From 7ffc133ec00a1e460a03d33085943f7d2ac4a29e Mon Sep 17 00:00:00 2001
From: WYB <908761037@qq.com>
Date: 星期二, 06 四月 2021 17:33:27 +0800
Subject: [PATCH] 工序下推页面优化处理
---
WebTM/views/生产工序管理/工序汇报单/Sc_ProcessReportList.html | 90 +++++++++++-----------
WebTM/views/生产工序管理/工序派工单/Sc_Add_ProcessSendWork.html | 82 +++++++++++---------
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 10 +-
3 files changed, 96 insertions(+), 86 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index b49e6ae..7d14801 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -17,10 +17,10 @@
<publishTime>03/23/2021 16:57:43</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>03/31/2021 16:14:35</publishTime>
+ <publishTime>04/06/2021 11:06:51</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>03/31/2021 16:14:35</publishTime>
+ <publishTime>04/06/2021 11:06:51</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>03/23/2021 16:57:43</publishTime>
@@ -1130,7 +1130,7 @@
<publishTime>03/29/2021 19:54:57</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭娲惧伐鍗�/Sc_Add_ProcessSendWork.html">
- <publishTime>03/31/2021 17:46:45</publishTime>
+ <publishTime>04/06/2021 16:12:51</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇浠诲姟鍗�/Sc_ICMOBillList.html">
<publishTime>03/23/2021 16:57:43</publishTime>
@@ -1148,7 +1148,7 @@
<publishTime>03/29/2021 20:16:17</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭姹囨姤鍗�/Sc_ProcessReportList.html">
- <publishTime>03/29/2021 19:53:34</publishTime>
+ <publishTime>04/06/2021 15:46:51</publishTime>
</File>
<File Include="views/鐢熶骇宸ュ簭绠＄悊/宸ュ簭娲惧伐鍗�/Sc_ProcessSendWorkList.html">
<publishTime>03/29/2021 19:53:52</publishTime>
@@ -1307,7 +1307,7 @@
<publishTime>03/29/2021 20:16:17</publishTime>
</File>
<File Include="Web.config">
- <publishTime>03/29/2021 20:24:19</publishTime>
+ <publishTime>04/06/2021 11:11:01</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
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 ee3a812..f67ac0c 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"
@@ -109,58 +109,58 @@
,cellMinWidth: 90
, cols: [[
//{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
- { type: 'checkbox' }
- ,{ field: 'HDate', title: '鏃ユ湡', sort: true, width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', sort: true, width: 170 }
- //, { field: 'HBillStatus ', title: '鍗曟嵁鐘舵��', width: 105 }
- , { field: 'HICMOBillNo', title: '浠诲姟鍗曞彿' }
- , { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
+ { type: 'checkbox' }
+ , { field: 'hmainid ', title: 'hmainid', width: 105, sort: true, fixed: true, hide: true }
+ ,{ field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
+
, { field: 'HDeptID', title: '閮ㄩ棬ID', width: 115 }
- , { field: 'HDeptNumber', title: '閮ㄩ棬浠ｇ爜' }
- , { field: 'HGroupID', title: '鐝粍ID', width: 160 }
- , { field: 'HGroupNumber', title: '鐝粍浠ｇ爜', width: 160 }
- , { field: 'HMaterID ', title: '鐝粍浠ｇ爜', width: 215 }
+ , { field: '閮ㄩ棬', title: '閮ㄩ棬' }
+ , { field: 'HMaterID', title: 'HMaterID' }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
+ , { field: '瑙勬牸鍨嬪彿 ', title: '瑙勬牸鍨嬪彿', width: 215 }
////, { field: 'hunitid', title: 'hunitid' }
- , { field: 'HMaterID ', title: '浜у搧ID ', width: 115 }
- , { field: 'HMaterNumber', title: '浜у搧浠ｇ爜' }
+ , { field: 'HUnitID ', title: 'HUnitID ', width: 115 }
+ , { field: '鍗曚綅浠ｇ爜', title: '鍗曚綅浠ｇ爜' }
////, { field: 'hempid', title: 'hempid' }
- , { field: 'HUnitID', title: '鍗曚綅ID', width: 100 }
- , { field: 'HUnitNumber', title: '鍗曚綅浠ｇ爜' }
- , { field: 'HPlanQty', title: '璁″垝鏁伴噺' }
- , { field: 'HInStockQty', title: '鍏ュ簱鏁伴噺' }
- , { field: 'HSumTimes', title: '鎬诲伐浣滄椂闂�' }
+ , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О', width: 100 }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+ , { field: 'hsubid', title: 'hsubid' }
+ , { field: 'HEmpID', title: 'HEmpID' }
+ , { field: '鑱屽憳', title: '鑱屽憳' }
////, { field: 'HCenterID', title: 'HCenterID' }
- , { field: 'HExplanation', title: '鎽樿' }
- , { field: 'HRemark ', title: '澶囨敞' }
+ , { field: '宸ュ簭', title: '宸ュ簭' }
+ , { field: '鍗曚环 ', title: '鍗曚环' }
////, { field: 'hbomid', title: 'hbomid' }
- , { field: 'HInnerBillNo', title: '鍐呴儴鍗曟嵁鍙�' }
+ , { field: '鏁伴噺', title: '鏁伴噺' }
////, { field: 'HRoutingInterID', title: 'HRoutingInterID' }
- , { field: 'HBacker', title: '閫�鍥炰汉' }
- , { field: 'HBackDate', title: '閫�鍥炴棩鏈�' }
- , { field: 'HChecker', title: '瀹℃牳浜�' }
- , { field: 'HCheckDate', title: '瀹℃牳鏃ユ湡' }
- , { field: 'HMaker', title: '鍒跺崟浜�' }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡' }
- , { field: 'HUpDater', title: '淇敼浜�' }
- , { field: 'HUpDateDate', title: '淇敼鏃ユ湡' }
- , { field: 'HCloseMan', title: '鍏抽棴浜�' }
- , { field: 'HCloseDate', title: '鍏抽棴鏃ユ湡' }
- , { field: 'HCloseType', title: '鍏抽棴绫诲瀷' }
+ , { field: '涓嶈壇鏁伴噺', title: '涓嶈壇鏁伴噺' }
+ , { field: '鎶ュ簾鏁�', title: '鎶ュ簾鏁�' }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+ , { field: '淇敼浜�', title: '淇敼浜�' }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
////, { field: 'hsubid', title: 'hsubid' }
- , { field: 'HDeleteMan', title: '浣滃簾浜�' }
- , { field: 'HDeleteDate', title: '浣滃簾鏃ユ湡' }
- //, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
- //, { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
- //, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
- //, { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
- //, { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
- //, { field: '淇敼浜�', title: '淇敼浜�' }
- //, { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
- //, { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
- //, { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
- //, { field: '浣滃簾浜�', title: '浣滃簾浜�' }
- //, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
- //, { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+ , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�' }
+ , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�' }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷' }
+ , { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
+ , { field: 'HBillType', title: 'HBillType' }
+ , { field: 'HBillSubType', title: 'HBillSubType' }
+ , { field: 'HICMOInterID', title: 'HICMOInterID' }
+ , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
+ , { field: 'HSourceID', title: 'HSourceID' }
+ , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
+ , { field: '鐢熶骇璧勬簮', title: '鐢熶骇璧勬簮' }
//, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
//, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
//, { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�' }
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 8615cb2..ee124e4 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"
@@ -74,7 +74,7 @@
<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="HDeptNumber" name="HDeptNumber" type="hidden" />
</div>
</div>
@@ -83,13 +83,13 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</div>-->
- <div class="layui-col-xs3">
+ <!--<div class="layui-col-xs3">
<label class="layui-form-label"> 鍐呴儴鍗曟嵁鍙凤細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
<input id="HSupID" name="HSupID" type="hidden" />
</div>
- </div>
+ </div>-->
<!--<div class="layui-col-xs3">
<label class="layui-form-label"> 浜у搧浠ｇ爜锛�</label>
<div class="layui-input-inline">
@@ -175,20 +175,20 @@
<input class="layui-input" name="HStatus" id="HStatus" autocomplete="off">
</div>
</div>
- <div class="layui-col-xs3">
+ <!--<div class="layui-col-xs3">
<label class="layui-form-label"> 鎬绘淳宸ユ暟閲忥細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HSupName" lay-verify="HSupName" id="HSupName" readonly="readonly" autocomplete="off">
<input id="HSupID" name="HSupID" type="hidden" />
</div>
- </div>
- <div class="layui-col-xs3">
+ </div>-->
+ <!--<div class="layui-col-xs3">
<label class="layui-form-label"> 鎬诲伐鏃讹細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" readonly="readonly" autocomplete="off">
<input id="HDeptID" name="HDeptID" type="hidden" />
</div>
- </div>
+ </div>-->
</div>
</div>
@@ -288,12 +288,12 @@
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;
var year = date.getFullYear();
- var shijian = year + "/" + month + "/" + day;
+ var shijian = year + "-" + month + "-" + day;
//鑾峰彇鍗曟嵁鍙�
$.ajax({
url: GetWEBURL() + "/api/newBill/getNewInterBillNo",
@@ -474,32 +474,41 @@
}
});
};
- // form.on('submit(Saver)', function (data) {//淇濆瓨
- // //debugger;
- // var sMainStr = JSON.stringify(data.field);
- // var sSubStr = JSON.stringify(table.cache['mainTable']);
- // var sMainSub = sMainStr + ';' + sSubStr;
- // $.ajax(
- // {
- // type: "POST",
- // url: GetWEBURL()+"SaverPOInStock", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- // async: true,
- // data: {"msg": sMainSub },
- // dataType: "json",
- // success: function (data) {
- // if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- // layer.msg(data.Message, { icon: 1 });
- // }
- // else {
- // f_alert(data.Message);
- // }
- // layer.closeAll("loading");
- // },
- // error: function (err) {
- // f_alert("閿欒:" + err);
- // }
- // });
- //});
+ form.on('submit(Saver)', function (data) {//淇濆瓨
+ //debugger;
+
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sMainSub = sMainStr + ';' + sSubStr;
+ $.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 });
+ }
+ 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) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
form.on('submit(Exit)', function (data) {//淇濆瓨
@@ -562,7 +571,8 @@
});
function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬
$("#HDeptName").val(obj[0].HName);
- $("#HDeptID").val(obj[0].HNumber);
+ $("#HDeptID").val(obj[0].HItemID);
+ $("#HDeptNumber").val(obj[0].HNumber);
}
--
Gitblit v1.9.1