Merge remote-tracking branch 'origin/main'

src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html

@@ -11,7 +11,7 @@ layout("/layouts/platform_h5.html"){
             @search="doSearch"
             input-align="left"
             placeholder="请输入经办人搜索"
-            v-model="pageForm.userName"
+            v-model="pageForm.searchKeyword"
         ></van-search>
         <van-tabs v-model="pageForm.approvalText"
                   @change="(val)=>{this.pageForm.approval = val==='1';this.doSearch();}">
@@ -39,21 +39,24 @@ layout("/layouts/platform_h5.html"){
                 </dict-tag>
             </table-column>
             <table-column label="金额（元）">{{row.money}}</table-column>
-            <table-column label="当前节点">{{row.curTaskName}}</table-column>
+            <table-column label="申请状态">
+                <span v-if="row.stateId == 1" style="color: #409eff;">待提交</span>
+                <span v-else-if="row.stateId == 2" style="color: #409eff;">待审核确认</span>
+                <span v-else-if="row.stateId == 3" style="color: #67c23a;">报销成功</span>
+                <span v-else-if="row.stateId == 4" style="color: #f56c6c;">拒绝</span>
+                <span v-else-if="row.stateId == 5" style="color: #409eff;">退回</span>
+                <span v-else>{{row.stateId}}</span>
+            </table-column>
         </template>
         <template #actions="{index,row}">
             <div class="action-btn" @click="onView(row)">
                 <i class="fa fa-eye"></i>
                 <span>查看</span>
             </div>
-            <div class="action-btn" v-if="row.taskState === 10" @click="onAudit(row)">
+            <div class="action-btn" v-if="row.stateId == 2" @click="onAudit(row)">
                 <i class="fa fa-edit"></i>
                 <span>审核</span>
             </div>
-            <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">
-                <i class="fa fa-undo"></i>
-                <span>撤回</span>
-            </div>
         </template>
     </table-list>
 
@@ -67,10 +70,10 @@ layout("/layouts/platform_h5.html"){
                     <van-cell-group title="审批意见">
                         <van-field label=""
                                    :rules="[{ required: true,message:'请填审批意见' }]"
-                                   v-model="formData.tf_opinion"
+                                   v-model="formData.reviewOpinion"
                                    required
                                    type="textarea"
-                                   name="tf_opinion"
+                                   name="reviewOpinion"
                                    rows="4"
                                    autosize
                                    class="more-text"
@@ -78,17 +81,16 @@ layout("/layouts/platform_h5.html"){
                     </van-cell-group>
                     <van-cell-group title="电子签名" class="form-section">
                         <van-field class="more-text" name="tf_userSign" label="" required
-                                   v-model="formData.tf_opinion" :rules="[{ required: true,message:'请签名' }]">
+                                   v-model="formData.reviewOpinion" :rules="[{ required: true,message:'请签名' }]">
                             <template #input>
                                 <h5-signature v-model="formData.tf_userSign" slot="input"></h5-signature>
                             </template>
                         </van-field>
                     </van-cell-group>
-                    <!-- 按钮区域 -->
                     <div class="form-actions">
-                        <van-button type="danger" @click="handleTaskAction(6)">退回到发起人</van-button>
-                        <van-button type="danger" @click="handleTaskAction(2)">拒绝申请</van-button>
-                        <van-button type="primary" @click="handleTaskAction(1)">同意申请</van-button>
+                        <van-button type="danger" @click="handleTaskAction(5)">退回到发起人</van-button>
+                        <van-button type="danger" @click="handleTaskAction(4)">拒绝申请</van-button>
+                        <van-button type="primary" @click="handleTaskAction(3)">同意申请</van-button>
                     </div>
                 </van-form>
             </div>
@@ -122,33 +124,18 @@ layout("/layouts/platform_h5.html"){
             }
         },
         methods: {
-            onRevoke(row) {
-                this.$dialog.confirm({
-                    title: "温馨提示",
-                    message: "您确定要撤回吗？"
-                }).then(() => {
-                    this.$axios.post("/flow/common/revokeTask", { taskId: row.taskId }).then(res => {
-                        if (res.code === 0) {
-                            this.$toast.success("提交成功")
-                            this.doSearch()
-                            this.infoShow = false
-                        }
-                    })
-                }).catch(() => {
-                    // on cancel
-                })
-            },
             handleTaskAction(val) {
                 this.$refs.formRef.validate().then(() => {
                     this.$dialog.confirm({
                         title: "温馨提示",
                         message: "您确定要提交吗？"
                     }).then(() => {
-                        this.$axios.post("/flow/common/executeTask", {
+                        this.$axios.post("/platform/unionReimburse/review/reviewTask", {
                             data: JSON.stringify({
-                                ...this.formData,
-                                submitType: val
-                            })
+                                id: this.formData.id,
+                                reviewOpinion: this.formData.reviewOpinion
+                            }),
+                            submitType: val
                         }).then(res => {
                             if (res.code === 0) {
                                 this.$toast.success("提交成功")
@@ -157,7 +144,6 @@ layout("/layouts/platform_h5.html"){
                             }
                         })
                     }).catch(() => {
-                        // on cancel
                     })
                 }).catch()
             },
@@ -168,10 +154,9 @@ layout("/layouts/platform_h5.html"){
             onAudit(row) {
                 this.showApprovalForm = true
                 this.formData = {
-                    tf_opinion: null,
-                    tf_userSign: null,
-                    processTaskId: row.taskId,
-                    taskName: row.curTaskName
+                    id: row.id,
+                    reviewOpinion: null,
+                    tf_userSign: null
                 }
                 this.$refs.unionReimburseInfoRef.onOpen(row)
             },

src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html

@@ -38,20 +38,21 @@ layout("/layouts/platform_h5.html"){
                 <i class="fa fa-eye"></i>
                 <span>查看</span>
             </div>
-            <div class="action-btn" v-if="row.taskState === 10" @click="onApproval(row)">
+            <div class="action-btn" v-if="showSecondAction(row)" @click="onApproval(row)">
                 <i class="fa fa-edit"></i>
                 <span>附议</span>
             </div>
-<!--            <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">-->
-<!--                <i class="fa fa-reply"></i>-->
-<!--                <span>撤回</span>-->
-<!--            </div>-->
+            <!--            <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">-->
+            <!--                <i class="fa fa-reply"></i>-->
+            <!--                <span>撤回</span>-->
+            <!--            </div>-->
         </template>
     </table-list>
 
     <proposal-info ref="proposalInfoRef">
         <div v-if="showApprovalForm">
-            <div class="process-title">{{formData.taskName}}</div>
+            <div class="process-title">提案附议</div>
+            <!--            <div class="process-title">{{formData.taskName}}</div>-->
             <van-form ref="formRef">
                 <van-field
                         v-model="formData.tf_opinion"
@@ -67,10 +68,15 @@ layout("/layouts/platform_h5.html"){
                 <!--                    <h5-signature v-model="formData.approvalSignature" slot="input"></h5-signature>-->
                 <!--                </van-field>-->
             </van-form>
-            <div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
+            <div v-if="row && row.curTaskCode === 'second'"
+                 style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
                 <van-button type="danger" block @click="handleTaskAction(20)">不同意</van-button>
                 <van-button type="primary" block @click="handleTaskAction(1)">同意</van-button>
             </div>
+            <div v-else style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
+                <van-button type="danger" block @click="updateSecond(2)">不同意</van-button>
+                <van-button type="primary" block @click="updateSecond(1)">同意</van-button>
+            </div>
         </div>
     </proposal-info>
 
@@ -94,6 +100,7 @@ layout("/layouts/platform_h5.html"){
                 },
 
                 sessionOptions: [],
+                row: null,
                 formData: {},
                 showApprovalForm: false,
                 rules: {
@@ -105,6 +112,12 @@ layout("/layouts/platform_h5.html"){
             "proposal-info": PROPOSAL_INFO
         },
         methods: {
+            // 附议按钮显示规则：
+            // 1. 当前任务进行中(taskState=10)时显示
+            // 2. 当前任务已废弃(taskState=99)时，仅 invite、second、delegation、committee 节点显示
+            showSecondAction(row) {
+                return row.taskState === 10 || (row.taskState === 99 && ["invite", "second", "preAudit", "delegation", "committee"].includes(row.taskKey))
+            },
             onReady() {
                 this.listSession()
             },
@@ -131,10 +144,14 @@ layout("/layouts/platform_h5.html"){
             },
 
             onApproval(row) {
+                this.row = row
                 this.showApprovalForm = true
                 this.$refs.proposalInfoRef.onOpen(row)
                 this.formData = {
                     processTaskId: row.taskId,
+                    taskId: row.taskId,
+                    proposalId: row.id,
+                    taskActorUserId: row.taskActorUserId,
                     taskName: row.curTaskName,
                     tf_opinion: "同意该提案"
                 }
@@ -147,7 +164,7 @@ layout("/layouts/platform_h5.html"){
                         title: "提示",
                         message: "您确定要提交吗？"
                     }).then(() => {
-                        this.$axios.post("/flow/common/executeTask", {
+                        this.$axios.post("/platform/proposal/seconded/executeTask", {
                             data: JSON.stringify({
                                 ...this.formData,
                                 submitType: val
@@ -167,6 +184,29 @@ layout("/layouts/platform_h5.html"){
                 }
             },
 
+            updateSecond(submitType) {
+                this.$dialog.confirm({
+                    title: "提示",
+                    message: "您确定要提交吗？"
+                }).then(() => {
+                    this.$axios.post("/platform/proposal/seconded/updateInfo", {
+                        proposalId: this.formData.proposalId,
+                        taskId: this.formData.taskId,
+                        taskActorUserId: this.formData.taskActorUserId,
+                        opinion: this.formData.tf_opinion,
+                        submitType: submitType,
+                    }).then((res) => {
+                        if (res.code === 0) {
+                            this.$refs.proposalInfoRef.onClose()
+                            this.$toast.success(res.msg)
+                            this.doSearch()
+                        }
+                    })
+                }).catch(() => {
+
+                })
+            },
+
             doSearch() {
                 this.$nextTick(() => {
                     this.pageForm.pageNumber = 1

src/main/resources/views/platform/zhghh5/democratic/proposal/transact/write/index.html

@@ -225,7 +225,7 @@ layout("/layouts/platform_h5.html"){
                     ></van-picker>
                 </van-popup>
 
-                <van-field
+               <!-- <van-field
                         :value="formData.suggestUnits.length > 0 ? formData.suggestUnits.join(', ') : ''"
                         is-link
                         readonly
@@ -235,7 +235,7 @@ layout("/layouts/platform_h5.html"){
                         @click="showSuggestionUnitPicker = true"
                         :rules="[{ required: true, message: '请选择建议承办单位' }]"
                         required
-                ></van-field>
+                ></van-field>-->
                 <van-popup v-model="showSuggestionUnitPicker" position="bottom" :style="{ height: '70%' }">
                     <div class="suggestion-unit-picker">
                         <!-- 头部工具栏 -->
@@ -719,6 +719,8 @@ layout("/layouts/platform_h5.html"){
                 if (this.bizId) {
                     this.$axios.post("/platform/proposal/write/detail", {id: this.bizId}).then((res) => {
                         if (res.code === 0) {
+                            res.data.brief=removeHTMLTag(res.data.brief)
+                            res.data.measures=removeHTMLTag(res.data.measures)
                             this.formData = res.data;
                             this.listOpenSession(true);
                         }

src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/unionLeaderApproval/index.html

@@ -0,0 +1,235 @@
+<!--#
+layout("/layouts/platform_h5.html"){
+#-->
+<div id="app">
+	<van-sticky>
+		<van-nav-bar title="帮扶二级党组织审核" left-text="返回" left-arrow @click-left="historyBack" placeholder fixed></van-nav-bar>
+		<van-search
+				v-model="pageForm.searchKeyword"
+				placeholder="请输入工号或者姓名进行查询"
+				show-action
+				:reverse-color="false"
+				input-align="left"
+				@search="doSearch">
+			<template #action>
+				<div @click="doSearch">搜索</div>
+			</template>
+		</van-search>
+		<van-dropdown-menu
+				v-if="$auth.hasRoleOr('SYSADMIN,SCHOOL_UNION_ADMIN,BRANCH_UNION_CHAIRMAN')"
+				:close-on-click-outside="false"
+				:close-on-click-overlay="false"
+		>
+			<van-dropdown-item :options="unionList" @change="unionChange" v-model="pageForm.unionId"></van-dropdown-item>
+			<van-dropdown-item :options="unitList" @change="doSearch" v-model="pageForm.unitId"></van-dropdown-item>
+		</van-dropdown-menu>
+		<van-tabs v-model="pageForm.approvalText"
+				  @change="(val)=>{this.pageForm.audit = val==='1';this.doSearch();}">
+			<van-tab title="已审核" name="1"></van-tab>
+			<van-tab title="未审核" name="0"></van-tab>
+		</van-tabs>
+	</van-sticky>
+
+	<table-list api="/platform/difficultHelp/unionLeaderApproval/pageData" :page_form.sync="pageForm" ref="tableListRef" title="userName" @ready="onReady">
+		<template v-slot="{index,row}">
+			<table-column label="受助人">{{row.userName + '(' + row.loginName + ')'}}</table-column>
+			<table-column label="所属工会">{{row.unionName}}</table-column>
+			<table-column label="工作单位">{{row.unitName}}</table-column>
+			<table-column label="困难类型">{{row.subsidyStandards}}</table-column>
+			<table-column label="填报时间">{{row.applyTime}}</table-column>
+			<table-column label="当前节点">{{row.curTaskName}}</table-column>
+		</template>
+		<template #actions="{index,row}">
+			<div class="action-btn" @click="onView(row)">
+				<i class="fa fa-eye"></i>
+				<span>查看</span>
+			</div>
+			<div class="action-btn" v-if="row.taskState === 10" @click="onApproval(row)">
+				<i class="fa fa-check"></i>
+				<span>审核</span>
+			</div>
+			<div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">
+				<i class="fa fa-undo"></i>
+				<span>撤回</span>
+			</div>
+		</template>
+	</table-list>
+
+
+	<info ref="infoRef">
+		<div v-if="showApprovalForm">
+			<div class="process-title">{{formData.taskName}}</div>
+			<van-form ref="formRef">
+
+				<el-form-item label="级别" prop="level" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+					<search-item>
+						<dict-select v-model="formData.level" code="DIFFICULT_LEVEL" style="width: 100%" placeholder="请选择级别"></dict-select>
+					</search-item>
+				</el-form-item>
+				<el-form-item label="审核金额" prop="money" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+						<el-input-number placeholder="请输入金额" v-model="formData.money" style="width: 100%" :precision="2"
+										 :min="0" ></el-input-number>
+				</el-form-item>
+
+				<van-field
+						v-model="formData.tf_opinion"
+						name="tf_opinion"
+						label="审批意见"
+						placeholder="请输入审批意见"
+						:rules="[{ required: true, message: '请填写审批意见' }]"
+						required
+						maxlength="100"
+						show-word-limit
+				></van-field>
+			</van-form>
+			<div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
+				<van-button type="danger" block @click="handleTaskAction(6)">退回</van-button>
+				<van-button type="danger" block @click="handleTaskAction(2)">拒绝</van-button>
+				<van-button type="primary" block @click="handleTaskAction(1)">同意</van-button>
+			</div>
+		</div>
+	</info>
+</div>
+<script nonce="${cspNonce!}">
+	<!--#include("../common/info.js"){}#-->
+
+	new Vue({
+		el: '#app',
+		store,
+		data() {
+			return {
+				pageForm: {
+					pageNo: 1,
+					pageSize: 10,
+					searchKeyword: '',
+					unionId: '',
+					unitId: '',
+					approvalText: "0",
+					audit: false
+				},
+				unionList: [],
+				unitList: [],
+
+				formData: {},
+				showApprovalForm: false
+			}
+		},
+		components: {
+			"info": INFO
+		},
+		methods: {
+			historyBack,
+
+			onReady() {
+				this.doSearch()
+			},
+
+			doSearch() {
+				this.$nextTick(() => {
+					this.pageForm.pageNumber = 1
+					this.pageForm.totalCount = 0
+					this.$refs.tableListRef.doSearch()
+				})
+			},
+
+			// 查看详情
+			onView(row) {
+				this.showApprovalForm = false
+				this.$refs.infoRef.onOpen(row)
+			},
+
+			onApproval(row) {
+				this.showApprovalForm = true
+				this.$refs.infoRef.onOpen(row)
+				this.formData = {
+					processTaskId: row.taskId,
+					taskName: row.curTaskName
+				}
+			},
+
+			async handleTaskAction(val) {
+				try {
+					await this.$refs.formRef.validate();
+					this.$dialog.confirm({
+						title: "提示",
+						message: "您确定要提交吗？"
+					}).then(() => {
+						this.$axios.post("/flow/common/executeTask", {
+							data: JSON.stringify({
+								...this.formData,
+								submitType: val
+							})
+						}).then((res) => {
+							if (res.code === 0) {
+								this.$refs.infoRef.onClose()
+								this.$toast.success(res.msg)
+								this.doSearch()
+							}
+						})
+					}).catch(() => {
+
+					})
+				} catch (error) {
+
+				}
+			},
+
+			// 撤回
+			onRevoke(row) {
+				debugger
+				this.$dialog.confirm({
+					title: '提示',
+					message: '您确定要撤回吗？',
+				}).then(() => {
+					this.$axios.post('/flow/common/revokeTask', {taskId: row.taskId}).then(res => {
+						if (res.code === 0) {
+							this.$toast.success('撤回成功');
+							this.doSearch();
+						}
+					})
+				}).catch(() => {
+				});
+			},
+			unionChange() {
+				this.$set(this.pageForm, "unitId", null)
+				this.flushUnits()
+				this.doSearch()
+			},
+			async initUnion() {
+				const hasAdmin = this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])
+				const unionId = hasAdmin ? null : this.$store.state.user.union.id
+				this.unionList = await this.$businessTool.listUnion(unionId)
+				this.unionList.forEach((v) => {
+					v.text = v.name
+					v.value = v.id
+				})
+				if (hasAdmin) {
+					this.unionList.unshift({ text: "全部工会", value: null })
+				}
+				if (this.unionList && this.unionList.length > 0) {
+					this.$set(this.pageForm, "unionId", this.unionList[0].value)
+				}
+			},
+			async flushUnits() {
+				const hasAdmin = this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])
+				const unionId = hasAdmin ? this.pageForm.unionId : this.$store.state.user.union.id
+				this.unitList = await this.$businessTool.listUnit(unionId)
+				this.unitList.forEach((v) => {
+					v.text = v.name
+					v.value = v.id
+				})
+				this.unitList.unshift({ text: "全部单位", value: null })
+				if (this.unitList && this.unitList.length > 0) {
+					this.$set(this.pageForm, "unitId", this.unitList[0].value)
+				}
+			},
+		},
+		async created() {
+			await this.initUnion()
+			await this.flushUnits()
+		}
+	})
+</script>
+<!--#
+}
+#-->

src/main/resources/views/platform/zhghh5/staffbenefit/medicalMutualAid/aidFund/applyMine/index.html

@@ -29,7 +29,7 @@ layout("/layouts/platform_h5.html"){
                 <i class="fa fa-mail-forward"></i>
                 <span>提交</span>
             </div>
-            <div class="action-btn delete" @click="onDelete(row)"
+            <div class="action-btn delete" @click="onDelete(row.id)"
                  v-if="row.taskKey === 'startTask' || !row.instanceId">
                 <i class="fa fa-trash"></i>
                 <span>删除</span>