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

陈婷婷

2025-12-03 098583fc3d814c149d09f415fd2b32bca8d21972

 src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue

@@ -72,7 +72,7 @@
                           <el-col :span="6">
                              <el-form-item label="过滤">
                                 <el-select v-model="query.ColName" style="width:190px">
                                    <el-option value="0" label=""></el-option>
                                    <!-- <el-option value="0" label=""></el-option> -->
                                    <el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" />
                                 </el-select>
                              </el-form-item>
@@ -101,7 +101,7 @@
                           <el-col :span="6">
                              <el-form-item label="过滤1">
                                 <el-select v-model="query.ColName1" style="width:190px">
                                    <el-option value="0" label=""></el-option>
                                    <!-- <el-option value="0" label=""></el-option> -->
                                    <el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" />
                                 </el-select>
                              </el-form-item>
@@ -130,7 +130,7 @@
                           <el-col :span="6">
                              <el-form-item label="过滤2">
                                 <el-select v-model="query.ColName2" style="width:190px">
                                    <el-option value="0" label=""></el-option>
                                    <!-- <el-option value="0" label=""></el-option> -->
                                    <el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" />
                                 </el-select>
                              </el-form-item>
@@ -246,14 +246,14 @@
            HSourceBillNo: '',
            Warehouse: '',
            Hmaker: '',
            ColName: '0',
            Comparator: '0',
            ColName: '',
            Comparator: '',
            ColContent: '',
            ColName1: '0',
            Comparator1: '0',
            ColName1: '',
            Comparator1: '',
            ColContent1: '',
            ColName2: '0',
            Comparator2: '0',
            ColName2: '',
            Comparator2: '',
            ColContent2: ''
         },
         timeCycles: [
@@ -669,8 +669,19 @@
         this.selectedRows = selection;
      },
      onBillNoClick(row) {
         const id = row.hmainid || row.HInterID;
         window.open('./Fb_StepFoldinBillEdit.html?OperationType=3&linterid=' + id, '_blank');
         const table = this.$refs.mainTable;
         if (table) {
            try {
               table.clearSelection();
               table.toggleRowSelection(row, true);
            } catch (e) {
               if (table.setCurrentRow) table.setCurrentRow(row);
            }
         }
         this.selectedRows = [row];
         this.operationType = '3';
         this.currentId = row.hmainid || row.HInterID || row.HItemID || '';
         this.editDialogVisible = true;
      },
      get_BarCodeDetail() {
      if (this.selectedRows.length !== 1) {