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

Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend

Browse Source
This commit is contained in:
linfso 2024-07-27 13:12:00 +08:00
commit 8a6106f1c8
2 changed files with 249 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
src/views/emis/emisTmsSiteBatch/packItemDetail.vue Normal file
View File

@ -0,0 +1,210 @@
<template>
<div>
<XdTable v-loading="loadingDone"
height="200px"
style="margin-left: 5%;width:90%;"
border
size="small"
:data="emisTmsDonePackList"
showSearch.sync="false"
:queryParams="queryDoneParams"
:total="doneTotal"
:showRightButton="false"
@queryTable="handleQueryDone"
@selection-change="handleDoneSelectionChange"
:showCustomizeTpl="false"
>
<el-table-column :label="$t('运单号')" align="center" prop="billCodeL" 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" 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="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">
<template slot-scope="scope">
<span class="ellipsis">{{ scope.row.sendCountryName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('目的国家')" align="center" prop="receiveCountryName" min-width="100">
<template slot-scope="scope">
<span class="ellipsis">{{ scope.row.receiveCountryName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" />
<el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100" />
<el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
<el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
<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">
<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>
</template>
</el-table-column>
<el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
<el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
</template>
</el-table-column>
<el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
</template>
</el-table-column>
<el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
<el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
<el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
<template slot-scope="scope">
<span class="ellipsis">{{ scope.row.sendCompany }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100">
<template slot-scope="scope">
<span class="ellipsis">{{ scope.row.remark }}</span>
</template>
</el-table-column>
</XdTable>
</div>
</template>
<script>
import { listEmisTmsPack, getPackNo, getEmisTmsPack, delEmisTmsPack, addEmisTmsPack, updateEmisTmsPack } from "@/api/emis/emisTmsPack";
import { listEmisTmsPackDtl, delEmisTmsPackDtl, addEmisTmsPackDtl } from "@/api/emis/emisTmsPackDtl";
import { parseTime, dateToStr } from "@/utils/custom";
import { formatSearchStr } from '@/utils/index'
import { PageSizes } from "pdf-lib";
export default {
name: "PackItemDetail",
props:{
packNo: String,
},
dicts: [],
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.queryDoneParams.packNo = this.packNo;
debugger
this.handleQueryDone();
},
watch: {
"packNo": {
handler (newValue, oldValue) {
this.queryDoneParams.packNo = newValue;
},
deep: true
}
},
methods: {
// 查询合包明细表
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(){
},
}
};
</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>

72
src/views/emis/emisTmsSiteBatch/packListView.vue
View File

@ -16,11 +16,12 @@
:row-class-name="disabledRow"
:showCustomizeTpl="false"
>
<el-table-column v-if="showType=='pack'" type="selection" width="55" align="center">
<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">
<XdTable v-loading="loadingDone"
<PackItemDetail :packNo="scope.row.packNo"></PackItemDetail>
<!-- <XdTable v-loading="loadingDone"
height="200px"
style="margin-left: 5%;width:90%;"
border
@ -32,8 +33,9 @@
:showRightButton="false"
@queryTable="handleQueryDone"
@selection-change="handleDoneSelectionChange"
:showCustomizeTpl="false"
>
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
<el-table-column :label="$t('运单号')" align="center" prop="billCodeL" 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" width="100" >
@ -98,7 +100,7 @@
<span class="ellipsis">{{ scope.row.remark }}</span>
</template>
</el-table-column>
</XdTable>
</XdTable> -->
</template>
</el-table-column>
<el-table-column v-if="showType=='batch'" :label="$t('合包号')" align="center" prop="packNo" min-width="170" />
@ -148,9 +150,11 @@ import { listEmisTmsPackDtl, delEmisTmsPackDtl, addEmisTmsPackDtl } from "@/api/
import { parseTime, dateToStr } from "@/utils/custom";
import { formatSearchStr } from '@/utils/index'
import { PageSizes } from "pdf-lib";
import PackItemDetail from '@/views/emis/emisTmsSiteBatch/packItemDetail';
export default {
name: "PackListView",
components: { PackItemDetail },
props:{
propParams: {},
propType: "",
@ -176,7 +180,7 @@ export default {
showType: "pack",
// 合包明细
emisTmsDonePackList:{},
emisTmsDonePackList:[],
currentExpandedRow: null,
@ -268,34 +272,35 @@ export default {
},
// 打开表格扩展
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++){
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);
}
}
}
// 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);
// }
// }
// }
},
// 查询合包明细表
@ -315,6 +320,7 @@ export default {
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);
}