Ver Fonte

EHR-绩效:新版需求页面跳转

001295 há 1 ano atrás
pai
commit
3bffea6920

+ 9 - 0
src/api/business/ehr/pm/flow.js

@@ -15,4 +15,13 @@ export function getFlow(id) {
     url: '/ehr/pm/flow/' + id,
     method: 'get'
   })
+}
+
+// 查询流程详细
+export function getInfo(query) {
+  return request({
+    url: '/ehr/pm/flow/getInfo',
+    method: 'post',
+    params: query
+  })
 }

+ 1 - 0
src/views/business/ehr/pm/awaitMarkPm/detail.vue

@@ -147,6 +147,7 @@ export default {
     }
 	},
   created() {
+    console.log("this.$route.query",this.$route.query);
     this.fetchPerformance(this.$route.query.performanceId);
     this.fetchFlow(this.$route.query.flowId);
   },

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

@@ -46,6 +46,7 @@
               type="text"
               icon="el-icon-search"
               @click="btnPmVerify(scope.row)"
+              v-if="scope.row.status == 4"
             >待评分</el-button>
           </template>
         </el-table-column>
@@ -56,6 +57,7 @@
 
 <script>
 import { listUnMark} from "@/api/business/ehr/pm/pmmark";
+import { getInfo} from "@/api/business/ehr/pm/flow";
 
 export default {
   name: "AwaitMarkPm",
@@ -90,7 +92,19 @@ export default {
     },
     //待确认
     async btnPmVerify(row){
-      this.$router.push({ name: 'AwaitMarkPmDetail', params: { performanceId: row.id,flowId: row.flowId } });
+      let params = {
+        performanceId:row.id,
+        performanceStatus:4,
+        staff:this.$store.state.user.name,
+        status:0,
+      }
+      let res = await getInfo(params);
+      if(res.code == 200 && res.data){
+        this.$router.push({ name: 'AwaitMarkPmDetail', query: { performanceId: row.id,flowId: res.data.id } });
+      }else{
+        console.log("params",params);
+        this.$modal.msgSuccess("未找到对应流程,请联系管理员!");
+      }
     },
     //返回
     btnBack(){

+ 3 - 11
src/views/business/ehr/pm/awaitVerifyPm/detail.vue

@@ -25,9 +25,6 @@
             </div>
           </el-descriptions-item>
         </el-descriptions>
-        <!-- <div style="float:right">
-          <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 width="100" :show-overflow-tooltip="!isUnfold" label="评估方面" align="center" prop="aspect">
@@ -42,11 +39,6 @@
               <div style="white-space: pre-wrap;text-align: left">{{scope.row.instructions}}</div>
             </template>
           </el-table-column>
-          <!-- <el-table-column width="100" label="角色" align="center" prop="role">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.ehr_pm_role" :value="scope.row.role"/>
-            </template>
-          </el-table-column> -->
           <el-table-column :show-overflow-tooltip="!isUnfold" label="评分标准" align="center" prop="standard">
             <template slot-scope="scope">
               <div style="white-space: pre-wrap;text-align: left">{{scope.row.standard}}</div>
@@ -101,9 +93,9 @@ export default {
     };
   },
   created() {
-    console.log('this.$route.query',this.$route.params);
-    this.fetchPerformance(this.$route.params.performanceId);
-    this.fetchFlow(this.$route.params.flowId);
+    console.log("this.$route.query",this.$route.query);
+    this.fetchPerformance(this.$route.query.performanceId);
+    this.fetchFlow(this.$route.query.flowId);
   },
   methods: {
     //查询详情

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

@@ -45,16 +45,27 @@
               type="text"
               icon="el-icon-search"
               @click="btnPmVerify(scope.row)"
+              v-if="scope.row.status == 1"
             >待确认</el-button>
           </template>
         </el-table-column>
       </el-table>
+      <div class="paginationClass">
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </div>
     </div>
   </div>
 </template>
 
 <script>
 import { listUnVerify} from "@/api/business/ehr/pm/pmverify";
+import { getInfo} from "@/api/business/ehr/pm/flow";
 
 export default {
   name: "AwaitVerifyPm",
@@ -63,6 +74,8 @@ export default {
     return {
       // 遮罩层
       loading: true,
+      // 总条数
+      total: 0,
       // 表格数据
       listData: [],
       // 查询参数
@@ -89,7 +102,19 @@ export default {
     },
     //待确认
     async btnPmVerify(row){
-      this.$router.push({ name: 'AwaitVerifyPmDetail', params: { performanceId: row.id,flowId: row.flowId } });
+      let params = {
+        performanceId:row.id,
+        performanceStatus:1,
+        staff:this.$store.state.user.name,
+        status:0,
+      }
+      let res = await getInfo(params);
+      if(res.code == 200 && res.data){
+        this.$router.push({ name: 'AwaitVerifyPmDetail', query: { performanceId: row.id,flowId: res.data.id } });
+      }else{
+        console.log("params",params);
+        this.$modal.msgSuccess("未找到对应流程,请联系管理员!");
+      }
     },
     //返回
     btnBack(){

+ 1 - 1
src/views/business/ehr/pm/myPm/btnCopyItem.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" @click="click">复制指标</el-button>
+    <el-button type="primary" 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" @row-dblclick="btnCopy">

+ 2 - 2
src/views/business/ehr/pm/myPm/detail.vue

@@ -6,7 +6,6 @@
         <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 type="primary" size="mini" @click="btnSubmit" :loading="loading" v-if="this.$store.state.user.name == form.staff && (form.status == '0' || form.status == '3')">提交</el-button>
-          <CopyItemDialog style="margin: 0 10px" @setItems="setItems" v-if="this.$store.state.user.name == form.staff && form.status == '0'" :id="rowId"></CopyItemDialog>
           <ApproveLogDialog style="margin: 0 10px" :pmId="form.id"></ApproveLogDialog>
           <AdjustlogDialog style="margin: 0 10px" :pmId="form.id"></AdjustlogDialog>
           <el-button size="mini" plain @click="btnPreviou" v-if="ids">上一个</el-button>
@@ -46,8 +45,9 @@
           <el-descriptions v-if="form.status > 4">
             <el-descriptions-item label="评语">{{form.comment}}</el-descriptions-item>
           </el-descriptions>
-          <div style="float:right">
+          <div style="float: right; padding: 3px 0; display:flex;justify-content:space-between">
             <el-button type="primary" size="mini" @click="btnAddRow" v-if="this.$store.state.user.name == form.staff && form.status == '0'">增加指标</el-button>
+            <CopyItemDialog style="margin: 0 10px" @setItems="setItems" v-if="this.$store.state.user.name == form.staff && form.status == '0'" :id="rowId"></CopyItemDialog>
             <!-- <el-button size="mini" @click="btnUnfold">{{isUnfold == true ? "收起" : "展开"}}</el-button> -->
           </div>
           <el-table size="mini"  :data="form.performanceItem" show-summary :summary-method="getSummaries" border>

+ 2 - 127
src/views/business/ehr/pm/myPm/index.vue

@@ -42,33 +42,12 @@
       </div>
     </div>
     <detail v-model="isList" v-if="!isList" :pageStu="page" :rowId="rowId" :ids="ids" @refresh="refresh" />
-
-    <el-dialog title="分数调整" :visible.sync="stageListOpen" width="1000px" :close-on-click-modal="false">
-      <el-table size="mini" height="500px" v-loading="stageListLoading" :data="stageList" @row-dblclick="btnDetails">
-        <el-table-column label="名称" align="center" prop="name" />
-        <el-table-column label="月份" align="center" prop="month" />
-        <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-search"
-              @click="btnEntryAdjust(scope.row)"
-            >进入调整</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import detail from './detail.vue'
 import { listPerformance,getCurrentMonthId,getNextMonthId} from "@/api/business/ehr/pm/performance";
-import { getGradeAdjustConut,toDoList} from "@/api/business/ehr/pm/gradeadjust";
-import { getPmVerifyConut} from "@/api/business/ehr/pm/pmverify";
-import { getPmMarkConut} from "@/api/business/ehr/pm/pmmark";
-import { listDept} from "@/api/business/ehr/ehr/dept";
 
 export default {
   name: "assess",
@@ -86,10 +65,6 @@ export default {
       listData: [],
       // id集合
       ids: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -97,11 +72,7 @@ export default {
         params:{
           dataPermission: 'Y',
           oneself: true,
-          staffCodeOrName: null,
         },
-        status: null,
-        month: null,
-        dept: null,
       },
       //页面显示
       isList: true,
@@ -109,35 +80,9 @@ export default {
       page: '',
       //详情id
       rowId: '',
-      //等级调整数量
-      adjustCount: null,
-      //等级调整周期列表
-      stageList:[],
-      //等级调整周期列表弹出层
-      stageListOpen:false,
-      //等级调整周期列表遮罩层
-      stageListLoading: true,
-      //待确认数量
-      verifyCount: null,
-      //待评分数量
-      markCount: null,
-      //部门树
-      deptTree: [],
-      //value
-      treeValue: [],
     };
   },
   async created() {
-    //查询等级调整数量
-    let res = await getGradeAdjustConut();
-    this.adjustCount = res.row;
-    //查询待确认数量
-    res = await getPmVerifyConut();
-    this.verifyCount = res.row;
-    //查询待评分数量
-    res = await getPmMarkConut();
-    this.markCount = res.row;
-    this.getList();
     //如果是跳转过来的页面带了参数flowId则直接进入填写页面
     if(this.$route['query'] !== undefined && this.$route.query['flowId'] !== undefined){
       this.rowId = this.$route.query.performanceId;
@@ -145,23 +90,12 @@ export default {
       this.ids = [this.$route.query.performanceId];
       this.isList = false;
     }
-    listDept().then(response => {
-      let arr = response.rows;
-      arr.forEach(function(element) {
-        element.parent_id = element.superiorsDept;
-        element.value = element.code;
-        element.label = element.name;
-      });
-      console.log("arr",arr);
-      this.deptTree = this.arrayToTree(arr,null);
-      console.log("deptTree",this.deptTree);
-    });
+    this.getList();
   },
   methods: {
     /** 查询绩效列表 */
     getList() {
       this.loading = true;
-      this.queryParams.dept = this.treeValue[this.treeValue.length - 1];
       listPerformance(this.queryParams).then(response => {
         this.listData = response.rows;
         this.ids = response.rows.map(item => item.id);
@@ -169,21 +103,10 @@ export default {
         this.loading = false;
       });
     },
-    /** 搜索按钮操作 */
-    async btnSearch() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    btnResetQuery() {
-      this.resetForm("queryForm");
-      this.treeValue = [];
-      this.queryParams.params.staffCodeOrName = null;
-      this.btnSearch();
-    },
     /** 刷新 */
     refresh(){
       this.resetForm("queryForm");
+      this.dateRange = [];
       this.treeValue = [];
       this.getList();
     },
@@ -193,15 +116,6 @@ export default {
       this.page = 'add';
       this.isList = false;
     },
-    //只看自己按钮
-    btnOneself(){
-      this.btnSearch();
-    },
-    //等级调整
-    btnGradeAdjust(){
-      this.stageListOpen = true;
-      this.getlistStage();
-    },
     //查看当月绩效
     async btnCurrentMonth(){
       let res = await getCurrentMonthId();
@@ -226,45 +140,6 @@ export default {
         this.isList = false;
       }
     },
-    //查询周期列表
-    getlistStage() {
-      this.stageListLoading = true;
-      toDoList().then(response => {
-        this.stageList = response.rows;
-        this.stageListLoading = false;
-      });
-    },
-    //进入调整
-    btnEntryAdjust(row){
-      this.$router.push({ name: 'AdjustGrade', query: { id: row.id,flowId: row.flowId } });
-    },
-    //待确认
-    btnPmVerify(){
-      this.$router.push({name:'PmVerify'});
-    },
-    //待评分
-    btnPmMark(){
-      this.$router.push({name:'PmMark'});
-    },
-    arrayToTree(data, pid) {
-      let result = []
-      this.getChildren(data, result, pid)
-      return result
-    },
-    getChildren(data, result, pid) {
-      for (const item of data) {
-        if (item.parent_id === pid) {
-          const newItem = { children: [], ...item }
-          result.push(newItem)
-          this.getChildren(data, newItem.children, item.code)
-        }
-      }
-    },
-    //
-    handleChange(value){
-      console.log("value",value);
-      this.$refs.cascaderHandle.dropDownVisible = false;
-    },
   }
 };
 </script>