From 0c33f718ed1ab346aaf5fdb6d6af11e9498a75a0 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 03 七月 2025 17:21:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
manager/src/views/member/list/index.vue | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 16 deletions(-)
diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
index 3611c63..0d346e4 100644
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -52,14 +52,14 @@
<Modal v-model="descFlag" :title="descTitle" @on-ok="handleSubmitModal" width="500">
<Form ref="form" :model="form" :rules="ruleValidate" :label-width="80">
- <Input v-model="form.id" v-show="false"/>
+ <Input v-model="form.id" v-show="false" />
<FormItem label="澶村儚">
<img :src="form.face || defaultPic" class="face" />
<Button type="text" class="upload" @click="() => {
- this.picModelFlag = true;
- this.$refs.ossManage.selectImage = true;
- }">淇敼</Button>
+ this.picModelFlag = true;
+ this.$refs.ossManage.selectImage = true;
+ }">淇敼</Button>
<input type="file" style="display: none" id="file" />
</FormItem>
<FormItem label="鐢ㄦ埛鍚�" prop="name">
@@ -67,6 +67,11 @@
</FormItem>
<FormItem label="鐢ㄦ埛鏄电О" prop="name">
<Input v-model="form.nickName" style="width: 200px" />
+ </FormItem>
+ <FormItem label="鏍囩" prop="tags">
+ <Select v-model="selectTagIds" multiple filterable :loading="selectLoading" style="width:200px;">
+ <Option v-for="item in options" :key="item.id" :label="item.tagName" :value="item.id"></Option>
+ </Select>
</FormItem>
<FormItem label="鎬у埆" prop="sex">
<RadioGroup type="button" button-style="solid" v-model="form.sex">
@@ -96,7 +101,7 @@
<Modal width="1200px" v-model="picModelFlag">
<ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage" />
</Modal>
- <multipleMap ref="map" @callback="selectedRegion"/>
+ <multipleMap ref="map" @callback="selectedRegion" />
</div>
</template>
@@ -105,6 +110,7 @@
import * as API_Member from "@/api/member.js";
import ossManage from "@/views/sys/oss-manage/ossManage";
import * as RegExp from "@/libs/RegExp.js";
+import { getTags } from "@/api/tag.js";
export default {
name: "member",
@@ -114,12 +120,15 @@
},
data() {
return {
- defaultPic:require('@/assets/default.png'),
+ defaultPic: require('@/assets/default.png'),
descTitle: "", // modal鏍囬
descFlag: false, //缂栬緫鏌ョ湅妗�
loading: true, // 琛ㄥ崟鍔犺浇鐘舵��
addFlag: false, // modal鏄鹃殣鎺у埗
-
+ selectLoading: false,
+ options: [],
+ selectTagIds: [],
+ selectTags: [],
addMemberForm: {
// 娣诲姞鐢ㄦ埛琛ㄥ崟
mobile: "",
@@ -323,7 +332,7 @@
methods: {
// 鍥炶皟缁欑埗绾�
callback(val, index) {
- this.selectMember.forEach(item=>{item.___selected = false})
+ this.selectMember.forEach(item => { item.___selected = false })
this.$set(val, "___selected", !val.___selected);
console.log(val.___selected);
console.log(this.selectMember);
@@ -391,8 +400,16 @@
* 鏌ヨ鏌ョ湅浼氬憳璇︽儏
*/
getMemberInfo(id) {
+ var that = this;
API_Member.getMemberInfoData(id).then((res) => {
if (res.result) {
+ debugger
+ that.selectTags = []
+ that.selectTagIds = []
+ res.result.tags.forEach(element => {
+ that.selectTags.push(element.tagName)
+ that.selectTagIds.push(element.tagId)
+ });
this.$set(this, "form", res.result);
}
});
@@ -432,17 +449,17 @@
// 閫変腑鐨勫湴鍧�
selectedRegion(val) {
- if(val.type === 'select'){
+ if (val.type === 'select') {
const paths = val.data.map(item => item.name).join(',')
const ids = val.data.map(item => item.id).join(',')
- this.$set(this.form,'region',paths)
- this.$set(this.form,'regionId',ids)
+ this.$set(this.form, 'region', paths)
+ this.$set(this.form, 'regionId', ids)
}
- else{
- this.$set(this.form,'region',val.data.addr)
- this.$set(this.form,'regionId',val.data.addrId)
+ else {
+ this.$set(this.form, 'region', val.data.addr)
+ this.$set(this.form, 'regionId', val.data.addrId)
}
},
//鏌ョ湅浼氬憳
@@ -474,9 +491,10 @@
// 鎻愪氦淇敼鏁版嵁
handleSubmitModal() {
- const { nickName, sex, username, face, newPassword,id,regionId,region } = this.form;
+ debugger
+ const { nickName, sex, username, face, newPassword, id, regionId, region } = this.form;
let time = new Date(this.form.birthday);
- let birthday = this.form.birthday=== undefined?'':
+ let birthday = this.form.birthday === undefined ? '' :
time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate();
let submit = {
regionId,
@@ -489,6 +507,7 @@
id
};
+ submit.tags = this.selectTagIds
if (newPassword) {
submit.password = this.md5(newPassword);
}
@@ -499,9 +518,35 @@
}
});
},
+ selectTag(e) {
+ debugger
+ if (this.selectTagIds.indexOf(e.value) != -1) {
+ this.selectTagIds.splice(this.selectTagIds.indexOf(e.value), 1)
+ this.selectTags.splice(this.selectTags.indexOf(e.label), 1)
+ }
+ else {
+ this.selectTagIds.push(e.value)
+ this.selectTags.push(e.label)
+ }
+ console.log(this.selectTags);
+
+ },
+ remoteMethod(query) {
+ this.selectLoading = true;
+ var params = {
+ "tagTypeKey": "USER",
+ "pageNumber": 1,
+ "pageSize": 500
+ }
+ getTags(params).then(res => {
+ this.options = res.data;
+ this.selectLoading = false;
+ });
+ },
},
mounted() {
this.getData();
+ this.remoteMethod("")
},
};
</script>
@@ -509,9 +554,11 @@
/deep/ .ivu-table-wrapper {
width: 100%;
}
+
/deep/ .ivu-card {
width: 100%;
}
+
.face {
width: 60px;
height: 60px;
--
Gitblit v1.8.0