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 bacb5cb..1a5aca0 100644 --- a/src/views/modules/result/record/recorddetail-add-or-update.vue +++ b/src/views/modules/result/record/recorddetail-add-or-update.vue @@ -12,11 +12,11 @@
- +
- +
@@ -29,7 +29,7 @@ - + @@ -155,7 +155,7 @@ export default { superScore: '', acquireScore: '', scoreComment: '', - priority: 0 + priority: '' }, dataRule: { scoreComment: [ @@ -163,9 +163,6 @@ export default { ], checkWeight: [ {validator: validNum, required: true, trigger: 'blur'} - ], - priority: [ - {validator: validPriority, required: true, trigger: 'blur'} ] } } @@ -211,11 +208,12 @@ export default { if (this.scoreCommentEditor !== null) { this.scoreCommentEditor.txt.html('') } + if (this.keyResultEditorElem3_5 !== null) { - this.keyResultEditorElem3_5.txt.html('') + this.keyResultEditorElem3_5.txt.html('无') } if (this.keyResultEditorElem3_7 !== null) { - this.keyResultEditorElem3_7.txt.html('') + this.keyResultEditorElem3_7.txt.html('无') } this.visible = true this.$nextTick(async () => { @@ -289,10 +287,10 @@ export default { this.scoreCommentEditor.txt.html(this.dataForm.scoreComment || '') } if (this.keyResultEditorElem3_5 !== null) { - this.keyResultEditorElem3_5.txt.html(this.dataForm.keyResult35 || '') + this.keyResultEditorElem3_5.txt.html(this.dataForm.keyResult35 || '无') } if (this.keyResultEditorElem3_7 !== null) { - this.keyResultEditorElem3_7.txt.html(this.dataForm.keyResult37 || '') + this.keyResultEditorElem3_7.txt.html(this.dataForm.keyResult37 || '无') } } } @@ -371,18 +369,15 @@ export default { } } if (this.auth.priority === 2) { - if (this.dataForm.priority !== 0) { - if (!this.dataForm.priority) { - this.alertInfo('优先级不能为空') - return - } - } - if (!/^(0|[1-9][0-9]*)$/.test(this.dataForm.priority)) { + if (!this.stringIsNull(this.dataForm.priority) && !/^(0|[1-9][0-9]*)$/.test(this.dataForm.priority)) { this.alertInfo('请输入大于或等于0的整数') return } } - + let priority1 = this.dataForm.priority + if (this.stringIsNull(this.dataForm.priority)) { + priority1 = 0 + } recorddetailAddOrUpdate({ 'id': this.dataForm.id || undefined, 'type': this.type, @@ -397,7 +392,7 @@ export default { 'scoreComment': Base64.encode(this.scoreCommentEditor.txt.html()), 'recordId': this.recordResultId, 'recordType': this.recordType, - 'priority': this.dataForm.priority + 'priority': priority1 }).then(res => { if (res && res.code === 0) { this.$message({ diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue index e786486..cf72e00 100644 --- a/src/views/modules/result/record/recorddetail.vue +++ b/src/views/modules/result/record/recorddetail.vue @@ -17,6 +17,7 @@ +
考核月份：{{checkMonth}} 员工姓名：{{ staffName }} @@ -72,7 +73,7 @@ - +