From f99ebdfff66f6ddf679deda6d71d499af725b025 Mon Sep 17 00:00:00 2001
From: Paidax <paidax.422@qq.com>
Date: Thu, 9 Jan 2025 09:36:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WelfareListController.java     |  9 +++++
 .../views/mobile/welfare/list/receive.html    | 12 ++++---
 .../platform/welfare/list/ListMange.html      | 18 ++++++++--
 .../welfare/project/ProjectMange.html         | 33 ++++++++++++-------
 .../views/platform/welfare/userChoose.html    |  2 +-
 5 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java
index 34239d8..21e35bd 100644
--- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java
+++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareListController.java
@@ -94,6 +94,7 @@ public class WelfareListController {
                            @Param(value = "projectId", required = false) String projectId,
                            @Param(value = "optionId", required = false) String optionId,
                            @Param(value = "month", required = false) String month,
+                           @Param(value = "isChoose", required = false) Integer isChoose,
                            @Param(value = "courierNumber", required = false) String courierNumber
     ) {
         Sql sql = Sqls.create("""
@@ -133,6 +134,14 @@ public class WelfareListController {
         cnd.andEX("wl.unionid", "=", pageParam.getWelfareUnit());
         cnd.andEX("wl.unitid", "=", pageParam.getUnit());
 
+        if (isChoose != null) {
+            if (isChoose.equals(1)) {
+                cnd.and("wus.selectUserId", "is not", null);
+            } else if (isChoose.equals(2)) {
+                cnd.and("wus.selectUserId", "is", null);
+            }
+        }
+
         if (Lang.isNotEmpty(pageParam.getPersonTypes())) {
             String personTypes = pageParam.getPersonTypes();
             String[] personTypeArray = Json.fromJsonAsArray(String.class, personTypes);
diff --git a/src/main/resources/views/mobile/welfare/list/receive.html b/src/main/resources/views/mobile/welfare/list/receive.html
index ea73520..a1ab564 100644
--- a/src/main/resources/views/mobile/welfare/list/receive.html
+++ b/src/main/resources/views/mobile/welfare/list/receive.html
@@ -115,10 +115,12 @@ layout("/mobile/platform.html"){
     }
 
     .optionDesc {
+        margin-top: -16px;
         display: -webkit-box;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 3;
+        /*-webkit-box-orient: vertical;*/
+        /*-webkit-line-clamp: 3;*/
         overflow: hidden;
+        white-space: pre-line;
         text-overflow: ellipsis;
         font-size: 13px;
         color: #868282;
@@ -219,7 +221,7 @@ layout("/mobile/platform.html"){
                  v-for="(subject,sidx) in projectInfo.welfareProjectSubjects">
                 <div style="display: flex;width: 100%;padding: 10px 0;flex-wrap: wrap"
                      v-for="(option, oidx) in subject.options">
-                    <div style="width: 120px;height: 100px;display: flex;justify-content: center;align-items: center;position:relative;">
+                    <div style="width: 120px;height: 110px;display: flex;justify-content: center;align-items: center;position:relative;">
 <!--                        <div v-if="[1,2,3].includes(option.rank)">-->
 <!--                            <div class="top-text" :style="'color:' + getRankColor(option.rank)">TOP{{option.rank}}</div>-->
 <!--                        </div>-->
@@ -234,7 +236,7 @@ layout("/mobile/platform.html"){
                         <div style="display: flex;justify-content: space-between;align-items: center;font-size: 14px">
                             <div style="width: 100%">{{option.optionName}}</div>
                         </div>
-                        <div class="optionDesc">
+                        <div class="optionDesc" @click="openViewDesc(option.description)">
                             <template v-if="option.supplier">
                                 {{option.supplier}}
                             </template>
@@ -242,7 +244,7 @@ layout("/mobile/platform.html"){
                         <div class="optionDesc" v-if="option.simpleDesc">
                             备注:{{option.simpleDesc}}
                         </div>
-                        <div style="position: absolute;right: 10px;bottom: 0;left: 0;display: flex;justify-content: space-between">
+                        <div style="position: absolute;right: 10px;bottom: -10px;left: 0;display: flex;justify-content: space-between">
                             <div style="width: 70px;font-size: 13px;color: #918a8a;text-align: right;"
                                  @click="openViewDesc(option.description)">
                                 套餐详情
diff --git a/src/main/resources/views/platform/welfare/list/ListMange.html b/src/main/resources/views/platform/welfare/list/ListMange.html
index faa8e9e..4136b26 100644
--- a/src/main/resources/views/platform/welfare/list/ListMange.html
+++ b/src/main/resources/views/platform/welfare/list/ListMange.html
@@ -237,6 +237,13 @@ layout("/layouts/platform.html"){
             <el-card class="mt10" shadow="never">
                 <table-tool :app="this" label="福利名单">
                     <template #func>
+
+                        <el-radio-group @change="doSearch" class="mr10" size="small" v-model="pageForm.isChoose">
+                            <el-radio-button :label="0">全部</el-radio-button>
+                            <el-radio-button :label="1">已选择</el-radio-button>
+                            <el-radio-button :label="2">未选择</el-radio-button>
+                        </el-radio-group>
+
                         <!--     <el-button :disabled="!pageForm.projectId"
                                         @click="doExportWelfareReceive(pageForm.projectId,pageForm.welfareUnit,pageForm.units,pageForm.personTypes,pageForm.userStates)"
                                         icon="el-icon-download"
@@ -428,6 +435,7 @@ layout("/layouts/platform.html"){
                     </el-col>
                     <el-col span="8">
                         <el-input-number :max="item.maxNum" :min="0"
+                                         @keydown.native="onKeydown"
                                          @change="numChange(item.selectNum,item,oidx)"
                                          style="width: 50%"
                                          v-model="item.selectNum"></el-input-number>
@@ -664,7 +672,8 @@ layout("/layouts/platform.html"){
                     searchName: 'username',
                     units: [],
                     personTypes: [],
-                    userStates: []
+                    userStates: [],
+                    isChoose: 0
                 },
                 tableColumns: commonColumns.concat([
                     {prop: 'isChoose', label: '是否选择', width: "100px", sortable: true},
@@ -711,6 +720,11 @@ layout("/layouts/platform.html"){
             'courier-number-info': httpVueLoader('/components/welfare/CourierNumberInfo.vue?v=' + new Date().getTime())
         },
         methods: {
+            onKeydown(event) {
+                if (event.key !== "ArrowUp" && event.key !== "ArrowDown") {
+                    event.preventDefault();
+                }
+            },
             doExportReimbursement() {
                 if (!this.pageForm.projectId) {
                     this.$message.warning('请选择要导出的福利')
@@ -883,7 +897,7 @@ layout("/layouts/platform.html"){
                 const sum = selectNums.reduce((accumulator, currentValue) => accumulator + currentValue, 0)
 
                 if (sum > multiSelectNum) {
-                    this.$set(this.welfareOptions[optionIndex], 'selectNum', multiSelectNum)
+                    this.$set(this.welfareOptions[optionIndex], 'selectNum', value - 1)
                     this.$message('此次福利最多只能选择' + multiSelectNum + '份');
                 }
 
diff --git a/src/main/resources/views/platform/welfare/project/ProjectMange.html b/src/main/resources/views/platform/welfare/project/ProjectMange.html
index e473ef8..a45720d 100644
--- a/src/main/resources/views/platform/welfare/project/ProjectMange.html
+++ b/src/main/resources/views/platform/welfare/project/ProjectMange.html
@@ -618,17 +618,26 @@ layout("/layouts/platform.html"){
                 this.$refs.openQRCode.openCode('/mobile/welfare/list/receive?projectId=' + row.id)
             },
             isCheckBoxChange() {
-                this.formData.welfareProjectSubjects.forEach(v=> {
-                    v.subjectType = this.formData.isCheckBox ? this.formData.isCheckBox : 'radio'
-                })
-
-                // this.formData.welfareProjectSubjects = [{
-                //     subjectName: '请输入福利信息',
-                //     subjectType: this.formData.isCheckBox ? this.formData.isCheckBox : 'radio',
-                //     defaultOption: null,
-                //
-                // }]
-
+                if (this.formData.welfareProjectSubjects && this.formData.welfareProjectSubjects.length > 0) {
+                    this.formData.welfareProjectSubjects.forEach(v=> {
+                        v.subjectType = this.formData.isCheckBox ? this.formData.isCheckBox : 'radio'
+                    })
+                } else {
+                    this.formData.welfareProjectSubjects = [{
+                        subjectName: '请输入福利信息',
+                        subjectType: this.formData.isCheckBox ? this.formData.isCheckBox : 'radio',
+                        defaultOption: null,
+                        options: [
+                            {
+                                optionType: "套餐",
+                                optionName: '福利1',
+                                optionNameId: '',
+                                optionSort: '1',
+                                imgUrl: ''
+                            }
+                        ]
+                    }]
+                }
             },
             async handleAvatarSuccess(res, file) {
                 this.$set(this.formData, 'cover', res.data.filepath)
@@ -859,7 +868,7 @@ layout("/layouts/platform.html"){
                     data.defaultFlexibleGifts = idx < 0 ? 0 : idx
                     data.provideTime = [data.provideTimeStart, data.provideTimeEnd]
                     data.choiceTime = [data.choiceTimeStart, data.choiceTimeEnd]
-                    if (data.welfareProjectSubjects.length === 0) {
+                    if (!data.welfareProjectSubjects || data.welfareProjectSubjects.length === 0) {
                         data.welfareProjectSubjects = [{
                             subjectName: '请输入福利信息',
                             subjectType: data.isCheckBox,
diff --git a/src/main/resources/views/platform/welfare/userChoose.html b/src/main/resources/views/platform/welfare/userChoose.html
index a6649c8..2da5275 100644
--- a/src/main/resources/views/platform/welfare/userChoose.html
+++ b/src/main/resources/views/platform/welfare/userChoose.html
@@ -594,7 +594,7 @@ layout("/layouts/platform.html"){
                 const sum = selectNums.reduce((accumulator, currentValue) => accumulator + currentValue, 0)
 
                 if (sum > multiSelectNum) {
-                    this.$set(this.projectInfo.welfareProjectSubjects[0].options[optionIndex], 'selectNum', multiSelectNum)
+                    this.$set(this.projectInfo.welfareProjectSubjects[0].options[optionIndex], 'selectNum', value - 1)
                     this.$message.warning('此次福利最多只能选择' + multiSelectNum + '份');
                 }