Merge branch 'dev' of http://172.16.100.139/new-business/drp-web into dev

src/views/business/ehr/pm/awaitMarkPm/detail.vue

@@ -31,15 +31,22 @@
           <el-descriptions :column="6 ">
             <el-descriptions-item label="自评分" v-if="form.status > 3">{{form.saMark}}</el-descriptions-item>
           </el-descriptions>
-          <el-descriptions v-if="form.status > 3">
-            <el-descriptions-item label="个人总结">{{form.summary}}</el-descriptions-item>
-          </el-descriptions>
-          <div style="  display: flex;align-items: flex-start;justify-content: flex-start;margin-top: -20px;" v-if="form.status > 4">
-            <p>总评语:</p>
-            <div style="margin-left: 18px;font-size: 15px;">
-              <p v-for="(item,index) in comment" :key="index">{{item[0]}}:{{item[1]}}</p>
-            </div>
-          </div>
+          <el-row style="color: #606266;font-size: 14px;" v-if="form.status > 3">
+            <el-col :span="2">
+              个人总结：
+            </el-col>
+            <el-col :span="22">
+              <div style="white-space: pre-wrap;text-align: left">{{form.summary}}</div>
+            </el-col>
+          </el-row>
+          <el-row style="margin-top:10px;color: #606266;font-size: 14px;" v-if="form.status > 4">
+            <el-col :span="2">
+              总评语:
+            </el-col>
+            <el-col :span="22">
+              <div v-for="(item,index) in comment" :key="index">{{item[0]}}:{{item[1]}}</div>
+            </el-col>
+          </el-row>
           <div v-if="flow.status == 0">
             <el-form-item label="总评语" prop="remark">
               <el-input type="textarea" v-model="form.remark"></el-input>
@@ -47,33 +54,33 @@
           </div>
           <el-table size="mini"  :data="form.performanceItem" show-summary :summary-method="getSummaries" border :key="refreshTable">
             <el-table-column type="index" width="50" label="序号"/>
-            <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估方面" align="center" prop="aspect">
+            <el-table-column width="100" label="评估方面" align="center" prop="aspect">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.ehr_pm_aspect" :value="scope.row.aspect"/>
               </template>
             </el-table-column>
-            <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估指标" align="center" prop="target" />
+            <el-table-column width="100" label="评估指标" align="center" prop="target" />
             <el-table-column width="80" label="权重(%)" align="center" prop="weight">
               <template slot-scope="scope">
                 {{scope.row.asItem ? "+/-" : scope.row.weight}}
               </template>
             </el-table-column>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="指标说明" align="center" prop="instructions">
+            <el-table-column label="指标说明" align="center" prop="instructions">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap;text-align: left">{{scope.row.instructions}}</div>
               </template>
             </el-table-column>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="评分标准" align="center" prop="standard">
+            <el-table-column label="评分标准" align="center" prop="standard">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap;text-align: left">{{scope.row.standard}}</div>
               </template>
             </el-table-column>
             <el-table-column width="100" label="数据来源" align="center" prop="source" />
             <el-table-column width="80" label="自评分" align="center" prop="selfScoring"/>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="自评语" align="center" prop="selfComment"/>
+            <el-table-column label="自评语" align="center" prop="selfComment"/>
             <el-table-column width="80" label="评估人" align="center" prop="evaluatorName" v-if="form.isTwoEvaluation"/>
             <el-table-column width="80" label="上级评分" align="center" prop="leaderScoring" v-if="flow.status != 0"/>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="评分说明" align="center" prop="leaderComment" v-if="flow.status != 0"/>
+            <el-table-column label="评分说明" align="center" prop="leaderComment" v-if="flow.status != 0"/>
             <el-table-column width="85" label="上级评分" align="center" prop="leaderScoring" :render-header="addRedStar" v-if="flow.status == 0">
               <template slot-scope="scope">
                 <el-form-item :prop="'performanceItem.'+scope.$index+'.leaderScoring'" :rules="{required: true,message: ' ',trigger: 'blur'}">
