Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

陈婷婷

2026-03-31 7b849f06f0b0986b3955c1d1d91a0b2a79fa7ea6

 src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue

@@ -564,6 +564,43 @@
          let HModName = "Gy_BarCodeBillList"
          this.DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, this.dataList);
        }
        else{
          if(data1.list){
            this.btResList = data1.list             //列表表头数据
            this.total = data1.count;
            var data = [];//列字段数据
            var col = [];
            var totalArray = [];
            //给空的数组赋值
            for (var key in data1.list) {//循序遍历数组
              data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//从每个对象中提取数据
            }
            //在列表左边添加勾选框
            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
            for (var i = 0; i < data.length; i++) {//遍历data数组重的数据
              if (this.titleData.indexOf(data[i].name) > -1) {//检查data【i】.name是否在数组中  //计算列
                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
              } else if (totalArray.indexOf(data[i].name) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //计算列
                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
              }
              else {
                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
              }
            }
            option.cols = [col]
            this.dataList = option
            option.data = data1.data;
            var result = data1.data;
            option.data = result;
            this.checkDataList = [];
            let HModName = "Gy_BarCodeBillList"
            this.DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, this.dataList);
          }
          else{
            this.tableShow = true
            this.loading = false
          }
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
      });