diff --git a/config/index.js b/config/index.js index a222aa5..72e858a 100644 --- a/config/index.js +++ b/config/index.js @@ -19,6 +19,7 @@ module.exports = { }, // Various Dev Server settings + // host: '192.168.43.94', // can be overwritten by process.env.HOST host: IP, // can be overwritten by process.env.HOST port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, diff --git a/package-lock.json b/package-lock.json index 5557794..9a5c8d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -116,9 +116,9 @@ } }, "ajv": { - "version": "6.12.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz", - "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==", + "version": "6.12.4", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz", + "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==", "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", 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 fd2960f..00988e8 100644 --- a/src/views/modules/result/record/approval-add-or-update.vue +++ b/src/views/modules/result/record/approval-add-or-update.vue @@ -4,9 +4,7 @@ :close-on-click-modal="false" :visible.sync="visible"> - - - + - - - +
- - - 通过 - 侍提交 + 通过 + 侍提交 + 驳回 @@ -45,12 +40,11 @@ export default { recordResultId: 0, auth: [], resultCommitId: 0, - type: 1, rollbackData: [], + status: 1, dataForm: { resultComment: '', - robackFlowId: 0, - status: 1 + rollbackFlowId: '' }, dataRule: {} } @@ -60,11 +54,11 @@ export default { }, computed: {}, methods: { - async init (recordResultId, auth, type) { + async init (recordResultId, auth, status) { this.recordResultId = recordResultId this.auth = auth this.visible = true - this.type = type + this.status = status this.$nextTick(async () => { this.$refs['dataForm'].resetFields() @@ -101,8 +95,7 @@ export default { 'resultComment': Base64.encode(this.resultCommentEditor.txt.html()), 'status': status, 'resultCommitId': this.resultCommitId, - 'type': this.type, - 'rollbackFlowId':this.rollbackFlowId + 'rollbackFlowId': this.dataForm.rollbackFlowId }).then(data => { if (data && data.code === 0) { this.$emit('refreshDataList', this.recordResultId) diff --git a/src/views/modules/result/record/lzresultrecord.vue b/src/views/modules/result/record/lzresultrecord.vue index 4175f77..335a174 100644 --- a/src/views/modules/result/record/lzresultrecord.vue +++ b/src/views/modules/result/record/lzresultrecord.vue @@ -54,6 +54,7 @@ border v-loading="dataListLoading" @selection-change="selectionChangeHandle" + :cell-style="cellStyle" style="width: 100%;"> @@ -91,7 +92,7 @@ label="操作"> @@ -127,19 +128,23 @@ export default { if (status === 0) { return '新建' } else if (status === 1) { - return '审批中' + return '侍审批' } else if (status === 2) { return '拒绝' } else if (status === 3) { + return '侍提交' + } else if (status === 4) { return '审批通过' + } else if (status === 5) { + return '驳回' } return '' }, getType (value) { if (value === 1) { - return '本月目标' + return '月初目标' } else if (value === 2) { - return '结果' + return '月未总结' } return '' } @@ -227,6 +232,17 @@ export default { this.dataListLoading = false }) }, + cellStyle ({row, column, rowIndex, columnIndex}) { + if (columnIndex === 5 && row.status === 5) { + return 'color:red!important;' + } else if (columnIndex === 5 && row.status === 4) { + return 'color:blue!important;' + } else if (columnIndex === 6 && row.type === 2) { + return 'font-weight:bold!important;' + } else { + return '' + } + }, // 获取数据列表 getDataList () { apiGetResultRecordList({ diff --git a/src/views/modules/result/record/lzresultrecordapp.vue b/src/views/modules/result/record/lzresultrecordapp.vue index 9c4ed96..d73fc89 100644 --- a/src/views/modules/result/record/lzresultrecordapp.vue +++ b/src/views/modules/result/record/lzresultrecordapp.vue @@ -166,14 +166,16 @@ export default { return '侍提交' } else if (status === 4) { return '审批通过' + } else if (status === 5) { + return '驳回' } return '' }, getType (value) { if (value === 1) { - return '本月目标' + return '月初目标' } else if (value === 2) { - return '结果' + return '月未总结' } return '' } diff --git a/src/views/modules/result/record/record.txt b/src/views/modules/result/record/record.txt deleted file mode 100644 index b89cbfc..0000000 --- a/src/views/modules/result/record/record.txt +++ /dev/null @@ -1,129 +0,0 @@ -tableData: [{ - id: '12987122', - item1: '业绩', - name: '公司资产盘点管理系统', - amount1: '234', - amount2: '3.2', - amount3: 10, - amount4: '83298', - amount5: '83298', - amount6: '83298' - }, { - id: '12987123', - item1: '业绩', - name: '数字化办公系统', - amount1: '前期需求整理、流程图（基于目前盘点系统扩展）；\n' + - ' 1.1：业绩考核线上化需求采集，流程图整理，表设计（100%完成）；\n' + - ' 1.2：业绩考核线上化编码；\n' + - ' 1.2.1：实现业绩基本功能（100%完成，）；\n' + - ' 1.2.1.1：后台H5项目指标添加（比重，评分）（100%完成，无严重bug）；\n' + - ' 1.2.1.2：后台H5关键结果添加（100%完成，无严重bug）；\n' + - ' 1.2.1.3：后台H5考核结果添加（100%完成，无严重bug）；\n' + - ' 1.2.1.4：后台H5当项目评分，评分说明（100%完成，无严重bug）；\n' + - ' 1.2.1.5：后台H5价值观考核结果（100%完成，无严重bug）；\n' + - ' 1.2.1.6：后台H5价值观评分，评分说明（100%完成，无严重bug）；\n' + - ' 1.2.1.7：后台H5总分计算（100%完成，无严重bug）\n' + - ' 1.3：权限管理\n' + - ' 1.3.2：后台H5权限管理（100%完成，无重bug）；', - amount2: '4.43', - amount3: 12, - amount4: '83298', - amount5: '83298', - amount6: '83298' - }, { - id: '12987124', - item1: '业绩', - name: '团队健康发展', - amount1: '324', - amount2: '1.9', - amount3: 9, - amount4: '83298', - amount5: '83298', - amount6: '83298' - }, { - id: '12987125', - item1: '业绩', - name: '王小虎', - amount1: '621', - amount2: '2.2', - amount3: 17, - amount4: '83298', - amount5: '83298', - amount6: '83298' - }, { - id: '12987126', - item1: '业绩', - name: '王小虎', - amount1: '539', - amount2: '4.1', - amount3: 15, - amount4: '83298', - amount5: '83298', - amount6: '83298' - }, - { - id: '12987122', - item1: '', - name: '', - amount1: '234', - amount2: '3.2', - amount3: 10, - amount4: '83298', - amount5: '83298', - amount6: '83298' - }, - { - id: '12987122', - item1: '文化价值观', - name: '做人：相信、包容、担当', - amount1: 'xxxxxxxxxxxxxxxxx', - amount2: '3.2', - amount3: 10, - amount4: '83298', - amount5: '83298', - amount6: '83298' - }, { - id: '12987123', - item1: '文化价值观', - name: '做事：用户第一、求真、极致', - amount1: '后台H5权限管理（100%完成，无重bug）；', - amount2: '4.43', - amount3: 12, - amount4: '83298', - amount5: '83298', - amount6: '83298' - }, - { - id: '12987123', - item1: '', - name: '', - amount1: '文化价值观考核结果', - amount2: '4.43', - amount3: 12, - amount4: '83298', - amount5: '83298', - amount6: '83298' - }, - { - id: '12987123', - item1: '最终绩效考核评分', - name: '', - amount1: '', - amount2: '4.43', - amount3: 12, - amount4: '83298', - amount5: '83298', - amount6: '83298' - }, - { - id: '12987123', - item1: '最终绩效考核结果等级', - name: '', - amount1: '', - amount2: '4.43', - amount3: 12, - amount4: '83298', - amount5: '83298', - amount6: '83298' - } - ], diff --git a/src/views/modules/result/record/recorddetail-add-or-update.vue b/src/views/modules/result/record/recorddetail-add-or-update.vue index 11d6945..f51ff65 100644 --- a/src/views/modules/result/record/recorddetail-add-or-update.vue +++ b/src/views/modules/result/record/recorddetail-add-or-update.vue @@ -144,7 +144,7 @@ export default { superScore: '', acquireScore: '', scoreComment: '', - priority: '' + priority: 0 }, dataRule: { scoreComment: [ @@ -327,7 +327,10 @@ export default { } } const score1 = this.superScoreData.filter(i => this.dataForm.acquireScore === i.score) - const superScore1 = score1[0].label + let superScore1 = '' + if (score1 !== null && score1 !== '' && score1.length > 0) { + superScore1 = score1[0].label + } recorddetailAddOrUpdate({ 'id': this.dataForm.id || undefined, 'type': this.type, diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue index 452b276..ded7b9b 100644 --- a/src/views/modules/result/record/recorddetail.vue +++ b/src/views/modules/result/record/recorddetail.vue @@ -37,7 +37,7 @@
-

驳回

+

驳回

@@ -160,7 +160,9 @@ export default { ApprovalAddOrUpdate }, activated () { - this.recordResultId = this.$route.query.id + if (this.$route.query.id > 0) { + this.recordResultId = this.$route.query.id + } this.recordType = this.$route.query.recordType this.getDataList() }, @@ -189,6 +191,7 @@ export default { if (this.tableData.find(item => item.isAdd === 1 || item.isEdit === 1)) { this.hasOperator = true } + this.$router.replace({path: '/recorddetail', query: {id: this.recordResultId, recordType: 3}}) } else { this.tableData = [] } @@ -307,6 +310,8 @@ export default { if (columnIndex === 0) { return [1, 1] } else if (columnIndex === 1) { + return [1, 1] + } else if (columnIndex === 2) { return [1, 7] } else { return [0, 0]