Commit 566706f1 authored by dragondean@qq.com's avatar dragondean@qq.com

修复部分bug

parent d3333c8e
......@@ -576,23 +576,26 @@ export default {
trigger: 'blur'
}
],
lineId: [{ required: true, message: "请选择线路"}],
lineId: [{ required: true, message: this.$t("请选择线路")}],
/* consignorId: [{ required: true, message: "发货人不能为空",}],
consigneeId: [{ required: true, message: "收货人不能为空"}], */
startTime: [{ required: true, message: "有效期开始时间不能为空"}],
endTime: [{ required: true, message: "有效期结束时间不能为空"}],
transportId: [{ required: true, message: "选择运输方式"}],
channelId: [{ required: true, message: "选择出货渠道"}],
stopTime: [{ required: true, message: "不能为空"}],
relation: [{ required: true, message: "请选择所属人"}],
control: [{ required: true, message: "请选择是否控货"}],
importance: [{ required: true, message: "请选择重要成都"}]
startTime: [{ required: true, message: this.$t("有效期开始时间不能为空")}],
endTime: [{ required: true, message: this.$t("有效期结束时间不能为空")}],
transportId: [{ required: true, message: this.$t("选择运输方式")}],
channelId: [{ required: true, message: this.$t("选择出货渠道")}],
stopTime: [{ required: true, message: this.$t("不能为空")}],
relation: [{ required: true, message: this.$t("请选择所属人")}],
control: [{ required: true, message: this.$t("请选择是否控货")}],
importance: [
{ required: true, message: this.$t("请选择重要程度")},
{ type: 'number', min: 1, message: this.$t("请选择重要程度")}
]
}
if(this.form.relation == 1){
rules.consignorId = [{ required: true, message: "发货人不能为空",}]
rules.consignorId = [{ required: true, message: this.$t("发货人不能为空")}]
}
if(this.form.relation == 2){
rules.consigneeId = [{ required: true, message: "收货人不能为空",}]
rules.consigneeId = [{ required: true, message: this.$t("收货人不能为空")}]
}
return rules
},
......
......@@ -736,6 +736,8 @@ export default {
}))
})
}
// 更换运输方式之后,之前选择的路线会失效,需要重新选择
this.$set(this.form, 'lineId', undefined)
this.getOpenedRouterList()
},
'form.lineId'(lineId){
......
......@@ -4,6 +4,20 @@
<el-form-item :label="$t('订单号')" v-if="order">
{{order.orderNo}}
</el-form-item>
<el-form-item label="" v-if="order">
<div>
{{$t('箱数')}}{{order.sumNum}}{{$t('')}}
</div>
<div>
{{$t('重量')}}{{order.sumWeight}}Kg
</div>
<div>
{{$t('体积')}}{{order.sumVolume}}
</div>
<div>
{{$t('数量')}}{{order.sumQuantity}}{{$t('')}}
</div>
</el-form-item>
<el-form-item :label="$t('放货方式')">
<dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.pickType" form-type="radio" formatter="number"></dict-selector>
</el-form-item>
......@@ -16,7 +30,7 @@
{{order.consigneeVO.name}}
</el-form-item>
<el-form-item :label="$t('收货电话')">
{{order.consigneeVO.countryCode}} {{order.consigneeVO.phone}}
+{{order.consigneeVO.countryCode}} {{order.consigneeVO.phone}}
</el-form-item>
<el-form-item :label="$t('收货地址')">
<!--缺少国城名字-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment