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

src/api/wms/condition/index.ts

@@ -42,7 +42,12 @@ export const deleteCondition = async (id: number) => {
 
 // 导出条件 Excel
 export const exportCondition = async (params) => {
-  return await request.download({ url: `/wms/condition/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/condition/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/condition/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/wms/configuration/index.ts

@@ -42,7 +42,12 @@ export const deleteConfiguration = async (id: number) => {
 
 // 导出配置 Excel
 export const exportConfiguration = async (params) => {
-  return await request.download({ url: `/wms/configuration/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/configuration/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/configuration/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/wms/configurationsetting/index.ts

@@ -44,7 +44,12 @@ export const deleteConfigurationsetting = async (id: number) => {
 
 // 导出配置设置 Excel
 export const exportConfigurationsetting = async (params) => {
-  return await request.download({ url: `/wms/configurationsetting/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/configurationsetting/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/configurationsetting/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/wms/paramsetting/index.ts

@@ -45,7 +45,12 @@ export const deleteParamsetting = async (id: number) => {
 
 // 导出参数设置 Excel
 export const exportParamsetting = async (params) => {
-  return await request.download({ url: `/wms/paramsetting/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/paramsetting/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/paramsetting/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/wms/rule/index.ts

@@ -44,7 +44,12 @@ export const deleteRule = async (id: number) => {
 
 // 导出规则 Excel
 export const exportRule = async (params) => {
-  return await request.download({ url: `/wms/rule/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/rule/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/rule/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/views/wms/basicDataManage/labelManage/package/index.vue

@@ -75,11 +75,20 @@ const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref(Package.allSchemas.tableColumns)
 
+
+/**
+ * Package2 regularParams = procure采购件标签记录页面   
+ * Package3 regularParams = manufacture  制造件标签记录页面
+ * Package4 regularParams = utensil  器具标签记录页面
+ */
+const regularParams = ref(route.name == 'Package2'?'procure':route.name == 'Package3'?'manufacture':route.name == 'Package4'?'utensil':'')
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
 
+
 // 查询列表页面参数设置
 const searchTableParams = ref([
 //{
@@ -102,7 +111,7 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
 const { tableObject, tableMethods } = useTable({
   getListApi: PackageApi.getPackagePage // 分页接口
 })
-
+tableObject.params.regularParams = regularParams.value
 // 获得表格的各种操作
 const { getList, setSearchParams } = tableMethods
 
@@ -233,7 +242,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '包装导入模版.xls'
+  templateTitle: '包装导入模版.xlsx'
 })
 
 // 导入成功之后
@@ -245,7 +254,8 @@ const importSuccess = () => {
 const searchFormClick = (searchData) => {
   tableObject.params = {
     isSearch: true,
-    filters: searchData.filters
+    filters: searchData.filters,
+    regularParams:regularParams.value
   }
   getList() // 刷新当前列表
 }

src/views/wms/basicDataManage/strategySetting/condition/index.vue

@@ -171,8 +171,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await ConditionApi.exportCondition(setSearchParams)
+    const data = await ConditionApi.exportCondition(tableObject.params)
-    download.excel(data, '条件.xls')
+    download.excel(data, '条件.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/basicDataManage/strategySetting/configuration/index.vue

@@ -171,8 +171,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await ConfigurationApi.exportConfiguration(setSearchParams)
+    const data = await ConfigurationApi.exportConfiguration(tableObject.params)
-    download.excel(data, '配置.xls')
+    download.excel(data, '配置.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue

@@ -201,8 +201,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await ConfigurationsettingApi.exportConfigurationsetting(setSearchParams)
+    const data = await ConfigurationsettingApi.exportConfigurationsetting(tableObject.params)
-    download.excel(data, '配置设置.xls')
+    download.excel(data, '配置设置.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue

@@ -172,8 +172,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await ParamsettingApi.exportParamsetting(setSearchParams)
+    const data = await ParamsettingApi.exportParamsetting(tableObject.params)
-    download.excel(data, '参数设置.xls')
+    download.excel(data, '参数设置.xlsx')
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/basicDataManage/strategySetting/rule/index.vue

@@ -200,8 +200,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await RuleApi.exportRule(setSearchParams)
+    const data = await RuleApi.exportRule(tableObject.params)
-    download.excel(data, '规则.xls')
+    download.excel(data, '规则.xlsx')
   } catch {
   } finally {
     exportLoading.value = false