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

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

@@ -51,7 +51,11 @@
               </template>
             </el-table-column>
             <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估指标" align="center" prop="target" />
-            <el-table-column width="80" label="权重" align="center" prop="weight"/>
+            <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">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap;text-align: left">{{scope.row.instructions}}</div>
@@ -138,6 +142,8 @@ export default {
       isUnfold:false,
       //是否显驳回弹出层
       turnDownOpen:false,
+      //上级评分
+      lldMark:0,
     };
   },
   computed: {
@@ -184,9 +190,10 @@ export default {
       if(this.form.ldMark){
         ldMark = this.form.ldMark;
       }else{
-        ldMark = data.reduce((sum, e) => sum + Number(e.leaderScoring || 0) * (Number(e.weight || 0) / 100), 0);
+        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;
       return ['合计','','',this.form.weight,'','','',this.form.saMark,'',ldMark];
     },
     //驳回
@@ -223,6 +230,14 @@ export default {
       if("000001,001194".includes(this.$store.state.user.name)){
         this.form.comment = '-';
       }
+      if(this.form.staffDivide == 'C1' && this.lldMark > 150){
+        this.$modal.msgWarning("业务组总评分不能超过150！");
+        return;
+      }
+      if(this.form.staffDivide == 'C2' && this.lldMark > 100){
+        this.$modal.msgWarning("非务组总评分不能超过100！");
+        return;
+      }
       this.$refs["dataForm"].validate(async (valid, obj) => {
         if (valid) {
           //保存绩效数据
@@ -247,7 +262,8 @@ export default {
     },
     //返回
     btnBack(){
-      this.$router.back();
+      // this.$router.back();
+      this.$router.push({name:'AwaitMarkPm',params: { id: this.form.sourceId}});
     },
     //必选标识
     addRedStar(h, { column }) {

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

@@ -33,7 +33,11 @@
             </template>
           </el-table-column>
           <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估指标" align="center" prop="target" />
-          <el-table-column width="80" label="权重" align="center" prop="weight"/>
+          <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">
             <template slot-scope="scope">
               <div style="white-space: pre-wrap;text-align: left">{{scope.row.instructions}}</div>

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

@@ -47,7 +47,11 @@
               </template>
             </el-table-column>
             <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估指标" align="center" prop="target" />
-            <el-table-column width="80" label="权重(%)" align="center" prop="weight"/>
+            <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">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap;text-align: left">{{scope.row.instructions}}</div>
@@ -156,16 +160,9 @@ 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;
-      }else{
-        selfScoring = data.reduce((sum, e) => sum + Number(e.selfScoring || 0) * (Number(e.weight || 0) / 100), 0);
-        selfScoring = selfScoring.toFixed(1);
-      }
-      return ['合计','','',weight,'','','',selfScoring,'',this.form.ldMark];
+      let val = data.reduce((sum, e) => sum + Number(e.weight || 0), 0);
+      this.weightSum = val;
+      return ['合计','','',val,'','','',this.form.saMark,'',this.form.ldMark];
     },
   }
 }

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

@@ -35,7 +35,11 @@
               </template>
             </el-table-column>
             <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估指标" align="center" prop="target" />
-            <el-table-column width="80" label="权重(%)" align="center" prop="weight"/>
+            <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">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap;text-align: left">{{scope.row.instructions}}</div>
@@ -140,16 +144,9 @@ 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;
-      }else{
-        selfScoring = data.reduce((sum, e) => sum + Number(e.selfScoring || 0) * (Number(e.weight || 0) / 100), 0);
-        selfScoring = selfScoring.toFixed(1);
-      }
-      return ['合计','','',weight,'','','',selfScoring,'',this.form.ldMark];
+      let val = data.reduce((sum, e) => sum + Number(e.weight || 0), 0);
+      this.weightSum = val;
+      return ['合计','','',val,'','','',this.form.saMark,'',this.form.ldMark];
     },
   }
 }

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

@@ -47,7 +47,11 @@
               </template>
             </el-table-column>
             <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估指标" align="center" prop="target" />
-            <el-table-column width="80" label="权重(%)" align="center" prop="weight"/>
+            <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">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap;text-align: left">{{scope.row.instructions}}</div>

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

@@ -51,14 +51,18 @@
             <!-- <el-button size="mini" @click="btnUnfold">{{isUnfold == true ? "收起" : "展开"}}</el-button> -->
           </div>
           <el-table size="mini"  :data="form.performanceItem" show-summary :summary-method="getSummaries" border>
-            <el-table-column type="index" width="50" label="序号"/>
+            <el-table-column type="index" width="50" align="center" label="序号"/>
             <el-table-column width="100" :show-overflow-tooltip="!isUnfold" 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="80" label="权重(%)" align="center" prop="weight"/>
+            <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">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap;text-align: left">{{scope.row.instructions}}</div>
@@ -223,6 +227,8 @@ export default {
       isUnfold:false,
       //明细权重合计值
       weightSum: 0,
+      //自评分
+      saMark: 0,
     }
   },
   computed: {
@@ -360,9 +366,10 @@ export default {
       if(this.form.saMark){
         selfScoring = this.form.saMark;
       }else{
-        selfScoring = data.reduce((sum, e) => sum + Number(e.selfScoring || 0) * (Number(e.weight || 0) / 100), 0);
+        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;
       return ['合计','','',weight,'','','',selfScoring,'',this.form.ldMark];
     },
     //提交
@@ -385,6 +392,14 @@ export default {
         });
       }
       if(this.form.status == '3'){
+        if(this.form.staffDivide == 'C1' && this.saMark > 150){
+          this.$modal.msgWarning("业务组自评总分不能超过150！");
+          return;
+        }
+        if(this.form.staffDivide == 'C2' && this.saMark > 100){
+          this.$modal.msgWarning("非务组自评总分不能超过100！");
+          return;
+        }
         this.$refs["dataForm"].validate(async valid => {
           if (valid) {
             let that = this;

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

@@ -58,7 +58,11 @@
               </template>
             </el-table-column>
             <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估指标" align="center" prop="target" />
-            <el-table-column width="80" label="权重(%)" align="center" prop="weight"/>
+            <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">
               <template slot-scope="scope">
                 <div style="white-space: pre-wrap;text-align: left">{{scope.row.instructions}}</div>