@@ -82,7 +89,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="评分说明" align="center" prop="leaderComment" v-if="flow.status == 0">
+            <el-table-column label="评分说明" align="center" prop="leaderComment" v-if="flow.status == 0">
               <template slot-scope="scope">
                 <el-form-item :prop="'performanceItem.'+scope.$index+'.leaderComment'">
                   <el-input v-if="scope.row.evaluator.includes($store.state.user.name)" size="mini" type="textarea" v-model="scope.row.leaderComment"/>
@@ -138,8 +145,6 @@ export default {
           { required: true, message: "驳回原因不能为空", trigger: "blur" },
         ],
       },
-      //是否展开
-      isUnfold:false,
       //是否显驳回弹出层
       turnDownOpen:false,
       //上级评分
@@ -199,20 +204,12 @@ export default {
          this.loading = false;
       })
     },
-    //展开/收起
-    btnUnfold(){
-      this.isUnfold = !this.isUnfold;
-    },
     //合计
     getSummaries(param){
       const { columns, data } = param;
       let ldMark = 0;
-      if(this.form.ldMark){
-        ldMark = this.form.ldMark;
-      }else{
-        ldMark = data.reduce((sum, e) => sum + (e.asItem ? Number(e.leaderScoring || 0) : Number(e.leaderScoring || 0) * (Number(e.weight || 0) / 100)), 0);
-        ldMark = ldMark.toFixed(1);
-      }
+      ldMark = data.reduce((sum, e) => sum + (e.asItem ? Number(e.leaderScoring || 0) : Number(e.leaderScoring || 0) * (Number(e.weight || 0) / 100)), 0);
+      ldMark = ldMark.toFixed(1);
       this.lldMark = ldMark;
       if(this.form.isTwoEvaluation){
         return ['合计','','',this.form.weight,'','','',this.form.saMark,'','',ldMark];

src/views/business/ehr/pm/awaitVerifyPm/detail.vue

@@ -29,23 +29,23 @@
         </el-descriptions>
         <el-table size="mini"  :data="form.performanceItem" show-summary :summary-method="getSummaries" border>
           <el-table-column type="index" width="50" label="序号"/>
-          <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估方面" align="center" prop="aspect">
+          <el-table-column width="100" label="评估方面" align="center" prop="aspect">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.ehr_pm_aspect" :value="scope.row.aspect"/>
             </template>
           </el-table-column>
-          <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估指标" align="center" prop="target" />
+          <el-table-column width="100" label="评估指标" align="center" prop="target" />
           <el-table-column width="80" label="权重(%)" align="center" prop="weight">
               <template slot-scope="scope">
                 {{scope.row.asItem ? "+/-" : scope.row.weight}}
               </template>
             </el-table-column>
-          <el-table-column :show-overflow-tooltip="!isUnfold" label="指标说明" align="center" prop="instructions">
+          <el-table-column label="指标说明" align="center" prop="instructions">
             <template slot-scope="scope">
               <div style="white-space: pre-wrap;text-align: left">{{scope.row.instructions}}</div>
             </template>
           </el-table-column>
-          <el-table-column :show-overflow-tooltip="!isUnfold" label="评分标准" align="center" prop="standard">
+          <el-table-column label="评分标准" align="center" prop="standard">
             <template slot-scope="scope">
               <div style="white-space: pre-wrap;text-align: left">{{scope.row.standard}}</div>
             </template>
@@ -92,8 +92,6 @@ export default {
           { required: true, message: "驳回原因不能为空", trigger: "blur" },
         ],
       },
-      //是否展开
-      isUnfold:false,
       //是否显驳回弹出层
       turnDownOpen:false,
     };
@@ -125,16 +123,13 @@ export default {
          this.loading = false;
       })
     },
