From 8b6bd01a15da647346de68b549a15d98c4ab2711 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 28 Aug 2020 11:12:14 +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

---
 .../result/record/lzresultrecordapp.vue       | 22 ++++++++++++++-----
 .../record/recorddetail-add-or-update.vue     | 13 ++++++-----
 .../modules/result/record/recorddetail.vue    |  4 ++--
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/views/modules/result/record/lzresultrecordapp.vue b/src/views/modules/result/record/lzresultrecordapp.vue
index fd34839..4d90bad 100644
--- a/src/views/modules/result/record/lzresultrecordapp.vue
+++ b/src/views/modules/result/record/lzresultrecordapp.vue
@@ -2,8 +2,8 @@
   <div class="mod-config">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
 
-      <el-form-item label="一级部门">
-        <el-select v-model="dataForm.department1" @change="changeDepartment('2')">
+      <el-form-item label="一级部门"  >
+        <el-select v-model="dataForm.department1" :disabled="departmentReaderOnly" @change="changeDepartment('2')">
           <el-option
             v-for="item in departmentList1"
             :key="item.departmentId"
@@ -14,7 +14,7 @@
       </el-form-item>
 
       <el-form-item label="二级部门">
-        <el-select v-model="dataForm.department2" placeholder="请选择" @change="changeDepartment('3')">
+        <el-select v-model="dataForm.department2" :disabled="departmentReaderOnly" placeholder="请选择" @change="changeDepartment('3')">
           <el-option
             v-for="item in departmentList2"
             :key="item.departmentId"
@@ -25,7 +25,7 @@
       </el-form-item>
 
       <el-form-item label="三级部门">
-        <el-select v-model="dataForm.department3" placeholder="请选择">
+        <el-select v-model="dataForm.department3" :disabled="departmentReaderOnly" placeholder="请选择">
           <el-option
             v-for="item in departmentList3"
             :key="item.departmentId"
@@ -232,7 +232,8 @@ export default {
       recordIdsSelect: [],
       tabValue: '1,2,5',
       isChangeDepartmentrtment: 0,
-      isHiden: false
+      isHiden: false,
+      departmentReaderOnly: false
     }
   },
   computed: {},
@@ -308,7 +309,7 @@ export default {
       })
     },
     tabChange (row) {
-      if(row.name === '3') {
+      if (row.name === '3') {
         this.isHiden = true
       } else {
         this.isHiden = false
@@ -342,6 +343,9 @@ export default {
             this.dataForm.department1 = data.department1
             this.dataForm.department2 = data.department2
             this.dataForm.department3 = data.department3
+            if (!this.stringIsNull(data.department3) || !this.stringIsNull(data.department2)) {
+              this.departmentReaderOnly = true
+            }
           }
         } else {
           this.dataList = []
@@ -356,6 +360,12 @@ export default {
       this.dataForm.beginDate = data[0]
       this.dataForm.endDate = data[1]
     },
+    stringIsNull (str) {
+      if (typeof str === 'undefined' || str === null || str === '') {
+        return true
+      }
+      return false
+    },
     cellStyle ({row, column, rowIndex, columnIndex}) {
       if (columnIndex === 5 && row.status === 5) {
         return 'color:red!important;'
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 6a471b9..3647fb4 100644
--- a/src/views/modules/result/record/recorddetail-add-or-update.vue
+++ b/src/views/modules/result/record/recorddetail-add-or-update.vue
@@ -309,8 +309,13 @@ export default {
           return
         }
       }
+      const score1 = this.superScoreData.filter(i => this.dataForm.acquireScore === i.score)
+      let superScore1 = ''
+      if (score1 !== null && score1 !== '' && score1.length > 0) {
+        superScore1 = score1[0].label
+      }
       if (this.auth.superScore === 2) {
-        if (this.stringIsNull(this.dataForm.superScore)) {
+        if (this.stringIsNull(superScore1)) {
           this.alertInfo('上级评分不能为空')
           return
         }
@@ -335,11 +340,7 @@ export default {
           return
         }
       }
-      const score1 = this.superScoreData.filter(i => this.dataForm.acquireScore === i.score)
-      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 f5af452..eb4d8bc 100644
--- a/src/views/modules/result/record/recorddetail.vue
+++ b/src/views/modules/result/record/recorddetail.vue
@@ -23,7 +23,7 @@
           <span>一级部门：<b>{{ department1 }}</b></span>
           <span>二级部门：<b>{{ department2 }}</b></span>
           <span>三级部门：<b>{{ department3 }}</b></span>
-          <span>直属上级:<b>{{ superStaff }}</b></span>
+          <span >直属上级:<b>{{ superStaff }}</b></span>
 
 
 
@@ -371,7 +371,7 @@ export default {
 .app-container {
   .el-steps{
     margin: 20px;
-    
+
   }
   /deep/ .el-step__head{
     .el-step__icon.is-text{