From b7923cc03402e74f2496ab4e13ffaa7eb49ad3bd Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 23 九月 2024 09:36:53 +0800
Subject: [PATCH] 1.模具保养规程表头 增加 HErrWarQtys int --预警次数 2,模具保养计划单 主表 增加 HErrWarQtys int --预警次数 3.模具保养计划单 计划子表 增加 HSendFlag bit //是否发送信息 （发送钉钉） HErrBeginQty int --预警开始次数 HUseNowQty ?int --当前使用次数 HUseEndQty ?int --结束使用次数 4.模具计划单,点击审核 生成模具保养计划 5.模具保养记录 点击审核 根据钉钉同步的累加模次 进行计算下次点检记录 6.异常反馈增加工作中心字段
---
WebTM/WebTM.csproj.user | 2
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMain.html | 36 ++++----
WebTM/views/计划管理/工艺路线/Gy_MaterialTechParamBillMainList.html | 30 +++++++
WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainPlanBillList.html | 71 ++++++++++-------
WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainRuleBillEdit.html | 8 ++
WebTM/layuiadmin/Scripts/webConfig.js | 9 -
WebTM/views/生产管理/异常反馈单/Sc_Add_MESExecptFeedBackBillList.html | 56 +++++++++++++
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 2
WebTM/views/车间管理/启动点检单/Gy_WorkBeginDotCheckListBill.html | 2
9 files changed, 155 insertions(+), 61 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index e39639b..005e8c8 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index a489032..75c614e 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,18 +5,13 @@
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
//var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- /* var WEBURL = "http://localhost:8082/API/"; */ //鏉滆春鏈湴閰嶇疆
- var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃� */
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost/API/";*/ //娼樻禉娓告湰鍦伴厤缃�
- /*var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
- //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
/* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
+ /* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
- //var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
//var WEBURL = "http://localhost/API/"; //娼樻禉娓告湰鍦伴厤缃�
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
index 3758c31..ad76b61 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_Add_MouldMaintainPlanBillList.html"
@@ -81,6 +81,7 @@
<label class="layui-form-label">鍛ㄦ湡鍗曚綅</label>
<div class="layui-input-inline">
<select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
+ <option value="娆�">娆�</option>
<option value="澶�">澶�</option>
<option value="鏈�">鏈�</option>
<option value="骞�">骞�</option>
@@ -94,6 +95,24 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">淇濆吇棰勮娆℃暟</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HErrWarQtys" id="HErrWarQtys" class="layui-input" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
<label class="layui-form-label">璁″垝寮�濮嬫棩鏈�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HBeginDate" id="HBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
@@ -105,35 +124,9 @@
<input class="layui-input" name="HEndDate" id="HEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">鎽樿</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation" style="width:530px;"></textarea>
- </div>
- </div>
- <div class="layui-inline" style="margin-left:340px;">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark" style="width:530px;"></textarea>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">浜у搧鍣ㄥ叿<label style="color:red"> * </label></label>
- <div class="layui-input-inline">
- <input type="text" name="HMouldName" id="HMouldName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HMouldID" id="HMouldID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HMouldList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
- <div class="layui-input-inline" >
+ <div class="layui-input-inline">
<input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;float:left;width:150px;" readonly>
<input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDept" id="btnHDept" style="width: 40px;">
@@ -148,6 +141,20 @@
<select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鎽樿</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation" style="width:530px;"></textarea>
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-left:340px;">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ュ娉�" class="layui-textarea" name="HRemark" id="HRemark" style="width:530px;"></textarea>
</div>
</div>
</div>
@@ -358,6 +365,7 @@
$("#HMaintainLevID").val(checkStatus.data[0].HMaintainLevID);
$("#HCycleUnit").val(checkStatus.data[0].鍛ㄦ湡鍗曚綅);
$("#HCheckCycle").val(checkStatus.data[0].淇濆吇鍛ㄦ湡);
+ $("#HErrWarQtys").val(checkStatus.data[0].淇濆吇棰勮娆℃暟);
form.render('select');
get_DocCheckItem2(checkStatus.data[0].hmainid);
@@ -637,6 +645,10 @@
, { field: 'HErrBeginTime', title: '棰勮寮�濮嬫椂闂寸偣' }
, { field: 'HRelationFlag', title: '鍏宠仈鏍囪' }
, { field: 'DiffDate', title: '鐩稿樊闂撮殧' }
+ , { field: 'HSendFlag', title: '鍙戦�佹爣璁�' }
+ , { field: 'HErrBeginQty', title: '棰勮寮�濮嬫鏁�' }
+ , { field: 'HUseNowQty', title: '褰撳墠浣跨敤娆℃暟' }
+ , { field: 'HUseEndQty', title: '缁撴潫浣跨敤娆℃暟' }
];
option_plan = {
id: 'mainTable_plan'
@@ -675,7 +687,7 @@
table.render(option1);
set_EditGrid_Plan(linterid); //缂栬緫鑾峰彇琛ㄤ綋--鐐规璁″垝
- option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "", "HErrBeginTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0 }];
+ option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HSafeEndTime": "", "HErrBeginTime": "", "HRelationFlag": "鏈偣妫�", "DiffDate": 0, "HSendFlag": "0", "HErrBeginQty": "", "HUseNowQty": "", "HUseEndQty": "" }];
table.render(option_plan);
}
@@ -754,6 +766,7 @@
, "HUSEORGID": data.HUSEORGID
, "HDeptID": data.HDeptID
, "HDeptName": data.閮ㄩ棬鍚嶇О
+ , "HErrWarQtys": data.淇濆吇棰勮娆℃暟
});
if ($("#HUSEORGID").val() == null || $("#HUSEORGID").val() == "" || $("#HUSEORGID").val() == undefined) {
$("#HUSEORGID").val(sessionStorage["OrganizationID"])
@@ -821,7 +834,7 @@
rowdata.push(
{
"HPlanDate": Pub_Format(data[i].璁″垝鏃ユ湡, "yyyy-MM-dd"), "HPlanBeginTime": Pub_Format(data[i].璁″垝寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HPlanEndTime": Pub_Format(data[i].璁″垝缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss"), "HSafeEndTime": Pub_Format(data[i].瀹夊叏缁撴潫鏃堕棿鐐�, "yyyy-MM-dd hh:mm:ss")
- ,"HErrBeginTime": Pub_Format(data[i].棰勮寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧
+ , "HErrBeginTime": Pub_Format(data[i].棰勮寮�濮嬫椂闂寸偣, "yyyy-MM-dd hh:mm:ss"), "HRelationFlag": data[i].鍏宠仈鏍囪, "DiffDate": data[i].鐩稿樊闂撮殧, "HSendFlag": data[i].淇℃伅鏍囪, "HErrBeginQty": data[i].棰勮寮�濮嬫鏁�, "HUseNowQty": data[i].褰撳墠浣跨敤娆℃暟, "HUseEndQty": data[i].缁撴潫浣跨敤娆℃暟
}
)
}
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
index 6583de5..0941ea2 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldMaintainRuleBillEdit.html"
@@ -78,6 +78,7 @@
<label class="layui-form-label">鍛ㄦ湡鍗曚綅<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit">
+ <option value="娆�">娆�</option>
<option value="澶�">澶�</option>
<option value="鏈�">鏈�</option>
<option value="骞�">骞�</option>
@@ -108,6 +109,12 @@
<label class="layui-form-label">淇濆吇棰勮澶╂暟</label>
<div class="layui-input-inline">
<input type="text" name="HErrWarDays" id="HErrWarDays" class="layui-input" value="0">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">淇濆吇棰勮娆℃暟</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HErrWarQtys" id="HErrWarQtys" class="layui-input" value="0">
</div>
</div>
</div>
@@ -546,6 +553,7 @@
, "HUseQtys": data.淇濆吇鍐插埡鏁�
, "HSafeDays": data.淇濆吇瀹夊叏澶╂暟
, "HErrWarDays": data.淇濆吇棰勮澶╂暟
+ , "HErrWarQtys": data.淇濆吇棰勮娆℃暟
});
} else {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
index 6f0f72b..99e3cd5 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\345\274\202\345\270\270\345\217\215\351\246\210\345\215\225/Sc_Add_MESExecptFeedBackBillList.html"
@@ -344,6 +344,16 @@
<input class="layui-input" name="HMainSourceBillType" lay-verify="HMainSourceBillType" id="HMainSourceBillType" disabled autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杞﹂棿:</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HCenterName" id="HCenterName" class="layui-input" value="" style="float:left;width:150px;" disabled>
+ <input type="hidden" name="HCenterID" id="HCenterID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HCenterList" id="HCenterList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
</div>
</div>
<!--鍏朵粬淇℃伅-->
@@ -559,8 +569,7 @@
set_EditFromGrid();
}
else if (OperationType == 4) {
- set_AddFNew();
- $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
+ set_AddFNew();
var EquipNumber = "";//璁惧浠ｇ爜
var HSourceName1 = "";//鐢熶骇璧勬簮鍚嶇О
var HTypes = "";//寮傚父绫诲瀷
@@ -760,6 +769,9 @@
$("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
$("#HDeptID").val(sessionStorage["HDeptID"]); //閮ㄩ棬ID
$("#HDeptName").val(sessionStorage["HDept"]); //閮ㄩ棬
+ $("#HSendMan").val(sessionStorage["HUserName"]); //鍙戦�佷汉
+ $("#HCenterName").val(sessionStorage["HWorkCenter"]); //宸ヤ綔涓績
+ $("#HCenterID").val(sessionStorage["HWorkCenterID"]); //宸ヤ綔涓績
}
//鏈夋簮鍗曟柊澧�
@@ -833,6 +845,8 @@
, "HSendMan": data.HSendMan
, "HDeptID": data.HDeptID
, "HDeptName": data.HDeptName
+ , "HCenterID": data.HCenterID
+ , "HCenterName": data.HCenterName
, "HReceiveMan": data.HReceiveMan
, "HCopyMan": data.HCopyMan
, "HMainSourceInterID": data.HSourceInterID //婧愬崟ID
@@ -1109,6 +1123,44 @@
});
});
+ //杞﹂棿(宸ヤ綔涓績)
+ form.on('submit(HCenterList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '宸ヤ綔涓績鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HCenterName").val(checkStatus.data[0].宸ヤ綔涓績鍚嶇О);
+ $("#HCenterID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//鎺ユ敹浜�(浣滃簾)
form.on('submit(HReceiveManList0)', function () {
//椤甸潰灞�-鑷畾涔�
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
index 129360f..4bd3d76 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMain.html"
@@ -413,27 +413,27 @@
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
}
- //else if (OperationType == 2) {
-
- // RoadBillMain(linterid);
- // $.ajax({
- // url: GetWEBURL() + "/Web/GetMAXNum",
- // type: "GET",
- // async: false,
- // data: { "HBillType": '3301' },
- // success: function (d) {
- // $("#HInterID").val(d.data[0].HInterID);
- // $("#HBillNo").val(d.data[0].HBillNo);
- // $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
- // }
- // });
- //}
+ else if (OperationType == 2) {
+ //鍒濆鍖栬〃鏍�
+ get_InitGrid();
+ RoadBillMain(linterid);
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ async: false,
+ data: { "HBillType": '3334' },
+ success: function (d) {
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+ });
+ }
else if (OperationType == 3) {
//绂佺敤鎸夐挳
var num = 1;
HfBtn(num);
- debugger;
//鍒濆鍖栬〃鏍�
get_InitGrid();
@@ -1313,8 +1313,8 @@
var tableSub = result.data[1];
//涓昏〃
form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HInterID": tableMain[0]["HInterID"]
- , "HBillNo": tableMain[0]["鍗曟嵁鍙�"]
+ "HInterID": OperationType == 2 ? "" : tableMain[0]["HInterID"]
+ , "HBillNo": OperationType == 2 ? "" : tableMain[0]["鍗曟嵁鍙�"]
, "HDate": Format(new Date(tableMain[0]["鏃ユ湡"]), "yyyy-MM-dd")
, "HMaterID": tableMain[0]["HMaterID"]
, "HMaterNumber": tableMain[0]["鐗╂枡浠ｇ爜"]
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMainList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMainList.html"
index 047d900..710c58d 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMainList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_MaterialTechParamBillMainList.html"
@@ -162,7 +162,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
-
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>澶嶅埗</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
@@ -238,6 +238,9 @@
//缂栬緫
case 'set_ShowBill': set_ShowBill();
break;
+ //澶嶅埗
+ case 'set_Copy': set_Copy();
+ break;
//鍒犻櫎
case 'set_DeleteBill': set_DeleteBill();
break;
@@ -602,7 +605,7 @@
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
}
if (number==2) {
- if (HProject) {
+ if (HProject!='0') {
sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
}
}
@@ -719,6 +722,29 @@
}
//#endregion
+ //澶嶅埗
+ function set_Copy() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var linterid = data[0].HInterID.toString();
+
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浜у搧宸ヨ壓鍙傛暟娓呭崟-缂栬緫'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_MaterialTechParamBillMain.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
+ , end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ })
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+ }
+
//#region 鍒犻櫎
function set_DeleteBill() {
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 9289b2e..f38dee9 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -830,7 +830,7 @@
sWhere += " and HOrgID = '" + HOrgID + "'";
}
if (number==2) {
- if (HProject) {
+ if (HProject!='0') {
sWhere += " and 椤圭洰鍙� like '%" + HProject + "%'";
}
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBill.html"
index 8dd1a92..41a03d4 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\220\257\345\212\250\347\202\271\346\243\200\345\215\225/Gy_WorkBeginDotCheckListBill.html"
@@ -931,7 +931,7 @@
"HCheckNoteItemName": tableSub[i]["妫�鏌ラ」鐩�"],
"HCheckPostID": tableSub[i]["HCheckPostID"],
"HCheckPostName": tableSub[i]["纭鑰呰鑹�"],
- "HDotCheckType": tableSub[i]["鐐规绫诲瀷"],
+ "HDotCheckType": tableSub[i]["鐐规绫诲瀷"] == null ? "璁惧" : tableSub[i]["鐐规绫诲瀷"],
"HRelationID": tableSub[i]["HRelationID"],
"HRelationName": relationName,
"HRemark": tableSub[i]["琛ㄤ綋澶囨敞"]
--
Gitblit v1.9.1