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

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 })
+  
 }

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 {

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) {

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
         }]
       }
     }