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

src/api/wms/purchasereturnRequestMain/index.ts

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

src/views/qms/inspectionQ2/inspectionQ2.data.ts

@@ -49,50 +49,7 @@ export const Q2 = useCrudSchemas(
         fixed: 'left'
       }
     },
-    {
+
-      label: 'Q1通知单号',
-      field: 'q1Number',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          enterSearch: true,
-          multiple: true,
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
-          searchField: 'number', // 查询弹窗赋值字段
-          searchTitle: 'Q1通知单', // 查询弹窗标题
-          searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
-          searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            },
-            {
-              key: 'status',
-              value: '0',
-              isMainValue: false
-            }
-          ],
-          verificationParams: [
-            {
-              key: 'number',
-              action: '==',
-              value: '',
-              isMainValue: false,
-              isSearch: true,
-              isFormModel: true
-            }
-          ] // 失去焦点校验参数
-        }
-      },
-      isSearch: true
-    },
     {
       label: '状态',
       field: 'status',
@@ -380,6 +337,7 @@ export const Q2 = useCrudSchemas(
         }
       }
     },
+
     {
       label: '索赔日期',
       field: 'claimTime',
@@ -422,6 +380,50 @@ export const Q2 = useCrudSchemas(
         }
       }
     },
+    {
+      label: 'Q1通知单号',
+      field: 'q1Number',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q1通知单', // 查询弹窗标题
+          searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      },
+      isSearch: true
+    },
     {
       label: '描述',
       field: 'desc',
@@ -473,8 +475,8 @@ export const Q2 = useCrudSchemas(
           valueFormat: 'YYYY-MM-DD HH:mm:ss',
           type: 'daterange',
           defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-        },
+        }
-      },
+      }
     },
     {
       label: '操作',

src/views/qms/inspectionQ3/inspectionQ3.data.ts

@@ -48,50 +48,7 @@ export const InspectionQ3Main = useCrudSchemas(
         fixed: 'left'
       }
     },
-    {
+
-      label: 'Q1通知单号',
-      field: 'q1Number',
-      sort: 'custom',
-      isSearch: true,
-      table: {
-        width: 150
-      },
-      form: {
-        // labelMessage: '信息提示说明！！！',
-        componentProps: {
-          enterSearch: true,
-          multiple: true,
-          isSearchList: true, // 开启查询弹窗
-          searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
-          searchField: 'number', // 查询弹窗赋值字段
-          searchTitle: 'Q1通知单', // 查询弹窗标题
-          searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
-          searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
-          searchCondition: [
-            {
-              key: 'available',
-              value: 'TRUE',
-              isMainValue: false
-            },
-            {
-              key: 'status',
-              value: '0',
-              isMainValue: false
-            }
-          ],
-          verificationParams: [
-            {
-              key: 'number',
-              action: '==',
-              value: '',
-              isMainValue: false,
-              isSearch: true,
-              isFormModel: true
-            }
-          ] // 失去焦点校验参数
-        }
-      }
-    },
     {
       label: '负责用户',
       field: 'responUser',
@@ -157,6 +114,50 @@ export const InspectionQ3Main = useCrudSchemas(
         }
       }
     },
+    {
+      label: 'Q1通知单号',
+      field: 'q1Number',
+      sort: 'custom',
+      isSearch: true,
+      table: {
+        width: 150
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          enterSearch: true,
+          multiple: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
+          searchField: 'number', // 查询弹窗赋值字段
+          searchTitle: 'Q1通知单', // 查询弹窗标题
+          searchAllSchemas: Q1.allSchemas, // 查询弹窗所需类
+          searchPage: InspectionQ1Api.getQ1Page, // 查询弹窗所需分页方法
+          searchCondition: [
+            {
+              key: 'available',
+              value: 'TRUE',
+              isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
     {
       label: '描述',
       field: 'desc',

src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts

@@ -446,8 +446,14 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
     label: '超过高储是否允许叫料',
     field: 'allowIssueRequest',
     sort: 'custom',
+    isSearch: false,
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    table: {
+      width: 150
+    },
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -456,7 +462,6 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
         activeValue: 'TRUE'
       }
     },
-    isTable: false
   },
   // {
   //   label: '优先空库位',

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -48,6 +48,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: false,
     sortTableDefault:3
   },
+  {
+    label: '明细备注',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: false,
+    sortTableDefault:3
+  },
   {
     label: '发货单号',
     field: 'asnNumber',

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

@@ -133,7 +133,7 @@
   <!-- 导入 -->
   <ImportForm
     ref="importFormRef"
-    url="/wms/purchasereturn-request-main/import"
+    url="/wms/purchasereturn-request-main/importNew"
     :importTemplateData="importTemplateData"
     @success="importSuccess"
     :updateIsDisable="true"
@@ -803,8 +803,8 @@ const onChangeForm = async (field, cur, formRef)=>{
     })
   }else if(field == 'locationCode' || field == 'itemCode'){
     // 退货库位 获取明细列表
-    let itemCode = field == 'locationCode'?formRef.value.formModel.itemCode:formRef.formModel.itemCode
+    let itemCode = formRef.formModel?formRef.formModel.itemCode:formRef.value.formModel.itemCode
-    let fromLocationCode = field == 'locationCode'?formRef.value.formModel.locationCode:formRef.formModel.locationCode
+    let fromLocationCode = formRef.formModel?formRef.formModel.locationCode:formRef.value.formModel.locationCode
     if(!itemCode||!fromLocationCode){
       return
     }
@@ -1064,6 +1064,6 @@ const showLabelSuccess = async (formField, searchField, val, formRef, type, row)
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await PurchasereturnRequestMainApi.importTemplate()
+  importTemplateData.templateUrl = await PurchasereturnRequestMainApi.importTemplateNew()
 })
 </script>

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

@@ -169,12 +169,13 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     if(routeName.value.includes('SCP')){
       const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params)
-      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     }else{
       const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSpare(tableObject.params)
-      download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     }
     
   } catch {

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

@@ -706,10 +706,11 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PurchasereturnRequestMainApi.exportPurchasereturnRequestMainSpare(
       tableObject.params
     )
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

@@ -348,8 +348,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PutawayJobMainApi.exportPutawayJobMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue

@@ -211,8 +211,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PutawayRecordMainApi.exportPutawayRecordMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@@ -406,8 +406,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PutawayRequestMainApi.exportPutawayRequestMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue

@@ -259,8 +259,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PurchasereceiptJobMainApi.exportSparereceiptJobMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue

@@ -160,8 +160,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PurchasereceiptRecordMainApi.exportSparereceiptRecordMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue

@@ -560,8 +560,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PurchasereceiptRequestMainApi.exportSparereceiptRequestMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue

@@ -156,8 +156,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PurchaseclaimRecordMainApi.exportPurchaseclaimRecordMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue

@@ -414,8 +414,9 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
       await message.exportConfirm()
       // 发起导出
       exportLoading.value = true
+      const excelTitle = ref(route.meta.title)
       const data = await PurchaseclaimRequestMainApi.exportPurchaseclaimRequestMain(tableObject.params)
-    download.excel(data, `【${route.meta.title}】【${formatDate(new Date())}】.xlsx`)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
     } catch {
     } finally {
       exportLoading.value = false