From 05fb7af4f0316fdae54f52076509e582ca5e1e4c Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期四, 04 十二月 2025 11:01:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/component/HSourceReportHtml/index.vue | 210 +++++++++++++++++++++++++++-------------------------
1 files changed, 108 insertions(+), 102 deletions(-)
diff --git a/src/views/component/HSourceReportHtml/index.vue b/src/views/component/HSourceReportHtml/index.vue
index ea92640..7f7ec1d 100644
--- a/src/views/component/HSourceReportHtml/index.vue
+++ b/src/views/component/HSourceReportHtml/index.vue
@@ -285,7 +285,7 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
- if (this.queryParams.HBillStatus &&this.HSouceBillType == '鐢熶骇璁㈠崟') {
+ if (this.queryParams.HBillStatus && this.HSouceBillType == '鐢熶骇璁㈠崟') {
this.sWhere += " and 鐘舵�� = '" + this.queryParams.HBillStatus + "'";
}
if (this.HSouceBillType == '鐢熶骇璁㈠崟') {
@@ -306,111 +306,117 @@
limit: this.pageSize,
},
}).then((response) => {
+ console.log(response)
this.tyResList = response.data.data; //鎬绘暟鎹�
let data1 = response.data;
+
let option = [];
- if (data1.code == 1) {
- 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,
- }); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
- var patrn = new RegExp(/^h/i);
- if (patrn.test(data1.list[key].ColmCols)) {
- this.titleData[key] = data1.list[key].ColmCols;
- }
+ // if (data1.code == 1) {
+ 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,
+ }); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ this.titleData[key] = data1.list[key].ColmCols;
}
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- 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;
- switch (this.HSouceBillType) {
- case '鐢熶骇璁㈠崟':
- this.HModName = "Sc_ICMOBill_3710";
- break;
- case '鐢熶骇姹囨姤鍗�':
- this.HModName = "Sc_ICMOReportBill_3711";
- break;
- case '閲囪喘璁㈠崟':
- this.HModName = "Cg_POOrderBill_1102";
- break;
- case '鏀舵枡閫氱煡鍗�':
- this.HModName = "Cg_POInStockBill_1103";
- break;
- case '濮斿璁㈠崟':
- this.HModName = "WW_EntrustOrderBill_1601";
- break;
- case '鐢熶骇鍏ュ簱鍗�':
- $("#HProcExchBillNoHidden").show();
- this.HModName = "ProductInBill_1202";
- break;
- case '閲囪喘鍏ュ簱鍗�':
- this.HModName = "POStockInBill_1201";
- break;
- case '閿�鍞��璐�':
- this.HModName = "SellOutBackBill_1247";
- break;
- case '鐢熶骇閫�鏂�':
- this.HModName = "MateOutBackBill_1244";
- break;
- case '宸ュ簭娴佽浆鍗�':
- this.HModName = "ProcessExchangeBill_3772";
- break;
- case '閿�鍞嚭搴撳崟':
- this.HModName = "SellOutBill_1205";
- break;
- case '棰嗘枡鍑哄簱鍗�':
- this.HModName = "MateOutBill_1204";
- break;
- }
- this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
}
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ 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;
+ if (data1.code == 0) {
+ data1.data = []
+ }
+ option.data = data1.data;
+ var result = data1.data;
+ option.data = result;
+ switch (this.HSouceBillType) {
+ case '鐢熶骇璁㈠崟':
+ this.HModName = "Sc_ICMOBill_3710";
+ break;
+ case '鐢熶骇姹囨姤鍗�':
+ this.HModName = "Sc_ICMOReportBill_3711";
+ break;
+ case '閲囪喘璁㈠崟':
+ this.HModName = "Cg_POOrderBill_1102";
+ break;
+ case '鏀舵枡閫氱煡鍗�':
+ this.HModName = "Cg_POInStockBill_1103";
+ break;
+ case '濮斿璁㈠崟':
+ this.HModName = "WW_EntrustOrderBill_1601";
+ break;
+ case '鐢熶骇鍏ュ簱鍗�':
+ $("#HProcExchBillNoHidden").show();
+ this.HModName = "ProductInBill_1202";
+ break;
+ case '閲囪喘鍏ュ簱鍗�':
+ this.HModName = "POStockInBill_1201";
+ break;
+ case '閿�鍞��璐�':
+ this.HModName = "SellOutBackBill_1247";
+ break;
+ case '鐢熶骇閫�鏂�':
+ this.HModName = "MateOutBackBill_1244";
+ break;
+ case '宸ュ簭娴佽浆鍗�':
+ this.HModName = "ProcessExchangeBill_3772";
+ break;
+ case '閿�鍞嚭搴撳崟':
+ this.HModName = "SellOutBill_1205";
+ break;
+ case '棰嗘枡鍑哄簱鍗�':
+ this.HModName = "MateOutBill_1204";
+ break;
+ }
+ this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+ // }
}).catch((error) => {
+ console.log(error)
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
@@ -674,7 +680,7 @@
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
- if (this.queryParams.HProcExchBillNo &&this.HSouceBillType == '鐢熶骇鍏ュ簱鍗�') {
+ if (this.queryParams.HProcExchBillNo && this.HSouceBillType == '鐢熶骇鍏ュ簱鍗�') {
this.sWhere += " and 娴佽浆鍗″彿 like '%" + this.queryParams.HProcExchBillNo + "%'";
}
if (this.queryParams.HDeptName) {
@@ -686,7 +692,7 @@
if (this.queryParams.PartName) {
this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.PartName + "%'";
}
- if (this.queryParams.HBillStatus &&this.HSouceBillType == '鐢熶骇璁㈠崟') {
+ if (this.queryParams.HBillStatus && this.HSouceBillType == '鐢熶骇璁㈠崟') {
this.sWhere += " and 鐘舵�� like '%" + this.queryParams.HBillStatus + "%'";
}
if (sessionStorage["Organization"] == "涔濊彵鐢垫満" && this.HSouceBillType == '鐢熶骇璁㈠崟') {
--
Gitblit v1.9.1