Skip to content

J
jiedao-app-operator-master
Commit 38b9b4e2 authored by yujinyao's avatar yujinyao
Browse files
Options

修改新建报价单页面布局

parent 83244a85
Show whitespace changes
Inline Side-by-side
Showing with 150 additions and 103 deletions
src/i18n/languages/en_US.json
View file @ 38b9b4e2
......@@ -4713,5 +4713,6 @@
"保留客户": "Retained customer",
"​被合并客户-非主客户": "Consolidated customer - Non-principal customer",
"注意事项": "Matters need attention",
"选择客户": "Select a customer"
"选择客户": "Select a customer",
"运输": "Transportation"
}
src/views/ecw/offer/edit.vue
View file @ 38b9b4e2
......@@ -23,28 +23,6 @@
<el-radio :label="2">{{ $t("收件人") }}</el-radio>
</el-radio-group>
</el-form-item>
<br />
<el-form-item
:label="$t('订单类型')"
v-if="
routeOtherServices.indexOf('1') > -1 ||
routeOtherServices.indexOf('4') > -1
"
>
<el-checkbox-group v-model="form.type">
<el-checkbox
label="1"
v-if="routeOtherServices.indexOf('1') > -1"
>{{ $t("集运服务") }}</el-checkbox
>
<el-checkbox
label="2"
v-if="routeOtherServices.indexOf('4') > -1"
>{{ $t("海外仓") }}</el-checkbox
>
</el-checkbox-group>
</el-form-item>
<div class="form-section">
<el-form-item :label="$t('发货人')" prop="consignorId">
<div class="contact">
......@@ -195,7 +173,9 @@
{{consignee.email || this.$t('无')}}
</el-descriptions-item>
</el-descriptions> -->
</el-card>
<el-card class="mt-10">
<div slot="header" class="card-title">{{$t("运输")}}</div>
<div class="form-section">
<el-form-item :label="$t('运输方式')" prop="transportId">
<dict-selector
......@@ -204,28 +184,7 @@
class="w-200"
/>
</el-form-item>
<el-form-item
:label="$t('出货渠道')"
v-if="
getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId)
.cssClass == 'channel'
"
prop="channelId"
>
<selector
:disabled="
getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId)
.cssClass != 'channel'
"
v-model="form.channelId"
:options="channelList"
value-field="channelId"
:label-field="$l('name')"
class="w-200"
></selector>
</el-form-item>
</div>
<div class="form-section">
<el-form-item :label="$t('始发城市')" prop="departureId">
<el-select
......@@ -241,6 +200,20 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('目的国')" prop="destCountryId">
<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-select>
</el-form-item>
<el-form-item :label="$t('目的城市')" prop="objectiveId">
<el-select
v-model="form.objectiveId"
......@@ -248,11 +221,11 @@
class="w-200"
>
<el-option
v-for="item in importCityList"
:label="$l(item, 'title')"
:value="item.id"
:key="item.id"
></el-option>
v-for="item in AddressCity"
:key="item.shi"
:label="item.shiName"
:value="item.shi"
/>
</el-select>
</el-form-item>
</div>
......@@ -288,10 +261,54 @@
</template>
</select>
</div>
<div class="form-section">
<el-form-item
:label="$t('出货渠道')"
v-if="
getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId)
.cssClass == 'channel'
"
prop="channelId"
>
<selector
:disabled="
getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId)
.cssClass != 'channel'
"
v-model="form.channelId"
:options="channelList"
value-field="channelId"
:label-field="$l('name')"
class="w-200"
></selector>
</el-form-item>
</div>
<div class="form-section">
<el-form-item
:label="$t('增值服务')"
v-if="
routeOtherServices.indexOf('1') > -1 ||
routeOtherServices.indexOf('4') > -1
"
>
<el-checkbox-group v-model="form.type">
<el-checkbox
label="1"
v-if="routeOtherServices.indexOf('1') > -1"
>{{ $t("集运服务") }}</el-checkbox
>
<el-checkbox
label="2"
v-if="routeOtherServices.indexOf('4') > -1"
>{{ $t("海外仓") }}</el-checkbox
>
</el-checkbox-group>
</el-form-item>
</div>
</el-card>
<el-card class="mt-10">
<div slot="header" class="card-title">
<div class="card-name">{{ $t("商品信息") }}</div>
<div class="card-name">{{ $t("商品") }}</div>
<el-button
type="primary"
size="mini"
......@@ -686,8 +703,6 @@
class="w-200"
></el-input>
</el-form-item>
</div>
<div class="form-section">
<el-form-item :label="$t('报关方式')" prop="customsType">
<dict-selector
:type="DICT_TYPE.ECW_CUSTOMS_TYPE"
......@@ -718,11 +733,19 @@
</div>
<div class="form-section">
<el-form-item :label="$t('竞争对手')" prop="competitor">
<el-input
<el-select
clearable
v-model="form.competitor"
placeholder=""
:placeholder="$t('请选择')"
class="w-200"
></el-input>
>
<el-option
v-for="item in competitorList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('重要程度')" prop="importance">
<el-rate v-model="form.importance"></el-rate>
......@@ -749,9 +772,6 @@
:picker-options="endDate"
></el-date-picker>
</el-form-item>
</div>
<div class="form-section">
<el-form-item :label="$t('交货方式')">
<!--
接口要求数据为整数，所以增加trade_type类型的字典，用1234代码以下不同类型
......@@ -784,10 +804,23 @@
</el-card>
<el-card class="mt-10" v-if="transport">
<div class="card-title" slot="header">{{ $l(transport, "label") }}</div>
<div class="card-title" slot="header">{{ $t('其他') }}</div>
<!-- <el-form-item :label="$t('快递单号')">
<el-input v-model="form.number" :placeholder="$t('请输入购买商品的快递单号')"></el-input>
</el-form-item> -->
<el-form-item :label="$t('特殊要求')">
<dict-selector
v-model="form.transportVO.packageTypeArr"
form-type="checkbox"
:type="DICT_TYPE.ORDER_SPECIAL_NEEDS"
multiple
/>
</el-form-item>
<br />
<el-form-item :label="$t('特殊要求备注')">
<el-input v-model="form.transportVO.packageRemarks"></el-input>
</el-form-item>
<br />
<el-form-item
:label="$t('是否双清')"
v-if="[2, 3, 4].indexOf(+form.transportId) > -1"
......@@ -822,7 +855,8 @@
companyType="9"
/>
</el-form-item>
<!--
<div class="form-section">
<el-form-item
:label="$t('清关证书')"
v-if="[2, 3, 4].indexOf(+form.transportId) > -1"
......@@ -840,6 +874,7 @@
>
<el-input v-model="form.transportVO.remarks"></el-input>
</el-form-item>
<el-form-item
:label="$t('是否拆包')"
v-if="[3, 4].indexOf(+form.transportId) > -1"
......@@ -851,6 +886,7 @@
formatter="bool"
/>
</el-form-item>
</div>
<el-form-item
:label="$t('单票立刻转运')"
v-if="[3, 4].indexOf(+form.transportId) > -1"
......@@ -867,19 +903,8 @@
)
}}</span>
</el-form-item>
<br />
<el-form-item :label="$t('特殊要求')">
<dict-selector
v-model="form.transportVO.packageTypeArr"
form-type="checkbox"
:type="DICT_TYPE.ORDER_SPECIAL_NEEDS"
multiple
/>
</el-form-item>
<br />
<el-form-item :label="$t('特殊要求备注')">
<el-input v-model="form.transportVO.packageRemarks"></el-input>
</el-form-item>
-->
</el-card>
<el-form-item label="" class="mt-20">
......@@ -940,6 +965,9 @@ import QuickCreateCustomer from "@/components/QuickCreateCustomer";
import { getCustomerContactsSelect } from "@/api/ecw/customerContacts";
import Decimal from "decimal.js";
import getQuote from "@/views/ecw/customer/index.vue";
import { getRegionList } from '@/api/ecw/order';
import { competitorListAll } from "@/api/ecw/customer";
window.Decimal = Decimal;
const createDefaultForm = () => {
return {
......@@ -1024,6 +1052,9 @@ export default {
}
},
},
AddressProvince: [],
AddressCity: [],
competitorList: []
};
},
computed: {
......@@ -1361,6 +1392,17 @@ export default {
"form.departureId"() {
this.getOpenedRouterList();
},
"form.destCountryId"(destCountryId) {
if (destCountryId != null) {
getRegionList(2, destCountryId).then(({ data }) => {
this.AddressCity = data
})
} else {
getRegionList(4, 4).then(({ data }) => {
this.AddressCity = data
})
}
},
// 目的地
async "form.objectiveId"() {
await this.$nextTick();
......@@ -1408,6 +1450,7 @@ export default {
let router = this.routerList.find((item) => item.id == lineId);
if (router) {
this.$set(this.form, "departureId", router.startCityId);
this.$set(this.form, "destCountryId", router.destCountryId);
this.$set(this.form, "objectiveId", router.destCityId);
}
......@@ -1448,6 +1491,9 @@ export default {
getCurrencyList().then((res) => (this.currencyList = res.data));
getUnitList().then((res) => (this.unitList = res.data));
this.transportList = this.getDictDatas(this.DICT_TYPE.ECW_TRANSPORT_TYPE);
getRegionList(1, 1).then((res) => (this.AddressProvince = res.data))
getRegionList(4, 4).then((res) => (this.AddressCity = res.data))
competitorListAll().then((res) => (this.competitorList = res.data))
if (this.$route.query.id) {
this.getOffer();
......
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