diff --git a/src/api/systemaccredit/systemapi.js b/src/api/systemaccredit/systemapi.js index 0979d04..147d222 100644 --- a/src/api/systemaccredit/systemapi.js +++ b/src/api/systemaccredit/systemapi.js @@ -129,4 +129,30 @@ export const createSchemeForDeparment = (data) => { method: 'post', data: data }) +} + + +//搜索岗位列表 +export const searchPostListCont = (data) => { + return request({ + url: '/postpc/search_orgpost_list', + method: 'post', + data: data + }) +} + +export const getorgary = (data) => { + return request({ + url: '/postpc/get_orgary', + method: 'post', + data: data + }) +} +//添加岗位 +export const newAddPostTarget = (data) => { + return request({ + url: '/postpc/new_add_posttarget', + method: 'post', + data: data + }) } \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 9f5f189..bce9ffe 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -506,7 +506,8 @@ export const constantRoutes = [ children: [ { path: 'flow', - component: () => import('@/views/workflow/flow'), + // component: () => import('@/views/workflow/flow'), + component: () => import('@/views/workflow/flow1'), meta: { title: '设置工作时段'} }, ], diff --git a/src/store/getters.js b/src/store/getters.js index 5ab7b4c..a3df8a7 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -3,6 +3,7 @@ const getters = { device: state => state.app.device, token: state => state.user.token, avatar: state => state.user.avatar, - name: state => state.user.name + name: state => state.user.name, + } export default getters diff --git a/src/store/index.js b/src/store/index.js index cccc83f..1ead9d7 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -11,9 +11,56 @@ const store = new Vuex.Store({ modules: { app, settings, - user + user, + tableId: '', + isTried: false, + promoterDrawer: false, + flowPermission1: {}, + approverDrawer: false, + approverConfig1: {}, + copyerDrawer: false, + copyerConfig1: {}, + conditionDrawer: false, + conditionsConfig1: { + conditionNodes: [], + }, }, getters, + + mutations: { + setTableId(status, payload) { + console.log("验证store----------------->",status, payload) + status.tableId = payload + }, + setIsTried(status, payload) { + status.isTried = payload + }, + setPromoter(status, payload) { + status.promoterDrawer = payload + }, + setFlowPermission(status, payload) { + status.flowPermission1 = payload + }, + setApprover(status, payload) { + status.approverDrawer = payload + }, + setApproverConfig(status, payload) { + status.approverConfig1 = payload + }, + setCopyer(status, payload) { + status.copyerDrawer = payload + }, + setCopyerConfig(status, payload) { + status.copyerConfig1 = payload + }, + setCondition(status, payload) { + console.log("Vuex.Store----------->setCondition",status, payload) + status.conditionDrawer = payload + }, + setConditionsConfig(status, payload) { + status.conditionsConfig1 = payload + }, + }, }) export default store diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index b3f33f8..de68e11 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -5,7 +5,8 @@ const { showSettings, fixedHeader, sidebarLogo } = defaultSettings const state = { showSettings: showSettings, fixedHeader: fixedHeader, - sidebarLogo: sidebarLogo + sidebarLogo: sidebarLogo, + } const mutations = { diff --git a/src/views/basicCont/targetLayout.vue b/src/views/basicCont/targetLayout.vue index 70a1367..6979557 100644 --- a/src/views/basicCont/targetLayout.vue +++ b/src/views/basicCont/targetLayout.vue @@ -124,10 +124,13 @@ export default { console.log('岗位',val,checked.checkedNodes) console.log(this.gwFromList); if(checked.checkedNodes.length <= 0){ - this.$refs.postTree.setCheckedKeys([val.id]); - console.log("----------------->",[val.id]); - this.gwFromList.postId = [val.id] - this.gwFromList.gwId=val.id + this.postList = [] + this.postShow=false + this.departShow=true + // this.$refs.postTree.setCheckedKeys([val.id]); + // console.log("----------------->",[val.id]); + // this.gwFromList.postId = [val.id] + // this.gwFromList.gwId=val.id }else{ this.gwFromList.postId = []; checked.checkedNodes.forEach(item => { diff --git a/src/views/basicInfo/gwProject.vue b/src/views/basicInfo/gwProject.vue index 6f04528..ba67968 100644 --- a/src/views/basicInfo/gwProject.vue +++ b/src/views/basicInfo/gwProject.vue @@ -182,7 +182,7 @@ :visible.sync="dialogFormVisible" :before-close="closeDialog" title="新增" - width="40%" + width="50%" > @@ -216,7 +216,7 @@ --> - + + + + + + + + + + + 搜索岗位 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/echarts/table.vue b/src/views/echarts/table.vue index b6289a8..c4d21a8 100644 --- a/src/views/echarts/table.vue +++ b/src/views/echarts/table.vue @@ -124,8 +124,8 @@ @@ -205,10 +205,10 @@
{{scope.row.score[index].achievement}}
--> -
+
{{scope.row.score[index].actualscore}}
-
+
{{scope.row.score[index].actualscore}}
@@ -270,8 +270,8 @@ @@ -349,28 +349,47 @@ @@ -521,6 +540,7 @@ export default { dingliangOldData:[], rowOldData:{}, chengjiYue:'', + chengjiNian:'', showDetails:false, props2: { checkStrictly: true, @@ -662,7 +682,9 @@ export default { liePos:'', transcript:"", transcript_hui:"", - searchChengji:{} + searchChengji:{ + year:0 + } } }, created(){ @@ -671,9 +693,11 @@ export default { this.getGrouplist() this.initialDepartment() this.getscoreTable() - // const timeOne = new Date() - // const year = timeOne.getFullYear() + const timeOne = new Date() + const year = timeOne.getFullYear() // this.transcript_hui = year + this.searchChengji.year = year + this.chengjiNian = year }, // 监听数据 watch: { @@ -721,6 +745,7 @@ export default { if(this.transcript != ""){ this.searchChengji.year = this.transcript.getFullYear().toString() } + this.chengjiNian = this.transcript.getFullYear() console.log("成绩表查询",this.searchChengji) const res = await departmenttranscript(this.searchChengji) this.scoreTableList=res.data @@ -743,7 +768,7 @@ export default { let nowDate = new Date() const from = { department:this.rowOldData.departmentid, - year:nowDate.getFullYear(), + year:this.chengjiNian, month:parseInt(this.chengjiYue), targetid:this.rowOldData.targetid } @@ -756,7 +781,7 @@ export default { let nowDate = new Date() const from = { department:this.rowOldData.departmentid, - year:nowDate.getFullYear(), + year:this.chengjiNian, month:parseInt(this.chengjiYue), targetid:this.rowOldData.targetid } @@ -766,14 +791,13 @@ export default { }, // 点击成绩表后 async clickYue(row,yue){ - let nowDate = new Date() const from = { department:row.departmentid, - year:nowDate.getFullYear(), + year:parseInt(this.searchChengji.year), month:yue } - + console.log("点击成绩表后-->",this.searchChengji.year) this.chengjiYue=yue const res = await summarydetails(from) this.detailsList=res.data @@ -789,6 +813,7 @@ export default { // this.searchInfo.page = 1 // this.searchInfo.pagesize = 10 // this.searchInfo.parentId=this.childInfo.outId + // this.chengjiNian = this.getData() }, // 初始化部门 @@ -1079,7 +1104,45 @@ export default { // } // } }, - + // 点击得分详情后调取历史记录 + clickOldMonth(row,monthVal){ + console.log("点击得分详情后调取历史记录-->",row); + this.rowOldData=row + // 如果是定性 + if (row.type==1) { + this.dingxingOldMonth(monthVal) + } + // 定量 + if (row.type==2) { + this.dingliangOldMonth(monthVal) + } + }, + // 定性历史记录 + async dingxingOldMonth(val){ + let nowDate = new Date() + const from = { + department:this.rowOldData.departmentid, + year:this.chengjiNian, + month:val, + targetid:this.rowOldData.targetid + } + const res = await summarydetailsxinglog(from) + this.dingxingOldData=res.data + this.dxdialogFormVisible=true + }, + // 定量历史记录 + async dingliangOldMonth(val){ + let nowDate = new Date() + const from = { + department:this.rowOldData.departmentid, + year:this.chengjiNian, + month:val, + targetid:this.rowOldData.targetid + } + const res = await summarydetailslianglog(from) + this.dingliangOldData=res.data + this.dldialogFormVisible=true + }, // 查询 // onSubmit(){ @@ -1103,6 +1166,7 @@ export default { } if(this.transcript_hui != ""){ this.searchVersion.year = this.transcript_hui.getFullYear().toString() + this.chengjiNian = this.transcript_hui.getFullYear() } console.log("this.searchVersion") diff --git a/src/views/workflow/flow1.vue b/src/views/workflow/flow1.vue new file mode 100644 index 0000000..6ca8d76 --- /dev/null +++ b/src/views/workflow/flow1.vue @@ -0,0 +1,20 @@ + + + \ No newline at end of file