|
@@ -44,6 +44,7 @@ import ImageUpload from '@/components/file-upload'
|
|
|
import { required, mobileRequired, mobile } from '@/components/template/rules_verify.js'
|
|
|
import { noticeListPageV2, noticePageExport, getNoticeDetail, noticeAdd, noticeUpdate, noticeDel } from "@/api/announcement";
|
|
|
import { memberListPageV2 } from "@/api/masterManagement";
|
|
|
+import { getMemberList } from "@/api/member";
|
|
|
import { getList as getListaa } from "@/api/merchant";
|
|
|
export default {
|
|
|
components: { TemplatePage, ImageUpload },
|
|
@@ -151,7 +152,7 @@ export default {
|
|
|
name: 'zj-paging-pull-down',
|
|
|
options: this.workerList,
|
|
|
attributes: {
|
|
|
- valueKey: "id",
|
|
|
+ valueKey: "userId",
|
|
|
labelKey: "nickName",
|
|
|
size: 'mini',
|
|
|
placeholder: '请选择',
|
|
@@ -282,7 +283,7 @@ export default {
|
|
|
},
|
|
|
render: (h, { props, onInput }) => {
|
|
|
var { value } = props
|
|
|
- return <div>{this.workerList.filter(item => !!~value.indexOf(item.id)).map(item => <el-tag style="margin-right:5px">{item.nickName}</el-tag>)}</div>
|
|
|
+ return <div>{this.workerList.filter(item => !!~value.indexOf(item.userId)).map(item => <el-tag style="margin-right:5px">{item.nickName}</el-tag>)}</div>
|
|
|
},
|
|
|
}]
|
|
|
}
|
|
@@ -376,7 +377,8 @@ export default {
|
|
|
this[key] = true;
|
|
|
})
|
|
|
} else {
|
|
|
- memberListPageV2({ "pageNum": 1, "pageSize": -1, "params": [] }).then(res => {
|
|
|
+ getMemberList({"pageNum": 1, "pageSize": -1, type:"WORKER"} ).then(res=>{
|
|
|
+ console.log(res.data.records)
|
|
|
this.workerList = res.data.records
|
|
|
this[key] = true;
|
|
|
})
|