Просмотр исходного кода

fix(采购订单): 修复批次号必填逻辑并更新参数配置

liujt 1 месяц назад
Родитель
Сommit
4a016376e2

+ 2 - 1
src/views/purchasingManage/purchaseOrder/components/addDialogNew.vue

@@ -513,6 +513,7 @@
             :isContractId="
               !!form.contractId && !OutValidate.includes(form.sourceType)
             "
+            :isBatchNo="isBatchNo == 1"
             @getProductData="getSupplierData"
           >
           </inventoryTable>
@@ -1035,7 +1036,7 @@
 
       //批次号是否必填//0否 1是
       parameterGetByCode({
-        code: 'eom_saleOrder_entrusted_batchNo'
+        code: 'eom_purchaseOrder_batchNo'
       }).then((res) => {
         this.isBatchNo = res.value;
       });

+ 14 - 1
src/views/purchasingManage/purchaseOrder/components/inventoryTableNew.vue

@@ -486,6 +486,11 @@
         <el-form-item
           style="margin-bottom: 20px"
           :prop="'datasource.' + scope.$index + '.batchNo'"
+          :rules="{
+            required: isBatchNo == 1 ? true : false,
+            message: '请输入批次号',
+            trigger: 'blur'
+          }"
         >
           <el-input
             v-model="scope.row.batchNo"
@@ -494,6 +499,9 @@
           </el-input>
         </el-form-item>
       </template>
+      <template v-slot:headerBatchNo="{ column }">
+        <span class="is-required">{{ column.label }}</span>
+      </template>
       <template v-slot:pricingWay="scope">
         <el-form-item :prop="'datasource.' + scope.$index + '.pricingWay'">
           <el-select
@@ -658,6 +666,10 @@
       },
       cacheKeyUrl: {
         default: 'eos-purchasingManage-purchaseOrder-inventoryTable'
+      },
+      isBatchNo: {
+        type: Boolean,
+        default: false
       }
     },
     components: {
@@ -1040,7 +1052,8 @@
             prop: 'batchNo',
             label: '批次号',
             slot: 'batchNo',
-            align: 'center'
+            align: 'center',
+            headerSlot: this.isBatchNo ? 'headerBatchNo' : '',
           },
           {
             prop: 'provenance',