diff --git a/src/api/api_flow_manager.js b/src/api/api_flow_manager.js new file mode 100644 index 0000000..7c87ace --- /dev/null +++ b/src/api/api_flow_manager.js @@ -0,0 +1,10 @@ +import http from '../utils/http' + +// 获取侧边菜单栏 +export const apiGetFlowList = params => { + return http({url: '/lz_management/user/lzflowmanager/list', method: 'get', params}) +} + +export const apiFlowInfo = params => { + return http({url: `/lz_management/user/lzflowmanager/info/${params}`, method: 'post'}) +} diff --git a/src/views/modules/result/chart/componments/chart-bar-form/index.vue b/src/views/modules/result/chart/componments/chart-bar-form/index.vue index 66629a1..a321d77 100644 --- a/src/views/modules/result/chart/componments/chart-bar-form/index.vue +++ b/src/views/modules/result/chart/componments/chart-bar-form/index.vue @@ -1,7 +1,7 @@ @@ -25,17 +25,25 @@ }, data () { return { + clickAble: true } }, mounted () { this.initChartBar() }, - watch: { // 监听到数据然后赋值 + watch: { dataInfo () { this.initChartBar() } }, methods: { + jump: function (e) { + if (this.clickAble) { + console.log('跳转') + } else { + this.clickAble = true + } + }, initChartBar () { var staffTotal = this.dataInfo.total var option = { @@ -56,9 +64,9 @@ } }, // 图例 - legend: { + /* legend: { data: ['人数'] - }, + }, */ // x轴 xAxis: { name: '等级', @@ -95,6 +103,10 @@ var echarts = require('echarts') this.chartBar = echarts.init(document.getElementById(this.aId)) this.chartBar.setOption(option) + this.chartBar.on('click', function (param) { + this.clickAble = false + console.log(param) + }.bind(this)) window.addEventListener('resize', () => { this.chartBar.resize() }) diff --git a/src/views/modules/result/record/approval-add-or-update.vue b/src/views/modules/result/record/approval-add-or-update.vue index 56ca723..e5b2889 100644 --- a/src/views/modules/result/record/approval-add-or-update.vue +++ b/src/views/modules/result/record/approval-add-or-update.vue @@ -6,16 +6,6 @@ -
@@ -23,9 +13,10 @@
- 通过 - 通过 - 驳回 + 通过 + 通过 + 驳回 + 申述 diff --git a/src/views/modules/result/record/lzresultrecord.vue b/src/views/modules/result/record/lzresultrecord.vue index c5cae7d..8be95eb 100644 --- a/src/views/modules/result/record/lzresultrecord.vue +++ b/src/views/modules/result/record/lzresultrecord.vue @@ -138,6 +138,10 @@ export default { return '审批通过' } else if (status === 5) { return '驳回' + } else if (status === 6) { + return '申述中' + } else if (status === 7) { + return '己终止' } return '' }, @@ -183,7 +187,10 @@ export default { {value: '1', label: '审批中'}, {value: '2', label: '拒绝'}, {value: '3', label: '审批中'}, - {value: '4', label: '审批通过'} + {value: '4', label: '审批通过'}, + {value: '5', label: '驳回'}, + {value: '6', label: '申述中'}, + {value: '7', label: '己终止'} ], departmentList1: [], departmentList2: [], diff --git a/src/views/modules/result/record/lzresultrecordapp.vue b/src/views/modules/result/record/lzresultrecordapp.vue index 96eba4e..8afef62 100644 --- a/src/views/modules/result/record/lzresultrecordapp.vue +++ b/src/views/modules/result/record/lzresultrecordapp.vue @@ -63,8 +63,6 @@ - - @@ -73,7 +71,7 @@ 查询 - + - - 提交 + + 批量操作 - - - + + + - + { recordIdsSubmit({ - 'recordIds': this.recordIdsSelect.join(',') + 'recordIds': this.recordIdsSelect.join(','), + 'batchOpt': this.dataForm.batchOpt }).then(data => { this.alertInfo(data.msg) this.getDataList() @@ -347,6 +358,7 @@ export default { if (data && data.code === 0) { this.dataList = data.page.list this.totalPage = data.page.totalCount + this.departmentLevel = data.departmentLevel if (this.isChangeDepartmentrtment === 0) { this.departmentList1 = data.departmentList1 this.departmentList2 = data.departmentList2 @@ -400,7 +412,6 @@ export default { this.pageIndex = val this.getDataList() }, - // 多选 selectionChangeHandle (val) { this.dataListSelections = val diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue index 5e4e9b2..454b47e 100644 --- a/src/views/modules/result/record/recorddetail.vue +++ b/src/views/modules/result/record/recorddetail.vue @@ -47,10 +47,10 @@
- +
-
+
diff --git a/src/views/modules/result/report/componments/chart-form/index.vue b/src/views/modules/result/report/componments/chart-form/index.vue deleted file mode 100644 index bca9343..0000000 --- a/src/views/modules/result/report/componments/chart-form/index.vue +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - diff --git a/src/views/modules/result/report/componments/query-form/index.vue b/src/views/modules/result/report/componments/query-form/index.vue deleted file mode 100644 index 20b8ac6..0000000 --- a/src/views/modules/result/report/componments/query-form/index.vue +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - diff --git a/src/views/modules/result/report/own.vue b/src/views/modules/result/report/own.vue deleted file mode 100644 index 701484f..0000000 --- a/src/views/modules/result/report/own.vue +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - diff --git a/src/views/modules/result/role/lzflowmanager-add-or-update.vue b/src/views/modules/result/role/lzflowmanager-add-or-update.vue new file mode 100644 index 0000000..19f5e09 --- /dev/null +++ b/src/views/modules/result/role/lzflowmanager-add-or-update.vue @@ -0,0 +1,111 @@ + + + diff --git a/src/views/modules/result/role/lzflowmanager.vue b/src/views/modules/result/role/lzflowmanager.vue new file mode 100644 index 0000000..775a8fd --- /dev/null +++ b/src/views/modules/result/role/lzflowmanager.vue @@ -0,0 +1,177 @@ + + +