From 99d4fff90c59faf6fe510f1641e066a8fbe5516a Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Mon, 24 Feb 2025 10:51:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E6=A8=A1=E6=9D=BF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=AE=A2=E6=88=B7=E4=BB=B7=E6=A0=BC=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/financialsector/index.js              |  2 +-
 src/views/Pricesystem/ListOfPriceSystems.vue  |  5 ++--
 .../Financialse/FinancialDelivery.vue         | 26 +++++++++++++++----
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/api/financialsector/index.js b/src/api/financialsector/index.js
index 30675f57..8442682f 100644
--- a/src/api/financialsector/index.js
+++ b/src/api/financialsector/index.js
@@ -74,7 +74,7 @@ export const $_tempDelpriceTemplate = params => {
 
 export const $_getexport= params => {
   return request({
-    url: '/api/logpm-basicdata/basicdataPrice//export/v2',
+    url: '/api/logpm-basicdata/basicdataPrice/export/v2',
     method: 'get',
     params,
     responseType: 'blob',
diff --git a/src/views/Pricesystem/ListOfPriceSystems.vue b/src/views/Pricesystem/ListOfPriceSystems.vue
index ce5c5be9..051e0ab0 100644
--- a/src/views/Pricesystem/ListOfPriceSystems.vue
+++ b/src/views/Pricesystem/ListOfPriceSystems.vue
@@ -394,12 +394,12 @@ const exporTemp = () => {
 // 导入模板
 const ImportTemplate = () => {
   uptitle.value='导入模板'
-  importaction.value='/api/logpm-basicdata/basicdataPrice/upload/v2'
+  importaction.value='/api/logpm-basicdata/basicdataPrice/upload/v3'
   dialogTemp.value = true;
 };
 const updateImportTemplate=()=>{
   uptitle.value='更新导入模板'
-  importaction.value='/api/logpm-basicdata/basicdataPrice/upload/upload/v3'
+  importaction.value='/api/logpm-basicdata/basicdataPrice/upload/v3/update'
   dialogTemp.value = true;
 }
 /** 生效时间 -- 生效时间不能大于到期时间 */
@@ -669,6 +669,7 @@ const deletetails = row => {
 /** 设置客户 */
 const handleClient = async row => {
   try {
+    HistoriBt.value = row
     loadstate.value = false;
     details.loadingObj.pageLoading = true;
     let _data = {
diff --git a/src/views/financialsector/Financialse/FinancialDelivery.vue b/src/views/financialsector/Financialse/FinancialDelivery.vue
index 467a6814..210e14ca 100644
--- a/src/views/financialsector/Financialse/FinancialDelivery.vue
+++ b/src/views/financialsector/Financialse/FinancialDelivery.vue
@@ -26,11 +26,11 @@
           <span class="el_table_span name">配送计费模式</span>
           <el-select
             v-model="form.dispatchPricingType"
-            filterable
+            :filterable="form.dispatchIsByCategory"
             placeholder="请选择配送计费模式"
             :popper-append-to-body="false"
             style="width: 100%"
-            multiple
+            :multiple="form.dispatchIsByCategory"
             @remove-tag="removeTag"
             @change="DeliveryType"
           >
@@ -41,7 +41,7 @@
               :label="item.label"
               :value="item.value"
             >
-              <el-checkbox v-model="item.check" @change="isChecked(item)">
+              <el-checkbox v-model="item.check" @change="isChecked(item)" v-if="form.dispatchIsByCategory">
                 {{ item.label }}
               </el-checkbox>
             </el-option>
@@ -599,6 +599,18 @@ const categoryChange = val => {
       loading: false,
     },
   ];
+
+
+  form.dispatchPricingType = [];
+  if(form.dispatchIsByCategory){
+    form.value.dispatchPricingType = [];
+  }else{
+    ServiceList.value.forEach(res => {
+      res.check = false;
+      res.state = false;
+  })
+    form.value.dispatchPricingType = []
+  }
 };
 // 是否最低计费展示
 const MinimumChange = val => {
@@ -1263,7 +1275,7 @@ const handleSubmit = async () => {
     });
     return;
   }
-  if (!form.value.dispatchPricingType.length) {
+  if (!form.value.dispatchPricingType.length && !form.value.dispatchPricingType) {
     ElMessage({
       message: '请选择配送计费模式',
       type: 'warning',
@@ -1274,8 +1286,12 @@ const handleSubmit = async () => {
   form.value.serviceType = props.templateData.ServiceType.join(','); //顶部选择的服务类型
   // 初始化数据
   const Submit = deepClone(form.value); //拷贝一份要提交的数据
+  if(Submit.dispatchPricingType.length){
+    Submit.dispatchPricingType = Submit.dispatchPricingType.join(','); //服务类型处理
+  }else{
+    Submit.dispatchPricingType = Submit.dispatchPricingType;
+  }
 
-  Submit.dispatchPricingType = Submit.dispatchPricingType.join(','); //服务类型处理
 
   // 选择了是否区分品类才进行处理数据
   if (form.value.dispatchIsByCategory) {