Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

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

@@ -30,12 +30,12 @@
           <div slot="header" class="card-title">
             {{$t('打包前')}}
           </div>
-          <el-table v-if="orderWarehouseInContent" :data="orderWarehouseInContent">
+          <el-table v-if="orderWarehouseInContent" :data="orderWarehouseInContent.orderWarehouseInItemDtoList">
             <el-table-column type="index" :label="$t('序号')" />
             <el-table-column :label="$t('箱数')" prop="cartonsNum">
                 <template slot-scope="{row}">
                   <span>{{row.cartonsNum}}</span>
-                  <!-- <el-button v-if="boxData.length>0" type="text" @click="seeBox">({{$t('混箱')}})</el-button> -->
+                  <el-button v-if="row.orderWarehouseInDetailsVOList&&row.orderWarehouseInDetailsVOList.length>0" type="text" @click="seeBox(row.orderWarehouseInDetailsVOList)">({{$t('混箱')}})</el-button>
                 </template>
             </el-table-column>
             <el-table-column :label="$t('入仓类型')" prop="cartonsNum">
@@ -77,7 +77,7 @@
             </el-table-column>
             <el-table-column :label="$t('入仓影像')" prop="orderLocationBackVOList" >
               <template slot-scope="{row}">
-               <el-button type="primary" @click="seeMv(row.pictureUrls)">{{$t('查看')}}</el-button>
+               <el-button type="primary" @click="seeMv(orderWarehouseInContent.pictures)">{{$t('查看')}}</el-button>
               </template>
             </el-table-column>
           </el-table>

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

@@ -70,10 +70,19 @@
                   </el-checkbox-group>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item :label="$t('入仓时间')" v-if="!edit">
+                  <el-date-picker v-model="form.inTime" type="datetime" :placeholder="$t('请选择入仓时间')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="16">
+                <el-form-item :label="$t('用途')">
+                  <el-checkbox-group v-model="form.usageIds">
+                    <el-checkbox v-for="item in getDictDatas(DICT_TYPE.WAREHOUSING_RECORD_DETAIL_USAGE)" :key="item.value" :label="item.value">{{ $l(item, 'label') }}</el-checkbox>
+                  </el-checkbox-group>
+                </el-form-item>
+              </el-col>
             </el-row>
-            <el-form-item :label="$t('入仓时间')" v-if="!edit">
-              <el-date-picker v-model="form.inTime" type="datetime" :placeholder="$t('请选择入仓时间')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
-            </el-form-item>
           </el-form>
 
           <el-card class="box-card">
@@ -289,10 +298,20 @@
                   </el-checkbox-group>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item :label="$t('入仓时间')">
+                  <el-date-picker v-model="form1.inTime" type="datetime" :placeholder="$t('请选择入仓时间')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="16">
+                <el-form-item :label="$t('用途')">
+                  <el-checkbox-group v-model="form1.usageIds">
+                    <el-checkbox v-for="item in getDictDatas(DICT_TYPE.WAREHOUSING_RECORD_DETAIL_USAGE)" :key="item.value" :label="item.value">{{ $l(item, 'label') }}</el-checkbox>
+                  </el-checkbox-group>
+                </el-form-item>
+              </el-col>
             </el-row>
-            <el-form-item :label="$t('入仓时间')">
-              <el-date-picker v-model="form1.inTime" type="datetime" :placeholder="$t('请选择入仓时间')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
-            </el-form-item>
           </el-form>
 
           <el-card class="box-card">
@@ -418,6 +437,7 @@
                 </el-table-column>
                 <el-table-column :label="$t('操作')">
                   <template v-slot="{ row, column, $index}">
+                    <WarehouseRecordDetail v-model="form1.table[$index].orderWarehouseInDetailsVOList" />
                     <el-popconfirm
                         title="确定要删除该行入仓记录吗？"
                         @confirm="handleDeleteRow($index, 1)"
