From c95fa4ae7837ddf3f20d9f0bbe77c83aa22b80b9 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Wed, 10 Jan 2024 15:28:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=A1=E5=88=92=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=97=B6=E5=88=B7=E6=96=B0=E8=A1=A8=E7=A4=BA=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/supplieritem/index.ts                |  7 +++++++
 .../customerreturnRequestMain/index.vue          |  5 +++--
 .../deliverplan/deliverPlanMain/index.vue        |  5 +++--
 .../purchaseMain/purchaseMain.data.ts            | 16 ++--------------
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/api/wms/supplieritem/index.ts b/src/api/wms/supplieritem/index.ts
index 387777af6..d6c801830 100644
--- a/src/api/wms/supplieritem/index.ts
+++ b/src/api/wms/supplieritem/index.ts
@@ -64,4 +64,11 @@ export const exportSupplieritem = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/supplieritem/get-import-template' })
+}
+
+// 查询供应商物品列表
+export const selectItembasicTypeToSupplieritem = async (params) => {
+  
+    return await request.get({ url: `/wms/supplieritem/pageItembasicTypeToSupplieritem`, params })
+  
 }
\ No newline at end of file
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index 99276caa9..eb362ed4d 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -360,7 +360,7 @@ const handleDeleteTable = (item, index) => {
 }
 
 //为true表示子表数据中存在数量为0的数据
-const flag = ref()
+const flag = ref(false)
 
 // 主子数据 提交
 const submitForm = async (formType, data) => {
@@ -369,10 +369,11 @@ const submitForm = async (formType, data) => {
     if(obj.qty == 0){
       message.error(`数量不能为0!`)
       flag.value = true
+      formRef.value.formLoading = false
       return;
     }
   })
-  if(flag){
+  if(flag.value){
     return
   }
   try {
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
index dd12d7db1..0677f524e 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
@@ -324,7 +324,7 @@ const handleDeleteTable = (item, index) => {
 }
 
 //为true表示子表数据中存在数量为0的数据
-const flag = ref()
+const flag = ref(false)
 
 // 主子数据 提交
 const submitForm = async (formType, data) => {
@@ -333,10 +333,11 @@ const submitForm = async (formType, data) => {
     if(obj.qty == 0){
       message.error(`数量不能为0!`)
       flag.value = true
+      formRef.value.formLoading = false
       return;
     }
   })
-  if(flag){
+  if(flag.value){
     return
   }
  var isHave =DeliverPlanMain.allSchemas.formSchema.some(function (item) {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index 493e6c950..11f0d0ef6 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -387,19 +387,11 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchField: 'itemCode',
       searchTitle: '供应商物品信息',
       searchAllSchemas: Supplieritem.allSchemas,
-      searchPage: SupplieritemApi.getSupplieritemPage,
+      searchPage: SupplieritemApi.selectItembasicTypeToSupplieritem,
       searchCondition: [{
         key:'supplierCode',
         value:'supplierCode',
         isMainValue: true
-      },{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
       }]
     },
     form: {
@@ -410,15 +402,11 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'itemCode',
         searchTitle: '供应商物品信息',
         searchAllSchemas: Supplieritem.allSchemas,
-        searchPage: SupplieritemApi.getSupplieritemPage,
+        searchPage: SupplieritemApi.selectItembasicTypeToSupplieritem,
         searchCondition: [{
           key:'supplierCode',
           value:'supplierCode',
           isMainValue: true
-        },{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
         }]
       }
     }