From 10feac04d0b5e132fe66f29b095c4af8e5d48be5 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 07 二月 2025 17:32:11 +0800 Subject: [PATCH] 流程设计:跳过、容缺的允许开关、办理时跳过容缺按钮的显隐控制 --- src/components/Process/panel/PropertiesPanel.vue | 69 ++++++++++++++++++++++++++++++++-- src/views/flowable/task/myProcess/send/index.vue | 2 + 2 files changed, 67 insertions(+), 4 deletions(-) diff --git a/src/components/Process/panel/PropertiesPanel.vue b/src/components/Process/panel/PropertiesPanel.vue index 6042067..e1a171f 100644 --- a/src/components/Process/panel/PropertiesPanel.vue +++ b/src/components/Process/panel/PropertiesPanel.vue @@ -14,8 +14,8 @@ <el-button size="mini" type="primary" icon="el-icon-setting" @click="openAttributesForm(null, -1)">灞炴�ц缃�</el-button> </div> - <el-dialog :visible.sync="propertyFormModelVisible" title="灞炴�ч厤缃�" width="600px" append-to-body destroy-on-close> - <div v-for="item in canConfigPropertyList"> + <el-dialog :visible.sync="propertyFormModelVisible" title="灞炴�ч厤缃�" width="600px" @close="closeProperty" append-to-body :destroy-on-close="true" :close-on-click-modal="false"> + <div v-for="item in canConfigPropertyList" style="margin-bottom: 20px"> <div v-if="item.vueType === 'switch'"> <el-switch v-model="item.value" @@ -35,7 +35,7 @@ <!-- </el-form-item>--> <!-- </el-form>--> <template slot="footer"> - <el-button size="mini" @click="propertyFormModelVisible = false">鍏� 闂�</el-button> + <el-button size="mini" @click="closeProperty">鍏� 闂�</el-button> </template> </el-dialog> </div> @@ -56,13 +56,36 @@ return { canConfigPropertyList: [ { - name: '璇ヨ妭鐐规槸瀹℃壒鑺傜偣', + name: '鏄惁瀹℃壒鑺傜偣', value: false, vueType: 'switch', method: (name, value) => { this.propertyForm.name = name this.propertyForm.value = value this.saveAttribute() + this.resetList() + } + }, + { + name: '鏄惁鍏佽璺宠繃', + value: false, + vueType: 'switch', + method: (name, value) => { + this.propertyForm.name = name + this.propertyForm.value = value + this.saveAttribute() + this.resetList() + } + }, + { + name: '鏄惁鍏佽瀹圭己', + value: false, + vueType: 'switch', + method: (name, value) => { + this.propertyForm.name = name + this.propertyForm.value = value + this.saveAttribute() + this.resetList() } } ], // 鍙互閰嶇疆鐨勫睘鎬у垪琛� @@ -84,6 +107,44 @@ } }, methods: { + closeProperty() { + this.propertyFormModelVisible = false + this.resetList() + }, + resetList() { + this.canConfigPropertyList = [ + { + name: '鏄惁瀹℃壒鑺傜偣', + value: false, + vueType: 'switch', + method: (name, value) => { + this.propertyForm.name = name + this.propertyForm.value = value + this.saveAttribute() + } + }, + { + name: '鏄惁鍏佽璺宠繃', + value: false, + vueType: 'switch', + method: (name, value) => { + this.propertyForm.name = name + this.propertyForm.value = value + this.saveAttribute() + } + }, + { + name: '鏄惁鍏佽瀹圭己', + value: false, + vueType: 'switch', + method: (name, value) => { + this.propertyForm.name = name + this.propertyForm.value = value + this.saveAttribute() + } + } + ] + }, resetAttributesList() { this.bpmnElement = this.modelerStore.element; this.otherExtensionList = []; // 鍏朵粬鎵╁睍閰嶇疆 diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue index b3eaa13..ac1ecaa 100644 --- a/src/views/flowable/task/myProcess/send/index.vue +++ b/src/views/flowable/task/myProcess/send/index.vue @@ -19,6 +19,8 @@ <el-button size="small" type="primary" :disabled="submitLoading" v-loading="submitLoading" @click="submitForm">纭骞舵彁浜�</el-button> <el-button size="small" type="primary" disabled @click="submitForm">鍗忓悓鍔炵悊(鍔熻兘寮�鍙戜腑)</el-button> <el-button size="small" type="primary" @click="openDelegation(formDataList[0].beforeNodeName)">杞姙</el-button> + <el-button v-if="formDataObj.canJump" size="small" type="primary" @click="openDelegation()">璺宠繃</el-button> + <el-button v-if="formDataObj.canWait" size="small" type="primary" @click="openDelegation()">瀹圭己</el-button> </div> <div class="current">褰撳墠闃舵锛�<span>{{formDataObj.beforeNodeName}}</span></div> </div> -- Gitblit v1.8.0