From a04df14b1865d9a0a113f9a355559e6e7f4ecb3d Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 11 Apr 2024 09:49:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/financialsector/FinanceHome.vue     | 36 +++++++++++++++----
 .../Financialse/FinancialBill.vue             |  6 ++--
 .../Financialse/FinancialTrunkLine.vue        |  1 +
 .../Financialse/FinancialWarehousing.vue      | 11 ++++--
 4 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/src/views/financialsector/FinanceHome.vue b/src/views/financialsector/FinanceHome.vue
index bae199b8..4eba0468 100644
--- a/src/views/financialsector/FinanceHome.vue
+++ b/src/views/financialsector/FinanceHome.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="content_box" v-loading='ServiceTypeLoading'>
+  <div class="content_box" v-loading='pageLoading'>
     <div class="header">
       <!-- 模板名称 -->
       <div class="el_Template">
@@ -79,6 +79,7 @@ import { ref, defineAsyncComponent,reactive, toRefs, computed, onMounted, nextTi
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { $_basicdataBrande,$_InfopriceTemplate} from '@/api/financialsector/index'; //价格模板
 const $route = useRoute(); //获取地址栏参数
+const pageLoading=ref(true);//页面加载效果
 //仓储模板
 const FinancialWarehousing = defineAsyncComponent(() =>
   import('@/views/financialsector/Financialse/FinancialWarehousing.vue')
@@ -99,6 +100,7 @@ const ServiceTypeLoading=ref(true);//菜单加载
 const form = ref({});
 const brand=ref([]);//品牌
 const Tabmenu = ref('仓储');
+const request=ref({});//用于保存会显的值
 const templateInfo = ref({});
 // 菜单列表
 const ServiceList = ref([]);
@@ -119,11 +121,22 @@ function updateDictionary(targetArray, dictionaryType) {
   }
 }).catch(()=>{
 }).finally(()=>{
-  ServiceTypeLoading.value=false;
+ServiceTypeLoading.value=false;
 });
 }
+
+// 循环渲染菜单
+  async function executeCheckedResults(results) {
+  for (const res of results) {
+  await new Promise(resolve => setTimeout(resolve, 500));
+  await isChecked(res);
+  await provideData()
+  }
+  pageLoading.value=false;
+}
 // 页面初始化必要请求
-const onLoad=()=>{
+const onLoad= async()=>{
+ await updateDictionary(ServiceList.value,'service_type');//菜单加载
   if($route.query.id){
     let data={
       id:$route.query.id
@@ -131,13 +144,16 @@ const onLoad=()=>{
     $_InfopriceTemplate(data).then(res=>{
       console.log(res,'获取详情');
       if(res.data.code == 200){
-        form.value=res.data.data
+        request.value=res.data.data;//发送回显数据
+        form.value.brand=res.data.data.brandId||'';//品牌
+        form.value.TemplateName=res.data.data.name||'';//模板名称
+        form.value.ServiceType= res.data.data.serviceType.split(",")||[];//服务类型
+        const result = ServiceList.value.filter(item => form.value.ServiceType.includes(item.value));
+        // 激活菜单设置为已经存在的
+        executeCheckedResults(result);
       }
     })
   }
-
-
-  updateDictionary(ServiceList.value,'service_type');//菜单加载
   let data={
     current:1,
     size:1000,
@@ -152,8 +168,11 @@ const onLoad=()=>{
 onLoad()
 // 点击菜单
 const isChecked = val => {
+  console.log(val,'val');
   //菜单隐藏/显示
   val.state = !val.state;
+  val.check=!val.check;
+  // 激活菜单设置为已经存在的
   //设置激活菜单
   Tabmenu.value = val.label;
   // 如果当前菜单被关闭则显示最新菜单
@@ -179,6 +198,9 @@ const provideData = (data) => {
   if(data){
     templateInfo.value.code=data;//接收来自子页面第一次保存的返回值
   }
+  if($route.query.id){
+    templateInfo.value.request=request.value;//发送回显数据
+  }
 };
 </script>
 
diff --git a/src/views/financialsector/Financialse/FinancialBill.vue b/src/views/financialsector/Financialse/FinancialBill.vue
index 85075e5f..3ae64498 100644
--- a/src/views/financialsector/Financialse/FinancialBill.vue
+++ b/src/views/financialsector/Financialse/FinancialBill.vue
@@ -269,11 +269,11 @@ const details = reactive({
     /** 计价方式 */
     pickupPricingType: [],
     /** 是否统一区域计费 */
-    pickupIsUnifyAreaBill: '1',
+    pickupIsUnifyAreaBill: '0',
     /** 是否区分品类 */
-    pickupIsByCategory: '1',
+    pickupIsByCategory: '0',
     /** 是否最低计费 */
-    pickupIsMinCost: '1',
+    pickupIsMinCost: '0',
     /** 最低计费类型 */
     pickupMinCostType: '1',
     /** 计费模版详情 */
diff --git a/src/views/financialsector/Financialse/FinancialTrunkLine.vue b/src/views/financialsector/Financialse/FinancialTrunkLine.vue
index 2f2ebb6e..c92ec7db 100644
--- a/src/views/financialsector/Financialse/FinancialTrunkLine.vue
+++ b/src/views/financialsector/Financialse/FinancialTrunkLine.vue
@@ -402,6 +402,7 @@ const initDictionaryBiz = async () => {
 
 initDictionaryBiz();
 
+
 /** 新增品类 */
 const handlePlus = async (value: any, index: number) => {
   value.categories.splice(index + 1, 0, {
diff --git a/src/views/financialsector/Financialse/FinancialWarehousing.vue b/src/views/financialsector/Financialse/FinancialWarehousing.vue
index 48690c13..355a9674 100644
--- a/src/views/financialsector/Financialse/FinancialWarehousing.vue
+++ b/src/views/financialsector/Financialse/FinancialWarehousing.vue
@@ -456,7 +456,7 @@ function updateDictionary(targetArray, dictionaryType) {
         if (res.data.data.length) {
           res.data.data.forEach(item => {
             targetArray.push({
-              value: item.dictKey,
+              value: Number(item.dictKey),
               label: item.dictValue,
               id: item.id,
             });
@@ -474,12 +474,19 @@ function updateDictionary(targetArray, dictionaryType) {
     .finally(() => {});
 }
 // 页面初始化必要请求
-const onLoad = () => {
+const onLoad = async() => {
   updateDictionary(Storagebillingtype.value, 'warehouse_pricing_type'); //仓储计费类型
   updateDictionary(Warehousebillingmode.value, 'warehouse_pricing_mode'); //仓储计费模式
   updateDictionary(CalculationBasis.value, 'warehouse_calculation_basis'); //计算基准
   updateDictionary(Distinguishcategories.value, 'price_yes_no'); //是否区分品类
   updateDictionary(Surchargepricingunit.value, 'warehouse_pricing_unit'); //附加费计价单位
+if(props.templateData.request){
+  // 执行回显
+  form.value=props.templateData.request
+}
+
+
+
 };
 onLoad();
 // 新增