Explorar o código

fix: 更新对账状态字段名称并修改相关提示信息(对账池)

xieyong hai 5 días
pai
achega
7fc41c0442

+ 8 - 4
src/views/warehouseManagement/inventoryAllocation/components/inventory-search.vue

@@ -200,11 +200,11 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="对账状态:" prop="isReconciliation">
+        <el-form-item label="对账状态:" prop="reconciliationStatus">
           <el-select
             filterable
             placeholder="请选择"
-            v-model="where.isReconciliation"
+            v-model="where.reconciliationStatus"
             clearable
             class="w100"
           >
@@ -275,6 +275,7 @@
         targetWarehouse: '',
         sourceWarehouse: '',
         isReconciliation: '',
+        reconciliationStatus: '',
         time: []
       };
       return {
@@ -302,8 +303,11 @@
           }
         ],
         isReconciliationOp: [
-          { value: 0, label: '未对账' },
-          { value: 1, label: '已对账' }
+          //  0:未入池 1:未对账 2:对账中 3:已对账
+          { value: 0, label: '未入池' },
+          { value: 1, label: '未对账' },
+          { value: 2, label: '对账中' },
+          { value: 3, label: '已对账' }
         ]
       };
     },

+ 17 - 7
src/views/warehouseManagement/inventoryAllocation/index.vue

@@ -60,7 +60,7 @@
           </el-dropdown>
 
           <el-button v-if="$hasPermission('wms:inventoryAllocation:statement')" :disabled="selection.length == 0" type="primary"  @click="handleGenerateStatement('add')"
-            >生成对账单</el-button
+            >推送对账池</el-button
           >
         </template>
         <!-- 单号链接 -->
@@ -157,8 +157,10 @@
         groupName: '',
         saveLoading: false,
         isReconciliationOp: [
-          { value: 0, label: '未对账' },
-          { value: 1, label: '已对账' },
+          { value: 0, label: '未入池' },
+          { value: 1, label: '未对账' },
+          { value: 2, label: '对账中' },
+          { value: 3, label: '已对账' }
         ],
         inventoryDimensionOp: [{
           code: '1',
@@ -225,7 +227,7 @@
             }
           },
           {
-            prop: 'isReconciliation',
+            prop: 'reconciliationStatus',
             label: '对账状态',
             align: 'center',
             showOverflowTooltip: true,
@@ -348,24 +350,32 @@
       // 生成对账单
       handleGenerateStatement(type) {
         if (this.selection.length == 0) {
-          this.$message.warning('请选择要生成对账单的记录');
+          this.$message.warning('请选择要推送对账池的记录');
           return;
         }
 
         // 检查选中的记录状态是否为2
         const invalidRecords = this.selection.filter(item => item.status != 2);
         if (invalidRecords.length > 0) {
-          this.$message.warning('请选择已完成的调拨单生成对账单');
+          this.$message.warning('请选择已完成的调拨单推送对账池');
           return;
         }
 
         // 检查选中的列表维度是否包含物品维度
         const dimensionRecords = this.selection.filter(item => item.inventoryDimension == 1);
         if (dimensionRecords.length > 0) {
-          this.$message.warning('请选择批次维度或包装维度调拨单生成对账单');
+          this.$message.warning('请选择批次维度或包装维度调拨单推送对账池');
           return;
         }
 
+        // 只有reconciliationStatus=0的才能点击推送对账池
+        const reconciliationRecords = this.selection.filter(item => item.reconciliationStatus != 0);
+        if (reconciliationRecords.length > 0) {
+          this.$message.warning('只有未入池的才能点击推送对账池');
+          return;
+        }
+
+
         this.generateStatementFlag = true;
         this.$nextTick(() => {
           this.$refs.generateStatementRef.open(type, this.selection);