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

shuishen

2021-09-13 b8dfc98b089e47fdb3e269941bbd2de3f7fb7de1

 src/views/securityEquipment/equipments.vue

@@ -114,7 +114,7 @@
        align: "center",
        selection: true,
        column: column,
        labelWidth:110,
        labelWidth: 110,
      },
    };
  },
@@ -263,17 +263,33 @@
      // console.log(params.deptId);
      if (this.fromDeptId != undefined) {
        params["deptId"] = this.fromDeptId;
        this.option.column[4].search = false;
        this.option.column[6].search = false;
        this.option.column[6].hide = true;
        this.option.column[6].addDisplay = false;
        this.option.column[6].editDisplay = false;
        for (let k in this.option.column) {
          if (this.option.column[k].prop == "deptId") {
            this.option.column[k].search = false;
            this.option.column[k].hide = true;
            this.option.column[k].addDisplay = false;
            this.option.column[k].editDisplay = false;
          }
        }
        // this.option.column[4].  = false;
        // this.option.column[6].search = false;
        // this.option.column[6].hide = true;
        // this.option.column[6].addDisplay = false;
        // this.option.column[6].editDisplay = false;
      } else {
        this.option.column[4].search = true;
          this.option.column[6].search = true;
        this.option.column[6].hide = false;
        this.option.column[6].addDisplay = true;
        this.option.column[6].editDisplay = true;
        for (let k in this.option.column) {
          if (this.option.column[k].prop == "deptId") {
            this.option.column[k].search = true;
            this.option.column[k].hide = false;
            this.option.column[k].addDisplay = true;
            this.option.column[k].editDisplay = true;
          }
        }
        // this.option.column[4].search = true;
        //   this.option.column[6].search = true;
        // this.option.column[6].hide = false;
        // this.option.column[6].addDisplay = true;
        // this.option.column[6].editDisplay = true;
      }
      getdata(
        page.currentPage,