From 196df4d4bf1941546d349cadbf343655578ec280 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期三, 13 九月 2023 15:05:56 +0800
Subject: [PATCH] sit期间修改
---
force-app/main/default/aura/taskManage/taskManageHelper.js | 182 +++++++++++++++++++++++++++++++++------------
1 files changed, 133 insertions(+), 49 deletions(-)
diff --git a/force-app/main/default/aura/taskManage/taskManageHelper.js b/force-app/main/default/aura/taskManage/taskManageHelper.js
index ce5ac00..f9d344b 100644
--- a/force-app/main/default/aura/taskManage/taskManageHelper.js
+++ b/force-app/main/default/aura/taskManage/taskManageHelper.js
@@ -64,13 +64,14 @@
{
label: "鍒涘缓鏃ユ湡",
fieldName: "taskCreateddate",
- type: "date-local",
- typeAttributes:{
- weekday: "long",
- year: "numeric",
- month: "long",
- day: "2-digit"
- },
+ type: "text",
+ // type: "date-local",
+ // typeAttributes:{
+ // weekday: "long",
+ // year: "numeric",
+ // month: "long",
+ // day: "2-digit"
+ // },
sortable: true ,
wrapText: true,
},
@@ -143,7 +144,7 @@
label: '鍚堝苟',
name: 'Merge',
title: '鍚堝苟',
- disabled: { fieldName: 'confirmButtonisDisabled'},
+ disabled: { fieldName: 'mergeConfirmButtonisDisabled'},
value: 'Merge'
},
initialWidth: 76,
@@ -195,13 +196,14 @@
{
label: "鍒涘缓鏃ユ湡",
fieldName: "taskCreateddate",
- type: "date-local",
- typeAttributes:{
- weekday: "long",
- year: "numeric",
- month: "long",
- day: "2-digit"
- },
+ type: "text",
+ // type: "date-local",
+ // typeAttributes:{
+ // weekday: "long",
+ // year: "numeric",
+ // month: "long",
+ // day: "2-digit"
+ // },
sortable: true
},
{
@@ -289,13 +291,14 @@
{
label: "鍒涘缓鏃ユ湡",
fieldName: "taskCreateddate",
- type: "date-local",
- typeAttributes:{
- weekday: "long",
- year: "numeric",
- month: "long",
- day: "2-digit"
- },
+ type: "text",
+ // type: "date-local",
+ // typeAttributes:{
+ // weekday: "long",
+ // year: "numeric",
+ // month: "long",
+ // day: "2-digit"
+ // },
sortable: true ,
wrapText: true,
},
@@ -368,7 +371,7 @@
label: '鍚堝苟',
name: 'Merge',
title: '鍚堝苟',
- disabled: { fieldName: 'confirmButtonisDisabled'},
+ disabled: { fieldName: 'mergeConfirmButtonisDisabled'},
value: 'Merge'
},
initialWidth: 76,
@@ -445,13 +448,14 @@
{
label: "鍒涘缓鏃ユ湡",
fieldName: "taskCreateddate",
- type: "date-local",
- typeAttributes:{
- weekday: "long",
- year: "numeric",
- month: "long",
- day: "2-digit"
- },
+ type: "text",
+ // type: "date-local",
+ // typeAttributes:{
+ // weekday: "long",
+ // year: "numeric",
+ // month: "long",
+ // day: "2-digit"
+ // },
sortable: true ,
wrapText: true,
},
@@ -524,7 +528,7 @@
label: '鍚堝苟',
name: 'Merge',
title: '鍚堝苟',
- disabled: { fieldName: 'confirmButtonisDisabled'},
+ disabled: { fieldName: 'mergeConfirmButtonisDisabled'},
value: 'Merge'
},
initialWidth: 76,
@@ -620,6 +624,23 @@
var state = response.getState();
if (state === "SUCCESS") {
var res = response.getReturnValue();
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ for(var rowIndex = 0 ;rowIndex<res.myTasks.length;rowIndex++){
+ if (res.myTasks[rowIndex].taskType == '鐩樼偣妫�鏌ヨ鍒�' || res.myTasks[rowIndex].taskType == '娓╂箍搴︽鏌ヨ鍒�') {
+ res.myTasks[rowIndex]['cancelButtonisDisabled'] = true ;
+ res.myTasks[rowIndex]['assignButtonisDisabled_Owner'] = true ;
+ res.myTasks[rowIndex]['mergeConfirmButtonisDisabled'] = true ;
+ }
+ };
+
+ for(var rowIndex = 0 ;rowIndex<res.subTasks.length;rowIndex++){
+ if (res.subTasks[rowIndex].taskType == '鐩樼偣妫�鏌ヨ鍒�' || res.subTasks[rowIndex].taskType == '娓╂箍搴︽鏌ヨ鍒�') {
+ res.subTasks[rowIndex]['cancelButtonisDisabled'] = true ;
+ res.subTasks[rowIndex]['assignButtonisDisabled_Owner'] = true ;
+ res.subTasks[rowIndex]['mergeConfirmButtonisDisabled'] = true ;
+ }
+ };
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
cmp.set('v.data',res.myTasks);
cmp.set('v.data2',res.subTasks);
cmp.set('v.dataCopy',res.myTasks);
@@ -738,6 +759,7 @@
//鍚庡彴鏂规硶鐨勫洖璋冨嚱鏁�
},
//20210105 CHAN-BWX3YU you end
+
// 鎺掑簭閫昏緫璁惧畾
sortBy: function(field, reverse, primer) {
var key = primer ? function(x) {
@@ -798,8 +820,17 @@
if (state === "SUCCESS") {
var res = response.getReturnValue();
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ for(var rowIndex = 0 ;rowIndex<res.myTasks.length;rowIndex++){
+ if (res.myTasks[rowIndex].taskType == '鐩樼偣妫�鏌ヨ鍒�' || res.myTasks[rowIndex].taskType == '娓╂箍搴︽鏌ヨ鍒�') {
+ res.myTasks[rowIndex]['cancelButtonisDisabled'] = true ;
+ res.myTasks[rowIndex]['assignButtonisDisabled_Owner'] = true ;
+ res.myTasks[rowIndex]['mergeConfirmButtonisDisabled'] = true ;
+ }
+ };
cmp.set('v.data',res.myTasks);
cmp.set('v.dataCopy',res.myTasks);
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
}
this.hideSpinner(cmp);
});
@@ -985,6 +1016,7 @@
Accept:function (cmp, row, action) {
cmp.set('v.ActivityDate',null);
cmp.set('v.feedbackPlanDate',null);
+ cmp.set('v.estimatedFinishDate', '');
//闄や簡璁板綍绫诲瀷涓哄叾浠�,涓斾换鍔″尯鍒嗕负涓婄骇鍒嗛厤浠诲姟鏃�,鍏朵粬閮借烦杞簨浠堕〉闈�
if('鍏朵粬'!=row.taskType){
cmp.set("v.IsEventDefault", true);
@@ -1066,6 +1098,26 @@
}
//check end
//2021-10-19 mzy 浠诲姟绠＄悊鏀瑰杽 end
+
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ // var estimatedFinishDate = cmp.get("v.estimatedFinishDate");
+ var estimatedFinishDate = new Date(cmp.get("v.estimatedFinishDate"));
+ if (row.taskType == '鐩樼偣妫�鏌ヨ鍒�' || row.taskType == '娓╂箍搴︽鏌ヨ鍒�') {
+ var estimatedFinishDate = cmp.get("v.estimatedFinishDate");
+
+ if (!estimatedFinishDate) {
+ alert('璇疯緭鍏ラ璁″畬鎴愭椂闂达紒');
+ return;
+ }
+
+ var latestFinishDate = row.latestFinishDate;
+ if (estimatedFinishDate > latestFinishDate) {
+ alert('棰勮瀹屾垚鏃堕棿涓嶈兘瓒呰繃鏈�鏅氬畬鎴愭棩('+latestFinishDate+')');
+ return;
+ }
+ }
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
+
var action = cmp.get("c.confirmOrDelay");
action.setParams({
"taskID" : row.id,
@@ -1073,12 +1125,18 @@
"delayReason" : '',
"IsGeneratePlan":IsGeneratePlan, //2021-10-20 mzy 浠诲姟绠＄悊鏀瑰杽
"ActivityDate" : activityDate, //2021-10-20 mzy 浠诲姟绠＄悊鏀瑰杽
- "feedbackPlanDate" : feedbackPlanDate
+ "feedbackPlanDate" : feedbackPlanDate,
+ "estimatedFinishDate" : estimatedFinishDate,
+ "delayReasonOther" : ''
});
//2021-10-20 mzy 浠诲姟绠＄悊鏀瑰杽 start
//闇�瑕佺敓鎴愯鍒掓墠浼氳烦杞埌浜嬩欢椤甸潰,灏嗕换鍔d甯﹀埌浜嬩欢椤甸潰
- if(IsGeneratePlan==true){
- window.open('/apex/SimpleEventRegister?taskId=' + row.id,'_blank');
+ if(IsGeneratePlan==true){
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ if (row.taskType != '鐩樼偣妫�鏌ヨ鍒�' && row.taskType != '娓╂箍搴︽鏌ヨ鍒�') {
+ window.open('/apex/SimpleEventRegister?taskId=' + row.id,'_blank');
+ }
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
}
//2021-10-20 mzy 浠诲姟绠＄悊鏀瑰杽 end
this.showSpinner(cmp);
@@ -1093,6 +1151,7 @@
rows[rowIndex]['taskStatus'] = '02 鎺ュ彈' ;
rows[rowIndex]['cancelButtonisDisabled'] = true ;
rows[rowIndex]['confirmButtonisDisabled'] = true ;
+ rows[rowIndex]['mergeConfirmButtonisDisabled'] = true ;
rows[rowIndex]['delayButtonisDisabled'] = true ;
rows[rowIndex]['assignButtonisDisabled_Owner'] = true ; //2021-10-20 mzy 浠诲姟绠＄悊鏀瑰杽
cmp.set('v.data', rows);
@@ -1137,6 +1196,7 @@
cmp.set('v.tempisFSE',row.isFSE);
cmp.set('v.delayReason', '');
cmp.set('v.delayReasonOther', '');
+ cmp.set('v.estimatedFinishDate', '');
cmp.set('v.delayIsOpen', true);
},
//纭鍙栨秷
@@ -1171,6 +1231,7 @@
rows[rowIndex]['taskStatus'] = '04 鍙栨秷' ;
rows[rowIndex]['cancelButtonisDisabled'] = true ;
rows[rowIndex]['confirmButtonisDisabled'] = true ;
+ rows[rowIndex]['mergeConfirmButtonisDisabled'] = true ;
rows[rowIndex]['delayButtonisDisabled'] = true ;
rows[rowIndex]['assignButtonisDisabled_Owner'] = true ; //2021-10-20 mzy 浠诲姟绠＄悊鏀瑰杽
cmp.set('v.data', rows);
@@ -1205,14 +1266,33 @@
if(delayReason == '鍏朵粬' && !delayReasonOther){
alert('寤舵湡鐞嗙敱(閫夐」)涓哄叾浠栨椂璇疯緭鍏ュ欢鏈熺悊鐢憋紙鍏朵粬锛夛紒');
return;
-
}
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ // var estimatedFinishDate = cmp.get("v.estimatedFinishDate");
+ var estimatedFinishDate = new Date(cmp.get("v.estimatedFinishDate"));
+ if (tempdata.taskType == '鐩樼偣妫�鏌ヨ鍒�' || tempdata.taskType == '娓╂箍搴︽鏌ヨ鍒�') {
+ var estimatedFinishDate = cmp.get("v.estimatedFinishDate");
+
+ if (!estimatedFinishDate) {
+ alert('璇疯緭鍏ュ欢鏈熻嚦鏃堕棿锛�');
+ return;
+ }
+
+ var createdAfter3Month = tempdata.createdAfter3Month;
+ if (estimatedFinishDate > createdAfter3Month) {
+ alert('寤舵湡鑷虫椂闂翠笉鑳借秴杩�('+createdAfter3Month+')');
+ return;
+ }
+ }
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
+
var action = cmp.get("c.confirmOrDelay");
action.setParams({
"taskID" : tempdata.id,
"isDelay" : true,
"delayReason" : delayReason,
"delayReasonOther" : delayReasonOther,
+ "estimatedFinishDate" : estimatedFinishDate,
});
this.showSpinner(cmp);
action.setCallback(this, function(response) {
@@ -1226,6 +1306,7 @@
rows[rowIndex]['taskStatus'] = '05 寤舵湡' ;
rows[rowIndex]['cancelButtonisDisabled'] = true ;
rows[rowIndex]['confirmButtonisDisabled'] = true ;
+ rows[rowIndex]['mergeConfirmButtonisDisabled'] = true ;
rows[rowIndex]['delayButtonisDisabled'] = true ;
rows[rowIndex]['assignButtonisDisabled_Owner'] = true ; //2021-11-11 mzy 浠诲姟绠＄悊鏀瑰杽
cmp.set('v.data', rows);
@@ -1245,9 +1326,11 @@
});
$A.enqueueAction(action);
-
- window.open('/apex/SimpleEventRegister?isDelay=true&taskId=' + tempdata.id ,'_blank');
-
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ if (tempdata.taskType != '鐩樼偣妫�鏌ヨ鍒�' && tempdata.taskType != '娓╂箍搴︽鏌ヨ鍒�') {
+ window.open('/apex/SimpleEventRegister?isDelay=true&taskId=' + tempdata.id ,'_blank');
+ }
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
},
// 纭閲嶆柊鍒嗛厤
ConfirmAssign: function(cmp, event) {
@@ -1321,6 +1404,7 @@
rows[rowIndex]['taskAssigneeName'] = res.assigneeName ;
rows[rowIndex]['cancelButtonisDisabled'] = true ;
rows[rowIndex]['confirmButtonisDisabled'] = true ;
+ rows[rowIndex]['mergeConfirmButtonisDisabled'] = true ;
rows[rowIndex]['delayButtonisDisabled'] = true ;
rows[rowIndex]['assignButtonisDisabled_Owner'] = true ;
cmp.set('v.data', rows);
@@ -1350,20 +1434,20 @@
//寮瑰嚭 閿欒鎻愮ず
showErrorToast : function(cmp) {
$A.util.removeClass(cmp.find('errorDiv'), 'slds-hide');
- window.setTimeout($A.getCallback(function() {
- $A.util.addClass(cmp.find('errorDiv'), 'slds-hide');
- }),
- 5000
- );
+ // window.setTimeout($A.getCallback(function() {
+ // $A.util.addClass(cmp.find('errorDiv'), 'slds-hide');
+ // }),
+ // 5000
+ // );
},
//寮瑰嚭 閿欒鎻愮ず 鏂囧瓧杈冨锛屾樉绀烘寔缁�10绉� - 2021-11-12 yjk
showErrorToastLongTime : function(cmp) {
$A.util.removeClass(cmp.find('errorDiv'), 'slds-hide');
- window.setTimeout($A.getCallback(function() {
- $A.util.addClass(cmp.find('errorDiv'), 'slds-hide');
- }),
- 10000
- );
+ // window.setTimeout($A.getCallback(function() {
+ // $A.util.addClass(cmp.find('errorDiv'), 'slds-hide');
+ // }),
+ // 10000
+ // );
},
// function automatic called by aura:waiting event
showSpinner: function(cmp) {
@@ -1379,7 +1463,7 @@
},
//wangweipeng 鑾峰彇url鐨勫弬鏁� 2021/09/27 start
getURLParameterValue: function() {
- var querystring = location.search.substr(1);
+ var querystring = window.location.search.substr(1);
var paramValue = {};
querystring.split("&").forEach(function(part) {
var param = part.split("=");
--
Gitblit v1.9.1