Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_xzeq

src/api/rlqbxs.js

@@ -35,7 +35,7 @@ export const TqRlqbxx = params =>
 
 // 根据身份证号提取人力情报
 export const TqRlqByZjhm = params =>
-  postform(`${base.alyIP}/rlqb/TqRlqByZjhm`, params);
+  post(`${base.alyIP}/rlqb/TqRlqByZjhm`, params);
   
 //一键分析
 export const doAnalyse = params =>

src/components/form.vue

@@ -516,11 +516,11 @@
                               }}{{ realIndex + 1 }}:</span
                             >
                             <span class="addContent">
-                              <!-- <i
+                              <i
                                 :class="'zdyicon ' + item2.iconClass"
-                                v-if="!type2"
+                                v-if="realIndex != 0"
                                 @click="deleteObj(reakData, item2)"
-                              ></i> -->
+                              ></i>
                               <el-form-item
                                 v-for="item4 in item3.name"
                                 :label="item4.name"
@@ -563,7 +563,10 @@
                                     <template slot="append"
                                       ><span
                                         @click="
-                                          messageTq(formLabelAlign[item2.id][0])
+                                          messageTq(
+                                            reakData[item4.id],
+                                            realIndex
+                                          )
                                         "
                                         >提取</span
                                       ></template
@@ -834,7 +837,10 @@
                         </div>
                       </div>
                       <div class="addChildBtn">
-                        <el-button type="primary" @click="handelFrom(item2,index2)">
+                        <el-button
+                          type="primary"
+                          @click="handelFrom(item2, index2)"
+                        >
                           <i class="el-icon-plus"></i><span>添加</span>
                         </el-button>
                       </div>
@@ -978,16 +984,9 @@ export default {
     ajDt(item) {
       this.$emit("ajDt", item);
     },
-    messageTq(item) {
-      console.log(item);
-      var itemSend = {};
-      if (item.xm && item.xm != "") {
-        itemSend.xm = item.xm;
-      }
-      if (item.zjhm && item.zjhm != "") {
-        itemSend.zjhm = item.zjhm;
-      }
-      this.$emit("messageTq", itemSend);
+    messageTq(item, index) {
+      debugger;
+      this.$emit("messageTq", item, index);
     },
     choosePeople(item) {
       console.log(item);
@@ -1602,8 +1601,8 @@ export default {
       return isJPG && isLt2M;
     },
     //新增表单数据
-    handelFrom(obj,index2) {
-      debugger
+    handelFrom(obj, index2) {
+      debugger;
       console.log(index2);
       console.log(obj);
       let self = this,
@@ -1674,6 +1673,24 @@ export default {
         });
       }
     },
+    deleteObj(obj) {
+      debugger;
+      let self = this;
+      self.propFormField.forEach((val) => {
+        val.data.forEach((f) => {
+          if (f.childrenAsAdd) {
+            f.childrenAsAdd.forEach((val2) => {
+              self.formLabelAlign[val2.id].forEach((val3, index) => {
+                if (val3 == obj) {
+                  self.formLabelAlign[val2.id].splice(index, 1);
+                  this.$message.success("删除成功");
+                }
+              });
+            });
+          }
+        });
+      });
+    },
   },
   mounted() {
     var self = this;

src/views/rlqbxsxx/adjustRlqbxs.vue

@@ -7,7 +7,7 @@
       :propTitle="title"
       :pageBs="pageBs"
       @examine="examine"
-      @messageTq="messageTq"
+      @messageTq="messageTq(arguments)"
       @insertMessage="insertMessage"
       @examineSave="examineSave"
     ></form-compontent>
@@ -103,7 +103,7 @@ export default {
                       name: xstgz,
                     },
                   ],
-                  iconClass: "el-icon-close",
+                  iconClass: "el-icon-delete",
                 },
               ],
             },
@@ -129,7 +129,7 @@ export default {
                       name: ryxsgl,
                     },
                   ],
-                  iconClass: "el-icon-close",
+                  iconClass: "el-icon-delete",
                 },
               ],
             },
@@ -406,17 +406,20 @@ export default {
       }
     },
     messageTq(item) {
+      debugger
       let self = this;
-      console.log(item);
-      // console.log(self.formField);
-      console.log(self.formLabelAlign);
-      if (!item || (!!item && item == "")) {
-        this.$message.error("请填写身份证号码");
-        return;
-      } else {
-        var params = new FormData();
-        params.append("zjhm", item);
-        TqRlqByZjhm(params).then((res) => {
+      // console.log(item);
+      // // console.log(self.formField);
+      // console.log(self.formLabelAlign);
+      // if (!item || (!!item && item == "")) {
+      //   this.$message.error("请填写身份证号码");
+      //   return;
+      // } else {
+      //   var params = new FormData();
+      //   params.append("zjhm", item);
+        TqRlqByZjhm({
+          zjhm: item[0]
+        }).then((res) => {
           if (res.success && res.code == 200) {
             this.$message.success("提取成功");
             var result = res.data.rows;
@@ -426,31 +429,33 @@ export default {
               console.log(i);
               if (i.data && i.data.length > 0) {
                 i.data.forEach((j, jIndex) => {
-                  debugger
                   if (j.childrenAsAdd) {
                     j.childrenAsAdd.forEach((m, mIndex) => {
-                      if (self.formLabelAlign[m.id][mIndex].zjhm == result.zjhm) {
-                        console.log(123);
+                      m.list.forEach((f) => {
+                        f.name.forEach((h) => {
                           debugger
-                        console.log(m.id);
-                        console.log(result[m.id]);
-
                           self.$set(
-                          self.formLabelAlign,
-                          m.id[mIndex],
-                          result || []
+                            self.formLabelAlign[m.id][item[1]],
+                            h.id,
+                            result[h.id]
                           );
-                      }
+                        });
+                      });
                     });
                   }
                 });
+                console.log(
+                  self.formField,
+                  2222222222222222,
+                  self.formLabelAlign
+                );
               }
             });
           } else {
             this.$message.error("提取失败");
           }
         });
-      }
+      // }
     },
     insertMessage(boo) {
       this.listVisiable = boo;