Merge remote-tracking branch 'origin/master'

src/api/set/messageindex.ts

@@ -10,6 +10,15 @@ export const listlist = (query?: LeaveQuery): AxiosPromise => {
     data: query
   });
 };
+//获取下拉列表
+export const listuserlist = (query?: string | number): AxiosPromise => {
+  return request({
+    url: `/system/message/user/list?keyword=${query}`,
+    method: 'get'
+    // params: query
+  });
+};
+
 //获取消息管理列表
 export const listAdd = (query?: LeaveListVO): AxiosPromise => {
   return request({
@@ -22,7 +31,7 @@ export const listAdd = (query?: LeaveListVO): AxiosPromise => {
 export const listtemplate = (query?: AccountQuery): AxiosPromise => {
   return request({
     url: '/system/message/template/list',
-    method: 'post',
+    method: 'POST',
     data: query
   });
 };

src/api/set/messagetype.ts

@@ -6,6 +6,29 @@ export interface CategoryTreeVO {
   children: CategoryTreeVO[];
 }
 
+export interface optionListItem {
+  avatar: string;
+  createTime: string;
+  deptId: number;
+  deptName: string;
+  email: string;
+  loginDate: string;
+  loginIp: string;
+  nickName: string;
+  phonenumber: string;
+  postIds: string;
+  remark: string;
+  roleId: string;
+  roleIds: string;
+  roles: string;
+  sex: string;
+  status: string;
+  tenantId: string;
+  userId: number;
+  userName: string;
+  userType: string;
+}
+
 export interface AccountQuery {
   current: number;
   size: number;

src/views/set/account.vue

@@ -39,7 +39,7 @@
     >
       <el-table-column label="id" prop="id" align="center" width="150" />
       <el-table-column label="模板名称" prop="templateName" align="center" width="150" />
-      <el-table-column label="模板名称" prop="templateName" align="center" width="150" />
+      <!-- <el-table-column label="模板名称" prop="templateName" align="center" width="150" /> -->
       <el-table-column label="模版类型" prop="templateType" align="center" width="150">
         <template #default="{ row }">
           {{ row.templateType == 1 ? '公告' : '通知' }}

src/views/set/message.vue

@@ -53,8 +53,20 @@
           <el-button @click="logmess = false" :style="{ background: logmess == false ? '#FFB6C1' : '' }">{{ '指定角色' }}</el-button>
           <el-button @click="logmess = true" :style="{ background: logmess == true ? '#FFB6C1' : '' }">{{ '指定具体人' }}</el-button>
         </el-form-item>
-        <el-form-item label="发送手机号" v-show="logmess == true">
-          <el-input v-model="dataparams.sendScope" placeholder="请输入要送的手机号" />
+        <el-form-item label="手机号/名称" v-show="logmess == true">
+          <!-- <el-input v-model="dataparams.sendScope" placeholder="请输入要送的手机号" /> -->
+          <el-select
+            v-model="dataparams.sendScope"
+            multiple
+            filterable
+            remote
+            reserve-keyword
+            placeholder="请输入手机号/名称"
+            :remote-method="remoteMethod"
+            :loading="loading"
+          >
+            <el-option v-for="item in options" :key="item.userId" :label="item.nickName" :value="item.userId" />
+          </el-select>
         </el-form-item>
         <el-form-item label="发送部分" v-show="logmess == false">
           <el-select v-model="dataparams.sendScope" placeholder="请选择类型">
@@ -81,11 +93,11 @@
 </template>
 
 <script setup name="Leave" lang="ts">
-import { listlist, listAdd } from '@/api/set/messageindex';
+import { listlist, listAdd, listuserlist } from '@/api/set/messageindex';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const showSearch = ref(true);
 const queryFormRef = ref<ElFormInstance>();
-import { LeaveForm, LeaveQuery, LeaveVO, LeaveListVO } from '@/api/set/messagetype';
+import { LeaveForm, LeaveQuery, LeaveVO, LeaveListVO, optionListItem } from '@/api/set/messagetype';
 const data = reactive<PageData<LeaveForm, LeaveQuery>>({
   form: {},
   queryParams: {
@@ -116,8 +128,7 @@ const dataparams = ref<LeaveListVO>({
   sendScope: null
 });
 const rules = reactive({
-  title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
-  // msgType: [{ required: true, message: '请选择类型', trigger: 'change' }],
+  title: [{ required: false, message: '请输入标题', trigger: 'blur' }],
   content: [{ required: true, message: '请输入备注内容', trigger: 'blur' }],
   model: [{ required: true, message: '请输入 model 内容', trigger: 'blur' }]
 });
@@ -126,8 +137,6 @@ const select = ref([
   { label: '手动', value: 1 }
 ]);
 const handleQuery = () => {};
-const resetQuery = () => {};
-const formRef = ref<ElFormInstance>();
 const sendScopelist = ref([
   { label: '全部', value: 'all' },
   { label: '达人', value: 'expert' },
@@ -147,6 +156,26 @@ const cilcikgAdd = async () => {
     getlist();
   }
 };
+const options = ref<optionListItem[]>([]);
+const valuefn = ref<string | number>('');
+const loading = ref(false);
+interface ListItem {
+  value: string;
+  label: string;
+}
+const remoteMethod = (query: string) => {
+  if (query) {
+    loading.value = true;
+    setTimeout(async () => {
+      loading.value = false;
+      const res = await listuserlist(query);
+      options.value = res.data;
+    }, 200);
+  } else {
+    options.value = [];
+  }
+};
+
 onMounted(() => {
   getlist();
 });