From cee52c980719889fa1687cf9d0b4e05bb66ffa57 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 20 Mar 2024 13:45:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BD=A6=E8=BE=86=E9=85=8D?=
 =?UTF-8?q?=E8=BD=BD=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/distribution/addVehicleStowage.js  | 39 ++++------
 src/option/waybill/WaybillOrderList.js        | 22 ++++--
 .../BasicdataGoodsAllocation.vue              | 72 +++++++++----------
 .../warehouse/tray/basicdataTray.vue          | 57 +++++++++------
 .../distribution/artery/AddVehicleStowage.vue | 17 +++--
 .../distribution/artery/VehicleStowage.vue    |  2 +-
 .../artery/VehicleStowageDetails.vue          | 15 +++-
 7 files changed, 124 insertions(+), 100 deletions(-)

diff --git a/src/option/distribution/addVehicleStowage.js b/src/option/distribution/addVehicleStowage.js
index d356453e..d784664f 100644
--- a/src/option/distribution/addVehicleStowage.js
+++ b/src/option/distribution/addVehicleStowage.js
@@ -754,8 +754,19 @@ export const detailsColumnList = [
     sortable: true,
   },
   {
-    prop: 'orderLineCost',
-    label: '订单干线成本',
+    prop: 'costPiece',
+    label: '按件成本',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    isshowSummary: true,
+    sortable: true,
+  },
+  {
+    prop: 'costZhang',
+    label: '按比例成本',
     type: 2,
     values: '',
     width: '130',
@@ -974,30 +985,6 @@ export const detailsColumnList = [
     isColumnMerge: true,
     sortable: true,
   },
-  {
-    prop: 'totalFee',
-    label: '单件成本 (按件)',
-    type: 2,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    isshowSummary: true,
-    isColumnMerge: true,
-    sortable: true,
-  },
-  {
-    prop: 'totalFee',
-    label: '单件成本 (按收入)',
-    type: 2,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    isshowSummary: true,
-    isColumnMerge: true,
-    sortable: true,
-  },
   // {
   //   prop: 'freight',
   //   label: '作废运单号',
diff --git a/src/option/waybill/WaybillOrderList.js b/src/option/waybill/WaybillOrderList.js
index 04f4dada..79bf82d0 100644
--- a/src/option/waybill/WaybillOrderList.js
+++ b/src/option/waybill/WaybillOrderList.js
@@ -175,9 +175,9 @@ export const columnList = [
     fixed: false,
     sortable: true,
   },
-  /*   {
-    prop: 'carrierName',
-    label: '单价',
+  {
+    prop: 'costPiece',
+    label: '按件分摊',
     type: 1,
     values: '',
     width: '130',
@@ -186,15 +186,25 @@ export const columnList = [
     sortable: true,
   },
   {
-    prop: 'carrierName',
-    label: '件数',
+    prop: 'costZhang',
+    label: '按比例分摊',
     type: 1,
     values: '',
     width: '130',
     checkarr: [],
     fixed: false,
     sortable: true,
-  }, */
+  },
+  {
+    prop: 'costNum',
+    label: '成本分摊件数',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'totalCount',
     label: '总数',
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
index f9a4c4cb..68a48f39 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container v-loading="loadingObj.pageLoading">
     <avue-crud
       :option="option"
       v-model:search="search"
@@ -137,6 +137,10 @@ export default {
       qrCodeObj: [],
       dialogVisible: false,
       html: '', // 页面包条码内容
+      /** 页面loading */
+      loadingObj: {
+        pageLoading: false,
+      },
     };
   },
   computed: {
@@ -423,41 +427,35 @@ export default {
       // LODOP.PREVIEW(); //预览(预览打印无脚标)
       LODOP.PRINT(); //直接打印
     },
-    handleqr() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
+    async handleqr() {
+      try {
+        if (this.selectionList.length === 0) {
+          this.$message.warning('请选择至少一条数据');
+          return;
+        }
 
-      let checkcode = [];
-      this.selectionList.map(item => {
-        checkcode.push(item.id);
-        // checkcode.push(item.orderPackageCode)
-      });
+        let checkcode = [];
+        this.selectionList.map(item => {
+          checkcode.push(item.id);
+          // checkcode.push(item.orderPackageCode)
+        });
 
-      let qr = checkcode.join(',');
-      console.log(qr);
-      this.html = '';
-      getPrintTemplate(qr).then(res => {
-        // this.orderPackageCode = res.data
-        console.log(res.data);
-        this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
-      });
-      this.dialogVisible = true;
+        let qr = checkcode.join(',');
+        console.log(qr);
+        this.html = '';
+        this.loadingObj.pageLoading = true;
+        const res = await getPrintTemplate(qr);
 
-      /*  this.dialogVisible = true;
-        this.qrCodeObj=[];
-        this.selectionList.forEach(item=>{
-          // console.log(">>>>>>>>>>",item);
-          //构建生成二维码条件
-         let params={}
-          getTemplate(Object.assign(params,item)).then(res=>{
-            let url = window.URL.createObjectURL(res.data);		// 获取返回参数中的需要的值data
-            console.log(">>>>>>>>>>",url);
-            this.qrCodeObj.push(url);
-          })
+        const { code, data } = res.data;
+        if (code !== 200) return;
 
-        })*/
+        this.html = this.getHtmls(data.dataList, data.templateHtml);
+        this.dialogVisible = true;
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
+      }
     },
     handleExport() {
       let downloadUrl = `/blade-BasicdataGoodsAllocation/BasicdataGoodsAllocation/export-BasicdataGoodsAllocation?${
@@ -542,7 +540,7 @@ export default {
       }
       getList(page.currentPage, page.pageSize, values).then(res => {
         const data = res.data.data;
-        console.log(res,'res================================================================>');
+        console.log(res, 'res================================================================>');
         this.page.total = data.total;
         this.data = data.records;
         this.loading = false;
@@ -586,10 +584,10 @@ export default {
     margin-right: 0;
   }
 }
-:deep(.el-card){
-height: 100%;
-.el-card__body{
+:deep(.el-card) {
   height: 100%;
-}
+  .el-card__body {
+    height: 100%;
+  }
 }
 </style>
diff --git a/src/views/basicdata/warehouse/tray/basicdataTray.vue b/src/views/basicdata/warehouse/tray/basicdataTray.vue
index cc067810..5845385f 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTray.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTray.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <basic-container v-loading="loadingObj.pageLoading">
     <avue-crud
       :option="option"
       v-model:search="search"
@@ -191,6 +191,9 @@ export default {
       data: [],
       html: null, // 页面包条码内容
       dialogVisible: false,
+      loadingObj: {
+        pageLoading: false,
+      },
     };
   },
   computed: {
@@ -359,7 +362,7 @@ export default {
           let pri_html = '';
           pri_html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
           // console.log(pri_html);
-          console.log(123123)
+          console.log(123123);
           that.w_print(pri_html);
         });
         // checkcode.push(item.orderPackageCode)
@@ -382,26 +385,34 @@ export default {
       // LODOP.PREVIEW(); //预览(预览打印无脚标)
       LODOP.PRINT(); //直接打印
     },
-    handleqr() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
+    async handleqr() {
+      try {
+        this.loadingObj.pageLoading = true;
 
-      let checkcode = [];
-      this.selectionList.map(item => {
-        checkcode.push(item.id);
-      });
+        if (this.selectionList.length === 0) {
+          this.$message.warning('请选择至少一条数据');
+          return;
+        }
+
+        let checkcode = [];
+        this.selectionList.map(item => {
+          checkcode.push(item.id);
+        });
 
-      let qr = checkcode.join(',');
-      console.log(qr);
-      this.html = '';
-      getPrintTemplate(qr).then(res => {
-        // this.orderPackageCode = res.data
+        let qr = checkcode.join(',');
+        console.log(qr);
+        this.html = '';
+        const res = await getPrintTemplate(qr);
         console.log(res.data);
-        this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
-      });
-      this.dialogVisible = true;
+        const { code, data } = res.data;
+        if (code !== 200) return;
+        this.html = this.getHtmls(data.dataList, data.templateHtml);
+        this.dialogVisible = true;
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
+      }
     },
     Details(row) {
       this.$router.push({
@@ -527,8 +538,8 @@ export default {
     },
     selectionClear() {
       this.selectionList = [];
-      console.log(this.query,'query');
-      this.$refs.crud.toggleSelection();                              
+      console.log(this.query, 'query');
+      this.$refs.crud.toggleSelection();
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
@@ -542,14 +553,14 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
 
-      const { warehouseId, trayStatus, type, palletCode,palletName } = this.query;
+      const { warehouseId, trayStatus, type, palletCode, palletName } = this.query;
 
       let values = {
         warehouseId: warehouseId,
         trayStatus: trayStatus,
         type: type,
         palletCode: palletCode,
-        palletName:palletName
+        palletName: palletName,
       };
 
       getList(page.currentPage, page.pageSize, values).then(res => {
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index c8267a14..f06a4df8 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -910,7 +910,7 @@ const initDispatchOrder = async item => {
     if (code !== 200) return;
     item.lineCarsOrderList = data;
     item.renderData = data;
-    item.MappingData = data.map(val => val.carsOrderId);
+    item.MappingData = data;
 
     details.orderCodeList = [
       ...new Set([
@@ -1446,10 +1446,10 @@ const handleRemoveWaybill = async (index: number) => {
   _node.lineCarsOrderList = _node.lineCarsOrderList.filter((val, index) => {
     // 修改
     if (Number(details.pageType) === 2) {
-      if (val.carsOrderId) {
-        const _index = _node.MappingData.indexOf(val.carsOrderId);
-        _node.MappingData.splice(_index, 1);
-      }
+      // if (val.carsOrderId) {
+      //   const _index = _node.MappingData.indexOf(val.carsOrderId);
+      //   _node.MappingData.splice(_index, 1);
+      // }
     }
 
     const _flag = !_selectList.includes(val);
@@ -1705,7 +1705,12 @@ const editSubmit = async () => {
     });
 
     submitData.addCarsLoadLineList[details.active].addList = _lineCarsOrderList;
-    submitData.addCarsLoadLineList[details.active].removeList = details._removeList;
+
+    for (let i = 0; i < _removeList.length; i++) {
+      const value = _removeList[i];
+      value.id = value.carsOrderId;
+    }
+    submitData.addCarsLoadLineList[details.active].removeList = _removeList;
 
     const res = await postUpdateCarsLoadBasicData(submitData);
     const { code, msg } = res.data;
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index 46c33deb..0ea95baa 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -60,7 +60,7 @@
         <!-- 头部左侧按钮模块 -->
         <div class="avue-crud__left">
           <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增配载 </el-button>
-          <el-button type="primary" icon="el-icon-printer" @click="searchReset">打 印</el-button>
+          <!-- <el-button type="primary" icon="el-icon-printer" @click="searchReset">打 印</el-button> -->
           <el-button type="primary" icon="el-icon-printer" @click="handleShowListOfLoadedWagons">
             装载清单
           </el-button>
diff --git a/src/views/distribution/artery/VehicleStowageDetails.vue b/src/views/distribution/artery/VehicleStowageDetails.vue
index 969bee33..7e19f87a 100644
--- a/src/views/distribution/artery/VehicleStowageDetails.vue
+++ b/src/views/distribution/artery/VehicleStowageDetails.vue
@@ -667,7 +667,7 @@ const initOriginWarehouseOrder = async (params = {}) => {
     data.carsLoadWaybillInfoList.forEach(val => {
       details.oldData.push(
         ...val.carsLoadOrderInfoList.map((item, index) => {
-          item = { ...item, ...val };
+          item = { ...val, ...item };
           delete item.carsLoadOrderInfoList;
           if (index === 0) item.mergeColumnIndex = val.carsLoadOrderInfoList.length;
           else {
@@ -946,6 +946,19 @@ const back = () => {
 
 /** 成本分摊 */
 const handleCostApportionments = async () => {
+  let _flag = false;
+
+  for (let i = 0; i < details.oldData.length; i++) {
+    const value = details.oldData[i];
+
+    if (!value.checkUserName) {
+      _flag = true;
+      break;
+    }
+  }
+
+  if (_flag) return ElMessage.error('请先审核运单再进行成本分摊!!!');
+
   ElMessageBox.confirm('确定要进行费用分摊吗?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',