Merge branch 'master' of http://192.168.1.222:3000/miaofuhao/kaifengHospital

CMS1.0/src/store/commonSelect/common.js

@@ -2,6 +2,7 @@ import { getPageListData } from '@/api/main/system/system'
 import { addDateRange } from '@/utils/ruoyi'
 const useSelectStore = defineStore('common', {
     state: () => ({
+        templateListData:[],
         userListData: [],
         deptListData: [],
         orderTypeTree: [],
@@ -21,6 +22,8 @@ const useSelectStore = defineStore('common', {
     }),
     actions: {
         async getSelectData(payload) {
+            const templateResult = await getPageListData('/sms/template')    //  /common/user
+            this.templateListData = getUserSelcet(templateResult.data, 'templateCode', 'templateId')
             const deptResult = await getPageListData('/common/dept') // /common/dept
             this.deptListData = arrayToTree(deptResult.data, 100)   
             const userResult = await getPageListData('/common/user')    //  /common/user

CMS1.0/src/views/main/msgManagement/msgTemplate/config/content.config.js

@@ -2,11 +2,12 @@ export const contentTableConfig = {
   title: '短信模板',
   contentTableHeader: true,
   propList: [
-    { prop: 'postCode', label: '模板编号' },
-    { prop: 'postName', label: '模板名称' },
-    { prop: 'postSort', label: '模板内容' },
-    { prop: 'status', label: '状态'},
-    { label: '操作', minWidth: '120', slotName: 'handler' }
+    { prop: 'templateCode', label: '模板编号' },
+    { prop: 'templateName', label: '模板名称' },
+    { prop: 'content', label: '模板内容' },
+    { prop: 'status', label: '状态', slotName: 'templateStatus', customSlot: true},
+    { prop: 'createTime', label: '创建时间'},
+    { label: '操作', minWidth: '120', slotName: 'handlerOperation', customSlot: true }
   ],
   showIndexColumn: true,
   showSelectColumn: false,

CMS1.0/src/views/main/msgManagement/msgTemplate/config/modal.config.js

@@ -1,39 +1,31 @@
 export const modalConfig = {
   formItems: [
     {
-      field: 'postCode',
+      field: 'templateCode',
       type: 'input',
       label: '模板编号',
       required: true,
-      placeholder: '请输入岗位编码'
+      placeholder: '请输入模板编号'
     },
     {
-      field: 'postName',
+      field: 'templateName',
       type: 'input',
       label: '模板名称',
       required: true,
-      placeholder: '请输入岗位名称'
+      placeholder: '请输入模板名称'
     },
     {
-      field: 'remark',
+      field: 'status',
+      type: 'switch',
+      label: '状态',
+      required: true,
+    },
+    {
+      field: 'content',
       type: 'textarea',
       label: '模板内容',
-      placeholder: '请输入备注'
+      placeholder: '请输入模板内容'
     }
-    // {
-    //   field: "departmentId",
-    //   type: "select",
-    //   label: "选择部门",
-    //   placeholder: "请选择部门",
-    //   options: [],
-    // },
-    // {
-    //   field: "roleId",
-    //   type: "select",
-    //   label: "选择角色",
-    //   placeholder: "请选择角色",
-    //   options: [],
-    // },
   ],
   colLayout: { span: 24 },
   itemStyle: {}

CMS1.0/src/views/main/msgManagement/msgTemplate/config/search.config.js

@@ -8,13 +8,13 @@ export const searchFormConfig = {
   },
   formItems: [
     {
-      field: 'postCode',
+      field: 'templateCode',
       type: 'input',
       label: '模板编号',
       placeholder: '请输入模板编号'
     },
     {
-      field: 'postName',
+      field: 'templateName',
       type: 'input',
       label: '模板名称',
       placeholder: '请输入模板名称'

CMS1.0/src/views/main/msgManagement/msgTemplate/msgTemplate.vue

@@ -8,26 +8,56 @@
     <page-content
       ref="pageContentRef"
       :contentTableConfig="contentTableConfig"
-      pageName="/system/post"
+      pageName="/sms/template"
       :isExport="false"
       @newBtnClick="handleNewData"
       @editBtnClick="handleEditData"
     >
-      <template #postStatus="{ row }">
+      <template #templateStatus="{ row }">
         <el-tag :type="row.status === '0' ? 'error' : 'success'">{{ row.status === '0' ? '禁用' : '启用' }}</el-tag>
       </template>
+      <template #handlerOperation="{ row }">
+        <el-button type="primary" v-if="row.status=='1'" link @click="handleEdit(row)">编辑</el-button>
+        <el-button type="primary" v-if="row.status=='1'" link @click="handleEnable(row)">禁用</el-button>
+        <el-button type="primary" v-if="row.status=='0'" link @click="handleEnable(row)">启用</el-button>
+        <el-button type="primary" link @click="handleDelete(row)">删除</el-button>
+        <el-button type="primary" link @click="handleTest(row)">测试</el-button>
+      </template>
     </page-content>
     <page-modal
       :defaultInfo="defaultInfo"
       ref="pageModalRef"
-      pageName="/system/post"
+      pageName="/sms/template"
       :modalConfig="modalConfigRef"
     ></page-modal>
+    <el-dialog
+    v-model="dialogVisible"
+    title="测试"
+    width="500"
+    :before-close="handleClose"
+  >
+    <el-form label-width="auto">
+      <el-form-item label="手机号">
+        <el-input v-model="templateForm.tel" />
+      </el-form-item>
+      <el-form-item label="短信内容">
+        <el-input v-model="templateForm.content" type="textarea" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="handleSend">
+          确定
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
   </div>
 </template>
 
 <script>
-import { defineComponent } from 'vue'
+import { defineComponent,onMounted } from 'vue'
 
 import PageSearch from '@/components/page-search'
 import PageContent from '@/components/page-content'
@@ -40,8 +70,10 @@ import { modalConfig } from './config/modal.config'
 import { usePageSearch } from '@/hooks/use-page-search'
 import { usePageModal } from '@/hooks/use-page-modal'
 
+import { editPageData, deletePageData } from '@/api/main/system/system';
+
 export default defineComponent({
-  name: 'FollowUpPlan',
+  name: 'MsgTemplate',
   components: {
     PageSearch,
     PageContent,
@@ -49,7 +81,41 @@ export default defineComponent({
   },
   setup() {
     const [pageContentRef, handleResetClick, handleQueryClick] = usePageSearch()
+    const { proxy } = getCurrentInstance();
+    const dialogVisible = ref(false)
+    const templateForm = ref({})
+    function handleSend() {
+      console.log(templateForm.value)
+    }
+    function handleDelete(data) {
+      deletePageData('/sms/template/'+data.templateId).then((data) => {
+        proxy.$modal.msgSuccess('删除成功');
+        pageContentRef.value.getPageData()
+      });
+    }
+    function handleEdit(data) {
+      console.log(data);
+      defaultInfo.value = data
+      pageModalRef.value.dialogVisible = true
+    }
+    function handleEnable(data) {
 
+      const params ={
+        templateId:data.templateId,
+        content:data.content,
+        templateCode:data.templateCode,
+        templateName:data.templateName,
+        status:data.status ==='1'?'0':'1'
+      }
+      editPageData('/sms/template', params).then((data) => {
+          proxy.$modal.msgSuccess(data.status ==='1'?'禁用成功':'启用成功');
+          pageContentRef.value.getPageData()
+        });
+    }
+    function handleTest(data) {
+      console.log(data)
+      dialogVisible.value = true
+    }
     // 1.处理逻辑
     const newCallback = () => {}
     const editCallback = () => {
@@ -65,6 +131,14 @@ export default defineComponent({
     const [pageModalRef, defaultInfo, handleNewData, handleEditData] =
       usePageModal(newCallback, editCallback)
     return {
+      handleSend,
+      templateForm,
+      dialogVisible,
+      proxy,
+      handleDelete,
+      handleEdit,
+      handleTest,
+      handleEnable,
       searchFormConfig,
       contentTableConfig,
       pageContentRef,

CMS1.0/src/views/main/msgManagement/sendRecord/config/content.config.js

@@ -1,13 +1,13 @@
 export const contentTableConfig = {
-  title: '岗位管理',
+  title: '发送记录',
   contentTableHeader: true,
   propList: [
-    { prop: 'postCode', label: '模板编号' },
-    { prop: 'postName', label: '手机号' },
-    { prop: 'postSort', label: '发送内容' },
-    { prop: 'status', label: '方向'},
-    { prop: 'status', label: '状态'},
-    { prop: 'status', label: '备注'},
+    { prop: 'templateCode', label: '模板编号' },
+    { prop: 'phoneNumber', label: '手机号' },
+    { prop: 'content', label: '发送内容' },
+    { prop: 'sendDirection', label: '方向'},
+    { prop: 'status', label: '状态', slotName: 'sendStatus', customSlot: true},
+    { prop: 'note', label: '备注'},
     { prop: 'createTime', label: '创建时间' },
     
   ],

CMS1.0/src/views/main/msgManagement/sendRecord/config/search.config.js

@@ -1,3 +1,6 @@
+import useSelectStore from '@/store/commonSelect/common'
+let templateData = useSelectStore().templateListData
+
 export const searchFormConfig = {
   labelWidth: '120px',
   itemStyle: {
@@ -8,25 +11,26 @@ export const searchFormConfig = {
   },
   formItems: [
     {
-      field: 'postCode',
+      field: 'phoneNumber',
       type: 'input',
       label: '手机号',
       placeholder: '请输入手机号'
     },
     {
-      field: 'postName',
-      type: 'input',
+      field: 'templateId',
+      type: 'select',
       label: '模版',
-      placeholder: '请选择模版'
+      placeholder: '请选择模版',
+      options: templateData
     },
     {
-      field: 'status',
+      field: 'sendDirection',
       type: 'select',
       label: '方向',
       placeholder: '请选择方向',
       options: [
-        { title: '启用', value: 1 },
-        { title: '禁用', value: 0 }
+        { title: '发送', value: '发送' },
+        { title: '接收', value: '接收' }
       ]
     }
   ]

CMS1.0/src/views/main/msgManagement/sendRecord/sendRecord.vue

@@ -1,20 +1,21 @@
 <template>
   <div class="app-container">
     <page-search
-      :searchFormConfig="searchFormConfig"
+      :searchFormConfig="searchFormConfigRef"
       @resetBtnClick="handleResetClick"
       @queryBtnClick="handleQueryClick"
     />
     <page-content
       ref="pageContentRef"
       :contentTableConfig="contentTableConfig"
-      pageName="/system/post"
+      pageName="/sms/record"
       :isExport="false"
+      :isCreate="false"
       @newBtnClick="handleNewData"
       @editBtnClick="handleEditData"
     >
-      <template #postStatus="{ row }">
-        <el-tag :type="row.status === '0' ? 'error' : 'success'">{{ row.status === '0' ? '禁用' : '启用' }}</el-tag>
+      <template #sendStatus="{ row }">
+        <el-tag :type="(row.status.indexOf('失败') !== -1) ? 'error' : 'success'">{{ row.status }}</el-tag>
       </template>
     </page-content>
     <page-modal
@@ -27,7 +28,7 @@
 </template>
 
 <script>
-import { defineComponent } from 'vue'
+import { defineComponent,onMounted } from 'vue'
 
 import PageSearch from '@/components/page-search'
 import PageContent from '@/components/page-content'
@@ -39,9 +40,10 @@ import { modalConfig } from './config/modal.config'
 
 import { usePageSearch } from '@/hooks/use-page-search'
 import { usePageModal } from '@/hooks/use-page-modal'
+import { getPageListData } from '@/api/main/system/system';
 
 export default defineComponent({
-  name: 'FollowUpPlan',
+  name: 'SendRecord',
   components: {
     PageSearch,
     PageContent,
@@ -49,7 +51,14 @@ export default defineComponent({
   },
   setup() {
     const [pageContentRef, handleResetClick, handleQueryClick] = usePageSearch()
-
+    onMounted(()=>{
+      getList()
+    })
+    function getList(data) {
+      getPageListData('/sms/template',{}).then((data) => {
+        console.log(data)
+      });
+    }
     // 1.处理逻辑
     const newCallback = () => {}
     const editCallback = () => {
@@ -58,19 +67,25 @@ export default defineComponent({
 
     // 2.动态添加部门和角色列表
     const modalConfigRef = computed(() => {
+      console.log(modalConfig.formItems);
       return modalConfig
     })
-
+    const searchFormConfigRef = computed(() => {
+      return searchFormConfig
+    })
+    
     // 3.调用hook获取公共变量和函数
     const [pageModalRef, defaultInfo, handleNewData, handleEditData] =
       usePageModal(newCallback, editCallback)
     return {
-      searchFormConfig,
+      getList,
       contentTableConfig,
       pageContentRef,
       handleResetClick,
       handleQueryClick,
       modalConfigRef,
+      searchFormConfigRef,
+      searchFormConfig,
       pageModalRef,
       defaultInfo,
       handleNewData,