@@ -671,7 +691,8 @@ export default {
         type: undefined,
         feeType: undefined,
         recordMode: undefined,
-        pictureUrls: []
+        pictureUrls: [],
+        usageIds: []
       },
       form1: {
         table: [],
@@ -690,7 +711,8 @@ export default {
         type: 1,
         feeType: undefined,
         recordMode: undefined,
-        pictureUrls: []
+        pictureUrls: [],
+        usageIds: []
       },
       brandList: [],
       brandList1: [],
@@ -769,6 +791,7 @@ export default {
       this.form.type = this.warehousing.type
       this.form.feeType = this.warehousing.feeType
       this.form.pictureUrls = this.warehousing.pictureUrls
+      this.form.usageIds = this.warehousing.usageIds?.split(',') || []
 
       this.warehousing.orderWarehouseInBackItemDoList.forEach(e => {
         let bg = {}
@@ -853,6 +876,7 @@ export default {
               orderItemId: undefined,
               orderNo: this.warehousing.orderNo,
               warehouseInProdAttrIds: this.form1.warehouseInProdAttrIds.join(','),
+              usageIds: this.form1.usageIds.join(','),
               orderWarehouseInItemDoList: this.form1.table.map(e => {
                 return {
                   ...e,
@@ -900,6 +924,7 @@ export default {
                 weight: (+this.warehousing.weight)?.toFixed(2) || '',
                 prodId: this.form.prodId,
                 warehouseInProdAttrIds: this.form.warehouseInProdAttrIds.join(','),
+                usageIds: this.form.usageIds.join(','),
                 "orderWarehouseInUpdateItemDoList": this.form.table.map(e => {
                   return {
                     ...e,
@@ -930,6 +955,7 @@ export default {
                 orderNo: this.warehousing.orderNo,
                 isAppend: this.isAdd ? true : undefined,
                 warehouseInProdAttrIds: this.form.warehouseInProdAttrIds.join(','),
+                usageIds: this.form.usageIds.join(','),
                 orderWarehouseInItemDoList: this.form.table.map(e => {
                   return {
                     ...e,

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

@@ -7,7 +7,7 @@
     <el-row :gutter="10">
       <el-col :span="12">
         <el-form-item :label="$t('中文品名')">
-          <product-selector v-model="value.prodId" determined protect-once :disabled="readonly" />
+          <product-selector v-model="value.prodId" @change="onProductChange" determined protect-once :disabled="readonly" />
         </el-form-item>
       </el-col>
       <el-col :span="12">
@@ -43,40 +43,33 @@
           <el-checkbox-group v-model="usageIds">
             <el-checkbox v-for="item in getDictDatas(DICT_TYPE.WAREHOUSING_RECORD_DETAIL_USAGE)" :key="item.value" :label="item.value" :disabled="readonly">{{ $l(item, 'label') }}</el-checkbox>
           </el-checkbox-group>
-<!--          <dict-selector
-            v-model="usageIds"
-            :type="DICT_TYPE.WAREHOUSING_RECORD_DETAIL_USAGE"
-            multiple
-            form-type="checkbox"
-            :disabled="readonly"
-          ></dict-selector>-->
         </el-form-item>
       </el-col>
     </el-row>
     <el-row :gutter="10">
       <el-col :span="4">
         <el-form-item :label="$t('长')">
-          <el-input v-model="boxGauge1" :disabled="readonly" />
+          <el-input v-model="boxGauge1" type="number" :disabled="readonly" />
         </el-form-item>
       </el-col>
       <el-col :span="4">
         <el-form-item :label="$t('宽')">
-          <el-input v-model="boxGauge2" :disabled="readonly" />
+          <el-input v-model="boxGauge2" type="number" :disabled="readonly" />
         </el-form-item>
       </el-col>
       <el-col :span="4">
         <el-form-item :label="$t('高')">
-          <el-input v-model="boxGauge3" :disabled="readonly" />
+          <el-input v-model="boxGauge3" type="number" :disabled="readonly" />
         </el-form-item>
       </el-col>
       <el-col :span="4">
         <el-form-item :label="$t('重量')">
-          <el-input v-model="value.weight" :disabled="readonly" />
+          <el-input v-model="value.weight" type="number" :disabled="readonly" />
         </el-form-item>
       </el-col>
       <el-col :span="4">
         <el-form-item :label="$t('体积')">
-          <el-input v-model="value.volume" :disabled="readonly" />
+          <el-input v-model="value.volume" type="number" :disabled="readonly" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -93,7 +86,7 @@
       </el-col>
       <el-col :span="4">
         <el-form-item :label="$t('数量')">
-          <el-input v-model="value.quantityAll" :disabled="readonly" />
+          <el-input v-model="value.quantityAll" type="number" :disabled="readonly" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -159,7 +152,6 @@ export default {
     }
 
     if (this.value.usageIds) {
-      console.log('this.value.usageIds',this.value.usageIds)
       await this.$nextTick()
       this.usageIds = this.value.usageIds.split(',') || []
     }
@@ -188,6 +180,12 @@ export default {
     },
     handleDelete() {
       this.$emit('handle-delete')
+    },
+    onProductChange(product){
+      if (!product) {
+        return
+      }
+      this.prodAttrIds = product.attrId ? product.attrId.split(',').map(e => +e) : []
     }
   },
   watch: {
@@ -195,19 +193,46 @@ export default {
       this.value.prodAttrIds = val.join(',')
     },
     usageIds(val) {
-      console.log('val', val)
       this.$nextTick(() => {
         this.value.usageIds = val.join(',')
       })
     },
     boxGauge1() {
+      if (this.boxGauge1 < 0 ) {
+        this.boxGauge1 = -this.boxGauge1
+      }
+
       this.value.boxGauge = this.boxGauge1 + '*' + this.boxGauge2 + '*' + this.boxGauge3
+      this.value.volume = (this.boxGauge1 * this.boxGauge2 * this.boxGauge3 / 1000000).toFixed(2)
     },
     boxGauge2() {
+      if (this.boxGauge2 < 0 ) {
+        this.boxGauge2 = -this.boxGauge2
+      }
       this.value.boxGauge = this.boxGauge1 + '*' + this.boxGauge2 + '*' + this.boxGauge3
+      this.value.volume = (this.boxGauge1 * this.boxGauge2 * this.boxGauge3 / 1000000).toFixed(2)
     },
     boxGauge3() {
+      if (this.boxGauge3 < 0 ) {
+        this.boxGauge3 = -this.boxGauge3
+      }
       this.value.boxGauge = this.boxGauge1 + '*' + this.boxGauge2 + '*' + this.boxGauge3
+      this.value.volume = (this.boxGauge1 * this.boxGauge2 * this.boxGauge3 / 1000000).toFixed(2)
+    },
+    'value.volume'() {
+      if (this.value.volume < 0) {
+        this.value.volume = -this.value.volume
+      }
+    },
+    'value.quantityAll'() {
+      if (this.value.quantityAll < 0) {
+        this.value.quantityAll = -this.value.quantityAll
+      }
+    },
+    'value.weight'() {
+      if (this.value.weight < 0) {
+        this.value.weight = -this.value.weight
+      }
     }
   }
 }