拆单升级

src/views/ecw/order/splitApply.vue

@@ -162,6 +162,16 @@
               <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.feeType" />
             </template>
           </el-table-column>
+          <el-table-column :label="$t('入仓类型')" align="center" >
+            <template slot-scope="{row}">
+              <dict-tag :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" :value="row.specificationType"></dict-tag>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('入仓规格')" align="center" >
+            <template slot-scope="{row}">
+              {{row.boxGauge}}
+            </template>
+          </el-table-column>
           <el-table-column :label="$t('入仓体积')" align="center" >
             <template slot-scope="scope">
                 <el-input v-model="scope.row.volume" @change="updateField(scope.row, 'volume')" size="mini" :disabled="index === 0">
@@ -402,7 +412,7 @@
              <template v-slot="{ row, column, $index }">
                <!--<el-button type="primary" size="mini" @click="showLocation(row, $index)">{{ $t('选择储位') }}</el-button>-->
                <warehouse-area-select
-                 v-model="row.orderLocationBackVOList"
+                 v-model="row.orderLocationList"
                  :warehouse-id="splitData[splitItemIndex].dstWarehouseId"
                  ></warehouse-area-select>
              </template>
@@ -556,9 +566,10 @@ export default {
       console.log("拆单数据", this.splitData, this.splitData.length)
       if(this.orderData.inWarehouseState != 207 &&  this.splitData.length){
         // 2023-05-20确认不需要询问，直接重置
-        deleteAllSplit(this.queryParams.orderId).then(res => {
+        // TODO 20230610 方便调试不删除，改完之后要取消注释
+        /*deleteAllSplit(this.queryParams.orderId).then(res => {
           this.getList()
-        })
+        })*/
         /*this.$confirm(this.$t('已有拆单数据，是否要重置？')).then(res => {
           return deleteAllSplit(this.queryParams.orderId)
         }).then(res => {
@@ -880,6 +891,9 @@ export default {
         if (!valid) {
           return;
         }
+        this.shopForm.specsRecordVOList.forEach(item => {
+          item.boxGauge = `${item.boxGauge1}*${item.boxGauge2}*${item.boxGauge3}`
+        })
         var params = {
           num:this.putin.num,
           orderItemId:this.shopForm.orderItemId,
@@ -943,7 +957,7 @@ export default {
         this.$set(this.shopForm,'specsRecordVOList',[])
       }
       this.shopForm.specsRecordVOList.push({
-        orderLocationBackVOList: []
+        orderLocationList: []
       })
     },
     // 删除一行，可选参数index表上行号，参数不是数字则删除最后一行