Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend
This commit is contained in:
linfso
commit
02b64fbe24
@ -303,11 +303,11 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="$t('目的国家')" prop="receiveCountry">
|
||||
<el-form-item :label="$t('目的国家')" prop="destCountry">
|
||||
<span slot="label">
|
||||
<span style="color: red">{{ $t('目的国家') }}</span>
|
||||
</span>
|
||||
<CountryPicker :placeholder="$t('选择国家')" v-model="coData.receiveCountry" ></CountryPicker>
|
||||
<CountryPicker :placeholder="$t('选择国家')" v-model="coData.destCountry" ></CountryPicker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
@ -527,7 +527,7 @@
|
||||
rows="2"
|
||||
/> -->
|
||||
<XdTextareaInput
|
||||
v-model="queryParams.billCode"
|
||||
v-model="wayBillData.billCode"
|
||||
:placeholder="$t('多个流水号逗号或换行隔开')"
|
||||
clearable
|
||||
:rows="2"
|
||||
@ -942,6 +942,8 @@ export default {
|
||||
this.wayBillData.dateTimeRange=value;
|
||||
},
|
||||
async handleAddCoPack(){
|
||||
debugger
|
||||
console.log(this.coData)
|
||||
if(!this.coData.destCountry || !this.coData.sendSiteCode || !this.coData.nextSiteCode || !this.blUnpack){
|
||||
this.$modal.msgError("请先选择必填项")
|
||||
return;
|
||||
|
||||
@ -310,9 +310,14 @@
|
||||
<span class="ellipsis">{{ scope.row.remark }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('目的国家')" align="center" prop="receiveCountryName" min-width="100">
|
||||
<el-table-column :label="$t('发件国家')" align="center" prop="sendCountryName" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<span class="ellipsis">{{ scope.row.receiveCountryName }}</span>
|
||||
<span class="ellipsis">{{ scope.row.sendCountryName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('目的国家')" align="center" prop="destCountryName" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<span class="ellipsis">{{ scope.row.destCountryName }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" />
|
||||
@ -356,15 +361,8 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="运输方式" prop="transType">
|
||||
<el-select v-model="coData.transType" placeholder="运输方式" clearable filterable >
|
||||
<el-option
|
||||
v-for="item in dict.type.emis_biz_shipping_method"
|
||||
v-bind:key="item.value"
|
||||
v-bind:label="item.label"
|
||||
v-bind:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
<el-form-item :label="$t('目的国家')" prop="destCountry">
|
||||
<CountryPicker :placeholder="$t('选择国家')" v-model="coData.destCountry" ></CountryPicker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
@ -385,6 +383,18 @@
|
||||
<EmisSiteSimplePicker :placeholder="$t('请选择')" v-model="coData.nextSiteCode" ></EmisSiteSimplePicker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="运输方式" prop="transType">
|
||||
<el-select v-model="coData.transType" placeholder="运输方式" clearable filterable >
|
||||
<el-option
|
||||
v-for="item in dict.type.emis_biz_shipping_method"
|
||||
v-bind:key="item.value"
|
||||
v-bind:label="item.label"
|
||||
v-bind:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8" v-if="coData.transType == 2">
|
||||
<el-form-item :label="$t('航空单号')" prop="airBilllNo">
|
||||
<el-input v-model="coData.airBilllNo" />
|
||||
@ -665,7 +675,7 @@
|
||||
rows="2"
|
||||
/> -->
|
||||
<XdTextareaInput
|
||||
v-model="queryParams.billCode"
|
||||
v-model="wayBillData.billCode"
|
||||
:placeholder="$t('多个流水号逗号或换行隔开')"
|
||||
clearable
|
||||
:rows="2"
|
||||
@ -673,7 +683,7 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="$t('目的国家')" prop="destCountry">
|
||||
<el-form-item :label="$t('目的国家')" prop="receiveCountry">
|
||||
<CountryPicker :placeholder="$t('选择国家')" v-model="wayBillData.receiveCountry" ></CountryPicker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -1006,6 +1016,7 @@ export default {
|
||||
this.queryParams.params["beginCreateTime"] = dateToStr(new Date(this.dateTimeRange[0]));
|
||||
this.queryParams.params["endCreateTime"] = dateToStr(new Date(this.dateTimeRange[1]));
|
||||
}
|
||||
this.queryParams.destCountry = this.queryParams.receiveCountry;
|
||||
listEmisTmsSiteBatch(this.queryParams).then(response => {
|
||||
this.emisTmsPackList = response.rows;
|
||||
this.total = response.total;
|
||||
@ -1118,12 +1129,23 @@ export default {
|
||||
this.$modal.msgError("请先选择至少一条运单信息")
|
||||
return;
|
||||
}
|
||||
|
||||
let firstItemCountry = this.emisCoPackDetail.length > 0 ? this.emisCoPackDetail[0].receiveCountry : '';
|
||||
// 将选中的“待组批次”的运单 置为 追加的运单号
|
||||
for(let p = 0; p < this.emisCoPackDetail.length;p++){
|
||||
if(this.emisCoPackDetail[p].receiveCountry != firstItemCountry){
|
||||
this.$message.error("存在了不同的目的国家！");
|
||||
return ;
|
||||
}
|
||||
}
|
||||
|
||||
let coPackItem={
|
||||
batchNo: this.coData.batchNo,
|
||||
batchName: this.coData.batchName || '',
|
||||
batchDate: this.coData.createTime,
|
||||
batchType: this.coData.batchType || null,
|
||||
transType: this.coData.transType || null,
|
||||
destCountry: this.coData.destCountry || null,
|
||||
startSiteCode: this.coData.startSiteCode || null,
|
||||
startSiteName: this.coData.startSiteName || null,
|
||||
nextSiteCode: this.coData.nextSiteCode || null,
|
||||
@ -1251,7 +1273,7 @@ export default {
|
||||
|| this.tempCoPackInfo.airBilllNo != this.coData.airBilllNo
|
||||
|| this.tempCoPackInfo.etd != this.coData.etd
|
||||
|| this.tempCoPackInfo.carNo != this.coData.carNo
|
||||
// || this.tempCoPackInfo.carTime != this.coData.carTime
|
||||
|| this.tempCoPackInfo.destCountry != this.coData.destCountry
|
||||
|| this.tempCoPackInfo.shipNo != this.coData.shipNo
|
||||
// || this.tempCoPackInfo.shipTime != this.coData.shipTime
|
||||
|| this.tempCoPackInfo.totalWaybillQty != this.coData.totalWaybillQty
|
||||
@ -1268,7 +1290,7 @@ export default {
|
||||
this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo;
|
||||
this.tempCoPackInfo.etd = this.coData.etd;
|
||||
this.tempCoPackInfo.carNo = this.coData.carNo;
|
||||
// this.tempCoPackInfo.carTime = this.coData.carTime;
|
||||
this.tempCoPackInfo.destCountry = this.coData.destCountry;
|
||||
this.tempCoPackInfo.shipNo = this.coData.shipNo;
|
||||
// this.tempCoPackInfo.shipTime = this.coData.shipTime;
|
||||
this.tempCoPackInfo.totalWaybillQty = this.coData.totalWaybillQty;
|
||||
@ -1492,8 +1514,13 @@ export default {
|
||||
this.coPackType="add";
|
||||
this.coData = {};
|
||||
if(this.activeName=="first"){
|
||||
let firstItemCountry = this.waitPackList.length > 0 ? this.waitPackList[0].receiveCountry : '';
|
||||
// 将选中的“待组批次”的运单 置为 追加的运单号
|
||||
for(let p = 0; p < this.waitPackList.length;p++){
|
||||
if(this.waitPackList[p].receiveCountry != firstItemCountry){
|
||||
this.$message.error("存在了不同的目的国家！");
|
||||
return ;
|
||||
}
|
||||
this.emisCoPackDetail.push(this.waitPackList[p]);
|
||||
}
|
||||
}
|
||||
@ -1545,7 +1572,7 @@ export default {
|
||||
let resData = response.data;
|
||||
this.coData.batchNo = resData.batchNo;
|
||||
// this.coData.createTime = resData.createTime;
|
||||
// this.coData.destCountry = resData.destCountry;
|
||||
this.coData.destCountry = resData.destCountry;
|
||||
// this.coData.startSiteCode = resData.startSiteCode;
|
||||
// this.coData.nextSiteCode = resData.nextSiteCode;
|
||||
// this.blUnpack = resData.blUnpack;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user