From bbc4e956d3bd91796567eafd0dffc82e9fb902c3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 08 二月 2023 11:32:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/PublicPage/HSourceReportHtml.html | 79 ++++++++++++++++++++++++++++-----------
1 files changed, 56 insertions(+), 23 deletions(-)
diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index 3d5f779..0fe673e 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -93,7 +93,6 @@
var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]];//婧愬崟id
var HSouceBillType = decodeURI(params[params[2]]);//婧愬崟绫诲瀷
- console.log(HSouceBillType);
}
var cols_arr = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
var table = null;
@@ -200,11 +199,11 @@
async: false,
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
success: function (data1) {
- console.log(data1);
+ layer.close(ajaxLoad);
for (var key in data1.list) {
resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
- set_InitGrid(sWhere);
+ set_InitGrid(data1);
}, error: function (err) {
layer.alert(err.Message, { icon: 5 });
}
@@ -214,13 +213,13 @@
//#endregion
//#region 鍒濆鍖栬〃鏍兼柟娉�
- function set_InitGrid(sWhere) {
+ function set_InitGrid(data1) {
//濉厖琛ㄦ牸澶存暟缁�
var data = resultTableHead;
cols_arr[0] = [];
cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
for (var i = 0; i < data.length; i++) {
- if (data[i].name.substr(0, 1) == 'H') {
+ if (data[i].name.substr(0, 1) == 'H' || data[i].name.substr(0, 1) == 'h') {
cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
}
else {
@@ -240,24 +239,22 @@
}
//濉厖琛ㄦ牸鏁版嵁
table.render({
- elem: '#layTable',
- url: GetWEBURL() + '/Sc_BarCode/ReportFromBillList',
- //toolbar: '#toolbarDemo', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
- title: '' + HSouceBillType + '',
- cols: cols_arr, //濉厖琛ㄦ牸澶存暟鎹�,
- id: 'layTable', //琛ㄦ牸id
- where: { sWhere: sWhere, HSouceBillType: HSouceBillType, HOrgID: linterid }, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
- page: true, //寮�鍚垎椤�
- totalRow: true, //寮�鍚悎璁�
- limit: 50, //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
- limits: [50, 500, 2000, 20000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
- method: 'get', //鎻愪氦鏂瑰紡
- layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
- height:600,
- response: {
- statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
- },
- done: function (res) { //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+ id: 'layTable'
+ , elem: '#layTable'
+ //, toolbar: '#toolbarDemo'
+ , cols: [cols_arr[0]]
+ , data: data1.data == null ? [] : data1.data
+ , title: '' + HSouceBillType + ''
+ , page: true //寮�鍚垎椤�
+ , totalRow: false //寮�鍚悎璁�
+ , cellMinWidth: 120
+ , height: 520
+ , limit: 50 //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+ , limits: [50, 500, 5000, 20000]
+ , method: 'get' //鎻愪氦鏂瑰紡
+ , layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
+ , loading: false
+ , done: function (res, curr, count) { //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
layer.close(layer.index); //杩斿洖鏁版嵁鍏抽棴loading
}
});
@@ -284,15 +281,51 @@
return sWhere;
break;
case '鐢熶骇姹囨姤鍗�':
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (PartNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + PartNumber + "%'";
+ }
+ if (PartName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+ }
return sWhere;
break;
case '閲囪喘璁㈠崟':
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (PartNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + PartNumber + "%'";
+ }
+ if (PartName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+ }
return sWhere;
break;
case '鏀舵枡閫氱煡鍗�':
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (PartNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + PartNumber + "%'";
+ }
+ if (PartName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+ }
return sWhere;
break;
case '濮斿璁㈠崟':
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ if (PartNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + PartNumber + "%'";
+ }
+ if (PartName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + PartName + "%'";
+ }
return sWhere;
break;
case '閫�璐ч�氱煡鍗�':
--
Gitblit v1.9.1