From 9620ca5caed59bd206dce701a04a5a4e4cfb9dc5 Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期二, 31 三月 2026 13:46:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
index c857236..817c60b 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
@@ -177,7 +177,8 @@
</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="Gy_BarCodeBillList" @rowEditClose="rowSetClose"
@@ -272,6 +273,15 @@
ColContent2: '',
},
+
+ loading: true,
+ tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
+ btList: [],//琛ㄥご鍒楄〃鏄剧ず
+ btResList: [],
+ tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+ dataList: [],
+ titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ pageSizes: [ 50,100, 500, 5000, 50000],
page: 1, //page椤电储寮�
pageSize: 0, //page椤甸潰璁板綍鏁�
total: 0, //璁板綍鍚堣鏁�
@@ -514,7 +524,6 @@
//#region 鏌ヨ
getList() {
- this.pageSize = 50
if (this.pageSize == 0) {
this.pageSize = 50
}
@@ -563,6 +572,43 @@
this.checkDataList = [];
let HModName = "Gy_BarCodeBillList"
this.DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, this.dataList);
+ }
+ else{
+ if(data1.list){
+ this.btResList = data1.list //鍒楄〃琛ㄥご鏁版嵁
+ this.total = data1.count;
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ if (this.titleData.indexOf(data[i].name) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if (totalArray.indexOf(data[i].name) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁＄畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ }
+ else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ option.cols = [col]
+ this.dataList = option
+ option.data = data1.data;
+ var result = data1.data;
+ option.data = result;
+ this.checkDataList = [];
+ let HModName = "Gy_BarCodeBillList"
+ this.DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, this.dataList);
+ }
+ else{
+ this.tableShow = true
+ this.loading = false
+ }
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -867,11 +913,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