From 19ab4206b6916b7f41da6fae9513f2db9f74e679 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Mon, 4 Mar 2024 15:52:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=AF=BC=E5=87=BAapi?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/scrapJobMain/index.ts                |  8 +++++++-
 src/api/wms/scrapRecordMain/index.ts             |  8 +++++++-
 src/api/wms/strategy/index.ts                    | 16 ++++++++++++++--
 .../strategy/purchaseReceiptStrategy/AddForm.vue | 16 ++++++++++++++++
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/api/wms/scrapJobMain/index.ts b/src/api/wms/scrapJobMain/index.ts
index bcdd51ea8..e4b0dfa1e 100644
--- a/src/api/wms/scrapJobMain/index.ts
+++ b/src/api/wms/scrapJobMain/index.ts
@@ -70,7 +70,13 @@ export const deleteScrapJobMain = async (id: number) => {
 
 // 导出报废出库任务主 Excel
 export const exportScrapJobMain = async (params) => {
-  return await request.download({ url: `/wms/scrap-job-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/scrap-job-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/scrap-job-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/scrapRecordMain/index.ts b/src/api/wms/scrapRecordMain/index.ts
index bd1caffc3..1efab607d 100644
--- a/src/api/wms/scrapRecordMain/index.ts
+++ b/src/api/wms/scrapRecordMain/index.ts
@@ -56,7 +56,13 @@ export const deleteScrapRecordMain = async (id: number) => {
 
 // 导出报废出库记录主 Excel
 export const exportScrapRecordMain = async (params) => {
-  return await request.download({ url: `/wms/scrap-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/scrap-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/scrap-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
diff --git a/src/api/wms/strategy/index.ts b/src/api/wms/strategy/index.ts
index a4e235bb1..d10cd5108 100644
--- a/src/api/wms/strategy/index.ts
+++ b/src/api/wms/strategy/index.ts
@@ -12,7 +12,13 @@ export interface StrategyVO {
 
 // 查询策略列表
 export const getStrategyPage = async (params) => {
-  return await request.get({ url: `/wms/strategy/page`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/strategy/senior', data })
+  } else {
+    return await request.get({ url: `/wms/strategy/page`, params })
+  }
 }
 
 // 查询策略详情
@@ -37,5 +43,11 @@ export const deleteStrategy = async (id: number) => {
 
 // 导出策略 Excel
 export const exportStrategy = async (params) => {
-  return await request.download({ url: `/wms/strategy/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/strategy/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/strategy/export-excel`, params })
+  }
 }
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
index b506b0325..5fa1c86c1 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue
@@ -126,6 +126,9 @@
           <div class="title">规则配置</div>
           <el-row gutter="10">
             <el-col :span="24">
+              <el-form-item label="不拆分">
+                <el-switch  v-model="formData.configuration.NotGroup"  active-value="TRUE" inactive-value="FALSE" chang = "changeGroup"/>
+              </el-form-item>
               <!-- 按零件拆分 -->
               <el-form-item  label="按零件拆分">
                 <el-switch v-model="formData.configuration.ByItem"  active-value="TRUE" inactive-value="FALSE"/>
@@ -161,6 +164,7 @@ import { getSupplierList } from '@/api/wms/supplier'
 import * as RuleApi from '@/api/wms/rule'
 import { object } from 'vue-types'
 import { isString } from '@/utils/is'
+import { log } from 'console';
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -188,6 +192,8 @@ const formData = ref({
     { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }
   ],
   configuration: {
+    // 不拆分
+    NotGroup: 'FALSE',
     // 按零件拆分
     ByItem: 'FALSE',
     // 按库位拆分
@@ -276,6 +282,14 @@ const changeSupplierType = (e) => {
   getFormSupplierList()
 }
 
+const changeGroup = () =>{
+  console.log(formData.configuration.NotGroup.value);
+  if(formData.configuration.NotGroup.value = "TRUE"){
+    formData.configuration.ByItem.value = "FALSE"
+    formData.configuration.ByLocation.value = "FALSE"
+    formData.configuration.ByContainer.value = "FALSE"
+  }
+}
 getFormSupplierList()
 
 /** 打开弹窗 */
@@ -416,6 +430,8 @@ const resetForm = () => {
       { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }
     ],
     configuration: {
+      // 不拆分
+      NotGroup: 'FALSE',
       // 按零件拆分
       ByItem: 'FALSE',
       // 按库位拆分