Pārlūkot izejas kodu

部门业绩指标计划,业绩指标考评相关的页面修改选择部门数据,前端增加部门人员查看权限,详情页面功能修改增加当前登录人部门参数;任务中心关于部门的有关详情页面功能修改增加当前登录人部门参数;新增单位考评评级页面及其新增页面并且服务联调;

SunZehao 1 gadu atpakaļ
vecāks
revīzija
aed3d99853

+ 3 - 3
src/api/api.js

@@ -23,8 +23,8 @@ export function apiGetModel(url, params) {
 //获取菜单数据
 export function apiGetMenuData() {
     return httpRequest({
-        // url: 'menu/menuList?parentId=10105', // 测试
-        url: 'menu/menuList?parentId=6802', // 生产
+        url: 'menu/menuList?parentId=10105', // 测试
+        // url: 'menu/menuList?parentId=6802', // 生产
         method: 'post'
     })
 }
@@ -334,7 +334,7 @@ export function apiGetdeptresponDetail(params) {
 //------部门考评启动-详情
 export function apiGetevaluationdeptplanDetail(params) {
     return httpRequest({
-        url: `evaluation-dept-plan/details/${params}`,
+        url: `evaluation-dept-plan/details/${params.id}/${params.deptId}`,
         method: 'get'
     })
 }

+ 15 - 6
src/components/assessment/evaluationDeptBusinessFrom.vue

@@ -188,16 +188,20 @@ export default {
     created() {
         this.statusData = [
             {
-                name: '已完成',
-                id: '1'
+                name: '已通过',
+                id: '0'
             },
             {
                 name: '待审核',
-                id: '0'
+                id: '-1'
             },
             {
-                name: '未开始',
-                id: '-1'
+                name: '未通过',
+                id: '-2'
+            },
+            {
+                name: '已批准',
+                id: '1'
             }
         ]
     },
@@ -235,7 +239,12 @@ export default {
         getDetails(id) {
             let that = this
             that.quantifiedList = []
-            apiGetevaluationdeptplanDetail(id).then(datas =>{
+            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+            let params = {
+                id: id,
+                deptId: userMes.deptId
+            }
+            apiGetevaluationdeptplanDetail(params).then(datas =>{
                 if (datas && datas.data) {
                     that.quantifiedList = datas.data
                     that.pageLeft.total = datas.data.length

+ 15 - 6
src/components/assessment/evaluationDeptStartFrom.vue

@@ -205,16 +205,20 @@ export default {
     created() {
         this.statusData = [
             {
-                name: '已完成',
-                id: '1'
+                name: '已通过',
+                id: '0'
             },
             {
                 name: '待审核',
-                id: '0'
+                id: '-1'
             },
             {
-                name: '未开始',
-                id: '-1'
+                name: '未通过',
+                id: '-2'
+            },
+            {
+                name: '已批准',
+                id: '1'
             }
         ]
     },
@@ -264,7 +268,12 @@ export default {
         getDetails(id) {
             let that = this
             that.quantifiedList = []
-            apiGetevaluationdeptplanDetail(id).then(datas =>{
+            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+            let params = {
+                id: id,
+                deptId: userMes.deptId
+            }
+            apiGetevaluationdeptplanDetail(params).then(datas =>{
                 if (datas && datas.data) {
                     that.quantifiedList = datas.data
                     that.pageLeft.total = datas.data.length

+ 10 - 1
src/components/assessment/evaluationDeptStartPage.vue

@@ -234,9 +234,11 @@ export default {
         // 查询列表页面
         getevaluStartList() {
             let that = this
+            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
             let params = {
                 pageNum: that.page.currentPage,
                 pageSize: that.page.pagesize,
+                deptId: userMes.deptId,
                 responsibilityCode: that.rescode,
                 des: that.resDes
             }
@@ -402,7 +404,14 @@ export default {
         },
         //明细
         getDetail(row) {
-            this.$refs.startFromDetail.init(row, this.departData)
+            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+            if (row.stage === '流程未启动') {
+                if (userMes.deptId === '23031009') {
+                    this.$refs.startFromDetail.init(row, this.departData)
+                }
+            } else {
+                this.$refs.startFromDetail.init(row, this.departData)
+            }
         },
         seeStates(row) {
             if (!row.instId) {

+ 15 - 6
src/components/taskCenter/taskCenterDeptBusinessFrom.vue

@@ -194,16 +194,20 @@ export default {
     created() {
         this.statusData = [
             {
-                name: '已完成',
-                id: '1'
+                name: '已通过',
+                id: '0'
             },
             {
                 name: '待审核',
-                id: '0'
+                id: '-1'
             },
             {
-                name: '未开始',
-                id: '-1'
+                name: '未通过',
+                id: '-2'
+            },
+            {
+                name: '已批准',
+                id: '1'
             }
         ]
     },
@@ -232,6 +236,11 @@ export default {
         getDetails(id) {
             let that = this
             that.quantifiedList = []
+            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+            let params = {
+                id: id,
+                deptId: userMes.deptId
+            }
             apiGetevaluationdeptassessmentDetailHeader(id).then(datas =>{
                 if (datas && datas.data) {
                     let item = datas.data
@@ -247,7 +256,7 @@ export default {
                     }
                 }
             })
-            apiGetevaluationdeptplanDetail(id).then(datas =>{
+            apiGetevaluationdeptplanDetail(params).then(datas =>{
                 if (datas && datas.data) {
                     that.quantifiedList = datas.data
                     that.pageLeft.total = datas.data.length

+ 15 - 6
src/components/taskCenter/taskCenterDeptStartFrom.vue

@@ -212,16 +212,20 @@ export default {
     created() {
         this.statusData = [
             {
-                name: '已完成',
-                id: '1'
+                name: '已通过',
+                id: '0'
             },
             {
                 name: '待审核',
-                id: '0'
+                id: '-1'
             },
             {
-                name: '未开始',
-                id: '-1'
+                name: '未通过',
+                id: '-2'
+            },
+            {
+                name: '已批准',
+                id: '1'
             }
         ]
     },
@@ -274,6 +278,11 @@ export default {
         getDetails(id) {
             let that = this
             that.quantifiedList = []
+            let userMes = JSON.parse(window.sessionStorage.getItem('user'))
+            let params = {
+                id: id,
+                deptId: userMes.deptId
+            }
             apiGetevaluationdeptplanDetailHeader(id).then(datas =>{
                 if (datas && datas.data) {
                     let item = datas.data
@@ -289,7 +298,7 @@ export default {
                     }
                 }
             })
-            apiGetevaluationdeptplanDetail(id).then(datas =>{
+            apiGetevaluationdeptplanDetail(params).then(datas =>{
                 if (datas && datas.data) {
                     that.quantifiedList = datas.data
                     that.pageLeft.total = datas.data.length

+ 3 - 3
src/utils/baseUrl.js

@@ -10,15 +10,15 @@ switch (process.env.NODE_ENV) {
     case 'development': 
         baseUrl.ROOT = "/api"  //开发环境url
         // baseUrl.URL = "http://10.65.59.67:28800"
-        baseUrl.URL = "http://192.168.2.10:28800"
+        baseUrl.URL = "http://192.168.2.8:28800"
         // baseUrl.URL = "http://10.65.78.23:28800"  //测试环境
         // baseUrl.URL = "http://10.65.78.81:28800"  // 正式环境
         break
  
     case 'production': 
         // baseUrl.ROOT = "http://123.60.219.66:28800/"
-        // baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
-        baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
+        baseUrl.ROOT = "http://10.65.78.23:28800/" //测试环境
+        // baseUrl.ROOT = "http://10.65.78.81:28800/"  // 正式环境
         break 
 }