commit

src/main/resources/static/assets/platform/css/elmain.css

@@ -105,7 +105,7 @@ a .expanded {
 }
 
 .el-table__body-wrapper {
-    scrollbar-width: none; /* firefox */
+    /*scrollbar-width: none; !* firefox *!*/
     -ms-overflow-style: none; /* IE 10+ */
     overflow-x: hidden;
     overflow-y: auto;
@@ -135,4 +135,4 @@ a .expanded {
     height: 40px;
     line-height: 40px;
     /*display: none !important;*/
-}
+}

src/main/resources/static/components/wakeshome/review/ReviewResult.vue

@@ -52,9 +52,10 @@
             <el-table-column label="满意度" prop="resultScore" header-align="center" align="center" width="350px">
               <template slot-scope="{row}">
                 <el-radio-group v-model="row.resultScore" size="small">
+                  <el-radio disabled label="非常满意">非常满意</el-radio>
                   <el-radio disabled label="满意">满意</el-radio>
-                  <el-radio disabled label="基本满意">基本满意</el-radio>
-                  <el-radio disabled label="不满意">不满意</el-radio>
+                  <el-radio disabled label="良好">良好</el-radio>
+                  <el-radio disabled label="一般">一般</el-radio>
                 </el-radio-group>
               </template>
             </el-table-column>
@@ -63,20 +64,20 @@
       </el-row>
 
       <div v-if="viewInfo.zbxx.scoringMode===1">
-        <el-divider content-position="left">备注</el-divider>
+        <el-divider content-position="left">简述工作情况</el-divider>
         <el-row>
           <el-col :span="24">
             <el-input type="textarea" :rows="2" maxlength="300" show-word-limit readonly
-                      v-model="nr.bzs[0].options" placeholder="请输入备注"></el-input>
+                      v-model="nr.bzs[0].options" placeholder="请简述工作情况"></el-input>
           </el-col>
         </el-row>
       </div>
     </el-form-item>
 
     <template v-if="viewInfo.zbxx.scoringMode === 2">
-      <vi-title title="备注填写"></vi-title>
+      <vi-title title="简述工作情况"></vi-title>
       <el-input type="textarea" :rows="2" maxlength="300" show-word-limit disabled
-                v-model="viewInfo.commentPeo.presidentOpinions" placeholder="请输入备注"></el-input>
+                v-model="viewInfo.commentPeo.presidentOpinions" placeholder="请简述工作情况"></el-input>
     </template>
 
     <template v-if="viewInfo.zbxx.scoringMode === 1 && viewInfo.zbxx.reviewMode === 1">

src/main/resources/static/components/wakeshome/review/UnionCommentZb.vue

@@ -26,11 +26,11 @@
 
       </el-col>
 
-      <el-col :span="8">
+<!--      <el-col :span="8">
         <el-form-item prop="assessment" label="">
           <el-checkbox v-model="data.isEvaluationIndex" :disabled="is_view">是否采用以往评议指标</el-checkbox>
         </el-form-item>
-      </el-col>
+      </el-col>-->
 
       <el-col :span="8">
         <el-form-item prop="zbId" label="以往评议指标" v-if="data.isEvaluationIndex">
@@ -222,7 +222,7 @@
                           </template>
                         </el-table-column>-->
 
-              <el-table-column label="是否填写意见" prop="isEvidence" header-align="center" align="center"
+<!--              <el-table-column label="是否填写意见" prop="isEvidence" header-align="center" align="center"
                                width="120px" v-if="data.scoringMode===1">
                 <template scope="{row}">
                   <el-switch
@@ -232,7 +232,7 @@
                       inactive-color="#ff4949">
                   </el-switch>
                 </template>
-              </el-table-column>
+              </el-table-column>-->
 
               <el-table-column v-if="!is_view" label="操作" header-align="center" align="center"
                                width="200px">