-    //展开/收起
-    btnUnfold(){
-      this.isUnfold = !this.isUnfold;
-    },
     //合计
     getSummaries(param){
-      const { columns, data } = param;
-      let val = data.reduce((sum, e) => sum + Number(e.weight || 0), 0);
-      this.weightSum = val;
-      return ['合计','','',val,'','','',this.form.saMark,'',this.form.ldMark];
+      if(this.form.isTwoEvaluation){
+        return ['合计','','',this.form.weight,'','','',this.form.saMark,'','',this.form.ldMark];
+      }else{
+        return ['合计','','',this.form.weight,'','','',this.form.saMark,'',this.form.ldMark];
+      }
     },
     //驳回
     btnTurnDown(){

src/views/business/ehr/pm/finishMarkPm/detail.vue

@@ -35,45 +35,52 @@
             <el-descriptions-item label="上级评分">{{form.ldMark}}</el-descriptions-item>
             <el-descriptions-item label="综合得分">{{form.mark}}</el-descriptions-item>
           </el-descriptions>
-          <el-descriptions>
-            <el-descriptions-item label="个人总结">{{form.summary}}</el-descriptions-item>
-          </el-descriptions>
-          <div style="  display: flex;align-items: flex-start;justify-content: flex-start;margin-top: -20px;">
-            <p>总评语:</p>
-            <div style="margin-left: 18px;font-size: 15px;">
-              <p v-for="(item,index) in comment" :key="index">{{item[0]}}:{{item[1]}}</p>
-            </div>
-          </div>
+          <el-row style="color: #606266;font-size: 14px;" v-if="form.status > 3">
+            <el-col :span="2">
+              个人总结：
+            </el-col>
+            <el-col :span="22">
+              <div style="white-space: pre-wrap;text-align: left">{{form.summary}}</div>
+            </el-col>
+          </el-row>
+          <el-row style="margin-top:10px;color: #606266;font-size: 14px;" v-if="form.status > 4">
+            <el-col :span="2">
+              总评语:
+            </el-col>
+            <el-col :span="22">
+              <div v-for="(item,index) in comment" :key="index">{{item[0]}}:{{item[1]}}</div>
+            </el-col>
+          </el-row>
           
           <el-table size="mini"  :data="form.performanceItem" show-summary :summary-method="getSummaries" border>
             <el-table-column type="index" width="50" label="序号"/>
-            <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估方面" align="center" prop="aspect">
+            <el-table-column width="100" label="评估方面" align="center" prop="aspect">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.ehr_pm_aspect" :value="scope.row.aspect"/>
               </template>
             </el-table-column>
-            <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估指标" align="center" prop="target" />
+            <el-table-column width="100" label="评估指标" align="center" prop="target" />
             <el-table-column width="80" label="权重(%)" align="center" prop="weight">
               <template slot-scope="scope">
                 {{scope.row.asItem ? "+/-" : scope.row.weight}}
               </template>
             </el-table-column>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="指标说明" align="center" prop="instructions">
+            <el-table-column label="指标说明" align="center" prop="instructions">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap;text-align: left">{{scope.row.instructions}}</div>
               </template>
             </el-table-column>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="评分标准" align="center" prop="standard">
+            <el-table-column label="评分标准" align="center" prop="standard">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap;text-align: left">{{scope.row.standard}}</div>
               </template>
             </el-table-column>
             <el-table-column width="100" label="数据来源" align="center" prop="source"/>
             <el-table-column width="80" label="自评分" align="center" prop="selfScoring"/>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="自评语" align="center" prop="selfComment"/>
+            <el-table-column label="自评语" align="center" prop="selfComment"/>
             <el-table-column width="80" label="评估人" align="center" prop="evaluatorName" v-if="form.isTwoEvaluation"/>
             <el-table-column width="80" label="上级评分" align="center" prop="leaderScoring"/>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="上级评语" align="center" prop="leaderComment"/>
+            <el-table-column label="上级评语" align="center" prop="leaderComment"/>
           </el-table>
         </el-form>
       </div>
@@ -103,8 +110,6 @@ export default {
       form:{},
       //遮罩
       loading: false,
-      //是否展开
-      isUnfold:false,
       //明细权重合计值
       weightSum: 0,
     }

src/views/business/ehr/pm/finishVerifyPm/detail.vue

@@ -31,23 +31,23 @@
           </el-descriptions>
           <el-table size="mini"  :data="form.performanceItem" show-summary :summary-method="getSummaries" border>
             <el-table-column type="index" width="50" label="序号"/>
-            <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估方面" align="center" prop="aspect">
+            <el-table-column width="100" label="评估方面" align="center" prop="aspect">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.ehr_pm_aspect" :value="scope.row.aspect"/>
               </template>
             </el-table-column>
-            <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估指标" align="center" prop="target" />
+            <el-table-column width="100" label="评估指标" align="center" prop="target" />
             <el-table-column width="80" label="权重(%)" align="center" prop="weight">
               <template slot-scope="scope">
                 {{scope.row.asItem ? "+/-" : scope.row.weight}}
               </template>
             </el-table-column>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="指标说明" align="center" prop="instructions">
+            <el-table-column label="指标说明" align="center" prop="instructions">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap;text-align: left">{{scope.row.instructions}}</div>
               </template>
             </el-table-column>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="评分标准" align="center" prop="standard">
+            <el-table-column label="评分标准" align="center" prop="standard">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap;text-align: left">{{scope.row.standard}}</div>
               </template>
@@ -82,8 +82,6 @@ export default {
       form:{},
       //遮罩
       loading: false,
-      //是否展开
-      isUnfold:false,
       //明细权重合计值
       weightSum: 0,
     }
@@ -145,10 +143,11 @@ export default {
     },
     //合计
     getSummaries(param){
-      const { columns, data } = param;
-      let val = data.reduce((sum, e) => sum + Number(e.weight || 0), 0);
-      this.weightSum = val;
-      return ['合计','','',val,'','','',this.form.saMark,'',this.form.ldMark];
+      if(this.form.isTwoEvaluation){
+        return ['合计','','',this.form.weight,'','','',this.form.saMark,'','',this.form.ldMark];
+      }else{
+        return ['合计','','',this.form.weight,'','','',this.form.saMark,'',this.form.ldMark];
+      }
     },
   }
 }

