Browse Source

测试环境与生产环境配置菜单(单位考评评级,考评评级配置页面);修改人员权限配置页面与工作流程配置
页面的跳转页面;修改部门业绩指标计划,业绩指标考评部门服务并联调;

SunZehao 1 year ago
parent
commit
d79aa6e537

+ 1 - 1
src/api/api.js

@@ -147,7 +147,7 @@ export function apiGetevaluationdeptnoticeList(params) {
 //----"通告管理-保存or修改"
 export function apiGetevaluationdeptnoticeSave(params, datas) {
     return httpRequest({
-        url: `evaluation-dept-notice/save?id=${params.id?params.id: ''}&noticeTitle=${params.noticeTitle}&noticeContent=${params.noticeContent}&sendTo=${params.sendTo}&sendToContent=${params.sendToContent}&releaseState=${params.releaseState}&releaseDept=${params.releaseDept}&releasePeople=${params.releasePeople}&serialNumber=${params.serialNumber}`,
+        url: `evaluation-dept-notice/save?id=${params.id?params.id: ''}&noticeTitle=${params.noticeTitle}&noticeContent=${params.noticeContent}&sendTo=${params.sendTo}&sendToContent=${params.sendToContent}&releaseState=${params.releaseState}&releaseDept=${params.releaseDept}&releaseDeptName=${params.releaseDeptName}&releasePeople=${params.releasePeople}&releasePeopleName=${params.releasePeopleName}&serialNumber=${params.serialNumber}`,
         method: 'post',
         header: { 'Content-Type': 'multipart/form-data' },
         mimeType: 'multipart/form-data',

+ 2 - 0
src/components/assessment/evaluationDeptBusinessPage.vue

@@ -108,9 +108,11 @@ export default {
         // 查询列表页面
         getevaluBusinessList() {
             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
             }

+ 5 - 3
src/components/assessment/evaluationUnitRatingPage.vue

@@ -401,7 +401,7 @@ export default {
         handleImport() {
             this.$refs.importPage.upload.title = "单位考评评级"
             this.$refs.importPage.upload.open = true
-            this.$refs.importPage.upload.url = '/evaluation-dept-rating/import'
+            this.$refs.importPage.upload.url = '/organization-rating/import'
         },
         successImport(val) {
             this.getevaluRatingList()
@@ -413,14 +413,16 @@ export default {
             //根据数据自己调整
             let colums = []
             colums = [
-                { header: 'ID', key: 'id', width: 26 },
+                { header: 'ID', key: 'id', width: 26, hidden: true},
                 { header: '考评单位', key: 'organizationShortName', width: 26 },
-                { header: '业务板块', key: 'binSectionName', width: 26 },
+                { header: '考评单位ID', key: 'organizationId', width: 26, hidden: true },
+                { header: '业务板块ID', key: 'binSection', width: 26, hidden: true },
                 { header: '考评年度', key: 'year', width: 26 },
                 { header: '生成经营评级', key: 'scjyRate', width: 26 },
                 { header: '前期评级', key: 'qqRate', width: 26 },
                 { header: '基建评级', key: 'jjRate', width: 26 },
                 { header: '年度评级', key: 'yearRate', width: 26 },
+                { header: '备注', key: 'remake', width: 26 },
             ]
             worksheet.columns = colums
             worksheet.getRow(1).font = {

+ 10 - 1
src/components/menuTreeconfig.vue

@@ -34,7 +34,7 @@ export default {
     name: 'MenuTree',
     methods: {
         open(item) {
-            if (item === '人员权限配置' || item === '工作流程配置') {
+            if (item === '人员权限配置') {
                 let url = ''
                 if (window.location.href.includes('10.65.78.23')) {
                     url = 'http://10.65.78.23:9098/#/login'
@@ -43,6 +43,15 @@ export default {
                 }
                 window.open(url, 'blank')
             }
+            if(item === '工作流程配置') {
+                let url = ''
+                if (window.location.href.includes('10.65.78.23')) {
+                    url = 'http://10.65.78.23:8080/agilebpm-ui/index.html'
+                } else {
+                    url = 'http://10.65.79.85:8080/agilebpm-ui/index.html'
+                }
+                window.open(url, 'blank')
+            }
         }
     }
 }

+ 7 - 5
src/components/notification/notificationMangePage.vue

@@ -122,7 +122,7 @@
                                         <el-option
                                         v-for="item in departData"
                                         :key="item.id"
-                                        :label="item.keyName"
+                                        :label="item.name"
                                         :value="item.id">
                                         </el-option>
                                     </el-select>
@@ -266,7 +266,7 @@ import fileDelete from '../../assets/btnIcon/fileDelete.png'
 import draft from '../../assets/btnIcon/draft.png'
 import release from '../../assets/btnIcon/release.png'
 import {apiGetevaluationdeptnoticeList, apiGetevaluationdeptnoticeSave,apievaluationdeptnoticeDelete,
-apiGetdatadictionaryList, apiPostevaluationdeptnoticeDelete, apiPostevaluationdeptnoticeModifiedState,
+apiGetorganizationstructureFromTree, apiPostevaluationdeptnoticeDelete, apiPostevaluationdeptnoticeModifiedState,
 apiGetevaluationdeptnoticeFilePreview} from '../../api/api'
 export default {
     components: {
@@ -372,11 +372,13 @@ export default {
         getDepartmentFromTreeData() {
             let that = this
             let params = {
-                superKey: 'BM0001'
+                id: '23031001',
+                num: 1,
+                type: 140
             }
-            apiGetdatadictionaryList(params).then(datas =>{
+            apiGetorganizationstructureFromTree(params).then(datas =>{
                 if (datas && datas.data) {
-                    that.departData = datas.data
+                    that.departData = datas.data[0].children
                 }
             })
         },