wulin/wl_management_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-08-24 14:23:46 +08:00
parent 6ec4a4f444
commit 9ae828c83d
8 changed files with 45 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/index.js
View File

@ -13,13 +13,13 @@ module.exports = {
assetsPublicPath: '/',
proxyTable: {
'/lz_management': {
target: 'http://192.168.43.94:8080',
target: 'http://localhost:8080',
changeOrigin: true
}
},
// Various Dev Server settings
host: '192.168.43.94', // can be overwritten by process.env.HOST
// host: '192.168.43.94', // 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,
errorOverlay: true,

6
package-lock.json generated
View File

@ -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",

27
src/views/modules/result/record/approval-add-or-update.vue
View File

@ -4,9 +4,7 @@
:close-on-click-modal="false"
:visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="80px">
<el-form-item label="回滚到">
<el-form-item label="回滚到" v-if="status === 5 " >
<el-select v-model="dataForm.rollbackFlowId" placeholder="请选择">
<el-option
v-for="item in rollbackData"
@ -16,18 +14,15 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="意见" prop="resultComment">
<el-form-item label="意见" prop="resultComment">
<div id="resultCommentEditorElem" class="editor"></div>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button type="primary" v-if="auth.approvelCommit === 1" @click="commitRecord(2)">通过</el-button>
<el-button type="primary" v-if="auth.waitCommit===1" @click="commitRecord(3)">侍提交</el-button>
<el-button type="primary" v-if="auth.approvelCommit === 1 && status !== 5 " @click="commitRecord(2)">通过</el-button>
<el-button type="primary" v-if="auth.waitCommit===1 && status !== 5 " @click="commitRecord(3)">侍提交</el-button>
<el-button type="primary" v-if="status === 5 && auth.reject == 1" @click="commitRecord(5)">驳回</el-button>
</span>
</el-dialog>
</template>
@ -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)

18
src/views/modules/result/record/lzresultrecord.vue
View File

@ -54,6 +54,7 @@
border
v-loading="dataListLoading"
@selection-change="selectionChangeHandle"
:cell-style="cellStyle"
style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
@ -91,7 +92,7 @@
label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id,3)">详情</el-button>
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
<el-button type="text" size="small" v-if="scope.row.id===0" @click="deleteHandle(scope.row.id)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -127,11 +128,15 @@ 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 ''
},
@ -227,6 +232,15 @@ 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 {
return ''
}
},
// 获取数据列表
getDataList () {
apiGetResultRecordList({

2
src/views/modules/result/record/lzresultrecordapp.vue
View File

@ -166,6 +166,8 @@ export default {
return '侍提交'
} else if (status === 4) {
return '审批通过'
} else if (status === 5) {
return '驳回'
}
return ''
},

129
src/views/modules/result/record/record.txt
View File

@ -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'
}
],

7
src/views/modules/result/record/recorddetail-add-or-update.vue
View File

@ -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,

9
src/views/modules/result/record/recorddetail.vue
View File

@ -37,7 +37,7 @@
</div>
<div class="bottom" v-show="this.auth.reject == 1">
<p><span style="cursor: pointer" @click="commitApprovalAddOrUpdate(2)" >驳回</span></p>
<p><span style="cursor: pointer" @click="commitApprovalAddOrUpdate(5)" >驳回</span></p>
</div>
</div>
@ -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]