Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/components/BasicForm/src/BasicForm.vue

@@ -4,12 +4,12 @@
     v-model="dialogVisible"
     :width="dialogWidth"
     :close-on-click-modal="false"
+    v-loading="formLoading"
   >
   <div 
     style="max-height: 60vh;overflow-y: auto;">
     <Form
       ref="formRef"
-      v-loading="formLoading"
       :rules="rules"
       :schema="formSchema"
       :is-col="true"

src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts

@@ -319,7 +319,7 @@ export const SupplieritemRules = reactive({
   ],
   supplierItemCode: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
-    { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
+    // { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
   ],
   // packUnit: [
   //   { required: true, message: '请选择供应商包装单位', trigger: 'change' }

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -441,6 +441,7 @@
   // 主子数据 提交
   const submitForm = async (formType, data) => {
     data.subList = []
+    let flag = false
     for (let item of tableData.value) {
       await PurchaseDetailApi.getPurchaseDetailPageCheckData({
         number: item.poNumber,
@@ -449,13 +450,20 @@
         console.log("【要货计划】-每条数据结果",item)
         if(res.list[0].type == 'DISCRETE'){//只有离散单需要这个校验
           if (item.planQty > res.list[0].orderQty - res.list[0].plannedQty) {
+            flag = true;
             message.error('要货计划数量不得大于订单数量-已计划数量')
             return
+          }else{
+            data.subList.push(item) // 拼接子表数据参数
           }
+        }else{
+          data.subList.push(item) // 拼接子表数据参数
         }
-        data.subList.push(item) // 拼接子表数据参数
       })
     }
+    if(flag){
+      return;
+    }
     if (data.subList.length == tableData.value.length) {
       try {
         if (formType === 'create') {