coys

src/views/home/works.vue

@@ -32,7 +32,7 @@
               v-for="(i, index) in item.dataList"
               :key="index"
               class="mainTitle"
-              :value="worksLink(2, item.taskType, i.status)"
+              :value="worksLink(2, item.taskType, i.recStatus? i.recStatus:i.status)"
               :title="i.taskName"
               :label="i.startTime + '-' + i.endTime"
               is-link
@@ -192,6 +192,8 @@ export default {
           strName = '待签名'
         }else if (val == 4 && taskType == 5) {
           strName = '待提交'
+        }else if (val == 4 && taskType == 10) {
+          strName = '待评优'
         }
         //教育培训
         if (val == 5 && taskType == 0) {
@@ -207,6 +209,7 @@ export default {
         return path
       } else {
         //返回详情路径
+        // taskType==status
         //监控调阅
         if (val == 3 && taskType == 1) {
           strName = '调阅中'
@@ -220,6 +223,10 @@ export default {
         if (val == 4 && taskType == 1) {
           pathInfo = '/rehearsalTaskSign/' + id + '_edit'
         }
+        //评优推优跳转
+        if (val == 4 && taskType == 10) {
+          pathInfo = '/commentSign/' + id + '_comment'
+        }
         //教育培训签名跳转
         if (val == 5 && taskType == 1) {
           pathInfo = '/personnelSignature/' + id + '_edit'

src/views/menu/rehearsalTask/components/rehearsalTaskSign.vue

@@ -336,8 +336,12 @@ export default {
     },
     clickChekcBox(v) {
       console.log(v)
+      console.log(this.resultList[0]);
       if (v[0] == this.resultList[0].value) {
-        this.resultList[1].disabled = this.disabledCheck('false')
+        if(this.resultList[1]){
+
+          this.resultList[1].disabled = this.disabledCheck('false')
+        }
         // if(v.length>1){
         //   this.result=[]
         // }
@@ -346,6 +350,7 @@ export default {
         this.result = []
       } else {
         this.resultList[1].disabled = this.disabledCheck('true')
+        
         // this.result=[]
       }
     },

src/views/menu/rehearsalTask/index.vue

@@ -276,7 +276,7 @@ export default {
       let endDate = Date.parse(new Date(list.endDate))
       //任务处于待记录状态，且任务在规定完成时间范围内，登录人所在机构和角色与任务培训角色、培训机构一致才显示
 
-      if (list.startDate && list.endDate && list.status == 0) {
+      if (list.startDate && list.endDate && (list.status == 0||list.status==5)) {
         if (date >= startDate && date <= endDate) {
           timefalg = true
         }

src/views/menu/rehearsalTask/optimal.vue

@@ -378,7 +378,7 @@ export default {
       })
     },
 
-    //培训登记跳转
+    //评优推优跳转
     commentSign(id) {
       this.$router.push('/commentSign/' + id + '_comment')
     },

vue.config.js

@@ -109,8 +109,8 @@ module.exports = defineConfig({
         }
       },
       '/dev': {
-        target: "http://10.87.10.55:8080",
-        // target: "http://10.87.10.47:8080",
+        // target: "http://10.87.10.55:8080",
+        target: "http://10.87.10.34:8080",
         // target: "http://47.92.229.224:8080",
         // ws:true,
         changOrigin:true,