Merge branch 'pre-release' into test

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

 <script>
 import Decimal from 'decimal.js'
+import { parseTime } from '@/utils/ruoyi'
 export default {
   name: 'DetailProd',
   props: {
@@ -19,6 +20,16 @@ export default {
       type: Object,
       required: true
     },
+    transportId: {
+      type: Number,
+      required: false
+    },
+  },
+  data(){
+    return {
+      feeDetail: null,
+      showFeeDetailDialog: false
+    }
   },
   computed:{
     // 显示特性
@@ -35,6 +46,119 @@ export default {
     },
   },
   methods:{
+    closeFeeDetail(){
+      this.showFeeDetailDialog = null
+    },
+    showFeeDetail(row, type){
+      console.log("showFeeDetail", row, type)
+      this.showFeeDetailDialog = true
+      const freight = [], clearance = []
+      
+      let freightFields = []
+      let clearanceFields = []
+      
+      const brandType = row.warehouseInInfoVO ? row.feeType : row.brandType
+      // 不是特价则显示其他字段
+      freightFields = [
+        // {field: 'oneSeaFreight', label: this.$t('成交单价')},
+        {field: 'originalSeaFreight', label: this.$t('默认单价（无牌无液无电）')},
+        // {field: 'brandFreightPrice', label: this.$t('品牌加价')},
+        {field: 'liquidFreightPrice', label: this.$t('液体加价')},
+        {field: 'electrifiedFreightPrice', label: this.$t('带电加价')},
+        {field: 'discountFreightPrice', label: this.$t('优惠活动减免')},
+        {field: 'plainCommission', label: this.$t('明佣')},
+        {field: 'hiddenCommission', label: this.$t('暗佣')}
+      ]
+      
+      // 批量加价
+      if(row.markupSeaFreight){
+        freightFields.push({field: 'markupSeaFreight', label: this.$t('批量加价')})
+      }
+      
+      // 品牌加价
+      if(row['brandFreightPrice'] && row['brandFreightPrice'] > 0){
+        freightFields.push({field: 'brandFreightPrice', label: brandType == 1 ? this.$t('有品牌加价') : this.$t('中性品牌加价')})
+      }
+      
+      // 有减免金额才显示优惠后单价
+      if(row['discountFreightPrice'] && row['discountFreightPrice'] > 0){
+        freightFields.push({field: 'afterDiscountSeaFreight', label: this.$t('优惠后单价')})
+      }
+      // 包装加价
+      if(row['packagingFreightPrice'] && row['packagingFreightPrice'] > 0){
+        freightFields.push({field: 'packagingFreightPrice', label: this.$t('包装加价')})
+      }
+      freightFields.push({field: 'oneSeaFreight', label: this.$t('成交单价')})
+      console.log({freightFields})
+      freightFields.forEach(item => {
+        if(row[item.field]){
+          freight.push({
+            label: item.label,
+            value: row[item.field],
+            currency: row.seaFreightCurrency,
+            volume: row.seaFreightVolume,
+            // 特价通过四个字段标识，任一为true则为特价
+            remark: item.field == 'oneSeaFreight' && (row.specialPriceType || row.splitCustomPriceType || row.channelManualPricing) ? this.$t('特价') : null
+          })
+          
+        }
+      })
+      
+      clearanceFields = [
+        {field: 'originalClearanceFreight', label: this.$t('默认单价（无牌无液无电）')},
+        // {field: 'brandClearanceFeePrice', label: this.$t('品牌加价')},
+        {field: 'liquidClearanceFeePrice', label: this.$t('液体加价')},
+        {field: 'electrifiedClearanceFeePrice', label: this.$t('带电加价')},
+        {field: 'discountClearanceFeePrice', label: this.$t('优惠活动减免')}
+      ]
+      // 批量加价
+      if(row.markupClearanceFreight){
+        clearanceFields.push({field: 'markupClearanceFreight', label: this.$t('批量加价')})
+      }
+      // 品牌加价
+      if(row['brandClearanceFeePrice'] && row['brandClearanceFeePrice'] > 0){
+        clearanceFields.push({field: 'brandClearanceFeePrice', label: brandType == 1 ? this.$t('有品牌加价') : this.$t('中性品牌加价')})
+      }
+      if(row['discountClearanceFeePrice'] && row['discountClearanceFeePrice'] > 0){
+        clearanceFields.push({field: 'afterDiscountClearanceFreight', label: this.$t('优惠后单价')})
+      }
+      // 包装加价
+      if(row['packagingClearanceFeePrice'] && row['packagingClearanceFeePrice'] > 0){
+        clearanceFields.push({field: 'packagingClearanceFeePrice', label: this.$t('包装加价')})
+      }
+      clearanceFields.push({field: 'oneClearanceFreight', label: this.$t('成交单价')})
+      clearanceFields.forEach(item => {
+        if(row[item.field]){
+          clearance.push({
+            label: item.label,
+            value: row[item.field],
+            currency: row.clearanceFreightCurrency,
+            volume: row.clearanceFreightVolume,
+            remark: (row.specialPriceType || row.splitCustomPriceType || row.channelManualPricing) && item.field == 'oneClearanceFreight' ? this.$t('特价') : null
+          })
+        }
+      })
+      
+      
+      freight.push({
+        label: this.$t('价格更新时间'),
+        value: parseTime(row.updateTime)
+      })
+      clearance.push({
+        label: this.$t('价格更新时间'),
+        value: parseTime(row.updateTime)
+      })
+      this.feeDetail = {
+        freight,
+        clearance,
+        charging:
+        row.charging,
+        coupons: row.couponInfoVOList,
+        airClearanceSource: [,this.$t('商品'), this.$t('渠道'), this.$t('商品线路价格'),this.$t('线路渠道')][row.airClearanceSource], // 1 商品 2 渠道 3 商品线路价格 4 线路渠道
+        airClearanceInfo: JSON.parse(row.airClearanceInfo), //空运清关费来源数据详情,
+        sourceName: row.airClearanceSource == 1 ? this.$l(row, 'prodTitle') : this.order?.channelName
+      }
+    },
     // 获取储位名称
     getLocationName(locationArr){
       if(!locationArr || !locationArr.length) return ''
@@ -100,6 +224,7 @@ export default {
 </script>
 
 <template>
+  <div>
     <el-table
       :data="list"
       border
@@ -215,5 +340,60 @@ export default {
       </el-table-column>
       <el-table-column prop="expressNo" :label="$t('填单快递单号')" />
     </el-table>
+    <el-dialog :title="$t('费用详情')" :visible="!!showFeeDetailDialog" :before-close="closeFeeDetail">
+      <el-row v-if="feeDetail">
+        <el-col :span="12">
+          <div>{{feeDetail.charging ? $t('全包价') : $t('运费')}}</div>
+          <div v-for="item in feeDetail.freight">
+            {{item.label}}: {{item.value}}
+            <template v-if="item.currency">
+              {{currencyMap[item.currency]}} / {{unitMap[item.volume]}} <span v-if="item.remark">【{{item.remark}}】</span>
+            </template>
+          </div>
+        </el-col>
+        <el-col :span="12" v-if="feeDetail.charging != 1">
+          <div>
+            {{$t('清关费')}}
+            <template v-if="transportId == 3 || transportId == 4">
+              {{$t('来自{source}', {source: feeDetail.airClearanceSource + feeDetail.sourceName})}}
+            </template>
+          </div>
+          <div v-for="item in feeDetail.clearance">
+            {{item.label}}: {{item.value}}
+            <template v-if="item.currency">
+              {{currencyMap[item.currency]}} / {{unitMap[item.volume]}} <span v-if="item.remark">【{{item.remark}}】</span>
+            </template>
+          </div>
+        </el-col>
+      </el-row>
+      
+      <div v-if="feeDetail && feeDetail.coupons && feeDetail.coupons.length" class="page-title">{{ $t('优惠详情') }}</div>
+      <el-table v-if="feeDetail && feeDetail.coupons && feeDetail.coupons.length" :data="feeDetail.coupons">
+        <el-table-column label="优惠ID" prop="couponId"></el-table-column>
+        <el-table-column label="优惠名称">
+          <template slot-scope="{row}">
+            {{ $l(row, 'title') }}
+          </template>
+        </el-table-column>
+        <el-table-column label="类型">
+          <template slot-scope="{row}">
+            <dict-tag :type="DICT_TYPE.ECW_COUPON_TYPE" :value="row.type" ></dict-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="运费优惠">
+          <template slot-scope="{row}">
+            {{ row.freightReduceAmount}}
+            {{currencyMap[row.freightReduceCurrencyId]}}
+          </template>
+        </el-table-column>
+        <el-table-column label="清关费优惠">
+          <template slot-scope="{row}">
+            {{ row.clearanceReduceAmount}}
+            {{ currencyMap[row.clearanceReduceCurrencyId] }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
 </template>
 

src/views/ecw/order/detail.vue

@@ -221,6 +221,7 @@
                        :attr-list="attrList"
                        :currency-map="currencyMap"
                        :unit-map="unitMap"
+                       :transport-id="order.transportId"
           ></detail-prod>
         </el-tab-pane>
         <!--退参品名  退仓/已混箱品名 lanbm 2024-04-16 按客户的要求修改-->
@@ -229,6 +230,7 @@
                        :attr-list="attrList"
                        :currency-map="currencyMap"
                        :unit-map="unitMap"
+                       :transport-id="order.transportId"
           ></detail-prod>
         </el-tab-pane>
         <!--lanbm 2024-06-11 处理订单到仓时间取值问题-->
@@ -374,61 +376,6 @@
       </el-table>
     </el-dialog>
 
-    <el-dialog :title="$t('费用详情')" :visible="!!showFeeDetailDialog" :before-close="closeFeeDetail">
-      <el-row v-if="feeDetail">
-        <el-col :span="12">
-          <div>{{feeDetail.charging ? $t('全包价') : $t('运费')}}</div>
-          <div v-for="item in feeDetail.freight">
-            {{item.label}}: {{item.value}}
-            <template v-if="item.currency">
-              {{currencyMap[item.currency]}} / {{unitMap[item.volume]}} <span v-if="item.remark">【{{item.remark}}】</span>
-            </template>
-          </div>
-        </el-col>
-        <el-col :span="12" v-if="feeDetail.charging != 1">
-          <div>
-            {{$t('清关费')}}
-            <template v-if="order.transportId == 3 || order.transportId == 4">
-              {{$t('来自{source}', {source: feeDetail.airClearanceSource + feeDetail.sourceName})}}
-            </template>
-          </div>
-          <div v-for="item in feeDetail.clearance">
-            {{item.label}}: {{item.value}}
-            <template v-if="item.currency">
-              {{currencyMap[item.currency]}} / {{unitMap[item.volume]}} <span v-if="item.remark">【{{item.remark}}】</span>
-            </template>
-          </div>
-        </el-col>
-      </el-row>
-
-      <div v-if="feeDetail && feeDetail.coupons && feeDetail.coupons.length" class="page-title">{{ $t('优惠详情') }}</div>
-      <el-table v-if="feeDetail && feeDetail.coupons && feeDetail.coupons.length" :data="feeDetail.coupons">
-        <el-table-column label="优惠ID" prop="couponId"></el-table-column>
-        <el-table-column label="优惠名称">
-          <template slot-scope="{row}">
-            {{ $l(row, 'title') }}
-          </template>
-        </el-table-column>
-        <el-table-column label="类型">
-          <template slot-scope="{row}">
-            <dict-tag :type="DICT_TYPE.ECW_COUPON_TYPE" :value="row.type" ></dict-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="运费优惠">
-          <template slot-scope="{row}">
-            {{ row.freightReduceAmount}}
-            {{currencyMap[row.freightReduceCurrencyId]}}
-          </template>
-        </el-table-column>
-        <el-table-column label="清关费优惠">
-          <template slot-scope="{row}">
-            {{ row.clearanceReduceAmount}}
-            {{ currencyMap[row.clearanceReduceCurrencyId] }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-
     <!--日志详情-->
     <operate-log-detail v-if="showLogDetailId" :log-id="showLogDetailId" @close="showLogDetailId=null"></operate-log-detail>
     <!--打包历史-->
@@ -518,8 +465,8 @@ export default {
       region: '',
       orderWarehouseIn: null, // 入仓详情
       showWarehouseInItemId: null, // 当前显示的入仓
-      showFeeDetailDialog: null, // 是否显示费用详情弹层
-      feeDetail: null, // 费用详情
+      /*showFeeDetailDialog: null, // 是否显示费用详情弹层
+      feeDetail: null, // 费用详情*/
       logsLoading: false, // 日志加载中
       logs: [], // 操作日志
       activeNames: [],//显示隐藏订单基本信息
@@ -624,6 +571,9 @@ export default {
   },
   methods: {
     checkPermi, // 检查权限,
+    handleTest(e){
+      console.log("handleTest", e)
+    },
     //订单信息显示更多
     handleChange(val){
       this.showText = val.length>0? this.$t('隐藏') : this.$t('显示更多')
@@ -638,119 +588,7 @@ export default {
       this.showMore = !this.showMore;
       this.consigneeText = this.showMore? this.$t('隐藏') : this.$t('更多')
     },
-    // 显示费用详情
-    showFeeDetail(row, type){
-      this.showFeeDetailDialog = true
-      const freight = [], clearance = []
-
-      let freightFields = []
-      let clearanceFields = []
     
-      const brandType = row.warehouseInInfoVO ? row.feeType : row.brandType
-      // 不是特价则显示其他字段
-      freightFields = [
-        // {field: 'oneSeaFreight', label: this.$t('成交单价')},
-        {field: 'originalSeaFreight', label: this.$t('默认单价（无牌无液无电）')},
-        // {field: 'brandFreightPrice', label: this.$t('品牌加价')},
-        {field: 'liquidFreightPrice', label: this.$t('液体加价')},
-        {field: 'electrifiedFreightPrice', label: this.$t('带电加价')},
-        {field: 'discountFreightPrice', label: this.$t('优惠活动减免')},
-        {field: 'plainCommission', label: this.$t('明佣')},
-        {field: 'hiddenCommission', label: this.$t('暗佣')}
-      ]
-
-      // 批量加价
-      if(row.markupSeaFreight){
-        freightFields.push({field: 'markupSeaFreight', label: this.$t('批量加价')})
-      }
-
-      // 品牌加价
-      if(row['brandFreightPrice'] && row['brandFreightPrice'] > 0){
-        freightFields.push({field: 'brandFreightPrice', label: brandType == 1 ? this.$t('有品牌加价') : this.$t('中性品牌加价')})
-      }
-
-      // 有减免金额才显示优惠后单价
-      if(row['discountFreightPrice'] && row['discountFreightPrice'] > 0){
-        freightFields.push({field: 'afterDiscountSeaFreight', label: this.$t('优惠后单价')})
-      }
-      // 包装加价
-      if(row['packagingFreightPrice'] && row['packagingFreightPrice'] > 0){
-        freightFields.push({field: 'packagingFreightPrice', label: this.$t('包装加价')})
-      }
-      freightFields.push({field: 'oneSeaFreight', label: this.$t('成交单价')})
-      console.log({freightFields})
-      freightFields.forEach(item => {
-        if(row[item.field]){
-          freight.push({
-            label: item.label,
-            value: row[item.field],
-            currency: row.seaFreightCurrency,
-            volume: row.seaFreightVolume,
-            // 特价通过四个字段标识，任一为true则为特价
-            remark: item.field == 'oneSeaFreight' && (row.specialPriceType || row.splitCustomPriceType || row.channelManualPricing) ? this.$t('特价') : null
-          })
-
-        }
-      })
-
-      clearanceFields = [
-        {field: 'originalClearanceFreight', label: this.$t('默认单价（无牌无液无电）')},
-        // {field: 'brandClearanceFeePrice', label: this.$t('品牌加价')},
-        {field: 'liquidClearanceFeePrice', label: this.$t('液体加价')},
-        {field: 'electrifiedClearanceFeePrice', label: this.$t('带电加价')},
-        {field: 'discountClearanceFeePrice', label: this.$t('优惠活动减免')}
-      ]
-      // 批量加价
-      if(row.markupClearanceFreight){
-        clearanceFields.push({field: 'markupClearanceFreight', label: this.$t('批量加价')})
-      }
-      // 品牌加价
-      if(row['brandClearanceFeePrice'] && row['brandClearanceFeePrice'] > 0){
-        clearanceFields.push({field: 'brandClearanceFeePrice', label: brandType == 1 ? this.$t('有品牌加价') : this.$t('中性品牌加价')})
-      }
-      if(row['discountClearanceFeePrice'] && row['discountClearanceFeePrice'] > 0){
-        clearanceFields.push({field: 'afterDiscountClearanceFreight', label: this.$t('优惠后单价')})
-      }
-      // 包装加价
-      if(row['packagingClearanceFeePrice'] && row['packagingClearanceFeePrice'] > 0){
-        clearanceFields.push({field: 'packagingClearanceFeePrice', label: this.$t('包装加价')})
-      }
-      clearanceFields.push({field: 'oneClearanceFreight', label: this.$t('成交单价')})
-      clearanceFields.forEach(item => {
-        if(row[item.field]){
-          clearance.push({
-            label: item.label,
-            value: row[item.field],
-            currency: row.clearanceFreightCurrency,
-            volume: row.clearanceFreightVolume,
-            remark: (row.specialPriceType || row.splitCustomPriceType || row.channelManualPricing) && item.field == 'oneClearanceFreight' ? this.$t('特价') : null
-          })
-        }
-      })
-
-
-      freight.push({
-        label: this.$t('价格更新时间'),
-        value: parseTime(row.updateTime)
-      })
-      clearance.push({
-        label: this.$t('价格更新时间'),
-        value: parseTime(row.updateTime)
-      })
-      this.feeDetail = {
-        freight,
-        clearance,
-        charging:
-        row.charging,
-        coupons: row.couponInfoVOList,
-        airClearanceSource: [,this.$t('商品'), this.$t('渠道'), this.$t('商品线路价格'),this.$t('线路渠道')][row.airClearanceSource], // 1 商品 2 渠道 3 商品线路价格 4 线路渠道
-        airClearanceInfo: JSON.parse(row.airClearanceInfo), //空运清关费来源数据详情,
-        sourceName: row.airClearanceSource == 1 ? this.$l(row, 'prodTitle') : this.order?.channelName
-      }
-    },
-    closeFeeDetail(){
-      this.showFeeDetailDialog = null
-    },
     /** 查询列表 */
     getOrder() {
       let that = this

src/views/ecw/order/edit.vue

@@ -707,7 +707,7 @@ import Template from '@/views/cms/template/index.vue'
 let makeDefaultFormData = () => {
   return {
     destCountryId: null,
-    lienId: null,
+    lineId: null,
     objectiveId: null,
     departureId: null,
     status:0,

src/views/ecw/order/index.vue

@@ -1000,6 +1000,7 @@ export default {
         if (type.indexOf("2") > -1) {
           arr.push(this.$t("海外仓"))
         }
+        return arr.join(",")
       }
     }
   },