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

src/api/wms/purchasereturnRecordMain/index.ts

@@ -75,6 +75,16 @@ export const exportPurchasereturnRecordMain = async (params) => {
   }
 }
 
+// 导出维修备件退货记录主 Excel
+export const exportPurchasereturnRecordMainSpare = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereturn-record-main/export-excel-senior-spare`, data })
+  } else {
+    return await request.download({url: `/wms/purchasereturn-record-main/export-excel-spare`, params})
+  }
+}
+
 // 导出采购退货记录主 Excel
 export const exportPurchasereturnRecordMainSCP = async (params) => {
   if (params.isSearch) {

src/api/wms/purchasereturnRequestMain/index.ts

@@ -73,6 +73,16 @@ export const exportPurchasereturnRequestMain = async (params) => {
   }
 }
 
+// 导出采购退货申请主 Excel
+export const exportPurchasereturnRequestMainSpare = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchasereturn-request-main/export-excel-senior-spare`, data })
+  } else {
+    return await request.download({url: `/wms/purchasereturn-request-main/export-excel-spare`, params})
+  }
+}
+
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/purchasereturn-request-main/get-import-template' })

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts

@@ -483,15 +483,15 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   },
   {
     label: '批次',
-    field: 'batch',
+    field: 'fromBatch',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '包装代码',
-    field: 'packingNumber',
+    label: '包装号',
+    field: 'fromPackingNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -506,7 +506,16 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '数量',
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: false,
+  },
+  {
+    label: '收货数量',
     field: 'qty',
     sort: 'custom',
     table: {

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts

@@ -586,7 +586,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTable: false
   },
   {
-    label: '数量',
+    label: '收货数量',
     field: 'qty',
     sort: 'custom',
     table: {

src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts

@@ -523,7 +523,25 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '数量',
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: false,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: false,
+  },
+  {
+    label: '退货数量',
     field: 'qty',
     sort: 'custom',
     table: {

src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/index.vue

@@ -172,8 +172,8 @@ const handleExport = async () => {
       const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params)
       download.excel(data, `${t('ts.采购退货记录主')}.xlsx`)
     }else{
-      const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params)
-      download.excel(data, `${t('ts.采购退货记录主')}.xlsx`)
+      const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSpare(tableObject.params)
+      download.excel(data, `维修备件退货记录主.xlsx`)
     }
     
   } catch {

src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRequestSpareMain/index.vue

@@ -699,10 +699,10 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMain(
+    const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMainSpare(
       tableObject.params
     )
-    download.excel(data, '采购退货申请主.xlsx')
+    download.excel(data, '维修备件退货申请主.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts

@@ -4,7 +4,7 @@ import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
 import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
-import {validateHanset,validateEmail} from '@/utils/validator'
+import { validateHanset, validateEmail } from '@/utils/validator'
 const { t } = useI18n() // 国际化
 
 /**
@@ -44,7 +44,15 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true
+        }], // 失去焦点校验参数
       }
     }
   },
@@ -421,7 +429,6 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       multiple:true,//多选
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择供应商物料',
-      isShowTableFormSearch: true,
       searchField: 'itemCode',
       searchTitle: '供应商物料信息',
       searchAllSchemas: Supplieritem.allSchemas,
@@ -435,6 +442,18 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
         key: 'available',
         value: 'TRUE',
         isMainValue: false
+        }],
+      verificationPage:  SupplieritemApi.getSupplierItemListByCodes, // tableForm下方输入框校验失去焦点之后是否正确的方法
+      isShowTableFormSearch: true, //tableForm下方是否出现输入框
+      isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据
+      // 失去焦点校验参数
+      verificationParams: [{
+        key: 'itemCode',
+        action: '==',
+        value: '',
+        isMainValue: false,
+        isSearch: 'true',
+        isFormModel: true,
       }]
     },
     form: {
@@ -455,6 +474,15 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
         key: 'available',
         value: 'TRUE',
         isMainValue: false
+        }],
+        // 失去焦点校验参数
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: 'true',
+          isFormModel: true,
         }]
       }
     }