..

src/main/resources/static/components/layout/HeaderUserAvatar.vue

@@ -50,7 +50,7 @@ module.exports = {
     name: "HeaderUserAvatar",
     store,
     components: {
-        "user-info": httpVueLoader("/components/module/userInfo/index.vue")
+        "user-info": httpVueLoader("/components/module/userInfo/index.vue?v="+new Date().getTime())
     },
     data() {
         return {

src/main/resources/static/components/module/activity/UserScope.vue

@@ -39,13 +39,13 @@
 
         <el-row class="query-row">
           <el-col class="query-title hidden-xs-only">性别：</el-col>
-          <el-col class="query-content">
+          <el-col class="query-content query-row-content-tag">
             <el-tag
                 :effect="pageForm.sexTypes.includes(item.name) ? 'dark' : 'plain'"
                 :key="item.code"
                 :type="item.name"
                 @click="tagClick('sexTypes', item.name)"
-                style="margin-right: 10px; cursor: pointer"
+                style="cursor: pointer;margin: 0;"
                 v-for="item in sexTypeOptions"
             >
               {{ item.name }}
@@ -55,13 +55,13 @@
 
         <el-row class="query-row" v-if="is_A06 === true || is_sysadmin === true || is_H04 === true">
           <el-col class="query-title">编制类型：</el-col>
-          <el-col class="query-content">
+          <el-col class="query-content query-row-content-tag">
             <el-tag
                 :effect="pageForm.personTypes.includes(item.name) ? 'dark' : 'plain'"
                 :key="item.code"
                 :type="item.name"
                 @click="tagClick('personTypes', item.name)"
-                style="margin-right: 10px; cursor: pointer"
+                style="cursor: pointer;margin: 0;"
                 v-for="item in personTypeOptions"
             >
               {{ item.name }}
@@ -94,13 +94,13 @@
 
         <el-row class="query-row" v-if="is_A06 === true || is_sysadmin === true || is_H04 === true">
           <el-col class="query-title">在职状态：</el-col>
-          <el-col class="query-content">
+          <el-col class="query-content query-row-content-tag">
             <el-tag
                 :effect="pageForm.userStates.includes(item.name) ? 'dark' : 'plain'"
                 :key="item.code"
                 :type="item.name"
                 @click="tagClick('userStates', item.name)"
-                style="margin-right: 10px; cursor: pointer"
+                style="cursor: pointer;margin: 0;"
                 v-for="item in userStateOptions"
             >
               {{ item.name }}
@@ -243,6 +243,22 @@
           </el-col>
         </el-row>
 
+        <el-row class="query-row" type="flex" align="middle">
+          <el-col class="query-title">入会日期：</el-col>
+          <el-col class="query-content">
+            <el-date-picker
+                v-model="pageForm.startJoinDate"
+                type="date"
+                placeholder="选择开始日期">
+            </el-date-picker>
+            <el-date-picker
+                v-model="pageForm.endJoinDate"
+                type="date"
+                placeholder="选择结束日期">
+            </el-date-picker>
+          </el-col>
+        </el-row>
+
         <!--                <el-row class="query-row"
                                 v-if="is_H10===true||is_A06===true||is_sysadmin===true||is_H04===true">
                             <el-col class="query-title">条件匹配：</el-col>
@@ -355,14 +371,6 @@ module.exports = {
         {
           code: "unionMember",
           name: "工会会员"
-        },
-        {
-          code: "welfareMember",
-          name: "福利会员"
-        },
-        {
-          code: "sickFundMember",
-          name: "基金会员"
         }
       ],
       sexTypeOptions: [
@@ -389,7 +397,7 @@ module.exports = {
         roleIds: [],
         userId: [],
         activityUserCnd: "",
-        reverseSelection: false
+        reverseSelection: false,
       },
       activityUnions: [],
       unions: [],
@@ -504,6 +512,17 @@ module.exports = {
         this.units = await this.$businessTool.listUnit(this.unionId)
       }
     },
+
+    determineStartDate() {
+      if (this.pageForm.endDate) {
+        if (Date.parse(this.pageForm.startDate) > Date.parse(this.pageForm.endDate)) {
+          this.pageForm.startDate = ""
+          this.$notify.warning("开始时间不能大于结束时间")
+        }
+      }
+      this.pageForm.startDate = this.pageForm.startDate.toLocaleDateString().replaceAll("/", "-")
+    },
+
     async pageData() {
       const pageForm = clone(this.pageForm)
       pageForm.personTypes = JSON.stringify(pageForm.personTypes)
@@ -646,6 +665,13 @@ module.exports = {
   margin-top: 5px;
 }
 
+.query-row-content-tag {
+  display: flex;
+  flex-wrap: wrap;         /* 标签自动换行 */
+  align-items: center;
+  gap: 4px 6px;            /* 横纵向间距 */
+}
+
 @media screen and (max-width: 992px) {
   .query-row:nth-child(4) .query-content .el-col:not(:last-child) {
     margin-bottom: 5px;

src/main/resources/static/components/module/userInfo/index.vue

@@ -4,7 +4,7 @@
         <el-descriptions :column="3" border class="descriptions-form">
             <el-descriptions-item label="工号">{{ viewData.loginname }}</el-descriptions-item>
             <el-descriptions-item label="姓名">{{ viewData.username }}</el-descriptions-item>
-            <el-descriptions-item label="姓名">{{ viewData.username }}</el-descriptions-item>
+            <el-descriptions-item label=""></el-descriptions-item>
             <el-descriptions-item label="性别">{{ viewData.sex }}</el-descriptions-item>
             <el-descriptions-item label="出生日期">
                 {{ viewData.birthday ? $moment(viewData.birthday).format("YYYY-MM-DD") : null }}