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

src/components/OrderBaseInfo/index.vue

@@ -18,6 +18,9 @@
       <el-descriptions-item :label="$t('送货时间')">{{ order.deliveryDate || '' }}</el-descriptions-item>
       <el-descriptions-item :label="$t('入仓类型')">{{ getDictDataLabel(DICT_TYPE.ECW_WAREHOUSING_TYPE, order.warehouseType) }}</el-descriptions-item>
       <el-descriptions-item :label="$t('订单号')">{{ order.orderNo }}</el-descriptions-item>
+
+      <el-descriptions-item v-if="stocking" :label="$t('出货渠道')">{{ order.channelName }}</el-descriptions-item>
+      <el-descriptions-item v-if="stocking" :label="$t('可出特性')">{{ order.channelAttrName }}</el-descriptions-item>
     </el-descriptions>
   </div>
 </template>
@@ -29,7 +32,9 @@ export default {
   name: "orderBaseInfo",
 
   props: {
-    order: Object
+    order: Object,
+    // 是否备货，如果页面引用需要显示可出特性和渠道
+    stocking: Boolean
   },
 
   data () {

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

@@ -3,7 +3,7 @@
   <div class="app-container">
     <h2>{{ title }}-{{ order.orderNo }}</h2>
 
-    <order-base-info :order="order"></order-base-info>
+    <order-base-info :order="order" stocking></order-base-info>
 
     <h2>{{$t('货物信息')}}</h2>
     <el-table
@@ -53,6 +53,14 @@
         :label="$t('快递单号')">
         {{ row.expressNo || (row.warehouseInInfoVO ? row.warehouseInInfoVO.expressNo : '') }}
       </el-table-column>
+      <el-table-column
+        v-slot="{row}"
+        :label="$t('商品特性')">
+        <template v-if="row.prodAttrIds">
+          {{showAttr(row.prodAttrIds)}}
+        </template>
+      </el-table-column>
+
       <el-table-column
         prop="createTime"
         :label="$t('最后操作时间')">
@@ -185,11 +193,14 @@ import imageUpload from "@/components/ImageUpload";
 import {parseTime} from "@/utils/ruoyi"
 import ImageAndVideoUpload from '@/components/ImageAndVideoUpload'
 import Package from './components/Package'
+import Template from "@/views/cms/template/index.vue";
+import {getProductAttrList} from "@/api/ecw/productAttr";
 
 export default {
   name: "Stocking",
 
   components: {
+    Template,
     orderBaseInfo,
     WarehouseAreaDialog,
     PrintTag,
@@ -208,6 +219,7 @@ export default {
       this.getOrder()
     }
     getCurrencyList().then(res => this.currencyList = res.data)
+    getProductAttrList().then(res => this.productAttrList = res.data)
   },
 
   data() {
@@ -261,7 +273,8 @@ export default {
       // 当前打包的订单商品项
       packageOrderItem: null,
       // 打包商品的入仓商品项
-      packageWarehouseItem: null
+      packageWarehouseItem: null,
+      productAttrList: []
     }
   },
 
@@ -294,6 +307,8 @@ export default {
     },
     getOrder(){
       return getOrder(this.orderId).then(r => {
+        // 获取渠道可出特性文案用户订单基础信息显示
+        r.data.channelAttrName = this.showAttr(r.data.channelAttrId)
         this.order = r.data
         this.form.sumVolume = this.order.sumVolume
         this.form.sumWeight = this.order.sumWeight
@@ -395,6 +410,18 @@ export default {
     },
     warehouseId(){
       return this.order?.logisticsInfoDto?.startWarehouseId
+    },
+    // 显示特性
+    showAttr(){
+      return attrIds => {
+        if(!attrIds) return ''
+        let attrArr = attrIds.split(",").map(item => +item)
+        let arr = []
+        this.productAttrList.forEach(item => {
+          if(attrArr.indexOf(item.id) > -1) arr.push(this.$l(item, 'attrName'))
+        })
+        return  arr.join(",")
+      }
     }
   }
 }