src/views/business/ehr/pm/myPm/detail.vue

@@ -36,20 +36,27 @@
             <el-descriptions-item label="上级评分" v-if="form.status > 4">{{form.ldMark}}</el-descriptions-item>
             <el-descriptions-item label="综合得分" v-if="form.status > 4">{{form.mark}}</el-descriptions-item>
           </el-descriptions>
-          <el-descriptions v-if="form.status > 3">
-            <el-descriptions-item label="个人总结">{{form.summary}}</el-descriptions-item>
-          </el-descriptions>
+          <el-row style="color: #606266;font-size: 14px;" v-if="form.status > 3">
+            <el-col :span="2">
+              个人总结：
+            </el-col>
+            <el-col :span="22">
+              <div style="white-space: pre-wrap;text-align: left">{{form.summary}}</div>
+            </el-col>
+          </el-row>
           <div v-if="this.$store.state.user.name == form.staff && form.status == '3'">
             <el-form-item label="个人总结" prop="summary">
               <el-input type="textarea" placeholder="总结本月工作的亮点和暗点" v-model="form.summary"></el-input>
             </el-form-item>
           </div>
-          <div style="  display: flex;align-items: flex-start;justify-content: flex-start;margin-top: -20px;" v-if="form.status > 4">
-            <p>总评语:</p>
-            <div style="margin-left: 18px;font-size: 15px;">
-              <p v-for="(item,index) in comment" :key="index">{{item[0]}}:{{item[1]}}</p>
-            </div>
-          </div>
+          <el-row style="margin-top:10px;color: #606266;font-size: 14px;" v-if="form.status > 4">
+            <el-col :span="2">
+              总评语:
+            </el-col>
+            <el-col :span="22">
+              <div v-for="(item,index) in comment" :key="index">{{item[0]}}:{{item[1]}}</div>
+            </el-col>
+          </el-row>
 
           <div style="float: right; padding: 3px 0; display:flex;justify-content:space-between">
             <el-button type="primary" size="mini" @click="btnAddRow" v-if="this.$store.state.user.name == form.staff && form.status == '0' && form.performanceItem.length <= 4">增加指标</el-button>
@@ -57,23 +64,23 @@
           </div>
           <el-table size="mini"  :data="form.performanceItem" show-summary :summary-method="getSummaries" border :key="refreshTable">
             <el-table-column type="index" width="50" align="center" label="序号"/>
-            <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估方面" align="center" prop="aspect">
+            <el-table-column width="100" label="评估方面" align="center" prop="aspect">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.ehr_pm_aspect" :value="scope.row.aspect"/>
               </template>
             </el-table-column>
