From 8938589be5948c6467cc6709d69f4c192fa2d07a Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 13 八月 2021 17:36:40 +0800
Subject: [PATCH] 报工平台 完工单审核功能，web完工单列表、编辑、审核
---
WebTM/views/生产管理/生产完工单/Sc_MESEndWorkBillList.html | 69 ++++++++---
WebTM/views/生产管理/生产停工单/Sc_Add_MESStopWorkBillList.html | 48 +++++++
WebTM/views/生产管理/生产开工单/Sc_MESBeginWorkBillList.html | 8
WebTM/views/生产管理/生产完工单/Sc_Add_MESEndWorkBillList.html | 51 ++++++++
WebTM/views/PublicPage/UserInformation.html | 1
WebTM/views/生产管理/生产停工单/Sc_MESStopWorkBillList.html | 79 +++++++++---
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html | 101 +++++++++++++---
7 files changed, 285 insertions(+), 72 deletions(-)
diff --git a/WebTM/views/PublicPage/UserInformation.html b/WebTM/views/PublicPage/UserInformation.html
index afdf42c..5d472fb 100644
--- a/WebTM/views/PublicPage/UserInformation.html
+++ b/WebTM/views/PublicPage/UserInformation.html
@@ -241,6 +241,7 @@
{
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
+ sWhere1 = " where 1=1 ";
if (HNumber) {
sWhere1 += " and HNumber like '%" + HNumber + "%'";
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
index 931e4fb..ac91645 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainBillList.html"
@@ -116,19 +116,31 @@
</div>
</div>
</div>
-
- <table class="layui-hide" 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-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
-
+ <div class="layui-tab layui-tab-card">
+ <ul class="layui-tab-title">
+ <li class="layui-this">淇濆吇椤逛俊鎭�</li>
+ <li>閰嶄欢淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
</div>
- </script>
- <script type="text/html" id="xuhao">
- {{d.LAY_TABLE_INDEX+1}}
- </script>
+ </div>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
</form>
</div>
</div>
@@ -169,8 +181,11 @@
, laydate = layui.laydate
, element = layui.element;
var option;
+ var option2;
+ var option1;
var sBillType = "3807";
var TabRow = { "HMaterID": 0, "HUnitID": "0 ", "HQty": "0 ", "HQtyMust": "0", "HManagerID": "0", "HRemark": " " };
+ var TabRow1 = { "HMaterID": 0, "HUnitID": "0 ", "HQty": "0 ", "HQtyMust": "0", "HManagerID": "0", "HRemark": " " };
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -535,17 +550,27 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid()
{
+ Table1(); //淇濆吇椤瑰垪琛�
+ Table2(); //閰嶄欢椤瑰垪琛�
+
+ }
+
+ //鍒濆鍖栦繚鍏婚」鍒楄〃
+ function Table1()
+ {
//琛ㄥご
- columns = [
+ columns = [
{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
- , { field: 'HMaterID', title: '閰嶄欢浠ｇ爜', edit: 'text', event: "" }
- , { field: 'HUnitID', title: '鍗曚綅浠ｇ爜', edit: 'text', event: "" }
- , { field: 'HQty', title: '瀹為檯鐢ㄩ噺', edit: 'text' }
- , { field: 'HQtyMust', title: '鏍囧噯鐢ㄩ噺', edit: 'text' }
- , { field: 'HManagerID', title: '璐熻矗浜轰唬鐮�', edit: 'text' }
+ , { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', event: "" }
+ , { field: 'HMaintainNumber', title: '淇濆吇椤圭洰浠ｇ爜', edit: 'text', event: "" }
+ , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text', event: "" }
+ , { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text', event: "" }
+ , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text', event: "" }
+ , { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text' }
+ , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text' }
+ , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
- , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
];
option = {
id: 'mainTable'
@@ -561,13 +586,45 @@
};
}
+ //鍒濆鍖栭厤浠堕」鍒楄〃
+ function Table2() {
+ //琛ㄥご
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: 'HMaintainItemID', title: '淇濆吇椤圭洰ID', edit: 'text', event: "" }
+ , { field: 'HMaintainNumber', title: '淇濆吇椤圭洰浠ｇ爜', edit: 'text', event: "" }
+ , { field: 'HMaintainItem', title: '淇濆吇椤圭洰', edit: 'text', event: "" }
+ , { field: 'HMaintainPart', title: '淇濆吇閮ㄤ綅', edit: 'text', event: "" }
+ , { field: 'HClaim', title: '鍏蜂綋瑕佹眰', edit: 'text', event: "" }
+ , { field: 'HManagerID', title: '璐熻矗浜篒D', edit: 'text' }
+ , { field: 'HManagerNumber', title: '璐熻矗浜轰唬鐮�', edit: 'text' }
+ , { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ ];
+ option2 = {
+ id: 'mainTable1'
+ , elem: '#mainTable1'
+ , toolbar: '#toolbarDemo'
+ , page: false
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns]
+ , done: function (res, curr, count) {
+
+ }
+ };
+ }
+
//鏃犳簮鍗曟柊澧�
function set_AddFNew()
{
//鑾峰彇鏈�澶у崟鎹彿
- get_MAXNum();
+ //get_MAXNum();
option.data = [TabRow];
+ option2.data = [TabRow1];
table.render(option);
+ table.render(option2);
}
//缂栬緫
@@ -577,6 +634,8 @@
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
option.data = [TabRow];
table.render(option);
+ option2.data = [TabRow1];
+ table.render(option2);
}
//鑾峰彇鏈�澶у崟鎹彿鍙婇粯璁ゅ�艰祴鍊�
@@ -654,7 +713,7 @@
$.ajax({
url: GetWEBURL() + 'Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetai',
type: "GET",
- data: { "sqlWhere": "and HInterID=" + linterid },
+ data: { "HInterID": linterid },
success: function (result) {
if (result.count == 1) {
option.data = result.data;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
index 8c03f47..647e73c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_Add_MESStopWorkBillList.html"
@@ -88,6 +88,7 @@
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -619,9 +620,14 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
- layer.close(layer.index);
- window.parent.location.reload();
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ layer.confirm(data.Message, {
+ btn: ['纭']
+ }, function (index) {
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ SaveVerify(); //瀹℃牳
+ }
});
}
else {
@@ -634,9 +640,45 @@
})
});
+ //瀹℃牳鎸夐挳鎻愪氦
+ form.on('submit(VerIfySaver)', function (data) {
+ SaveVerify();
+ });
+
+ //瀹℃牳鎻愪氦
+ function SaveVerify() {
+ var InterID = $("#HInterID").val();
+ if (!AllowLoadData())//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MESStopWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+ //layer.close(layer.index);
+ //window.parent.location.reload();
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 })
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 })
+ }
+ })
+ }
+
//閫�鍑�
form.on('submit(Exit)', function (data) {
Pub_Close(1);
+ window.parent.location.reload();
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_MESStopWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_MESStopWorkBillList.html"
index dafb7e8..44b4011 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_MESStopWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\201\234\345\267\245\345\215\225/Sc_MESStopWorkBillList.html"
@@ -36,11 +36,23 @@
<input type="date" class="layui-input" id="HDate1">
</div>
</div>
- <!--<div class="layui-inline">
- <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
+ <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">
+ <input type="text" class="layui-input" name="HSource" id="HSource">
+ </div>
+ </div>
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">璁㈠崟璺熻釜鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
+ </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>
@@ -53,24 +65,20 @@
<span>鍏朵粬鏉′欢></span>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
- </div>
- </div>
+
</div>
</div>
</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-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
- <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
</form>
@@ -134,19 +142,24 @@
break;
case 'btn-Delete': set_DeleteBill();
break;
+ //鍒锋柊
+ case 'get_Refresh': set_Refresh();
+ break;
//瀹℃牳鎸夐挳
case 'btn-Audit': set_CheckBill();
break;
- //鍙嶅鏍告寜閽�
- case 'btn-DeAudit': set_AbandonCheck();
+ //閫�鍑�
+ case 'get_Exit': Pub_Close(2);
break;
};
});
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ var ajaxLoad = layer.load();
var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HSource = $("#HSource").val();//鐢熶骇璧勬簮
if (HDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
}
@@ -156,7 +169,9 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
- var index = layer.load(0, { shade: false });
+ if (HSource) {
+ sWhere += " and 璧勬簮浠ｇ爜 like '%" + HSource + "%' or 璧勬簮鍚嶇О like '%" + HSource + "%'";
+ }
$.ajax({
url: GetWEBURL() + '/Sc_MESStopWorkBill/list',
type: "GET",
@@ -165,14 +180,13 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.close(index);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ layer.close(ajaxLoad);
} else {
- layer.close(index);
+ layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
- layer.close(index);
+ layer.close(ajaxLoad);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
@@ -181,9 +195,10 @@
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
- $("#WorkCenter").val("");//鍗曟嵁鍙�
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HSource").val("");//鐢熶骇璧勬簮
$("#btnSearch").click();
});
//#endregion
@@ -202,6 +217,8 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
@@ -213,7 +230,8 @@
, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
- , { field: 'HBillType', title: 'HBillType', hide: true }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true }
+ , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160 }
, { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
, { field: '宸ュ簭璁″垝鍗曞彿', title: '宸ュ簭璁″垝鍗曞彿' }
, { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿' }
@@ -311,6 +329,11 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid.toString();
+ var HBillStatus = data[0].HBillStatus.toString();
+ if (HBillStatus != "1") {
+ layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+ return false;
+ }
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
@@ -342,6 +365,11 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var InterID = data[0].hmainid.toString();
+ var HBillStatus = data[0].HBillStatus.toString();
+ if (HBillStatus != "1") {
+ layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁稿垹闄わ紒');
+ return false;
+ }
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
@@ -373,6 +401,11 @@
}
}
+ //鍒锋柊
+ function set_Refresh() {
+ $("#btnSearch").click();
+ }
+
//瀹℃牳
function set_CheckBill() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
index 5cecbbe..79084a1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_Add_MESEndWorkBillList.html"
@@ -88,6 +88,7 @@
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
@@ -769,6 +770,9 @@
});
+
+
+
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {
var sMainStr = JSON.stringify(data.field);
@@ -784,9 +788,14 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
- layer.close(layer.index);
- window.parent.location.reload();
+ $("#HInterID").val(data.HInterID);//鑾峰彇鎻愪氦鎴愬姛杩斿洖鐨勫崟鎹富ID
+ layer.confirm(data.Message, {
+ btn: ['纭']
+ }, function (index) {
+ if (data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ SaveVerify(); //瀹℃牳
+ }
});
}
else {
@@ -799,9 +808,45 @@
})
});
+ //瀹℃牳鎸夐挳鎻愪氦
+ form.on('submit(VerIfySaver)', function (data) {
+ SaveVerify();
+ });
+
+ //瀹℃牳鎻愪氦
+ function SaveVerify() {
+ var InterID = $("#HInterID").val();
+ if (!AllowLoadData())//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Sc_MESEndWorkBill/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
+ //layer.close(layer.index);
+ //window.parent.location.reload();
+ });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 })
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 })
+ }
+ })
+ }
+
//閫�鍑�
form.on('submit(Exit)', function (data) {
Pub_Close(1);
+ window.parent.location.reload();
});
//#endregion
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_MESEndWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_MESEndWorkBillList.html"
index 82d716a..1a21793 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_MESEndWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\256\214\345\267\245\345\215\225/Sc_MESEndWorkBillList.html"
@@ -40,6 +40,18 @@
<input type="date" class="layui-input" id="HDate1">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <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">
+ <input type="text" class="layui-input" name="HSource" id="HSource">
+ </div>
+ </div>
<!--<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁绫诲瀷</label>
<div class="layui-input-block">
@@ -72,24 +84,20 @@
<span>鍏朵粬鏉′欢></span>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
- </div>
- </div>
+
</div>
</div>
</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-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
</div>
</script>
@@ -153,19 +161,24 @@
break;
case 'btn-Delete': set_DeleteBill();
break;
+ //鍒锋柊
+ case 'get_Refresh': set_Refresh();
+ break;
//瀹℃牳鎸夐挳
case 'btn-Audit': set_CheckBill();
break;
- //鍙嶅鏍告寜閽�
- case 'btn-DeAudit': set_AbandonCheck();
+ //閫�鍑�
+ case 'get_Exit': Pub_Close(2);
break;
};
});
//鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ form.on('submit(btnSearch)', function (data) {
+ var ajaxLoad = layer.load();
var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HSource = $("#HSource").val();//鐢熶骇璧勬簮
if (HDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
}
@@ -175,7 +188,9 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
- var index = layer.load(0);
+ if (HSource) {
+ sWhere += " and 璧勬簮浠ｇ爜 like '%" + HSource + "%' or 璧勬簮鍚嶇О like '%" + HSource + "%'";
+ }
$.ajax({
url: GetWEBURL() + '/Sc_MESEndWorkBill/GetMESEndWorkBill',
type: "GET",
@@ -184,14 +199,13 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.close(index);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ layer.close(ajaxLoad);
} else {
- layer.close(index);
+ layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
- layer.close(index);
+ layer.close(ajaxLoad);
layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
}
});
@@ -201,9 +215,10 @@
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
$("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HSource").val("");//鐢熶骇璧勬簮
$("#btnSearch").click();
});
@@ -222,6 +237,8 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
@@ -234,6 +251,7 @@
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160 }
+ , { field: 'HBillStatus', title: '鍗曟嵁鐘舵��', width: 160 }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 115 }
, { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 200 }
, { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜', width: 115 }
@@ -307,6 +325,11 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var linterid = data[0].hmainid.toString();
+ var HBillStatus = data[0].HBillStatus.toString();
+ if (HBillStatus != "1") {
+ layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+ return false;
+ }
//if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
layer.open({
type: 2
@@ -338,6 +361,11 @@
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
var InterID = data[0].hmainid.toString();
+ var HBillStatus = data[0].HBillStatus.toString();
+ if (HBillStatus != "1") {
+ layer.msg('鍗曟嵁鐘舵�佷笉涓烘湭瀹℃牳鐘舵��,涓嶅厑璁哥紪杈戯紒');
+ return false;
+ }
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
$.ajax({
@@ -369,6 +397,11 @@
}
}
+ //鍒锋柊
+ function set_Refresh() {
+ $("#btnSearch").click();
+ }
+
//瀹℃牳
function set_CheckBill() {
var checkStatus = table.checkStatus('mainTable')
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html"
index 9521e8b..3dfe6bb 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\274\200\345\267\245\345\215\225/Sc_MESBeginWorkBillList.html"
@@ -91,7 +91,7 @@
<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-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -223,9 +223,10 @@
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
$("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HSource").val("");//鐢熶骇璧勬簮
$("#btnSearch").click();
});
//#endregion
@@ -310,7 +311,6 @@
//鏂板
function set_AddNew()
{
- alert("aa");
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
--
Gitblit v1.9.1