修复部分bug

src/api/finance/CustomerSettlement.js

@@ -7,7 +7,7 @@ import request from '@/axios';
  */
 export const postPageList = data => {
   return request({
-    url: '/api/logpm-statisticsdata-zhy/merchantBalance/pageList',
+    url: '/api/logpm-statisticsdata/merchantBalance/pageList',
     method: 'post',
     data,
   });
@@ -20,7 +20,7 @@ export const postPageList = data => {
  */
 export const postCheckBalance = data => {
   return request({
-    url: '/api/logpm-statisticsdata-zhy/merchantStatistics/checkBalance',
+    url: '/api/logpm-statisticsdata/merchantStatistics/checkBalance',
     method: 'post',
     data,
   });

src/api/finance/MerchantDepositSlip.js

@@ -7,7 +7,7 @@ import request from '@/axios';
  */
 export const postPageList = data => {
   return request({
-    url: '/api/logpm-statisticsdata-zhy/merchantStatistics/pageList',
+    url: '/api/logpm-statisticsdata/merchantStatistics/pageList',
     method: 'post',
     data,
   });
@@ -20,8 +20,20 @@ export const postPageList = data => {
  */
 export const postCheckBalance = data => {
   return request({
-    url: '/api/logpm-statisticsdata-zhy/merchantStatistics/checkBalance',
+    url: '/api/logpm-statisticsdata/merchantStatistics/checkBalance',
     method: 'post',
     data,
   });
 };
+
+/**
+ * 计算仓储&配送费用
+ * @param {*} data
+ * @returns
+ */
+export const postReal = data => {
+  return request({
+    url: `/api/logpm-statisticsdata/merchantStatistics/real/${data}`,
+    method: 'patch',
+  });
+};

src/api/finance/SettlementInformation.js

@@ -7,7 +7,7 @@ import request from '@/axios';
  */
 export const postFindBalanceDetail = data => {
   return request({
-    url: '/api/logpm-statisticsdata-zhy/merchantBalance/findBalanceDetail',
+    url: '/api/logpm-statisticsdata/merchantBalance/findBalanceDetail',
     method: 'post',
     data,
   });
@@ -20,7 +20,7 @@ export const postFindBalanceDetail = data => {
  */
 export const postFindRecordList = data => {
   return request({
-    url: '/api/logpm-statisticsdata-zhy/merchantBalance/findRecordList',
+    url: '/api/logpm-statisticsdata/merchantBalance/findRecordList',
     method: 'post',
     data,
   });
@@ -33,7 +33,7 @@ export const postFindRecordList = data => {
  */
 export const postAddBalanceRecord = data => {
   return request({
-    url: '/api/logpm-statisticsdata-zhy/merchantBalance/addBalanceRecord',
+    url: '/api/logpm-statisticsdata/merchantBalance/addBalanceRecord',
     method: 'post',
     data,
   });

src/option/basicdata/TripartiteMaterial.js

@@ -27,7 +27,7 @@ export const columnList = [
   },
   {
     prop: 'category',
-    label: '物料名称',
+    label: '干线结算品类',
     type: 2,
     values: '',
     width: '150',

src/option/distribution/VehicleStowage.js

@@ -15,7 +15,7 @@ export const columnList = [
     fixed: true,
   },
   {
-    prop: 'waybillNo',
+    prop: 'carsNo',
     label: '批次号',
     type: 13,
     values: '',

src/option/finance/MerchantDepositSlip.js

@@ -92,12 +92,23 @@ export const columnList = [
   //   head: false,
   // },
   {
-    prop: 'waybillStatus',
+    prop: 'waybillStatusName',
     label: '运单状态',
     type: 1,
     values: '',
     width: '150',
-    checkarr: [],
+    checkarr: [
+      { label: '未入库', value: '0' },
+      { label: '部分入库', value: '10' },
+      { label: '入库', value: '20' },
+      { label: '部分中转', value: '30' },
+      { label: '中转', value: '40' },
+      { label: '目的仓部分到达', value: '60' },
+      { label: '配送部分装车', value: '70' },
+      { label: '配送装车', value: '80' },
+      { label: '部分签收', value: '90' },
+      { label: '已签收', value: '100' },
+    ],
     fixed: false,
     sortable: true,
     head: false,
@@ -1274,7 +1285,7 @@ export const columnList = [
     label: '操作',
     type: 6,
     values: '',
-    width: '120',
+    width: '200',
     checkarr: [],
     fixed: 'right',
     sortable: false,

src/views/basicdata/TripartiteMaterial/list.vue

@@ -164,16 +164,16 @@
 
         <!-- materialArr -->
         <el-form-item
-          label="结算品类"
+          label="干线结算品类"
           prop="categoryName"
-          :rules="[{ required: true, message: '请选择结算品类', trigger: ['blur', 'change'] }]"
+          :rules="[{ required: true, message: '请选择干线结算品类', trigger: ['blur', 'change'] }]"
         >
           <el-select
             class="w100"
             v-model="details.form.categoryName"
             filterable
             clearable
-            placeholder="请选择结算品类"
+            placeholder="请选择干线结算品类"
             style="width: 240px"
             :loading="loadingObj.loading"
             @change="handleChangeMaterial"

src/views/distribution/artery/TripartiteTransfer.vue

@@ -5,9 +5,9 @@
       <div v-h5uShow="!search">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query" class="header_search">
-          <el-form-item label="网点:">
+          <!-- <el-form-item label="网点:">
             <el-input v-model="query.serviceNumber" placeholder="请选择网点" clearable></el-input>
-          </el-form-item>
+          </el-form-item> -->
 
           <el-form-item label="承运时间:" class="el-times">
             <el-date-picker
@@ -65,9 +65,9 @@
             />
           </el-form-item>
 
-          <el-form-item label="车次号:" class="el-times">
+          <!-- <el-form-item label="车次号:" class="el-times">
             <el-input v-model="query.stockupArea" placeholder="请输入车次号"></el-input>
-          </el-form-item>
+          </el-form-item> -->
 
           <!-- 查询按钮 -->
           <el-form-item class="el-btn">
@@ -929,6 +929,10 @@ const searchHide = () => {
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
   if (index === '') delete details.query[row.prop];
+  if (row.prop === 'carsNo') {
+    details.query.loadCarsNo = index;
+    if (!index && index !== 0) delete details.query[row.prop];
+  }
   onLoad();
 };
 

src/views/distribution/artery/VehicleArrivalManagement.vue

@@ -5,9 +5,9 @@
       <div v-h5uShow="search">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query" class="header_search">
-          <el-form-item label="车次号:">
+          <!-- <el-form-item label="车次号:">
             <el-input v-model="query.serviceNumber" placeholder="请输入车次号" clearable></el-input>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="预计发车:" class="el-times">
             <el-date-picker
               v-model="stockupDate"
@@ -877,6 +877,10 @@ const searchHide = () => {
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
   if (!index && index !== 0) delete details.query[row.prop];
+  if (row.prop === 'carsNo') {
+    details.query.loadCarsNo = index;
+    if (!index && index !== 0) delete details.query[row.prop];
+  }
   onLoad();
 };
 

src/views/distribution/artery/VehicleStowage.vue

@@ -5,9 +5,9 @@
       <div v-h5uShow="!search">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query" class="header_search">
-          <el-form-item label="车次号:">
+          <!-- <el-form-item label="车次号:">
             <el-input v-model="query.serviceNumber" placeholder="请输入车次号" clearable></el-input>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="提货时间:" class="el-times">
             <el-date-picker
               v-model="stockupDate"
@@ -851,7 +851,9 @@ const inputsc = (index, row) => {
   details.query[row.prop] = index;
   if (!index && index !== 0) delete details.query[row.prop];
 
-  if (row.prop === 'waybillNo') {
+  if (row.prop === 'carsNo') {
+    details.query.loadCarsNo = index;
+    if (!index && index !== 0) delete details.query[row.prop];
   }
   initOnload();
 };

src/views/finance/MerchantDepositSlip.vue

@@ -76,6 +76,8 @@
             <template #default="slotProps">
               <template v-if="slotProps.scope.column.label === '操作'">
                 <!-- <el-text @click="handleShowPackageOrderList(slotProps.scope)"> 包明细 </el-text> -->
+                <el-text @click="handleComputedPrice(slotProps.scope)"> 计算费用 </el-text>
+
                 <el-text @click="() => ViewTransactionInformation(slotProps.scope)">
                   异动信息
                 </el-text>
@@ -175,7 +177,8 @@
           >
             <template #default="slotProps">
               <template v-if="slotProps.scope.column.label === '操作'">
-                <!-- <el-text @click="handleShowPackageOrderList(slotProps.scope)"> 包明细 </el-text> -->
+                <el-text @click="handleComputedPrice(slotProps.scope)"> 计算费用 </el-text>
+
                 <el-text @click="() => ViewTransactionInformation(slotProps.scope)">
                   异动信息
                 </el-text>
@@ -220,7 +223,7 @@ import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { postPageList, postCheckBalance } from '@/api/finance/MerchantDepositSlip';
+import { postPageList, postCheckBalance, postReal } from '@/api/finance/MerchantDepositSlip';
 import {
   downloadXls,
   setNodeHeight,
@@ -486,6 +489,30 @@ const handleConfirm = () => {
   });
 };
 
+/** 计算仓储&配送费用 */
+const handleComputedPrice = ({ row }) => {
+  ElMessageBox.confirm('确认计算仓储&配送费用?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+
+      const res = await postReal(row.orderInfoId);
+      const { code, msg } = res.data;
+
+      if (code !== 200) return msg && ElMessage.warning(msg);
+      if (msg) ElMessage.success(msg);
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      onLoad();
+      details.loadingObj.pageLoading = false;
+    }
+  });
+};
+
 /** 导出 */
 const handleExport = () => {
   ElMessageBox.confirm('是否确认导出?', '提示', {