-            <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估指标" align="center" prop="target" />
+            <el-table-column width="100" label="评估指标" align="center" prop="target" />
             <el-table-column width="80" label="权重(%)" align="center" prop="weight">
               <template slot-scope="scope">
                 {{scope.row.asItem ? "+/-" : scope.row.weight}}
               </template>
             </el-table-column>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="指标说明" align="center" prop="instructions">
+            <el-table-column label="指标说明" align="center" prop="instructions">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap;text-align: left">{{scope.row.instructions}}</div>
               </template>
             </el-table-column>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="评分标准" align="center" prop="standard">
+            <el-table-column label="评分标准" align="center" prop="standard">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap;text-align: left">{{scope.row.standard}}</div>
               </template>
@@ -81,9 +88,13 @@
             <el-table-column width="100" label="数据来源" align="center" prop="source" />
 
             <el-table-column width="80" label="自评分" align="center" prop="selfScoring" v-if="form.status > 3"/>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="自评语" align="center" prop="selfComment" v-if="form.status > 3"/>
+            <el-table-column label="自评语" align="center" prop="selfComment" v-if="form.status > 3">
+              <template slot-scope="scope">
+                <div style="white-space: pre-wrap;text-align: left">{{scope.row.selfComment}}</div>
+              </template>
+            </el-table-column>
 
-            <el-table-column width="80" label="自评分" align="center" prop="selfScoring" :render-header="addRedStar" v-if="this.$store.state.user.name == form.staff && form.status == '3'">
+            <el-table-column width="85" label="自评分" align="center" prop="selfScoring" :render-header="addRedStar" v-if="this.$store.state.user.name == form.staff && form.status == '3'">
               <template slot-scope="scope">
                 <el-form-item :prop="'performanceItem.'+scope.$index+'.selfScoring'" :rules="{required: true,message: ' ',trigger: 'blur'}">
                   <el-input  v-model="scope.row.selfScoring" v-only-number="{max:saMarkMax,min:0,precision:1}" size="mini" v-if="!form.scored.includes(scope.row.evaluator)"/>
@@ -91,7 +102,7 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="自评语" align="center" prop="selfComment" :render-header="addRedStar" v-if="this.$store.state.user.name == form.staff && form.status == '3'">
+            <el-table-column label="自评语" align="center" prop="selfComment" :render-header="addRedStar" v-if="this.$store.state.user.name == form.staff && form.status == '3'">
               <template slot-scope="scope">
                 <el-form-item :prop="'performanceItem.'+scope.$index+'.selfComment'" :rules="{required: true,message: ' ',trigger: 'blur'}">
                   <el-input size="mini" type="textarea" :rows="3" v-model="scope.row.selfComment" v-if="!form.scored.includes(scope.row.evaluator)"/>
@@ -103,7 +114,11 @@
             <el-table-column width="80" label="评估人" align="center" prop="evaluatorName" v-if="form.status > 4 && form.isTwoEvaluation"/>
 
             <el-table-column width="80" label="上级评分" align="center" prop="leaderScoring" v-if="form.status > 4"/>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="评分说明" align="center" prop="leaderComment" v-if="form.status > 4"/>
+            <el-table-column label="评分说明" align="center" prop="leaderComment" v-if="form.status > 4">
+              <template slot-scope="scope">
+                <div style="white-space: pre-wrap;text-align: left">{{scope.row.leaderComment}}</div>
+              </template>
+            </el-table-column>
 
             <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" v-if="this.$store.state.user.name == form.staff && form.status == '0'">
               <template slot-scope="scope">
@@ -228,8 +243,6 @@ export default {
           { required: true, message: "数据来源不能为空", trigger: "blur" },
         ],
       },
-      //是否展开
-      isUnfold:false,
       //明细权重合计值
       weightSum: 0,
       //自评分
@@ -386,10 +399,6 @@ export default {
         }
       });
     },
