From 6a72e9e44dc7278e18d55ccd5637b81a1cb2f047 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期一, 04 三月 2024 18:16:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://highdatas.com:9000/r/foundation/designer.approve.2 into dev
---
src/views/admin/FormProcessDesign.vue | 97 ++++--------------------------------------------
1 files changed, 9 insertions(+), 88 deletions(-)
diff --git a/src/views/admin/FormProcessDesign.vue b/src/views/admin/FormProcessDesign.vue
index 59eedb1..9f326f4 100644
--- a/src/views/admin/FormProcessDesign.vue
+++ b/src/views/admin/FormProcessDesign.vue
@@ -6,7 +6,7 @@
<div class="layout-body">
<process-design ref="processDesign" v-show="activeSelect === 'processDesign'"/>
</div>
- <w-dialog :showFooter="false" v-model="validVisible" title="璁剧疆椤规鏌�">
+ <flow-dialog :showFooter="false" v-model="validVisible" title="璁剧疆椤规鏌�">
<el-result :icon="validIcon" :title="errTitle" :subTitle="validResult.desc">
<i slot="icon" style="font-size: 30px" v-if="!validResult.finished" class="el-icon-loading"></i>
<div slot="subTitle" class="err-info" v-if="validResult.errs.length > 0">
@@ -27,14 +27,14 @@
</el-form>
</template>
</el-result>
- </w-dialog>
+ </flow-dialog>
</el-container>
</template>
<script>
import LayoutHeader from './LayoutHeader'
-import {getFormDetail, createForm, updateFormDetail, createFlow, getFlowDetail} from '@/api/design'
+import {createFlow, getFlowDetail} from '@/api/design'
import ProcessDesign from '@/views/admin/layout/ProcessDesign'
@@ -105,50 +105,16 @@
},
methods: {
- convertToTreeData(data, parent,index,parentId) {
- //index浠�1寮�濮� 浠巌ndex_no=1鐨勮妭鐐瑰紑濮嬪線涓嬩竴涓釜鎵�
- const tempJson = data.find(f =>
- f.index_no === index
- )
- console.log("tempJson",tempJson);
- //瑙ｆ瀽瀛愬鎵硅妭鐐�
- parent.children = {
- "id": tempJson.id,
- "parentId": parentId,
- "name": "瀹℃壒浜�",
- "type": "APPROVAL",
- "props":
- {
- "assignedType": "ASSIGN_USER",
- "nobody": {
- "handler": "TO_PASS",
- "assignedUser": []
- },
- "refuse": {
- "type": "TO_END",
- "target": ""
- },
- "assignedUser": [{"id": tempJson.board_id||tempJson.rule_code, "name": tempJson.name,"type":tempJson.board_id!=null?"group":"staff"}],
- "approvalGroup":tempJson.board_id!=null?{"id":tempJson.board_id,"name":tempJson.name}:"",
- "staffGroup":tempJson.board_id!=null?"":{"id":tempJson.rule_code,"name":tempJson.name},
- }
- }
- //濡傛灉浼犺繃鏉ョ殑瀹℃壒鑺傜偣鏁扮粍澶т簬褰撳墠绱㈠紩 璇存槑涓嬮潰杩樻湁
- if (data.length >index) {
- let getChildren = this.convertToTreeData(data, parent.children, index+1,parent.children.id)
- parent.children=getChildren
- }
- return parent;
- },
+
loadFormInfo(formId) {
let param = {"id": formId}
+
//鑾峰彇娴佺▼璇︽儏
getFlowDetail(param).then(rsp => {
let form = rsp.data.data;
- console.log("getFlowDetail-form", form)
form.logo = ""
form.formItems = []
- form.process =this.convertToTreeData(form.steps, {
+ form.process =this.$Utils.convertToTreeData(form.steps, {
"id": form.id, "parentId": null,
"type": "ROOT",
"name": "鍙戣捣浜�",
@@ -162,7 +128,7 @@
form.templateName = form.name
form.groupId = null;
- console.log("杈撳嚭杞崲鍚庣殑form,",form)
+
this.$store.commit('loadForm', form)
}).catch(err => {
this.$message.error(err)
@@ -203,7 +169,6 @@
})
},
validateDesign() {
- console.log('000')
this.validVisible = true
this.validStep = 0
this.showValiding()
@@ -285,47 +250,6 @@
publishProcess() {
this.validateDesign()
},
- //瀹℃壒娴佹爲褰㈢粨鏋勮浆鎹负json
- dataTree(data, index, parentId) {
- let result = [];
- let names = [];
- let ruleCode = [];
- console.log("data銆嬨�嬨��",data)
- data.props.assignedUser.forEach(org => names.push(org.name));
- let ids = []
- data.props.assignedUser.forEach(org => ids.push(org.id));
- // 淇敼鐨勬椂鍊� 鏍规嵁閫変腑绫诲瀷鏄灦鏋勮繕鏄鎵圭粍 娓叉煋鏁版嵁
- if(data.props.assignedUser[0].type==='staff'){
- ids = [];
- data.props.assignedUser.forEach(org => ruleCode.push(org.id));
- }else{
- //鍒ゆ柇閫変腑鐨勬暟鎹被鍨嬫槸鏋舵瀯杩樻槸瀹℃壒缁� 濡傛灉鏄灦鏋� 灏嗗鎵圭粍娓呯┖ board_id缃负绌�
- if (data.props.staffGroup!=undefined&& Object.keys(data.props.staffGroup).length!==0) {
- ids = [];
- data.props.assignedUser.forEach(org => ruleCode.push(org.id));
- }
- }
-
- //鎻掑叆娴佺▼鏁扮粍椤�
- result.push(
- {
- name: String(names).replaceAll(',', '銆�'),
- id: data.id||'',
- parent_id: parentId||'',
- index_no: index,
- board_id: ids.length > 0 ? String(ids).replaceAll(',', '銆�') : null,
- rule_code: ruleCode.length > 0 ? String(ruleCode).replaceAll(',', '銆�') : null
- }
- ) // 鍙彇褰撳墠鑺傜偣鐨勪俊鎭紝涓嶅寘鎷� children
- console.log("result>>>",result)
- //濡傛灉涓嬮潰杩樻湁瀛愰」 缁х画寰�涓嬭鏁版嵁
- if (data.children!==undefined&&Object.keys(data.children).length !== 0) {
- let getChildren = this.dataTree(data.children, index + 1, parentId)
- result = result.concat(getChildren)
- }
-
- return result
- },
doPublish() {
this.$confirm('纭鍙戝竷鍚庢祦绋嬬珛鍗崇敓鏁堬紝鏄惁缁х画?', '鎻愮ず', {
@@ -334,17 +258,14 @@
type: 'warning'
}).then(() => {
let processNew = JSON.parse(JSON.stringify(this.setup.process));
- console.log("processNew", processNew)
//鍒ゆ柇鏉′欢鍒嗘敮
- this.conditionRecursion(processNew);
let data = {};
data.name = this.form.name;
data.id = processNew.id||''
- var i = 1;
+ let i = 1;
//杞暟鎹粨鏋�
- data.steps = this.dataTree(processNew.children, i, processNew.id);
+ data.steps = this.$Utils.dataTree(processNew.children, i, processNew.id);
let template = {data}
- console.log("鏂版暟缁勭粨鏋�-template", template);
createFlow(template).then(rsp => {
this.$message.success("鍒涘缓娴佺▼鎴愬姛")
this.$router.push("/formsPanel")
--
Gitblit v1.8.0