From f4e364e137a65bc4e5e8a6fcfb3b821e522838ab Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 28 Aug 2020 18:08:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../record/recorddetail-add-or-update.vue     | 50 ++++++++++++++++--
 .../modules/result/record/recorddetail.vue    | 52 +++++++++++++++----
 2 files changed, 89 insertions(+), 13 deletions(-)

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 3647fb4..ea7c228 100644
--- a/src/views/modules/result/record/recorddetail-add-or-update.vue
+++ b/src/views/modules/result/record/recorddetail-add-or-update.vue
@@ -11,6 +11,15 @@
       <el-form-item label="关键结果" v-show="auth.keyResult >= 1 && this.type == 1 " prop="keyResult">
         <div id="keyResultEditorElem" class="editor"></div>
       </el-form-item>
+
+      <el-form-item label="3.5-考核标准" v-show="auth.keyResult35 >= 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">
+        <div id="keyResultEditorElem3_7" class="editor"></div>
+      </el-form-item>
+
       <el-form-item v-show="auth.checkWeight>=1" label="考核权重" prop="checkWeight">
         <el-input v-model="dataForm.checkWeight" :disabled="auth.checkWeight<2" placeholder="考核权重"></el-input>
       </el-form-item>
@@ -103,6 +112,8 @@ export default {
       checkResultEditor: null,
       recordResultId: null,
       scoreCommentEditor: null,
+      keyResultEditorElem3_5: null,
+      keyResultEditorElem3_7: null,
       auth: [],
       recordType: 0,
       type: 0,
@@ -124,9 +135,6 @@ export default {
       }, {
         score: 3.583,
         label: '3.5(+)-合格'
-      }, {
-        score: 3.583,
-        label: '3.5(+)-合格'
       }, {
         score: 3.5,
         label: '3.5分-合格'
@@ -203,6 +211,12 @@ export default {
       if (this.scoreCommentEditor !== null) {
         this.scoreCommentEditor.txt.html('')
       }
+      if (this.keyResultEditorElem3_5 !== null) {
+        this.keyResultEditorElem3_5.txt.html('')
+      }
+      if (this.keyResultEditorElem3_7 !== null) {
+        this.keyResultEditorElem3_7.txt.html('')
+      }
       this.visible = true
       this.$nextTick(async () => {
         this.$refs['dataForm'].resetFields()
@@ -239,6 +253,28 @@ export default {
             this.scoreCommentEditor.$textElem.attr('contenteditable', false)
           }
         }
+        if (this.keyResultEditorElem3_5 === null) {
+          this.keyResultEditorElem3_5 = new E('#keyResultEditorElem3_5')
+          this.keyResultEditorElem3_5.customConfig.uploadImgServer = '/uploadPicture'
+          this.keyResultEditorElem3_5.customConfig.uploadFileName = 'file'
+          this.keyResultEditorElem3_5.customConfig.uploadImgParams = ''
+          this.keyResultEditorElem3_5.customConfig.debug = true
+          this.keyResultEditorElem3_5.create()
+          if (this.auth.keyResult35 < 2) {
+            this.keyResultEditorElem3_5.$textElem.attr('contenteditable', false)
+          }
+        }
+        if (this.keyResultEditorElem3_7 === null) {
+          this.keyResultEditorElem3_7 = new E('#keyResultEditorElem3_7')
+          this.keyResultEditorElem3_7.customConfig.uploadImgServer = '/uploadPicture'
+          this.keyResultEditorElem3_7.customConfig.uploadFileName = 'file'
+          this.keyResultEditorElem3_7.customConfig.uploadImgParams = ''
+          this.keyResultEditorElem3_7.customConfig.debug = true
+          this.keyResultEditorElem3_7.create()
+          if (this.auth.keyResult37 < 2) {
+            this.keyResultEditorElem3_7.$textElem.attr('contenteditable', false)
+          }
+        }
         if (this.dataForm.id && this.dataForm.id > 0) {
           const data = await apiDetailInfo(this.dataForm.id)
           if (data && data.code === 0) {
@@ -252,6 +288,12 @@ export default {
             if (this.scoreCommentEditor !== null) {
               this.scoreCommentEditor.txt.html(this.dataForm.scoreComment || '')
             }
+            if (this.keyResultEditorElem3_5 !== null) {
+              this.keyResultEditorElem3_5.txt.html(this.dataForm.keyResult35 || '')
+            }
+            if (this.keyResultEditorElem3_7 !== null) {
+              this.keyResultEditorElem3_7.txt.html(this.dataForm.keyResult37 || '')
+            }
           }
         }
       })
@@ -346,6 +388,8 @@ export default {
         'type': this.type,
         'target': this.dataForm.target,
         'keyResult': Base64.encode(this.keyResultEditor.txt.html()),
+        'keyResult35': Base64.encode(this.keyResultEditorElem3_5.txt.html()),
+        'keyResult37': Base64.encode(this.keyResultEditorElem3_7.txt.html()),
         'checkWeight': this.dataForm.checkWeight,
         'checkResult': Base64.encode(this.checkResultEditor.txt.html()),
         'superScore': superScore1,
diff --git a/src/views/modules/result/record/recorddetail.vue b/src/views/modules/result/record/recorddetail.vue
index eb4d8bc..5f89895 100644
--- a/src/views/modules/result/record/recorddetail.vue
+++ b/src/views/modules/result/record/recorddetail.vue
@@ -79,8 +79,26 @@
             <div v-html="scope.row.keyResult"  class="rich">
             </div>
           </template>
-
         </el-table-column>
+
+
+        <el-table-column label="3.5-考核标准" prop="keyResult35" align="left" width="350">
+          <template slot-scope="scope" >
+            <div v-html="scope.row.keyResult35"  class="rich">
+            </div>
+          </template>
+        </el-table-column>
+
+
+        <el-table-column label="3.7-考核标准" prop="keyResult37" align="left" width="350">
+          <template slot-scope="scope" >
+            <div v-html="scope.row.keyResult37"  class="rich">
+            </div>
+          </template>
+        </el-table-column>
+
+
+
         <el-table-column label="考核权重" prop="checkWeight" align="center" >
           <template slot-scope="scope">
             <div class="conatnt-name">
@@ -157,7 +175,7 @@ export default {
   },
   data () {
     return {
-      active: 3,
+      active: 0,
       type: 1,
       hasOperator: false,
       recordResultId: 0,
@@ -181,11 +199,8 @@ export default {
       fileCount: 0,
       clientHeight: 0,
       stepList: [
-        { name: '转成', time: '03-23 11:21', status: 1, statusStr: '通过' },
-        { name: '转成是', time: '03-23 11:21', status: 2, statusStr: '未提交' },
-        { name: '转成去', time: '03-23 11:21', status: 3, statusStr: '拒绝' },
-        { name: '转成饿', time: '03-23 11:21', status: 1, statusStr: '通过' },
-        { name: '转成个是', time: '03-23 11:21', status: 2, statusStr: '未提交' }
+        { name: '', time: '', status: 0, statusStr: '' },
+        { name: '', time: '', status: 0, statusStr: '' }
       ]
     }
   },
@@ -234,6 +249,11 @@ export default {
         this.addOrUpdateVisible = false
         this.approvalVisible = false
         this.fileCount = data.fileCount || 0
+        this.stepList = data.stepList
+        this.active = 0
+        this.stepList.forEach(item => {
+          this.active = item.status + this.active
+        })
       })
     },
     // 新增 / 编辑
@@ -253,7 +273,7 @@ export default {
         }, 500)
       })
     },
