后台入仓操作、补充、修改储位规则调整-前

https://zentao.test.jdshangmen.com/task-view-1635.html

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

@@ -171,9 +171,14 @@
                     </el-form-item>
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('储位')" prop="orderLocationBackVOList">
+                <el-table-column :label="$t('储位')" prop="orderLocationBackVOList"  width="150px">
                   <template v-slot="{ row, column, $index }">
-                    <warehouse-area-select v-model="column"></warehouse-area-select>
+                    <warehouse-area-select
+                      v-model="tableData[$index].orderLocationBackVOList"
+                      :readonly="tableData[$index].id && !edit"
+                      :order-id="orderId"
+                      :warehouse-id="warehouseId"
+                      :is-editing="edit"></warehouse-area-select>
                   </template>
                 </el-table-column>
               </el-table>
@@ -344,6 +349,16 @@
                     </el-form-item>
                   </template>
                 </el-table-column>
+                <el-table-column :label="$t('储位')" prop="orderLocationBackVOList"  width="150px">
+                  <template v-slot="{ row, column, $index }">
+                    <warehouse-area-select
+                      v-model="tableData1[$index].orderLocationBackVOList"
+                      :readonly="tableData1[$index].id && !edit"
+                      :order-id="orderId"
+                      :warehouse-id="warehouseId"
+                      :is-editing="edit"></warehouse-area-select>
+                  </template>
+                </el-table-column>
               </el-table>
             </el-form>
           </el-card>
@@ -396,6 +411,10 @@ export default {
   },
 
   props: {
+    order: {
+      type: Object,
+      default: undefined
+    },
     orderId: {
       type: Number,
       default: undefined
@@ -611,7 +630,8 @@ export default {
         ...this.form.orderWarehouseInItemDoList.map(e => {
           return {
             ...e,
-            boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3
+            boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3,
+            orderLocationCreateReqVOList: e.orderLocationBackVOList
           }
         })
       ]
@@ -631,7 +651,8 @@ export default {
               orderWarehouseInItemDoList: this.form1.orderWarehouseInItemDoList.map(e => {
                 return {
                   ...e,
-                  boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3
+                  boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3,
+                  orderLocationCreateReqVOList: e.orderLocationBackVOList
                 }
               })
             }).then(r => {
@@ -665,7 +686,8 @@ export default {
                 "orderWarehouseInUpdateItemDoList": this.tableData.map(e => {
                   return {
                     ...e,
-                    boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3
+                    boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3,
+                    orderLocationCreateReqVOList: e.orderLocationBackVOList
                   }
                 }),
                 copyUserId: this.selectedUsers
@@ -808,6 +830,9 @@ export default {
         }
       }
       return ''
+    },
+    warehouseId(){
+      return this.order?.logisticsInfoDto?.startWarehouseId
     }
   }
 }

src/views/ecw/order/warehousing/index.vue

@@ -4,7 +4,7 @@
 
     <order-base-info :order="order"></order-base-info>
 
-    <div style="margin-top: 20px">
+    <div style="margin-top: 20px;display: none">
       <span>{{$t('储位')}}：{{ ($refs.area ? $refs.area.selected : []).join(',') }}</span>
       <el-button type="primary" size="mini" @click="areaVisible = true" style="margin-left: 15px">{{$t('选择')}}</el-button>
     </div>
@@ -153,7 +153,7 @@
     <warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList"
                            :order-id="orderId" :warehouse-id="warehouseId" :is-editing="isEdit"></warehouse-area-dialog>
 
-    <edit-dialog :title="title" :order-id="order.orderId" :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="isEdit" :is-jiyun="order.type && order.type.indexOf('1') !== -1"></edit-dialog>
+    <edit-dialog :order="order" :title="title" :order-id="order.orderId" :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="isEdit" :is-jiyun="order.type && order.type.indexOf('1') !== -1"></edit-dialog>
 
 <!--  完成入仓  -->
     <el-dialog