From 7b849f06f0b0986b3955c1d1d91a0b2a79fa7ea6 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期二, 31 三月 2026 08:40:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue | 70 +++++++++++++++++++++++++++++++---
1 files changed, 63 insertions(+), 7 deletions(-)
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
index 8e43f3d..f0113f9 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
@@ -180,7 +180,7 @@
<pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" @pagination="handleQuery" />
<!-- 鍒楄缃� -->
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
- <RowSettings :colName="btResList" HModName="Kf_POStockInBillList" @rowEditClose="rowSetClose"
+ <RowSettings :colName="btResList" HModName="Gy_BarCodeBillList" @rowEditClose="rowSetClose"
v-if="rowHideShow" />
</el-dialog>
<!-- 鎵撳嵃 -->
@@ -405,6 +405,10 @@
//#region 蹇�熻繃婊�
handleQuery() {
+ var params = this.get_UrlVars();
+ var HSourceInterID = params[params[1]];
+ var HSourceEntryID = params[params[2]];
+ var HSEQ = params[params[3]];
this.sWhere = ''
if (this.queryParams.ColName && this.queryParams.Comparator) {
var com = "";
@@ -487,14 +491,17 @@
if (this.queryParams.HMaterName) {
this.sWhere += " and 鐗╂枡鍚嶇О like ''%" + this.queryParams.HMaterName + "%''";
}
+ if(HSEQ!=''&&HSEQ!=null){
+ this.sWhere += " and 婧愬崟琛屽彿 = ''" + HSEQ + "''";
+ }
+ if(HSourceInterID!=''&&HSourceInterID!=null){
+ this.sWhere += " and HSourceInterID = ''" + HSourceInterID + "''";
+ }
+ if(HSourceEntryID!=''&&HSourceEntryID!=null){
+ this.sWhere += " and HSourceEntryID = ''" + HSourceEntryID + "''";
+ }
if (this.queryParams.HOrgID) {
this.sWhere += " and HStockOrgID = ''" + this.queryParams.HOrgID + "''";
- }
- if(sessionStorage["HMainSourceBillNo"] &&sessionStorage["HMainSourceBillNo"].length>0){
- this.sWhere += " and 婧愬崟鍗曞彿 like ''%" + sessionStorage["HMainSourceBillNo"] + "%''";
- }
- if (sessionStorage["HSourceBillSEQ"] &&sessionStorage["HSourceBillSEQ"].length>0) {
- this.sWhere += " and 婧愬崟琛屽彿 = ''" + sessionStorage["HSourceBillSEQ"] + "''";
}
//濡傛灉鏄嚜鍔ㄧ櫥褰曪紝鍒欏彧鑳芥煡鐪嬩緵搴斿晢鑷繁鐨勬潯鐮併��
if (sessionStorage["HAutoLogin"] == "1") {
@@ -557,6 +564,43 @@
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("鎺ュ彛璇锋眰澶辫触!");
});
@@ -594,6 +638,18 @@
//#endregion
+ //#region 鑾峰彇鍙傛暟
+ get_UrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ },
+ //#endregion
//#region 鍒犻櫎
handleDrop() {
},
--
Gitblit v1.9.1