From 4a958c4d56855107f63388f7b0103056905a72f9 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 16 Nov 2023 11:41:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E8=AE=BE=E7=BD=AE=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/carrier/index.ts                  |   7 +-
 src/api/wms/owner/index.ts                    |   7 +-
 src/api/wms/shift/index.ts                    |   7 +-
 src/api/wms/team/index.ts                     |   7 +-
 .../labelManage/package/index.vue             |   1 -
 .../orderManage/carrier/index.vue             |   2 +-
 .../orderManage/owner/index.vue               |   2 +-
 .../orderManage/shift/index.vue               |   2 +-
 .../orderManage/team/index.vue                |   2 +-
 .../configurationsetting/index.vue            | 105 +++++++++++-------
 .../strategySetting/rule/index.vue            | 100 +++++++++++------
 .../strategySetting/rule/rule.data.ts         |   3 +
 12 files changed, 162 insertions(+), 83 deletions(-)

diff --git a/src/api/wms/carrier/index.ts b/src/api/wms/carrier/index.ts
index 6d9fb44e1..18d1c88fd 100644
--- a/src/api/wms/carrier/index.ts
+++ b/src/api/wms/carrier/index.ts
@@ -54,7 +54,12 @@ export const deleteCarrier = async (id: number) => {
 
 // 导出承运商 Excel
 export const exportCarrier = async (params) => {
-  return await request.download({ url: `/wms/carrier/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/carrier/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/carrier/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/owner/index.ts b/src/api/wms/owner/index.ts
index 5e8c5c40f..9c4260ea0 100644
--- a/src/api/wms/owner/index.ts
+++ b/src/api/wms/owner/index.ts
@@ -54,7 +54,12 @@ export const deleteOwner = async (id: number) => {
 
 // 导出货主 Excel
 export const exportOwner = async (params) => {
-  return await request.download({ url: `/wms/owner/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/owner/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/owner/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/shift/index.ts b/src/api/wms/shift/index.ts
index 973f4c9c2..f663b794f 100644
--- a/src/api/wms/shift/index.ts
+++ b/src/api/wms/shift/index.ts
@@ -46,7 +46,12 @@ export const deleteShift = async (id: number) => {
 
 // 导出班次 Excel
 export const exportShift = async (params) => {
-  return await request.download({ url: `/wms/shift/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/shift/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/shift/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/team/index.ts b/src/api/wms/team/index.ts
index 0abb2de21..6c978a410 100644
--- a/src/api/wms/team/index.ts
+++ b/src/api/wms/team/index.ts
@@ -44,7 +44,12 @@ export const deleteTeam = async (id: number) => {
 
 // 导出班组 Excel
 export const exportTeam = async (params) => {
-  return await request.download({ url: `/wms/team/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/team/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/team/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/views/wms/basicDataManage/labelManage/package/index.vue b/src/views/wms/basicDataManage/labelManage/package/index.vue
index 06de855d2..bb5472c22 100644
--- a/src/views/wms/basicDataManage/labelManage/package/index.vue
+++ b/src/views/wms/basicDataManage/labelManage/package/index.vue
@@ -253,6 +253,5 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await PackageApi.importTemplate()
 })
 </script>
diff --git a/src/views/wms/basicDataManage/orderManage/carrier/index.vue b/src/views/wms/basicDataManage/orderManage/carrier/index.vue
index 4a35464f4..895e0d8ed 100644
--- a/src/views/wms/basicDataManage/orderManage/carrier/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/carrier/index.vue
@@ -195,7 +195,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await CarrierApi.exportCarrier(setSearchParams)
+    const data = await CarrierApi.exportCarrier(tableObject.params)
     download.excel(data, '承运商.xls')
   } catch {
   } finally {
diff --git a/src/views/wms/basicDataManage/orderManage/owner/index.vue b/src/views/wms/basicDataManage/orderManage/owner/index.vue
index 8dfc7082b..d3408ac53 100644
--- a/src/views/wms/basicDataManage/orderManage/owner/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/owner/index.vue
@@ -195,7 +195,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await OwnerApi.exportOwner(setSearchParams)
+    const data = await OwnerApi.exportOwner(tableObject.params)
     download.excel(data, '货主.xls')
   } catch {
   } finally {
diff --git a/src/views/wms/basicDataManage/orderManage/shift/index.vue b/src/views/wms/basicDataManage/orderManage/shift/index.vue
index f167c9cb7..cbe35e0a5 100644
--- a/src/views/wms/basicDataManage/orderManage/shift/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/shift/index.vue
@@ -195,7 +195,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await ShiftApi.exportShift(setSearchParams)
+    const data = await ShiftApi.exportShift(tableObject.params)
     download.excel(data, '班次.xls')
   } catch {
   } finally {
diff --git a/src/views/wms/basicDataManage/orderManage/team/index.vue b/src/views/wms/basicDataManage/orderManage/team/index.vue
index 6cbd98ef4..a6fe602eb 100644
--- a/src/views/wms/basicDataManage/orderManage/team/index.vue
+++ b/src/views/wms/basicDataManage/orderManage/team/index.vue
@@ -195,7 +195,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await TeamApi.exportTeam(setSearchParams)
+    const data = await TeamApi.exportTeam(tableObject.params)
     download.excel(data, '班组.xls')
   } catch {
   } finally {
diff --git a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
index 1892c5bc5..9066e2d00 100644
--- a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue
@@ -1,18 +1,22 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Configurationsetting.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="Configurationsetting.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
   <TableHead
-   :HeadButttondata="HeadButttondata" 
-   @button-base-click="buttonBaseClick"
-   :route-name="routeName" 
-   @updataTableColumns="updataTableColumns"
-   @searchFormClick="searchFormClick"
-   :allSchemas="Configurationsetting.allSchemas"
-   />
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :route-name="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Configurationsetting.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -27,23 +31,23 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #strategyType="{row}">
+      <template #strategyType="{ row }">
         <el-button type="primary" link @click="openDetail(row, '策略类型', row.strategyType)">
           <span>{{ formatter(row.strategyType) }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm 
-    ref="basicFormRef" 
-    @success="getList" 
-    :rules="ConfigurationsettingRules" 
-    :formAllSchemas="Configurationsetting.allSchemas" 
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ConfigurationsettingRules"
+    :formAllSchemas="Configurationsetting.allSchemas"
     :apiUpdate="ConfigurationsettingApi.updateConfigurationsetting"
     :apiCreate="ConfigurationsettingApi.createConfigurationsetting"
     :isBusiness="false"
@@ -53,7 +57,12 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Configurationsetting.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/configurationsetting/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/configurationsetting/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
@@ -62,7 +71,7 @@ import * as ConfigurationsettingApi from '@/api/wms/configurationsetting'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import { Configurationsetting, ConfigurationsettingRules } from './configurationsetting.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
@@ -91,12 +100,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:configurationsetting:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:configurationsetting:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:configurationsetting:export'}), // 导出
-  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultAddBtn({ hasPermi: 'wms:configurationsetting:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'wms:configurationsetting:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:configurationsetting:export' }), // 导出
+  defaultButtons.defaultFreshBtn(null), //刷新
   defaultButtons.defaultFilterBtn(null), //筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -107,34 +116,42 @@ const HeadButttondata = [
   // },
 ]
 
-// 头部按钮事件 
+// 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮 
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:configurationsetting:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:configurationsetting:delete'}), // 删除
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:configurationsetting:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:configurationsetting:delete' }) // 删除
 ]
 
-// 列表-操作按钮事件 
+// 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     // const res = await ConfigurationsettingApi.getItempackaging(row.id)
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
   }
 }
@@ -144,6 +161,18 @@ const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
+// form表单提交
+const formsSuccess = async (formType, data) => {
+  if (formType === 'create') {
+    await ConfigurationsettingApi.createConfigurationsetting(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ConfigurationsettingApi.updateConfigurationsetting(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
 
 /** 详情操作 */
 const detailRef = ref()
@@ -203,12 +232,12 @@ const searchFormClick = (searchData) => {
   }
   getList() // 刷新当前列表
 }
-const formatter = (type)=>{
- let str =  getStrDictOptions(DICT_TYPE.STRATEGY_TYPE).filter(item=>type==item.value)[0].label;
- return str
+const formatter = (type) => {
+  let str = getStrDictOptions(DICT_TYPE.STRATEGY_TYPE).filter((item) => type == item.value)[0].label
+  return str
 }
 /** 初始化 **/
-onMounted(async() => {
+onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await ConfigurationsettingApi.importTemplate()
 })
diff --git a/src/views/wms/basicDataManage/strategySetting/rule/index.vue b/src/views/wms/basicDataManage/strategySetting/rule/index.vue
index 4919b8aee..82a6140e3 100644
--- a/src/views/wms/basicDataManage/strategySetting/rule/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/rule/index.vue
@@ -1,18 +1,22 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Rule.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="Rule.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
   <TableHead
-   :HeadButttondata="HeadButttondata" 
-   @button-base-click="buttonBaseClick"
-   :route-name="routeName" 
-   @updataTableColumns="updataTableColumns"
-   @searchFormClick="searchFormClick"
-   :allSchemas="Rule.allSchemas"
-   />
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :route-name="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="Rule.allSchemas"
+  />
 
   <!-- 列表 -->
   <ContentWrap>
@@ -27,23 +31,23 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #strategyCode="{row}">
+      <template #strategyCode="{ row }">
         <el-button type="primary" link @click="openDetail(row, '策略代码', row.strategyCode)">
           <span>{{ row.strategyCode }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <BasicForm 
-    ref="basicFormRef" 
-    @success="getList" 
-    :rules="RuleRules" 
-    :formAllSchemas="Rule.allSchemas" 
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="RuleRules"
+    :formAllSchemas="Rule.allSchemas"
     :apiUpdate="RuleApi.updateRule"
     :apiCreate="RuleApi.createRule"
     :isBusiness="false"
@@ -53,7 +57,12 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="Rule.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/rule/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm
+    ref="importFormRef"
+    url="/wms/rule/import"
+    :importTemplateData="importTemplateData"
+    @success="importSuccess"
+  />
 </template>
 
 <script setup lang="ts">
@@ -62,7 +71,7 @@ import * as RuleApi from '@/api/wms/rule'
 import BasicForm from '@/components/BasicForm/src/BasicForm.vue'
 import { Rule, RuleRules } from './rule.data'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
-import TableHead from '@/components/TableHead/src/TableHead.vue' 
+import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 
@@ -90,12 +99,12 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:rule:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:rule:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:rule:export'}), // 导出
-  defaultButtons.defaultFreshBtn(null),//刷新
+  defaultButtons.defaultAddBtn({ hasPermi: 'wms:rule:create' }), // 新增
+  defaultButtons.defaultImportBtn({ hasPermi: 'wms:rule:import' }), // 导入
+  defaultButtons.defaultExportBtn({ hasPermi: 'wms:rule:export' }), // 导出
+  defaultButtons.defaultFreshBtn(null), //刷新
   defaultButtons.defaultFilterBtn(null), //筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -106,34 +115,42 @@ const HeadButttondata = [
   // },
 ]
 
-// 头部按钮事件 
+// 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮 
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:rule:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:rule:delete'}), // 删除
+  defaultButtons.mainListEditBtn({ hasPermi: 'wms:rule:update' }), // 编辑
+  defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:rule:delete' }) // 删除
 ]
 
-// 列表-操作按钮事件 
+// 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     // const res = await RuleApi.getItempackaging(row.id)
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
   }
 }
@@ -143,6 +160,18 @@ const basicFormRef = ref()
 const openForm = (type: string, row?: any) => {
   basicFormRef.value.open(type, row)
 }
+// form表单提交
+const formsSuccess = async (formType, data) => {
+  if (formType === 'create') {
+    await RuleApi.createRule(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await RuleApi.updateRule(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
 
 /** 详情操作 */
 const detailRef = ref()
@@ -204,8 +233,7 @@ const searchFormClick = (searchData) => {
 }
 
 /** 初始化 **/
-onMounted(async() => {
+onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await RuleApi.importTemplate()
 })
 </script>
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts b/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts
index 010d268a4..f1e6fd953 100644
--- a/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts
+++ b/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts
@@ -14,6 +14,7 @@ export const Rule = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
       fixed: 'left'
     },
+    isSearch:true
   },
   {
     label: '优先级',
@@ -36,6 +37,7 @@ export const Rule = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch:true
   },
   {
     label: '名称',
@@ -44,6 +46,7 @@ export const Rule = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch:true
   },
   {
     label: '条件',