Commit d7daea72 authored by zhengyi's avatar zhengyi

报价单编辑与详情bug修复

parent e39dc95b
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的国')" prop="destCountryId"> <el-form-item :label="$t('目的国')" prop="destCountryId">
<el-select v-model="form.destCountryId" :placeholder="$t('请选择目的国')" class="w-200"> <el-select v-model="form.destCountryId" :placeholder="$t('请选择目的国')" class="w-200" >
<el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia" /> <el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia" />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -742,6 +742,8 @@ export default { ...@@ -742,6 +742,8 @@ export default {
startTime: [{ required: true, message: this.$t("有效期开始时间不能为空") }], startTime: [{ required: true, message: this.$t("有效期开始时间不能为空") }],
endTime: [{ required: true, message: this.$t("有效期结束时间不能为空") }], endTime: [{ required: true, message: this.$t("有效期结束时间不能为空") }],
transportId: [{ required: true, message: this.$t("选择运输方式") }], transportId: [{ required: true, message: this.$t("选择运输方式") }],
// departureId: [{required: true, message: this.$t('请选择始发城市')}],
destCountryId: [{required: true, message: this.$t('请选择目的国家')}],
channelId: [{ required: true, message: this.$t("选择出货渠道") }], channelId: [{ required: true, message: this.$t("选择出货渠道") }],
stopTime: [{ required: true, message: this.$t("不能为空") }], stopTime: [{ required: true, message: this.$t("不能为空") }],
relation: [{ required: true, message: this.$t("请选择所属人") }], relation: [{ required: true, message: this.$t("请选择所属人") }],
...@@ -1074,9 +1076,9 @@ export default { ...@@ -1074,9 +1076,9 @@ export default {
selectedRouter(val) { selectedRouter(val) {
if (!val) return if (!val) return
;["1", "4"].forEach((service) => { ;["1", "4"].forEach((service) => {
if (this.routeOtherServices.indexOf(service) < 0 && this.form.type.indexOf(service) > -1) { if (this.routeOtherServices.indexOf(service) < 0 && this.form.serviceType.indexOf(service) > -1) {
this.form.type.splice( this.form.serviceType.splice(
this.form.type.findIndex((item) => item == service), this.form.serviceType.findIndex((item) => item == service),
1 1
) )
} }
...@@ -1102,7 +1104,7 @@ export default { ...@@ -1102,7 +1104,7 @@ export default {
getRegionList(4, 4).then((res) => (this.AddressCity = res.data)) getRegionList(4, 4).then((res) => (this.AddressCity = res.data))
competitorListAll().then((res) => (this.competitorList = res.data)) competitorListAll().then((res) => (this.competitorList = res.data))
if (this.$route.query.id) { if (this.$route.query.id && this.$route.query.copyId) {
this.getOffer() this.getOffer()
} else { } else {
// alert(this.$route.query.customer.defaultContactPhone) // alert(this.$route.query.customer.defaultContactPhone)
...@@ -1146,7 +1148,7 @@ export default { ...@@ -1146,7 +1148,7 @@ export default {
if (this.$route.query !== 1) { if (this.$route.query !== 1) {
getOffer(this.$route.query.id || this.$route.query.copyId).then((res) => { getOffer(this.$route.query.id || this.$route.query.copyId).then((res) => {
let formData = res.data let formData = res.data
formData.type = formData.type ? formData.type.split(",").filter((item) => item != "") : [] formData.serviceType = formData.serviceType ? formData.serviceType.split(",").filter((item) => item != "") : []
formData.prodCreateReqVOList = [] formData.prodCreateReqVOList = []
if (formData.transportVO && formData.transportVO.packageType) { if (formData.transportVO && formData.transportVO.packageType) {
formData.transportVO.packageTypeArr = formData.transportVO.packageType.split(",").filter((item) => item && item != "") formData.transportVO.packageTypeArr = formData.transportVO.packageType.split(",").filter((item) => item && item != "")
...@@ -1179,10 +1181,12 @@ export default { ...@@ -1179,10 +1181,12 @@ export default {
} }
if (this.$route.query.copyId) { if (this.$route.query.copyId) {
formData.offerId = "" formData.offerId = null
formData.startTime = "" formData.startTime = ""
formData.endTime = "" formData.endTime = ""
formData.stopTime = "" formData.stopTime = ""
// 复制报价单状态重置为草稿
formData.status = 2
} }
formData.channelId = formData.channelId || null formData.channelId = formData.channelId || null
......
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