From ebc5cb37642bc43d7d98366c2e28e50a5fd84dc5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 02 二月 2024 09:16:32 +0800
Subject: [PATCH] 工作任务 增加 字段 任务状态 ，需求及问题清单内码，需求及问题清单号,工作任务里 增加 字段： 订单等级（紧急、普通、优化项目）、增加 催促次数 的字段；单据列表里 也把 这2个字段 显示出来
---
WebTM/views/项目管理/工作任务/PM_WorkTaskBillMainMy.html | 162 +++++++++++-----------
WebTM/views/项目管理/工作任务/PM_WorkTaskBillList.html | 58 ++++++-
WebTM/views/项目管理/报表分析/PM_ProjectBillMainMy.html | 1
WebTM/views/项目管理/工作任务/PM_WorkTaskBill.html | 70 +++++++++
WebTM/views/项目管理/工作任务/PM_WorkTaskReportBill.html | 122 ++++++++++++++--
5 files changed, 303 insertions(+), 110 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 ecd4f16..d3a52d4 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"
@@ -197,6 +197,23 @@
</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;">
+ <select name="HOrderLevID" id="HOrderLevID" lay-filter="HOrderLevID" style="width:120px;">
+ </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="HHasten" name="HHasten" id="HHasten" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly >
+
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHHasten" id="btnSearchHHasten" 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">
@@ -446,6 +463,10 @@
//鏂囦欢閫夋嫨鍒濆鍖�
PicUpload();
+
+ //鍒濆鍖栬鍗曠瓑绾�
+ HOrderLev();
+
}
//else if (OperationType == 2) { //澶嶅埗
// //绂佺敤缁勭粐閫夐」
@@ -463,7 +484,10 @@
// }
// });
//}
- else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //缂栬緫
+ else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ //鍒濆鍖栬鍗曠瓑绾�
+ HOrderLev();
+ //缂栬緫
////绂佺敤缁勭粐閫夐」
//$("#HOrgID").attr("disabled", true);
//鍒濆鍖栭」鐩樁娈佃〃
@@ -473,6 +497,7 @@
PicUpload();
//灞曠ず宸蹭笂浼犵殑鏂囦欢
getFileList_loaded();
+
} else if (OperationType == 4 && HProjectStageID != null) { //涓嬫帹
////绂佺敤缁勭粐閫夐」
//$("#HOrgID").attr("disabled", true);
@@ -495,13 +520,16 @@
set_WorkTaskReport();
//鏂囦欢閫夋嫨鍒濆鍖�
PicUpload();
+ //鍒濆鍖栬鍗曠瓑绾�
+ HOrderLev();
}
//#endregion
//#region 鍒濆鍖栫粍缁�
Organ();
//#endregion
-
+
+
//#endregion
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -638,6 +666,42 @@
}
})
}
+ //#endregion
+
+ //#region 鑾峰彇璁㈠崟绛夌骇
+ function HOrderLev() {
+ //鑾峰彇璁㈠崟绛夌骇
+ var Order = '';
+ $.ajax({
+ type: "get",
+ async: false,
+ url: GetWEBURL() + "/PM_WorkTaskBill/getOrder",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Order += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
+ }
+ $("#HOrderLevID ").append(Order);
+ //if (OperationType == 1) {
+ // HOrgIDBar = sessionStorage["OrganizationID"];
+ //}
+ //$("#HOrderLevID ").val(HOrgIDBar);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+ //#endregion
+
+
+ //#region 鑾峰彇鍌績娆℃暟
+ document.getElementById('btnSearchHHasten').addEventListener('click', function () {
+ var input = document.getElementById('HHasten');
+ input.value = parseInt(input.value) + 1;
+ });
+
//#endregion
//#region 鑾峰彇鍙傛暟
@@ -1063,6 +1127,8 @@
, "HCopyEmp": tableMain[0]["HCopyEmp"]
, "HRemark": tableMain[0]["HRemark"]
, "HOrgID": tableMain[0]["HOrgID"]
+ , "HOrderLevID": tableMain[0]["HOrderLevID"]
+ , "HHasten": tableMain[0]["HHasten"]
, "HMainSourceInterID": tableMain[0]["HMainSourceInterID"]
, "HMainSourceEntryID": tableMain[0]["HMainSourceEntryID"]
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_WorkTaskBillList.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_WorkTaskBillList.html"
index d8723a3..2532bda 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_WorkTaskBillList.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_WorkTaskBillList.html"
@@ -129,8 +129,8 @@
<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_ShowBill_dh"><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="btn-Begin"><i class="layui-icon layui-icon-radio"></i>寮�濮嬩换鍔�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cancel-Begin"><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>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>淇濆瓨鏂规</button>
@@ -171,7 +171,7 @@
var HModName = "PM_WorkTaskBillList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HInterID", "HProjectStageID", "HOrgID", "HEntryID", "HProjectID", "HBillStatus"];
+ var titleData = ["HInterID", "HProjectStageID", "HOrgID", "HEntryID", "HProjectID", "HBillStatus", "HOrderLevID"];
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
@@ -251,14 +251,14 @@
case 'set_ShowBill_dh':
set_ShowBill_dh();
break;
- ////绂佺敤鎸夐挳
- //case 'btn-Stop':
- // set_De_Stop(0);
- // break;
- ////鍙嶇鐢ㄦ寜閽�
- //case 'btn-DeStop':
- // set_De_Stop(1);
- // break;
+ //寮�濮嬩换鍔℃寜閽�
+ case 'btn-Begin':
+ set_Begin(0);
+ break;
+ //鎾ら攢浠诲姟鎸夐挳
+ case 'btn-Cancel-Begin':
+ set_Begin(1);
+ break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
break;
@@ -820,6 +820,42 @@
}
//#endregion
+ //#region 寮�濮嬩换鍔�/鎾ら攢寮�濮嬫暟鎹�
+ function set_Begin(num) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].HInterID.toString();
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/PM_WorkTaskBill/BeginPM_WorkTaskBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": num, "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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ }
+ }
+ //#endregion
+
//#region 澶氳涓嬫帹
function set_ShowBill_dh() {
var checkStatus = table.checkStatus('mainTable')
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_WorkTaskBillMainMy.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_WorkTaskBillMainMy.html"
index 471eac4..2aac929 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_WorkTaskBillMainMy.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_WorkTaskBillMainMy.html"
@@ -24,34 +24,34 @@
<div class="layui-col-md12">
<div class="layui-card" style="padding: 1px">
<div class="layui-card-body" style="padding: 1px;">
- <form class="layui-form" action="" lay-filter="component-form-group"
+ <form class="layui-form" action="" lay-filter="component-form-group">
<div style="padding: 10px; ">
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_LookDown" lay-filter="btn_LookDown">寮曞嚭</button>
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">棰勮</button>
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">鎵撳嵃</button>
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_report" lay-filter="btn_report">姹囨姤</button>
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_LookDown" lay-filter="btn_LookDown">寮曞嚭</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">棰勮</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_report" lay-filter="btn_report">涓嬫帹浠诲姟姹囨姤</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">閫�鍑�</button>
</div>
- <div class="layui-tab layui-tab-card" style="margin-top:20px;" lay-filter="tab-TabTest">
- <ul class="layui-tab-title">
- <li lay-id="1" class="layui-this">鏈畬鎴�</li>
- <li lay-id="2">姝ｅ湪杩涜</li>
- <li lay-id="3">宸插畬鎴�</li>
- </ul>
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <!--鏈畬鎴�-->
- <table class="layui-hide" id="mainTable_notcomplete" lay-filter="mainTable_notcomplete"></table>
- </div>
- <div class="layui-tab-item">
- <!--姝ｅ湪杩涜-->
- <table class="layui-hide" id="mainTable_proc" lay-filter="mainTable_proc"></table>
- </div>
- <div class="layui-tab-item">
- <!--宸插畬鎴�-->
- <table class="layui-hide" id="mainTable_finish" lay-filter="mainTable_finish"></table>
- </div>
- </div>
+ <div class="layui-tab layui-tab-card" style="margin-top:20px;" >
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏈畬鎴�</li>
+ <li>姝ｅ湪杩涜</li>
+ <li>宸插畬鎴�</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <!--鏈畬鎴�-->
+ <table class="layui-hide" id="mainTable_notcomplete" lay-filter="mainTable_notcomplete"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--姝ｅ湪杩涜-->
+ <table class="layui-hide" id="mainTable_proc" lay-filter="mainTable_proc"></table>
+ </div>
+ <div class="layui-tab-item">
+ <!--宸插畬鎴�-->
+ <table class="layui-hide" id="mainTable_finish" lay-filter="mainTable_finish"></table>
+ </div>
+ </div>
</div>
<script type="text/html" id="toolbarDemo">
@@ -83,8 +83,8 @@
var option_finish = ""; //宸插畬鎴�
var option_proc = ""; //姝ｅ湪杩涜
var ins;
- var TableTab = "mainTable_notcomplete"; //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滄湭瀹屾垚鈥� 椤电
- var cur_title = "鏈畬鎴�"; //褰撳墠閫変腑椤电
+ //var TableTab = "mainTable_notcomplete"; //鍒濆鍖栭〉闈㈡椂榛樿涓� 鈥滄湭瀹屾垚鈥� 椤电
+ //var cur_title = "鏈畬鎴�"; //褰撳墠閫変腑椤电
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -116,22 +116,6 @@
form.on('submit(get_Exit)', function (data) {
Pub_Close(2);
});
-
-
-
-
- //鐩戝惉褰撳墠澶勪簬鍝竴涓〉绛撅紝浼� HModName 鍊�
- element.on('tab(tab-TabTest)', function (data) {
- HMaterInfo = table.cache['mainTable'];
- cur_title = data.elem.context.innerText;
- if (cur_title == "鏈畬鎴�") {
- TableTab = "mainTable_notcomplete";
- } else if (cur_title == "宸插畬鎴�") {
- TableTab = "mainTable_finish";
- } else if (cur_title == "姝ｅ湪杩涜") {
- TableTab = "mainTable_proc";
- }
- })
//#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
@@ -275,7 +259,7 @@
var HBillType = "鎴戠殑浠诲姟";
Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
//鍒锋柊琛ㄦ牸鏁版嵁
- //DisPlay_HideColumn();
+ // DisPlay_HideColumn();
layer.close(ajaxLoad);
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
@@ -298,47 +282,53 @@
//#region 瀵煎嚭Execel
function get_Export() {
-
- table.exportFile(ins.config.id, option_notcomplete.data, "xls");
+ var data = option_notcomplete.data
+ data.forEach((item) => {
+ // 濡傛灉鏌愪釜瀛楁鐨勫�煎お闀匡紝闇�瑕佸幓闄ゆ崲琛岀
+ if (item.浠诲姟鎻忚堪.length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item.浠诲姟鎻忚堪 = item.浠诲姟鎻忚堪.replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ });
+ table.exportFile(ins.config.id, data, "xls");
}
+ //#endregion
//#region 姹囨姤
function get_report() {
- var checkStatus = table.checkStatus("mainTable_proc")
- , data = checkStatus.data;
+ var activeTab = getActiveTab();
+ if (activeTab == "鏈畬鎴�") {
+ var checkStatus = table.checkStatus('mainTable_notcomplete')
+ , data = checkStatus.data;
+ } else if (activeTab == "宸插畬鎴�") {
+ var checkStatus = table.checkStatus('mainTable_finish')
+ , data = checkStatus.data;
+ } else if (activeTab == "姝ｅ湪杩涜") {
+ var checkStatus = table.checkStatus('mainTable_proc')
+ , data = checkStatus.data;
+ }
+
+ var HInterID = data[0].HInterID;
+ var HEntryID = data[0].HEntryID;
if (data.length == 1) {
layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鏂板浜ч噺姹囨姤鍗�',
- closeBtn: 1,
- shift: 2,
- area: ['100%', '100%'],
- maxmin: true,
- content: '../../鐢熶骇绠＄悊/浜ч噺姹囨姤鍗�/Sc_Add_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
- end: function () {
-
- },
- success: function (dom, index) {
- var deliverData = [];
- deliverData.push({
- "HBillType": data[0].鍗曟嵁绫诲瀷,
- "HSourceInterID": data[0].HInterID,
- "HSourceEntryID": data[0].婧愬崟瀛愬唴鐮�,
- "HSourceBillNo": data[0].婧愬崟鍗曞彿,
- "HSourceBillType": data[0].婧愬崟绫诲瀷
- });
-
- //閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
- var iframe = window['layui-layer-iframe' + index];
- //璋冪敤iframe寮瑰嚭灞傚唴鐨勬柟娉�
- iframe.edit(deliverData);
- },
- });
- } else {
- layer.msg('璇峰湪 姝ｅ湪鐢熶骇 椤电涓�夋嫨涓�琛屾暟鎹紑宸ワ紒');
- }
+ type: 2
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['100%', '100%']
+ , title: '宸ヤ綔浠诲姟-涓嬫帹'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../../椤圭洰绠＄悊/宸ヤ綔浠诲姟/PM_WorkTaskReportBill.html?OperationType=2&linterid=' + HInterID + '&HSouceBillType='
+ , btn: ['纭畾'],
+ // 鎸夐挳1 鐨勫洖璋�
+ btn1: function (index, layero, that) {
+ //鍒锋柊椤甸潰
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺紒');
+ }
}
//#endregion
@@ -393,6 +383,20 @@
}
//#endregion
+ // 鑾峰彇鏍囩
+ function getActiveTab() {
+ var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
+ var activeTab;
+ for (var i = 0; i < tabs.length; i++) {
+ if (tabs[i].classList.contains("layui-this")) {
+ activeTab = tabs[i].innerText;
+ break;
+ }
+ }
+ return activeTab;
+
+ }
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
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_WorkTaskReportBill.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_WorkTaskReportBill.html"
index 1e879d6..951d968 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_WorkTaskReportBill.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_WorkTaskReportBill.html"
@@ -291,7 +291,8 @@
var params = getUrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
- var HProjectStageID = params[params[3]]; //闃舵鍐呯爜
+ var HEntryID = params[params[3]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
+ //var HProjectStageID = params[params[3]]; //闃舵鍐呯爜
//#endregion
@@ -326,23 +327,27 @@
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栭」鐩樁娈佃〃
get_InitGrid();
+
}
- //else if (OperationType == 2) { //澶嶅埗
- // //绂佺敤缁勭粐閫夐」
- // //$("#HOrgID").attr("disabled", true);
- // RoadBillMain(linterid);
- // $.ajax({
- // url: GetWEBURL() + "/Web/GetMAXNum",
- // type: "GET",
- // async: false,
- // data: { "HBillType": '4750' },
- // 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) { //鎴戠殑浠诲姟妯″潡涓嬫帹
+ ////绂佺敤缁勭粐閫夐」
+ //$("#HOrgID").attr("disabled", true);
+ //鐢熸垚骞惰缃富琛ㄧ殑鍐呯爜鍜屽崟鎹彿
+ createBillNo();
+ //姹囨姤浜哄垵濮嬪寲
+ getHEmpByHUserName();
+
+ //鍒濆鍖栧埗鍗曚汉鍜屽埗鍗曟椂闂�
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+ //鍒濆鍖栨棩鏈�
+ $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //鍒濆鍖栭」鐩樁娈佃〃
+ get_InitGrid();
+
+ get_Display();
+ }
else if (OperationType == 3) {//濡傛灉淇敼鍒欒蛋涓嬮潰 new //缂栬緫
////绂佺敤缁勭粐閫夐」
//$("#HOrgID").attr("disabled", true);
@@ -367,6 +372,7 @@
get_InitGrid();
//涓嬫帹-椤甸潰璁剧疆
set_WorkTaskReport();
+
}
//#endregion
@@ -590,7 +596,7 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HOrgID").append(Organization);
- if (OperationType == 1 || OperationType == 4) {
+ if (OperationType == 1 || OperationType == 4 || OperationType == 2) {
HOrgIDBar = sessionStorage["OrganizationID"];
}
$("#HOrgID").val(HOrgIDBar);
@@ -757,6 +763,7 @@
num.push(table.cache["mainTable"][i])
}
}
+
//鑾峰彇缁勭粐鏁版嵁
data.field.HPRDORGID = sessionStorage["OrganizationID"];//缁勭粐
//鑻ヤ负缂栬緫-淇濆瓨锛屽垯鏇存柊淇敼浜哄拰淇敼鏃堕棿
@@ -786,6 +793,8 @@
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
+ var datas = num;
+ UpdateState(datas);
}
else {
layer.close(index);
@@ -800,6 +809,40 @@
}
//#endregion
+
+ //寰幆瀛愯〃鏁版嵁,鏌ョ湅鏄惁瀹屾垚,瀹屾垚灏辨洿鏂扮姸鎬佷负宸茬粨鏉�
+ function UpdateState(datas) {
+ var data = datas;
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].HFinishFlag == true) {
+ var InterID = data[i].HSourceInterID;
+ var nums = 2;
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/PM_WorkTaskBill/BeginPM_WorkTaskBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "Type": nums, "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);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ }
+ }
+
//#region 缂栬緫 椤甸潰璧嬪��
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
@@ -1280,6 +1323,49 @@
}
//#endregion
+ //#region 鏌ヨ 鎴戠殑浠诲姟涓嬫帹鏌ヨ鏁版嵁
+ function get_Display() {
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ url: GetWEBURL() + '/PM_WorkTaskBill/XTList',
+ type: "GET",
+ async: false,
+ data: { "HInterID": linterid, "user": sessionStorage["HUserName"]},
+ success: function (data1) {
+ if (data1.count == 1) {
+ var rowdata = [];
+ for (var i = 0; i < data1.data.length; i++) {
+ rowdata.push(
+ {
+ "HName": data1.data[i].浠诲姟鍚嶇О
+ , "HTaskNote": data1.data[i].浠诲姟鎻忚堪
+ , "HType": data1.data[i].浠诲姟绫诲瀷
+ , "HProjectID": data1.data[i].HProjectID
+ , "HProNumber": data1.data[i].椤圭洰浠ｇ爜
+ , "HProjectStageID": data1.data[i].HProjectStageID
+ , "HProjectStageName": data1.data[i].椤圭洰闃舵
+ , "HSourceInterID": data1.data[i].HInterID
+ , "HSourceEntryID": data1.data[i].HEntryID
+ , "HSourceBillNo": data1.data[i].鍗曟嵁鍙�
+ , "HSourceBillType": data1.data[i].鍗曟嵁绫诲瀷
+ , "HRelTimes": data1.data[i].宸茶�楃敤宸ユ椂
+ });
+ }
+ option.data = rowdata;
+ table.render(option);
+ CheckedSet_tableSub();
+ form.render('select');
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+ //#endregion
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ProjectBillMainMy.html" "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ProjectBillMainMy.html"
index a55541b..bbcda7d 100644
--- "a/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ProjectBillMainMy.html"
+++ "b/WebTM/views/\351\241\271\347\233\256\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/PM_ProjectBillMainMy.html"
@@ -485,6 +485,7 @@
//#endregion
+
//#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
--
Gitblit v1.9.1