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-07-23 11:38:59 +08:00
parent 793ef7cfd9
commit d806998a4b
3 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,7 +271,7 @@
</el-tab-pane> -->
<!-- :height="(slotProps.contentHeight-200)+'px'" -->
<el-tab-pane label="合包列表" name="third">
<packListView ref="packListView" :propSelect="false" :propParams="queryParams" :slotProps="slotProps"></packListView>
<packListView ref="packListView" propType="pack" :propParams="queryParams" :slotProps="slotProps"></packListView>
<!-- <el-table
v-loading="loading"
border

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

@ -286,7 +286,7 @@
</XdTable>
</el-tab-pane>
<el-tab-pane label="合包列表" name="fourth">
<packListView ref="packListView" :propSelect="true" :propParams="queryParams" :slotProps="slotProps"></packListView>
<packListView ref="packListView" propType="batch" :propParams="queryParams" :slotProps="slotProps"></packListView>
</el-tab-pane>
<el-tab-pane label="批次列表" name="third">
<XdTable v-loading="loading"

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

@ -14,8 +14,9 @@
@selection-change="handleSelectionChange"
@expand-change="expandChange"
:row-class-name="disabledRow"
:showCustomizeTpl="false"
>
<el-table-column v-if="showSelect" type="selection" width="55" align="center">
<el-table-column v-if="showType=='pack'" type="selection" width="55" align="center">
</el-table-column>
<el-table-column type="expand">
<template slot-scope="scope">
@ -100,24 +101,43 @@
</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">
<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 :label="$t('操作网点')" align="center" prop="createSiteName" min-width="100" />
<el-table-column :label="$t('是否可拆')" align="center" prop="blUnpack" min-width="100">
<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 :label="$t('操作员')" align="center" prop="createByName" min-width="150" />
<el-table-column :label="$t('票数')" align="center" prop="totalWaybillQty" min-width="100" />
<el-table-column :label="$t('件数')" align="center" prop="totalParcelQty" 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="packDate" min-width="170" />
<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>
@ -133,7 +153,7 @@ export default {
name: "PackListView",
props:{
propParams: {},
propSelect: Boolean,
propType: "",
slotProps: {}
},
dicts: [],
@ -153,7 +173,7 @@ export default {
selection:[],// 选中的合包
showSelect: true,
showType: "pack",
// 合包明细
emisTmsDonePackList:{},
@ -173,7 +193,7 @@ export default {
created() {
// this.initData();
this.queryParams = this.propParams;
this.showSelect = this.propSelect;
this.showType = this.propType;
},
watch: {
"propParams": {