Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!567

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

@@ -4,9 +4,17 @@
     <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="createTime" />
-        <el-table-column label="阶段" align="center" prop="performanceStatus" />
+        <el-table-column label="阶段" align="center" prop="performanceStatus" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.ehr_pm_status" :value="scope.row.performanceStatus"/>
+          </template>
+        </el-table-column>
         <el-table-column label="评估人" align="center" prop="staffName" />
-        <el-table-column label="状态" align="center" prop="status" />
+        <el-table-column label="状态" align="center" prop="status" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.ehr_pm_flow_status" :value="scope.row.status"/>
+          </template>
+        </el-table-column>
         <el-table-column label="结果" align="center" prop="result" />
       </el-table>
     </el-dialog>
@@ -18,6 +26,7 @@
 import { listFlow} from "@/api/business/ehr/pm/flow";
 export default {
   name: "ApproveLogDialog",
+  dicts: ['ehr_pm_status','ehr_pm_flow_status'],
   props: ['pmId'],
   data() {
     return {

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

@@ -187,6 +187,8 @@ export default {
   async created() {
     let res = await count();
     this.adjustCount = res.row;
+    //数据权限配置
+    this.queryParams.params = {dataPermission:"Y"};
     this.getList();
   },
   methods: {

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

@@ -144,6 +144,9 @@ export default {
     //绩效确认
     async btnverify(val){
       this.flow.status = val;
+      if(this.flow.status == 2){
+        this.flow.result = "同意";
+      }
       await verify(this.flow).then(res => {
         if (res.code === 200) {
           this.fetchPerformance(this.$route.query.performanceId);