打包加箱明细和备注

src/views/ecw/order/stocking/components/Package.vue

@@ -2,7 +2,7 @@
   <el-dialog
     :title="title + ' - ' + warehousing.orderNo"
     :visible.sync="visible"
-    width="1280px"
+    width="90vw"
   >
     <el-form ref="form" :model="form" :rules="formRules" label-width="80px">
       <el-descriptions border :column="2">
@@ -101,7 +101,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="长(cm)">
+          <el-table-column label="长(cm)" width="110px">
             <template v-slot:header>
               <span>{{ $t('长') }}</span>(cm)
             </template>
@@ -111,7 +111,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="宽(cm)">
+          <el-table-column label="宽(cm)" width="110px">
             <template v-slot:header>
               <span>{{ $t('宽') }}</span>(cm)
             </template>
@@ -121,7 +121,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="高(cm)">
+          <el-table-column label="高(cm)" width="110px">
             <template v-slot:header>
               <span>{{ $t('高') }}</span>(cm)
             </template>
@@ -131,7 +131,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="体积(m³)">
+          <el-table-column label="体积(m³)" width="110px">
             <template v-slot:header>
               <span style="color: red">*</span> <span>{{ $t('体积') }}</span>(m³)
             </template>
@@ -141,7 +141,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="重量(Kg)">
+          <el-table-column label="重量(Kg)" width="110px">
             <template v-slot:header>
               <span style="color: red">*</span> <span>{{ $t('重量') }}</span>(Kg)
             </template>
@@ -160,7 +160,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('快递单号')">
+          <el-table-column :label="$t('快递单号')" width="150px">
             <template v-slot="{r,c,$index}">
               <el-form-item>
                 <el-input :disabled="$index < protectRowCount" v-model="form.table[$index].expressNo" placeholder=""></el-input>
@@ -179,8 +179,16 @@
                 :is-editing="edit"></warehouse-area-select>
             </template>
           </el-table-column>
+          <el-table-column :label="$t('备注')">
+              <template v-slot="{r,c,$index}">
+                  <el-form-item>
+                      <el-input v-model="form.table[$index].remark" type="textarea" show-word-limit maxlength="100" placeholder=""></el-input>
+                  </el-form-item>
+              </template>
+          </el-table-column>
           <el-table-column :label="$t('操作')">
             <template v-slot="{ row, column, $index}">
+							<WarehouseRecordDetail v-model="form.table[$index].orderWarehouseInDetailsVOList" />
               <el-popconfirm
                 v-if="$index >= protectRowCount"
                 title="确定要删除该行记录吗？"
@@ -214,11 +222,13 @@ import {finishPacked, orderWarehouseIn, orderWarehouseInUpdateApply} from "@/api
 import {getProductAttrList} from "@/api/ecw/productAttr"
 import {getProductTypeList} from "@/api/ecw/productType"
 import {addProduct} from "@/api/ecw/product"
+import WarehouseRecordDetail from "@/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue";
 
 export default {
   name: "Package",
 
   components: {
+    WarehouseRecordDetail,
     ProductSelector,
     WarehouseAreaSelect,
     WorkFlow
@@ -497,12 +507,31 @@ export default {
         if (!valid1) {
           return
         }
+        // 复制数据副本，避免修改格式后原数据被影响
+        const table = JSON.parse(JSON.stringify(this.form.table))
+        table.forEach(({orderWarehouseInDetailsVOList}) => {
+
+        })
+
         // 首次入仓、入仓补充
         return finishPacked({
           brand: this.form.brand,
           orderId: this.warehousing.orderId,
           orderItemId: this.warehousing.orderItemId,
-          orderWarehouseInItemDtoList: this.form.table.map(e => {
+          orderWarehouseInItemDtoList: table.map(e => {
+            if(!e.orderWarehouseInDetailsVOList){
+                e.orderWarehouseInDetailsVOList = []
+            }
+              e.orderWarehouseInDetailsVOList = e.orderWarehouseInDetailsVOList.map(item => {
+                if(Array.isArray(item.prodAttrIds)){
+                    item.prodAttrIds = item.prodAttrIds.join(',')
+                }
+                if(Array.isArray(item.usageIds)){
+                    item.usageIds = item.usageIds.join(',')
+                }
+                return item
+            })
+
             return {
               ...e,
               boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3,