Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

Administrator

2021-07-14 f78a56ba2e2c3cf48a0809a824e306a578cefd00

 src/views/securityUnit/index.vue

@@ -229,7 +229,7 @@
    ids() {
      let ids = [];
      this.selectionList.forEach((ele) => {
        ids.push(ele.id);
        ids.push(ele.creditcode);
      });
      return ids.join(",");
    },
@@ -349,12 +349,13 @@
        this.$message.warning("请选择至少一条数据");
        return;
      }
      this.$confirm("确定将选择数据删除?", {
      this.$confirm("确定批量将选择数据删除?", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      })
        .then(() => {
          // console.log(this.ids);
          return remove(this.ids);
        })
        .then(() => {
@@ -428,6 +429,7 @@
          return;
        }
      }
      console.log(d, 0);
      this.data0 = d;
      this.forms = 1;
    },
@@ -453,6 +455,7 @@
          return;
        }
      }
      console.log(d, 1);
      this.data1 = d;
      this.forms = 2;
    },
@@ -468,13 +471,13 @@
          }
        }
      }
      console.log(d);
      d["cardid"] = d["cardid2"];
      delete d["cardid2"];
      d["cell"] = d["cell2"];
      delete d["cell2"];
      d["shareholdingratio"] = d["shareholdingratio2"];
      delete d["shareholdingratio2"];
      // console.log(d);
      // d["shareholdingratio"] = d["shareholdingratio2"];
      // delete d["shareholdingratio2"];
      for (var k in d) {
        if (d[k] == "" || d[k] == undefined) {
          console.log(k);
@@ -482,6 +485,7 @@
          return;
        }
      }
      console.log(d, 2);
      this.data2 = d;

      // this.data0.departmentid = this.data0.useid;
@@ -500,7 +504,11 @@
      adddata2(this.data2).then((res) => {
        console.log(res, 2);
      });
      this.onLoad(this.page, this.query);
      var time = setTimeout(() => {
        this.onLoad(this.page, this.query);
        clearTimeout(time);
        time = null;
      }, 500);
      console.log(this.data0, this.data1, this.data2);
      this.tipover();
    },