From 6c6ff8dc156751b86de60c4502e5b51f3aadeb2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Sat, 7 Sep 2024 16:43:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue      | 14 ++++-----
 .../src/views/system/notice/DetailModal.vue   |  6 ++--
 .../src/views/system/notice/index.vue         |  2 +-
 .../src/views/system/notice/notice.data.ts    | 29 +++++++++++++++++--
 4 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue
index 8477e90..3a32f30 100644
--- a/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue
+++ b/jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/XxhbjwxtxsmdList.vue
@@ -7,13 +7,13 @@
           <a-col :lg="6" >
             <a-form-item name="kcrwdm">
               <template #label><span title="课程任务代码">课程任务代码</span></template>
-              <j-input placeholder="请输入文件名称" v-model:value="queryParam.kcrwdm"  allow-clear />
+              <j-input placeholder="请输入课程任务代码" v-model:value="queryParam.kcrwdm"  allow-clear />
             </a-form-item>
           </a-col>
           <a-col :lg="6" >
             <a-form-item name="zymc">
               <template #label><span title="专业">专业</span></template>
-              <j-input placeholder="请输入文件名称" v-model:value="queryParam.zymc"  allow-clear />
+              <j-input placeholder="请输入专业名称" v-model:value="queryParam.zymc"  allow-clear />
             </a-form-item>
           </a-col>
           <a-col :lg="6" >
@@ -34,13 +34,9 @@
               <JSelectMultiple v-model:value="queryParam.kclb" placeholder="请选择课程类别" dictCode="kcxz"></JSelectMultiple>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
-              <a-col :lg="6">
-                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
-                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
-              </a-col>
-            </span>
+          <a-col :lg="18" style="text-align: right">
+            <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+            <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
           </a-col>
         </a-row>
       </a-form>
diff --git a/jeecgboot-vue3/src/views/system/notice/DetailModal.vue b/jeecgboot-vue3/src/views/system/notice/DetailModal.vue
index c1771ef..a31675e 100644
--- a/jeecgboot-vue3/src/views/system/notice/DetailModal.vue
+++ b/jeecgboot-vue3/src/views/system/notice/DetailModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" title="查看详情" :showCancelBtn="false" :showOkBtn="false" width="900px">
+  <BasicModal v-bind="$attrs" @register="registerModal" title="查看收件人" :showCancelBtn="false" :showOkBtn="false" width="900px">
     <BasicForm @register="registerForm" disabled />
   </BasicModal>
 </template>
@@ -7,11 +7,11 @@
 import { ref, computed, unref } from 'vue';
 import { BasicModal, useModalInner } from '/@/components/Modal';
 import { BasicForm, useForm } from '/@/components/Form/index';
-import { formSchema } from './notice.data';
+import { detailSchema } from './notice.data';
 
 //表单配置
 const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
-  schemas: formSchema,
+  schemas: detailSchema,
   showActionButtonGroup: false,
 });
 //表单赋值
diff --git a/jeecgboot-vue3/src/views/system/notice/index.vue b/jeecgboot-vue3/src/views/system/notice/index.vue
index b78720f..32798b1 100644
--- a/jeecgboot-vue3/src/views/system/notice/index.vue
+++ b/jeecgboot-vue3/src/views/system/notice/index.vue
@@ -27,10 +27,10 @@
                 <span :class="notice.sendStatus=='0'?'state-cg':notice.sendStatus=='1'?'state-fb':'state-cx'">{{showDictValue(notice.sendStatus, statusData)}}</span>
               </a-col>
               <a-col :span="8" class="item-text-right">
+                <a-button class="item-button-border" type="link" @click="handleDetail(notice)">收件人</a-button>
                 <a-button v-if="notice.sendStatus!=1" class="item-button-border" type="link" @click="handleEdit(notice)">编辑</a-button>
                 <a-button v-if="notice.sendStatus!=1" class="item-button-border" type="link" @click="handleDelete(notice)">删除</a-button>
                 <a-button v-if="notice.sendStatus!=1" class="item-button-border" type="link" @click="handleRelease(notice)">发布</a-button>
-                <!-- <a-button v-if="notice.sendStatus==1" class="item-button-border" type="link" @click="handleDetail(notice)">详情</a-button> -->
                 <a-button v-if="notice.sendStatus==1" class="item-button-border" type="link" @click="handleReturn(notice)">撤回</a-button>
               </a-col>
             </a-row>
diff --git a/jeecgboot-vue3/src/views/system/notice/notice.data.ts b/jeecgboot-vue3/src/views/system/notice/notice.data.ts
index 5b14665..20e8865 100644
--- a/jeecgboot-vue3/src/views/system/notice/notice.data.ts
+++ b/jeecgboot-vue3/src/views/system/notice/notice.data.ts
@@ -116,7 +116,7 @@ export const formSchema: FormSchema[] = [
   // },
   {
     field: 'msgType',
-    label: '接收用户',
+    label: '接收专家',
     defaultValue: 'USER',
     component: 'JDictSelectTag',
     required: true,
@@ -125,7 +125,6 @@ export const formSchema: FormSchema[] = [
       dictCode: 'msg_type',
       placeholder: '请选择发布范围',
     },
-    show: false,
   },
   {
     field: 'userIds',
@@ -156,3 +155,29 @@ export const formSchema: FormSchema[] = [
     // render: render.renderTinymce,
   },
 ];
+
+export const detailSchema: FormSchema[] = [
+  {
+    field: 'msgType',
+    label: '接收专家',
+    defaultValue: 'USER',
+    component: 'JDictSelectTag',
+    required: true,
+    componentProps: {
+      type: 'radio',
+      dictCode: 'msg_type',
+      placeholder: '请选择发布范围',
+    },
+  },
+  {
+    field: 'userIds',
+    label: '指定专家',
+    component: 'JSelectExpert',
+    required: true,
+    componentProps: {
+      rowKey: 'id',
+      labelKey: 'realname',
+    },
+    ifShow: ({ values }) => values.msgType == 'USER',
+  },
+];