Merge branch 'release' of...

Merge branch 'release' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release2.2new

 Conflicts:
	src/views/ecw/offer/edit.vue
	src/views/ecw/warehouse/index.vue

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

@@ -373,8 +373,12 @@
     <el-card class="mt-10">
       <span slot="header">{{$t('特价折扣')}}</span>
       <el-table :data="orderSpecialApplyVOList">
-        <el-table-column :label="$t('商品类型')" prop="prodType"></el-table-column>
-        <el-table-column :label="$t('商品名称')" prop="prodTitleEn"></el-table-column>
+        <el-table-column :label="$t('商品类型')" prop="prodType">
+            <template slot-scope="{row}">
+            {{showProductTypeName(row.prodType)}}
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('商品名称')" prop="prodTitleZh"></el-table-column>
         <el-table-column :label="$t('英文名称')" prop="prodTitleEn"></el-table-column>
         <!--<el-table-column :label="$t('线路')" width="120" prop="line">
 
@@ -420,6 +424,7 @@ import Price from "@/views/ecw/order/components/price.vue";
 import {parseTime} from "@/utils/ruoyi";
 import Decimal  from "decimal.js";
 import {createElementVNode} from "@vue/runtime-dom";
+import {getProductTypeList} from "@/api/ecw/productType";
 export default  {
   props:{
     orderId: [Number, String],
@@ -437,7 +442,9 @@ export default  {
       // 订单费用汇总
       orderSummary: null,
       // 订单费用明细汇总
-      orderDetailSummary: null
+      orderDetailSummary: null,
+        // 商品类型
+        productTypeList: []
     }
   },
   computed:{
@@ -467,8 +474,25 @@ export default  {
     // 特价折扣
     orderSpecialApplyVOList(){
       return this.orderDetailSummary?.orderSpecialApplyVOList || []
+    },
+    // 根据商品类型ID返回名称
+    showProductTypeName(){
+        return id => {
+            if(!this.productTypeList.length) return '-'
+            const item = this.productTypeList.find(item => item.id === id)
+            return this.$l(item, 'title')
+        }
     }
   },
+  watch:{
+      orderSpecialApplyVOList(list){
+          if(list.length && !this.productTypeList.length){
+              getProductTypeList().then(res => {
+                  this.productTypeList = res.data
+              })
+          }
+      }
+  },
   mounted() {
     this.getOrderSummary()
     this.getOrderDetailSummary()
@@ -479,6 +503,7 @@ export default  {
       let total = {}
       arr.forEach(item => {
         const currency = item[currencyField]
+          if(!currency) return
         if(!total[currency]){
           total[currency] = new Decimal(0)
         }

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

@@ -837,7 +837,7 @@ export default {
               orderId: this.warehousing.orderId,
               orderItemId: undefined,
               orderNo: this.warehousing.orderNo,
-              warehouseInProdAttrIds: this.form.warehouseInProdAttrIds.join(','),
+              warehouseInProdAttrIds: this.form1.warehouseInProdAttrIds.join(','),
               orderWarehouseInItemDoList: this.form1.table.map(e => {
                 return {
                   ...e,

src/views/ecw/warehouse/index.vue

@@ -327,6 +327,9 @@
           <el-form-item :label="$t('最小保价费金额')" >
             <el-input-number  :controls="false" v-model="lineform.minPrice"  > </el-input-number>
           </el-form-item>
+          <el-form-item :label="$t('最小保价费金额')" >
+            <el-input-number  :controls="false" v-model="lineform.minPrice"  > </el-input-number>
+          </el-form-item>
           <el-form-item :label="$t('是否支持控货')">
             <el-radio-group v-model="lineform.controlStatus">
               <el-radio :label="0">支持</el-radio>
@@ -888,7 +891,8 @@ export default {
         this.lineform.lineId = row.lineId;
         this.lineform.transportType = row.transportType;
          this.lineform.currencyUnit =  row.currencyUnit ? row.currencyUnit : 1
-        this.lineform.controlStatus =  row.controlStatus ?  row.controlStatus  : 0
+         this.lineform.controlStatus =  row.controlStatus ?  row.controlStatus  : 0
+        this.lineform.minPrice = row.minPrice ?  row.minPrice  : 0
        if(row.minPrice){
          this.lineform.minPrice = row.minPrice;
        }else {