From b1740c80205d9584738b1150f4122784c70bbe57 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 四月 2025 14:55:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/OperaMemberWindow.vue | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/admin/src/components/business/OperaMemberWindow.vue b/admin/src/components/business/OperaMemberWindow.vue
index 2cc8ad5..d5ee026 100644
--- a/admin/src/components/business/OperaMemberWindow.vue
+++ b/admin/src/components/business/OperaMemberWindow.vue
@@ -7,12 +7,21 @@
<el-form-item label="鎵�灞炵粍缁�" prop="companyId">
<!-- <el-cascader v-model="form.company" :options="department" @change="handleChangeCompany" :show-all-levels="false"
clearable filterable :props="departprops"></el-cascader>-->
- <el-select v-model="form.companyId" clearable filterable placeholder="璇烽�夋嫨">
- <template v-for="item in companyList">
- <el-option v-if="item.countNum && item.countNum>0" :key="item.id" :label="item.companyNamePath" :value="item.id">
- </el-option>
- </template>
- </el-select>
+<!-- <el-select v-model="form.companyId" clearable filterable placeholder="璇烽�夋嫨">-->
+<!-- <template v-for="item in companyList">-->
+<!-- <el-option :key="item.id" :label="item.companyNamePath" :value="item.id">-->
+<!-- </el-option>-->
+<!-- </template>-->
+<!-- </el-select>-->
+ <treeselect
+ v-model="form.companyId"
+ placeholder="璇烽�夋嫨"
+ :options="treeData"
+ :normalizer="normalizeOptions"
+ :default-expand-level="1"
+ noChildrenText="娌℃湁瀛愰�夐」"
+ noOptionsText="娌℃湁鍙�夐」"
+ noResultsText="娌℃湁鍖归厤鐨勭粨鏋�" />
<div style="font-size: 12px;color: #F56C6C">
娉細浠呮敮鎸侀�夋嫨 銆恵{ companyType === 0 ? '鐩稿叧鏂圭粍缁�' : '鍐呴儴缁勭粐' }}銆�
</div>
@@ -152,6 +161,7 @@
positionId: null,
faceImgFull: ''
},
+ treeData: [],
// 楠岃瘉瑙勫垯
rules: {
name: [{ required: true, message: '璇疯緭鍏ュ憳宸ュ鍚�', trigger: 'blur' }],
@@ -169,6 +179,21 @@
})
},
methods: {
+ // 瑙勮寖鍖栭�夐」鏁版嵁鐨勬柟娉�
+ normalizeOptions(node) {
+ // node: 鍘熷鐨勯�夐」鏁版嵁
+ // 鍦ㄨ繖閲屾牴鎹渶瑕佽繘琛岄�夐」鏁版嵁鐨勮鑼冨寲鎿嶄綔锛屽苟杩斿洖瑙勮寖鍖栧悗鐨勯�夐」鏁版嵁
+ // 渚嬪锛屽彲浠ュ皢鍘熷鐨勯�夐」鏁版嵁杞崲涓虹鍚堟彃浠惰姹傜殑缁撴瀯
+ if (node.childList && !node.childList.length) {
+ // 鍘绘帀children=[]鐨刢hildren灞炴��
+ delete node.childList;
+ }
+ return {
+ id: node.id,
+ label: node.name,
+ children: node.childList,
+ };
+ },
getCompany() {
companyGetList({
model: {type:this.companyType } ,
--
Gitblit v1.9.3