Merge remote-tracking branch 'origin/dev1.6' into dev1.6

src/components/WarehouseAreaSelect/index.vue

@@ -188,8 +188,10 @@ export default {
         this.$emit('input', data)
         this.dialogVisible = false
 
-        if (this.isEditing || this.orderItemId) {
-            updateWarehouseInLocation(data)
+        if (this.isEditing || this.warehouseInId) {
+            updateWarehouseInLocation(data).then(() => {
+              this.$message.success('储位修改成功')
+            })
         }
       })
     },

src/views/ecw/order/detail.vue

@@ -292,6 +292,7 @@
             <el-table-column :label="$t('操作人类型')" width="100">
               <template slot-scope="{row}">{{ row.userType == 1 ? $t('会员') : $t('管理员') }}</template>
             </el-table-column>
+            <el-table-column :label="$t('操作类型')" prop="type" width="150"></el-table-column>
             <el-table-column :label="$t('操作描述')" prop="msg" width="300"></el-table-column>
             <el-table-column :label="$t('备注')" prop="note">
               <template slot-scope="{row}">
@@ -497,8 +498,6 @@ export default {
 
     getCurrencyList().then(res => this.currencyList = res.data)
     getUnitList().then(res => this.unitList = res.data)
-
-    console.log('2023-01-14 23:23 看到此消息则表示代码最新')
   },
   methods: {
     checkPermi, // 检查权限

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

@@ -253,7 +253,7 @@
                       <el-input v-else v-model="form1.table[$index].cartonsNum" placeholder="">
                         <span slot="append">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGING_TYPE, form1.table[$index].unit) }}</span>
                       </el-input>
-                      <dict-selector :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" v-model="form1.table[$index].specificationType" @change="handleVolume($index)"></dict-selector>
+                      <dict-selector :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" v-model="form1.table[$index].specificationType" @change="handleVolume($index, 1)"></dict-selector>
                     </el-form-item>
                   </template>
                 </el-table-column>
@@ -532,7 +532,7 @@ export default {
         prodTitleEn: undefined,
         prodTitleZh: undefined,
         prodType: undefined,
-        type: undefined,
+        type: 1,
         feeType: undefined
       },
       brandList: [],
@@ -561,37 +561,45 @@ export default {
   },
 
   mounted() {
-    this.form.table = this.warehousing.orderWarehouseInBackItemDoList
-    this.form.brandType = this.warehousing.brandType
-    this.form.orderId = this.warehousing.orderId
-    this.form.orderItemId = this.warehousing.orderNo
-    this.form.orderNo = this.warehousing.orderNo
-    this.form.brand = this.warehousing.brand
-    this.form.brandType = this.warehousing.brandType
-    this.form.inTime = this.warehousing.inTime
-    this.form.material = this.warehousing.material
-    this.form.orderId = this.warehousing.orderId
-    this.form.orderItemId = this.warehousing.orderItemId
-    this.form.orderNo = this.warehousing.orderNo
-    this.form.prodAttrIds = this.warehousing.prodAttrIds
-    this.form.prodId = this.warehousing.prodId
-    this.form.prodTitleEn = this.warehousing.prodTitleEn
-    this.form.prodTitleZh = this.warehousing.prodTitleZh
-    this.form.prodType = this.warehousing.prodType
-    this.form.type = this.warehousing.type
-    this.form.feeType = this.warehousing.feeType
-
-    this.form.table.forEach(e => {
-      if (e.boxGauge) {
-        const boxGauge = e.boxGauge.split('*')
-        e.boxGauge1 = boxGauge[0]
-        e.boxGauge2 = boxGauge[1]
-        e.boxGauge3 = boxGauge[2]
-      }
-    })
+    this.init()
   },
 
   methods: {
+    init(){
+      this.form.table = this.warehousing.orderWarehouseInBackItemDoList
+      this.form.brandType = this.warehousing.brandType
+      this.form.orderId = this.warehousing.orderId
+      this.form.orderItemId = this.warehousing.orderNo
+      this.form.orderNo = this.warehousing.orderNo
+      this.form.brand = this.warehousing.brand
+      this.form.brandType = this.warehousing.brandType
+      this.form.inTime = this.warehousing.inTime
+      this.form.material = this.warehousing.material
+      this.form.orderId = this.warehousing.orderId
+      this.form.orderItemId = this.warehousing.orderItemId
+      this.form.orderNo = this.warehousing.orderNo
+      this.form.prodAttrIds = this.warehousing.prodAttrIds
+      this.form.prodId = this.warehousing.prodId
+      this.form.prodTitleEn = this.warehousing.prodTitleEn
+      this.form.prodTitleZh = this.warehousing.prodTitleZh
+      this.form.prodType = this.warehousing.prodType
+      this.form.type = this.warehousing.type
+      this.form.feeType = this.warehousing.feeType
+
+      this.form.table.forEach(e => {
+        if (e.boxGauge) {
+          const boxGauge = e.boxGauge.split('*')
+          e.boxGauge1 = boxGauge[0]
+          e.boxGauge2 = boxGauge[1]
+          e.boxGauge3 = boxGauge[2]
+        }
+      })
+
+      if (!this.edit){
+        this.handleAdd()
+        this.handleAdd(1)
+      }
+    },
     handleClose() {
       this.$emit('close')
       this.visible = false

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

@@ -165,7 +165,7 @@
       width="300px">
       <div style="text-align: center">{{$t('在完成入仓前，您还可以')}}</div>
       <div style="text-align: center;padding: 15px 0">
-        <el-button type="info" @click="areaVisible = true">{{$t('选择储位')}}</el-button>
+<!--        <el-button type="info" @click="areaVisible = true">{{$t('选择储位')}}</el-button>-->
         <el-button type="info" @click="isShowPrintTag = true">{{$t('打印标签')}}</el-button>
       </div>
       <div style="text-align: center">

src/views/ecw/order/weightDeal.vue

@@ -75,7 +75,11 @@
             <el-table-column :label="$t('入库货物属性')">
               <template slot-scope="scope">
                  <p>{{$t('箱规')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.boxGauge:0}}</p>
-                 <p>{{$t('品牌')}}：<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.feeType" /></p>
+                 <p>{{$t('品牌')}}：
+                   <span v-if="row.brandName">{{row.brandName}}</span>
+                   <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType" />
+                  </p>
+                <!-- <p>{{$t('品牌')}}：<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.feeType" /></p> -->
                   <p>{{$t('箱数')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}&nbsp;&nbsp;</p>
                   <p>{{$t('体积')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}CBM&nbsp;&nbsp;</p>
                   <p>{{$t('重量')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}KG