提交修改

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

@@ -12,11 +12,11 @@
         <div id="keyResultEditorElem" class="editor"></div>
       </el-form-item>
 
-      <el-form-item label="3.5-考核标准" v-show="auth.keyResult35 >= 1 " prop="keyResult35">
+      <el-form-item label="3.5-考核标准" v-show="auth.keyResult35 >= 1 && this.type ===1 " prop="keyResult35">
         <div id="keyResultEditorElem3_5" class="editor"></div>
       </el-form-item>
 
-      <el-form-item label="3.7-考核标准" v-show="auth.keyResult37 >= 1" prop="keyResult37">
+      <el-form-item label="3.7-考核标准" v-show="auth.keyResult37 >= 1 && this.type ===1" prop="keyResult37">
         <div id="keyResultEditorElem3_7" class="editor"></div>
       </el-form-item>
 
@@ -29,7 +29,7 @@
       </el-form-item>
 
       <el-form-item label="绩效排序" v-show="auth.priority >= 1" prop="priority">
-        <el-input :disabled="auth.priority < 2 " v-model="dataForm.priority" placeholder="优先级别，数字越大，越在排列在表格前面"></el-input>
+        <el-input :disabled="auth.priority < 2 " v-model="dataForm.priority" placeholder="数字越大，越在排列在列表前面"></el-input>
       </el-form-item>
 
       <el-form-item label="上级评分" v-show="auth.superScore >= 1">
@@ -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.stringIsNull(this.dataForm.priority) && !/^(0|[1-9][0-9]*)$/.test(this.dataForm.priority)) {
-          if (!this.dataForm.priority) {
-            this.alertInfo('优先级不能为空')
-            return
-          }
-        }
-        if (!/^(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({

src/views/modules/result/record/recorddetail.vue

@@ -17,6 +17,7 @@
             </el-step>
           </el-steps>
         </div>
+
         <div class="titleCenter">
           <span>考核月份：<b>{{checkMonth}}</b></span>
           <span>员工姓名：<b>{{ staffName }}</b></span>
@@ -72,7 +73,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="关键结果" prop="keyResult" align="left" width="350">
+        <el-table-column label="关键结果" prop="keyResult" align="left" width="280">
           <template slot-scope="scope" >
             <div v-html="scope.row.keyResult"  class="rich">
             </div>
@@ -80,7 +81,7 @@
         </el-table-column>
 
 
-        <el-table-column label="3.5-考核标准" prop="keyResult35" align="left" width="350">
+        <el-table-column label="3.5-考核标准" prop="keyResult35" align="left" width="280">
           <template slot-scope="scope" >
             <div v-html="scope.row.keyResult35"  class="rich">
             </div>
@@ -88,7 +89,7 @@
         </el-table-column>
 
 
-        <el-table-column label="3.7-考核标准" prop="keyResult37" align="left" width="350">
+        <el-table-column label="3.7-考核标准" prop="keyResult37" align="left" width="280">
           <template slot-scope="scope" >
             <div v-html="scope.row.keyResult37"  class="rich">
             </div>
@@ -104,13 +105,13 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="考核结果（员工填写）" prop="checkResult" width="350" align="left">
+        <el-table-column label="考核结果（员工填写）" prop="checkResult" width="280" align="left">
           <template slot-scope="scope">
             <div v-html="scope.row.checkResult" class="rich">
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="直属上级评分(100%）" prop="superScore"  align="left" width="160"></el-table-column>
+        <el-table-column label="直属上级评分(100%）" prop="superScore"  align="left" width="120"></el-table-column>
         <el-table-column label="得分" prop="acquireScore" align="center">
           <template slot-scope="scope">
             <div class="conatnt-name">
@@ -118,7 +119,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="评分说明（直属上级填写）" width="300" prop="scoreComment">
+        <el-table-column label="评分说明（直属上级填写）" width="280" prop="scoreComment">
           <template slot-scope="scope">
             <div v-html="scope.row.scoreComment" class="rich">
             </div>