EHR-绩效：增加双向评估功能；

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

@@ -201,7 +201,11 @@ export default {
         ldMark = ldMark.toFixed(1);
       }
       this.lldMark = ldMark;
-      return ['合计','','',this.form.weight,'','','',this.form.saMark,'',ldMark];
+      if(this.form.isTwoEvaluation){
+        return ['合计','','',this.form.weight,'','','',this.form.saMark,'','',ldMark];
+      }else{
+        return ['合计','','',this.form.weight,'','','',this.form.saMark,'',ldMark];
+      }
     },
     //驳回
     btnTurnDown(){

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

@@ -3,7 +3,11 @@
     <el-button size="mini" @click="click">分数调整记录</el-button>
     <el-dialog title="分数调整记录" :visible.sync="open" width="1000px" :close-on-click-modal="false">
       <el-table size="mini" height="500px" v-loading="loading" :data="listData">
-        <el-table-column label="调整分" align="center" prop="ajMark" />
+        <el-table-column label="调整分" align="center" prop="ajMark">
+          <template slot-scope="scope">
+            {{scope.row.ajMark > 0 ? "+" + scope.row.ajMark : scope.row.ajMark}}
+          </template>
+        </el-table-column>
         <el-table-column label="调整原因" align="center" prop="ajCause" />
         <el-table-column label="调整时间" align="center" prop="createTime" />
         <el-table-column label="调整人" align="center" prop="createBy" />

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

@@ -161,10 +161,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/finishVerifyPm/btnAjMarkLog.vue

@@ -3,7 +3,11 @@
     <el-button size="mini" @click="click">分数调整记录</el-button>
     <el-dialog title="分数调整记录" :visible.sync="open" width="1000px" :close-on-click-modal="false">
       <el-table size="mini" height="500px" v-loading="loading" :data="listData">
-        <el-table-column label="调整分" align="center" prop="ajMark" />
+        <el-table-column label="调整分" align="center" prop="ajMark">
+          <template slot-scope="scope">
+            {{scope.row.ajMark > 0 ? "+" + scope.row.ajMark : scope.row.ajMark}}
+          </template>
+        </el-table-column>
         <el-table-column label="调整原因" align="center" prop="ajCause" />
         <el-table-column label="调整时间" align="center" prop="createTime" />
         <el-table-column label="调整人" align="center" prop="createBy" />

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

@@ -3,7 +3,11 @@
     <el-button size="mini" @click="click">分数调整记录</el-button>
     <el-dialog title="分数调整记录" :visible.sync="open" width="1000px" :close-on-click-modal="false">
       <el-table size="mini" height="500px" v-loading="loading" :data="listData">
-        <el-table-column label="调整分" align="center" prop="ajMark" />
+        <el-table-column label="调整分" align="center" prop="ajMark">
+          <template slot-scope="scope">
+            {{scope.row.ajMark > 0 ? "+" + scope.row.ajMark : scope.row.ajMark}}
+          </template>
+        </el-table-column>
         <el-table-column label="调整原因" align="center" prop="ajCause" />
         <el-table-column label="调整时间" align="center" prop="createTime" />
         <el-table-column label="调整人" align="center" prop="createBy" />

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

@@ -369,7 +369,11 @@ export default {
         selfScoring = selfScoring.toFixed(1);
       }
       this.saMark = selfScoring;
-      return ['合计','','',weight,'','','',selfScoring,'',this.form.ldMark];
+      if(this.form.isTwoEvaluation){
+        return ['合计','','',weight,'','','',selfScoring,'','',this.form.ldMark];
+      }else{
+        return ['合计','','',weight,'','','',selfScoring,'',this.form.ldMark];
+      }
     },
     //提交
     btnSubmit(){

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

@@ -3,7 +3,11 @@
     <el-button size="mini" @click="click">分数调整记录</el-button>
     <el-dialog title="分数调整记录" :visible.sync="open" width="1000px" :close-on-click-modal="false">
       <el-table size="mini" height="500px" v-loading="loading" :data="listData">
-        <el-table-column label="调整分" align="center" prop="ajMark" />
+        <el-table-column label="调整分" align="center" prop="ajMark">
+          <template slot-scope="scope">
+            {{scope.row.ajMark > 0 ? "+" + scope.row.ajMark : scope.row.ajMark}}
+          </template>
+        </el-table-column>
         <el-table-column label="调整原因" align="center" prop="ajCause" />
         <el-table-column label="调整时间" align="center" prop="createTime" />
         <el-table-column label="调整人" align="center" prop="createBy" />

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

@@ -153,17 +153,11 @@ export default {
     },
     //合计
     getSummaries(param){
-      const { columns, data } = param;
-      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;
+      if(this.form.isTwoEvaluation){
+        return ['合计','','',this.form.weight,'','','',this.form.saMark,'','',this.form.ldMark];
       }else{
-        selfScoring = data.reduce((sum, e) => sum + Number(e.selfScoring || 0) * (Number(e.weight || 0) / 100), 0);
-        selfScoring = selfScoring.toFixed(1);
+        return ['合计','','',this.form.weight,'','','',this.form.saMark,'',this.form.ldMark];
       }
-      return ['合计','','',weight,'','','',selfScoring,'',this.form.ldMark];
     },
   }
 }

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

@@ -2,7 +2,7 @@
   <div class="createPm">
     <el-button size="mini" icon="el-icon-plus" @click="click">生成绩效</el-button>
     <el-dialog title="生成绩效" :visible.sync="open" width="1000px" :close-on-click-modal="false">
-      <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true">
+      <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" @submit.native.prevent>
         <el-form-item label="员工" prop="staffCodeOrName">
           <el-input
             v-model="queryParams.staffCodeOrName"