-    uploadDownFile (val) {n
+    uploadDownFile (val) {
       this.uploadVisible = true
       this.$nextTick(() => {
         setTimeout(() => {
@@ -326,13 +346,17 @@ export default {
           return [1, 2]
         } else if (columnIndex === 1) {
           return [0, 0]
+        } else if (columnIndex === 2) {
+          return [1, 3]
+        } else if (columnIndex === 3 || columnIndex === 4) {
+          return [0, 0]
         }
       }
 
       if (rowIndex >= this.yeJiCheckNum + 1 && rowIndex < this.yeJiCheckNum + 1 + this.wenHuaJiaZhiGuanNum) {
         if (columnIndex === 1) {
-          return [1, 2]
-        } else if (columnIndex === 2) {
+          return [1, 4]
+        } else if (columnIndex === 2 || columnIndex === 3 || columnIndex === 4) {
           return [0, 0]
         }
       }
@@ -341,6 +365,10 @@ export default {
           return [1, 2]
         } else if (columnIndex === 1) {
           return [0, 0]
+        } else if (columnIndex === 2) {
+          return [1, 3]
+        } else if (columnIndex === 3 || columnIndex === 4) {
+          return [0, 0]
         }
       }
       if (rowIndex >= (this.yeJiCheckNum + 1 + this.wenHuaJiaZhiGuanNum) && rowIndex <= this.yeJiCheckNum + 1 + this.wenHuaJiaZhiGuanNum + this.lastResultNum) {
@@ -348,6 +376,10 @@ export default {
           return [1, 2]
         } else if (columnIndex === 1) {
           return [0, 0]
+        } else if (columnIndex === 2) {
+          return [1, 3]
+        } else if (columnIndex === 3 || columnIndex === 4) {
+          return [0, 0]
         }
       }
       if (rowIndex > this.yeJiCheckNum + 1 + this.wenHuaJiaZhiGuanNum + this.lastResultNum) {