Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/coupon/edit.vue

@@ -534,7 +534,7 @@ export default {
 		checkPositive(object, field){
 			const lastChar = object[field].split('').pop()
 			object[field] = parseFloat(object[field])
-			if(!object[field] || object[field] < 0) object[field] = ''
+			if(isNaN(object[field]) || object[field] < 0) object[field] = ''
 			else object[field] = object[field].toString()
 
 			// 如果最后一位是.且没有其他点则补上

src/views/ecw/offer/components/Commossion.vue

@@ -18,17 +18,17 @@
       <el-row v-if="!form.charging">
         <el-col :span="12">
           <el-form-item :label="$t('运费')">
-            {{form.orgSeaFreight}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
+            {{form.seaFreight}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('清关费')">
-            {{form.orgClearanceFreight}} {{ currencyMap[form.clearanceFreightCurrency] }} / {{ unitMap[form.clearanceFreightVolume] }}
+            {{form.clearanceFreight}} {{ currencyMap[form.clearanceFreightCurrency] }} / {{ unitMap[form.clearanceFreightVolume] }}
           </el-form-item>
         </el-col>
       </el-row>
       <el-form-item :label="$t('全包价')" v-if="form.charging">
-        {{form.orgSeaFreight}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
+        {{form.seaFreight}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
       </el-form-item>
       <el-form-item :label="$t('佣金类型')" prop="commissionType">
         <dict-selector :type="DICT_TYPE.COMMISSION_TYPE" v-model="form.commissionType" form-type="radio" formatter="number" />
@@ -52,7 +52,7 @@
 
         <!-- 明佣+暗佣显示 -->
         <div v-if="form.commissionType == 3">
-          {{$t('成本价')}}：{{form.orgSeaFreight}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
+          {{$t('成本价')}}：{{costPrice}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
         </div>
         
         <!-- 暗佣显示 -->
@@ -64,7 +64,7 @@
           <el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + offer.relationId)">去设置</el-link>
         </div>
 
-        <div  v-if="form.commissionType == 1 || form.commissionType == 3">{{$t('销售价')}}：{{form.orgSeaFreight + form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}</div>
+        <div  v-if="form.commissionType == 1 || form.commissionType == 3">{{$t('销售价')}}：{{ salePrice }} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}</div>
         <div v-if="form.commissionType == 3">{{$t('实际佣金返点')}}：{{form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}</div>
       </div>
       <div class="page-title">{{$t('审批流程')}}</div>
@@ -96,6 +96,7 @@ import { getProductTypeList } from '@/api/ecw/productType'
 import WorkFlow from '@/components/WorkFlow'
 import {getDarkReturnCommission} from '@/api/ecw/customerCommission'
 import {cancelProcessInstance} from '@/api/bpm/processInstance'
+import Decimal from "decimal.js"
 const TYPE = 3
 export default {
   name: "Commossion",
@@ -158,6 +159,12 @@ export default {
         return s ? '【' + s + '】' : ''
       }
     },
+    costPrice(){
+      return Decimal(this.form.seaFreight || 0).minus(this.form.orgShadeCommissionAmount || 0).minus(this.form.shadeCommissionAmount || 0)
+    },
+    salePrice(){
+      return Decimal(this.form.seaFreight || 0).minus(this.form.orgLightCommissionAmount || 0).plus(this.form.lightCommissionAmount || 0)
+    },
     currencyMap(){
       let map = {}
       this.currencyList.forEach(item => {

src/views/ecw/offer/components/SpecialDetail.vue

@@ -25,13 +25,13 @@
       </div>
       
       <div>
-        原运费：{{form.seaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
+        原运费：{{form.orgSeaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
       </div>
       <div>
-        新运费：{{newSeaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
+        新运费：{{form.seaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
       </div>
       <div>
-        成本价：{{form.orgSeaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
+        成本价：{{costPrice}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
       </div>
       <div>
         明佣：{{ form.lightCommissionAmount}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
@@ -132,8 +132,12 @@ export default {
       return map
     },
     // 新运费
-    newSeaFreight(){
+    /* newSeaFreight(){
       return Decimal(this.form.seaFreight).plus(this.form.shadeCommissionAmount).plus(this.form.lightCommissionAmount)
+    }, */
+    // 成本价
+    costPrice(){
+      return Decimal(this.form.seaFreight || 0).minus(this.form.lightCommissionAmount || 0).minus(this.form.shadeCommissionAmount || 0)
     }
   },
   methods: {

src/views/ecw/order/detail.vue

@@ -390,7 +390,7 @@ export default {
       });
     },
     getChannel(){
-      if(!this.order || !this.order.channelId) return
+      if(!this.order || !this.order.channelId || this.order.transportId == 1 || this.order.transportId == 2) return
       getChannel(this.order.channelId).then(res => {
         this.channelName = res.data.nameZh
       })

src/views/ecw/order/edit.vue

@@ -698,6 +698,7 @@ export default {
             totalWorth: new Decimal(0),
             totalQuatity: new Decimal(0)
         }
+        if(!this.form || !this.form.orderItemVOList) return sum
         this.form.orderItemVOList.forEach(item => {
             sum.totalNum = sum.totalNum.plus(item.num || 0)
             sum.totalVolume = sum.totalVolume.plus(item.volume || 0)
@@ -767,6 +768,11 @@ export default {
             this.$set(this.form, 'lineId', undefined)
         }
 
+        // 选择海运拼柜和海运整柜清空渠道值
+        if(transportId == 1 || transportId == 2){
+            this.$set(this.form, 'channelId', null)
+        }
+        
         this.getOpenedRouterList()
     },
     'form.channelId'(){

src/views/ecw/order/index.vue

@@ -139,7 +139,8 @@
       <el-table-column :label="$t('唛头')" align="center" prop="marks" />
       <el-table-column :label="$t('总箱数/入仓箱数')" align="center" prop="sumNum">
         <template slot-scope="{row}">
-          {{row.totalNum}}{{$t('箱')}}/{{row.sumNum}}{{$t('箱')}}
+          <div :style="{color:row.customsType != 1 ? 'red' : null}">{{row.totalNum}}{{$t('箱')}}/{{row.sumNum}}{{$t('箱')}}</div>
+          <dict-tag v-if="row.customsType != 1" style="color:red" :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="row.customsType"></dict-tag>
         </template>
       </el-table-column>
       <el-table-column :label="$t('体积/重量')" align="center" prop="sumWeight">

src/views/ecw/order/special/Preferential.vue

@@ -13,7 +13,7 @@
       </template>
       <template v-else>
         <el-form-item :label="$t('原泡货标准')">
-          {{form.orgWVolume}} kg
+          {{form.orgVWeight}} kg
         </el-form-item>
         <el-form-item :label="$t('现泡货标准')" style="width: 400px" prop="clearanceFreight">
           <el-input v-model="form.vweight" type="number" class="w-100" /> kg