Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulator...

liuyg

2021-10-12 6c1f80c02fa74749cc8dd5997e6972c65b4b805d

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory_ys

 src/views/statisticalQueryManagement/businessStatistics.vue

@@ -312,7 +312,7 @@
        this.dialogShow = true;
      } else if (column.label == "持证人数") {
        this.dialogTitle = "业务统计明细---持证保安人员清单";
        this.searchitem = "dq";
        this.searchitem = "zong";
        this.paramCz = true;
        this.fwdeptId = row.departmentid;
        this.dialogShow = true;

 src/views/statisticalQueryManagement/securityGuardDetail.vue

@@ -220,7 +220,7 @@
            label: "是否持证",
            prop: "hold",
            type: "select",
            search: true,
            search: !this.paramCz,
            searchSpan: 4,
            dicData: [
              {
@@ -288,7 +288,7 @@
      param["status"] = params["status"] || "";
      param["deptId"] = this.fwdeptId;
      if (this.paramCz) {
        param["hold"] = "0";
        param["hold"] = "1";
      } else {
        param["hold"] = params["hold"] || "";
      }