消息列表喝模板列表

src/api/set/messageindex.ts

@@ -19,7 +19,7 @@ export const listuserlist = (query?: string | number): AxiosPromise => {
   });
 };
 
-//获取消息管理列表
+//发送消息
 export const listAdd = (query?: LeaveListVO): AxiosPromise => {
   return request({
     url: '/system/message/send',
@@ -43,3 +43,10 @@ export const templateAdd = (query?: paramsaccountOV): AxiosPromise => {
     data: query
   });
 };
+//下拉搜索获取模板
+export const templateSelect = (query?: string): AxiosPromise => {
+  return request({
+    url: `/system/message/template/listByName?name=${query}`,
+    method: 'get'
+  });
+};

src/api/set/messagetype.ts

@@ -45,8 +45,11 @@ export interface LeaveQuery {
    * 每页页数
    */;
   size?: number;
-  startLeaveDays: string;
+  title?: string;
-  endLeaveDays: string;
+  content?: string;
+  sendTime?: string;
+  recipient?: string;
+  type?: string;
 }
 export interface LeaveForm {}
 
@@ -63,10 +66,9 @@ export interface LeaveVO {
 }
 
 export interface LeaveListVO {
-  content: string;
-  title: string;
-  // msgType: string;
   sendScope: number | string;
+  templateId: string;
+  logmess: number;
 }
 export interface AccountOV {
   id: string | number;

src/router/index.ts

@@ -278,7 +278,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [
         path: 'account',
         component: () => import('@/views/set/account.vue'),
         name: 'account',
-        meta: { title: '账号管理', icon: 'dashboard', affix: true }
+        meta: { title: '消息模板', icon: 'dashboard', affix: true }
       }
     ]
   }

src/views/set/account.vue

@@ -6,9 +6,9 @@
           <el-form-item label="模板名称" prop="phone">
             <el-input v-model="queryParams.templateName" placeholder="请输入模板名称" clearable @keyup.enter="handleQuery" />
           </el-form-item>
-          <el-form-item label="模板编号" prop="phone">
+          <!-- <el-form-item label="模板编号" prop="phone">
             <el-input v-model="queryParams.templatecode" placeholder="请输入模板编码" clearable @keyup.enter="handleQuery" />
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="类型" prop="phone">
             <el-select v-model="queryParams.templateType" placeholder="请选择类型">
               <el-option label="通知" value="0" />
@@ -26,7 +26,7 @@
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-        <el-button type="primary" @click="showRefuteDialog = true">新增</el-button>
+        <el-button type="primary" @click="showRefuteDialog = true">创建模板</el-button>
       </div>
     </transition>
     <el-table
@@ -37,7 +37,7 @@
       :default-expand-all="isExpandAll"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
-      <el-table-column label="id" prop="id" align="center" width="150" />
+      <el-table-column label="id" prop="id" align="center" width="180" />
       <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">
@@ -52,9 +52,6 @@
       </el-table-column>
       <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <!-- <el-tooltip content="审核" placement="top">
-            <el-button link type="primary" @click="handleAdd(scope.row)" v-hasPermi="['workflow:video:add']">审核</el-button>
-          </el-tooltip>-->
           <el-tooltip content="删除" placement="top">
             <el-button link type="primary" v-hasPermi="['workflow:video:remove']">删除</el-button>
           </el-tooltip>
@@ -64,7 +61,7 @@
     <div class="block">
       <pagination v-if="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getlist" />
     </div>
-    <el-dialog v-model="showRefuteDialog" title="消息发送">
+    <el-dialog v-model="showRefuteDialog" title="创建消息模板">
       <el-form :model="dataparams" :rules="rules">
         <el-form-item label="模板类型">
           <el-select v-model="dataparams.templateType" placeholder="请选择类型">
@@ -72,9 +69,6 @@
             <el-option label="公告" value="1" />
           </el-select>
         </el-form-item>
-        <el-form-item label="模板编码">
-          <el-input v-model="dataparams.templateCode" placeholder="模板编码" />
-        </el-form-item>
         <el-form-item label="模板名称">
           <el-input v-model="dataparams.templateName" placeholder="模板名称" />
         </el-form-item>
@@ -82,13 +76,12 @@
           <el-input v-model="dataparams.title" placeholder="模板标题" />
         </el-form-item>
         <el-form-item label="模板内容">
-          <el-input v-model="dataparams.templateContent" placeholder="模板内容" />
+          <el-input v-model="dataparams.templateContent" placeholder="模板内容" type="textarea" :autosize="{ minRows: 4, maxRows: 8 }" />
         </el-form-item>
       </el-form>
       <template #footer>
         <span class="dialog-footer">
-          <!-- <el-button @click="showRefuteDialog = false">取消</el-button> -->
+          <el-button type="primary" @click="cilcikgAdd">创建</el-button>
-          <el-button type="primary" @click="cilcikgAdd">发送</el-button>
         </span>
       </template>
     </el-dialog>

src/views/set/message.vue

@@ -3,6 +3,25 @@
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="search">
         <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+          <el-form-item label="消息标题">
