commit

src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateMineController.java

@@ -80,6 +80,7 @@ public class EvaluateMineController {
         Cnd cnd = Cnd.NEW();
         cnd.andEX("YEAR(info.year)", "=", year);
         cnd.and("info.loginName", "=", SecurityUtil.getUserLoginname());
+		cnd.desc("info.createdAt");
         sql.setCondition(cnd);
         Pagination pagination = evaluateService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
         return Result.success(pagination);

src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorManageController.java

@@ -64,7 +64,7 @@ public class HonorManageController {
         Sql sql = Sqls.create("""
                 SELECT
                 	h.*,
-                	u.loginname,
+                	u.loginName,
                 	prize.`name` AS prizeName,
                 	type.`name` AS typeName,
                 	`level`.`name` AS levelName,

src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html

@@ -145,7 +145,7 @@ layout("/layouts/platform.html"){
                     type: "warning"
                 }).then(() => {
                     this.$axios.post('/platform/article/write/submitAgain', {
-                        info: JSON.stringify(this.formData),
+                        article: JSON.stringify(this.formData),
                         taskId: GetQueryString("taskId")
                     }).then(res => {
                         if (res.code === 0) {

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

@@ -236,7 +236,6 @@ layout("/layouts/platform.html"){
             openAdd() {
                 this.stepActive = 0
                 this.dialogVisible = true
-                this.formData={}
                 this.$nextTick(() => {
                     this.$refs.formRef.resetFields()
                 })

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

@@ -60,6 +60,10 @@ layout("/layouts/platform.html"){
         },
         methods: {
             openApply(row) {
+                if(this.$moment().isAfter(this.$moment(row.endTime))) {
+                    this.$message.warning('申请时间已截止')
+                    return
+                }
                 $.post("/platform/evaluate/apply/valid", {id: row.id}).then((res) => {
                     if (res.code === 0) {
                         const {msg, data} = res

src/main/resources/views/platform/zhgh/dayofficework/honor/manage/index.html

@@ -34,7 +34,7 @@ layout("/layouts/platform.html"){
                 </search-item>
                 <search-item label="获奖工会">
                     <el-select v-model="pageForm.unionName" placeholder="请选择获奖工会" @change="doSearch" style="width: 100%" clearable>
-                        <el-option v-for="o in unionList" :key="o.id" :label="o.unionname" :value="o.unionname"></el-option>
+                        <el-option v-for="o in unionList" :key="o.id" :label="o.name" :value="o.id"></el-option>
                     </el-select>
                 </search-item>
             </search>
@@ -262,8 +262,7 @@ layout("/layouts/platform.html"){
                     unitName
             },
             openEdit(row) {
-                this.$store.dispatch("pjaxRoute", "/platform/honor/registration?id=" + row.id)
+                commonUtil.pjaxPush("/platform/honor/registration?id=" + row.id)
-                // window.location.href = "/platform/honor/registration?id=" + row.id
             },
             async doDelete(row) {
                 const { id } = row
@@ -325,6 +324,7 @@ layout("/layouts/platform.html"){
                 }
             },
             async honorTypeChange(val) {
+                this.tableData = []
                 this.honorPrizeList = await this.getHonorPrize(val)
                 const data = this.honorTypeList.find((v) => v.id === val)
                 if (data) {
@@ -334,6 +334,7 @@ layout("/layouts/platform.html"){
             }
         },
         async created() {
+            this.unionList = await this.$businessTool.listUnion()
             await this.initData()
             await this.pageData()
         }

src/main/resources/views/platform/zhgh/dayofficework/honor/registration/index.html

@@ -230,9 +230,9 @@ layout("/layouts/platform.html"){
                             </el-row>
 
                             <el-row type="flex" :gutter="20">
-                                <el-col :span="12" v-if="formData.honorType== 'HONOR_LIST'">
+                                <el-col :span="12" v-if="formData.queryTypeCode == 'HONOR_LIST'">
                                     <el-form-item label="参加比赛名称" prop="gameName">
-                                        <el-input v-model="formData.gameName" maxlength="100"></el-input>
+                                        <el-input v-model="formData.gameName" maxlength="100" placeholder="请输入参加比赛名称"></el-input>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="12">
@@ -303,7 +303,7 @@ layout("/layouts/platform.html"){
                     if (res.code === 0) {
                         this.$message.success("操作成功，即将跳转至台账界面")
                         setTimeout(() => {
-                            pjaxReplace("/platform/honor/manage")
+                            commonUtil.pjaxPush("/platform/honor/manage")
                         }, 500)
                     } else {
                         this.$message.error(res.msg)
@@ -423,6 +423,7 @@ layout("/layouts/platform.html"){
         },
         created() {
             this.initData()
+            this.isEdit = GetQueryString("id")
             if (GetQueryString("id")) {
                 this.findData(GetQueryString("id"))
             }