coys преди 2 години
родител
ревизия
d64c6289d9
променени са 5 файла, в които са добавени 35 реда и са изтрити 22 реда
  1. 14 0
      src/api/evaluateTask.js
  2. 1 1
      src/views/home/works.vue
  3. 9 11
      src/views/menu/resumptionEvaluate/index.vue
  4. 9 9
      src/views/menu/training/index.vue
  5. 2 1
      vue.config.js

+ 14 - 0
src/api/evaluateTask.js

@@ -0,0 +1,14 @@
+// 外包履职评价
+import request from '@/utils/request'
+
+
+// 分页
+export function getEvaluatePage(query) {
+  return request({
+    url: '/core/task/list',
+    
+    method: 'get',
+    params:query
+  })
+}
+

+ 1 - 1
src/views/home/works.vue

@@ -73,7 +73,7 @@ export default {
     if (this.orgId) {
       this.$refs.topbar.getTheWeather()
     }
-    if(this.$refs.list.length>0){
+    if(this.$refs.list?.length>0){
       this.big_box='big_boxTwo'
     }
   },

+ 9 - 11
src/views/menu/resumptionEvaluate/index.vue

@@ -3,7 +3,7 @@
     <div class="topBox">
       <NavBar :go="{ type: 'push', path: '/menu' }" />
       <van-row>
-        <van-col span="24"> <van-search v-model="value" placeholder="请输入搜索关键词" @search="onSearch" /></van-col>
+        <van-col span="24"> <van-search v-model="evaluateName" placeholder="请输入搜索关键词" @search="onSearch" /></van-col>
       </van-row>
       <van-row>
         <van-col span="24">
@@ -92,7 +92,7 @@
 <script>
 import NavBar from '@/components/NavBar'
 import { Col, Row, Cascader, Dialog, DatetimePicker, Icon, Picker } from 'vant'
-import { getdrillTask } from '@/api/drillTask.js'
+import { getEvaluatePage } from '@/api/evaluateTask.js'
 import { deptTreeList } from '@/api/toConsult.js'
 import { Toast } from 'vant'
 import OrgTree from '@/components/orgTree'
@@ -106,7 +106,7 @@ export default {
       pageNum: 1,
       loading: false, //加载状态
       finished: false, //是否全部加载完毕
-      value:'',
+      evaluateName:'',
       yearColumns: [],
 
       orgName: JSON.parse(sessionStorage.getItem('SET_USER_ORGNAME')) || '', //机构名称
@@ -119,7 +119,7 @@ export default {
         children: 'children'
       },
       taskList: [{}], //列表数据
-      typeValue: ' ', //类型值
+      
       yearSelect: null,
       value1: JSON.parse(sessionStorage.getItem('SET_USER_ID')) || '', //输入框model
 
@@ -173,7 +173,7 @@ export default {
     //初始化
     init() {
       //获取数据字典
-      this.getDictHandler('drill_task_status', res => {
+      this.getDictHandler('plan_status', res => {
         this.columnsList = res
         this.columns = res.map(item => item.dictLabel)
         this.columns.unshift('全部')
@@ -183,7 +183,7 @@ export default {
     },
     selectListAppHandler(type = 0, callback = () => {}) {
       let obj = {
-        isAppSelect: 1,
+        evaluateName:this.evaluateName,
         pageNum: this.pageNum,
         pageSize: 10
       }
@@ -198,14 +198,12 @@ export default {
       obj.orgId = this.cascaderValue || JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + '' || ''
 
       if (this.currentDate) {
-        obj.date = this.currentDate + '-' + this.active
-      }
-      if (this.typeValue) {
-        obj.type = this.typeValue
+        obj.date = this.currentDate 
       }
+      
 
       //获取任务列表
-      getdrillTask(obj).then(res => {
+      getEvaluatePage(obj).then(res => {
         let { code, rows, msg } = res
         if (code == 200) {
           if (type) {

+ 9 - 9
src/views/menu/training/index.vue

@@ -278,7 +278,7 @@ export default {
     },
     //判断是否展示登记按钮
     isSign(list) {
-      let falg = false
+      let falg = true
       let timefalg = false
       //value1 当前登陆用户ID
       let date = new Date().getTime()
@@ -293,14 +293,14 @@ export default {
       }
       //cascaderValue  当前机构ID
       //当前用户角色ID
-      let roleL = JSON.parse(sessionStorage.getItem('SET_USER_ROLELIST'))
-      roleL.forEach(i => {
-        list.taskRoleList.forEach(item => {
-          if (this.cascaderValue == list.orgId && i.roleId == item.roleId) {
-            falg = true
-          }
-        })
-      })
+      // let roleL = JSON.parse(sessionStorage.getItem('SET_USER_ROLELIST'))
+      // roleL.forEach(i => {
+      //   list.taskRoleList.forEach(item => {
+      //     if (this.cascaderValue == list.orgId && i.roleId == item.roleId) {
+      //       falg = true
+      //     }
+      //   })
+      // })
       if (date > endDate) {
         //当前时间大于结束时间表示已超期
 

+ 2 - 1
vue.config.js

@@ -109,7 +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.91:8080",
         // ws:true,
         changOrigin:true,
         pathRewrite:{