海运缺陷单修复

src/views/ecw/box/ladingBill/index.vue

@@ -192,6 +192,7 @@ export default {
       }
       this.currRow = row;
       this.$set(this.dialogCfg, "type", type);
+      this.$set(this.dialogCfg, "width", "750px");
       this.$set(this.dialogCfg, "visible", true);
     },
     makeBill(row) {
@@ -201,11 +202,10 @@ export default {
       }).then((res) => {
         const { data } = res;
         const { titleZh = "", contentZh = "" } = data?.ladingTemplate ?? {};
-        let billContent = `${titleZh}${data.orderInfo}${contentZh}`,
-          orderNo = data.orderInfo?.orderNo ?? "";
+        let billContent = `${titleZh}${data.orderInfo}${contentZh}`;
         this.currData = {
           billContent,
-          orderNo,
+          orderNo: this.currRow.orderNo,
         };
       });
     },

src/views/ecw/box/ladingBill/makeLadingBill.vue

@@ -3,7 +3,9 @@
     <el-row>
       <div class="title-orderNo">订单号：{{orderNo}}</div>
     </el-row>
-    <vue-ueditor-wrap v-model="billContent" :config="editorConfig" editor-id="billUeditor" />
+    <el-row class="ueditor-row">
+      <vue-ueditor-wrap v-model="billContent" :config="editorConfig" editor-id="billUeditor" style="max-width: 690px;" />
+    </el-row>
 
     <!-- 审核流程 -->
     <el-row class="process-area">
@@ -22,7 +24,7 @@
       </div>
     </el-row>
 
-    <el-dialog :title="dialogCfg.title" :visible.sync="visible" width="80%" append-to-body class="shippingSea-dialog">
+    <el-dialog :title="dialogCfg.title" :visible.sync="visible" width="850px" append-to-body class="shippingSea-dialog">
       <previewBill v-if="visible" :contentHtml="billContent" :currRow="currRow" :type="dialogCfg.type" />
     </el-dialog>
   </el-row>
@@ -234,5 +236,9 @@ export default {
       text-align: center;
     }
   }
+  .ueditor-row {
+    display: flex;
+    justify-content: center;
+  }
 }
 </style>

src/views/ecw/box/ladingBill/previewBill.vue

 <template>
   <el-row>
-    <div v-html="contentHtml"></div>
+    <div v-html="contentHtml" class="contentHtml"></div>
     <el-row v-if="currRow.status === 2 && type === 'previewBill'" style="text-align: center;">
       <el-button type="primary" @click="download">下载</el-button>
       <el-button type="primary" @click="print">打印</el-button>
@@ -55,6 +55,11 @@ export default {
 };
 </script>
 
-
 <style lang="scss" scoped>
+::v-deep .contentHtml {
+  > table {
+    width: 96% !important;
+    margin-left: 2%;
+  }
+}
 </style>

src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue

@@ -318,22 +318,18 @@ export default {
     },
     /* 打开拆单 */
     getSplit() {
-      this.querySplitGoods().then((res) => {
-        if (res) {
-          if (this.currRow.goodsList && this.currRow.goodsList.length) {
-            const [orderItem] = this.currRow.goodsList;
-            createSplit({
-              parentOrderId: this.currRow.orderId,
-              parentOrderNo: this.currRow.orderNo,
-              dstWarehouseId: orderItem.destWarehouseId,
-              transportId: orderItem.transportId,
-              shipmentType: 1,
-            }).then((res) => {
-              this.querySplitGoods();
-            });
-          }
-        }
-      });
+      if (this.currRow.goodsList && this.currRow.goodsList.length) {
+        const [orderItem] = this.currRow.goodsList;
+        createSplit({
+          parentOrderId: this.currRow.orderId,
+          parentOrderNo: this.currRow.orderNo,
+          dstWarehouseId: orderItem.destWarehouseId,
+          transportId: orderItem.transportId,
+          shipmentType: 1,
+        }).then((res) => {
+          this.querySplitGoods();
+        });
+      }
     },
     /* 查询拆单项 */
     querySplitGoods() {
@@ -389,8 +385,14 @@ export default {
           leviteSum,
           column.warehouseInInfoVO?.cartonsNum ?? 0
         ).toNumber();
-        leviteV += Decimal.add(leviteV, column.warehouseInInfoVO?.volume ?? 0).toFixed(2);
-        leviteW += Decimal.add(leviteW, column.warehouseInInfoVO?.weight ?? 0).toFixed(2);
+        leviteV += Decimal.add(
+          leviteV,
+          column.warehouseInInfoVO?.volume ?? 0
+        ).toFixed(2);
+        leviteW += Decimal.add(
+          leviteW,
+          column.warehouseInInfoVO?.weight ?? 0
+        ).toFixed(2);
       });
       sums[1] =
         "下单统计：" +
@@ -460,7 +462,10 @@ export default {
         if (valid) {
           // 输入箱数大于实装箱数
           const total = this.totalSplitNum();
-          const canSplitNum = Decimal.sub(this.currRow.num, this.currRow.installNum).toNumber();
+          const canSplitNum = Decimal.sub(
+            this.currRow.num,
+            this.currRow.installNum
+          ).toNumber();
           const remain = Decimal.sub(canSplitNum, total).toNumber();
           if (this.shopForm.num > remain) {
             this.$message.error("放入箱数不能大于总箱数");

src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue

@@ -545,7 +545,7 @@ export default {
     },
     /* 是否显示拆单 */
     isShowSplitOrder(row) {
-      if (row.num > row.installNum) {
+      if (row.num > row.installNum && row.installNum !== 0) {
         return true;
       }
       return false;