From 0dc8bb45d9e39d3432ecc0b688881228d08c5b85 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 11 一月 2024 17:26:00 +0800
Subject: [PATCH] 对巡检记录单,工序检验单,首件检验单优化,在巡检记录单的保存和添加的时候保存判定结论,在页面跟视图进行修改,添加头部要查询数据的字段内容,对部门设置添加按钮设置
---
WebTM/views/质量管理/巡检记录单/QC_PatrolProcCheckBillList.html | 98 ++++++++--------
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 31 +++-
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBillList.html | 88 +++++++-------
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html | 91 +++++++-------
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckBill.html | 7 +
5 files changed, 164 insertions(+), 151 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/\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