-    //展开/收起
-    btnUnfold(){
-      this.isUnfold = !this.isUnfold;
-    },
     //上一个
     btnPreviou(){
       let i = this.ids.indexOf(this.id) - 1;
@@ -417,12 +426,8 @@ export default {
       let weight = data.reduce((sum, e) => sum + Number(e.weight || 0), 0);
       this.weightSum = weight;
       let selfScoring = 0;
-      if(this.form.saMark){
-        selfScoring = this.form.saMark;
-      }else{
-        selfScoring = data.reduce((sum, e) => sum + (e.asItem ? Number(e.selfScoring || 0) :  Number(e.selfScoring || 0) * (Number(e.weight || 0) / 100)), 0);
-        selfScoring = selfScoring.toFixed(1);
-      }
+      selfScoring = data.reduce((sum, e) => sum + (e.asItem ? Number(e.selfScoring || 0) :  Number(e.selfScoring || 0) * (Number(e.weight || 0) / 100)), 0);
+      selfScoring = selfScoring.toFixed(1);
       this.saMark = selfScoring;
       if(this.form.isTwoEvaluation){
         return ['合计','','',weight,'','','',selfScoring,'','',this.form.ldMark];

src/views/business/ehr/pm/performance/detail.vue

@@ -37,45 +37,60 @@
             <el-descriptions-item label="上级评分" v-if="form.status > 4">{{form.ldMark}}</el-descriptions-item>
             <el-descriptions-item label="综合得分" v-if="form.status > 4">{{form.mark}}</el-descriptions-item>
           </el-descriptions>
-          <el-descriptions v-if="form.status > 3">
-            <el-descriptions-item label="个人总结">{{form.summary}}</el-descriptions-item>
-          </el-descriptions>
-          <div style="  display: flex;align-items: flex-start;justify-content: flex-start;margin-top: -20px;" v-if="form.status > 4">
-            <p>总评语:</p>
-            <div style="margin-left: 18px;font-size: 15px;">
-              <p v-for="(item,index) in comment" :key="index">{{item[0]}}:{{item[1]}}</p>
-            </div>
-          </div>
+          <el-row style="color: #606266;font-size: 14px;" v-if="form.status > 3">
+            <el-col :span="2">
+              个人总结：
+            </el-col>
+            <el-col :span="22">
+              <div style="white-space: pre-wrap;text-align: left">{{form.summary}}</div>
+            </el-col>
+          </el-row>
+          <el-row style="margin-top:10px;color: #606266;font-size: 14px;" v-if="form.status > 4">
+            <el-col :span="2">
+              总评语:
+            </el-col>
+            <el-col :span="22">
+              <div v-for="(item,index) in comment" :key="index">{{item[0]}}:{{item[1]}}</div>
+            </el-col>
+          </el-row>
           
           <el-table size="mini"  :data="form.performanceItem" show-summary :summary-method="getSummaries" border>
             <el-table-column type="index" width="50" label="序号"/>
-            <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估方面" align="center" prop="aspect">
+            <el-table-column width="100" label="评估方面" align="center" prop="aspect">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.ehr_pm_aspect" :value="scope.row.aspect"/>
               </template>
             </el-table-column>
-            <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估指标" align="center" prop="target" />
+            <el-table-column width="100" label="评估指标" align="center" prop="target" />
             <el-table-column width="80" label="权重(%)" align="center" prop="weight">
               <template slot-scope="scope">
                 {{scope.row.asItem ? "+/-" : scope.row.weight}}
               </template>
             </el-table-column>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="指标说明" align="center" prop="instructions">
+            <el-table-column label="指标说明" align="center" prop="instructions">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap;text-align: left">{{scope.row.instructions}}</div>
               </template>
             </el-table-column>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="评分标准" align="center" prop="standard">
+            <el-table-column label="评分标准" align="center" prop="standard">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap;text-align: left">{{scope.row.standard}}</div>
               </template>
             </el-table-column>
             <el-table-column width="100" label="数据来源" align="center" prop="source" />
             <el-table-column width="80" label="自评分" align="center" prop="selfScoring" v-if="form.status > 3"/>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="自评语" align="center" prop="selfComment" v-if="form.status > 3"/>
+              <el-table-column label="自评语" align="center" prop="selfComment" v-if="form.status > 3">
+              <template slot-scope="scope">
+                <div style="white-space: pre-wrap;text-align: left">{{scope.row.selfComment}}</div>
+              </template>
+            </el-table-column>
             <el-table-column width="80" label="评估人" align="center" prop="evaluatorName" v-if="form.status > 4 && form.isTwoEvaluation"/>
             <el-table-column width="80" label="上级评分" align="center" prop="leaderScoring" v-if="form.status > 4"/>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="评分说明" align="center" prop="leaderComment" v-if="form.status > 4"/>
+            <el-table-column label="评分说明" align="center" prop="leaderComment" v-if="form.status > 4">
+              <template slot-scope="scope">
+                <div style="white-space: pre-wrap;text-align: left">{{scope.row.leaderComment}}</div>
+              </template>
+            </el-table-column>
           </el-table>
         </el-form>
       </div>

src/views/business/ehr/pm/performance/index.vue

@@ -59,9 +59,11 @@
         </el-row>
       </el-form>
       <div style="float:right">
+        <el-button size="mini" icon="el-icon-download" @click="btnExport">条件导出</el-button>
       </div>
       <el-table size="mini" height="500px" v-loading="loading" :data="listData" @row-dblclick="btnDetails">
         <el-table-column label="绩效编号" align="center" prop="id" />
+        <el-table-column label="员工编码" align="center" prop="staff" />
         <el-table-column label="员工姓名" align="center" prop="staffName" />
         <el-table-column show-overflow-tooltip label="评估周期" align="center" prop="name" />
         <el-table-column label="月度" align="center" prop="month" />
@@ -192,9 +194,9 @@ export default {
     },
     /** 刷新 */
     refresh(){
-      this.resetForm("queryForm");
-      this.dateRange = [];
-      this.treeValue = [];
+      // this.resetForm("queryForm");
+      // this.dateRange = [];
+      // this.treeValue = [];
       this.getList();
     },
     /** 进入详情 */
@@ -222,6 +224,10 @@ export default {
       console.log("value",value);
       this.$refs.cascaderHandle.dropDownVisible = false;
     },
+    //导出
+    btnExport(){
+      this.download('/ehr/pm/performance/export', this.queryParams, `performance_${new Date().getTime()}.xlsx`)
+    },
   }
 };
 </script>

src/views/business/ehr/pm/psnrelation/index.vue

@@ -21,7 +21,7 @@
         </el-row>
       </el-form>
       <div style="float:right">
-        <el-button type="primary" size="mini" @click="btnGetRelation">同步EHR评估关系</el-button>
+        <el-button  v-loading="loading" type="primary" size="mini" @click="btnGetRelation">同步EHR评估关系</el-button>
       </div>
       <el-table size="mini" height="500px" v-loading="loading" :data="listData" @row-dblclick="btnDetails">
         <el-table-column label="员工编号" align="center" prop="staff" />
@@ -132,11 +132,13 @@ export default {
     },
     //获取EHR评估关系按钮
     btnGetRelation(){
+      this.loading = true;
       sync().then(response => {
         if(response.code == 200){
-          this.$modal.msgSuccess(response.rows.length > 0 ? "同步成功" + "新增下列人员" + response.rows : "同步成功");
+          this.$modal.msgSuccess(response.rows.length > 0 ? "同步成功" + "已同步下列人员【" + response.rows + "】": "同步成功");
           this.getList();
         }
+        this.loading = false;
       });
     }
   }

src/views/business/ehr/pm/stagecontrol/pmList.vue

@@ -31,7 +31,7 @@
       </el-row>
     </el-form>
     <div style="float: right; padding: 3px 0; display:flex;justify-content:space-between">
-      <el-button size="mini" icon="el-icon-download" @click="btnExportAll">导出全部</el-button>
+      <el-button size="mini" icon="el-icon-download" @click="btnExportAll">全部导出</el-button>
       <CreatePmDialog :stageId="stage.id" v-if="stage.stage < 5"></CreatePmDialog>
     </div> 
     <el-table size="mini" height="400px" v-loading="loading" :data="listData">
@@ -213,7 +213,7 @@ export default {
     },
     //导出全部
     btnExportAll(){
-      this.download('/ehr/pm/performance/exportAll', {sourceId:this.stage.id}, `performance_${new Date().getTime()}.xlsx`)
+      this.download('/ehr/pm/performance/export', {sourceId:this.queryParams.sourceId}, `performance_${new Date().getTime()}.xlsx`)
     },
   },
 };