Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/api/Pricesystem/index.js

@@ -91,11 +91,11 @@ export const putBasicdataPrice = data => {
  * 获取价格路径列表
  * @returns
  */
-export const getPage = data => {
+export const getPage = params => {
   return request({
     url: '/api/logpm-basicdata/priceRoute/page',
     method: 'get',
-    data,
+    params,
   });
 };
 
@@ -104,8 +104,9 @@ export const getPage = data => {
  * @returns
  */
 export const getDetails = data => {
+  console.log('data :>> ', data);
   return request({
-    url: `/api/logpm-basicdata/priceRoute/${data.id}`,
+    url: `/api/logpm-basicdata/priceRoute/${data}`,
     method: 'get',
   });
 };
@@ -126,9 +127,10 @@ export const postSubmit = data => {
  * 删除
  * @returns
  */
-export const postRemove = data => {
+export const postRemove = params => {
   return request({
     url: `/api/logpm-basicdata/priceRoute/remove`,
     method: 'post',
+    params,
   });
 };

src/views/Pricesystem/Price/PriceBill.vue

@@ -221,19 +221,20 @@
 
       <tablecmt
         class="tableNode"
+        ref="tableNode"
         :columnList="details.columnList"
         :tableData="details.data"
         :loading="details.loadingObj.list"
       >
         <template #default="slotProps">
           <template v-if="slotProps.scope.column.label === '操作'">
-            <el-text @click="() => handlePlusVehicle(slotProps.scope)"
+            <el-text class="button" @click="() => handleEdit(slotProps.scope)"
               ><el-icon>
                 <CirclePlus />
               </el-icon>
               编 辑
             </el-text>
-            <el-text class="remove" @click="() => handlePlusVehicle(slotProps.scope)">
+            <el-text class="button remove" @click="() => handleRemoveLine(slotProps.scope)">
               <el-icon>
                 <Delete />
               </el-icon>
@@ -262,7 +263,7 @@
   </div>
 
   <el-dialog
-    title="新增提货路径"
+    :title="details.lineType === 'add' ? '新增提货路径' : '编辑提货路径'"
     :visible.sync="details.popUpShow.addVsitied"
     width="70%"
     v-model="details.popUpShow.addVsitied"
@@ -305,12 +306,17 @@
       <el-form-item label="发货单位">
         <el-select
           class="w100"
-          v-model="details.form.sendOrgId"
+          v-model="details.form.sendOrg"
           filterable
           clearable
           placeholder="请选择发货单位"
           style="width: 240px"
           :loading="details.loadingObj.loading"
+          @change="
+            () => {
+              details.form.sendOrgId = details.form.sendOrg;
+            }
+          "
           remote
           reserve-keyword
           default-first-option
@@ -510,10 +516,16 @@
 <script setup lang="ts">
 import { ref, reactive, getCurrentInstance, nextTick } from 'vue';
 import { getLazyTreeAll } from '@/api/base/region';
-import { debounce, deepClone } from '@/utils/util';
+import { debounce, deepClone, setNodeHeight } from '@/utils/util';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { getDictionaryBiz } from '@/api/system/dict';
-import { putBasicdataPrice, getPage, postSubmit } from '@/api/Pricesystem/index';
+import {
+  putBasicdataPrice,
+  getPage,
+  postSubmit,
+  postRemove,
+  getDetails,
+} from '@/api/Pricesystem/index';
 import { useRoute } from 'vue-router';
 import { getList } from '@/api/basicdata/basicClient';
 const $route = useRoute(); //获取地址栏参数
@@ -619,36 +631,36 @@ const details = reactive({
     //   fixed: true,
     // },
     {
-      prop: 'name',
+      prop: 'startCountyName',
       label: '始发地',
       type: 1,
       values: '',
       width: '150',
       checkarr: [],
       fixed: false,
-      sortable: true,
+      // sortable: true,
       head: false,
     },
     {
-      prop: 'name',
+      prop: 'endCountyName',
       label: '目的地',
       type: 1,
       values: '',
       width: '150',
       checkarr: [],
       fixed: false,
-      sortable: true,
+      // sortable: true,
       head: false,
     },
     {
-      prop: 'name',
+      prop: 'sendOrgName',
       label: '发货单位',
       type: 1,
       values: '',
       width: '150',
       checkarr: [],
       fixed: false,
-      sortable: true,
+      // sortable: true,
       head: false,
     },
     {
@@ -659,7 +671,6 @@ const details = reactive({
       width: '150',
       checkarr: [],
       fixed: false,
-      sortable: false,
       head: false,
     },
   ],
@@ -676,8 +687,14 @@ const details = reactive({
   },
   /** 发货单位数组 */
   sendOrgArr: [],
+  /** 省市区 */
+  regionOptione: [],
+  /** 提货路线type */
+  lineType: 'add' as 'add' | 'edit',
 });
 
+const tableNode = ref();
+
 const validatePrice = (rule: any, value: any, callback: any) => {
   const message = '请输入大于0的费用';
 
@@ -692,13 +709,6 @@ const validatePrice = (rule: any, value: any, callback: any) => {
   }
 };
 
-// 获取省市区信息
-getLazyTreeAll().then(res => {
-  if (res.data.success) {
-    details.regionOptione = res.data.data;
-  }
-});
-
 /** 处理干线计费模式 */
 const handleTrunkLinePricingType = response => {
   const { code, data } = response.data;
@@ -842,7 +852,15 @@ const initDictionaryBiz = async () => {
       details.form.additionalCost = 0;
 
       // 不按统一区域计费, 初始化获取数据
-      if (details.form.pickupIsUnifyAreaBill === '0') initLineData();
+      if (details.form.pickupIsUnifyAreaBill === '0') {
+        // 获取省市区信息
+        const res = await getLazyTreeAll();
+        if (res.data.success) {
+          details.regionOptione = res.data.data || [];
+        }
+
+        initLineData();
+      }
     }
 
     // 处理干线
@@ -904,12 +922,81 @@ const handleCheckVehicleType = () => {
   }
 };
 
+/** 转译始发地和目的地
+ * @param {Array} 循环数组
+ * @param {String} province 省
+ * @param {String} city 市
+ * @param {String} region 区
+ */
+const handleTranslation = (province, city, region) => {
+  console.log('province, city, region :>> ', province, city, region);
+
+  let name = '';
+
+  for (let i = 0; i < details.regionOptione.length; i++) {
+    const value = details.regionOptione[i];
+
+    if (value.value !== province + '') continue;
+    name += value.label;
+
+    if (!value.children || value.children.length === 0) return name;
+
+    for (let index = 0; index < value.children.length; index++) {
+      const element = value.children[index];
+
+      if (element.value !== city + '') continue;
+      name += '/' + element.label;
+
+      if (!element.children || element.children.length === 0) return name;
+
+      for (let j = 0; j < element.children.length; j++) {
+        const item = element.children[j];
+
+        if (item.value === region + '') {
+          name += '/' + item.label;
+          break;
+        }
+      }
+      break;
+    }
+    break;
+  }
+
+  return name;
+};
+
 /** 获取提货路径数据 */
 const initLineData = async () => {
+  setNodeHeight(tableNode.value.$el, '70vh');
+
   try {
     details.loadingObj.list = true;
 
-    const res = await getPage({ ...details.page });
+    const res = await getPage({ ...details.page, priceId: $route.query.id });
+    const { code, data } = res.data;
+
+    if (code !== 200) return;
+
+    details.data = data.records;
+
+    for (let i = 0; i < details.data.length; i++) {
+      const value = details.data[i];
+
+      value.startCountyName = handleTranslation(
+        value.startProvinceId,
+        value.startCityId,
+        value.startCountyId
+      );
+      value.endCountyName = handleTranslation(
+        value.endProvinceId,
+        value.endCityId,
+        value.endCountyId
+      );
+    }
+
+    console.log('details.data :>> ', details.data);
+
+    details.page.total = data.total;
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
@@ -931,12 +1018,12 @@ const currentChange = current => {
 };
 
 /** 城市改变 */
-const handleChangeCity = (CascaderValue: any[] | null, type: 'strat' | 'end') => {
+const handleChangeCity = (CascaderValue: any[] | null, type: 'start' | 'end') => {
   console.log('CascaderValue :>> ', CascaderValue);
 
   // 赋值
   switch (type) {
-    case 'strat':
+    case 'start':
       if (!CascaderValue) {
         details.form.startProvinceId = ''; // 省
         details.form.startCityId = ''; // 市
@@ -987,6 +1074,10 @@ const handleChangeCity = (CascaderValue: any[] | null, type: 'strat' | 'end') =>
 
 /** 新增提货路径 */
 const handleAdd = () => {
+  handleVehicleTypeStatus();
+
+  details.lineType = 'add';
+
   details.VehicleBillingDetal = [
     {
       /** 车型 */
@@ -999,6 +1090,109 @@ const handleAdd = () => {
   details.popUpShow.addVsitied = true;
 };
 
+/** 给form赋值 */
+const initAssignmentForm = data => {
+  details.form.startCity = [
+    ...new Set([data.startProvinceId + '', data.startCityId + '', data.startCountyId + '']),
+  ];
+  details.form.endCity = [
+    ...new Set([data.endProvinceId + '', data.endCityId + '', data.endCountyId + '']),
+  ];
+  details.form.sendOrgId = data.sendOrgId;
+  details.form.sendOrg = data.sendOrgName;
+  details.form.priceId = data.priceId;
+
+  details.form.minCost = data.minCost || 0;
+  details.form.additionalCost = data.additionalCost || 0;
+
+  // 车辆赋值
+  details.VehicleBillingDetal = data.fullVehicle || [];
+
+  for (let i = 0; i < details.VehicleBillingDetal.length; i++) {
+    const value = details.VehicleBillingDetal[i];
+
+    value.vehicleType += '';
+  }
+
+  const _billTemplateDetailArr = [];
+
+  // 品类赋值
+  for (let i = 0; i < details.form.billTemplateDetail.length; i++) {
+    const value = details.form.billTemplateDetail[i];
+    const _itemObj = {
+      title: value.dictValue + '计费品类',
+      code: value.dictKey,
+      categories: [
+        {
+          title: '',
+          categoryId: '',
+          goods: '',
+          price: 0,
+        },
+      ],
+    };
+
+    const _arr = [];
+
+    for (let i = 0; i < value.categories.length; i++) {
+      const item = value.categories[i];
+
+      const Arr =
+        value.code === '1'
+          ? // 按件
+            data.pieceCategory
+          : value.code === '3'
+          ? // 按方
+            data.cubeCategory
+          : // 按重量
+            data.weightCategory;
+      if (!Arr || Arr.length === 0) break;
+
+      for (let index = 0; index < Arr.length; index++) {
+        const val = Arr[index];
+        if (val.categoryId !== item.categoryId) continue;
+        item.price = val.price;
+      }
+    }
+  }
+};
+
+/** 编辑提货路径 */
+const handleEdit = async ({ row }) => {
+  try {
+    details.loadingObj.pageLoading = true;
+    details.form = deepClone(details.initForm);
+
+    handleVehicleTypeStatus();
+
+    details.lineType = 'edit';
+    details.VehicleBillingDetal = [
+      {
+        /** 车型 */
+        pickupPricingType: '',
+        /** 车型计费(元/车) */
+        price: 0,
+      },
+    ];
+
+    const res = await getDetails(row.id);
+
+    const { code, data } = res.data;
+    if (code !== 200) return;
+
+    initAssignmentForm(data);
+    details.form.id = row.id;
+
+    console.log('details.form :>> ', details.form);
+
+    details.popUpShow.addVsitied = true;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
+
 /** 查询收货单位 */
 const remoteMethod = async value => {
   try {
@@ -1019,6 +1213,14 @@ const remoteMethod = async value => {
   }
 };
 
+/** 恢复车辆选择状态 */
+const handleVehicleTypeStatus = () => {
+  for (let i = 0; i < details.vehicleTypeArr.length; i++) {
+    const value = details.vehicleTypeArr[i];
+    value.isCheck = false;
+  }
+};
+
 /** 重置数据 */
 const resetFormData = () => {
   ElMessageBox.confirm('是否重置数据?', '提示', {
@@ -1109,21 +1311,27 @@ const handleSubmitLine = () => {
     type: 'success',
   }).then(async () => {
     try {
-      details.loadingObj.pageLoading = true;
+      details.popUpShow.addVsitied = false; // 关闭弹窗
+      details.loadingObj.pageLoading = true; // 开启loading
+
+      console.log('details.form :>> ', details.form);
 
       const submitData: any = {
         startProvinceId: details.form.startProvinceId, // 省
         startCityId: details.form.startCityId, // 市
         startCountyId: details.form.startCountyId, // 区,
         endProvinceId: details.form.endProvinceId, // 省
-        endCityId: details.form.startCityId, // 市
+        endCityId: details.form.endCityId, // 市
         endCountyId: details.form.endCountyId, // 区,
         /** 提货 */
         serviceType: '1',
-        id: $route.query.id,
+        priceId: $route.query.id,
         sendOrgId: details.form.sendOrgId,
       };
 
+      // 如果为编辑提交
+      if (details.lineType === 'edit') submitData.id = details.form.id;
+
       // 是否最低计费
       if (details.form.pickupIsMinCost === '1') {
         submitData.minCost = details.form.minCost;
@@ -1153,6 +1361,10 @@ const handleSubmitLine = () => {
       if (code !== 200) return;
 
       ElMessage.success(msg);
+
+      handleVehicleTypeStatus();
+
+      initLineData();
       console.log('submitData :>> ', submitData);
     } catch (error) {
       console.log('error :>> ', error);
@@ -1162,6 +1374,30 @@ const handleSubmitLine = () => {
   });
 };
 
+/** 删除路径 */
+const handleRemoveLine = ({ row }) => {
+  ElMessageBox.confirm(`确认删除 【${row.startCountyName}】-【${row.endCountyName}】 数据`, '', {
+    confirmButtonText: '删除',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+
+      const res = await postRemove({ ids: row.id });
+      const { code, msg } = res.data;
+      if (code !== 200) return;
+      ElMessage.success(msg);
+
+      initLineData();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
+};
+
 defineExpose({ initDictionaryBiz });
 </script>
 
@@ -1280,6 +1516,7 @@ defineExpose({ initDictionaryBiz });
   background: #0086f1;
   border-color: #0086f1;
   color: #fff !important;
+  cursor: pointer;
 
   &:hover {
     background: #79bbff;
@@ -1292,6 +1529,7 @@ defineExpose({ initDictionaryBiz });
   background: #f85b52;
   border-color: #f85b52;
   color: #fff !important;
+  cursor: pointer;
 
   &:hover {
     background: #f89898;
@@ -1303,7 +1541,7 @@ defineExpose({ initDictionaryBiz });
   width: 100% !important;
 }
 
-:deep(.el-text) {
+:deep(.button.el-text) {
   color: #d3832a !important;
   font-weight: normal;
   cursor: pointer;
@@ -1323,12 +1561,6 @@ defineExpose({ initDictionaryBiz });
   }
 }
 
-:deep(.tableNode thead .el-text) {
-  color: var(--el-text-color-primary) !important;
-  font-weight: bold;
-  cursor: pointer;
-}
-
 .dialog-footer {
   text-align: end;
 }