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

liuyg

2021-11-19 0855c8cef2f2f414cf9a84285421fdcdd5bc6310

 src/views/statisticalQueryManagement/securityGuardDetail.vue

@@ -89,6 +89,7 @@
        searchShow: true,
        searchMenuSpan: 6,
        index: true,
        indexLabel:'序号',
        viewBtn: true,
        dialogClickModal: false,
        column: [
@@ -224,15 +225,15 @@
            dicData: [
              {
                label: "是",
                value: "0"
              },
              {
                label: "否",
                value: "1"
              },
              {
                label: "已吊销",
                label: "否",
                value: "2"
              },
              {
                label: "已吊销",
                value: "3"
              }
            ],
            slot: true,
@@ -287,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"] || "";
      }