commit

src/main/resources/views/platform/zhgh/activity/sports/applyUser/indexList.html

@@ -26,8 +26,8 @@ layout("/layouts/platform.html"){
                     </search-item>
                     <search-item label="报名状态">
                         <el-radio-group @change="activityInfoData" v-model="pageForm.applyStatus">
-                            <el-radio-button :label="1">未报名</el-radio-button>
                             <el-radio-button :label="2">已报名</el-radio-button>
+                            <el-radio-button :label="1">未报名</el-radio-button>
                         </el-radio-group>
                     </search-item>
                 </search>
@@ -186,7 +186,7 @@ layout("/layouts/platform.html"){
                 activityList: [],
                 pageForm: {
                     isActivity: 2,
-                    applyStatus: 2,
+                    applyStatus: 1,
                     year: new Date().getFullYear() + ""
                 },
                 activityData: {},

src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/apply/index.html

@@ -124,7 +124,6 @@ layout("/layouts/platform.html"){
                 </el-descriptions-item>
 
 
-
                 <el-descriptions-item label="备注">
                     <el-form-item prop="note"
                                   :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
@@ -224,7 +223,7 @@ layout("/layouts/platform.html"){
             // 保存
             onSave() {
                 const msg = this.validateBirthday()
-                if ( msg){
+                if (msg) {
                     this.$message.warning(msg)
                     return
                 }
@@ -250,28 +249,32 @@ layout("/layouts/platform.html"){
             // 提交
             onSubmit() {
                 const msg = this.validateBirthday()
-                if ( msg){
+                if (msg) {
                     this.$message.warning(msg)
                     return
                 }
-                this.getIsRepeatByIdCard().then(flag => {
-                    if (flag) {
+                this.$refs.formRef.validate((valid) => {
+                    if (valid) {
+                        this.getIsRepeatByIdCard().then(flag => {
+                            if (flag) {
 
-                    } else {
-                        this.$confirm("您确定要提交吗？", "提示", {
-                            confirmButtonText: "确定",
-                            cancelButtonText: "取消",
-                            type: "warning"
-                        }).then(() => {
-                            this.$axios.post('/platform/enrollmentRegistration/apply/submit', {
-                                data: JSON.stringify(this.formData),
-                                taskId: GetQueryString("taskId")
-                            }).then(res => {
-                                if (res.code === 0) {
-                                    this.$message.success("提交成功")
-                                    window.location.href = '/platform/enrollmentRegistration/applyList/index'
-                                }
-                            })
+                            } else {
+                                this.$confirm("您确定要提交吗？", "提示", {
+                                    confirmButtonText: "确定",
+                                    cancelButtonText: "取消",
+                                    type: "warning"
+                                }).then(() => {
+                                    this.$axios.post('/platform/enrollmentRegistration/apply/submit', {
+                                        data: JSON.stringify(this.formData),
+                                        taskId: GetQueryString("taskId")
+                                    }).then(res => {
+                                        if (res.code === 0) {
+                                            this.$message.success("提交成功")
+                                            window.location.href = '/platform/enrollmentRegistration/applyList/index'
+                                        }
+                                    })
+                                })
+                            }
                         })
                     }
                 })
@@ -279,28 +282,32 @@ layout("/layouts/platform.html"){
             },
             onFinishTask() {
                 const msg = this.validateBirthday()
-                if ( msg){
+                if (msg) {
                     this.$message.warning(msg)
                     return
                 }
-                this.getIsRepeatByIdCard().then(flag => {
-                    if (flag) {
+                this.$refs.formRef.validate((valid) => {
+                    if (valid) {
+                        this.getIsRepeatByIdCard().then(flag => {
+                            if (flag) {
 
-                    } else {
-                        this.$confirm("您确定要提交吗？", "提示", {
-                            confirmButtonText: "确定",
-                            cancelButtonText: "取消",
-                            type: "warning"
-                        }).then(() => {
-                            this.$axios.post('/platform/enrollmentRegistration/apply/submitAgain', {
-                                data: JSON.stringify(this.formData),
-                                taskId: GetQueryString("taskId")
-                            }).then(res => {
-                                if (res.code === 0) {
-                                    this.$message.success("提交成功")
-                                    window.location.href = '/platform/enrollmentRegistration/applyList/index'
-                                }
-                            })
+                            } else {
+                                this.$confirm("您确定要提交吗？", "提示", {
+                                    confirmButtonText: "确定",
+                                    cancelButtonText: "取消",
+                                    type: "warning"
+                                }).then(() => {
+                                    this.$axios.post('/platform/enrollmentRegistration/apply/submitAgain', {
+                                        data: JSON.stringify(this.formData),
+                                        taskId: GetQueryString("taskId")
+                                    }).then(res => {
+                                        if (res.code === 0) {
+                                            this.$message.success("提交成功")
+                                            window.location.href = '/platform/enrollmentRegistration/applyList/index'
+                                        }
+                                    })
+                                })
+                            }
                         })
                     }
                 })

src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/schoolAudit/index.html

@@ -75,7 +75,7 @@ layout("/layouts/platform.html"){
                     </template>
                 </el-table-column>
                 <el-table-column prop="applyTime" label="填报时间"></el-table-column>
-                <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
                     <template v-slot="{row}">
                         <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"

src/main/resources/views/platform/zhgh/dayofficework/enrollmentRegistration/unionAudit/index.html

@@ -60,7 +60,7 @@ layout("/layouts/platform.html"){
                     </template>
                 </el-table-column>
                 <el-table-column prop="applyTime" label="填报时间"></el-table-column>
-                <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
                     <template v-slot="{row}">
                         <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
@@ -93,11 +93,9 @@ layout("/layouts/platform.html"){
                                       :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
                             <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
                         </el-form-item>
-<!--
-:rules="[{required:true,message:'必填',trigger:['change','blur']}]"
--->
+
                         <el-form-item label="签字" prop="tf_userSign"
-                                      >
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
                             <pc-signature v-model="formData.tf_userSign"></pc-signature>
                         </el-form-item>
                     </el-form>

src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/index.html

@@ -27,7 +27,6 @@ layout("/layouts/platform.html"){
                     <el-table-column prop="honorTypeName" label="荣誉类型"></el-table-column>
                     <el-table-column label="操作" width="200px">
                         <template slot-scope="{row}">
-                            <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
                             <el-button size="mini" type="primary" @click="openApply(row)">申请</el-button>
                         </template>
                     </el-table-column>
@@ -38,6 +37,9 @@ layout("/layouts/platform.html"){
         <template #edit>
             <apply_form ref="applyFormRef" @refresh=""></apply_form>
         </template>
+        <template #view>
+            <info ref="infoRef"></info>
+        </template>
 
     </guava>
 </div>
@@ -57,8 +59,6 @@ layout("/layouts/platform.html"){
             }
         },
         methods: {
-            openView(row) {
-            },
             openApply(row) {
                 $.post("/platform/evaluate/apply/valid", {id: row.id}).then((res) => {
                     if (res.code === 0) {

src/main/resources/views/platform/zhgh/dayofficework/evaluation/branchUnionApproval/index.html

@@ -50,7 +50,7 @@ layout("/layouts/platform.html"){
                 <el-table-column prop="mobile" label="联系方式"></el-table-column>
                 <el-table-column prop="applyDateTime" label="申请时间"></el-table-column>
                 <el-table-column prop="honorName" label="类型" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
                     <template v-slot="{row}">
                         <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"

src/main/resources/views/platform/zhgh/dayofficework/evaluation/schoolUnionApproval/index.html

@@ -58,7 +58,7 @@ layout("/layouts/platform.html"){
                 <el-table-column prop="mobile" label="联系方式"></el-table-column>
                 <el-table-column prop="honorName" label="类型" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="applyDateTime" label="申请时间"></el-table-column>
-                <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
                     <template v-slot="{row}">
                         <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"

src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/schoolAudit/index.html

@@ -67,7 +67,7 @@ layout("/layouts/platform.html"){
                 <el-table-column prop="activityMatter" label="活动项目"></el-table-column>
                 <el-table-column prop="declareTotalBudgetMoney" label="申报预算金额"></el-table-column>
                 <el-table-column prop="applyDate" label="申报时间"></el-table-column>
-                <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
                     <template slot-scope="{row}">
                         <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"

src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/apply/index.html

@@ -18,8 +18,8 @@ layout("/layouts/platform.html"){
                         </el-radio-group>
                     </el-form-item>
                 </el-descriptions-item>
-                <el-descriptions-item label="申报人姓名">{{formData.userName}}</el-descriptions-item>
-                <el-descriptions-item label="申报人工号">{{formData.loginName}}</el-descriptions-item>
+                <el-descriptions-item label="申请人姓名">{{formData.userName}}</el-descriptions-item>
+                <el-descriptions-item label="申请人工号">{{formData.loginName}}</el-descriptions-item>
                 <el-descriptions-item label="联系方式">
                     <el-form-item label="联系方式" prop="mobile"
                                   :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
@@ -95,8 +95,7 @@ layout("/layouts/platform.html"){
                         </el-date-picker>
                     </el-form-item>
                 </el-descriptions-item>
-                <el-descriptions-item
-                        v-if="!['ACTIVITY_BUDGET_TYPE_THREE'].includes(formData.outlayManageSource)"></el-descriptions-item>
+                <el-descriptions-item></el-descriptions-item>
                 <el-descriptions-item label="支付内容" :span="2">
                     <el-form-item label="支付内容" prop="paymentContent"
                                   :rules="[{required:true,message:'必填',trigger:['change','blur']}]">

src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/applyList/index.html

@@ -42,7 +42,7 @@ layout("/layouts/platform.html"){
                     </template>
                 </el-table-column>
                 <el-table-column prop="money" label="金额"></el-table-column>
-                <el-table-column prop="applyTime" label="申报时间"></el-table-column>
+                <el-table-column prop="applyTime" label="申请时间"></el-table-column>
                 <el-table-column prop="taskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
                     <template v-slot="{row}">
@@ -120,6 +120,18 @@ layout("/layouts/platform.html"){
                 })
             },
             doDelete(id) {
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    this.$axios.post("/platform/outlay/reimburse/applyList/doDelete", {id}).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.pageData()
+                        }
+                    })
+                })
             }
         },
         async created() {

src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/clubAudit/index.html

@@ -58,7 +58,7 @@ layout("/layouts/platform.html"){
                 </el-table-column>
                 <el-table-column prop="money" label="金额"></el-table-column>
                 <el-table-column prop="applyTime" label="申报时间"></el-table-column>
-                <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
                     <template v-slot="{row}">
                         <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"

src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/clubZxAudit/index.html

@@ -58,7 +58,7 @@ layout("/layouts/platform.html"){
                 </el-table-column>
                 <el-table-column prop="money" label="金额"></el-table-column>
                 <el-table-column prop="applyTime" label="申报时间"></el-table-column>
-                <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
                     <template v-slot="{row}">
                         <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"

src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolCnAudit/index.html

@@ -72,7 +72,7 @@ layout("/layouts/platform.html"){
                 </el-table-column>
                 <el-table-column prop="money" label="金额"></el-table-column>
                 <el-table-column prop="applyTime" label="申报时间"></el-table-column>
-                <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
                     <template v-slot="{row}">
                         <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"

src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolKjAudit/index.html

@@ -90,7 +90,7 @@ layout("/layouts/platform.html"){
                     </template>
                 </el-table-column>
                 <el-table-column prop="applyTime" label="申报时间"></el-table-column>
-                <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
                     <template v-slot="{row}">
                         <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"

src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolZxAudit/index.html

@@ -90,7 +90,7 @@ layout("/layouts/platform.html"){
                     </template>
                 </el-table-column>
                 <el-table-column prop="applyTime" label="申报时间"></el-table-column>
-                <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
                     <template v-slot="{row}">
                         <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"

src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/unionAudit/index.html

@@ -58,7 +58,7 @@ layout("/layouts/platform.html"){
                 </el-table-column>
                 <el-table-column prop="money" label="金额"></el-table-column>
                 <el-table-column prop="applyTime" label="申报时间"></el-table-column>
-                <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
                     <template v-slot="{row}">
                         <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"

src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/activityList/basicForm.js

@@ -40,11 +40,10 @@ const basicForm = {
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item prop="unionId" label="工会"
-                                          :rules="[{required:true,message:'请选择工会',trigger:['change','blur']}]">
+                            <el-form-item prop="unionId" label="查找工会">
                                 <el-select clearable filterable multiple style="width: 100%"
                                            v-model="formData.unionId"
-                                           placeholder="请选择活动线路"
+                                           placeholder="请选择工会"
                                            @change="onUnionChange">
                                     <el-option :value="item.id"
                                                :key="item.id"

src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/activitySignUp/signUpForm.js

@@ -210,7 +210,7 @@ const SIGN_UP_FORM = {
                         type: "warning"
                     }).then(() => {
                         this.getSIgnUpUserList().then(data => {
-                            const union = this.activityData.unionQuotaAllocationList(v => v.unionId === this.unionId)
+                            const union = this.activityData.unionQuotaAllocationList.find(v => v.unionId === this.unionId)
                             if (data >= union.allocationNum) {
                                 this.$message.error("该活动已满")
                                 return

src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/schoolAudit/index.html

@@ -79,7 +79,7 @@ layout("/layouts/platform.html"){
                     <el-table-column label="所属单位" prop="unitName"></el-table-column>
                     <el-table-column label="报名线路" prop="lineName"></el-table-column>
                     <el-table-column prop="signUpTime" label="报名时间"></el-table-column>
-                    <el-table-column prop="taskName" label="当前节点"></el-table-column>
+                    <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                     <el-table-column prop="instanceState" label="流程状态">
                         <template v-slot="{row}">
                             <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"