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

src/views/ecw/order/edit.vue

@@ -941,7 +941,7 @@ export default {
         this.getOrder()
     }
     if(this.$route.query.transportType != this.transportId){
-      this.set(this.form.transportId, +this.$route.query.transportType)
+      this.set(this.form.transportId, +this.$route.query.transportType || null)
     }
 
     // 变更出货渠道
@@ -1289,13 +1289,17 @@ export default {
         if(this.calculating || !calcable) return false
         this.calculating = true
         console.log('calculating ---> ')
-        calculationPrice({
+        const data = {
           lineId: this.form.lineId,
           transportId: this.form.transportId,
           channelId: [3,4].indexOf(this.form.transportId) > -1 ? this.form.channelId : undefined,
           prodConditionParamList: this.getProductListWithDefaultValue(),
           orderType: this.form.orderType
-        }).then(res => {
+        }
+        if(this.form.channelId){
+          data.channelId = this.form.channelId
+        }
+        calculationPrice(data).then(res => {
             this.$set(this, 'fee', res.data.costDto)
             this.form.orderItemVOList.map((item, index) => {
                 this.$set(item, 'fee', res.data.prodCostDtoList[index] || null)

src/views/ecw/productPrice/edit.vue

@@ -251,8 +251,8 @@
           </el-form-item>
         </template>
 
-        <el-form-item :label="$t('是否単询')" prop="inquiry">
-          <dict-selector :type="DICT_TYPE.NEED_ORDER_INQUIRY" v-model="form.needOrderInquiry" form-type="radio"></dict-selector>
+        <el-form-item :label="$t('是否单询')" prop="inquiry">
+          <dict-selector :type="DICT_TYPE.NEED_ORDER_INQUIRY" v-model="form.needOrderInquiry" form-type="radio" formatter="number"></dict-selector>
         </el-form-item>
       </el-card>
     </el-form>
@@ -373,7 +373,9 @@ export default {
       form: {
         minWeightUnit: 0,
         priceStepList: [], // 阶梯价格
-        specialList: []
+        specialList: [],
+        // 是否单询，默认否
+        needOrderInquiry: '0'
       },
       needPay: false, // 是否需要预付
       stepPrice: false, // 是否阶梯订单
@@ -608,7 +610,9 @@ export default {
         clearancePrice: 0,
         transportPrice: 0,
         minWeight: 0,
-        minWeightUnit: null
+        minWeightUnit: null,
+        // 是否单询，默认否
+        needOrderInquiry: 0
       }
       // 默认体积单位（立方米）
       this.setDefaultVolumeUnit(7)