+            <el-input v-model="queryParams.title" placeholder="请输入消息标题" />
+          </el-form-item>
+          <el-form-item label="发送内容">
+            <el-input v-model="queryParams.content" placeholder="请输入发送内容" />
+          </el-form-item>
+          <el-form-item label="发送时间">
+            <el-date-picker v-model="queryParams.sendTime" type="date" placeholder="选择发送时间" />
+          </el-form-item>
+          <el-form-item label="发送对象">
+            <el-input v-model="queryParams.recipient" placeholder="请输入发送对象" />
+          </el-form-item>
+          <el-form-item label="发送类型">
+            <el-select v-model="queryParams.type" placeholder="请选择发送类型">
+              <!-- 这里需要根据实际的发送类型选项添加 el-option -->
+              <el-option label="类型1" value="1" />
+              <el-option label="类型2" value="2" />
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <!-- <el-button icon="Refresh" @click="resetQuery">重置</el-button> -->
@@ -19,12 +38,12 @@
       :default-expand-all="isExpandAll"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
-      <el-table-column label="id" prop="id" align="center" width="150" />
+      <el-table-column label="id" prop="id" align="center" width="180" />
       <el-table-column label="发送者ID" prop="senderId" align="center" width="150" />
       <el-table-column label="标题" prop="title" align="center" width="150" />
       <el-table-column label="内容" prop="content" align="center" width="150" />
-      <el-table-column label="创建时间" prop="createTime" align="center" width="250" />
+      <el-table-column label="创建时间" prop="createTime" align="center" width="200" />
-      <el-table-column label="定时发送时间" prop="scheduledTime" align="center" width="250" />
+      <el-table-column label="定时发送时间" prop="scheduledTime" align="center" width="200" />
       <el-table-column label="消息类型" prop="title" align="center" width="150">
         <template #default="{ row }">
           {{ row.msgType == 1 ? '手动' : '自动' }}
@@ -32,11 +51,8 @@
       </el-table-column>
       <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <!-- <el-tooltip content="审核" placement="top">
+          <el-tooltip content="撤回" placement="top">
-            <el-button link type="primary" @click="handleAdd(scope.row)" v-hasPermi="['workflow:video:add']">审核</el-button>
+            <el-button link type="primary" v-hasPermi="['workflow:video:remove']">撤回</el-button>
-          </el-tooltip>-->
-          <el-tooltip content="删除" placement="top">
-            <el-button link type="primary" v-hasPermi="['workflow:video:remove']">删除</el-button>
           </el-tooltip>
         </template>
       </el-table-column>
@@ -44,17 +60,28 @@
     <div class="block">
       <pagination v-if="total > 0" :total="total" v-model:page="queryParams.current" v-model:limit="queryParams.size" @pagination="getlist" />
     </div>
-    <el-dialog v-model="showRefuteDialog" title="消息发送">
+    <el-dialog v-model="showRefuteDialog" title="消息发送" @close="clearFormData">
       <el-form :model="dataparams" :rules="rules">
-        <el-form-item label="标题">
+        <el-form-item label="模板名称">
-          <el-input v-model="dataparams.title" placeholder="请输入标题" />
+          <!-- <el-input v-model="dataparams.title" placeholder="请输入标题" /> -->
+          <el-select
+            v-model="dataparams.templateId"
+            filterable
+            remote
+            reserve-keyword
+            placeholder="请输入模板名称"
+            :remote-method="idMethod"
+            :loading="idloading"
+          >
+            <el-option v-for="item in idoptions" :key="item.id" :label="item.templateName" :value="item.id" />
+          </el-select>
         </el-form-item>
         <el-form-item label="指定">
-          <el-button @click="logmess = false" :style="{ background: logmess == false ? '#FFB6C1' : '' }">{{ '指定角色' }}</el-button>
+          <el-button @click="dataparams.logmess = 1" :style="{ background: dataparams.logmess == 1 ? '#FFB6C1' : '' }">{{ '指定角色' }}</el-button>
-          <el-button @click="logmess = true" :style="{ background: logmess == true ? '#FFB6C1' : '' }">{{ '指定具体人' }}</el-button>
+          <el-button @click="dataparams.logmess = 2" :style="{ background: dataparams.logmess == 2 ? '#FFB6C1' : '' }">{{ '指定用户' }}</el-button>
+          <!-- <el-button @click="dataparams.logmess = 3" :style="{ background: dataparams.logmess == 3 ? '#FFB6C1' : '' }">{{ '指定群' }}</el-button> -->
         </el-form-item>
-        <el-form-item label="手机号/名称" v-show="logmess == true">
+        <el-form-item label="手机号/名称" v-show="dataparams.logmess == 2">
-          <!-- <el-input v-model="dataparams.sendScope" placeholder="请输入要送的手机号" /> -->
           <el-select
             v-model="dataparams.sendScope"
             multiple
@@ -64,23 +91,29 @@
             placeholder="请输入手机号/名称"
             :remote-method="remoteMethod"
             :loading="loading"
