From 77be404d9d2b3fa11c7ba0890dcdf2bb0b5d6a1c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 31 十月 2024 17:14:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/approvalConfiguration.vue | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/business/approvalConfiguration.vue b/admin/src/views/business/approvalConfiguration.vue
index 09b2d8f..56f5133 100644
--- a/admin/src/views/business/approvalConfiguration.vue
+++ b/admin/src/views/business/approvalConfiguration.vue
@@ -179,7 +179,7 @@
</div>
</div>
<el-transfer filterable :title="['鏈��', '宸查��']" openAll :props="{ label: 'name', key: 'keyTemp' }"
- filter-placeholder="鎼滅储鍛樺伐" v-model="searchForm.objIds" :data="memberList" class="transfer">
+ filter-placeholder="鎼滅储鍛樺伐" v-model="searchForm.objIds" :right-default-checked="searchForm.objIdsT" :data="memberList" class="transfer">
</el-transfer>
</div>
<span slot="footer" class="dialog-footer">
@@ -197,6 +197,8 @@
import { approveTemplSave, approveTemplByType } from '@/api'
import { fetchList } from '@/api/business/company'
import { fetchList as memberListPost } from '@/api/business/member'
+import { getSystemDictData } from '@/api/other/other'
+
export default {
name: 'config',
components: {
@@ -213,7 +215,9 @@
],
activeIndex: 0,
- param: {},
+ param: {
+ objIdsT: []
+ },
searchForm: {},
isShowTransfer: false,
memberList: [],
@@ -312,8 +316,8 @@
},
// 鑾峰彇缁勭粐鏍�
- getfindCompanyTreePage() {
- fetchList()
+ getfindCompanyTreePage() {
+ fetchList(2)
.then(res => {
if (res && res.length > 0) {
res[0].fsStatus = 1
@@ -350,6 +354,9 @@
console.log(row)
this.$set(this.searchForm, 'companyId', row.id)
this.$set(this.searchForm, 'erpOrgId', row.erpId)
+ this.$set(this.searchForm, 'objIdsT', this.searchForm.objIds)
+ console.log('searchForm.objIds', this.searchForm.objIds);
+
this.getMemberList()
},
TransferSub() {
--
Gitblit v1.9.3