Эх сурвалжийг харах

ehr-绩效:功能开发;

001295 1 жил өмнө
parent
commit
02065e99c0

+ 10 - 1
src/api/business/ehr/pm/flow.js

@@ -1,6 +1,15 @@
 import request from '@/utils/request'
 
-// 查询阶段详细
+// 查询流程列表
+export function listFlow(query) {
+  return request({
+    url: '/ehr/pm/flow/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询流程详细
 export function getFlow(id) {
   return request({
     url: '/ehr/pm/flow/' + id,

+ 20 - 15
src/views/business/ehr/pm/performance/detail.vue

@@ -3,12 +3,11 @@
     <el-card>
       <div slot="header" class="clearfix">
         <span style="font-weight:bold">绩效考核表</span>
-        <div style="float: right; padding: 3px 0" type="text">
+        <div style="float: right; padding: 3px 0; display:flex;justify-content:space-between" type="text">
           <el-button size="mini" plain @click="btnBack">返回</el-button>
           <el-button size="mini" plain @click="btnSubmit" v-if="this.$store.state.user.name == form.staff && (form.status == '0' || form.status == '3')">提交</el-button>
-          <el-button size="mini" plain @click="btnCopyItem"  v-if="this.$store.state.user.name == form.staff && form.status == '0'">复制指标</el-button>
-          <!-- <el-button size="mini" plain @click="btnLog">指标修改记录</el-button> -->
-          <el-button size="mini" plain @click="btnApproveLog">指标审批记录</el-button>
+          <CopyItemDialog style="margin: 0 10px" @setItems="setItems" v-if="this.$store.state.user.name == form.staff && form.status == '0'"></CopyItemDialog>
+          <ApproveLogDialog style="margin: 0 10px" :pmId="form.id"></ApproveLogDialog>
           <el-button size="mini" plain @click="btnPreviou" v-if="ids">上一个</el-button>
           <el-button size="mini" plain @click="btnNext" v-if="ids">下一个</el-button>
         </div>
@@ -159,6 +158,8 @@
 </template>
 
 <script>
+import ApproveLogDialog from './btnApproveLog.vue'
+import CopyItemDialog from './btnCopyItem.vue'
 import { getPerformance,fillinFinish,selfestimate} from "@/api/business/ehr/pm/performance";
 import { getPerformanceItem,addPerformanceItem,updatePerformanceItem,batchUpdatePerformanceItem,delPerformanceItem} from "@/api/business/ehr/pm/performanceitem";
 
@@ -170,6 +171,7 @@ export default {
     prop: 'isList',
     event: 'jugislist'
   },
+  components: {ApproveLogDialog,CopyItemDialog},
   data() {
     return {
       //id
@@ -365,18 +367,21 @@ export default {
         });
       }
     },
-    //复制指标
-    btnCopyItem(){
-
-    },
-    //指标修改记录
-    btnLog(){
-
+    //设置明细
+    setItems(items){
+      console.log(111);
+      items.forEach((e) => {
+        e.id = null;
+        e.standard = null;
+        e.selfScoring = null;
+        e.selfComment = null;
+        e.leaderScoring = null;
+        e.leaderComment = null;
+        e.weightedScore = null;
+      });
+      this.form.performanceItem = items;
+      return true;
     },
-    //指标审批记录
-    btnApproveLog(){
-      
-    }
   }
 }
 </script>

+ 1 - 1
src/views/business/ehr/pm/performance/index.vue

@@ -57,7 +57,7 @@
           </template>
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
+          <template slot-scope="scope">
             <el-button
               size="mini"
               type="text"