From 6ff28524dda0a01d51a6506158e7e8426b406375 Mon Sep 17 00:00:00 2001
From: WYB <908761037@qq.com>
Date: 星期日, 25 四月 2021 17:41:06 +0800
Subject: [PATCH] 工序汇报单打印路径修复。
---
WebTM/views/生产工序管理/工序汇报单/Sc_Add_ProcessReportList.html | 388 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 298 insertions(+), 90 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\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 94d9a2c..ccfec34 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"
@@ -15,12 +15,17 @@
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
<div class="layui-card">
- <form id="form0" class="layui-form" action="">
+ <form id="form0" class="layui-form layui-form-pane" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ <button type="button" id="Closeing" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Closeing">鍏抽棴</button>
+ <button type="button" id="BackClose" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="BackClose">鍙嶅叧闂�</button>
+ <button type="button" id="Auditing" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Auditing">瀹℃牳</button>
+ <button type="button" id="BackAudit" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="BackAudit">鍙嶅鏍�</button>
+ <button type="button" id="Printing" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Printing">鎵撳嵃</button>
</div>
@@ -51,14 +56,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 id="HManagerID" name="HManagerID" type="hidden" />
+ <input class="layui-input" name="HICMOBillNo" id="HICMOBillNo" autocomplete="off" disabled>
+ <!--<input id="HICMOInterID" name="HICMOInterID" 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="HDeptID" readonly="readonly" autocomplete="off" class="layui-input">
+ <input type="text" name="HDeptNumber" id="HDeptNumber" lay-verify="HDeptID" readonly="readonly" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -70,63 +75,51 @@
<label class="layui-form-label">杞﹂棿锛�</label>
<div class="layui-input-inline">
<input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
-
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <input id="HDeptID" name="HDeptID" type="hidden" />
-
+
+ <button type="button" id="HDeptID-BT" lay-submit="" class="layui-btn" lay-filter="HDeptID-BT">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <input id="HDeptID" name="HDeptID" type="hidden" />
+
</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="HDHDate" lay-verify="HDHDate" id="HDHDate">
- </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="HDHDate" lay-verify="HDHDate" id="HDHDate">
+ </div>
+ </div>-->
<div class="layui-col-xs3">
<label class="layui-form-label"> 璁″垝寮�宸ユ棩鏈燂細</label>
<div class="layui-input-inline">
- <input class="layui-input" name="HPlanBeginDate" lay-verify="HPlanBeginDate" id="HPlanBeginDate" autocomplete="off">
-
+ <input class="layui-input" name="HPlanBeginDate" lay-verify="HPlanBeginDate" id="HPlanBeginDate" 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="HPlanEndDate" lay-verify="HPlanEndDate" id="HPlanEndDate" autocomplete="off">
-
+ <input class="layui-input" name="HPlanEndDate" lay-verify="HPlanEndDate" id="HPlanEndDate" 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="HPlanQty" lay-verify="HPlanQty" id="HPlanQty" autocomplete="off">
+ <input class="layui-input" name="HPlanQty" lay-verify="HPlanQty" id="HPlanQty" autocomplete="off">
</div>
</div>
+
</div>
</div>
<div class="layui-form-item">
<div class="layui-row">
-
- <div class="layui-col-xs6">
+
+ <div class="layui-col-xs8">
<label class="layui-form-label"> 澶� 娉細</label>
<div class="layui-input-block">
<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
@@ -135,67 +128,80 @@
</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">
- <input type="hidden" name="HEmpID" id="HEmpID" autocomplete="off" class="layui-input">
+ <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">
+ <input type="hidden" name="HEmpID" id="HEmpID" autocomplete="off" class="layui-input">
- </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 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-col-xs3">
+ <label class="layui-form-label">鍏抽棴浜猴細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCloseMan" id="HCloseMan" 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 class="layui-col-xs3">
+ <label class="layui-form-label">鍏抽棴鏃ユ湡锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HCloseDate" id="HCloseDate" readonly="readonly" autocomplete="off">
+ </div>
+ </div>
+ </div>
</div>
</div>
+
+ </div>
+ </div>
</div>
<blockquote class="layui-elem-quote">宸ュ簭娲惧伐鍗�</blockquote>
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-add"><i class="layui-icon layui-icon-addition"></i>鎷嗗垎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-del"><i class="layui-icon layui-icon-subtraction"></i>鍒犺</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-del"><i class="layui-icon layui-icon-subtraction"></i>鍒犺</button>-->
</div>
</script>
-
+
+
</form>
</div>
</div>
@@ -206,6 +212,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script>
+
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -221,13 +228,49 @@
var lentryid = params[params[1]];
var PlanBeginDate = params[params[2]];
var PlanEndDate = params[params[3]];
- alert(HInterID + '绗簩涓細' + 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") {
+ $('#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);
+ }
+
+ }, error: function () {
+ layer.alert("鑾峰彇鏁版嵁澶辫触!", { icon: 5 });
+ }
+ });
+ } else {
+ //鑾峰彇鍗曟嵁鍙�
$.ajax({
url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
type: "GET",
@@ -243,6 +286,8 @@
layer.alert("鑾峰彇鍗曟嵁鍙峰け璐�!", { icon: 5 });
}
});
+ }
+
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -260,6 +305,8 @@
$("#HMaker").val(sessionStorage["HUserName"]);//鍒跺崟浜�
$("#HEmpID").val(sessionStorage["HEmpID"]);
+ CurUserName = sessionStorage["HUserName"];
+
//鎵ц涓�涓猯aydate瀹炰緥
laydate.render({
@@ -268,7 +315,13 @@
//鍔犺浇璁″垝鍗曚笅鎺ㄧ殑鏁版嵁
+ if (typeof (lentryid) == "undefined") {
+
+ RoadHBillSub2();
+ } else {
+
RoadHBillSub();
+ }
table.render({
elem: '#mainTable'
, toolbar: '#toolbarDemo'
@@ -360,6 +413,7 @@
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
table.reload('mainTable', {
data: ajaxReturnData
+ , height: 'full-10'
, loading: false
, done: function (index, res) {
layer.closeAll("loading");
@@ -372,6 +426,33 @@
}
});
};
+ //鍔犺浇鏄剧ず鏁版嵁
+ function RoadHBillSub2() {
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ProcessMangement/MES_h_v_Sc_ProcessSendWorkList_Json',
+ type: "GET",
+ data: {
+ "HInterID": parseInt(HInterID)
+ },
+ success: function (result) {
+ console.log(result);
+ //$("#HBillNo").val(result.data[0].HInterID);
+ ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ table.reload('mainTable', {
+ data: ajaxReturnData
+ , loading: false
+ , done: function (index, res) {
+ layer.closeAll("loading");
+ }
+ });
+
+ },
+ error: function (result) {
+ console.log(result);
+ }
+ });
+ };
+ //淇濆瓨
form.on('submit(Saver)', function (data) {//淇濆瓨
var sMainStr = JSON.stringify(data.field);
@@ -403,17 +484,144 @@
}
});
});
- function f_alert(sMsg) {
- layer.alert(sMsg, { icon: 5 });
-
- }
+
-
- form.on('submit(Exit)', function (data) {//淇濆瓨
+ 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;
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL()+"CloseProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: {
+ "HInterID": parseInt(HInterID)
+ , "IsClose": 0
+ ,"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");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ }
+ });
+ });
+ //鍙嶅叧闂�
+ form.on("submit(BackClose)", function (data) {
+ layer.alert("鎴戞槸鍙嶅叧闂寜閽紒");
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL()+"CloseProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: {
+ "HInterID": parseInt(HInterID)
+ , "IsClose": 1
+ ,"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");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ }
+ });
+ });
+ //瀹℃牳Auditing
+ form.on("submit(Auditing)", function (data) {
+ layer.alert("鎴戞槸瀹℃牳鎸夐挳锛�");
+
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL()+"AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: {
+ "HInterID": parseInt(HInterID)
+ , "IsAudit": 0
+ ,"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");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ }
+ });
+ });
+
+ //鍙嶅鏍窧ackAudit
+ form.on("submit(BackAudit)", function (data) {
+ layer.alert("鎴戞槸鍙嶅鏍告寜閽紒");
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL()+"AuditProcessReportList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: {
+ "HInterID": parseInt(HInterID)
+ , "IsAudit": 1
+ ,"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");
+ },
+ 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=姹囨姤鍗�");
+
+ });
+
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
//閫夋嫨閮ㄩ棬
form.on('submit(HDeptID-BT)', function () {//閫夋嫨閮ㄩ棬
layer.open({
--
Gitblit v1.9.1