调仓bug修复

src/views/ecw/order/batchSingleApplication.vue

@@ -79,7 +79,7 @@
       <el-row style="margin-top: 30px">
         <el-col :span="8">
           <div style="text-align: right;">
-            {{ list[0] && list[0].adjustToStartWarehouseName ? list[0].adjustToStartWarehouseName : list[0] ? [14,16,15].includes(this.list[0].status) ? list[0].dstWarehouseName : list[0].startWarehouseName : '' }}
+            {{ list[0] && list[0].adjustToDestWarehouseName ? list[0].adjustToDestWarehouseName : list[0] ? [14,16,15].includes(this.list[0].status) ? list[0].dstWarehouseName : list[0].startWarehouseName : '' }}
           </div>
         </el-col>
         <el-col :span="3"><div style="text-align:center">
@@ -118,9 +118,9 @@
                 <warehouse-video-list :modal="false" :status="3" :item ="row"></warehouse-video-list>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('调拨出仓备注')" prop="arrivalRemark">
+            <el-table-column :label="$t('调拨出仓备注')" prop="deliveryRemark">
             </el-table-column>
-            <el-table-column :label="$t('调拨到仓备注')" prop="deliveryRemark">
+            <el-table-column :label="$t('调拨到仓备注')" prop="arrivalRemark">
             </el-table-column>
           </el-table>
       </el-card>
@@ -239,7 +239,7 @@ export default {
     getOrderListFn() {
       getOrderPage({orderIdList: this.orderList}).then(r => {
         this.list = r.data.list
-        warehouseAdjustmentList({id: this.list[0].adjustToStartWarehouseId ? this.list[0].adjustToStartWarehouseId :[14,16,15].includes(this.list[0].status) ? this.list[0].dstWarehouseId : this.list[0].startWarehouseId }).then(r => this.availableWarehouse = r.data)
+        warehouseAdjustmentList({id: this.list[0].adjustToDestWarehouseId  ? this.list[0].adjustToDestWarehouseId  :[14,16,15].includes(this.list[0].status) ? this.list[0].dstWarehouseId : this.list[0].startWarehouseId }).then(r => this.availableWarehouse = r.data)
         adjustLastWithStatus({orderId:this.list[0].orderId,lang:0}).then(r =>{
           this.applyStatus = r.data
           if(r.data?.orderWarehouseAdjustBackVO?.status === 1){
@@ -251,7 +251,7 @@ export default {
     submit() {
       let p = this.list.map(e => e.orderId).join(',');
       this.params.orderIds = p;
-      this.params.warehouseOutId = this.list[0].adjustToStartWarehouseId ? this.list[0].adjustToStartWarehouseId : [14,16,15].includes(this.list[0].status) ? this.list[0].dstWarehouseId : this.list[0].startWarehouseId;
+      this.params.warehouseOutId = this.list[0].adjustToDestWarehouseId  ? this.list[0].adjustToDestWarehouseId  : [14,16,15].includes(this.list[0].status) ? this.list[0].dstWarehouseId : this.list[0].startWarehouseId;
       this.params.orderNo = this.list[0].orderNo
       orderWarehouseInAdjustApply(this.params).then(r => {
         if (r.code === 0) {

src/views/ecw/order/transferWarehousing.vue

@@ -74,9 +74,9 @@
           <warehouse-video-list :status="3" :item ="row"></warehouse-video-list>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('调拨出仓备注')" prop="arrivalRemark">
+      <el-table-column :label="$t('调拨出仓备注')" prop="deliveryRemark">
       </el-table-column>
-      <el-table-column :label="$t('调拨到仓备注')" prop="deliveryRemark">
+      <el-table-column :label="$t('调拨到仓备注')" prop="arrivalRemark">
       </el-table-column>
     </el-table>
     <el-descriptions style="margin-top: 20px" :column="4" border>
@@ -312,11 +312,11 @@ export default {
       if(this.type == 2){
         this.params.deliveryDate = parseTime(this.warehouseDetails.deliveryDate)
       }
-      orderWarehousePicturePage({rows:100,bizId:this.params.id,type:this.type == 1 ? 2 : 3 }).then(r => {
-        if(r.code === 0){
-          this.params.urls = r.data.list.map(e => e.url);
-        }
-      })
+      // orderWarehousePicturePage({rows:100,bizId:this.params.id,type:this.type == 1 ? 2 : 3 }).then(r => {
+      //   if(r.code === 0){
+      //     this.params.urls = r.data.list.map(e => e.url);
+      //   }
+      // })
     })
     getOrderWarehouseIn(this.orderId).then(r => {
       if(r.code === 0){