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-18 19:37:59 +08:00
parent dda7288b64
commit 19cd003bbc
1 changed files with 97 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,7 +204,7 @@
</el-table-column>
</XdTable>
</el-tab-pane>
<el-tab-pane label="已合包" name="second">
<!-- <el-tab-pane label="已合包" name="second">
<XdTable v-loading="loadingDone"
:height="(slotProps.contentHeight-200)+'px'"
border stripe
@ -228,7 +228,6 @@
<dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('物流信息')" align="center" prop="lastTraceInfo" min-width="100" :show-overflow-tooltip="true"/> -->
<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">
@ -250,7 +249,6 @@
</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="totalWeight" 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" />
@ -284,7 +282,7 @@
</template>
</el-table-column>
</XdTable>
</el-tab-pane>
</el-tab-pane> -->
<el-tab-pane label="合包列表" name="third">
<XdTable v-loading="loading"
:height="(slotProps.contentHeight-200)+'px'"
@ -298,9 +296,89 @@
@queryTable="handleQuery"
@selection-change="handleSelectionChange"
@sort-change="handleSortChange"
@expand-change="expandChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="expand">
<template slot-scope="props">
<XdTable v-loading="loadingDone"
height="200px"
style="margin-left: 5%;width:90%;"
border stripe
size="small"
:data="emisTmsDonePackList"
showSearch.sync="false"
:queryParams="queryDoneParams"
:total="doneTotal"
:showRightButton="false"
@queryTable="handleQueryDone"
@selection-change="handleDoneSelectionChange"
@sort-change="handleSortChange"
>
<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" 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" />
<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>
</template>
</el-table-column>
<el-table-column :label="$t('合包号')" align="center" prop="packNo" min-width="170" />
<el-table-column :label="$t('合包状态')" align="center" prop="packStatus" min-width="100">
<template slot-scope="scope">
@ -899,6 +977,20 @@ export default {
break;
}
},
async expandChange(row){
// row.packNo
this.emisTmsDonePackList=[];
let resList = await listEmisTmsPackDtl({packNo: row.packNo});
if(!resList || resList.code != 200){
this.$message.error(resList && resList.msg || "未知错误");
return;
}
// this.tempExistCoPackWayBillList = resList.rows;//临时存储，用于运单号校验
// this.tempCoPackInfo = resData;
for(let p = 0; p < resList.rows.length;p++){
this.emisTmsDonePackList.push(resList.rows[p].waybillDetail);
}
},
donothing(){
},