From fb21bba8780ac7b2bd51edb3534640bcc5e88040 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 16 五月 2024 17:07:34 +0800
Subject: [PATCH] 1.销售管理,仓库管理 所有的 新增 审核 反审核 删除 增加 进行 会计期间 结账 的判断和控制 2.岗位技能清单 和 员工技能清单 表头 增加 2个 字段； HMaterID int --产品编码（gy_Material） HProcID int --工序（gy_Process）
---
WebTM/views/工资管理/员工技能清单/HR_EmployeeSkillBill.html | 144 +++++++++++++++--
WebTM/WebTM.csproj.user | 2
WebTM/views/销售管理/特批申请单/Xs_ExceptiveCheckRequestBill.html | 1
WebTM/views/工资管理/员工技能清单/HR_EmployeeSkillBillList.html | 2
WebTM/views/验收入库/委外入库/Kf_EntrustInBillList.html | 37 ++++
WebTM/views/基础资料/生产基础资料/Gy_PostSkillList.html | 2
WebTM/views/销售管理/销售调价单/Xs_SellOutChangeBillList.html | 1
WebTM/views/工资管理/岗位技能清单/HR_PostSkillBill.html | 140 +++++++++++++++--
WebTM/views/工资管理/岗位技能清单/HR_PostSkillBillList.html | 2
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_PostSkillList.html | 107 +++++++++++++
WebTM/views/设备管理/设备档案/Gy_EquipFileMainEdit.html | 28 +++
11 files changed, 419 insertions(+), 47 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 005e8c8..e39639b 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>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PostSkillList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PostSkillList.html"
index 40715c1..ea5e7a1 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PostSkillList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_PostSkillList.html"
@@ -51,6 +51,17 @@
<input class="layui-input" name="HHelpCode" id="HHelpCode" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲宀椾綅</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HPostName" name="HPostName" id="HPostName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HPostID" id="HPostID" lay-verify="HPostID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHPost" id="btnSearchHPost" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+
</div>
<div class="layui-form-item">
<label class="layui-form-label" style="width: 120px">浣跨敤缁勭粐锛�</label>
@@ -66,6 +77,16 @@
<option value="鏈娇鐢�">鏈娇鐢�</option>
<option value="宸蹭娇鐢�">宸蹭娇鐢�</option>
</select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
</div>
@@ -198,6 +219,20 @@
//}
}
});
+
+ //#region 閫夋嫨宀椾綅鎸夐挳
+ form.on('submit(btnSearchHPost)', function () {
+ get_checkSearchHPost();
+ });
+ //#endregion
+
+ //#region 閫夋嫨閮ㄩ棬鎸夐挳
+ form.on('submit(btnSearchHProc)', function () {
+ get_checkSearchHProc();
+ });
+ //#endregion
+
+
//#endregion
@@ -232,6 +267,10 @@
$("#HItemID").val(data.HItemID);//浠ｇ爜ID
$("#HNumber").val(data.宀椾綅鎶�鑳戒唬鐮�);//浠ｇ爜
$("#HName").val(data.宀椾綅鎶�鑳藉悕绉�);//鍚嶇О
+ $("#HPostID").val(data.HPostID);//浠ｇ爜ID
+ $("#HPostName").val(data.宀椾綅鍚嶇О);//浠ｇ爜
+ $("#HProcID").val(data.HProcID);//浠ｇ爜ID
+ $("#HProcName").val(data.宸ュ簭鍚嶇О);//浠ｇ爜
$("#HHelpCode").val(data.鍔╄鐮�);//鍔╄鐮�
$("#HUSEORGID").val(data.鍒涘缓缁勭粐);//浣跨敤缁勭粐
$("#HUseFlag ").val(data.浣跨敤鐘舵��);//浣跨敤鐘舵��
@@ -253,6 +292,63 @@
layer.alert(sMsg, { icon: 5 });
}
+
+ //#region 宀椾綅閫夋嫨椤甸潰
+ function get_checkSearchHPost() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '鍛樺伐琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Post.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HPostID").val(checkStatus.data[0].HItemID);//宀椾綅id
+ $("#HPostName").val(checkStatus.data[0].宀椾綅鍚嶇О);//宀椾綅鍚嶇О
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ })
+ }
+ //#endregion
+
+ //#region 宸ュ簭閫夋嫨椤甸潰
+ function get_checkSearchHProc() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ュ簭琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HProcID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//閮ㄩ棬鍚嶇О
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ })
+ }
+ //#endregion
+
//鑾峰彇鐧诲綍椤电粍缁囧垪
function Organ() {
var Organization = '';
@@ -277,6 +373,17 @@
//#endregion
});
+ //宸ュ簭
+ function GetProcessValue(obj) {
+ $("#HProcID").val(obj[0].HItemID);//宸ュ簭id
+ $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);//宸ュ簭鍚嶇О
+ }
+ //宀椾綅
+ function GetGyPostValue(obj) {
+ $("#HPostID").val(obj[0].HItemID);//宀椾綅id
+ $("#HPostName").val(obj[0].宀椾綅鍚嶇О);//宀椾綅鍚嶇О
+ }
+
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html"
index 0abe1b1..700e71d 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PostSkillList.html"
@@ -121,7 +121,7 @@
var option = [];
var HModName = "Gy_PostSkill";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "鐭唬鐮伮�","鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐"];
+ var titleData = ["HItemID", "鐭唬鐮伮�", "鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐", "HPostID","HProcID"];
//#endregion
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBill.html"
index d6c8c33..da82b9e 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBill.html"
@@ -115,10 +115,41 @@
</button>
</div>
</div>
+
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍐呴儴璁㈠崟鍙�</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HInnerBillNo" lay-verify="HInnerBillNo" id="HInnerBillNo" >
+ <input type="text" class="layui-input" name="HInnerBillNo" lay-verify="HInnerBillNo" id="HInnerBillNo">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
</div>
</div>
</div>
@@ -129,23 +160,6 @@
<select name="HOrgID" id="HOrgID" lay-verify="HOrgID" style="background-color:#efefef4d;" readonly>
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
- </div>
- </div>
- </div>
-
- <div class="layui-row">
- <div class="layui-inline">
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <input type="hidden" name="HProID" id="HProID" lay-verify="HProID" value="0">
- <input type="hidden" name="HProjectStageID" id="HProjectStageID" lay-verify="HProjectStageID" value="0">
- <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" lay-verify="HMainSourceBillType" value="">
- <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="">
</div>
</div>
</div>
@@ -399,14 +413,28 @@
get_checkSearchHEmp();
});
//#endregion
+
//#region 閫夋嫨璇勫畾浜烘寜閽�
form.on('submit(btnSearchHCheckEmp)', function () {
get_checkSearchHCheckEmp();
});
//#endregion
+
//#region 閫夋嫨涓婄骇棰嗗鎸夐挳
form.on('submit(btnSearchHManagerEmp)', function () {
get_checkSearchHManagerEmp();
+ });
+ //#endregion
+
+ //#region 閫夋嫨鐗╂枡鎸夐挳
+ form.on('submit(btnSearchHMater)', function () {
+ get_checkSearchHMater();
+ });
+ //#endregion
+
+ //#region 閫夋嫨宸ュ簭鎸夐挳
+ form.on('submit(btnSearchHProc)', function () {
+ get_checkSearchHProc();
});
//#endregion
@@ -458,7 +486,7 @@
"HPostSkillid": "0"
, "HPostSkillNumber": ""
, "HPostSkillName": ""
- , "HSkillLev": ""
+ , "HSkillLev": "1"
, "HTrainDate": Format(new Date(), "yyyy-MM-dd")
, "HRemark": ""
, "HSourceInterID": "0"
@@ -827,6 +855,67 @@
}
//#endregion
+ //#region 鐗╂枡閫夋嫨椤甸潰
+ function get_checkSearchHMater() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+
+ $("#HMaterID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//閮ㄩ棬鍚嶇О
+
+ table.render(option);
+ layer.closeAll();
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () { }
+ });
+ }
+ //#endregion
+
+ //#region 宸ュ簭閫夋嫨椤甸潰
+ function get_checkSearchHProc() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ュ簭琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HProcID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//閮ㄩ棬鍚嶇О
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ })
+ }
+ //#endregion
+
//#region 淇濆瓨HMaker
function set_AddNew(data) {
//鑾峰彇瀛愯〃鏁版嵁
@@ -909,6 +998,10 @@
, "HDeptName": data[0]["閮ㄩ棬鍚嶇О"]
, "HPostID": data[0]["HPostID"]
, "HPostName": data[0]["宀椾綅鍚嶇О"]
+ , "HProcID": data[0]["HProcID"]
+ , "HProcName": data[0]["宸ュ簭鍚嶇О"]
+ , "HMaterID": data[0]["HMaterID"]
+ , "HMaterName": data[0]["鐗╂枡鍚嶇О"]
, "HEmpID": data[0]["HEmpID"]
, "HEmpName": data[0]["鑱屽憳鍚嶇О"]
@@ -1271,6 +1364,19 @@
$("#HManagerEmpID").val(obj[0].HItemID);
$("#HManagerEmpName").val(obj[0].鑱屽憳鍚嶇О);
}
+
+ //鍙屽嚮杩斿洖鐗╂枡
+ function GetGyMaterial(obj) {
+ $("#HMaterID").val(obj.HItemID);//鐗╂枡id
+ $("#HMaterName").val(obj.鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+ }
+
+ //宸ュ簭
+ function GetProcessValue(obj) {
+ $("#HProcID").val(obj[0].HItemID);//宸ュ簭id
+ $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);//宸ュ簭鍚嶇О
+ }
+
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBillList.html"
index d83c396..e8db1ad 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\221\230\345\267\245\346\212\200\350\203\275\346\270\205\345\215\225/HR_EmployeeSkillBillList.html"
@@ -131,7 +131,7 @@
var HModName = "HR_EmployeeSkillBillList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["hmainid", "HEntryID", "HPostID", "HDeptID", "HPostSkillid", "HOrgID", "HEmpID", "HCheckEmpID", "HManagerEmpID"];
+ var titleData = ["hmainid", "HEntryID", "HPostID", "HDeptID", "HPostSkillid", "HOrgID", "HEmpID", "HCheckEmpID", "HManagerEmpID","HProcID", "HMaterID"];
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "2330";
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html"
index 9a7f8cf..bf99c8c 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBill.html"
@@ -73,6 +73,8 @@
</button>
</div>
</div>
+ </div>
+ <div class="layui-row">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">閮ㄩ棬</label>
<div class="layui-input-block" style="margin-left: 77px;">
@@ -83,6 +85,34 @@
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">浜у搧缂栫爜</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HMaterName" name="HMaterName" id="HMaterName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HMaterID" id="HMaterID" lay-verify="HMaterID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHMater" id="btnSearchHMater" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">瀵瑰簲宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" lay-verify="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProc" id="btnSearchHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
+ <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class="layui-inline">
@@ -91,23 +121,6 @@
<select name="HOrgID" id="HOrgID" lay-verify="HOrgID" style="background-color:#efefef4d;" readonly>
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">澶囨敞</label>
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
- </div>
- </div>
- </div>
-
- <div class="layui-row">
- <div class="layui-inline">
- <div class="layui-input-block" style="margin-left: 120px; width: 501px;">
- <input type="hidden" name="HProID" id="HProID" lay-verify="HProID" value="0">
- <input type="hidden" name="HProjectStageID" id="HProjectStageID" lay-verify="HProjectStageID" value="0">
- <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" lay-verify="HMainSourceBillType" value="">
- <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="">
</div>
</div>
</div>
@@ -355,6 +368,19 @@
});
//#endregion
+ //#region 閫夋嫨鐗╂枡鎸夐挳
+ form.on('submit(btnSearchHMater)', function () {
+ get_checkSearchHMater();
+ });
+ //#endregion
+
+ //#region 閫夋嫨宸ュ簭鎸夐挳
+ form.on('submit(btnSearchHProc)', function () {
+ get_checkSearchHProc();
+ });
+ //#endregion
+
+
//#endregion
//#region 鎿嶄綔鎸夐挳瑙﹀彂浜嬩欢
@@ -403,7 +429,7 @@
"HPostSkillid": "0"
, "HPostSkillNumber": ""
, "HPostSkillName": ""
- , "HSkillLev": ""
+ , "HSkillLev": "1"
, "HRemark": ""
, "HSourceInterID": "0"
, "HSourceEntryID": "0"
@@ -662,6 +688,67 @@
}
//#endregion
+ //#region 鐗╂枡閫夋嫨椤甸潰
+ function get_checkSearchHMater() {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "鐗╂枡鍒楄〃" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["90%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+
+
+ $("#HMaterID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
+ $("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);//閮ㄩ棬鍚嶇О
+
+ table.render(option);
+ layer.closeAll();
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () { }
+ });
+ }
+ //#endregion
+
+ //#region 宸ュ簭閫夋嫨椤甸潰
+ function get_checkSearchHProc() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '宸ュ簭琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鐢熶骇鍩虹璧勬枡/Gy_Process.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('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HProcID").val(checkStatus.data[0].HItemID);//閮ㄩ棬id
+ $("#HProcName").val(checkStatus.data[0].宸ュ簭鍚嶇О);//閮ㄩ棬鍚嶇О
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ , end: function () { }
+ })
+ }
+ //#endregion
+
//#region 淇濆瓨HMaker
function set_AddNew(data) {
//鑾峰彇瀛愯〃鏁版嵁
@@ -744,6 +831,10 @@
, "HDeptName": data[0]["閮ㄩ棬鍚嶇О"]
, "HPostID": data[0]["HPostID"]
, "HPostName": data[0]["宀椾綅鍚嶇О"]
+ , "HProcID": data[0]["HProcID"]
+ , "HProcName": data[0]["宸ュ簭鍚嶇О"]
+ , "HMaterID": data[0]["HMaterID"]
+ , "HMaterName": data[0]["鐗╂枡鍚嶇О"]
, "HRemark": data[0]["琛ㄥご澶囨敞"]
, "HMaker": data[0]["鍒跺崟浜�"]
@@ -1083,6 +1174,19 @@
$("#HPostID").val(obj[0].HItemID);//宀椾綅id
$("#HPostName").val(obj[0].宀椾綅鍚嶇О);//宀椾綅鍚嶇О
}
+
+ //鍙屽嚮杩斿洖鐗╂枡
+ function GetGyMaterial(obj) {
+ $("#HMaterID").val(obj.HItemID);//鐗╂枡id
+ $("#HMaterName").val(obj.鐗╂枡鍚嶇О);//鐗╂枡鍚嶇О
+ }
+
+ //宸ュ簭
+ function GetProcessValue(obj) {
+ $("#HProcID").val(obj[0].HItemID);//宸ュ簭id
+ $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);//宸ュ簭鍚嶇О
+ }
+
</script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html"
index 3a5e63e..d1fe79f 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\262\227\344\275\215\346\212\200\350\203\275\346\270\205\345\215\225/HR_PostSkillBillList.html"
@@ -131,7 +131,7 @@
var HModName = "HR_PostSkillBillList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["hmainid", "HEntryID", "HPostID", "HDeptID", "HPostSkillid", "HOrgID"];
+ var titleData = ["hmainid", "HEntryID", "HPostID", "HDeptID", "HPostSkillid", "HOrgID", "HProcID","HMaterID"];
//#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
var HModuleType = "2331";
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
index 1b0a674..c484ac9 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileMainEdit.html"
@@ -135,8 +135,9 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">瀵瑰簲ERP鐗╂枡
- <!--<label style="color:red"> * </label>-->
+ <label class="layui-form-label">
+ 瀵瑰簲ERP鐗╂枡
+ <!--<label style="color:red"> * </label>-->
</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="float:left;width:150px;">
@@ -275,6 +276,23 @@
<option value="鍔犲伐">鍔犲伐</option>
<option value="鍏虫満">鍏虫満</option>
<option value="寮傚父鍋滄満">寮傚父鍋滄満</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鏁伴噰鐗╃悊鍦板潃</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HMacAddress" id="HMacAddress">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏄惁涓荤敓浜ц澶�</label>
+ <div class="layui-input-block" style="margin-left: 125px;width:55%;">
+ <select name="HMainSourceFlag" lay-filter="HMainSourceFlag" id="HMainSourceFlag">
+ <option value="鍚�" selected="selected">鍚�</option>
+ <option value="鏄�">鏄�</option>
</select>
</div>
</div>
@@ -929,6 +947,8 @@
$("#HLogo").val(d.data[0].鍝佺墝);
$("#HSourceID").val(d.data[0].HSourceID);
$("#HSourceName").val(d.data[0].HSourceName);
+ $("#HMacAddress").val(d.data[0].鏁伴噰鐗╃悊鍦板潃);
+ $("#HMainSourceFlag").val(d.data[0].鏄惁涓荤敓浜ц澶�);
form.render("select");
}
});
@@ -973,7 +993,7 @@
if (data.count == 1) {
layer.msg(data.Message, { time: 1 * 10000, icon: 1 }, function () {
if (linterid == undefined) {
- $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
location.reload();
}
else {
@@ -1005,7 +1025,7 @@
if (data.count == 1) {
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
if (linterid == undefined) {
- $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
location.reload();
}
else {
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
index 21f01d1..3e8fc9a 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\347\211\271\346\211\271\347\224\263\350\257\267\345\215\225/Xs_ExceptiveCheckRequestBill.html"
@@ -430,6 +430,7 @@
$("#HMaker").val(sessionStorage["HUserName"]);
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HPlanPayDate").val(Format(new Date(), "yyyy-MM-dd"));
}
else if (OperationType == 3) { //缂栬緫
//鍔犺浇缂栬緫椤甸潰
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBillList.html"
index b87ae20..ec05869 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\260\203\344\273\267\345\215\225/Xs_SellOutChangeBillList.html"
@@ -113,6 +113,7 @@
<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>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" ><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
index 900931f..e9fd583 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBillList.html"
@@ -111,7 +111,7 @@
<!--<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" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
- <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Delete" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Audit" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-DeAudit" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
@@ -180,7 +180,40 @@
case 'set_ShowBill': set_ShowBill();
break;
//鍒犻櫎
- case 'set_DeleteBill': set_DeleteBill();
+ case 'set_DeleteBill':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Kf_EntrustInBill/DeleteKf_EntrustInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
break;
//瀹℃牳鎸夐挳
case 'btn-Audit':
--
Gitblit v1.9.1