冲突解决

src/api/Pricesystem/index.js

@@ -74,3 +74,61 @@ export const $_tempDelpriceTemplate = params => {
     params,
   });
 };
+
+/**
+ * 修改基础价格
+ * @returns
+ */
+export const putBasicdataPrice = data => {
+  return request({
+    url: '/api/logpm-basicdata/basicdataPrice',
+    method: 'put',
+    data,
+  });
+};
+
+/**
+ * 获取价格路径列表
+ * @returns
+ */
+export const getPage = data => {
+  return request({
+    url: '/api/logpm-basicdata/priceRoute/page',
+    method: 'get',
+    data,
+  });
+};
+
+/**
+ * 获取价格路径详情
+ * @returns
+ */
+export const getDetails = data => {
+  return request({
+    url: `/api/logpm-basicdata/priceRoute/${data.id}`,
+    method: 'get',
+  });
+};
+
+/**
+ * 提交路径
+ * @returns
+ */
+export const postSubmit = data => {
+  return request({
+    url: `/api/logpm-basicdata/priceRoute/submit`,
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 删除
+ * @returns
+ */
+export const postRemove = data => {
+  return request({
+    url: `/api/logpm-basicdata/priceRoute/remove`,
+    method: 'post',
+  });
+};

src/option/waybill/TemporaryStorageList.js

@@ -197,7 +197,7 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'legacyStatus',
+    prop: 'legacyStatusName',
     label: '遗留',
     type: 1,
     values: '',
@@ -205,7 +205,6 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: true,
-    isshowSummary: true,
   },
   {
     prop: 'customerName',

src/views/Pricesystem/PricesyHome.vue

@@ -5,7 +5,9 @@
       <el-tabs type="border-card" v-model="Tabmenu">
         <template v-for="item in ServiceList" :key="item.label">
           <el-tab-pane :name="item.label" v-if="item.state" :label="item.label">
-            <span v-if="item.label == '提货'"><FinancialBill /></span>
+            <span v-if="item.label == '提货'"
+              ><FinancialBill ref="financialBill" :templateData="templateInfo"
+            /></span>
             <span v-if="item.label == '干线'"
               ><FinancialTrunkLine @request-data="provideData" :templateData="templateInfo"
             /></span>
@@ -30,6 +32,7 @@ import { $_basicdataBrande } from '@/api/financialsector/index'; //价格模板
 import { $_InfopriceTemplate as getInfo } from '@/api/Pricesystem/index.js';
 import { $_InfopriceTemplate } from '@/api/financialsector/index.js';
 import { useRoute } from 'vue-router';
+import { nextTick } from 'vue';
 
 const $route = useRoute();
 
@@ -57,7 +60,7 @@ const ServiceList = ref([]);
 /** 车辆类型 */
 const VehicleTypeList = ref([]);
 
-const request = ref({}); //用于保存会显的值
+const financialBill = ref();
 
 // 字典公共函数
 function updateDictionary(targetArray, dictionaryType) {
@@ -80,9 +83,11 @@ function updateDictionary(targetArray, dictionaryType) {
 
 // 循环渲染菜单
 async function executeCheckedResults(results) {
+  console.log('results :>> ', results);
+
   await nextTick();
   for (const res of results) {
-    await isChecked(res, false, false);
+    await isChecked(res, false);
     await provideData();
   }
   pageLoading.value = false;
@@ -123,21 +128,27 @@ const onLoad = async () => {
     let data = {
       id: $route.query.templateId,
     };
-    $_InfopriceTemplate(data).then(res => {
+    $_InfopriceTemplate(data).then(async res => {
       const { code, data } = res.data;
 
       if (code !== 200 || !data) return;
 
       console.log(res, '获取详情');
-      request.value = data; //发送回显数据
       form.value.TemplateName = data.name || ''; //模板名称
       form.value.ServiceType = data.serviceType.split(',') || []; //服务类型
       form.value.request=data
+      form.value.request = data;
       console.log('form.value.ServiceType :>> ', form.value.ServiceType);
       const result = ServiceList.value.filter(item => form.value.ServiceType.includes(item.value));
 
       // 激活菜单设置为已经存在的
       executeCheckedResults(result);
+
+      await nextTick();
+      setTimeout(() => {
+        console.log('financialBill :>> ', financialBill);
+        financialBill.value[0].initDictionaryBiz();
+      }, 1000);
     });
   } catch (error) {
     console.log('error :>> ', error);

src/views/financialsector/Financialse/FinancialBill.vue

@@ -51,6 +51,7 @@
       </el-form-item>
     </el-form>
 
+    <!-- 品类管理 -->
     <template v-if="details.form.pickupIsByCategory === '1'">
       <el-divider content-position="left">品类管理</el-divider>
 

src/views/waybill/TemporaryStorageList.vue

@@ -881,6 +881,12 @@ const onLoad = async (params = {} as any, isRefresh?: boolean) => {
     if (code !== 200) return;
     const _arr = [...details.selectionList];
 
+    for (let i = 0; i < data.records.length; i++) {
+      const value = data.records[i];
+
+      value.legacyStatusName = Number(value.legacyStatus) ? '是' : '否';
+    }
+
     if (status === 'haveData') details.haveDataData = data.records;
     else details.notHaveDataData = data.records;
     details.page.total = data.total;