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-24 09:12:28 +08:00
commit 403f61cafb
3 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@
<!-- </SearchForm> -->
</el-form>
<div slot="pageContent">
<div slot="pageContent" slot-scope="slotProps">
<!-- slot-scope="slotProps"
:style="'height:'+(slotProps.contentHeight)+'px'" -->
<div>
@ -271,7 +271,8 @@
</el-tab-pane> -->
<!-- :height="(slotProps.contentHeight-200)+'px'" -->
<el-tab-pane label="合包列表" name="third">
<el-table
<packListView ref="packListView" propType="pack" :propParams="queryParams" :slotProps="slotProps"></packListView>
<!-- <el-table
v-loading="loading"
border
size="mini"
@ -289,7 +290,6 @@
@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"
@ -311,14 +311,6 @@
>
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
<el-table-column :label="$t('所属主单号')" align="center" prop="mainBillCode" 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="waybillDetail.currentSiteName" min-width="100" />
<el-table-column :label="$t('下一网点')" align="center" prop="waybillDetail.nextSiteName" min-width="100" />
<el-table-column :label="$t('寄件国家')" align="center" prop="waybillDetail.sendCountryName" min-width="100">
@ -343,10 +335,6 @@
<span>1</span>
</template>
</el-table-column>
<!-- <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="waybillDetail.receiveName" min-width="150" />
<el-table-column :label="$t('收件公司')" align="center" prop="waybillDetail.receiveCompany" min-width="100">
<template slot-scope="scope">
@ -395,22 +383,10 @@
</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 :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleUpdate(scope.row)"
v-hasPermi="['emis:emisTmsPack:query']"
>查看</el-button>
</template>
</el-table-column> -->
</el-table>
</el-table> -->
</el-tab-pane>
</el-tabs>
</div>
@ -810,13 +786,14 @@ import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePic
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: "PackageManagement",
components: { ProblemTypePicker, EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker},
components: { ProblemTypePicker, EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker, PackListView},
dicts: ['emis_pack_status', 'emis_qujian_fangshi', 'emis_payment_type', 'emis_waybill_status'],
data() {
return {
@ -974,7 +951,9 @@ export default {
break;
case 'third':
this.waitPackList=[];
this.getList();
// this.getList();
this.queryParams.dateTimeRange = this.dateTimeRange;
this.$refs.packListView.getList();
break;
default:
break;

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" :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"

47
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 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,6 +153,7 @@ export default {
name: "PackListView",
props:{
propParams: {},
propType: "",
slotProps: {}
},
dicts: [],
@ -152,6 +173,8 @@ export default {
selection:[],// 选中的合包
showType: "pack",
// 合包明细
emisTmsDonePackList:{},
@ -169,6 +192,8 @@ export default {
},
created() {
// this.initData();
this.queryParams = this.propParams;
this.showType = this.propType;
},
watch: {
"propParams": {