入仓修改审批回显以及数据不对

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

@@ -133,7 +133,14 @@
   <div v-if="type === 4">
     <p>申请理由</p>
     <div>
-      {{ FeeDetails.details || '' }}
+      用户修改了订单中商品编号为【{{ FeeDetails.orderItemVOList[0].prodId }}】的【{{ FeeDetails.details.applyInfoVOList[0].newValue }}】信息：
+      <ol>
+        <template v-for="item in FeeDetails.details.applyInfoVOList">
+          <li v-if="item.orgValue === undefined">{{ item.name }}：{{ item.newValue }}</li>
+          <li v-else-if="item.newValue === undefined">删除入仓</li>
+          <li v-else-if="item.newValue !== item.orgValue">{{ item.name }}从【{{ item.orgValue }}】改为【{{ item.newValue }}】</li>
+        </template>
+      </ol>
     </div>
   </div>
 </div>

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -372,20 +372,20 @@ export default {
       opened: false,
       brandList: [],
       form: {
-        "brand": "0",
-        "brandType": 0,
-        "inTime": "",
-        "material": "",
-        "orderId": 0,
-        "orderItemId": 0,
-        "orderNo": "",
+        // "brand": "0",
+        // "brandType": 0,
+        // "inTime": "",
+        // "material": "",
+        // "orderId": 0,
+        // "orderItemId": 0,
+        // "orderNo": "",
         "orderWarehouseInItemDoList": [],
         "prodAttrIds": "",
         "prodId": 0,
-        "prodTitleEn": "",
-        "prodTitleZh": "",
-        "prodType": 0,
-        "type": 0,
+        // "prodTitleEn": "",
+        // "prodTitleZh": "",
+        // "prodType": 0,
+        // "type": 0,
         feeType: 0,
         recordMode: undefined
       },
@@ -533,7 +533,16 @@ export default {
               orderId: this.warehousing.orderId,
               orderItemId: this.warehousing.orderItemId,
               orderNo: this.warehousing.orderNo,
-              "orderWarehouseInUpdateItemDoList": orderWarehouseInItemDoList,
+              cartonsNum: this.warehousing.num,
+              volume: this.warehousing.volume.toFixed(2),
+              weight: this.warehousing.weight.toFixed(2),
+              prodId: this.warehousing.prodId,
+              "orderWarehouseInUpdateItemDoList": this.tableData.map(e => {
+                return {
+                  ...e,
+                  boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3
+                }
+              }),
               copyUserId: this.selectedUsers
             }).then(r => {
               if (r.data) {