md
This commit is contained in:
parent
08b5f5a627
commit
68eb03abc4
440
src/views/emis/emisTmsPack/PackList.vue
Normal file
440
src/views/emis/emisTmsPack/PackList.vue
Normal file
@ -0,0 +1,440 @@
|
||||
<template>
|
||||
<div >
|
||||
<el-form ref="form" size="mini" :model="queryParams" label-width="100px">
|
||||
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="" prop="queryOrderType">
|
||||
<div slot="label">
|
||||
<el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
|
||||
<el-radio label="1">合包号</el-radio>
|
||||
<el-radio label="2">运单号</el-radio>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
<!-- <el-input
|
||||
v-model="queryParams.packNo"
|
||||
:placeholder="$t('多个合包号逗号可换行隔开')"
|
||||
clearable
|
||||
type="textarea"
|
||||
rows="2"
|
||||
/> -->
|
||||
<XdTextareaInput
|
||||
v-model="queryParams.packNo"
|
||||
:placeholder="$t('多个流水号逗号或换行隔开')"
|
||||
clearable
|
||||
:rows="2"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="发货时间" prop="dateTimeRange">
|
||||
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="$t('寄件网点')" prop="sendAreaSiteCode">
|
||||
<EmisSiteSimplePicker v-model="queryParams.sendAreaSiteCode" :placeholder="$t('寄件网点')" isInitiated="true" ></EmisSiteSimplePicker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="目的国家" prop="sendCountry">
|
||||
<CountryPicker v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" ></CountryPicker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="所属线路" prop="lineCode">
|
||||
<TransLinePicker v-model="queryParams.lineCode" :countryCode="queryParams.receiveCountry"></TransLinePicker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="产品类型" prop="productType">
|
||||
<TransProductPicker placeholder="全部" v-model="queryParams.productType" :transLineCode="queryParams.lineCode" ></TransProductPicker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="问题件方式" prop="pickupMethod">
|
||||
<el-select clearable="" v-model="queryParams.problemQueryType" placeholder="请选择">
|
||||
<el-option label="只查问题件类型" :value="1"></el-option>
|
||||
<el-option label="剔除问题件类型" :value="2"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="问题件类型" prop="problemType">
|
||||
<ProblemTypePicker v-model="queryParams.problemType" ></ProblemTypePicker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<!-- </SearchForm> -->
|
||||
</el-form>
|
||||
|
||||
<XdTable v-loading="loading"
|
||||
border
|
||||
ref="table"
|
||||
size="small"
|
||||
:data="emisTmsPackList"
|
||||
showSearch.sync="false"
|
||||
:queryParams="queryParams"
|
||||
:total="total"
|
||||
:showRightButton="true"
|
||||
@queryTable="getList"
|
||||
@selection-change="handleSelectionChange"
|
||||
@expand-change="expandChange"
|
||||
:row-class-name="disabledRow"
|
||||
:showCustomizeTpl="false"
|
||||
>
|
||||
<div slot="toolbar">
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
@click="handleQuery"
|
||||
>查询</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleCoAdd"
|
||||
:disabled="addWayBillDisabled"
|
||||
>追加</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
|
||||
<el-table-column v-if="showType=='batch'" type="selection" width="55" align="center">
|
||||
</el-table-column>
|
||||
<el-table-column type="expand">
|
||||
<template slot-scope="scope">
|
||||
<PackItemDetail :packNo="scope.row.packNo"></PackItemDetail>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="showType=='batch'" :label="$t('合包号')" align="center" prop="packNo" min-width="170" />
|
||||
<el-table-column v-if="showType=='batch'" :label="$t('合包状态')" align="center" prop="packStatus" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.emis_pack_status" :value="scope.row.packStatus"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="showType=='batch'" :label="$t('操作网点')" align="center" prop="createSiteName" min-width="100" />
|
||||
<el-table-column v-if="showType=='batch'" :label="$t('是否可拆')" align="center" prop="blUnpack" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.blUnpack == "1" ? "是" : "否" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="showType=='batch'" :label="$t('操作员')" align="center" prop="createByName" min-width="150" />
|
||||
<el-table-column v-if="showType=='batch'" :label="$t('票数')" align="center" prop="totalWaybillQty" min-width="100" />
|
||||
<el-table-column v-if="showType=='batch'" :label="$t('件数')" align="center" prop="totalParcelQty" min-width="100" />
|
||||
<el-table-column v-if="showType=='batch'" :label="$t('实际重量')" align="center" prop="totalWeight" min-width="100" />
|
||||
<el-table-column v-if="showType=='batch'" :label="$t('体积')" align="center" prop="totalVolume" min-width="100" />
|
||||
<el-table-column v-if="showType=='batch'" :label="$t('创建时间')" align="center" prop="packDate" min-width="170" />
|
||||
|
||||
<el-table-column v-if="showType=='pack'" :label="$t('合包号')" align="center" prop="packNo" min-width="170" />
|
||||
<el-table-column v-if="showType=='pack'" :label="$t('合包状态')" align="center" prop="packStatus" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.emis_pack_status" :value="scope.row.packStatus"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="showType=='pack'" :label="$t('创建网点')" align="center" prop="createSiteName" min-width="100" />
|
||||
<el-table-column v-if="showType=='pack'" :label="$t('发出网点')" align="center" prop="sendStiteName" min-width="100" />
|
||||
<el-table-column v-if="showType=='pack'" :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
|
||||
<el-table-column v-if="showType=='pack'" :label="$t('是否可拆')" align="center" prop="blUnpack" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.blUnpack == "1" ? "是" : "否" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column v-if="showType=='pack'" :label="$t('创建人')" align="center" prop="createByName" min-width="150" />
|
||||
<el-table-column v-if="showType=='pack'" :label="$t('件数')" align="center" prop="totalParcelQty" min-width="100" />
|
||||
<el-table-column v-if="showType=='pack'" :label="$t('合包重量')" align="center" prop="totalWeight" min-width="100" />
|
||||
<el-table-column v-if="showType=='pack'" :label="$t('创建时间')" align="center" prop="packDate" min-width="170" />
|
||||
</XdTable>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listEmisTmsPack, getPackNo, getEmisTmsPack, delEmisTmsPack, addEmisTmsPack, updateEmisTmsPack } from "@/api/emis/emisTmsPack";
|
||||
import { listEmisTmsPackDtl, delEmisTmsPackDtl, addEmisTmsPackDtl } from "@/api/emis/emisTmsPackDtl";
|
||||
import PackItemDetail from '@/views/emis/emisTmsSiteBatch/packItemDetail';
|
||||
|
||||
// import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
|
||||
import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm';
|
||||
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
|
||||
import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
|
||||
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
|
||||
import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
|
||||
import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
|
||||
import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
|
||||
import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
|
||||
import PackListView from '@/views/emis/emisTmsSiteBatch/packListView';
|
||||
|
||||
import { parseTime, dateToStr } from "@/utils/custom";
|
||||
import { formatSearchStr } from '@/utils/index'
|
||||
|
||||
export default {
|
||||
name: "PackListView",
|
||||
components: { PackItemDetail,ProblemTypePicker, EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker, PackListView},
|
||||
props:{
|
||||
propParams: {},
|
||||
propType: "",
|
||||
slotProps: {}
|
||||
},
|
||||
dicts: ['emis_pack_status'],
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
loadingDone: false,
|
||||
total: 0,
|
||||
doneTotal: 0,
|
||||
|
||||
// TMS合包表格数据
|
||||
emisTmsPackList: [],
|
||||
|
||||
canSelectList: [],// 被选中的合包列表
|
||||
|
||||
queryParams:{},
|
||||
|
||||
selection:[],// 选中的合包
|
||||
|
||||
showType: "pack",
|
||||
|
||||
// 合包明细
|
||||
emisTmsDonePackList:[],
|
||||
|
||||
currentExpandedRow: null,
|
||||
|
||||
// 查询参数
|
||||
queryDoneParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 20,
|
||||
packNo: null,
|
||||
params:{}
|
||||
},
|
||||
|
||||
};
|
||||
},
|
||||
created() {
|
||||
// this.initData();
|
||||
// this.queryParams = this.propParams || {};
|
||||
// this.queryParams.params = this.queryParams.params || {};
|
||||
// this.queryParams.params.isNeedPack = null;
|
||||
// this.showType = this.propType;
|
||||
this.getList();
|
||||
},
|
||||
watch: {
|
||||
// "propParams": {
|
||||
// handler (newValue, oldValue) {
|
||||
// this.queryParams = newValue || {};
|
||||
// this.queryParams.params = this.queryParams.params || {};
|
||||
// this.queryParams.params.isNeedPack = null;
|
||||
// // this.initData();
|
||||
// },
|
||||
// deep: true
|
||||
// }
|
||||
},
|
||||
methods: {
|
||||
handleQuery(){
|
||||
this.getList();
|
||||
},
|
||||
disabledRow({ row }) {
|
||||
if (row.blUnpack == "1") {
|
||||
return 'disabled-row';
|
||||
}
|
||||
return '';
|
||||
},
|
||||
// 选择表格数据
|
||||
handleSelectionChange(selection){
|
||||
// let destCountry = "";
|
||||
this.canSelectList = [];
|
||||
for(let i = 0; i < selection.length; i++){
|
||||
if(selection[i].blUnpack == "0"){
|
||||
// 去掉此逻辑,因为合包中的目的国家可能为空,从“去组批次”的逻辑里进行判断
|
||||
// if(!destCountry){
|
||||
// destCountry = selection[i].destCountry;
|
||||
// }else if(destCountry != selection[i].destCountry){
|
||||
// this.canSelectList = [];
|
||||
// this.$message.error("选择数据中存在不同的目的国家");
|
||||
// }
|
||||
this.canSelectList.push(selection[i]);
|
||||
}
|
||||
}
|
||||
},
|
||||
async getPackBillList(){
|
||||
debugger;
|
||||
let billList = [];
|
||||
let destCountry = "";
|
||||
for(let i = 0; i < this.canSelectList.length; i++ ){
|
||||
let resList = await listEmisTmsPackDtl({packNo: this.canSelectList[i].packNo});
|
||||
if(!resList || resList.code != 200){
|
||||
return{
|
||||
code: -1,
|
||||
message: resList && resList.msg || "未知错误",
|
||||
list: []
|
||||
};
|
||||
}
|
||||
for(let p = 0; p < resList.rows.length;p++){
|
||||
if(resList.rows[p].mainBillCode){
|
||||
if(!destCountry){
|
||||
destCountry = resList.rows[p].destCountry;
|
||||
}else if(destCountry != resList.rows[p].destCountry){
|
||||
return {
|
||||
code: -1,
|
||||
message: "选择数据中存在不同的目的国家",
|
||||
list: []
|
||||
};
|
||||
}
|
||||
billList.push(resList.rows[p].waybillDetail);
|
||||
}
|
||||
}
|
||||
}
|
||||
return {
|
||||
code: 0,
|
||||
message:"",
|
||||
list: billList
|
||||
}
|
||||
},
|
||||
// 打开表格扩展
|
||||
expandChange(row, expandedRows){
|
||||
// if(expandedRows.length==0){// 没有扩展的行
|
||||
// this.currentExpandedRow = null;
|
||||
// return;
|
||||
// }
|
||||
// if(this.currentExpandedRow && expandedRows.length == 1 && expandedRows[0].packNo == this.currentExpandedRow.packNo){// 已经查询过了
|
||||
// return;
|
||||
// }
|
||||
// this.loading = true;
|
||||
// this.currentExpandedRow = row;
|
||||
// this.emisTmsDonePackList=[];
|
||||
// listEmisTmsPackDtl({packNo: row.packNo}).then(resList => {
|
||||
// if(!resList || resList.code != 200){
|
||||
// this.$message.error(resList && resList.msg || "未知错误");
|
||||
// return;
|
||||
// }
|
||||
// for(let p = 0; p < resList.rows.length;p++){
|
||||
// resList.rows[p].waybillDetail.billCodeL = resList.rows[p].billCode;
|
||||
// this.emisTmsDonePackList.push(resList.rows[p].waybillDetail);
|
||||
// }
|
||||
// this.doneTotal = resList.total;
|
||||
// this.loading = false;
|
||||
// });
|
||||
// if(expandedRows.length > 1){
|
||||
// for(let i = 0; i < expandedRows.length; i++){
|
||||
// if(row.packNo != expandedRows[i].packNo){
|
||||
// this.$refs.table.$refs.table.$refs.elTable.toggleRowExpansion(expandedRows[i], false);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
},
|
||||
// 查询合包明细表
|
||||
async handleQueryDone(){
|
||||
this.single = true;
|
||||
this.multiple = true;
|
||||
this.loadingDone = true;
|
||||
|
||||
let resList = await listEmisTmsPackDtl(this.queryDoneParams);
|
||||
this.loadingDone = false;
|
||||
if(!resList || resList.code != 200){
|
||||
this.$message.error(resList && resList.msg || "未知错误");
|
||||
return;
|
||||
}
|
||||
//this.tempExistCoPackWayBillList = resList.rows;//临时存储,用于运单号校验
|
||||
this.doneTotal = resList.total;
|
||||
this.emisTmsDonePackList = [];
|
||||
for(let p = 0; p < resList.rows.length;p++){
|
||||
let obj = {...resList.rows[p].waybillDetail};
|
||||
obj.billCodeL = resList.rows[p].billCode;
|
||||
obj.packNo = resList.rows[p].packNo;
|
||||
this.emisTmsDonePackList.push(obj);
|
||||
}
|
||||
this.doneTotal = resList.total;
|
||||
},
|
||||
handleDoneSelectionChange(){
|
||||
|
||||
},
|
||||
/** 查询TMS合包列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
this.single = true;
|
||||
this.multiple = true;
|
||||
// this.queryParams.params = {};
|
||||
if(this.queryParams.packNo){
|
||||
let qBillCode=formatSearchStr(this.queryParams.packNo);
|
||||
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.queryParams.queryOrderType == "1"){
|
||||
this.queryParams.packNo=newBillCodeStr;
|
||||
this.queryParams.billCode=null;
|
||||
}else{
|
||||
// 处理子单号
|
||||
this.queryParams.billCode=newBillCodeStr;
|
||||
this.queryParams.packNo=null;
|
||||
}
|
||||
}
|
||||
|
||||
this.emisTmsPackList = [];
|
||||
// if (null != this.dateTimeRange && '' != this.dateTimeRange) {
|
||||
// this.queryParams.params["beginSendDate"] = dateToStr(new Date(this.dateTimeRange[0]));
|
||||
// this.queryParams.params["endSendDate"] = dateToStr(new Date(this.dateTimeRange[1]));
|
||||
// }
|
||||
this.queryParams.params["beginSendDate"] = null;
|
||||
this.queryParams.params["endSendDate"] = null;
|
||||
this.queryParams.params["isNeedPack"] = null;
|
||||
this.queryParams.destCountry = this.queryParams.receiveCountry;
|
||||
listEmisTmsPack(this.queryParams).then(response => {
|
||||
this.emisTmsPackList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
|
||||
<style rel="stylesheet/scss" lang="scss">
|
||||
|
||||
.margin-top{
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.el-descriptions-item__label.is-bordered-label {
|
||||
min-width: 80px;
|
||||
}
|
||||
|
||||
.printMeClass {
|
||||
font-family: SimHei;
|
||||
label {
|
||||
font-weight: normal;
|
||||
}
|
||||
}
|
||||
.ellipsis {
|
||||
width: 100px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
vertical-align: top;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.el-table .disabled-row .cell .el-checkbox__inner {
|
||||
display: none; /* 隐藏checkbox */
|
||||
}
|
||||
.el-table .disabled-row .cell::after {
|
||||
content: '';
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: rgba(255, 255, 255, 0.6); /* 添加一个遮盖层 */
|
||||
}
|
||||
</style>
|
||||
1150
src/views/emis/emisTmsPack/WaitPackList.vue
Normal file
1150
src/views/emis/emisTmsPack/WaitPackList.vue
Normal file
File diff suppressed because it is too large
Load Diff
1735
src/views/emis/emisTmsPack/packageManagement copy 2.vue
Normal file
1735
src/views/emis/emisTmsPack/packageManagement copy 2.vue
Normal file
File diff suppressed because it is too large
Load Diff
2081
src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel copy.vue
Normal file
2081
src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel copy.vue
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user