修改组织树搜索框

src/views/message/persongroup/components/GroupBoard.vue

@@ -57,7 +57,12 @@
         />
       </el-form-item>
       <el-form-item label="组内成员：" prop="userList" v-if="props.drawerTitle === '查看人员分组'">
-        <el-select v-model="ruleForm.userList" value-key="id" multiple disabled="true">
+        <el-select
+          v-model="ruleForm.userList"
+          value-key="id"
+          multiple
+          disabled="true"
+        >
           <el-option v-for="user in selectedUser" :key="user.id" :label="user.name" :value="user">
           </el-option>
         </el-select>
@@ -72,10 +77,10 @@
         v-else
       >
         <el-select
+          placeholder="请添加组内人员"
           v-model="ruleForm.userList"
           value-key="id"
           multiple
-          placeholder="请添加组内人员"
           @click="dialogVisible = true"
         >
           <el-option v-for="user in selectedUser" :key="user.id" :label="user.name" :value="user">
@@ -280,6 +285,7 @@ watch(
   margin-top: 24px;
   gap: 20px;
   ::v-deep .el-select__selection {
+    min-height: 25px;
     max-height: 60px;
     overflow-y: auto;
   }

src/views/message/persongroup/components/Search.vue

@@ -12,9 +12,9 @@
       <el-button type="primary" style="margin-left: 15px" @click="getUserGroup">
         搜索
       </el-button>
-      <!-- <el-button style="margin-left: 15px" @click="resetSearch"
-        ><img src="../img/refresh.png" style="margin-right: 8px;" />重置
-      </el-button> -->
+      <el-button style="margin-left: 15px" @click="resetSearch">
+        重置
+      </el-button>
     </div>
   </div>
 </template>
@@ -26,10 +26,10 @@ import { storeToRefs } from 'pinia';
 const userGroup = userGroupList();
 const { queryStr } = storeToRefs(userGroup);
 const { getUserGroup } = userGroup;
-// const resetSearch = () => {
-//   queryStr.value = '';
-//   getUserGroup();
-// };
+const resetSearch = () => {
+  queryStr.value = '';
+  getUserGroup();
+};
 </script>
 
 <style lang="scss" scoped>

src/views/message/persongroup/components/SelectTree.vue

@@ -6,7 +6,8 @@
         :style="{ width: '300px', height: '30px' }"
         placeholder="请输入搜索内容"
         :prefix-icon="Search"
-        @keyup.enter="onSearch"
+        @input="onSearch"
+        clearable
       />
       <el-tree
         ref="treeRef"
@@ -105,7 +106,6 @@ const onSearch = () => {
   } else {
     filterData.value = nodeData.value;
   }
-  queryStr.value = '';
 };
 const total = ref<number>(0);
 const selected = ref<number>(0);

src/views/message/reportmessage/ReportOperation.vue

@@ -170,13 +170,16 @@ import { addMassage, searchMassage, editMassage } from '@/api/sendMessage/sendMe
 import { ElMessage } from 'element-plus';
 import { storeToRefs } from 'pinia';
 import { useUserStore } from '@/store/modules/user';
+import { useFormList } from './store/useFormList';
 import { useRoute, useRouter } from 'vue-router';
 import DesignatedUserList from '@/views/message/designatedUserSelectTree.vue';
 import type { FormProps } from 'element-plus';
 const labelPosition = ref<FormProps['labelPosition']>('left');
 
 const useUser = useUserStore();
+const FormList = useFormList();
 const { info } = storeToRefs(useUser);
+const { type } = storeToRefs(FormList);
 let operater = info.value.nickname;
 
 const weekVisible = ref(false); // 控制Tooltip显示
@@ -282,6 +285,7 @@ const resetForm = (formEl: FormInstance | undefined) => {
 };
 
 const clickBack = () => {
+  type.value = reportType.value;
   router.back();
 };
 
@@ -364,10 +368,6 @@ onBeforeMount(() => {
       width: 669px;
       border-right: 1px solid rgba(0, 0, 0, 0.06);
       overflow-y: auto;
-      .el-form{
-        height: 760px;
-        overflow-y: auto;
-      }
       .two-btns {
         position: absolute;
         right: 33px;

src/views/message/reportmessage/components/Form.vue

@@ -16,7 +16,7 @@
       ref="tableRef"
     >
       <template #tableTitle>
-        <el-button type="primary" :icon="Plus" @click="CreateReport(type)">新建报表</el-button>
+        <el-button type="primary" :icon="Plus" @click="CreateReport(type)">新建报表配置</el-button>
       </template>
       <template #empty>
         <div class="empty-content flex flex-col items-center">

src/views/message/reportmessage/overviewColumns.ts

@@ -11,7 +11,7 @@ const { getForm } = formStore;
 import { updateStatus, updateStatusParams } from './api/index'
 export const reportDataCol: BasicColumn[] = [
   {
-    label: '报表类型',
+    label: '报表周期',
     prop: 'statisticType',
     render(record) {
       const typeName = statisticTypeName.find(item => item.value === record.row.statisticType);