From 4915fc2aec6f6e89485479d8be712a92fdc85d08 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期一, 07 二月 2022 17:17:55 +0800
Subject: [PATCH] 工序管理
---
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/生产工序管理/委外工序计划汇报单/WW_Add_EntrustProcessReport.html | 2
WebTM/views/生产工序管理/委外工序计划转出单/WW_Add_EntrustProcessSendOutBill.html | 302 ++++++++++----------
WebTM/views/生产工序管理/委外工序派工单/WW_AddEntrustProcSendWork.html | 2
WebTM/views/生产工序管理/工序计划单/Sc_ProcessPlanList.html | 4
WebTM/views/生产工序管理/委外工序计划汇报单/WW_EntrustProcessReportBillList.html | 8
WebTM/views/生产工序管理/工序汇报单/Sc_Add_ProcessReportList.html | 346 +++++++++++-----------
WebTM/views/生产工序管理/委外工序派工单/WW_EntrustProcSendWorkBillList.html | 2
WebTM/views/生产工序管理/工序派工单/Sc_ProcessSendWorkList.html | 43 +
12 files changed, 455 insertions(+), 436 deletions(-)
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({
--
Gitblit v1.9.1