+          >
+            <el-option v-for="item in options" :key="item.userId" :label="item.nickName" :value="item.userName" />
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="群名称" v-show="dataparams.logmess == 3">
+          <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> -->
-        <el-form-item label="发送部分" v-show="logmess == false">
+        <el-form-item label="指定角色" v-show="dataparams.logmess == 1">
-          <el-select v-model="dataparams.sendScope" placeholder="请选择类型">
+          <el-select v-model="dataparams.sendScope" placeholder="请选择角色">
             <el-option v-for="(item, index) in sendScopelist" :label="item.label" :value="item.value" :key="index" />
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="类型">
-          <el-select v-model="dataparams.msgType" placeholder="请选择类型">
-            <el-option v-for="(item, index) in select" :label="item.label" :value="item.value" :key="index" />
-          </el-select>
-        </el-form-item> -->
-        <el-form-item label="内容">
-          <Editor v-model="dataparams.content" placeholder="请输入内容" type="url"></Editor>
-        </el-form-item>
       </el-form>
       <template #footer>
         <span class="dialog-footer">
@@ -93,18 +126,21 @@
 </template>
 
 <script setup name="Leave" lang="ts">
-import { listlist, listAdd, listuserlist } from '@/api/set/messageindex';
+import { listlist, listAdd, listuserlist, listtemplate, templateSelect } from '@/api/set/messageindex';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const showSearch = ref(true);
 const queryFormRef = ref<ElFormInstance>();
-import { LeaveForm, LeaveQuery, LeaveVO, LeaveListVO, optionListItem } from '@/api/set/messagetype';
+import { LeaveForm, LeaveQuery, LeaveVO, LeaveListVO, optionListItem, AccountOV } from '@/api/set/messagetype';
 const data = reactive<PageData<LeaveForm, LeaveQuery>>({
   form: {},
   queryParams: {
     current: 1,
     size: 10,
-    startLeaveDays: undefined,
+    title: null,
-    endLeaveDays: undefined
+    content: null,
+    sendTime: null,
+    recipient: null,
+    type: null
   },
   rules: {}
 });
@@ -113,7 +149,6 @@ const { queryParams } = toRefs(data);
 const messList = ref<LeaveVO[]>([]);
 const total = ref(0);
 const showRefuteDialog = ref<boolean>(false);
-const logmess = ref<boolean>(false);
 const getlist = async () => {
   const res = await listlist(queryParams.value);
   console.log(res);
@@ -123,14 +158,13 @@ const getlist = async () => {
   }
 };
 const dataparams = ref<LeaveListVO>({
-  content: null,
+  sendScope: null,
-  title: null,
+  templateId: null,
-  sendScope: null
+  logmess: 1 // 1:角色 2:用户  3:群聊
 });
 const rules = reactive({
-  title: [{ required: false, message: '请输入标题', trigger: 'blur' }],
+  id: [{ required: false, message: '请输入', trigger: 'blur' }],
-  content: [{ required: true, message: '请输入备注内容', trigger: 'blur' }],
+  sendScope: [{ required: true, message: '请输入内容', trigger: 'blur' }]
-  model: [{ required: true, message: '请输入 model 内容', trigger: 'blur' }]
 });
 const select = ref([
   { label: '自动', value: 0 },
@@ -147,15 +181,22 @@ const sendScopelist = ref([
 const cilcikgAdd = async () => {
   const res = await listAdd(dataparams.value);
   if (res.code == 200) {
-    // dataparams.value = {
+    dataparams.value = {
-    //   content: undefined,
+      sendScope: null,
-    //   title: undefined,
+      templateId: null,
-    //   msgType: undefined,
+      logmess: 1 // 1:角色 2:用户  3:群聊
-    // }
+    };
     showRefuteDialog.value = false;
     getlist();
   }
 };
+const clearFormData = () => {
+  dataparams.value = {
+    sendScope: null,
+    templateId: null,
+    logmess: 1 // 1:角色 2:用户  3:群聊
+  };
+};
 const options = ref<optionListItem[]>([]);
 const valuefn = ref<string | number>('');
 const loading = ref(false);
@@ -175,8 +216,39 @@ const remoteMethod = (query: string) => {
     options.value = [];
   }
 };
+//查询模板
+const idloading = ref(false);
+interface ListItemoptions {
+  id: string | number;
+  status: string;
+  templateContent: string;
+  templateName: string;
+  templateType: string;
+}
+const idoptions = ref<ListItemoptions[]>([]);
+const idMethod = (query: string) => {
+  if (query) {
+    idloading.value = true;
+    setTimeout(async () => {
+      idloading.value = false;
+      const res = await templateSelect(query);
+      idoptions.value = res.data;
+    }, 200);
+  } else {
+    idoptions.value = [];
+  }
+};
 
+// const monge = ref<AccountOV[]>([]);
+// const getaccountlist = async () => {
+//   const res = await listtemplate();
+//   console.log(res);
+//   if (res.code == 200) {
+//     monge.value = res.data.records;
+//   }
+// };
 onMounted(() => {
   getlist();
+  // getaccountlist();
 });
 </script>