From 9e18636bed4fc3fceec08ca25d6c7916d4d9a429 Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 25 十二月 2024 17:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/actions/base/StartWorkflowAction.js | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/components/actions/base/StartWorkflowAction.js b/Source/plt-web/plt-web-ui/src/components/actions/base/StartWorkflowAction.js
index ddb084d..c75adb8 100644
--- a/Source/plt-web/plt-web-ui/src/components/actions/base/StartWorkflowAction.js
+++ b/Source/plt-web/plt-web-ui/src/components/actions/base/StartWorkflowAction.js
@@ -8,40 +8,41 @@
export const doAction = (options,callback) => {
- //modelName 娴佺▼鍚嶇О 榛樿涓� 褰撳墠鐢ㄦ埛+'鍚姩娴佺▼'+褰撳墠鍒嗙被
//multi 鏄惁寮�鍚閫�
//checknotprocess 鏄惁鍏佽鍙戣捣娴佺▼
+ //templateType 娴佺▼妯℃澘type 蹇呭～
+ //filterTemplate 娴佺▼杩囨护妯℃澘淇℃伅
options.sourceData = options.sourceData || {};
options.dataStore = options.dataStore || [];
- // if (!options.dataStore || options.dataStore.length < 1) {
- // Vue.prototype.$message.error("璇烽�夋嫨闇�瑕佸彂璧锋祦绋嬬殑鏁版嵁");
- // return false;
- // }
- // if (!options.paramVOS.multi && options.dataStore.length > 1) {
- // Vue.prototype.$message.error("浠呰兘閫夋嫨涓�鏉℃暟鎹彂璧锋祦绋�");
- // return false;
- // }
- //
- // //楠岃瘉涓嶅厑璁稿惎鍔ㄧ殑鏉′欢
- // if(!validatenull(options.paramVOS.checknotprocess)) {
- // let notprocess = options.paramVOS.checknotprocess.split('&');
- // let checknotprocess=false;
- // notprocess.forEach((item,i)=>{
- // if (options.dataStore[0][item.split('=')[0]] == item.split('=')[1]) {
- // checknotprocess=true;
- // return false;
- // }
- // })
- // if (checknotprocess) {
- // Vue.prototype.$message.error(replaceFreeMarker(options.paramVOS.checknotprocessmsg,options.dataStore,{}) || "褰撳墠鏁版嵁涓嶅厑璁稿彂璧锋祦绋�");
- // return false;
- // }
- // }
+ if (!options.dataStore || options.dataStore.length < 1) {
+ Vue.prototype.$message.error("璇烽�夋嫨闇�瑕佸彂璧锋祦绋嬬殑鏁版嵁");
+ return false;
+ }
+ if (!options.paramVOS.multi && options.dataStore.length > 1) {
+ Vue.prototype.$message.error("浠呰兘閫夋嫨涓�鏉℃暟鎹彂璧锋祦绋�");
+ return false;
+ }
+
+ //楠岃瘉涓嶅厑璁稿惎鍔ㄧ殑鏉′欢
+ if(!validatenull(options.paramVOS.checknotprocess)) {
+ let notprocess = options.paramVOS.checknotprocess.split('&');
+ let checknotprocess=false;
+ notprocess.forEach((item,i)=>{
+ if (options.dataStore[0][item.split('=')[0]] == item.split('=')[1]) {
+ checknotprocess=true;
+ return false;
+ }
+ })
+ if (checknotprocess) {
+ Vue.prototype.$message.error(replaceFreeMarker(options.paramVOS.checknotprocessmsg,options.dataStore,{}) || "褰撳墠鏁版嵁涓嶅厑璁稿彂璧锋祦绋�");
+ return false;
+ }
+ }
callPreEvent(options, doBefore, function (options) {
showStartWindow(options, function () {
- callPostEvent(options, doAfter, callback,type);
+ callPostEvent(options, doAfter, callback,'startwork');
});
});
};
--
Gitblit v1.9.3