From 6cda3b111d262444a897fe2457a60aea2c461b42 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期三, 10 五月 2023 17:27:41 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/lwc/lexCreateRepair/lexCreateRepair.js | 15 ++++++++-------
force-app/main/default/lwc/lexQISAgree/lexQISAgree.js | 4 +++-
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/lwc/lexCreateRepair/lexCreateRepair.js b/force-app/main/default/lwc/lexCreateRepair/lexCreateRepair.js
index 8a2f637..9ec0128 100644
--- a/force-app/main/default/lwc/lexCreateRepair/lexCreateRepair.js
+++ b/force-app/main/default/lwc/lexCreateRepair/lexCreateRepair.js
@@ -140,17 +140,18 @@
}
}
if ((this.oCMjudgement == '璐ㄩ噺闂' && this.nextaction == '鏃犲伩缁翠慨') ||
- (this.oCMjudgement == '璐ㄩ噺闂' && this.nextaction == '鏈夊伩缁翠慨' && this.specialfollow == '0') ||
- (this.oCMjudgement == '闈炶川閲忛棶棰�' && this.nextaction == '鏃犲伩缁翠慨' && this.specialfollow == '1') ||
- (this.oCMjudgement == '闈炶川閲忛棶棰�' && this.nextaction == '鏈夊伩缁翠慨' && this.specialfollow == '0') ||
- (this.oCMjudgement == '璐ㄩ噺闂+闈炶川閲忛棶棰�' && this.nextaction == '鏃犲伩缁翠慨' && this.specialfollow == '1') ||
- (this.oCMjudgement == '璐ㄩ噺闂+闈炶川閲忛棶棰�' && this.nextaction == '鏈夊伩缁翠慨+鏃犲伩缁翠慨' && this.specialfollow == '0') ||
- (this.oCMjudgement == '鐜拌薄鏈彂鐜�' && this.nextaction == '鏃犲伩缁翠慨' && this.specialfollow == '1') ||
- (this.oCMjudgement == '鐜拌薄鏈彂鐜�' && this.nextaction == '鏈夊伩缁翠慨' && this.specialfollow == '0')) {
+ (this.oCMjudgement == '璐ㄩ噺闂' && this.nextaction == '鏈夊伩缁翠慨' && this.specialfollow == false) ||
+ (this.oCMjudgement == '闈炶川閲忛棶棰�' && this.nextaction == '鏃犲伩缁翠慨' && this.specialfollow == true) ||
+ (this.oCMjudgement == '闈炶川閲忛棶棰�' && this.nextaction == '鏈夊伩缁翠慨' && this.specialfollow == false) ||
+ (this.oCMjudgement == '璐ㄩ噺闂+闈炶川閲忛棶棰�' && this.nextaction == '鏃犲伩缁翠慨' && this.specialfollow == true) ||
+ (this.oCMjudgement == '璐ㄩ噺闂+闈炶川閲忛棶棰�' && this.nextaction == '鏈夊伩缁翠慨+鏃犲伩缁翠慨' && this.specialfollow == false) ||
+ (this.oCMjudgement == '鐜拌薄鏈彂鐜�' && this.nextaction == '鏃犲伩缁翠慨' && this.specialfollow == true) ||
+ (this.oCMjudgement == '鐜拌薄鏈彂鐜�' && this.nextaction == '鏈夊伩缁翠慨' && this.specialfollow == false)) {
this.newflag = true;
}
console.log('this.newflag = '+this.newflag);
console.log('this.typeflag = '+this.typeflag);
+
if ( this.newflag && this.typeflag) {
if (this.isUsedForTheOpera == 'YES') {
this.UseFailProductFinish = '鏄�';
diff --git a/force-app/main/default/lwc/lexQISAgree/lexQISAgree.js b/force-app/main/default/lwc/lexQISAgree/lexQISAgree.js
index da5fd6b..1c16be7 100644
--- a/force-app/main/default/lwc/lexQISAgree/lexQISAgree.js
+++ b/force-app/main/default/lwc/lexQISAgree/lexQISAgree.js
@@ -6,6 +6,7 @@
import init from '@salesforce/apex/QISReportController.initForQisAgreeButton';
import updateQis from '@salesforce/apex/QISReportController.updateQisForQisAgree';
import UserInfo_Owner from '@salesforce/apex/TaskFeedbackController.UserInfo_Owner';
+import USER_ID from '@salesforce/user/Id';
import { updateRecord } from 'lightning/uiRecordApi';
export default class lexQISAgree extends LightningElement {
@@ -13,6 +14,7 @@
IsLoading = true;
qisReportId;
OwnerId;
+ userId = USER_ID;
err;
@wire(CurrentPageReference)
@@ -38,7 +40,7 @@
this.IsLoading = false;
this.qisReportId = result.Id;
this.OwnerId = result.ownerId;
- if (this.OwnerId != UserInfo_Owner.Id) {
+ if (this.OwnerId != this.userId) {
const evt = new ShowToastEvent({
title : '鍙湁鎵�鏈夎�呭彲浠ユ寜QIS缁撴灉璺熻繘瀹屾瘯鐨勬寜閽�',
message: '',
--
Gitblit v1.9.1