From 5d41a30f1c563522b80c3f9e21bf057dc5cc6149 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 31 八月 2023 14:18:45 +0800
Subject: [PATCH] 项目管理模块完善
---
WebTM/views/项目管理/工程项目/PM_ProjectBillList.html | 24 ++---
WebTM/views/项目管理/工程项目/PM_ProjectBill.html | 100 ++++++++++++------------
WebTM/views/项目管理/工作任务/PM_WorkTaskBill.html | 69 ++++++++++++++++-
3 files changed, 126 insertions(+), 67 deletions(-)
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
index 5b6e124..168dd88 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBill.html"
@@ -82,11 +82,11 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">椤圭洰浠ｇ爜<label style="color:red"> * </label></label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber">
- </div>
- </div>-->
+ <label class="layui-form-label" style="width: 85px;">椤圭洰浠ｇ爜<label style="color:red"> * </label></label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" lay-verify="HProNumber" name="HProNumber" id="HProNumber">
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">椤圭洰浠ｇ爜<label style="color:red"> * </label></label>
<div class="layui-input-block" style="margin-left: 77px;">
@@ -212,6 +212,16 @@
<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
<!--鍔ㄦ�佹覆鏌撶粍缁�-->
</select>
+ </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="HMainSourceInterID" id="HMainSourceInterID" lay-verify="HMainSourceInterID" value="0">
+ <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" lay-verify="HMainSourceEntryID" value="0">
+ <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" lay-verify="HMainSourceBillType" value="0">
+ <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="0">
</div>
</div>
</div>
@@ -341,6 +351,7 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ var HEntryID = params[params[3]]; //宸ョ▼椤圭洰瀛愬唴鐮�
//#endregion
@@ -396,6 +407,24 @@
//$("#HOrgID").attr("disabled", true);
//鍒濆鍖栭」鐩樁娈佃〃
RoadBillMain(linterid);
+ } else if (OperationType == 4 && HProjectStageID != null) { //涓嬫帹
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
+
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ createBillNo();
+
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栨渶缁堝畬鎴愭椂闂�
+ $("#HLastDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栨棩鏈�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+
+ //涓嬫帹-椤甸潰璁剧疆
+ set_WorkTaskReport();
}
//#endregion
@@ -870,6 +899,36 @@
}
//#endregion
+ //#region 涓嬫帹-椤甸潰璧嬪��
+ function set_WorkTaskReport() {
+ $.ajax({
+ url: GetWEBURL() + "/PM_ProjectBill/set_WorkTask",
+ type: "GET",
+ async: false,
+ data: { "HInterID": linterid, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ var tableMain = result.data;
+
+ //涓昏〃 璧嬪��
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HOrgID": tableMain[0]["HOrgID"]
+ , "HProNumber": tableMain[0]["HProNumber"]
+ , "HProName": tableMain[0]["HProName"]
+ , "HProjectStageID": tableMain[0]["HProjectStageID"]
+ , "HProjectStageName": tableMain[0]["HProjectStageName"]
+ , "HMainSourceInterID": tableMain[0]["HInterID"]
+ , "HMainSourceEntryID": tableMain[0]["HEntryID"]
+ , "HMainSourceBillNo": tableMain[0]["HBillNo"]
+ , "HMainSourceBillType": tableMain[0]["HBillType"]
+ });
+
+ //缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
+ HOrgIDBar = tableMain[0]["HOrgID"];
+ }
+ })
+ }
+ //#endregion
+
//#region 瀹℃牳
function set_CheckBill() {
layer.confirm("纭瑕佸鏍稿悧?", function (index) {
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
index 3c73ca8..bd6cf04 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBill.html"
@@ -635,41 +635,43 @@
//#endregion
//#region 瀛愯〃锛氬崟鍏冩牸缂栬緫鐩戝惉
- //table.on('edit(mainTable1)', function (obj) {
- // // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
- // var oldText = $(this).prev().text();
- // var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
- // , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
- // , field = obj.field; //寰楀埌瀛楁
- // //姝ｅ垯琛ㄨ揪寮�-鏍￠獙闈炶礋娴偣鏁�
- // var ref = /^\d+(\.\d+)?$/;
+ table.on('edit(mainTable1)', function (obj) {
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+ //姝ｅ垯琛ㄨ揪寮�-鏍￠獙闈炶礋娴偣鏁�
+ var ref = /^\d+(\.\d+)?$/;
- // switch (field) {
- // case "HRate": //鏁伴噺
- // if (!ref.test(value)) { //鑻ヨ緭鍏ュ�兼牸寮忎笉姝ｇ‘锛屽垯鍙樺洖鍘熸潵鐨勫��
- // obj.update({
- // HRate: oldText
- // });
- // layer.msg("椤圭洰鍗犳瘮锛氭暟鎹敊璇紝璇疯緭鍏ラ潪璐熷皬鏁�")
- // } else {
- // var HSumMoney = $("#HSumMoney").val();
- // if (!(ref.test(value) && ref.test(HSumMoney))) {
- // obj.update({
- // HPlanAvgMoney: ((HSumMoney * value) / 100).toFixed(8) //棰勮鍒嗛厤涓氱哗=鍚堝悓鎬婚噾棰�*椤圭洰鍗犳瘮
- // , HPlanCountMoney: (((HSumMoney * value) / 100) * 0.07).toFixed(8) //(椤圭洰鎻愭垚)棰勮鎻愭垚=棰勮鍒嗛厤涓氱哗*0.07
- // });
- // } else {
- // layer.msg("鍚堝悓鎬婚噾棰濇牸寮忓瓨鍦ㄩ棶棰橈紝鏃犳硶璁＄畻鈥滈璁″垎閰嶄笟缁┾�濅笌鈥滈璁℃彁鎴愨��");
- // obj.update({
- // HPlanAvgMoney: 0
- // , HPlanCountMoney: 0
- // });
- // }
- // }
- // break;
- // default:
- // }
- //});
+ switch (field) {
+ case "HRate": //鏁伴噺
+ if (!ref.test(value)) { //鑻ヨ緭鍏ュ�兼牸寮忎笉姝ｇ‘锛屽垯鍙樺洖鍘熸潵鐨勫��
+ obj.update({
+ HRate: oldText
+ });
+ layer.msg("椤圭洰鍗犳瘮锛氭暟鎹敊璇紝璇疯緭鍏ラ潪璐熷皬鏁�")
+ table.render(option1);
+ CheckedSet_tableSub_Emp();
+ } else {
+ var HSumMoney = $("#HSumMoney").val();
+ if ( ref.test(value) && ref.test(HSumMoney) ) {
+ obj.update({
+ HPlanAvgMoney: ((HSumMoney * value) / 100).toFixed(8) //棰勮鍒嗛厤涓氱哗=鍚堝悓鎬婚噾棰�*椤圭洰鍗犳瘮
+ , HPlanCountMoney: (((HSumMoney * value) / 100) * 0.07).toFixed(8) //(椤圭洰鎻愭垚)棰勮鎻愭垚=棰勮鍒嗛厤涓氱哗*0.07
+ });
+ } else {
+ layer.msg("鍚堝悓鎬婚噾棰濇牸寮忓瓨鍦ㄩ棶棰橈紝鏃犳硶璁＄畻鈥滈璁″垎閰嶄笟缁┾�濅笌鈥滈璁℃彁鎴愨��");
+ obj.update({
+ HPlanAvgMoney: 0
+ , HPlanCountMoney: 0
+ });
+ }
+ }
+ break;
+ default:
+ }
+ })
//#endregion
//#endregion
@@ -847,20 +849,20 @@
//#endregion
//#region 椤圭洰鎴愬憳琛細琛屽唴榧犳爣绂诲紑浜嬩欢锛氭鏌ラ」鐩垚鍛樻槸鍚﹂噸澶�
- table.on('edit(mainTable1)', function (obj) {
- if (obj.field == "HEmployeeID") {
- var num = 0;
- for (var i = 0; i < option1.data.length; i++) {
- if (obj.value == option1.data[i]["HEmployeeID"]) {
- num += 1;
- }
- if (num > 1) {
- layer.msg("椤圭洰闃舵:" + obj.value + "閲嶅!");
- return false;
- }
- }
- }
- })
+ //table.on('edit(mainTable1)', function (obj) {
+ // if (obj.field == "HEmployeeID") {
+ // var num = 0;
+ // for (var i = 0; i < option1.data.length; i++) {
+ // if (obj.value == option1.data[i]["HEmployeeID"]) {
+ // num += 1;
+ // }
+ // if (num > 1) {
+ // layer.msg("椤圭洰闃舵:" + obj.value + "閲嶅!");
+ // return false;
+ // }
+ // }
+ // }
+ //})
//#endregion
@@ -1915,7 +1917,7 @@
obj.event = "";
return false;
- }else if (event.key == "F6") {
+ }else if (event.key == "F8") {
//闃舵璐熻矗浜�
if (obj.event == "HEmpName") {
var HOrgID = $("#HOrgID").val();
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
index 195806c..c68c7a4 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillList.html"
@@ -109,7 +109,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>浣滃簾</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>鍙嶄綔搴�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ProjectReport"><i class="layui-icon layui-icon-radio"></i>涓嬫帹(闃舵姹囨姤)</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_WorkTaskReport"><i class="layui-icon layui-icon-radio"></i>涓嬫帹(浠诲姟姹囨姤)</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_WorkTask"><i class="layui-icon layui-icon-radio"></i>涓嬫帹(宸ヤ綔浠诲姟)</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>绂佺敤</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>鍙嶇鐢�</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
@@ -200,9 +200,9 @@
case 'set_ProjectReport':
set_ProjectReport();
break;
- //涓嬫帹(浠诲姟姹囨姤)
- case 'set_WorkTaskReport':
- set_WorkTaskReport();
+ //涓嬫帹(宸ヤ綔浠诲姟)
+ case 'set_WorkTask':
+ set_WorkTask();
break;
////绂佺敤鎸夐挳
//case 'btn-Stop':
@@ -736,21 +736,21 @@
}
//#endregion
- //#region 涓嬫帹(浠诲姟姹囨姤)
- function set_WorkTaskReport() {
+ //#region 涓嬫帹(宸ヤ綔浠诲姟)
+ function set_WorkTask() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- var InterID = data[0].HInterID.toString();
- var HProjectStageID = data[0].HProjectStageID;
+ var HInterID = data[0].HInterID.toString();
+ var HEntryID = data[0].HEntryID.toString();
if (checkStatus.data.length === 1) {
var InterID = data[0].HInterID.toString();
layer.open({
type: 2
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['100%', '100%']
- , title: '浠诲姟姹囨姤-涓嬫帹'
+ , title: '宸ヤ綔浠诲姟-涓嬫帹'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../../椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBill.html?OperationType=4&linterid=' + InterID + '&HSouceBillType=' + '&HProjectStageID=' + HProjectStageID
+ , content: '../../椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskBill.html?OperationType=4&linterid=' + HInterID + '&HSouceBillType=' + '&HEntryID=' + HEntryID
, btn: ['纭畾'],
// 鎸夐挳1 鐨勫洖璋�
btn1: function (index, layero, that) {
@@ -760,12 +760,10 @@
})
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
}
-
}
//#endregion
-
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
--
Gitblit v1.9.1