From 7c7c4ae64b84be1766a5ebbe3ba5ee97cba8c6da Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 04 七月 2024 16:21:41 +0800
Subject: [PATCH] ‘’
---
admin/src/views/business/approvalConfiguration.vue | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/admin/src/views/business/approvalConfiguration.vue b/admin/src/views/business/approvalConfiguration.vue
index 622d55f..eba5df1 100644
--- a/admin/src/views/business/approvalConfiguration.vue
+++ b/admin/src/views/business/approvalConfiguration.vue
@@ -32,13 +32,13 @@
<div class="content">
<div v-if="item.objIds && item.objIds.length === 1 ">
<span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}</span>
- <span v-if="item.approveType == 0"> 鎴栫</span>
- <span v-if="item.approveType == 1"> 浼氱</span>
+ <span v-if="item.approveType == 0 && item.type == '0'"> 鎴栫</span>
+ <span v-if="item.approveType == 1 && item.type == '0'"> 浼氱</span>
</div>
<div v-else-if="item.objIds && item.objIds.length > 1">
- <span>{{ item.objIds[0].name }} {{ item.objIds[0].companyName }}绛�</span>
- <span v-if="item.approveType == 0"> 鎴栫</span>
- <span v-if="item.approveType == 1"> 浼氱</span>
+ <span>{{ item.objIds[0].name }} 绛�</span>
+ <span v-if="item.approveType == 0 && item.type == '0'"> 鎴栫</span>
+ <span v-if="item.approveType == 1 && item.type == '0'"> 浼氱</span>
</div>
<div v-else>璇烽�夋嫨</div>
<i class="el-icon-arrow-right"></i>
@@ -120,7 +120,7 @@
<div class="config_data_item_reviewed_r">
<span>琚浜虹殑</span>
<el-select
- v-model="apprList[activeIndex].level"
+ v-model="apprList[activeIndex].objLevel"
placeholder="璇烽�夋嫨"
style="margin: 0 20px 0 10px"
>
@@ -163,6 +163,7 @@
<div class="config_data_submit">
<el-button
@click="onSubmit"
+ :loading="subLoading"
style="background: #435ebe"
type="primary"
>淇濆瓨閰嶇疆椤�</el-button
@@ -243,6 +244,7 @@
data () {
return {
activeType: '0',
+ subLoading: false,
apprList: [
{ remark: '瀹℃壒浜�', active: false, type: '0', objIds: [] },
{ remark: '鎶勯�佷汉', active: false, type: '1', objIds: [] }
@@ -277,7 +279,7 @@
item.active = true
if (item.objIds && item.objIds.length > 0) {
const objIds = item.objIds.map(i => {
- return i.id + '-' + i.name
+ return `${i.id}-${i.name}${i.companyName ? '-' + i.companyName : ''}`
})
this.$set(this.searchForm, 'objIds', objIds)
} else {
@@ -298,18 +300,19 @@
item.objIds = item.memberList.map(i => {
return {
id: i.id,
- name: i.name
+ name: i.name,
+ companyName: i.companyName
}
})
}
})
this.apprList = arr
+ this.flowClick(0)
+ this.$forceUpdate()
}
// console.log(res);
})
- this.flowClick(0)
- this.$forceUpdate()
},
onSubmit () {
const { apprList, activeType } = this
@@ -318,15 +321,19 @@
item.level = index + 1
if (item.objIds && item.objIds.length > 0) {
item.objIds = item.objIds.map(i => i.id).join(',')
+ } else {
+ item.objIds = ''
}
})
+ this.subLoading = true
approveTemplSave({
type: activeType,
paramList: temp
}).then(res => {
- // if (res.code === 200) {
- this.$message.success('淇濆瓨鎴愬姛')
- // }
+ this.subLoading = false
+ this.$tip.success('淇濆瓨鎴愬姛')
+ }, () => {
+ this.subLoading = false
})
},
handleDel () {
--
Gitblit v1.9.3