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

shuishen

2021-11-12 8e2a42e4a2da78f9cda9fa3e7732a0ef72f0c906

 src/views/licenseApproval/securityGuard.vue

@@ -2,7 +2,7 @@
 * @Author: liu
 * @Date: 2021-08-26 16:57:58 
 * @Last Modified by: liu
 * @Last Modified time: 2021-11-05 14:45:01
 * @Last Modified time: 2021-11-09 11:16:14
 */


@@ -409,24 +409,33 @@
      this.upsData("2", "1"); //不通过
    },
    upsData(state, type) {
      let date = new Date(+new Date() + 8 * 3600 * 1000)
        .toJSON()
        .substr(0, 19)
        .replace("T", " ");
      // console.log(date);
      // return;
      this.dialogVisiblecc = false;
      if (this.user_name == "派") {
        // 派出所审批
        this.xukezData.ptime = date;
        this.xukezData.papprove = state;
        this.xukezData.popinion = this.textareaShenpi;
        this.xukezData.type = type == "0" ? "2" : "1"; // 为了保持审核系统识别
      } else if (this.user_name == "县") {
        // 分局审批
        this.xukezData.xtime = date;
        this.xukezData.xapprove = state;
        this.xukezData.xopinion = this.textareaShenpi;
        this.xukezData.type = type == "0" ? "2" : "1"; // 为了保持审核系统识别
      } else if (this.user_name == "市") {
        // 市局审批
        this.xukezData.stime = date;
        this.xukezData.sapprove = state;
        this.xukezData.sopinion = this.textareaShenpi;
        this.xukezData.type = type == "0" ? "0" : "1"; // 为了保持审核系统识别
      }
      console.log(this.xukezData);
      // console.log(this.xukezData);
      // return;
      update(this.xukezData).then((res) => {
        console.log(res);
@@ -581,6 +590,7 @@
      console.log(params, "params");
      params["jurisdiction"] = this.userInfo.jurisdiction;
      params["usetype"] = this.userData;
      this.option.column[this.option.column.length - 2].prop = "opinionOur";
      // return;
      getList(
        page.currentPage,
@@ -591,9 +601,21 @@
        this.page.total = data.total;
        this.data = data.records;
        for (var k in this.data) {
          console.log(this.changeState(this.data[k]));
          // console.log(this.changeState(this.data[k]));
          this.data[k] = this.changeState(this.data[k]);
          let paichusuoyijian = this.data[k].popinion
            ? "派出所意见：" + this.data[k].popinion + "；"
            : "";
          let fenjuijian = this.data[k].xopinion
            ? "分局意见：" + this.data[k].xopinion + "；"
            : "";
          let shijuyijian = this.data[k].sopinion
            ? "市局意见：" + this.data[k].sopinion + "；"
            : "";
          this.data[k]["opinionOur"] =
            paichusuoyijian + fenjuijian + shijuyijian;
        }
        console.log(this.data);
        this.loading = false;
        this.selectionClear();
      });