订单重货提示

src/views/ecw/coupon/edit.vue

@@ -477,12 +477,20 @@ export default {
 		},
 		// 满减活动如果选择的满多少金额减，则在选择满货币后需要同步减的货币，且禁用减的货币修改
 		checkReduceCurrency(item){
+			// 金额满减
 			if(this.form.type == 2 && item.combUnit.split('_')[0] == 'fullCurrencyId'){
 				this.$set(item, 'reduceCurrencyDisabled', true)
 				this.$set(item, 'reduceCurrencyId', +item.combUnit.split('_')[1])
 				return
 			}
 
+			// 优惠
+			if(this.form.type == 5){
+				this.$set(item, 'reduceCurrencyDisabled', true)
+				this.$set(item, 'reduceCurrencyId', +item.fullCurrencyId)
+			}
+
+
 			if(item.reduceCurrencyDisabled){
 				this.$set(item, 'reduceCurrencyDisabled', false)
 			}

src/views/ecw/order/index.vue

@@ -148,8 +148,12 @@
           <!--入仓前是填单数据，入仓后是入仓数据-->
           <component
           :is="row.orderType ==  2 ? 'el-tooltip' : 'div'"
-          class="item" effect="dark"
-          :content="(row.wVolume||0)+'m³'"
+          class="item"
+          :style="{
+            color: row.orderType ==  2 ? 'red' : null
+          }"
+          effect="dark"
+          :content="(row.wvolume||0)+'m³'"
           placement="bottom">
             <div v-if="row.inWarehouseState <= 1">{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</div>
             <div v-else>{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</div>