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

src/api/wms/purchaseClaimRecordMain/index.ts

@@ -60,8 +60,13 @@ export const rejectPurchaseClaimRecordMain = async (id: number) => {
 
 // 导出采购索赔主 Excel
 export const exportPurchaseClaimRecordMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchaseClaim-record-main/export-excel-senior`, data })
+  }else{
     return await request.download({ url: `/wms/purchaseClaim-record-main/export-excel`, params })
   }
+}
 
 // 下载用户导入模板
 export const importTemplate = () => {

src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts

@@ -526,7 +526,8 @@ export const DeliverRecordMainRules = reactive({
     { required: true, message: '请选择发运时间', trigger: 'blur' }
   ],
   billNo: [
-    { required: true, message: '请输入顺引单据号', trigger: 'blur' }
+    { required: true, message: '请输入顺引单据号', trigger: 'blur' },
+    { max: 18, message: '字符不得超过18位', trigger: 'blur' },
   ]
 })
 
@@ -1015,7 +1016,8 @@ export const DeliverRecordDetailRules = reactive({
     { required: true, message: '请输入数量', trigger: 'blur' }
   ],
   serialNo: [
-    { required: true, message: '请输入顺序号', trigger: 'blur' }
+    { required: true, message: '请输入顺序号', trigger: 'blur' },
+    { max: 64, message: '字符不得超过64位', trigger: 'blur' },
   ],
   classes: [
     { required: true, message: '请选择班次', trigger: 'blur' }

src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue

@@ -394,6 +394,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
 } 
 
 const searchTableAddSuccess = (formField, searchField, val, formRef, type, row) => {
+  console.log(type)
   if (type == 'tableForm') {
       if(formField == 'itemCode') {
         const tableFormKeys = {}
@@ -416,6 +417,10 @@ const searchTableAddSuccess = (formField, searchField, val, formRef, type, row)
       } else {
         row[formField] = val[0][searchField]
       }
+    }else  if(formField == 'customerCode'){
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
   }
 } 
 

src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue

@@ -181,7 +181,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({ hasPermi: `wms:purchaseClaimRecord:create` }), // 新增
   defaultButtons.defaultImportBtn({ hasPermi: `wms:purchaseClaimRecord:import` }), // 导入
-  defaultButtons.defaultExportBtn({ hasPermi: `wms:purchaseClaimRecord:export` }), // 导出
+  defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置