From 1c9d495dcc5dc34456d389db3b230e98766d2639 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 12 一月 2024 10:31:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 2
WebTM/views/质量管理/巡检记录单/QC_PatrolProcCheckBillList.html | 98 +++---
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 31 +
WebTM/views/系统管理/过滤方案设置/Xt_FastICScheme.html | 8
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList.html | 88 +++---
WebTM/views/系统管理/过滤方案设置/Xt_FastICSchemeList.html | 122 +++++---
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html | 91 +++---
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html | 7
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 318 +++++++++++++++++------
9 files changed, 478 insertions(+), 287 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index 01df218..52ce424 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -13,6 +13,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
</head>
<body>
@@ -87,15 +88,16 @@
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_show"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_ref"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn_audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn_deaudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn_stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn_destop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_hidecolumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>鎸夐挳璁剧疆</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
@@ -180,6 +182,11 @@
break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
+ break;
+ case 'set_HideButton':
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Gy_DepartmentList";
+ get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
break;
};
});
@@ -310,6 +317,12 @@
}
table.render(option);
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "Gy_DepartmentList";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+
+
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index 3fbe19e..b67449f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -160,6 +160,8 @@
</div>
</div>
</div>
+ <!--鏄剧ず褰撳墠杩囨护鏂规-->
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now" ></div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<!--<div class="layui-btn-container">
@@ -250,9 +252,11 @@
var option = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
- var HDefaultFilter = "";
+ //鏄惁宸茬粡閫夋嫨浜嗚繃婊ゆ柟妗�
+ window.HDefaultFilter = "";
+ //閫夋嫨鐨勮繃婊ゆ柟妗堝唴鐮�
+ window.HInterID_Choose = 0;
//鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
-
//鍒濆鍖栬〃鏍�
DisPlay_HideColumn();
@@ -437,12 +441,13 @@
});
//#region 鍒濆鍖栫晫闈�
- function set_ClearBill() {
+ function set_ClearBill() {
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
get_FastQuery();
-
+ //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+ get_DefaultModule();
}
//#endregion
@@ -635,6 +640,7 @@
$.ajax({
url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',
type: "GET",
+ async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
@@ -1016,87 +1022,7 @@
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
}
- }
-
- //淇濆瓨鏂规
- function set_SaveScheme() {
- var Filter = document.getElementsByClassName("ForFilteringSchemes"); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
-
- var HFilterIdList = "";
- var HFilterIdLists = "";
- var HValue = "";
- var HElement_type = "";
- for (var i = 0; i < Filter.length; i++) {
- HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
- HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
- HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
- HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
- }
- //瀵规暟缁勮繘琛岀紪鐮�
- HFilterIdLists = encodeURI(HFilterIdLists.substring(0, HFilterIdLists.length - 1));//瀵� URI 杩涜缂栫爜
- HValue = encodeURI(HValue.substring(0, HValue.length - 1));//瀵� URI 杩涜缂栫爜
- HElement_type = encodeURI(HElement_type.substring(0, HElement_type.length - 1));//瀵� URI 杩涜缂栫爜
-
- if (HDefaultFilter == "") {
- layer.open({
- type: 2
- , area: ['40%', '80%']
- , title: '杩囨护鏂规'
- , shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=閲囪喘璁㈠崟&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
- , btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
-
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
-
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- }
- , end: function () {
- get_FastQuery()
- }
- })
- }
- ;
- }
-
- //璇诲彇鏂规
- function set_ReadScheme() {
- layer.open({
- type: 2
- , area: ['80%', '80%']
- , title: '杩囨护鏂规鍒楄〃'
- , shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=HFilterScheme'
- , btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
-
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
-
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- }
- , end: function () {
- get_FastQuery()
- }
- })
- }
+ }
// 澶嶅埗
function set_copy() {
@@ -1708,13 +1634,235 @@
return res;
}
+
+ //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+ function get_DefaultModule() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": "閲囪喘璁㈠崟", "HInterID": 0, "Type": "Default" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data;
+ HInterID_Choose = data[0].hmainid;
+ HInterID = data[0].hmainid
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ var HRemark = data[0].澶囨敞
+
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+ get_FastQuery()
+ form.render("select");
+ } else {
+ document.getElementById("HFilterScheme_Now").style.display = "none";
+ get_FastQuery()
+ form.render("select");
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //淇濆瓨鏂规
+ function set_SaveScheme() {
+ var index = layer.open()
+ var HIsClose_Manual = false;
+ var Filter = document.getElementsByClassName("ForFilteringSchemes"); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+ var HFilterIdList = "";
+ var HFilterIdLists = "";
+ var HValue = "";
+ var HElement_type = "";
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //瀵规暟缁勮繘琛岀紪鐮�
+ HFilterIdLists = encodeURI(HFilterIdLists.substring(0, HFilterIdLists.length - 1));//瀵� URI 杩涜缂栫爜
+ HValue = encodeURI(HValue.substring(0, HValue.length - 1));//瀵� URI 杩涜缂栫爜
+ HElement_type = encodeURI(HElement_type.substring(0, HElement_type.length - 1));//瀵� URI 杩涜缂栫爜
+
+ if (HDefaultFilter == "") {
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=閲囪喘璁㈠崟&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery();
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ }
+ })
+ layer.close(index)
+ } else {
+ layer.confirm('褰撳墠宸查�夋嫨杩囨护鏂规锛屾槸鍚︿慨鏀癸紵璇烽�夋嫨瀵瑰簲鎿嶄綔', {
+ title: "鎿嶄綔鎻愮ず",
+ icon: 0,
+ btn: ['鏂板鏂规', '淇濆瓨淇敼褰撳墠鏂规', '鍙栨秷']
+ }, function (index, layero) {
+ //鏂板
+ layer.open({
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=閲囪喘璁㈠崟&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , end: function () {
+ get_FastQuery()
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] + ")" + '</span>';
+ }
+ })
+ layer.close(index)
+ }, function (index) {
+ var Filter_Edit = document.getElementsByClassName("ForFilteringSchemes"); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+ for (var i = 0; i < Filter_Edit.length; i++) {
+ HFilterIdList = Filter_Edit[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter_Edit[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //瀵规暟缁勮繘琛岀紪鐮�
+ HFilterIdLists = encodeURI(HFilterIdLists.substring(0, HFilterIdLists.length - 1));//瀵� URI 杩涜缂栫爜
+ HValue = encodeURI(HValue.substring(0, HValue.length - 1));//瀵� URI 杩涜缂栫爜
+ HElement_type = encodeURI(HElement_type.substring(0, HElement_type.length - 1));//瀵� URI 杩涜缂栫爜
+ var sMainSub = HInterID_Choose + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["HUserName"] + ';' + 3;
+
+ //淇敼
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Xt_FastICScheme/save", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "oMain": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+ }
+ else {
+
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+
+ }
+ });
+ layer.close(index)
+ }, function (index) {
+ //鍙栨秷
+ layer.alert('鍙栨秷')
+ layer.close(index)
+ });
+ }
+
+ }
+
+ //璇诲彇鏂规
+ function set_ReadScheme() {
+ var HIsClose_Manual = false;
+ var Filter = document.getElementsByClassName("ForFilteringSchemes"); //鑾峰彇鏈〉鎵�鏈夎繃婊ゆ潯浠跺璞�(class涓寘鍚�"ForFilteringSchemes"鐨勫厓绱�)
+
+ var HFilterIdList = "";
+ var HFilterIdLists = "";
+ var HValue = "";
+ var HElement_type = "";
+ for (var i = 0; i < Filter.length; i++) {
+ HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
+ HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
+ HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+ }
+ //瀵规暟缁勮繘琛岀紪鐮�
+ HFilterIdLists = encodeURI(HFilterIdLists.substring(0, HFilterIdLists.length - 1));//瀵� URI 杩涜缂栫爜
+ HValue = encodeURI(HValue.substring(0, HValue.length - 1));//瀵� URI 杩涜缂栫爜
+ HElement_type = encodeURI(HElement_type.substring(0, HElement_type.length - 1));//瀵� URI 杩涜缂栫爜
+
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '杩囨护鏂规鍒楄〃'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICSchemeList.html?HType=Select&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
+ }
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery()
+ form.render("select");
+ }
+ }
+ })
+ }
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
+ // 杩囨护鏂规杩斿洖鏁版嵁
+ function HFilterScheme(obj) //杩斿洖杩囨护鏂规
+ {
+ var HInterID = obj[0].hmainid;
+ HInterID_Choose = obj[0].hmainid;
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": "閲囪喘璁㈠崟", "HInterID": HInterID, "Type": "Select" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = data1.data;
+ //璧嬪�艰繃婊ゆ柟妗堝悕绉�
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず褰撳墠鐨勮繃婊ゆ柟妗�
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ HInterID = data[0].hmainid
+ //鏍规嵁閫夋嫨鐨勮繃婊ゆ柟妗堝洖濉暟鎹埌鍒楄〃杩囨护鏉′欢
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
</script>
</body>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index a8ee9af..f5422e8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -1016,7 +1016,7 @@
for (let i = 0; i < data.length; i++) {
arr.push({
"HMaterID": data[i].鐗╂枡ID, "HMaterCode": data[i].鐗╂枡浠ｇ爜, "HMaterName": data[i].鐗╂枡鍚嶇О, "HMaterSpec": data[i].瑙勬牸鍨嬪彿,
- "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": data[i].鐢熶骇璧勬簮ID, "HSourceCode": data[i].鐢熶骇璧勬簮浠ｇ爜,
+ "HUnitID": data[i].鍗曚綅ID, "HUnitCode": data[i].璁￠噺鍗曚綅浠ｇ爜, "HUnitName": data[i].璁￠噺鍗曚綅, "HSourceID": data[i].鐢熶骇璧勬簮ID, "HSourceCode": data[i].鐢熶骇璧勬簮浠ｇ爜,
"HSourceName": data[i].鐢熶骇璧勬簮鍚嶇О, "HWorkerid": data[i].鎿嶄綔鍛業D, "HWorkerCode": data[i].鎿嶄綔鍛樹唬鐮�,
"HWorkerName": data[i].鎿嶄綔鍛樺悕绉�, "HQty": data[i].浜ч噺, "HBadQty": data[i].涓嶈壇鏁伴噺 == '' ? 0 : data[i].涓嶈壇鏁伴噺, "HICMOBillNo": data[i].鐢熶骇璁㈠崟鍙�,
"HICMOInterID": data[i].HICMOInterID, "HICMOEntryID": data[i].HICMOEntryID, "HRemark": "", "HSourceInterID": data[i].HICMOInterID, "HSourceEntryID": data[i].HICMOEntryID, "HSourceBillNo": data[i].鐢熶骇璁㈠崟鍙�,
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICScheme.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICScheme.html"
index 3a905f8..f8c95fd 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICScheme.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICScheme.html"
@@ -43,7 +43,7 @@
<div class="layui-inline">
<label class="layui-form-label">妯″潡鍚嶇О锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HBillName" lay-verify="HBillName" id="HBillName" readonly>
+ <input class="layui-input" name="HBillName" lay-verify="HBillName" id="HBillName" style="background-color:#eeebeb" readonly>
</div>
</div>
<div class="layui-inline">
@@ -144,7 +144,7 @@
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
$("#HCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HUserCode").val(sessionStorage["HUserName"]);
+ $("#HUserCode").val(sessionStorage["Czybm"]);
}
});
}
@@ -158,7 +158,7 @@
data.field.HStopflag = isStopCheck;//灏嗘暟缁勫悎骞舵垚瀛楃涓�
var oMain = JSON.stringify(data.field)
- var sMainSub = oMain + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["HUserName"];
+ var sMainSub = oMain + ';' + HFilterIdLists + ';' + HValue + ';' + HElement_type + ';' + sessionStorage["Czybm"] + ';' + OperationType;
$.ajax(
{
type: "POST",
@@ -168,6 +168,8 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ sessionStorage["HFilterSchemeName_" + sessionStorage["Czybm"]] = $("#HName").val();
+ sessionStorage["HFilterSchemeRemark_" + sessionStorage["Czybm"]] = $("#HRemark").val();
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICSchemeList.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICSchemeList.html"
index 08a3550..b3c8020 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICSchemeList.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\350\277\207\346\273\244\346\226\271\346\241\210\350\256\276\347\275\256/Xt_FastICSchemeList.html"
@@ -22,14 +22,15 @@
<div class="layui-collapse">
<div class="layui-colla-item">
-
+
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"> </table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnAdd" id="btn-Add"><i class="layui-icon layui-icon-form"></i>鏂板</button>
- <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btndelete" id="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btndelete" id="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
+ <button type="button" lay-submit="" class="layui-btn layui-btn-sm" lay-event="btnExit" id="btn-Exit"><i class="layui-icon layui-icon-form"></i>閫�鍑�</button>
</div>
</script>
</form>
@@ -41,7 +42,30 @@
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+
<script>
+ function getUrlVars() {
+ 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;
+ }
+ var params = getUrlVars();
+ var Type = params[params[0]];
+
+ HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+
+
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var HFilterIdLists = params[params[1]];//杩囨护鏉′欢ID
+ var HValue = params[params[2]];//杩囨护鏉′欢涓緭鍏ョ殑鍊�
+ var HElement_type = params[params[3]];//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -62,7 +86,7 @@
var Organization = sessionStorage["Organization"]
var HModName = "Xt_FastICSchemeList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID"];
+ var titleData = ["hmainid", "杩囨护瀛楁ID", "杩囨护鏍囩绫诲瀷","杩囨护鍊�"];
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -77,10 +101,13 @@
switch (obj.event) {
//鏂板
case 'btnAdd': set_AddNew();
- break;
+ break;
//鍒犻櫎
case 'btndelete': set_DeleteBill();
- break;
+ break;
+ //閫�鍑�
+ case 'btnExit': set_Exit();
+ break;
};
});
@@ -108,11 +135,11 @@
var data = [];
data.push(obj.data);
switch (Type) {
- case "HAccCus": //杩斿洖缁撶畻鍗曚綅
- parent.GetHAccCusValue(data);
+ case "HFilterScheme": //杩斿洖杩囨护鏂规
+ parent.HFilterScheme(data);
break;
default:
- parent.GetHSupValue(data); //杩斿洖 瀹㈡埛
+ parent.HFilterScheme(data); //杩斿洖 瀹㈡埛
}
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
@@ -153,17 +180,6 @@
, limits: [50, 500, 5000, 50000]
, limit: 50
, cellMinWidth: 90
- //, cols: [[
- // { type: 'radio', fixed: 'left' }
- // , { field: '閫夋嫨', title: '閫夋嫨', sort: true, hide: true }
- // , { field: 'HItemID', title: 'HItemID', hide: true }
- // , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
- // , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�' }
- // , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿' }
- // , { field: '缁勭粐鍚嶇О', title: '缁勭粐鍚嶇О' }
- // , { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
- // , { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
- //]]
};
}
//鏌ヨ
@@ -173,7 +189,7 @@
$.ajax({
url: GetWEBURL() + '/Xt_FastICScheme/list',
type: "GET",
- data: { "user": sessionStorage["HUserName"], "HModuleName": "閲囪喘璁㈠崟" },
+ data: { "user": sessionStorage["Czybm"], "HModuleName": "閲囪喘璁㈠崟" },
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -213,7 +229,7 @@
, limit: 50
, cellMinWidth: 90
}
- table.render(option);
+ table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
@@ -283,65 +299,77 @@
sWhere = "";
}
-
+
// 鍒犻櫎鎸夐挳
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var ModRightNameDelete = "Gy_Supplier_Delete";
+ if (checkStatus.data.length > 0) {
+
+ var hmainid = "";
+ for (let i = 0; i < data.length; i++) {
+ hmainid += data[i].hmainid + ",";
+ }
+ //瀵规暟缁勮繘琛岀紪鐮�
+ hmainid = encodeURI(hmainid.substring(0, hmainid.length - 1));//瀵� URI 杩涜缂栫爜
+
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + '/Gy_Supplier/Delete_Json',
+ url: GetWEBURL() + '/Xt_FastICScheme/DeltetXt_FastICScheme',
type: "GET",
- //async: true,
- data: { "HItemID": checkStatus.data[0].HItemID, "User": sessionStorage["HUserName"], "ModRightNameDelete": ModRightNameDelete },
+ data: { "HInterID": hmainid, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ layer.msg(result.Message, { icon: 1 }, function () {
// 寰楀埌frame绱㈠紩
var index = layer.getFrameIndex(window.name);
//鍏抽棴褰撳墠frame
- layer.close(index);
+ layer.close(wait);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
window.location.reload();
});
} else {
layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(wait);
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(wait);
}
- })
+ });
})
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
}
-
+
//鏂板鎸夐挳
function set_AddNew() {
layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板杩囨护鏂规',
- closeBtn: 1,
- shift: 2,
- area: ['100%', '100%'],
- maxmin: true,
- content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html',
- end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
- },
- success: function (layero, index) {
-
+ type: 2
+ , area: ['40%', '80%']
+ , title: '杩囨护鏂规'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../绯荤粺绠＄悊/杩囨护鏂规璁剧疆/Xt_FastICScheme.html?OperationType=1&HModuleName=閲囪喘璁㈠崟&HFilterIdLists=' + HFilterIdLists + '&HValue=' + HValue + '&HElement_type=' + HElement_type
+ , cancel: function () {
+ // 鍙充笂瑙掑叧闂簨浠剁殑閫昏緫
+ HIsClose_Manual = true;
}
- });
+ , end: function () {
+ if (HIsClose_Manual != true) {
+ get_FastQuery();
+ }
+ }
+ })
+ }
+ //閫�鍑烘寜閽�
+ function set_Exit() {
+ Pub_Close(1);
}
-
//#endregion
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
index aa65243..5eb0d36 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckBill.html"
@@ -93,6 +93,13 @@
<input type="text" name="HMainProcName" id="HMainProcName" onkeyup="this.value=this.value.replace(/\D/g,'')" lay-verify="" autocomplete="off" class="layui-input" value="">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒ゆ柇缁撹</label>
+ <div class="layui-input-block">
+ <input type="radio" name="HLastResult" id="HLastResult" value="1" title="鍚堟牸" checked>
+ <input type="radio" name="HLastResult" id="HLastResult" value="0" title="涓嶅悎鏍�">
+ </div>
+ </div>
<div class="layui-colorpicker-xs" style="margin-top:15px">
<label class="layui-form-label"> 澶囨敞</label>
<div class="layui-input-block">
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
index 2d224e5..0e6b1b6 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_PatrolProcCheckBillList.html"
@@ -37,101 +37,97 @@
</div>
<!--绗竴灞傝繃婊�-->
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HDate1" id="HDate1">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HDate2" id="HDate2">
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍒ゅ畾缁撹</label>
- <div class="layui-input-block" style="width:120px">
- <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
- <option value=""></option>
- <option value="鍚堟牸">鍚堟牸</option>
- <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
- </select>
- </div>
-
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <!--绗簩鎺掕繃婊�-->
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
- <div class="layui-row" style="margin-top:5px">
+
+ <div class="layui-colla-content">
+ <!--绗簩鎺掕繃婊�-->
+ <div class="layui-row" >
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡缂栫爜</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HModel" id="HModel">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璐ㄦ鍛�</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">璐ㄦ鍛�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HName1" id="HName1">
</div>
</div>
</div>
- </div>
- <!--绗笁鎺掕繃婊�-->
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <!--绗笁鎺掕繃婊�-->
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
- <label class="layui-form-label">妫�楠岄」鐩�</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">妫�楠岄」鐩�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HName2" id="HName2">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐢熶骇鍚嶇О</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HName3" id="HName3">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">宸ュ簭娴佽浆鍗�</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
</div>
</div>
+ <div class="layui-inline" style="width: 85px;">
+ <label class="layui-form-label">鍒ゅ畾缁撹</label>
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HLastResult" id="HLastResult" lay-verify="HLastResult" >
+ <option value=""></option>
+ <option value="鍚堟牸">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>
</div>
- </div>
- <!--鑷畾涔夎繃婊�-->
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <!--鑷畾涔夎繃婊�-->
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block" style="width:120px">
+ <div class="layui-input-block" style="margin-left: 120px;">
<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
- <div class="layui-inline" style="width:120px">
+ <div class="layui-inline">
<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
@@ -146,7 +142,7 @@
<option value="10">涓嶅寘鍚�</option>
</select>
</div>
- <div class="layui-inline" style="width:120px">
+ <div class="layui-inline">
<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
@@ -281,8 +277,12 @@
, { field: '琛ㄥご澶囨敞 ', title: '琛ㄥご澶囨敞', width: 105, sort: true }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 160, sort: true }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 160, sort: true }
+ , { field: '鍒ゅ畾缁撹', title: '鍒ゅ畾缁撹', sort: true }
, { field: '鐢熶骇璧勬簮鍚嶇О', title: '鐢熶骇璧勬簮鍚嶇О', sort: true }
, { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜', sort: true }
+ , { field: '妫�楠岄」鐩唬鐮�', title: '妫�楠岄」鐩唬鐮�', sort: true }
+ , { field: '妫�楠岄」鐩悕绉�', title: '妫�楠岄」鐩悕绉�', sort: true }
+ , { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', sort: true }
, { field: '浜у搧鍐呯爜', title: '浜у搧鍐呯爜', sort: true }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', sort: true }
, { field: '浜у搧鍨嬪彿', title: '浜у搧鍨嬪彿', width: 115, sort: true }
@@ -514,21 +514,21 @@
if (HBillNo)
sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
if (HNumber)
- sqlWhere += " and 鐗╂枡缂栫爜 like '%" + HNumber + "%'";
+ sqlWhere += " and 浜у搧鍐呯爜 like '%" + HNumber + "%'";
if (HName)
- sqlWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
+ sqlWhere += " and 浜у搧鍚嶇О like '%" + HName + "%'";
if (HModel)
- sqlWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+ sqlWhere += " and 浜у搧鍨嬪彿 like '%" + HModel + "%'";
if (HLastResult)
sqlWhere += " and 鍒ゅ畾缁撹 like '" + HLastResult + "%'";
if (HName1)
- sqlWhere += " and 璐ㄦ鍛樺悕绉� like '%" + HName1 + "%'";
+ sqlWhere += " and 妫�楠屽憳鍚嶇О like '%" + HName1 + "%'";
if (HName2)
- sqlWhere += " and 妫�楠岄」鐩� like '%" + HName2 + "%'";
+ sqlWhere += " and 妫�楠岄」鐩悕绉� like '%" + HName2 + "%'";
if (HName3)
sqlWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + HName3 + "%'";
if (HProcExchBillNo)
- sqlWhere += " and 宸ュ簭娴佽浆鍗� like '%" + HProcExchBillNo + "%'";
+ sqlWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
if (HDate1) {
sqlWhere += " and 鏃ユ湡 >= '" + HDate1 + "'";
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
index c28bac9..8326565 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillList.html"
@@ -39,101 +39,97 @@
</div>
<!--绗竴灞傝繃婊�-->
<div class="layui-inline">
- <label class="layui-form-label" >鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HDate1" id="HDate1">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HDate2" id="HDate2">
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍒ゅ畾缁撹</label>
- <div class="layui-input-block" style="width:120px">
- <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
- <option value=""></option>
- <option value="鍚堟牸">鍚堟牸</option>
- <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
- </select>
- </div>
-
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
- <!--绗簩鎺掕繃婊�-->
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
- <div class="layui-row" style="margin-top:5px">
+
+ <div class="layui-colla-content">
+ <!--绗簩鎺掕繃婊�-->
+ <div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡缂栫爜</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HModel" id="HModel">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璐ㄦ鍛�</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">璐ㄦ鍛�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HName1" id="HName1">
</div>
</div>
</div>
- </div>
- <!--绗笁鎺掕繃婊�-->
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <!--绗笁鎺掕繃婊�-->
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
- <label class="layui-form-label">妫�楠岄」鐩�</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">妫�楠岄」鐩�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HName2" id="HName2">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐢熶骇鍚嶇О</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HName3" id="HName3">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">宸ュ簭娴佽浆鍗�</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
</div>
</div>
+ <div class="layui-inline" style="width: 85px;">
+ <label class="layui-form-label">鍒ゅ畾缁撹</label>
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
+ <option value=""></option>
+ <option value="鍚堟牸">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>
</div>
- </div>
- <!--鑷畾涔夎繃婊�-->
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <!--鑷畾涔夎繃婊�-->
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block" style="width:120px">
+ <div class="layui-input-block" style="margin-left: 120px;">
<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
- <div class="layui-inline" style="width:120px">
+ <div class="layui-inline">
<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
@@ -148,7 +144,7 @@
<option value="10">涓嶅寘鍚�</option>
</select>
</div>
- <div class="layui-inline" style="width:120px">
+ <div class="layui-inline">
<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
@@ -333,7 +329,7 @@
if (HBillNo)
sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
if (HNumber)
- sqlWhere += " and 鐗╂枡缂栫爜 like '%" + HNumber + "%'";
+ sqlWhere += " and 鐗╂枡浠ｇ爜 like '%" + HNumber + "%'";
if (HName)
sqlWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
if (HModel)
@@ -343,11 +339,11 @@
if (HName1)
sqlWhere += " and 璐ㄦ鍛樺悕绉� like '%" + HName1 + "%'";
if (HName2)
- sqlWhere += " and 妫�楠岄」鐩� like '%" + HName2 + "%'";
+ sqlWhere += " and 妫�楠岄」鐩悕绉� like '%" + HName2 + "%'";
if (HName3)
sqlWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + HName3 + "%'";
if (HProcExchBillNo)
- sqlWhere += " and 宸ュ簭娴佽浆鍗� like '%" + HProcExchBillNo + "%'";
+ sqlWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
if (HDate1) {
sqlWhere += " and 鏃ユ湡 >= '" + HDate1 + "'";
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
index f7b81b6..7c255a6 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillList.html"
@@ -39,102 +39,99 @@
</div>
<!--绗竴灞傝繃婊�-->
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">鍗曟嵁鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">寮�濮嬫棩鏈�</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HDate1" id="HDate1">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HDate2" id="HDate2">
</div>
</div>
- <div class="layui-inline" >
- <label class="layui-form-label">鍒ゅ畾缁撹</label>
- <div class="layui-input-block" style="width:120px">
- <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
- <option value=""></option>
- <option value="鍚堟牸">鍚堟牸</option>
- <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
- </select>
- </div>
-
- </div>
+
<div class="layui-inline">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query" id="f_Query">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>
- <!--绗簩鎺掕繃婊�-->
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
- <div class="layui-row" style="margin-top:5px">
+
+ <div class="layui-colla-content">
+ <!--绗簩鎺掕繃婊�-->
+ <div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡缂栫爜</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block" style="width:120px" >
+ <label class="layui-form-label" style="width: 85px;">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HModel" id="HModel">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">璐ㄦ鍛�</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">璐ㄦ鍛�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HName1" id="HName1">
</div>
</div>
</div>
- </div>
- <!--绗笁鎺掕繃婊�-->
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <!--绗笁鎺掕繃婊�-->
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
- <label class="layui-form-label">妫�楠岄」鐩�</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">妫�楠岄」鐩�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HName2" id="HName2">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鐢熶骇鍚嶇О</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">鐢熶骇鍚嶇О</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HName3" id="HName3">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">宸ュ簭娴佽浆鍗�</label>
- <div class="layui-input-block" style="width:120px">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
</div>
</div>
+ <div class="layui-inline" style="width: 85px;">
+ <label class="layui-form-label">鍒ゅ畾缁撹</label>
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HLastResult" id="HLastResult" lay-verify="HLastResult">
+ <option value=""></option>
+ <option value="鍚堟牸">鍚堟牸</option>
+ <option value="涓嶅悎鏍�">涓嶅悎鏍�</option>
+ </select>
+ </div>
+ </div>
</div>
- </div>
- <!--鑷畾涔夎繃婊�-->
- <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <!--鑷畾涔夎繃婊�-->
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block" style="width:120px">
+ <div class="layui-input-block">
<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
</select>
</div>
</div>
- <div class="layui-inline" style="width:120px">
+ <div class="layui-inline">
<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
@@ -148,8 +145,8 @@
<option value="9">鍙冲寘鍚�</option>
<option value="10">涓嶅寘鍚�</option>
</select>
- </div>
- <div class="layui-inline" style="width:120px">
+ </div>
+ <div class="layui-inline" style="margin-left: 120px;">
<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
</div>
</div>
@@ -792,7 +789,7 @@
if (HBillNo)
sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo+ "%'";
if (HNumber)
- sqlWhere += " and 鐗╂枡缂栫爜 like '%" + HNumber + "%'";
+ sqlWhere += " and 鐗╂枡浠ｇ爜 like '%" + HNumber + "%'";
if (HName)
sqlWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
if (HModel)
@@ -802,11 +799,11 @@
if (HName1)
sqlWhere += " and 璐ㄦ鍛樺悕绉� like '%" + HName1 + "%'";
if (HName2)
- sqlWhere += " and 妫�楠岄」鐩� like '%" + HName2 + "%'";
+ sqlWhere += " and 妫�楠岄」鐩悕绉� like '%" + HName2 + "%'";
if (HName3)
sqlWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + HName3 + "%'";
if (HProcExchBillNo)
- sqlWhere += " and 宸ュ簭娴佽浆鍗� like '%" + HProcExchBillNo + "%'";
+ sqlWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
if (HDate1) {
sqlWhere += " and 鏃ユ湡 >= '" + HDate1 + "'";
--
Gitblit v1.9.1