Merge remote-tracking branch 'origin/dev' into dev

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

@@ -183,7 +183,7 @@ export default {
       }).then((res) => {
         const { data } = res;
         const { titleZh = "", contentZh = "" } = data?.ladingTemplate ?? {};
-        let billContent = `${titleZh}${contentZh}`,
+        let billContent = `${titleZh}${data.orderInfo}${contentZh}`,
           orderNo = data.orderInfo?.orderNo ?? "";
         this.currData = {
           billContent,

src/views/ecw/order/components/warehouseDetails.vue

@@ -241,8 +241,12 @@ export default {
           break;
         case 4:
           // 入仓修改
-          getWarehouseUpdateApprovalInfo(this.processInstanceID).then(r => {
-            this.FeeDetails.details = r.data.details
+          getWarehouseUpdateApprovalInfo(this.processInstanceID).then(res => {
+            getOrder(res.data.orderIds).then(r =>{
+              this.FeeDetails = r.data
+              this.FeeDetails.details = JSON.parse(res.data.details)
+              // this.FeeDetails.details = res.data.details
+            })
           })
           break
       }