aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改问题

Browse Source
This commit is contained in:
liuyp 2024-06-13 23:05:24 +08:00
parent 3ba5f52ac5
commit 341178e277
2 changed files with 116 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/views/emis/emisTmsPack/packageManagement.vue
View File

@ -143,8 +143,11 @@
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
<el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
<el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100" />
<el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_pack_status" :value="scope.row.waybillStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
<el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
<el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
@ -597,7 +600,7 @@
<div slot="label">
<el-radio-group class="query-label" v-model="wayBillData.params.dataTimeType">
<el-radio label="1">下单时间</el-radio>
<el-radio label="0">录单时间</el-radio>
<!-- <el-radio label="0">录单时间</el-radio> -->
</el-radio-group>
</div>
<elDateAdvPicker clearable v-model="wayBillData.dateTimeRange" @dateTimeChange="onWayBillDateSelect" ></elDateAdvPicker>
@ -649,8 +652,11 @@
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
<el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
<el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100" />
<el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_pack_status" :value="scope.row.waybillStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
<el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
<el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
@ -782,7 +788,10 @@ export default {
wayBillData: {
pageNum: 1,
pageSize: 20,
params:{}
params:{
queryOrderType:'1',
dataTimeType:'1'
}
},
// 追加的运单数据
emisWayBillList:[],
@ -1046,6 +1055,29 @@ export default {
this.wayBillData.params.endCreateTime = dateToStr(new Date(this.wayBillData.dateTimeRange[1]));
}
}
if(this.wayBillData.billCode){
let qBillCode=formatSearchStr(this.wayBillData.billCode);
let billArr = qBillCode.split(",");
let newBillCodeStr="";
billArr.forEach(item=>{
if(item.startsWith("T")){
let mainBillCode=item.substr(0,14);
newBillCodeStr=newBillCodeStr+mainBillCode+",";
}else if(item == ""){
}else{
newBillCodeStr=newBillCodeStr+item+",";
}
});
if(this.wayBillData.params.queryOrderType == "0"){
this.wayBillData.orderSN=newBillCodeStr;
this.wayBillData.billCode=null;
}else{
// 处理子单号
this.wayBillData.billCode=newBillCodeStr;
this.wayBillData.orderSN=null;
}
}
this.wayBillData.params.isNeedPack = 1;
listEmisWaybill(this.wayBillData).then(response => {
this.loading2 = false;

99
src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
View File

@ -54,7 +54,7 @@
<div slot="label">
<el-radio-group class="query-label" v-model="queryParams.params.queryOrderDateType">
<el-radio label="1">下单时间</el-radio>
<el-radio label="0">录单时间</el-radio>
<!-- <el-radio label="0">录单时间</el-radio> -->
</el-radio-group>
</div>
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
@ -138,7 +138,11 @@
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
<el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
<el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100" />
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" /> -->
<el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
<el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
@ -165,7 +169,11 @@
<el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
<el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
<el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
<el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="150" />
<el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="150">
<template slot-scope="scope">
<span class="ellipsis">{{ scope.row.receiveName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="100">
<template slot-scope="scope">
<span class="ellipsis">{{ scope.row.receiveCompany }}</span>
@ -215,7 +223,11 @@
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
<el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
<el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100" />
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" /> -->
<el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
<el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
@ -356,42 +368,42 @@
</el-col>
<el-col :span="12">
<el-form-item :label="$t('批次名称')" prop="batchName">
<!-- <span slot="label">
<span slot="label">
<span style="color: red">{{ $t('批次名称') }}</span>
</span> -->
</span>
<el-input v-model="coData.batchName" clearable="" placeholder="" key="test"></el-input>
<!-- <el-input v-model="coData.batchName" placeholder=""></el-input> -->
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('目的国家')" prop="destCountry">
<!-- <span slot="label">
<span slot="label">
<span style="color: red">{{ $t('目的国家') }}</span>
</span> -->
</span>
<CountryPicker :placeholder="$t('选择国家')" v-model="coData.destCountry" ></CountryPicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('起始网点')" prop="startSiteCode">
<!-- <span slot="label">
<span slot="label">
<span style="color: red">{{ $t('起始网点') }}</span>
</span> -->
</span>
<EmisSiteSimplePicker :placeholder="$t('请选择')" @change="onSiteSelect" v-model="coData.startSiteCode" :disabled="$store.getters.ownerSiteCode != '88888'" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('下一网点')" prop="nextSiteCode">
<!-- <span slot="label">
<span slot="label">
<span style="color: red">{{ $t('下一网点') }}</span>
</span> -->
</span>
<EmisSiteSimplePicker :placeholder="$t('请选择')" v-model="coData.nextSiteCode" ></EmisSiteSimplePicker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="运输方式" prop="transType">
<!-- <span slot="label">
<span slot="label">
<span style="color: red">{{ $t('运输方式') }}</span>
</span> -->
</span>
<el-select v-model="coData.transType" placeholder="运输方式" clearable filterable >
<el-option
v-for="dict in dict.type.emis_biz_shipping_method"
@ -404,11 +416,17 @@
</el-col>
<el-col :span="8" v-if="coData.transType == 2">
<el-form-item :label="$t('航空单号')" prop="airBilllNo">
<span slot="label">
<span style="color: red">{{ $t('航空单号') }}</span>
</span>
<el-input v-model="coData.airBilllNo" />
</el-form-item>
</el-col>
<el-col :span="8" v-if="coData.transType == 2">
<el-form-item label="起飞时间" prop="airTime">
<span slot="label">
<span style="color: red">{{ $t('起飞时间') }}</span>
</span>
<el-date-picker clearable
v-model="coData.airTime"
type="date"
@ -419,11 +437,17 @@
</el-col>
<el-col :span="8" v-if="coData.transType == 4">
<el-form-item :label="$t('船次号')" prop="shipNo">
<span slot="label">
<span style="color: red">{{ $t('船次号') }}</span>
</span>
<el-input v-model="coData.shipNo" />
</el-form-item>
</el-col>
<el-col :span="8" v-if="coData.transType == 4">
<el-form-item label="开船时间" prop="shipTime">
<span slot="label">
<span style="color: red">{{ $t('开船时间') }}</span>
</span>
<el-date-picker clearable
v-model="coData.shipTime"
type="date"
@ -434,11 +458,17 @@
</el-col>
<el-col :span="8" v-if="['1','3','5'].indexOf(coData.transType) > -1">
<el-form-item :label="$t('车牌号')" prop="carNo">
<span slot="label">
<span style="color: red">{{ $t('车牌号') }}</span>
</span>
<el-input v-model="coData.carNo" clearable="" placeholder=""></el-input>
</el-form-item>
</el-col>
<el-col :span="8" v-if="['1','3','5'].indexOf(coData.transType) > -1">
<el-form-item label="发车时间" prop="carTime">
<span slot="label">
<span style="color: red">{{ $t('发车时间') }}</span>
</span>
<el-date-picker clearable
v-model="coData.carTime"
type="date"
@ -573,9 +603,9 @@
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
<el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
<el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" min-width="100" />
<el-table-column :label="$t('运单状态')" align="center" prop="emis_pack_status" min-width="100">
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_pack_status" :value="coData.packStatus"/>
<dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" /> -->
@ -683,7 +713,7 @@
<div slot="label">
<el-radio-group class="query-label" v-model="wayBillData.params.dataTimeType">
<el-radio label="1">下单时间</el-radio>
<el-radio label="0">录单时间</el-radio>
<!-- <el-radio label="0">录单时间</el-radio> -->
</el-radio-group>
</div>
<elDateAdvPicker clearable v-model="wayBillData.dateTimeRange" @dateTimeChange="onWayBillDateSelect" ></elDateAdvPicker>
@ -735,9 +765,9 @@
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
<el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
<el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" min-width="100" />
<el-table-column :label="$t('运单状态')" align="center" prop="emis_pack_status" min-width="100">
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_pack_status" :value="coData.packStatus"/>
<dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" /> -->
@ -819,7 +849,7 @@ import { formatSearchStr } from '@/utils/index'
export default {
name: "CenterGenBatchMgnt",
components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker},
dicts: ['emis_pack_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi', 'cebp_return_status'],
dicts: ['emis_waybill_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi', 'cebp_return_status'],
data() {
return {
// 遮罩层
@ -869,7 +899,10 @@ export default {
wayBillData: {
pageNum: 1,
pageSize: 20,
params:{}
params:{
dataTimeType: '1',
queryOrderType: '1'
}
},
// 追加的运单数据
emisWayBillList:[],
@ -933,6 +966,7 @@ export default {
// delFlag: null,
params:{
queryOrderType: '0',
queryOrderDateType: '1'
},
},
queryCoParams: {
@ -1154,6 +1188,29 @@ export default {
this.wayBillData.params.endCreateTime = dateToStr(new Date(this.wayBillData.dateTimeRange[1]));
}
}
if(this.wayBillData.billCode){
let qBillCode=formatSearchStr(this.wayBillData.billCode);
let billArr = qBillCode.split(",");
let newBillCodeStr="";
billArr.forEach(item=>{
if(item.startsWith("T")){
let mainBillCode=item.substr(0,14);
newBillCodeStr=newBillCodeStr+mainBillCode+",";
}else if(item == ""){
}else{
newBillCodeStr=newBillCodeStr+item+",";
}
});
if(this.wayBillData.params.queryOrderType == "0"){
this.wayBillData.orderSN=newBillCodeStr;
this.wayBillData.billCode=null;
}else{
// 处理子单号
this.wayBillData.billCode=newBillCodeStr;
this.wayBillData.orderSN=null;
}
}
this.wayBillData.params.isNeedBatch = 1;
listEmisWaybill(this.wayBillData).then(response => {
this.loading2 = false;