Merge branch 'main' of http://222.71.165.188:3000/yunxi/GWEip

src/views/Gw/dianRongQi/DianRongQiForm.vue

@@ -589,11 +589,11 @@ const fnSubmitA = async () => {
     }
     await refFormA.value.validate().then(async (res: any) => {
         if (!res) {
-            let isRepeatWono = await comApi.IsRepeatWoNoInPeiDianXiang(formType.value == "copy"?0:formDataA.value.ID,formDataA.value.SupplierWorkNo,'dianrongqi')
-            if(isRepeatWono==true){
-                VXETable.modal.alert({content:"供应商工单编号重复设置，请重新选择"})
-                return;
-            }
+            // let isRepeatWono = await comApi.IsRepeatWoNoInPeiDianXiang(formType.value == "copy"?0:formDataA.value.ID,formDataA.value.SupplierWorkNo,'dianrongqi')
+            // if(isRepeatWono==true){
+            //     VXETable.modal.alert({content:"供应商工单编号重复设置，请重新选择"})
+            //     return;
+            // }
             formDataA.value.Sended = 0
             switch (formType.value) {
                 case 'add':

src/views/Gw/duanLuQi/DuanLuQiForm.vue

@@ -570,11 +570,11 @@ const fnSubmitA = async () => {
     }
     await refFormA.value.validate().then(async (res: any) => {
         if (!res) {
-            let isRepeatWono = await comApi.IsRepeatWoNoInPeiDianXiang(formType.value == "copy"?0:formDataA.value.ID,formDataA.value.SupplierWorkNo,'duanluqi')
-            if(isRepeatWono==true){
-                VXETable.modal.alert({content:"供应商工单编号重复设置，请重新选择"})
-                return;
-            }
+            // let isRepeatWono = await comApi.IsRepeatWoNoInPeiDianXiang(formType.value == "copy"?0:formDataA.value.ID,formDataA.value.SupplierWorkNo,'duanluqi')
+            // if(isRepeatWono==true){
+            //     VXETable.modal.alert({content:"供应商工单编号重复设置，请重新选择"})
+            //     return;
+            // }
             formDataA.value.Sended = 0
             switch (formType.value) {
                 case 'add':

src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue

@@ -374,7 +374,7 @@ const fnSubmitA = async () => {
                 return;
             }
     let finishedCount = await FinishedProductWarehousingApi.getFinishedProductCount(formDataA.value.SupplierWorkNo)
-    if(finishedCount!= 32){
+    if(finishedCount< 32){
         VXETable.modal.alert({content:"当前工单数据不完整，请检查原材料/组部件检验、生产工艺及过程检验、出厂试验是否都已完整录入"})
                 return;
     }