From 966b4c5902f5848ad4372f6337e49bf748286a0e Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期一, 06 九月 2021 09:24:24 +0800
Subject: [PATCH] 1
---
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 6 -
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 3
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html | 2
WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html | 2
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 2
WebTM/views/质量管理/首件检验单/QC_FirstPieceCheckBillList.html | 294 +++++++++++++++++++++++++++++++++++++-----------
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 2
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 45 ++++---
9 files changed, 256 insertions(+), 104 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 90bdcbc..98aaf5e 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,11 +1,11 @@
锘縡unction GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
- //var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
+ var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
+ //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣�
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_EmployeeList.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_EmployeeList.html"
index f5f5833..85ec88b 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_EmployeeList.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_EmployeeList.html"
@@ -49,9 +49,6 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><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-Print"><i class="layui-icon layui-icon-circle"></i>棰勮</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
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_WorkCenter_Add_Edit.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_WorkCenter_Add_Edit.html"
index 7e86aed..117e98a 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_WorkCenter_Add_Edit.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_WorkCenter_Add_Edit.html"
@@ -294,7 +294,7 @@
var sMainStr = JSON.stringify(data.field);
$.ajax({
type: "POST",
- url: GetWEBURL() + "Gy_WorkCenter/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "Gy_WorkCenter/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "oMain": sMainStr },
dataType: "json",
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
index bb06066..c47fa11 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
@@ -289,7 +289,7 @@
var sMainStr = JSON.stringify(data.field);
$.ajax({
type: "POST",
- url: GetWEBURL() + "Gy_Group/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "Gy_Group/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
//url:"http://localhost:30552/Gy_Group/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "oMain": sMainStr },
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index 0d7f46a..3b1200c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -412,7 +412,7 @@
var sMainStr = JSON.stringify(data.field);
$.ajax({
type: "POST",
- url: GetWEBURL() + "Gy_Process/EditBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "Gy_Process/ModifyByID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
data: { "oMain": sMainStr },
dataType: "json",
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 fcc429f..952e86c 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"
@@ -328,26 +328,33 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var hmainid = data[0].hmainid;
- var ajaxLoad = layer.load();
- //閫昏緫鍒犻櫎鏂规硶
- $.ajax({
- url: GetWEBURL() + '/Sc_ICMOBill/DeltetSc_ICMOReportBill',
- type: "GET",
- data: { "HInterID": hmainid },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 });
- get_Display(sWhere);
- layer.close(ajaxLoad);
- } else {
- layer.close(ajaxLoad);
- layer.alert(result.Message, { icon: 5 });
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ICMOBill/DeltetSc_ICMOReportBill',
+ type: "GET",
+ data: { "HInterID": hmainid },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ 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);
}
- }, error: function () {
- layer.close(ajaxLoad);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ })
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index 06745b6..f219414 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -680,12 +680,6 @@
// }
});
- form.on('submit(Cancel)', function () {
- //sessionStorage["SourceFlag"] = false;
- parent.location.href = "../../../views/index.html"
- //window.close();//鍏抽棴褰撳墠椤�
- })
-
form.on('submit(Saver)', function (data) {//淇濆瓨
//debugger;
var sMainStr = JSON.stringify(data.field);
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 090f0db..d4d2045 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"
@@ -8,7 +8,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/layui/layui.js"></script>
+ <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>
</head>
<body>
@@ -54,10 +59,12 @@
</div>
<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="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
- </div>
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
</script>
</form>
</div>
@@ -66,10 +73,10 @@
</div>
<!--<script src="../../layuiadmin/layui/lay/modules/mobile/jquery-3.3.1.min.js"></script>-->
- <script src="../../../layuiadmin/layui/layui.js"></script>
+ <!--<script src="../../../layuiadmin/layui/layui.js"></script>
<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/Scripts/webConfig.js"></script>-->
<script>
var _cur_page = 1;
var sql = " ";
@@ -138,6 +145,8 @@
//layui.code();
RoadHBillNo(sql);
layer.load(3)
+ $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
//鏂规硶绾ф覆鏌�
table.render({
elem: '#mainTable'
@@ -187,10 +196,34 @@
}
});
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ //#endregion
+
+ //#region 閲嶇疆杩囨护鏉′欢鏂规硶
+ function set_ClearQuery() {
+ $("#HBillNo").val("");
+ $("#HNumber").val("");
+ $("#HName").val("");
+ $("#HDate1").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HDate2").val(Format(new Date(), "yyyy-MM-dd"));
+ sqlWhere = "";
+ }
+ //#endregion
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
switch (obj.event) {
+
case 'btn-getCheckData':
var data = checkStatus.data;
layer.alert(JSON.stringify(data));
@@ -225,76 +258,125 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var InterID = data[0].hmainid.toString();
- //閫昏緫鍒犻櫎鏂规硶
- $.ajax({
- url: GetWEBURL() + 'DeltetQC_FirstPieceCheck',
- type: "GET",
- data: { "HInterID": InterID },
- success: function (result) {
- console.log('gouba' + result);
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var index = layer.load();
+ //閫昏緫鍒犻櫎鏂规硶
+ $.ajax({
+ url: GetWEBURL() + 'DeltetQC_FirstPieceCheck',
+ type: "GET",
+ data: { "HInterID": InterID },
+ success: function (result) {
+ console.log('gouba' + result);
+ if (result.count == 1) {
+ layer.msg(result.Message, { icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ layer.close(index);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(index);
}
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ })
}
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
- break;
+ break;
+ case 'get_Refresh':
+ set_ClearQuery();
+ RoadHBillNo(sqlWhere);
+ break;
+ case 'get_Exit':
+ Pub_Close(2);
+ break;
};
});
-
-
- ///鍔犺浇鏄剧ず鏁版嵁
+ //#region 鏌ヨ
function RoadHBillNo(sqlWhere) {
- where = sqlWhere;
+ var ajaxLoad = layer.load();
$.ajax({
type: "get",
- url: GetWEBURL() +"/QC_Management/MES_QC_FirstPieceCheckBillList_Json",
+ url: GetWEBURL() + "/QC_Management/MES_QC_FirstPieceCheckBillList_Json",
async: true,
data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"],
success: function (result) {
if (result.count == 1) {
- ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
- table.reload('mainTable', {
- data: ajaxReturnData
- , height: 'full-10'
- , page: {
- curr: _cur_page //蹇呴』浠庣 1 椤靛紑濮�
- }
- , loading: false
- , done: function (index, res) {
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , height: 'full-10'
+ , page: {
+ curr: _cur_page // 蹇呴』浠庣 1 椤靛紑濮�
+ }
+ , loading: false
+ , done: function (index, res) {
- }
- });
- layer.close(index0);
- } else {
- layer.close(index0);
+ }
+ });
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
layer.alert(result.code + result.Message, { icon: 5 });
- }
+ }
},
error: function (result) {
- layer.close(index0);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- };
- form.on('submit(f_Query)', function (data) {//鏌ヨ
+ }
+ //#endregion
+
+ ///鍔犺浇鏄剧ず鏁版嵁
+ //function RoadHBillNo(sqlWhere) {
+ // where = sqlWhere;
+ // var ajaxLoad = layer.load();
+ // $.ajax({
+ // type: "get",
+ // url: GetWEBURL() +"/QC_Management/MES_QC_FirstPieceCheckBillList_Json",
+ // async: true,
+ // data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"],
+ // success: function (result) {
+ // if (result.count == 1) {
+ // ajaxReturage /nData = JSON.parse(JSON.stringify(result)).data;
+ // table.reload('mainTable', {
+ // data: ajaxReturnData
+ // , height: 'full-10'
+ // , page: {
+ // curr: _cur_p/蹇呴』浠庣 1 椤靛紑濮�
+ // }
+ // , loading: false
+ // , done: function (index, res) {
+
+ // }
+ // });
+ // layer.close(ajaxLoad);
+ // } else {
+ // layer.close(ajaxLoad);
+ // layer.alert(result.code + result.Message, { icon: 5 });
+ // }
+
+ // },
+ // error: function (result) {
+ // layer.close(ajaxLoad);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+ //};
+ //#region 蹇�熻繃婊�
+ function get_FastQuery() {
var sqlWhere = " and 1=1 ";
//if ($("#HStatus").val() != "")
// sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
@@ -306,34 +388,19 @@
var HDate2 = $("#HDate2").val();//缁撴潫鏃ユ湡
if (HBillNo)
- sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo+ "%'";
+ sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
if (HNumber)
sqlWhere += " and 鐗╂枡浠ｇ爜 like '%" + HNumber + "%'";
if (HName)
sqlWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
if (HModel)
sqlWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
- //if ($("#HClStatus").val() != "")
- // sqlWhere += " and 鍏抽棴鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
- //if ($("#HPURCHASEORGID").val() != "")
- // sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
if (HDate1) {
sqlWhere += " and 鏃ユ湡 >= '" + HDate1 + "'";
}
if (HDate2) {
sqlWhere += " and 鏃ユ湡 <= '" + HDate2 + "'";
}
- //if ($("#HISGenerate").val() != "") {
- // if ($("#HISGenerate").val() == "鏄�")
- // {
- // sqlWhere += " and 鏈叧鑱旀暟閲� <= 0";
- // }
- // else if ($("#HISGenerate").val() == "鍚�") {
- // sqlWhere += " and 鏈叧鑱旀暟閲� > 0";
- // }
- //}
-
-
var Time = $("#Time").val();
var dd = new Date();
var dt;
@@ -367,7 +434,85 @@
//浠庣涓�椤靛紑濮�
_cur_page = 1;
RoadHBillNo(sqlWhere);
- });
+ sqlWhere = "";
+ }
+ //#endregion
+
+
+ //form.on('submit(f_Query)', function (data) {//鏌ヨ
+ // var sqlWhere = " and 1=1 ";
+ // //if ($("#HStatus").val() != "")
+ // // sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
+ // var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ // var HNumber = $("#HNumber").val();//鐗╂枡浠ｇ爜
+ // var HName = $("#HName").val();//鐗╂枡鍚嶇О
+ // var HModel = $("#HModel").val();//瑙勬牸鍨嬪彿
+ // var HDate1 = $("#HDate1").val();//寮�濮嬫棩鏈�
+ // var HDate2 = $("#HDate2").val();//缁撴潫鏃ユ湡
+
+ // if (HBillNo)
+ // sqlWhere += " and 鍗曟嵁鍙� like '%" + HBillNo+ "%'";
+ // if (HNumber)
+ // sqlWhere += " and 鐗╂枡浠ｇ爜 like '%" + HNumber + "%'";
+ // if (HName)
+ // sqlWhere += " and 鐗╂枡鍚嶇О like '%" + HName + "%'";
+ // if (HModel)
+ // sqlWhere += " and 瑙勬牸鍨嬪彿 like '%" + HModel + "%'";
+ // //if ($("#HClStatus").val() != "")
+ // // sqlWhere += " and 鍏抽棴鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
+ // //if ($("#HPURCHASEORGID").val() != "")
+ // // sqlWhere += " and 閲囪喘缁勭粐 like ^^%" + $("#HPURCHASEORGID").val() + "%^^";
+ // if (HDate1) {
+ // sqlWhere += " and 鏃ユ湡 >= '" + HDate1 + "'";
+ // }
+ // if (HDate2) {
+ // sqlWhere += " and 鏃ユ湡 <= '" + HDate2 + "'";
+ // }
+ // //if ($("#HISGenerate").val() != "") {
+ // // if ($("#HISGenerate").val() == "鏄�")
+ // // {
+ // // sqlWhere += " and 鏈叧鑱旀暟閲� <= 0";
+ // // }
+ // // else if ($("#HISGenerate").val() == "鍚�") {
+ // // sqlWhere += " and 鏈叧鑱旀暟閲� > 0";
+ // // }
+ // //}
+
+
+ // var Time = $("#Time").val();
+ // var dd = new Date();
+ // var dt;
+ // switch (Time) {
+ // case 1: dd = new Date(dd.setDate(dd.getDate() + 7));
+ // case 2: dd = new Date(dd.setDate(dd.getDate() + 14));
+ // case 3: dd = new Date(dd.setMonth(dd.getMonth() + 1));
+ // case 4: dd = new Date(dd.setMonth(dd.getMonth() + 2));
+ // case 5: dd = new Date(dd.setMonth(dd.getMonth() + 3));
+ // case 6: dd = new Date(dd.setMonth(dd.getMonth() + 6));
+ // case 7: dd = new Date(dd.setMonth(dd.getMonth() + 12));
+ // default: dd = new Date(dd.setDate(dd.getDate()));
+ // }
+ // dt = dd.getFullYear().toString();
+ // if (dd.getMonth() + 1 < 10) {
+ // dt = dt + "-0" + (dd.getMonth() + 1).toString();
+ // }
+ // else {
+ // dt = dt + "-0" + (dd.getMonth() + 1).toString();
+ // }
+ // if (dd.getDate() < 10) {
+ // dt = dt + "-0" + dd.getDate().toString();
+ // }
+ // else {
+ // dt = dt + "-" + dd.getDate().toString();
+ // }
+ // //if (Time != 8) {
+ // // sqlWhere += " and 浜よ揣鏃ユ湡 <= ^^" + dt + "^^";
+ // //}
+ // sql = sqlWhere;
+ // //浠庣涓�椤靛紑濮�
+ // _cur_page = 1;
+ // RoadHBillNo(sqlWhere);
+ //});
var $ = layui.$, active = {
f_Query: function () { //鏌ヨ
@@ -393,6 +538,15 @@
// });
//}
};
+ //閫�鍑烘寜閽�
+ form.on('submit(get_Exit)', function () {
+ if (OperationType == 1) {
+ Pub_Close(2);
+ }
+ else if (OperationType == 2) {
+ Pub_Close(1);
+ }
+ })
$('.test-table-reload-btn .layui-btn').on('click', function () {
var type = $(this).data('type');
active[type] ? active[type].call(this) : '';
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index d7802ac..e74b63c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -73,9 +73,9 @@
</div>
</div>
</div>
- </div>
</div>
</div>
+
<table class="" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
--
Gitblit v1.9.1