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

liuyg

2021-08-28 c8e279927a36c755fd78769cfa8e489568192aa4

 src/views/securityEquipment/gun.vue

@@ -59,6 +59,7 @@
        align: "center",
        border: true,
        selection: true,
        labelWidth:110,
        column: column,
      },
    };
@@ -189,9 +190,9 @@
    },
    onLoad(page, params = {}) {
      this.loading = true;
      params["deptId"] = this.fromDeptId;
      // console.log(params.deptId);
      if (params.deptId != undefined) {
      if (this.fromDeptId != undefined) {
        params["deptId"] = this.fromDeptId;
        this.option.column[5].search = false;
        this.option.column[5].hide = true;
        this.option.column[5].addDisplay = false;