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/common/process/config/ApprovalNodeConfig.vue | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/views/common/process/config/ApprovalNodeConfig.vue b/src/views/common/process/config/ApprovalNodeConfig.vue
index a7d6880..2017e57 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,11 +118,9 @@
return this.$store.state.selectedNode
},
nodeProps() {
-
return this.$store.state.selectedNode.props
},
select() {
- console.log("this.config--select", this.config)
return this.config.assignedUser
},
@@ -144,29 +141,28 @@
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) {
this.selectedNode.props.groups.splice(index, 1)
},
addConditionGroup() {
- console.log("this.config", this.config)
this.config.groups.push({
})
},
selected(select, type) {
- console.log("杈撳嚭閫変腑select", this.nodeProps)
this.nodeProps.assignedUser = []
-
if (type === 'group') {
this.nodeProps.staffGroup = {}
this.nodeProps.assignedUser.push({
@@ -184,9 +180,7 @@
}
)
}
- console.log("assignedUser", this.config)
- console.log("this.config.props", this.config)
- this.orgPickerSelected.length = 0
+
},
removeOrgItem(index) {
this.select.splice(index, 1)
--
Gitblit v1.8.0