From ba614829f008504d2316ba0916db8f3c9af0b563 Mon Sep 17 00:00:00 2001
From: zhiyong.zhou <zhiyong.zhou@highdatas.com>
Date: 星期一, 04 三月 2024 15:07:05 +0800
Subject: [PATCH] 删除多余文件 提交
---
/dev/null | 0
src/views/common/process/nodes/Node.vue | 2
src/views/common/InsertButton.vue | 64 ++++++++++----------
src/views/admin/FormsPanel.vue | 13 ---
src/views/common/process/nodes/ApprovalNode.vue | 4
src/views/workspace/process/ProcessInstanceTabs.vue | 6 -
src/views/common/process/config/ApprovalNodeConfig.vue | 23 ++++---
src/api/design.js | 20 +-----
src/views/admin/layout/process/ProcessTree.vue | 13 ++-
9 files changed, 62 insertions(+), 83 deletions(-)
diff --git a/src/api/design.js b/src/api/design.js
index 5a8eac2..4006b98 100644
--- a/src/api/design.js
+++ b/src/api/design.js
@@ -9,6 +9,7 @@
data: param,
});
}
+//瀛楀吀
export function getDict(param) {
param.token="admin";
return request({
@@ -17,14 +18,7 @@
data: param,
});
}
-// 琛ㄥ崟鎺掑簭
-export function groupItemsSort(param) {
- return request({
- url: 'admin/form/group/sort',
- method: 'put',
- data: param,
- });
-}
+
export function createFlow(param) {
param.token="admin";
@@ -34,13 +28,7 @@
data: param,
});
}
-// 鏌ヨ琛ㄥ崟璇︽儏
-export function getFormDetail(id) {
- return request({
- url: 'admin/form/detail/' + id,
- method: 'get',
- });
-}
+
// 鏌ヨ瀹℃壒娴佽鎯�
export function getFlowDetail(param) {
param.token="admin"
@@ -50,7 +38,7 @@
data:param
});
}
-// 鏌ヨ瀹℃壒娴佽鎯�
+// 鏌ヨ瀹℃壒娴佽鎯� 涓嶅彲缂栬緫 妯悜
export function getWorkSetpsByBusinessId(param) {
param.token="admin"
param.dataname="md_position"
diff --git a/src/api/process.js b/src/api/process.js
deleted file mode 100644
index e69de29..0000000
--- a/src/api/process.js
+++ /dev/null
diff --git a/src/views/admin/FormsPanel.vue b/src/views/admin/FormsPanel.vue
index 4adf64f..9e9e0c9 100644
--- a/src/views/admin/FormsPanel.vue
+++ b/src/views/admin/FormsPanel.vue
@@ -18,7 +18,6 @@
<div style="float: right">
<el-button type="text" icon="el-icon-edit-outline" size="mini" @click="editFrom(item, groups)">缂栬緫
</el-button>
-
<el-button type="text" size="mini" @click="viewGroup(item,groups)">鏌ョ湅娴佺▼</el-button>
<el-popover placement="left" trigger="click" width="400" style="margin-left: 10px"
@@ -66,23 +65,15 @@
console.log("getEntitySet", rsp.data.data)
this.groups = rsp.data.data.entityset
console.log("this.groups", this.groups)
- //this.groups = rsp.data
}).catch(err => this.$message.error('鑾峰彇瀹℃壒娴佺▼寮傚父'))
},
newProcess(groupId) {
- // this.$store.commit("setTemplate", this.getTemplateData());
- // this.$store.commit("setIsEdit", false);
this.$router.push("/admin/design?groupId=" + groupId);
},
groupSort() {
this.groupsSort = false
- groupItemsSort(this.groups).then(rsp => {
- this.$message.success("鎺掑簭鎴愬姛")
- this.getGroups()
- }).catch(err => {
- this.getGroups()
- this.$message.error(err.response.data)
- })
+ this.$message.success("鎺掑簭鎴愬姛")
+
},
diff --git a/src/views/admin/layout/process/ProcessTree.vue b/src/views/admin/layout/process/ProcessTree.vue
index 692518c..cbd0cf5 100644
--- a/src/views/admin/layout/process/ProcessTree.vue
+++ b/src/views/admin/layout/process/ProcessTree.vue
@@ -171,7 +171,7 @@
},
getRandomId(){
console.log("tree鐢熸垚鑺傜偣id")
- return '';
+ return ' ';
//return `HighDatas_${new Date().getTime().toString().substring(5)}${Math.round(Math.random()*9000+1000)}`
},
//閫変腑涓�涓妭鐐�
@@ -181,15 +181,17 @@
},
//澶勭悊鑺傜偣鎻掑叆閫昏緫
insertNode(type, parentNode){
+ console.log("insertNode-parentNode",parentNode)
this.$refs['_root'].click()
- //缂撳瓨涓�涓嬪悗闈㈢殑鑺傜偣
let afterNode = parentNode.children
+ console.log("afterNode",afterNode)
//鎻掑叆鏂拌妭鐐�
parentNode.children = {
id: this.getRandomId(),
parentId: parentNode.id,
props: {},
- type: type,
+ type: type
+
}
switch (type){
case 'APPROVAL': this.insertApprovalNode(parentNode, afterNode); break;
@@ -213,15 +215,16 @@
if (afterNode && afterNode.id){
afterNode.parentId = parentNode.children.id
}
- this.$set(parentNode.children, 'children', afterNode)
+ this.$set(parentNode.children, 'children', Object)
+ console.log("parentNode.children",parentNode.children)
}
this.$forceUpdate()
},
insertApprovalNode(parentNode){
- console.log("tree 娣诲姞閫氳繃鑺傜偣",parentNode.children)
this.$set(parentNode.children, "name", "瀹℃壒浜�")
console.log("tree-DefaultProps.APPROVAL_PROPS)",DefaultProps.APPROVAL_PROPS)
this.$set(parentNode.children, "props", this.$deepCopy(DefaultProps.APPROVAL_PROPS))
+ console.log("parentNode.children",parentNode.children)
},
insertTaskNode(parentNode){
this.$set(parentNode.children, "name", "鍔炵悊浜�")
diff --git a/src/views/common/InsertButton.vue b/src/views/common/InsertButton.vue
index bae2a9c..6f1ca67 100644
--- a/src/views/common/InsertButton.vue
+++ b/src/views/common/InsertButton.vue
@@ -5,38 +5,38 @@
<i class="el-icon-s-check" style="color:rgb(255, 148, 62);"></i>
<span>瀹℃壒浜�</span>
</div>
-<!-- <div @click="addTaskNode">-->
-<!-- <i class="el-icon-s-check" style="color:rgb(230, 176, 57);"></i>-->
-<!-- <span>鍔炵悊浜�</span>-->
-<!-- </div>-->
-<!-- <div @click="addCcNode">-->
-<!-- <i class="el-icon-s-promotion" style="color:rgb(50, 150, 250);"></i>-->
-<!-- <span>鎶勯�佷汉</span>-->
-<!-- </div>-->
-<!-- <div @click="addConditionsNode">-->
-<!-- <i class="el-icon-share" style="color:rgb(21, 188, 131);"></i>-->
-<!-- <span>鏉′欢鍒嗘敮</span>-->
-<!-- </div>-->
-<!-- <div @click="addConcurrentsNode">-->
-<!-- <i class="el-icon-s-operation" style="color:#718dff;"></i>-->
-<!-- <span>骞惰鍒嗘敮</span>-->
-<!-- </div>-->
-<!-- <div @click="addInclusivesNode">-->
-<!-- <i class="el-icon-s-operation" style="color:#718dff;"></i>-->
-<!-- <span>鍖呭鍒嗘敮</span>-->
-<!-- </div>-->
-<!-- <div @click="addDelayNode">-->
-<!-- <i class="el-icon-time" style="color:#f25643;"></i>-->
-<!-- <span>寤惰繜绛夊緟</span>-->
-<!-- </div>-->
-<!-- <div @click="addTriggerNode">-->
-<!-- <i class="el-icon-set-up" style="color:#15BC83;"></i>-->
-<!-- <span>瑙﹀彂鍣�</span>-->
-<!-- </div>-->
-<!-- <div @click="addSubprocessNode">-->
-<!-- <i class="el-icon-set-up" style="color:#15BC93;"></i>-->
-<!-- <span>瀛愭祦绋�</span>-->
-<!-- </div>-->
+ <div @click="addTaskNode">
+ <i class="el-icon-s-check" style="color:rgb(230, 176, 57);"></i>
+ <span>鍔炵悊浜�</span>
+ </div>
+ <div @click="addCcNode">
+ <i class="el-icon-s-promotion" style="color:rgb(50, 150, 250);"></i>
+ <span>鎶勯�佷汉</span>
+ </div>
+ <div @click="addConditionsNode">
+ <i class="el-icon-share" style="color:rgb(21, 188, 131);"></i>
+ <span>鏉′欢鍒嗘敮</span>
+ </div>
+ <div @click="addConcurrentsNode">
+ <i class="el-icon-s-operation" style="color:#718dff;"></i>
+ <span>骞惰鍒嗘敮</span>
+ </div>
+ <div @click="addInclusivesNode">
+ <i class="el-icon-s-operation" style="color:#718dff;"></i>
+ <span>鍖呭鍒嗘敮</span>
+ </div>
+ <div @click="addDelayNode">
+ <i class="el-icon-time" style="color:#f25643;"></i>
+ <span>寤惰繜绛夊緟</span>
+ </div>
+ <div @click="addTriggerNode">
+ <i class="el-icon-set-up" style="color:#15BC83;"></i>
+ <span>瑙﹀彂鍣�</span>
+ </div>
+ <div @click="addSubprocessNode">
+ <i class="el-icon-set-up" style="color:#15BC93;"></i>
+ <span>瀛愭祦绋�</span>
+ </div>
</div>
<el-button icon="el-icon-plus" slot="reference" type="primary" size="small" circle></el-button>
</el-popover>
diff --git a/src/views/common/process/config/ApprovalNodeConfig.vue b/src/views/common/process/config/ApprovalNodeConfig.vue
index a7d6880..bdbae80 100644
--- a/src/views/common/process/config/ApprovalNodeConfig.vue
+++ b/src/views/common/process/config/ApprovalNodeConfig.vue
@@ -11,8 +11,8 @@
<el-form-item label="鈿� 閫夋嫨瀹℃壒缁勬垨瀹℃壒鏋舵瀯" prop="text" class="user-type">
<el-select @change="selected(this,'staff')" value-key="id" style="width: 80%;" size="small"
v-model="nodeProps.staffGroup" placeholder="璇烽�夋嫨瀹℃壒鏋舵瀯">
- <el-option v-for="staffApprovals in staffGroups" :label="staffApprovals.name" :value="staffApprovals"
- :key="staffApprovals.id"></el-option>
+ <el-option v-for="staff in staffGroups" :label="staff.name" :value="staff"
+ :key="staff.id"></el-option>
</el-select>
</el-form-item>
<el-divider></el-divider>
@@ -69,7 +69,6 @@
</div>
</template>
<script>
-//import OrgPicker from "@/components/common/OrgPicker";
import {getDict, getEntitySet} from "@/api/design";
export default {
name: "ApprovalNodeConfig",
@@ -119,7 +118,7 @@
return this.$store.state.selectedNode
},
nodeProps() {
-
+ console.log("this.$store.state.selectedNode.props",this.$store.state.selectedNode.props)
return this.$store.state.selectedNode.props
},
select() {
@@ -144,15 +143,17 @@
let template = {"code": "position_sales"}
getDict(template).then(rsp => {
this.staffGroups = this.$Utils.decode(rsp.data.data.dictionary.items)
- this.staffGroups.forEach(item => item.name = item.value);
- this.staffGroups.forEach(item => item.id = item.code);
+ this.staffGroups.forEach(item => {
+ item.name = item.value
+ item.id = item.code
+ });
+ // this.staffGroups.forEach(item => );
}).catch(err => this.$message.error('鑾峰彇瀹℃壒娴佺▼寮傚父'))
},
//濡傛灉鍒囨崲閫夌涓嶆槸鎸囧畾鑺傜偣 閭ｅ氨鎶婁箣鍓嶉�夋嫨鐨勬寚瀹氳妭鐐逛俊鎭� 缁欐竻闄ゆ帀 閬垮厤鎻愪氦涓婂幓
setValue() {
if (this.nodeProps.refuse.type !== 'TO_NODE') {
this.nodeProps.refuse.target = '';
-
}
},
delGroup(index) {
@@ -164,9 +165,9 @@
})
},
selected(select, type) {
- console.log("杈撳嚭閫変腑select", this.nodeProps)
+ debugger
+ console.log("this.config.props",this.config)
this.nodeProps.assignedUser = []
-
if (type === 'group') {
this.nodeProps.staffGroup = {}
this.nodeProps.assignedUser.push({
@@ -184,9 +185,9 @@
}
)
}
- console.log("assignedUser", this.config)
- console.log("this.config.props", this.config)
+ console.log("杈撳嚭閫変腑select", this.nodeProps)
this.orgPickerSelected.length = 0
+ this.$forceUpdate()
},
removeOrgItem(index) {
this.select.splice(index, 1)
diff --git a/src/views/common/process/nodes/ApprovalNode.vue b/src/views/common/process/nodes/ApprovalNode.vue
index 6326dd8..bddb176 100644
--- a/src/views/common/process/nodes/ApprovalNode.vue
+++ b/src/views/common/process/nodes/ApprovalNode.vue
@@ -37,13 +37,13 @@
console.log("content:config.assignedUser",config)
let texts = []
config.assignedUser.forEach(org => texts.push(org.name))
- return String(texts).replaceAll(',', '銆�')
-
+ return String(texts).replaceAll(',', '銆�')||"aaa"
},
},
created() {
console.log("鍔犺浇ApprovalNode.vue")
+ this.content
},
methods: {
getFormItemById(id){
diff --git a/src/views/common/process/nodes/Node.vue b/src/views/common/process/nodes/Node.vue
index 1247049..5bcd058 100644
--- a/src/views/common/process/nodes/Node.vue
+++ b/src/views/common/process/nodes/Node.vue
@@ -57,7 +57,7 @@
//鑺傜偣鍐呭鍖哄煙鏂囧瓧
content: {
type: String,
- default: ""
+ default: "111"
},
title:{
type: String,
diff --git a/src/views/workspace/process/ProcessInstanceTabs.vue b/src/views/workspace/process/ProcessInstanceTabs.vue
index 8502375..7a37b1b 100644
--- a/src/views/workspace/process/ProcessInstanceTabs.vue
+++ b/src/views/workspace/process/ProcessInstanceTabs.vue
@@ -17,7 +17,6 @@
return {
loading: false,
processInstanceId: "",
- taskId: "",
formData: {},
currentNode: {},
processInfo: "",
@@ -51,6 +50,7 @@
"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
@@ -60,15 +60,12 @@
getProcessInfo() {
this.loading = true;
let param = {"id": this.processInstanceId}
- //let param = {"id": "74d84fb9188f4ce4b93e95f301ebbc1b"}
- //鏍规嵁涓氬姟id鑾峰彇褰撳墠瀹℃壒娴佹楠�
getWorkSetpsByBusinessId(param).then(rsp => {
let workSetps=rsp.data.data
console.log("workSetps", workSetps)
if(workSetps.length>0){
let index=-1;
let resultProcess;
- debugger
let noApprovalArr=workSetps.filter(item=>item.end_time===null);
////濡傛灉鎵�鏈夎妭鐐归兘娌″鎵� 閭ｄ箞灏卞彇index_no=1鐨刬d涓哄綋鍓嶈繍琛岀殑鑺傜偣
if(noApprovalArr.length===workSetps.length){
@@ -149,7 +146,6 @@
},
beforeMount() {
this.processInstanceId = this.$route.query.processInstanceId;
- this.taskId = this.$route.query.taskId;
},
mounted() {
this.getProcessInfo();
--
Gitblit v1.8.0