From 99d20b4c8f1685675b47b81d6dec1b108b53f8ad Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期三, 01 四月 2026 14:55:35 +0800
Subject: [PATCH] 承运合同和出运单增加分页显示
---
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue | 28 +++++++------
src/views/logistics/transportGPS/WL_YayBill.vue | 32 ++++++++++-----
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 22 +++++-----
3 files changed, 47 insertions(+), 35 deletions(-)
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
index 06d03f6..3575ea6 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
@@ -163,8 +163,7 @@
</el-table-column>
</template>
</el-table>
- <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes"
- @pagination="getList" />
+ <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes" @pagination="getList" />
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
@@ -258,7 +257,7 @@
queryParams: {
HBillNo: '',
HBillno2: '',
- HInitTimeCycle: 29,
+ HInitTimeCycle: 364,
HDeptID: '',
HSourceBillNo: '',
@@ -282,16 +281,17 @@
multiple: true,
// 閬僵灞�
loading: true,
+ loading: true,
tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
btList: [],//琛ㄥご鍒楄〃鏄剧ず
btResList: [],
tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
dataList: [],
titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- pageSizes: [50, 100, 500, 5000, 50000],
+ pageSizes: [ 10,50, 500, 5000, 50000],
page: 1,
pageSize: 0,
- total: 0,
+ total: 0,
};
},
created() {
@@ -373,7 +373,6 @@
this.eTime = yyyyE + '-' + mmE + '-' + ddE
},
getList() {
- this.pageSize = 50
this.tableShow = false
this.loading = true
if (this.sTime && !this.sWhere) {
@@ -393,16 +392,19 @@
if (this.pageSize == 0) {
this.pageSize = 50
}
- axios.get(this.$baseUrl + '/Cg_ContractTransportBillListController/get%EF%BB%BFList', {
+ axios.get(this.$baseUrl + '/Cg_ContractTransportBillListController/page', {
params: {
"sWhere": this.sWhere,
"user": sessionStorage["HUserName"],
+ "Page":this.page,
+ "size":this.pageSize,
+ "Type":1117
},
}).then(response => {
this.tyResList = response.data.data//鎬绘暟鎹�
let data1 = response.data
let option = []
- if (data1.code == 1) {
+ if (data1.list && data1.list.length > 0) {
this.btResList = data1.list//閿�鍞嚭搴撳崟鎺ュ彛琛ㄥご鏁版嵁
this.total = data1.count;
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -545,11 +547,11 @@
this.totalNameList.push(item)
}
})
- if (data1.data[0].HPageSize == 0) {
- this.pageSize = 50
- } else {
- this.pageSize = data1.data[0].HPageSize
- }
+ // if (data1.data[0].HPageSize == 0) {
+ // this.pageSize = 50
+ // } else {
+ // this.pageSize = data1.data[0].HPageSize
+ // }
this.tableData = option.data
this.tableShow = true
this.loading = false
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 8c3514e..13862e7 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -459,14 +459,14 @@
<el-table-column align="center" label="鐗╂枡瑙勬牸" width="120">
<template slot-scope="scope">{{ scope.row.HModel }} </template>
</el-table-column>
- <el-table-column align="center" label="瀹瑰櫒浠ｇ爜" width="120">
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒浠ｇ爜" width="120">
<template slot-scope="scope">
<el-input v-model="scope.row.HMouldNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�"
@keyup.native.f7="openDataDialog(17, scope.row)"
@dblclick.native="openDataDialog(17, scope.row)" />
</template>
</el-table-column>
- <el-table-column align="center" label="瀹瑰櫒鍚嶇О" width="120">
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒鍚嶇О" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HMouldName }}</span>
</template>
@@ -479,30 +479,30 @@
@change="checkTotalQtyExceed(scope.row)"></el-input-number>
</template>
</el-table-column>
- <el-table-column align="center" label="鏍囧噯鍖呰鏁伴噺" width="120">
+ <el-table-column v-if="false" align="center" label="鏍囧噯鍖呰鏁伴噺" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HSNP }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="鍖呰瀹瑰櫒鏁伴噺" width="170">
+ <el-table-column v-if="false" align="center" label="鍖呰瀹瑰櫒鏁伴噺" width="170">
<template slot-scope="scope">
<el-input-number v-model="scope.row.HMouldQty" :min="0" style="width: 90px;"
controls-position="right"
@change="changeHMouldQty(scope.row)"></el-input-number>
</template>
</el-table-column>
- <el-table-column align="center" label="瀹瑰櫒鏁伴噺/鎵�" width="120">
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒鏁伴噺/鎵�" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HStandardQtyForMouldInPack }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="鎵樻暟" width="120">
+ <el-table-column v-if="false" align="center" label="鎵樻暟" width="120">
<template slot-scope="scope"> <!--HPackQTY=HMouldQty/HStandardQtyForMouldInPack -->
<el-input-number v-model="scope.row.HPackQTY" :min="0" style="width: 90px;"
controls-position="right" @change="changeHPackQty(scope.row)"></el-input-number>
</template>
</el-table-column>
- <el-table-column align="center" label="鎵樺崟浣嶄綋绉�" width="120">
+ <el-table-column v-if="false" align="center" label="鎵樺崟浣嶄綋绉�" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HPackV }}</span>
</template>
@@ -519,22 +519,22 @@
controls-position="right"></el-input-number> -->
</template>
</el-table-column>
- <el-table-column align="center" label="瀹瑰櫒闀垮害" width="120">
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒闀垮害" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HMouldLength }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="瀹瑰櫒瀹藉害" width="120">
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒瀹藉害" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HMouldWidth }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="瀹瑰櫒楂樺害" width="120">
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒楂樺害" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HMouldHeight }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="鎶樺彔楂樺害" width="120">
+ <el-table-column v-if="false" align="center" label="鎶樺彔楂樺害" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HMouldFoldHeight }}</span>
</template>
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index df1aba6..c5036de 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -256,8 +256,9 @@
</template>
</el-table>
<!-- 璁板綍鏁般�侀〉鏁般�佸綋鍓嶉〉 -->
- <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize"
- @pagination="handleQuery" />
+ <!-- <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize"
+ @pagination="handleQuery" /> -->
+ <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes" @pagination="getList" />
<!-- 鍒楄缃� -->
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
@@ -535,6 +536,14 @@
ColContent2: '',
ColContent: '',
},
+ loading: true,
+ tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
+ btList: [],//琛ㄥご鍒楄〃鏄剧ず
+ btResList: [],
+ tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+ dataList: [],
+ titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ pageSizes: [ 50,100, 500, 5000, 50000],
page: 1, //page椤电储寮�
pageSize: 0, //page椤甸潰璁板綍鏁�
total: 0, //璁板綍鍚堣鏁�
@@ -761,7 +770,7 @@
//#region 鏌ヨ
getList() {
- this.pageSize = 50
+
if (this.pageSize == 0) {
this.pageSize = 50
}
@@ -769,18 +778,19 @@
this.loading = true
console.log("swhere", this.sWhere)
// 鍒楄〃鏌ヨ
- axios.get(this.$baseUrl + '/WLYayBillController/GetListPage', {
+ axios.get(this.$baseUrl + '/WLYayBillController/page', {
params: {
"sWhere": this.sWhere,
"user": sessionStorage["HUserName"],
"page": this.page,
- "size": this.pageSize
+ "size": this.pageSize,
+ "Type":3321
},
}).then(response => {
this.tyResList = response.data.data//鎬绘暟鎹�
let data1 = response.data
let option = []
- if (data1.code == 1) {
+ if (data1.list && data1.list.length > 0) {
this.btResList = data1.list //鍒楄〃琛ㄥご鏁版嵁
this.total = data1.count;
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -1231,11 +1241,11 @@
this.totalNameList.push(item)
}
})
- if (data1.data[0].HPageSize == 0) {
- this.pageSize = 50
- } else {
- this.pageSize = data1.data[0].HPageSize
- }
+ // if (data1.data[0].HPageSize == 0) {
+ // this.pageSize = 50
+ // } else {
+ // this.pageSize = data1.data[0].HPageSize
+ // }
this.tableData = option.data
this.tableShow = true
this.loading = false
--
Gitblit v1.9.1