소스 검색

no message

linwenxin 1 년 전
부모
커밋
6375552e3f

+ 5 - 3
src/views/setting/notification/announcement/index.vue

@@ -44,6 +44,7 @@ import ImageUpload from '@/components/file-upload'
 import { required, mobileRequired, mobile } from '@/components/template/rules_verify.js'
 import { required, mobileRequired, mobile } from '@/components/template/rules_verify.js'
 import { noticeListPageV2, noticePageExport, getNoticeDetail, noticeAdd, noticeUpdate, noticeDel } from "@/api/announcement";
 import { noticeListPageV2, noticePageExport, getNoticeDetail, noticeAdd, noticeUpdate, noticeDel } from "@/api/announcement";
 import { memberListPageV2 } from "@/api/masterManagement";
 import { memberListPageV2 } from "@/api/masterManagement";
+import { getMemberList } from "@/api/member";
 import { getList as getListaa } from "@/api/merchant";
 import { getList as getListaa } from "@/api/merchant";
 export default {
 export default {
 	components: { TemplatePage, ImageUpload },
 	components: { TemplatePage, ImageUpload },
@@ -151,7 +152,7 @@ export default {
 				name: 'zj-paging-pull-down',
 				name: 'zj-paging-pull-down',
 				options: this.workerList,
 				options: this.workerList,
 				attributes: {
 				attributes: {
-					valueKey: "id",
+					valueKey: "userId",
 					labelKey: "nickName",
 					labelKey: "nickName",
 					size: 'mini',
 					size: 'mini',
 					placeholder: '请选择',
 					placeholder: '请选择',
@@ -282,7 +283,7 @@ export default {
 				},
 				},
 				render: (h, { props, onInput }) => {
 				render: (h, { props, onInput }) => {
 					var { value } = props
 					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;
 					this[key] = true;
 				})
 				})
 			} else {
 			} 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.workerList = res.data.records
 					this[key] = true;
 					this[key] = true;
 				})
 				})

+ 5 - 0
src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/basicInfo.js

@@ -22,6 +22,11 @@ export default {
             label: '客户名称',
             label: '客户名称',
             prop: 'userName',
             prop: 'userName',
             rules: this.formOptions.userName.isRules
             rules: this.formOptions.userName.isRules
+          },
+          events: {
+            input: (v) => {
+              this.orderInfo.linkName = v
+            }
           }
           }
         },
         },
         {
         {