From c8a1a2c6fba8983fd33a7edf9d83f847b2e6c450 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 15 Oct 2024 17:58:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
 =?UTF-8?q?=EF=BC=8C=E5=85=B3=E9=97=AD=E5=BC=80=E5=8D=95=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=E5=93=81=E7=B1=BB=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=8C=89=E8=BD=A6=E6=AC=A1=E5=85=A5=E5=BA=93=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=85=B3=E9=97=AD=E5=A4=87=E8=B4=A7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=BA=93=E4=BD=8D=E5=92=8C=E6=89=98=E7=9B=98?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mixins/index.js                           |  2 +-
 .../waybill/WarehousingByTrainNumber.js       |  1 +
 .../ConfigureBillingAndWarehousing/list.vue   |  2 +-
 .../driverArtery/basicdataDriverArteryAdd.vue | 15 ++++++-
 .../distribution/artery/VehicleStowage.vue    |  2 +-
 .../deliverylist/distributionDeliveryList.vue | 17 ++++----
 .../distribution/inventory/CreateOrder.vue    | 40 +++++++++---------
 .../stockup/distributionStockupDiscuss.vue    | 40 +++++++++---------
 .../stockup/distributionStockupMarket.vue     | 42 +++++++++----------
 .../stockup/distributionStockupSelf.vue       | 40 +++++++++---------
 .../waybill/WarehousingByTrainNumber.vue      |  2 +-
 vite.config.js                                | 18 ++++----
 12 files changed, 116 insertions(+), 105 deletions(-)

diff --git a/src/mixins/index.js b/src/mixins/index.js
index 28c42aca..26f9ff39 100644
--- a/src/mixins/index.js
+++ b/src/mixins/index.js
@@ -45,7 +45,7 @@ export default {
             })
             .catch(err => {
               console.log(err);
-              that.$route.push('/login');
+              that.$router.push({ path: '/login' });
               clearInterval(this.refreshTime);
               this.refreshLock = false;
             });
