Merge remote-tracking branch 'origin/master_hella' into master_hella

src/api/wms/business/inputBlur.ts

@@ -573,6 +573,9 @@ export const getListByBottonInput = async (headerItem, val, row, routeName, form
       }
     }
     await tableFormSchemaObj.verificationPage(params.value).then(async (res) => {
+      if(!Array.isArray(res)&&res.list&&Array.isArray(res.list)){
+        res = res.list
+      }
       list.value = res ? res : []
       if (arr1.length != res.length) {
         const arr2 = res.map((item) => item[headerItem.tableForm.searchField])

src/api/wms/purchasereturnRequestMain/index.ts

@@ -126,6 +126,11 @@ export const importTemplateNew = () => {
   return request.download({ url: '/wms/purchasereturn-request-main/get-import-template-new' })
 }
 
+// 下载用户导入模板(新)
+export const importTemplateMorderType = () => {
+  return request.download({ url: '/wms/purchasereturn-request-main/get-import-template-mordertype' })
+}
+
 // 关闭采购退货申请主 Excel
 export const closePurchasereturnRequestMain = async (id) => {
   return await request.put({ url: `/wms/purchasereturn-request-main/close?id=` + id })

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@@ -913,12 +913,12 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
           message: '请填写来源库位！',
           isMainValue: true
         },
-        {
+        // {
-          key: 'warehouseCode',
+        //   key: 'warehouseCode',
-          value: 'toWarehouseCode',
+        //   value: 'toWarehouseCode',
-          message: '请填写到仓库！',
+        //   message: '请填写到仓库！',
-          isMainValue: true
+        //   isMainValue: true
-        },
+        // },
         {
           key: 'inventoryStatus',
           value: 'OK',
@@ -942,12 +942,12 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
         message: '请填写来源库位！',
         isMainValue: true
       },
-      {
+      // {
-        key: 'warehouseCode',
+      //   key: 'warehouseCode',
-        value: 'toWarehouseCode',
+      //   value: 'toWarehouseCode',
-        message: '请填写到仓库！',
+      //   message: '请填写到仓库！',
-        isMainValue: true
+      //   isMainValue: true
-      },
+      // },
       {
         key: 'inventoryStatus',
         value: 'OK',
@@ -956,7 +956,17 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
           key: 'businessType',
           value: 'ReturnToStore', // 合格退料
           isMainValue: false
-        }]
+        }],
+      verificationPage: BalanceApi.getBalancePage, // 校验数去焦点输入是否正确的方法
+      isShowTableFormSearch: true,
+      verificationParams: [{
+        key: 'itemCode',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: true,
+        isFormModel: true,
+      }], // 失去焦点校验参数
     },
   },
   // {

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue

@@ -144,7 +144,7 @@
   <!-- 导入 -->
   <ImportForm
     ref="importFormRef"
-    url="/wms/purchasereturn-request-main/importNew"
+    url="/wms/purchasereturn-request-main/importMorderType"
     :importTemplateData="importTemplateData"
     @success="importSuccess"
     :updateIsDisable="true"
@@ -1130,6 +1130,6 @@ const showLabelSuccess = async (formField, searchField, val, formRef, type, row)
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await PurchasereturnRequestMainApi.importTemplateNew()
+  importTemplateData.templateUrl = await PurchasereturnRequestMainApi.importTemplateMorderType()
 })
 </script>

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts

@@ -307,7 +307,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     tableForm: {
       type: 'InputNumber',
-      min: 1,
+      min: 0,
       precision: 6
     }
   },

src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue

@@ -352,6 +352,7 @@
       ...model,
       statuss: model.status.join(',')?model.status.join(','):''
     }
+    model1.isLS = 1
     delete model1.status
     setSearchParams(model1)
   }