feat: BUG修复

@@ -128,8 +128,12 @@ export default {
       });
       });
       await getCustomizeExcel({}).then((res) => {
       await getCustomizeExcel({}).then((res) => {
         if (res.code === "200") {
         if (res.code === "200") {
-          this.transferValue = res.data.defaultLogisticsWaybill;
-          this.transferValue1 = res.data.defaultCommodityDetail;
+          this.transferValue = res.data.logisticsWaybillDimension
+            ? res.data.logisticsWaybillDimension
+            : res.data.defaultLogisticsWaybill;
+          this.transferValue1 = res.data.commodityDetailDimension
+            ? res.data.commodityDetailDimension
+            : res.data.defaultCommodityDetail;
           this.historyInfo = res.data;
           this.historyInfo = res.data;
           this.$nextTick(() => {
           this.$nextTick(() => {
             this.commodityDetailDimension = this.commodityDetailDimension.map(
             this.commodityDetailDimension = this.commodityDetailDimension.map(
@@ -159,9 +163,13 @@ export default {
     radioChange(e) {
     radioChange(e) {
       console.log(e);
       console.log(e);
       if (e === 3) {
       if (e === 3) {
-        this.transferValue = this.historyInfo.defaultLogisticsWaybill;
+        this.transferValue = this.historyInfo.logisticsWaybillDimension
+          ? this.historyInfo.logisticsWaybillDimension
+          : this.historyInfo.defaultLogisticsWaybill;
       } else if (e === 6) {
       } else if (e === 6) {
-        this.transferValue1 = this.historyInfo.defaultCommodityDetail;
+        this.transferValue1 = this.historyInfo.commodityDetailDimension
+          ? this.historyInfo.commodityDetailDimension
+          : this.historyInfo.defaultCommodityDetail;
       }
       }
     },
     },
 
 

@@ -191,7 +191,7 @@
       ref="entryTable"
       ref="entryTable"
       :data="tableData"
       :data="tableData"
       :headerData="headerData"
       :headerData="headerData"
-      :maxHeight="500"
+      :maxHeight="tableMaxheight"
       :border="true"
       :border="true"
       :pagination="true"
       :pagination="true"
       :order="false"
       :order="false"
@@ -370,9 +370,7 @@ export default {
     this.search(0);
     this.search(0);
   },
   },
   mounted() {
   mounted() {
-    this.$nextTick(() => {
     this.tableMaxheight = window.innerHeight - 300;
     this.tableMaxheight = window.innerHeight - 300;
-    });
   },
   },
   watch: {
   watch: {
     $route() {
     $route() {

@@ -194,17 +194,18 @@ export default {
           slot: true,
           slot: true,
         },
         },
         {
         {
-          name: "物流运单编号",
-          value: "logisticsNo",
+          name: "提运单号",
+          value: "billNo",
           width: "",
           width: "",
           align: "left",
           align: "left",
         },
         },
         {
         {
-          name: "提运单号",
-          value: "billNo",
+          name: "物流运单编号",
+          value: "logisticsNo",
           width: "",
           width: "",
           align: "left",
           align: "left",
         },
         },
+
         {
         {
           name: "清单编号",
           name: "清单编号",
           value: "invtNo",
           value: "invtNo",

@@ -48,7 +48,11 @@
               placeholder=""
               placeholder=""
             >
             >
               <el-option
               <el-option
-                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS.filter(fItem => fItem.itemChineseName !== '已提交')"
+                v-for="(
+                  item, index
+                ) in $store.getters.dict.RECEIPT_STATUS.filter(
+                  (fItem) => fItem.itemChineseName !== '已提交'
+                )"
                 :key="index"
                 :key="index"
                 :label="item.itemChineseName"
                 :label="item.itemChineseName"
                 :value="item.itemValue"
                 :value="item.itemValue"
@@ -146,9 +150,9 @@
           </div>
           </div>
         </TablePopover>
         </TablePopover>
       </template>
       </template>
-      <template v-slot:logisticsNo="scope">
+      <template v-slot:billNo="scope">
         <el-button type="text" @click="view(scope.row)">{{
         <el-button type="text" @click="view(scope.row)">{{
-            scope.row.logisticsNo
+          scope.row.billNo
         }}</el-button>
         }}</el-button>
       </template>
       </template>
     </Table>
     </Table>
@@ -186,18 +190,19 @@ export default {
           slot: true,
           slot: true,
         },
         },
         {
         {
-          name: "物流运单编号",
-          value: "logisticsNo",
+          name: "提运单号",
+          value: "billNo",
           width: "",
           width: "",
           align: "left",
           align: "left",
-          slot: true
+          slot: true,
         },
         },
         {
         {
-          name: "提运单号",
-          value: "billNo",
+          name: "物流运单编号",
+          value: "logisticsNo",
           width: "",
           width: "",
           align: "left",
           align: "left",
         },
         },
+
         {
         {
           name: "物流企业名称",
           name: "物流企业名称",
           value: "logisticsName",
           value: "logisticsName",
@@ -295,13 +300,13 @@ export default {
       if (val == 0) {
       if (val == 0) {
         this.page.pageIndex = 1;
         this.page.pageIndex = 1;
       }
       }
-      let obj = {...this.sreachFormData};
+      let obj = { ...this.sreachFormData };
       obj.pageIndex = this.page.pageIndex;
       obj.pageIndex = this.page.pageIndex;
       obj.pageSize = this.page.pageSize;
       obj.pageSize = this.page.pageSize;
       obj.createTimeStart = "";
       obj.createTimeStart = "";
       obj.createTimeEnd = "";
       obj.createTimeEnd = "";
-      obj.logisticsNo = obj.logisticsWaybillNumber
-      delete obj.logisticsWaybillNumber
+      obj.logisticsNo = obj.logisticsWaybillNumber;
+      delete obj.logisticsWaybillNumber;
       if (obj.logisticsNo != null && obj.logisticsNo != "") {
       if (obj.logisticsNo != null && obj.logisticsNo != "") {
         obj.logisticsNo = obj.logisticsNo.split("\n");
         obj.logisticsNo = obj.logisticsNo.split("\n");
       } else {
       } else {
@@ -311,7 +316,7 @@ export default {
         obj.createTimeStart = obj.createTime[0];
         obj.createTimeStart = obj.createTime[0];
         obj.createTimeEnd = obj.createTime[1];
         obj.createTimeEnd = obj.createTime[1];
       }
       }
-      delete obj.createTime
+      delete obj.createTime;
       // if (obj.billNo != null && obj.billNo != "") {
       // if (obj.billNo != null && obj.billNo != "") {
       //   obj.billNo = obj.billNo.split("\n");
       //   obj.billNo = obj.billNo.split("\n");
       // } else {
       // } else {
@@ -362,7 +367,7 @@ export default {
         })
         })
         .finally(() => {
         .finally(() => {
           this.$nextTick(() => {
           this.$nextTick(() => {
-            this.$store.dispatch('setLoadingState', false)
+            this.$store.dispatch("setLoadingState", false);
             this.$refs.returnStatusPopover.tableLoading = false;
             this.$refs.returnStatusPopover.tableLoading = false;
           });
           });
         });
         });

@@ -52,8 +52,7 @@
       :border="true"
       :border="true"
       :pagination="false"
       :pagination="false"
       :order="false"
       :order="false"
-      :height="tableMaxheight + 'px'"
-      :maxHeight="tableMaxheight + 'px'"
+      :maxHeight="tableMaxheight"
     >
     >
     </Table>
     </Table>