diff --git a/src/option/waybill/WarehousingByTrainNumber.js b/src/option/waybill/WarehousingByTrainNumber.js
index 340c1dbd..151caeec 100644
--- a/src/option/waybill/WarehousingByTrainNumber.js
+++ b/src/option/waybill/WarehousingByTrainNumber.js
@@ -58,6 +58,7 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: true,
+    isshowSummary: true,
   },
   {
     prop: 'warehouseName',
diff --git a/src/views/basicdata/ConfigureBillingAndWarehousing/list.vue b/src/views/basicdata/ConfigureBillingAndWarehousing/list.vue
index 8929a923..d53922c4 100644
--- a/src/views/basicdata/ConfigureBillingAndWarehousing/list.vue
+++ b/src/views/basicdata/ConfigureBillingAndWarehousing/list.vue
@@ -382,7 +382,7 @@ const sizeChange = (pageSize: number) => {
 
 /** 页码改变执行的回调 */
 const currentChange = current => {
-  details.pageNum = current;
+  details.page.pageNum = current;
   onLoad();
 };
 
diff --git a/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue b/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue
index 436e33e7..c0f55f10 100644
--- a/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue
+++ b/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue
@@ -292,13 +292,26 @@ export default {
         {
           label: '承运商',
           prop: 'carrierId',
-          filterable: true,
           type: 'select',
           filterable: true,
           dicUrl: '/api/logpm-basicdata/carrier/dictionary',
           options: [],
           rules: [{ required: true, message: '请选择承运商!', trigger: 'blur' }],
         },
+        {
+          label: '结算渠道',
+          prop: 'settlementChannel',
+          type: 'select',
+          filterable: true,
+          dicUrl: '/api/logpm-basicdata/carrier/dictionary',
+          options: [],
+          rules: [{ required: true, message: '请选择结算渠道!', trigger: 'blur' }],
+        },
+        {
+          label: '结算账号',
+          prop: 'roadOperationLicenseNub',
+          type: 'input',
+        },
         {
           label: '运输协议',
           prop: 'transportationAgreement',
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index ac2b9a44..dfde5561 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -941,7 +941,7 @@ const sizeChange = (pageSize: number) => {
 
 /** 页码改变执行的回调 */
 const currentChange = current => {
-  details.pageNum = current;
+  details.page.pageNum = current;
   onLoad();
 };
 
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index faba5ed0..406b19f3 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <div v-h5uShow="!search">
+      <div v-h5uShow="search">
         <!-- 查询模块 -->
         <el-form class="header_search" :model="query">
           <el-form-item label="配送车次:">
@@ -1009,17 +1009,16 @@ export default {
       this.title = '查看';
       this.view = true;
       this.box = true;
-      if(row.id){
+      if (row.id) {
         getDetail(row.id).then(res => {
-        this.form = res.data.data;
-      });
-      }else{
+          this.form = res.data.data;
+        });
+      } else {
         ElMessage({
-        message: '数据错误，刷新页面重新尝试',
-        type: 'warning',
-      })
+          message: '数据错误，刷新页面重新尝试',
+          type: 'warning',
+        });
       }
-
     },
     handleViewBlank(row) {
       this.$router.push({
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index bb7cddfb..4cf0cb05 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -2335,15 +2335,15 @@ const onLoad = async (idsArr = []) => {
           element.incomeCategoryName = element.incomeCategoryName || '其它';
           element.incomeCategory = element.incomeCategoryName || '其它';
           element.incomeCategoryId = element.incomeCategoryId || '';
-            
-            // 成本结算
+
+          // 成本结算
           element.confirmCostCategoryName = element.costCategoryName || '其它';
           element.confirmCostCategoryId = element.costCategoryId || '';
           element.costCategoryName = element.costCategoryName || '其它';
           element.costCategory = element.costCategoryName || '其它';
           element.costCategoryId = element.costCategoryId || '';
 
-          (!element.incomeCategoryId) && (_flag = true);
+          !element.incomeCategoryId && (_flag = true);
         }
 
         details.package.renderData = handleFilterData(
@@ -2512,7 +2512,7 @@ const onEditLoad = async () => {
         element.incomeCategoryName = element.incomeCategoryName || '其它';
         element.incomeCategory = element.incomeCategoryName || '其它';
         element.incomeCategoryId = element.incomeCategoryId || '';
-        
+
         // 成本结算
         element.confirmCostCategoryName = element.costCategoryName || '其它';
         element.confirmCostCategoryId = element.costCategoryId || '';
@@ -2521,7 +2521,7 @@ const onEditLoad = async () => {
         element.costCategory = element.costCategoryName || '其它';
         element.costCategoryId = element.costCategoryId || '';
 
-        (!element.incomeCategoryId) && (_flag = true);
+        !element.incomeCategoryId && (_flag = true);
       }
 
       details.package.renderData = handleFilterData(
@@ -4395,14 +4395,14 @@ const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number
   // 提货
   if (pickup && template) {
     handleAssignmentItemPricePickUp(value, pickup, template);
-  } else{
-      value.pickupPrice = 0;
-      value.systemPickupChargeType = 1;
-    }
+  } else {
+    value.pickupPrice = 0;
+    value.systemPickupChargeType = 1;
+  }
 
   // 配送
   if (dispatch && template) handleAssignmentItemPriceDispatch(value, dispatch, template);
-  else{ 
+  else {
     value.deliveryPrice = 0;
     value.systemDeliveryChargeType = 1;
   }
@@ -4609,7 +4609,7 @@ const handleShow = async () => {
 const handleBatchEdit = () => {
   ElMessageBox.confirm('此操作将批量修改结算品类, 是否继续?', '提示', {
     confirmButtonText: '修改收入品类',
-    cancelButtonText: '修改成本品类',
+    cancelButtonText: '取消',
   })
     .then(() => {
       for (let i = 0; i < details.package.selectionList.length; i++) {
@@ -4623,16 +4623,14 @@ const handleBatchEdit = () => {
       }
     })
     .catch(() => {
-      for (let i = 0; i < details.package.selectionList.length; i++) {
-        const value = details.package.selectionList[i];
-
-        // 成本
-        value.costCategoryId = details.package.incomeCategoryId || '';
-        value.costCategoryName = details.package.incomeCategoryName || '其它';
-        value.costCategory = details.package.incomeCategoryName || '其它';
-
-        value.MaintenanceOrNot = value.incomeCategoryId && value.costCategoryId ? '是' : '否';
-      }
+      // for (let i = 0; i < details.package.selectionList.length; i++) {
+      //   const value = details.package.selectionList[i];
+      //   // 成本
+      //   value.costCategoryId = details.package.incomeCategoryId || '';
+      //   value.costCategoryName = details.package.incomeCategoryName || '其它';
+      //   value.costCategory = details.package.incomeCategoryName || '其它';
+      //   value.MaintenanceOrNot = value.incomeCategoryId && value.costCategoryId ? '是' : '否';
+      // }
     });
 };
 
diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue
index e7550a97..081c53b5 100644
--- a/src/views/distribution/stockup/distributionStockupDiscuss.vue
+++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue
@@ -451,16 +451,16 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'stockipAllocation',
-          label: '所在库位',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'stockipAllocation',
+        //   label: '所在库位',
+        //   type: 2,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         // {
         //   prop: 'goodsAreaId',
         //   label: '备货区编号',
@@ -492,16 +492,16 @@ export default {
           fixed: false,
           sortable: true,
         },*/
-        {
-          prop: 'pallet',
-          label: '所在托盘',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'pallet',
+        //   label: '所在托盘',
+        //   type: 2,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'fixTime',
           label: '确认完成备货时间',
diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue
index 5e49948d..26662383 100644
--- a/src/views/distribution/stockup/distributionStockupMarket.vue
+++ b/src/views/distribution/stockup/distributionStockupMarket.vue
@@ -23,7 +23,7 @@
                 start-placeholder="开始时间"
                 end-placeholder="结束时间"
                 :shortcuts="shortcuts"
-              :default-time="defaultTime2"
+                :default-time="defaultTime2"
               />
             </el-form-item>
             <el-form-item style="margin-left: 24px" label="客户名称">
@@ -459,16 +459,16 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'stockipAllocation',
-          label: '所在库位',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'stockipAllocation',
+        //   label: '所在库位',
+        //   type: 2,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         // {
         //   prop: 'goodsAreaId',
         //   label: '备货区编号',
@@ -500,16 +500,16 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        {
-          prop: 'pallet',
-          label: '所在托盘',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'pallet',
+        //   label: '所在托盘',
+        //   type: 2,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'fixTime',
           label: '确认完成备货时间',
diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue
index ca6a6ed6..1ef1bafa 100644
--- a/src/views/distribution/stockup/distributionStockupSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupSelf.vue
@@ -447,16 +447,16 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'stockipAllocation',
-          label: '所在库位',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'stockipAllocation',
+        //   label: '所在库位',
+        //   type: 2,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         // {
         //   prop: 'goodsAreaId',
         //   label: '备货区编号',
@@ -488,16 +488,16 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        {
-          prop: 'pallet',
-          label: '所在托盘',
-          type: 2,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'pallet',
+        //   label: '所在托盘',
+        //   type: 2,
+        //   values: '',
+        //   width: '130',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'fixTime',
           label: '确认完成备货时间',
diff --git a/src/views/waybill/WarehousingByTrainNumber.vue b/src/views/waybill/WarehousingByTrainNumber.vue
index 5ab5ceed..dd57b345 100644
--- a/src/views/waybill/WarehousingByTrainNumber.vue
+++ b/src/views/waybill/WarehousingByTrainNumber.vue
@@ -405,7 +405,7 @@ const handleGoDetails = ({ row }) => {
 };
 
 const handleIsSelect = val => {
-  if (Number(val.isIncoming) === 1) {
+  if (Number(val.isIncoming) !== 0) {
     return true;
   } else {
     return false;
diff --git a/vite.config.js b/vite.config.js
index f2375925..6f91c72c 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -16,30 +16,30 @@ export default ({ mode, command }) => {
           // hy
           // target: 'http://192.168.3.12:13000',
           // xiaohei
-        // target: 'http://192.168.3.65:13000',       
+          // target: 'http://192.168.3.65:13000',
           // lmy
           // target: 'http://192.168.10.123:8889',
-          // cg 
-            //  target: 'http://192.168.3.2:13000',
+          // cg
+          //  target: 'http://192.168.3.2:13000',
           // target: 'http://192.168.10.101:8888',
           // 老zyc
-        // target: 'http://192.168.10.75:8777',
+          // target: 'http://192.168.10.75:8777',
           // 新zyc
           // target: 'http://192.168.6.116:8777',
           // target: 'http://192.168.6.122:8777',
-          // target: 'http://192.168.3.14:13000',  
+          // target: 'http://192.168.3.14:13000',
           // target: 'http://192.168.10.25:2888',
           // target: 'http://192.168.6.161:9777',//CY
           // target: 'http://192.168.10.57:13000',
           // target: 'http://192.168.10.200:13000',
-          // target: 'http://192.168.10.29:13000',
-          // target: 'http://192.168.3.5:13000',//？
+          // target: 'http://192.168.3.16:13000',
+          target: 'http://192.168.3.73:13000', //？
           // target: 'http://h5uapi.huitongys.com',
-          target: 'http://test.api.huo5you.com',
+          // target: 'http://test.api.huo5u.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),
         },
-        '/imgapi': {  
+        '/imgapi': {
           target: 'http://127.0.0.1:38088',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/imgapi/, ''),