COYS

src/views/home/works.vue

@@ -176,6 +176,11 @@ export default {
         return str
       } else if (type == 2) {
         //返回跳转文字
+        //履职
+        if (val == 0 && taskType == 2) {
+          strName = '进行中'
+        }
+        // id=1714836777629044738&enable=1&taskDate=2023-10-19
         //监控调阅
         if (val == 3 && taskType == 1) {
           strName = '调阅中'
@@ -218,7 +223,7 @@ export default {
           pathInfo = '/personnelSignature/' + id + '_edit'
         }
         //履职跳转
-        if (val == 0 && taskType == 1) {
+        if (val == 0 && taskType == 1||val == 0 && taskType == 2) {
 
           pathInfo = `/resumption_detail?id=${id}&enable=${taskType}&taskDate=${item.startTime.split(' ')[0]}
 `        }

src/views/menu/rehearsalTask/optimal.vue

@@ -13,10 +13,8 @@
           ><van-field
             v-model="fieldValue"
             label-width="3em"
-            
             :disabled="showStatus"
             label="状态"
-            
             placeholder=""
             @click="showStatus = true"
             ><van-icon name="arrow-down" slot="button"
@@ -36,7 +34,6 @@
         <van-col span="9">
           <van-field
             v-model="currentDate"
-            
             label-width="3em"
             label="年份"
             placeholder=""
@@ -103,7 +100,7 @@
               <div>{{ item.commentScore }}</div>
             </div>
             <div class="mainItem" @click="goInfo(item.id)">
-              <div>评分状态</div>
+              <div>评优状态</div>
               <div>{{ item.recStatusText }}</div>
             </div>
           </div>
@@ -148,7 +145,7 @@ export default {
       columnsList: [],
       showStatus: false, //状态显示隐藏
       showDate: false, //月份显示隐藏
-      fieldValue: '全部', //状态名称
+      fieldValue: '', //状态名称
       statusValue: ' ', //状态值
       columns: [], //状态数组
       currentDate: newDateYear() //年份
@@ -168,31 +165,48 @@ export default {
 
   created() {
     this.presentDate = new Date(newDateYear())
+    let orgType = window.sessionStorage.getItem('SET_USER_ORGTYPE')
+      switch (orgType) {
+        case '2':
+          this.fieldValue = '已推荐地区优秀案例'
+          this.statusValue='2'
+          break
+        case '3':
+          this.fieldValue = '正常案例'
+          this.statusValue='0'
+          break
+        case '1':
+          this.fieldValue = '已推荐省级优秀案例'
+          this.statusValue='4'
+          break
 
+        default:
+          break
+      }
     this.yearData()
     this.getNewMonth()
   },
   mounted() {
-    this.init()
     this.cascaderValue = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
+    this.init()
   },
   methods: {
     getNewMonth() {
       //获取当前月份
       let date = new Date().getMonth() + 1
-     
+
       //默认填充当前季度
       if (date > 7 && date < 10) {
-        this.active='07-01'
+        this.active = '07-01'
         //三季度
-      }else if(date > 4 && date < 7){
+      } else if (date > 4 && date < 7) {
         //二季度
-        this.active='04-01'
-      }else if(date > 1 && date < 4){
+        this.active = '04-01'
+      } else if (date > 1 && date < 4) {
         //一季度
-        this.active='01-01'
-      }else{
-        this.active='10-01'
+        this.active = '01-01'
+      } else {
+        this.active = '10-01'
         // 四季度
       }
     },
@@ -202,7 +216,7 @@ export default {
       this.orgName = val.name
       this.selectListAppHandler()
     },
-    // 当前行社 3 -> 0:正常案例、1:行社优秀案例、2:已推荐地区优秀案例
+    // 当前行社 3 -> 0:正常案例、1:行社优秀案例、
 
     // 当前地区 2 -> 2:已推荐地区优秀案例、3:地区优秀案例、4:已推荐省级优秀案例
 
@@ -211,23 +225,27 @@ export default {
     isSign(item) {
       let orgType = window.sessionStorage.getItem('SET_USER_ORGTYPE')
       if (orgType == '2') {
-        if (item.recStatus == 2 || item.recStatus == 3 || item.recStatus == 4) {
+        if (item.recStatus == 2 || item.recStatus == 3) {
           return true
+        } else {
+          return false
         }
         // 办事处
       } else if (orgType == 3) {
-        if (item.recStatus == 0 || item.recStatus == 1 || item.recStatus == 2) {
+        if (item.recStatus == 0 || item.recStatus == 1) {
           return true
+        } else {
+          return false
         }
         // 行社
       } else if (orgType == 1) {
         if (item.recStatus == 4 || item.recStatus == 5) {
           return true
+        } else {
+          return false
         }
         // 省联社
       }
-
-      return true
     },
     //清空查询条件
     clearSearch() {
@@ -249,7 +267,11 @@ export default {
         this.columnsList = res
         this.columns = res.map(item => item.dictLabel)
         this.columns.unshift('全部')
+        
+        // fieldValue
       })
+     
+
       this.selectListAppHandler()
     },
     selectListAppHandler(type = 0, callback = () => {}) {
@@ -309,8 +331,7 @@ export default {
     },
     //月份选中触发
     onDateConfirm(val) {
-     
-      this.currentDate = this.newDate(val+'')
+      this.currentDate = this.newDate(val + '')
 
       this.showDate = false
       this.selectListAppHandler()