From ccca1e769915b9b76a0da381d0948ab224379a1b Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 07 二月 2022 22:08:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/报工台工序/防错/Sc_MaterToSourceStepBillList.html | 2
WebTM/views/生产工序管理/委外工序计划转出单/WW_EntrustProcessSendOutBillList.html | 10
WebTM/views/生产工序管理/工序汇报单/Sc_ProcessReportList.html | 2
WebTM/views/生产工序管理/工序派工单/Sc_Add_ProcessSendWork.html | 168 +++---
WebTM/views/生产工序管理/工序计划单/Sc_ProcessPlanEdit.html | 2
WebTM/views/生产管理/报工台工序/完工/Sc_MESEndStepWorkBillList.html | 4
WebTM/views/生产管理/报工台工序/防错/Sc_Add_MaterToSourceStepBillList.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 2
WebTM/views/生产管理/报工台工序/开工/Sc_MESBeginStepWorkBillList.html | 4
WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBillList.html | 3
WebTM/views/生产工序管理/委外工序计划汇报单/WW_Add_EntrustProcessReport.html | 2
WebTM/views/生产工序管理/委外工序派工单/WW_AddEntrustProcSendWork.html | 2
WebTM/views/生产工序管理/委外工序计划汇报单/WW_EntrustProcessReportBillList.html | 8
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 2
WebTM/views/生产管理/组装单/Sc_GroupOrderBillList.html | 2
WebTM/views/index.html | 2
WebTM/views/生产工序管理/工序派工单/Sc_ProcessSendWorkList.html | 43 +
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 3
WebTM/views/生产管理/报工台工序/停工/Sc_MESStopStepWorkBillList.html | 4
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 2
WebTM/views/生产工序管理/工序计划单/Sc_ProcessPlanList.html | 4
WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBill.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 2
WebTM/views/生产管理/生产物料清单/sc_Gy_ICBomBillMainList.html | 412 +++++++++++++++++
WebTM/views/生产工序管理/委外工序计划转出单/WW_Add_EntrustProcessSendOutBill.html | 302 ++++++------
WebTM/views/生产工序管理/工序汇报单/Sc_Add_ProcessReportList.html | 346 +++++++-------
WebTM/views/生产工序管理/委外工序派工单/WW_EntrustProcSendWorkBillList.html | 2
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html | 3
WebTM/WebTM.csproj | 1
WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBillList.html | 3
30 files changed, 891 insertions(+), 455 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 916ea77..3e1b2f2 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -798,6 +798,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎷嗙鍗昞Sc_PackSplitBill_Fast.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇姹囨姤鍗昞Sc_ICMOReportBill_FastNew.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇姹囨姤鍗昞Sc_Add_ICMOReportBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鐗╂枡娓呭崟\sc_Gy_ICBomBillMainList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇缁勮杩芥函鍗昞Sc_AssemblyBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnList.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index dd0ee5a..6fff953 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -275,7 +275,7 @@
<dd>
<a>鐢熶骇鐗╂枡娓呭崟</a>
<dl class="layui-nav-child">
- <dd><a lay-href="">鐗╂枡娓呭崟缁存姢n</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鐗╂枡娓呭崟/sc_Gy_ICBomBillMainList.html">鐗╂枡娓呭崟缁存姢</a></dd>
</dl>
</dd>
<dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillList.html">宸ヨ壓璺嚎缁存姢</a></dd>
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/WW_AddEntrustProcSendWork.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/WW_AddEntrustProcSendWork.html"
index c3dfd5f..10b0831 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/WW_AddEntrustProcSendWork.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/WW_AddEntrustProcSendWork.html"
@@ -344,7 +344,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
$.ajax(
{
type: "POST",
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/WW_EntrustProcSendWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/WW_EntrustProcSendWorkBillList.html"
index fd9d993..01c0f1e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/WW_EntrustProcSendWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/WW_EntrustProcSendWorkBillList.html"
@@ -396,7 +396,7 @@
type: "get",
url: GetWEBURL() + "/Sc_ProcessMangement/MES_WW_EntrustProcSendWorkBill_Json",
async: true,
- data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"],
+ data: { "sqlWhere": sqlWhere, "user": sessionStorage["HUserName"] },//"HSupNo": sessionStorage["HUserName"],
success: function (result) {
if (result.count == 1) {
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\346\261\207\346\212\245\345\215\225/WW_Add_EntrustProcessReport.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\346\261\207\346\212\245\345\215\225/WW_Add_EntrustProcessReport.html"
index 5a80068..0c9fe57 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\346\261\207\346\212\245\345\215\225/WW_Add_EntrustProcessReport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\346\261\207\346\212\245\345\215\225/WW_Add_EntrustProcessReport.html"
@@ -353,7 +353,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
$.ajax(
{
type: "POST",
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\346\261\207\346\212\245\345\215\225/WW_EntrustProcessReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\346\261\207\346\212\245\345\215\225/WW_EntrustProcessReportBillList.html"
index b293842..05aaac4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\346\261\207\346\212\245\345\215\225/WW_EntrustProcessReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\346\261\207\346\212\245\345\215\225/WW_EntrustProcessReportBillList.html"
@@ -453,7 +453,7 @@
type: "get",
url: GetWEBURL()+"/Sc_ProcessMangement/MES_WW_EntrustProcessReportBill_Json",
async: true,
- data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"],
+ data: { "sqlWhere": sqlWhere, "user": sessionStorage["HUserName"]},//"HSupNo": sessionStorage["HUserName"],
success: function (result) {
if (result.count == 1) {
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
@@ -468,16 +468,16 @@
}
});
- layer.close(index0);
+ //layer.close(index0);
} else {
- layer.close(index0);
+ //layer.close(index0);
layer.alert(result.code + result.Message, { icon: 5 });
}
},
error: function (result) {
console.log(result);
- layer.close(index0);
+ //layer.close(index0);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\350\275\254\345\207\272\345\215\225/WW_Add_EntrustProcessSendOutBill.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\350\275\254\345\207\272\345\215\225/WW_Add_EntrustProcessSendOutBill.html"
index 40d0d49..c14e506 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\350\275\254\345\207\272\345\215\225/WW_Add_EntrustProcessSendOutBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\350\275\254\345\207\272\345\215\225/WW_Add_EntrustProcessSendOutBill.html"
@@ -175,7 +175,7 @@
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script>
var sql = " and HBillType='3740' ";
- function getUrlVars() {
+ 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++) {
@@ -202,54 +202,54 @@
$('#HDeptID-BT').addClass("layui-btn-disabled").attr("disabled", true);
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
$('#HRemark').addClass("layui-btn-disabled").attr("disabled", true);
- $.ajax({
- url: GetWEBURL() + "/Sc_ProcessMangement/MES_DetailSc_ProcessReportList_Json",
- type: "GET",
- data: { "HInterID": parseInt( HInterID) },
- success: function (data1) {
- if (data1.count == 1) {
- $("#HInterID").val(data1.data[0].HInterID);//
- $("#HBillNo").val(data1.data[0].HBillNo);//
- $("#HDate").val(data1.data[0].HDate);
- $("#HDeptName").val(data1.data[0].HName);
- $("#HDeptNumber").val(data1.data[0].HNumber);
- $("#HICMOBillNo").val(data1.data[0].HICMOBillNo);
- $("#HRemark").val(data1.data[0].HRemark);
- $("#HPlanQty").val(data1.data[0].HPlanQty);
- $("#HMaker").val(data1.data[0].HMaker);
- $("#HMakeDate").val(data1.data[0].HMakeDate);
- $("#HChecker").val(data1.data[0].HChecker);
- $("#HCheckDate").val(data1.data[0].HCheckDate);
- $("#HUpDater").val(data1.data[0].HUpDater);
- $("#HUpDateDate").val(data1.data[0].HUpDateDate);
- $("#HCloseMan").val(data1.data[0].HCloseMan);
- $("#HCloseDate").val(data1.data[0].HCloseDate);
- } else {
- layer.msg(data1.Message);
- }
+ $.ajax({
+ url: GetWEBURL() + "/Sc_ProcessMangement/MES_DetailSc_ProcessReportList_Json",
+ type: "GET",
+ data: { "HInterID": parseInt(HInterID) },
+ success: function (data1) {
+ if (data1.count == 1) {
+ $("#HInterID").val(data1.data[0].HInterID);//
+ $("#HBillNo").val(data1.data[0].HBillNo);//
+ $("#HDate").val(data1.data[0].HDate);
+ $("#HDeptName").val(data1.data[0].HName);
+ $("#HDeptNumber").val(data1.data[0].HNumber);
+ $("#HICMOBillNo").val(data1.data[0].HICMOBillNo);
+ $("#HRemark").val(data1.data[0].HRemark);
+ $("#HPlanQty").val(data1.data[0].HPlanQty);
+ $("#HMaker").val(data1.data[0].HMaker);
+ $("#HMakeDate").val(data1.data[0].HMakeDate);
+ $("#HChecker").val(data1.data[0].HChecker);
+ $("#HCheckDate").val(data1.data[0].HCheckDate);
+ $("#HUpDater").val(data1.data[0].HUpDater);
+ $("#HUpDateDate").val(data1.data[0].HUpDateDate);
+ $("#HCloseMan").val(data1.data[0].HCloseMan);
+ $("#HCloseDate").val(data1.data[0].HCloseDate);
+ } else {
+ layer.msg(data1.Message);
+ }
- }, error: function () {
- layer.alert("鑾峰彇鏁版嵁澶辫触!", { icon: 5 });
- }
- });
+ }, error: function () {
+ layer.alert("鑾峰彇鏁版嵁澶辫触!", { icon: 5 });
+ }
+ });
} else {
- //鑾峰彇鍗曟嵁鍙�
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3741' },
- success: function (d) {
- //console.log(d.data);
- $("#HBillNo").val(d.data[0].HBillNo);//
- $("#HInterID").val(d.data[0].HInterID);
- $("#HDate").val(shijian);
- $('#HPlanBeginDate').val(shijian);
- //HPlanEndDate
- $('#HPlanEndDate').val(shijian);
- }, error: function () {
- layer.alert("鑾峰彇鍗曟嵁鍙峰け璐�!", { icon: 5 });
- }
- });
+ //鑾峰彇鍗曟嵁鍙�
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3741' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);//
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HDate").val(shijian);
+ $('#HPlanBeginDate').val(shijian);
+ //HPlanEndDate
+ $('#HPlanEndDate').val(shijian);
+ }, error: function () {
+ layer.alert("鑾峰彇鍗曟嵁鍙峰け璐�!", { icon: 5 });
+ }
+ });
}
@@ -267,24 +267,24 @@
, laypage = layui.laypage
, laydate = layui.laydate
- $("#HMaker").val(sessionStorage["HUserName"]);//鍒跺崟浜�
+ $("#HMaker").val(sessionStorage["HUserName"]);//鍒跺崟浜�
$("#HEmpID").val(sessionStorage["HEmpID"]);
CurUserName = sessionStorage["HUserName"];
//鎵ц涓�涓猯aydate瀹炰緥
- laydate.render({
- elem: '#HPlanBeginDate,#HPlanEndDate' //鎸囧畾鍏冪礌
- });
+ laydate.render({
+ elem: '#HPlanBeginDate,#HPlanEndDate' //鎸囧畾鍏冪礌
+ });
//鍔犺浇璁″垝鍗曚笅鎺ㄧ殑鏁版嵁
if (typeof (lentryid) == "undefined") {
- RoadHBillSub2();
+ RoadHBillSub2();
} else {
- RoadHBillSub(sql);
+ RoadHBillSub(sql);
}
table.render({
elem: '#mainTable'
@@ -292,10 +292,10 @@
, limit: 1000
, totalRow: true
, cols: [[
- { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
+ { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
- , { field: '鏁伴噺', title: '鏁伴噺', edit: 'text', event: "inputHPlanQty"}
+ , { field: '鏁伴噺', title: '鏁伴噺', edit: 'text', event: "inputHPlanQty" }
, { field: 'HDeptID ', title: 'HDeptID', width: 105 }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜' }
, { field: '閮ㄩ棬', title: '閮ㄩ棬' }
@@ -391,7 +391,7 @@
}
});
};
- //鍔犺浇鏄剧ず鏁版嵁
+ //鍔犺浇鏄剧ず鏁版嵁
function RoadHBillSub2() {
$.ajax({
url: GetWEBURL() + '/Sc_ProcessMangement/MES_h_v_Sc_ProcessSendWorkList_Json',
@@ -418,37 +418,37 @@
});
};
//淇濆瓨
- form.on('submit(Saver)', function (data) {//淇濆瓨
+ form.on('submit(Saver)', function (data) {//淇濆瓨
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
$.ajax(
- {
- type: "POST",
- url: GetWEBURL() +"SaveWW_EntrustProcessSendOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: {"msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled",true);
- }
- else {
+ {
+ type: "POST",
+ url: GetWEBURL() + "SaveWW_EntrustProcessSendOutBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
- f_alert(data.Message);
- console.log("濮斿娲惧伐鍗曚笅鎺ㄤ繚瀛�"+sMainStr);
- }
- layer.closeAll("loading");
- },
+ f_alert(data.Message);
+ console.log("濮斿娲惧伐鍗曚笅鎺ㄤ繚瀛�" + sMainStr);
+ }
+ layer.closeAll("loading");
+ },
error: function (err) {
f_alert("閿欒:" + err);
- console.log("濮斿娲惧伐鍗曚笅鎺ㄤ繚瀛�"+sMainStr);
- }
- });
- });
+ console.log("濮斿娲惧伐鍗曚笅鎺ㄤ繚瀛�" + sMainStr);
+ }
+ });
+ });
form.on('submit(Exit)', function (data) {//閫�鍑�
@@ -456,130 +456,130 @@
parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
//鍏抽棴
- form.on('submit(Closeing)', function (data) {//
- //debugger;
+ form.on('submit(Closeing)', function (data) {//
+ //debugger;
$.ajax(
- {
- type: "GET",
- url: GetWEBURL()+"CloseProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ {
+ type: "GET",
+ url: GetWEBURL() + "CloseProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: {
"HInterID": parseInt(HInterID)
, "IsClose": 0
- ,"CurUserName":CurUserName
+ , "CurUserName": CurUserName
},
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#').addClass("layui-btn-disabled").attr("disabled",true);
- }
- else {
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
- f_alert(data.Message);
- }
- layer.closeAll("loading");
- },
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
error: function (err) {
f_alert("閿欒:" + err);
- }
- });
- });
+ }
+ });
+ });
//鍙嶅叧闂�
form.on("submit(BackClose)", function (data) {
layer.alert("鎴戞槸鍙嶅叧闂寜閽紒");
- $.ajax(
- {
- type: "GET",
- url: GetWEBURL()+"CloseProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "CloseProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: {
"HInterID": parseInt(HInterID)
, "IsClose": 1
- ,"CurUserName":CurUserName
+ , "CurUserName": CurUserName
},
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#').addClass("layui-btn-disabled").attr("disabled",true);
- }
- else {
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
- f_alert(data.Message);
- }
- layer.closeAll("loading");
- },
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
error: function (err) {
f_alert("閿欒:" + err);
- }
- });
+ }
+ });
});
//瀹℃牳Auditing
form.on("submit(Auditing)", function (data) {
layer.alert("鎴戞槸瀹℃牳鎸夐挳锛�");
- $.ajax(
- {
- type: "GET",
- url: GetWEBURL()+"AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: {
"HInterID": parseInt(HInterID)
, "IsAudit": 0
- ,"CurUserName":CurUserName
+ , "CurUserName": CurUserName
},
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#').addClass("layui-btn-disabled").attr("disabled",true);
- }
- else {
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
- f_alert(data.Message);
- }
- layer.closeAll("loading");
- },
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
error: function (err) {
f_alert("閿欒:" + err);
- }
- });
+ }
+ });
});
- //鍙嶅鏍窧ackAudit
+ //鍙嶅鏍窧ackAudit
form.on("submit(BackAudit)", function (data) {
layer.alert("鎴戞槸鍙嶅鏍告寜閽紒");
- $.ajax(
- {
- type: "GET",
- url: GetWEBURL()+"AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: {
"HInterID": parseInt(HInterID)
, "IsAudit": 1
- ,"CurUserName":CurUserName
+ , "CurUserName": CurUserName
},
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#').addClass("layui-btn-disabled").attr("disabled",true);
- }
- else {
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
- f_alert(data.Message);
- }
- layer.closeAll("loading");
- },
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
error: function (err) {
f_alert("閿欒:" + err);
- }
- });
+ }
+ });
});
//鎵撳嵃Printing
form.on("submit(Printing)", function (data) {
layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + HInterID);
- window.open("../宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + HInterID + "&Type=HProcessReport"+"&OpenTmp=a");
+ window.open("../宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + HInterID + "&Type=HProcessReport" + "&OpenTmp=a");
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\350\275\254\345\207\272\345\215\225/WW_EntrustProcessSendOutBillList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\350\275\254\345\207\272\345\215\225/WW_EntrustProcessSendOutBillList.html"
index 72286f0..7c1e2f5 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\350\275\254\345\207\272\345\215\225/WW_EntrustProcessSendOutBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\350\256\241\345\210\222\350\275\254\345\207\272\345\215\225/WW_EntrustProcessSendOutBillList.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
- <title>濮斿宸ュ簭娲惧伐鍗曞垪琛�</title>
+ <title>濮斿宸ュ簭璁″垝杞嚭鍗曞垪琛�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -450,7 +450,7 @@
type: "get",
url: GetWEBURL()+"/Sc_ProcessMangement/MES_WW_EntrustProcessSendOutBillList_Json",
async: true,
- data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"],
+ data: { "sqlWhere": sqlWhere, "user": sessionStorage["HUserName"] },//"HSupNo": sessionStorage["HUserName"],
success: function (result) {
if (result.count == 1) {
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
@@ -465,15 +465,15 @@
}
});
- layer.close(index0);
+ //layer.close(index0);
} else {
- layer.close(index0);
+ //layer.close(index0);
layer.alert(result.code + result.Message, { icon: 5 });
}
},
error: function (result) {
- layer.close(index0);
+ //layer.close(index0);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
index 7e38b47..83ac388 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProcessReportList.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>鏂板娲惧伐鍗�</title>
+ <title>宸ュ簭姹囨姤鍗曟柊澧炴淳宸ュ崟</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -212,8 +212,8 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script>
-
- function getUrlVars() {
+
+ 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++) {
@@ -225,69 +225,73 @@
}
var params = getUrlVars();
var HInterID = params[params[0]];
+ if (HInterID == null) {
+ HInterID = 0;
+ console.log(HInterID)
+ }
var lentryid = params[params[1]];
var PlanBeginDate = params[params[2]];
var PlanEndDate = params[params[3]];
- alert("鐪嬬湅" + HInterID + "lentryid" + lentryid);
+ //alert("鐪嬬湅" + HInterID + "lentryid" + lentryid);
var date = new Date();
var day = date.getDate();
var month = date.getMonth() + 1;
var year = date.getFullYear();
var shijian = year + "-" + month + "-" + day;
var CurUserName;
- if (typeof (lentryid) == "undefined") {
+ if (typeof (lentryid) != "undefined") {
$('#HDeptID-BT').addClass("layui-btn-disabled").attr("disabled", true);
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
$('#HRemark').addClass("layui-btn-disabled").attr("disabled", true);
- $.ajax({
- url: GetWEBURL() + "/Sc_ProcessMangement/MES_DetailSc_ProcessReportList_Json",
- type: "GET",
- data: { "HInterID": parseInt( HInterID) },
- success: function (data1) {
- if (data1.count == 1) {
- $("#HInterID").val(data1.data[0].HInterID);//
- $("#HBillNo").val(data1.data[0].HBillNo);//
- $("#HDate").val(data1.data[0].HDate);
- $("#HDeptName").val(data1.data[0].HName);
- $("#HDeptNumber").val(data1.data[0].HNumber);
- $("#HICMOBillNo").val(data1.data[0].HICMOBillNo);
- $("#HRemark").val(data1.data[0].HRemark);
- $("#HPlanQty").val(data1.data[0].HPlanQty);
- $("#HMaker").val(data1.data[0].HMaker);
- $("#HMakeDate").val(data1.data[0].HMakeDate);
- $("#HChecker").val(data1.data[0].HChecker);
- $("#HCheckDate").val(data1.data[0].HCheckDate);
- $("#HUpDater").val(data1.data[0].HUpDater);
- $("#HUpDateDate").val(data1.data[0].HUpDateDate);
- $("#HCloseMan").val(data1.data[0].HCloseMan);
- $("#HCloseDate").val(data1.data[0].HCloseDate);
- } else {
- layer.msg(data1.Message);
+ $.ajax({
+ url: GetWEBURL() + "/Sc_ProcessMangement/MES_DetailSc_ProcessReportList_Json",
+ type: "GET",
+ data: { "HInterID": parseInt(HInterID) },
+ success: function (data1) {
+ if (data1.count == 1) {
+ $("#HInterID").val(data1.data[0].HInterID);//
+ $("#HBillNo").val(data1.data[0].HBillNo);//
+ $("#HDate").val(data1.data[0].HDate);
+ $("#HDeptName").val(data1.data[0].HName);
+ $("#HDeptNumber").val(data1.data[0].HNumber);
+ $("#HICMOBillNo").val(data1.data[0].HICMOBillNo);
+ $("#HRemark").val(data1.data[0].HRemark);
+ $("#HPlanQty").val(data1.data[0].HPlanQty);
+ $("#HMaker").val(data1.data[0].HMaker);
+ $("#HMakeDate").val(data1.data[0].HMakeDate);
+ $("#HChecker").val(data1.data[0].HChecker);
+ $("#HCheckDate").val(data1.data[0].HCheckDate);
+ $("#HUpDater").val(data1.data[0].HUpDater);
+ $("#HUpDateDate").val(data1.data[0].HUpDateDate);
+ $("#HCloseMan").val(data1.data[0].HCloseMan);
+ $("#HCloseDate").val(data1.data[0].HCloseDate);
+ } else {
+ layer.msg(data1.Message);
+ }
+
+ }, error: function () {
+ layer.alert("鑾峰彇鏁版嵁澶辫触!", { icon: 5 });
}
-
- }, error: function () {
- layer.alert("鑾峰彇鏁版嵁澶辫触!", { icon: 5 });
- }
- });
+ });
} else {
- //鑾峰彇鍗曟嵁鍙�
- $.ajax({
- url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
- type: "GET",
- data: { "billType": '3714' },
- success: function (d) {
- //console.log(d.data);
- $("#HBillNo").val(d.data.HBillNo);//
- $("#HDate").val(shijian);
- $('#HPlanBeginDate').val(shijian);
- //HPlanEndDate
- $('#HPlanEndDate').val(shijian);
- }, error: function () {
- layer.alert("鑾峰彇鍗曟嵁鍙峰け璐�!", { icon: 5 });
- }
- });
+ //鑾峰彇鍗曟嵁鍙�
+ $.ajax({
+ url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
+ type: "GET",
+ data: { "billType": '3714' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data.HBillNo);//
+ $("#HDate").val(shijian);
+ $('#HPlanBeginDate').val(shijian);
+ //HPlanEndDate
+ $('#HPlanEndDate').val(shijian);
+ }, error: function () {
+ layer.alert("鑾峰彇鍗曟嵁鍙峰け璐�!", { icon: 5 });
+ }
+ });
}
-
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -303,24 +307,24 @@
, laypage = layui.laypage
, laydate = layui.laydate
- $("#HMaker").val(sessionStorage["HUserName"]);//鍒跺崟浜�
+ $("#HMaker").val(sessionStorage["HUserName"]);//鍒跺崟浜�
$("#HEmpID").val(sessionStorage["HEmpID"]);
CurUserName = sessionStorage["HUserName"];
-
+
//鎵ц涓�涓猯aydate瀹炰緥
- laydate.render({
- elem: '#HPlanBeginDate,#HPlanEndDate' //鎸囧畾鍏冪礌
- });
+ laydate.render({
+ elem: '#HPlanBeginDate,#HPlanEndDate' //鎸囧畾鍏冪礌
+ });
//鍔犺浇璁″垝鍗曚笅鎺ㄧ殑鏁版嵁
if (typeof (lentryid) == "undefined") {
-
- RoadHBillSub2();
+
+ RoadHBillSub2();
} else {
-
- RoadHBillSub();
+
+ RoadHBillSub();
}
table.render({
elem: '#mainTable'
@@ -330,8 +334,8 @@
, cols: [[
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿' }
- ,{ field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
- ,{ field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
+ , { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
, { field: '鏁伴噺', title: '鏁伴噺', width: 100, edit: 'text', event: "inputHPlanQty", totalRow: true }
, { field: 'HDeptID ', title: 'HDeptID', width: 105 }
@@ -405,7 +409,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_ProcessMangement/MES_Sc_ProcessSendWorkMain_Json',
type: "GET",
- data: { "sWhere": "and hmainid in(" + lentryid + ")" },
+ data: { "sWhere": "and hmainid in(" + lentryid + ")", "user": sessionStorage["HUserName"] },
success: function (result) {
console.log(result);
//$("#HBillNo").val(result.data[0].HInterID);
@@ -426,7 +430,7 @@
}
});
};
- //鍔犺浇鏄剧ず鏁版嵁
+ //鍔犺浇鏄剧ず鏁版嵁
function RoadHBillSub2() {
$.ajax({
url: GetWEBURL() + '/Sc_ProcessMangement/MES_h_v_Sc_ProcessSendWorkList_Json',
@@ -453,168 +457,168 @@
});
};
//淇濆瓨
- form.on('submit(Saver)', function (data) {//淇濆瓨
-
+ form.on('submit(Saver)', function (data) {//淇濆瓨
+
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
$.ajax(
- {
- type: "POST",
- url: GetWEBURL()+"SaveProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: {"msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled",true);
- }
- else {
-
- f_alert(data.Message);
- console.log("娲惧伐鍗曚笅鎺ㄤ繚瀛�"+sMainStr);
- }
- layer.closeAll("loading");
- },
+ {
+ type: "POST",
+ url: GetWEBURL() + "SaveProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
+
+ f_alert(data.Message);
+ console.log("娲惧伐鍗曚笅鎺ㄤ繚瀛�" + sMainStr);
+ }
+ layer.closeAll("loading");
+ },
error: function (err) {
-
+
f_alert("閿欒:" + err);
- console.log("娲惧伐鍗曚笅鎺ㄤ繚瀛�"+sMainStr);
- }
- });
- });
-
+ console.log("娲惧伐鍗曚笅鎺ㄤ繚瀛�" + sMainStr);
+ }
+ });
+ });
+
form.on('submit(Exit)', function (data) {//閫�鍑�
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
//鍏抽棴
- form.on('submit(Closeing)', function (data) {//
- //debugger;
+ form.on('submit(Closeing)', function (data) {//
+ //debugger;
$.ajax(
- {
- type: "GET",
- url: GetWEBURL()+"CloseProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ {
+ type: "GET",
+ url: GetWEBURL() + "CloseProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: {
"HInterID": parseInt(HInterID)
, "IsClose": 0
- ,"CurUserName":CurUserName
+ , "CurUserName": CurUserName
},
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#').addClass("layui-btn-disabled").attr("disabled",true);
- }
- else {
-
- f_alert(data.Message);
- }
- layer.closeAll("loading");
- },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
+
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
error: function (err) {
-
+
f_alert("閿欒:" + err);
- }
- });
- });
+ }
+ });
+ });
//鍙嶅叧闂�
form.on("submit(BackClose)", function (data) {
layer.alert("鎴戞槸鍙嶅叧闂寜閽紒");
- $.ajax(
- {
- type: "GET",
- url: GetWEBURL()+"CloseProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "CloseProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: {
"HInterID": parseInt(HInterID)
, "IsClose": 1
- ,"CurUserName":CurUserName
+ , "CurUserName": CurUserName
},
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#').addClass("layui-btn-disabled").attr("disabled",true);
- }
- else {
-
- f_alert(data.Message);
- }
- layer.closeAll("loading");
- },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
+
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
error: function (err) {
-
+
f_alert("閿欒:" + err);
- }
- });
+ }
+ });
});
//瀹℃牳Auditing
form.on("submit(Auditing)", function (data) {
layer.alert("鎴戞槸瀹℃牳鎸夐挳锛�");
- $.ajax(
- {
- type: "GET",
- url: GetWEBURL()+"AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: {
"HInterID": parseInt(HInterID)
, "IsAudit": 0
- ,"CurUserName":CurUserName
+ , "CurUserName": CurUserName
},
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#').addClass("layui-btn-disabled").attr("disabled",true);
- }
- else {
-
- f_alert(data.Message);
- }
- layer.closeAll("loading");
- },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
+
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
error: function (err) {
-
+
f_alert("閿欒:" + err);
- }
- });
+ }
+ });
});
- //鍙嶅鏍窧ackAudit
+ //鍙嶅鏍窧ackAudit
form.on("submit(BackAudit)", function (data) {
layer.alert("鎴戞槸鍙嶅鏍告寜閽紒");
- $.ajax(
- {
- type: "GET",
- url: GetWEBURL()+"AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
data: {
"HInterID": parseInt(HInterID)
, "IsAudit": 1
- ,"CurUserName":CurUserName
+ , "CurUserName": CurUserName
},
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#').addClass("layui-btn-disabled").attr("disabled",true);
- }
- else {
-
- f_alert(data.Message);
- }
- layer.closeAll("loading");
- },
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
+
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
error: function (err) {
-
+
f_alert("閿欒:" + err);
- }
- });
+ }
+ });
});
//鎵撳嵃Printing
form.on("submit(Printing)", function (data) {
layer.alert("鎴戞槸鎵撳嵃鎸夐挳锛佸崟鎹富ID鏄細" + HInterID);
- window.open("../宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + HInterID + "&Type=HProcessReport"+"&OpenTmp=a");
+ window.open("../宸ュ簭姹囨姤鍗�/HBarPlanPrint.html?linterid=" + HInterID + "&Type=HProcessReport" + "&OpenTmp=a");
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportList.html"
index 2e02a8a..803e523 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\261\207\346\212\245\345\215\225/Sc_ProcessReportList.html"
@@ -204,7 +204,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Sc_ProcessMangement/MES_Sc_ProcessReportList_Json',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html"
index 2713d05..73d6313 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_Add_ProcessSendWork.html"
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8" />
- <title>鏂板娲惧伐鍗�</title>
+ <title>鏂板娲惧伐鍗�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -51,14 +51,14 @@
<div class="layui-col-xs3">
<label class="layui-form-label">浠诲姟鍗曞彿锛�</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HManagerName" id="HManagerName" autocomplete="off" disabled>
+ <input class="layui-input" name="HManagerName" id="HManagerName" autocomplete="off" disabled>
<input id="HManagerID" name="HManagerID" type="hidden" />
</div>
</div>
<div class="layui-col-xs3">
<label class="layui-form-label">杞﹂棿浠ｇ爜锛�</label>
<div class="layui-input-inline">
- <input type="text" name="HDeptNumber" id="HDeptNumber" lay-verify="HDeptNumber" readonly="readonly" autocomplete="off" class="layui-input">
+ <input type="text" name="HDeptNumber" id="HDeptNumber" lay-verify="HDeptNumber" readonly="readonly" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -107,7 +107,7 @@
<div class="layui-form-item">
<div class="layui-row">
-
+
<div class="layui-col-xs6">
<label class="layui-form-label"> 澶� 娉細</label>
<div class="layui-input-block">
@@ -117,55 +117,55 @@
</div>
</div>
</div>
- <div class="layui-tab-item">
- <div class="layui-form-item">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label">鍒� 鍗� 浜猴細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HMaker" id="HMaker" readonly="readonly" autocomplete="off">
- </div>
- </div>
- <div class="layui-col-xs3">
- <label class="layui-form-label">瀹� 鏍� 浜猴細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HChecker" id="HChecker" readonly="readonly" autocomplete="off">
- </div>
- </div>
- <div class="layui-col-xs3">
- <label class="layui-form-label">鍙� 鏇� 浜猴細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HUpDater" id="HUpDater" readonly="readonly" autocomplete="off">
- </div>
- </div>
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label">鍒� 鍗� 浜猴細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMaker" id="HMaker" readonly="readonly" autocomplete="off">
</div>
</div>
- <div class="layui-form-item">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label">鍒跺崟鏃ユ湡锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HMakeDate" id="HMakeDate" readonly="readonly" autocomplete="off">
- </div>
- </div>
- <div class="layui-col-xs3">
- <label class="layui-form-label">瀹℃牳鏃ユ湡锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HCheckDate" id="HCheckDate" readonly="readonly" autocomplete="off">
- </div>
- </div>
- <div class="layui-col-xs3">
- <label class="layui-form-label">鍙樻洿鏃ユ湡锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HUpDateDate" id="HUpDateDate" readonly="readonly" autocomplete="off">
- </div>
- </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label">瀹� 鏍� 浜猴細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HChecker" id="HChecker" readonly="readonly" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label">鍙� 鏇� 浜猴細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HUpDater" id="HUpDater" readonly="readonly" autocomplete="off">
</div>
</div>
</div>
-
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label">鍒跺崟鏃ユ湡锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HMakeDate" id="HMakeDate" readonly="readonly" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label">瀹℃牳鏃ユ湡锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCheckDate" id="HCheckDate" readonly="readonly" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label">鍙樻洿鏃ユ湡锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HUpDateDate" id="HUpDateDate" readonly="readonly" autocomplete="off">
+ </div>
+ </div>
+ </div>
</div>
</div>
+
+ </div>
+ </div>
</div>
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
@@ -177,15 +177,15 @@
<blockquote class="layui-elem-quote">宸ュ簭璁″垝鍗�</blockquote>
</form>
</div>
- </div>
+ </div>
</div>
</div>
- <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>
- function getUrlVars() {
+ 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++) {
@@ -200,7 +200,7 @@
var lentryid = params[params[1]];
var PlanBeginDate = params[params[2]];
var PlanEndDate = params[params[3]];
- alert(HInterID + '绗簩涓細' + lentryid);
+ //alert(HInterID + '绗簩涓細' + lentryid);
var date = new Date();
var day = date.getDate();
var month = date.getMonth() + 1;
@@ -239,9 +239,9 @@
//鎵ц涓�涓猯aydate瀹炰緥
- laydate.render({
- elem: '#HPlanBeginDate,#HPlanEndDate' //鎸囧畾鍏冪礌
- });
+ laydate.render({
+ elem: '#HPlanBeginDate,#HPlanEndDate' //鎸囧畾鍏冪礌
+ });
//鍔犺浇璁″垝鍗曚笅鎺ㄧ殑鏁版嵁
@@ -360,12 +360,12 @@
}
});
- ///鍔犺浇鏄剧ず鏁版嵁
+ ///缂栬緫 鍔犺浇鏄剧ず鏁版嵁
function RoadHBillSub() {
$.ajax({
url: GetWEBURL() + '/Sc_ProcessMangement/MES_Sc_ProcessPlanMain_Json',
type: "GET",
- data: { "sWhere": "and hmainid in(" + lentryid + ")" },
+ data: { "sWhere": "and hmainid in('" + lentryid + "')", "user": sessionStorage["HUserName"]},
success: function (result) {
console.log(result);
//$("#HBillNo").val(result.data[0].HInterID);
@@ -386,41 +386,41 @@
}
});
};
- form.on('submit(Saver)', function (data) {//淇濆瓨
- //debugger;
-
+ form.on('submit(Saver)', function (data) {//淇濆瓨
+ //debugger;
+
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
$.ajax(
- {
- type: "POST",
- url: GetWEBURL()+"SaveProcessSendWork", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- async: true,
- data: {"msg": sMainSub },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- layer.msg(data.Message, { icon: 1 });
- $('#add-btn').addClass("layui-btn-disabled").attr("disabled",true);
- }
- else {
-
- f_alert(data.Message);
- console.log("bobo"+sMainStr);
- }
- layer.closeAll("loading");
- },
+ {
+ type: "POST",
+ url: GetWEBURL() + "SaveProcessSendWork", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ }
+ else {
+
+ f_alert(data.Message);
+ console.log("bobo" + sMainStr);
+ }
+ layer.closeAll("loading");
+ },
error: function (err) {
-
+
f_alert("閿欒:" + err);
- console.log("bobo"+sMainStr);
- }
- });
- });
- function f_alert(sMsg) {
+ console.log("bobo" + sMainStr);
+ }
+ });
+ });
+ function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
-
+
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_ProcessSendWorkList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_ProcessSendWorkList.html"
index c4528e6..b8abeb4 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_ProcessSendWorkList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\264\276\345\267\245\345\215\225/Sc_ProcessSendWorkList.html"
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>鐢熶骇宸ュ簭姹囨姤鍗曞垪琛�</title>
+ <title>鐢熶骇宸ュ簭娲惧伐鍗曞垪琛�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -67,11 +67,13 @@
<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" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <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-Pushdown"><i class="layui-icon layui-icon-form"></i>涓嬫帹</button>
</div>
@@ -210,13 +212,26 @@
}
break;
- case 'add':
- var date = new Date();
- var day = date.getDate();
- var month = date.getMonth() + 1;
- var year = date.getFullYear();
- var shijian = year + "/" + month + "/" + day;
- layer.msg(shijian);
+ //娣诲姞
+ case 'btn-Add':
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ュ簭璁″垝鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '../../鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_Add_ProcessReportList.html?HInterID=-1&OperationType=1&linterid=0&HSouceBillType=0&linteridSub=-1',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ },
+ success: function (layero, index) {
+
+ }
+ });
break;
case '':
layer.msg('');
@@ -231,7 +246,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Sc_ProcessMangement/MES_Sc_ProcessSendWorkMain_Json',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanEdit.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanEdit.html"
index a4d71a5..0e111a7 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanEdit.html"
@@ -738,7 +738,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
//console.log(JSON.stringify(table.cache['mainTable'][0]))
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html"
index 1e29b75..e5f998f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\267\245\345\272\217\350\256\241\345\210\222\345\215\225/Sc_ProcessPlanList.html"
@@ -421,7 +421,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Sc_ProcessMangement/MES_Sc_ProcessPlanMain_Json',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -593,7 +593,7 @@
btn: ["纭畾", "鍙栨秷"]
, btn1: function () {
- var ModRightNameDelete = "";//鍒犻櫎鏉冮檺
+ var ModRightNameDelete = "Sc_ProcessPlan_Drop";//鍒犻櫎鏉冮檺
var HInterID = checkstatus.data[0].hmainid;
$.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
index 826e196..94a8a08 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\201\234\345\267\245/Sc_MESStopStepWorkBillList.html"
@@ -175,7 +175,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MESStopStepWorkBill/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -349,7 +349,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MESStopStepWorkBill/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html"
index b233ecf..9832f16 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\256\214\345\267\245/Sc_MESEndStepWorkBillList.html"
@@ -194,7 +194,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MESEndStepWorkBill/GetMESEndWorkBill',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -351,7 +351,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MESEndStepWorkBill/GetMESEndWorkBill',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
index 04c53cf..c284146 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
@@ -196,7 +196,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBill',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -369,7 +369,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBill',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html"
index 568de70..388d301 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_Add_MaterToSourceStepBillList.html"
@@ -442,7 +442,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sSubStr1 = JSON.stringify(table.cache['mainTable1']);
- var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];
if (!AllowLoadData(sSubStr, sSubStr1))//鏁版嵁楠岃瘉
{
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html"
index d5dcc4d..1265176 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html"
@@ -247,7 +247,7 @@
$.ajax({
url: GetWEBURL() + '/Sc_MaterToSourceStepBill/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere,"user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\211\251\346\226\231\346\270\205\345\215\225/sc_Gy_ICBomBillMainList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\211\251\346\226\231\346\270\205\345\215\225/sc_Gy_ICBomBillMainList.html"
new file mode 100644
index 0000000..401bdc3
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\347\211\251\346\226\231\346\270\205\345\215\225/sc_Gy_ICBomBillMainList.html"
@@ -0,0 +1,412 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鐢熶骇鐗╂枡娓呭崟鍒楄〃</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--<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/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
+
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ </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" style="width:190px;">
+ </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">
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;">
+ </div>
+ </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="MaterialCode" id="MaterialCode" style="width:190px;">
+ </div>
+ </div>
+ <!--<hr />-->
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="MaterialName" id="MaterialName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="SpecificationModel" id="SpecificationModel" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="Warehouse" id="Warehouse" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="Hmaker" id="Hmaker" style="width:190px;">
+ </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-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <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="get_Exit"><i class="layui-icon layui-icon-logout"></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-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+
+ //#endregion
+
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ });
+
+ // 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ //鍒濆鍖栨棩鏈�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 160 }
+ , { field: '浠撳簱', title: '浠撳簱', width: 160 }
+ , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+ , { field: 'hmaterid', title: 'hmaterid', width: 200, hide: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 115 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 115 }
+ , { field: 'hunitid', title: 'hunitid', width: 200, hide: true }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 200 }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 115 }
+ , { field: '鐢ㄩ噺', title: '鐢ㄩ噺', width: 200 }
+ , { field: '鍑�鐢ㄩ噺', title: '鍑�鐢ㄩ噺', width: 200 }
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 125 }
+ , { field: '宸ュ簭', title: '宸ュ簭', width: 125 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '淇敼浜�', title: '淇敼浜�', width: 125 }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+
+ ]]
+ };
+ }
+
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ICBomBill/list',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ // 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ //var HDeptID = $("#HDeptID").val();//閮ㄩ棬
+ var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠ｇ爜
+ var MaterialName = $("#MaterialName").val();//鐗╂枡鍚嶇О
+ var SpecificationModel = $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
+ var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+ var Warehouse = $("#Warehouse").val();//浠撳簱
+ var Hmaker = $("#Hmaker").val();//鍒跺崟浜�
+
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+
+ //if (HDeptID) {
+ // sWhere += " and 閮ㄩ棬 like '%" + HDeptID + "%'";
+ //}
+ if (MaterialCode) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + MaterialCode + "%'";
+ }
+ if (MaterialName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + MaterialName + "%'";
+ }
+ if (SpecificationModel) {
+ sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'";
+ }
+ if (HSourceBillNo) {
+ sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
+ }
+ if (Warehouse) {
+ sWhere += " and 浠撳簱 like '%" + Warehouse + "%'";
+ }
+ if (Hmaker) {
+ sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ // 閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");//鍗曟嵁鍙�
+ //$("#HDeptID").val("");//閮ㄩ棬
+ $("#MaterialCode").val("");//鐗╂枡浠ｇ爜
+ $("#MaterialName").val("");//鐗╂枡鍚嶇О
+ $("#SpecificationModel").val("");//瑙勬牸鍨嬪彿
+ $("#HSourceBillNo").val("");//婧愬崟鍗曞彿
+ $("#Warehouse").val("");//浠撳簱
+ $("#Hmaker").val("");//鍒跺崟浜�
+
+ sWhere = "";
+ }
+
+ // 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+
+ //瀹℃牳
+ function set_AuditBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Kf_ICStockBillMain/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, 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 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+
+ //鍙嶅鏍�
+ function set_DeAuditBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Kf_ICStockBillMain/AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "IsAudit": 2, "CurUserName": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, 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 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹弽瀹℃牳锛�');
+ }
+ }
+
+ //鎵撳嵃
+ function get_PrintReport() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+
+ if (checkStatus.data.length === 1) {
+ layer.open({
+ type: 2
+ , area: ['50%', '50%']
+ , title: '鎵撳嵃妯＄増閫夋嫨'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=ICStockBill', 'yes']
+ , resize: false
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
+ }
+ }
+
+
+ //#endregion
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\273\204\350\243\205\345\215\225/Sc_GroupOrderBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\273\204\350\243\205\345\215\225/Sc_GroupOrderBillList.html"
index e93dec6..88aea2b 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\273\204\350\243\205\345\215\225/Sc_GroupOrderBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\273\204\350\243\205\345\215\225/Sc_GroupOrderBillList.html"
@@ -313,7 +313,7 @@
$.ajax({
url: GetWEBURL() + '/GroupOrderBill/List',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
index 41222bb..d48e1eb 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
@@ -670,7 +670,7 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
//var tableData = data.field;
- var oMain = data.field;
+ var oMain = data.field + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
type: "POST",
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html"
index ac1568f..ef83f52 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBillList.html"
@@ -210,10 +210,11 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationEntrustInBill/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 0) {
option.data = [];
+ layer.alert(data1.Message, { icon: 5 });
} else {
option.data = data1.data;
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html"
index bcdc582..0ab4252 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBillList.html"
@@ -215,10 +215,11 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationEntrustOutBill/list',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 0) {
option.data = [];
+ layer.alert(data1.Message, { icon: 5 });
} else {
option.data = data1.data;
}
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_StationOutBill.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_StationOutBill.html"
index c54f40c..f5fb00b 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_StationOutBill.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_StationOutBill.html"
@@ -784,7 +784,7 @@
//鎻愪氦
form.on('submit(Saver)', function (data) {//鎻愪氦
var tableData = data.field;
- var oMain = data.field;
+ var oMain = data.field + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
type: "POST",
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 931499a..735e6ab 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"
@@ -472,10 +472,11 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationOutBill/get_Display',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
if (data1.count == 0) {
option.data = [];
+ layer.alert(data1.Message, { icon: 5 });
} else {
option.data = data1.data;
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 5eea88e..366d1fa 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -939,7 +939,7 @@
data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
+ var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
type: "POST",
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 926bd21..db5208c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -470,7 +470,7 @@
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index be018b5..935b1b3 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -481,7 +481,7 @@
layer.msg("娴佹按鍙锋病鏈夐�夋嫨锛佽杈撳叆娴佹按鍙峰悗鍥炶溅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
- var oMain = data.field;
+ var oMain = data.field + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
type: "POST",
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
index 3057bc4..2a6978c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
@@ -331,10 +331,11 @@
$.ajax({
url: GetWEBURL() + '/Cj_StationInBill/get_Display',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (result) {
if (result.count == 0) {
option.data = [];
+ layer.alert(result.Message, { icon: 5 });
} else {
option.data = result.data;
}
--
Gitblit v1.9.1