EHR-绩效：问题处理

src/api/business/ehr/pm/adjustlog.js

@@ -17,3 +17,15 @@ export function addAdjustlog(data) {
     data: data
   })
 }
+
+//导入
+export function importData(data) {
+  return request({
+    url: `/ehr/pm/adjustlog/importData`,
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}

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

@@ -27,7 +27,7 @@
               导入<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-button size="mini" type="primary" @click="useImportTemplate">模板下载</el-button>
+              <el-button size="mini" @click="useImportTemplate">模板下载</el-button>
               <el-upload ref="upload" action="" :http-request="onUpload">
                 <el-button size="mini" type="primary">数据导入</el-button>
               </el-upload>
@@ -92,7 +92,7 @@
 
 <script>
 import { listMarkAdjust,getPerformance} from "@/api/business/ehr/pm/markadjust";
-import { addAdjustlog} from "@/api/business/ehr/pm/adjustlog";
+import { addAdjustlog,importData} from "@/api/business/ehr/pm/adjustlog";
 
 export default {
   name: "AdjustMark",
@@ -218,7 +218,7 @@ export default {
     },
     //模板下载
     useImportTemplate(){
-      this.download('pu/allot/importTemplate', {
+      this.download('ehr/pm/adjustlog/importTemplate', {
       }, `分数调整导入模板_${new Date().getTime()}.xlsx`)
     },
     //导入
@@ -229,7 +229,8 @@ export default {
     onUpload (file) {
       this.loading = true;
       let formData = new FormData()
-      formData.append('file',file.file)
+      formData.append('file',file.file);
+      formData.append('stageId',this.$route.params.id);
       importData(formData).then((res) => {
         console.log('res',res);
         if(res.code == '200'){
@@ -242,7 +243,7 @@ export default {
         this.$message.error(e.message)
       }).finally((e) => {
         this.$refs['upload'].clearFiles();
-        this.resetList();
+        this.getList();
         this.loading = false;
       })
     },

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

@@ -32,7 +32,7 @@
           <el-descriptions v-if="form.status > 4">
             <el-descriptions-item label="评语">{{form.comment}}</el-descriptions-item>
           </el-descriptions>
-          <div>
+          <div v-if="flow.status == 0">
             <el-form-item label="评语" prop="comment">
               <el-input type="textarea" v-model="form.comment"></el-input>
             </el-form-item>
@@ -176,9 +176,14 @@ 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];
+      let ldMark = 0;
+      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 = ldMark.toFixed(1);
+      }
+      return ['合计','','',this.form.weight,'','','',this.form.saMark,'',ldMark];
     },
     //驳回
     btnTurnDown(){

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

@@ -95,7 +95,7 @@
 
             <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 width="80" label="加权得分" align="center" prop="weightedScore" v-if="form.status > 4"/>
+            <!-- <el-table-column width="80" label="加权得分" align="center" prop="weightedScore" v-if="form.status > 4"/> -->
           
             <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">
@@ -353,9 +353,16 @@ 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];
+      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];
     },
     //提交
     btnSubmit(){