EHR-绩效：问题处理

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

@@ -13,7 +13,6 @@
           <el-button size="mini" type="primary" :loading="loading" plain @click="btnCloseGradeAdjust" v-if="form.stage == '5' && form.isAdjust == 'Y' && form.isSalary == 'N'">关闭等级调整</el-button>
           <el-button size="mini" type="primary" :loading="loading" plain @click="btnAdjustMark" v-if="form.stage == '5' && form.isSalary == 'N'">分数调整</el-button>
           <el-button size="mini" type="primary" :loading="loading" plain @click="btnCendToSalary" v-if="form.stage == '5' && form.isSalary == 'N'">过数到薪资</el-button>
-          <CreatePmDialog style="margin: 0 10px" :stageId="form.id" v-if="form.isPublish == 'Y' && form.stage != '5'"></CreatePmDialog>
           <el-button size="mini" plain @click="btnPreviou">上一个</el-button>
           <el-button size="mini" plain @click="btnNext">下一个</el-button>
         </div>
@@ -27,8 +26,8 @@
               <div>{{ dict.label }}</div>
             </div>
           </el-descriptions-item>
-          <el-descriptions-item label="预计填写结束时间">{{form.month}}</el-descriptions-item>
-          <el-descriptions-item label="预计评分结束时间">{{form.month}}</el-descriptions-item>
+          <el-descriptions-item label="预计填写结束时间">{{form.fillinEndtiem}}</el-descriptions-item>
+          <el-descriptions-item label="预计评分结束时间">{{form.markEndtiem}}</el-descriptions-item>
         </el-descriptions>
         <el-form size="mini" label-position="right" ref="form" :model="form" :rules="formRules" :inline="true" class="demo-form-inline" v-if="pageState != 'see'">
           <el-row>
@@ -57,13 +56,13 @@
             </el-col>
             <el-col span="6">
               <el-form-item label="预计填写结束时间" prop="yearMonth">
-                <el-date-picker type="date" value-format="yyyy-MM" v-model="form.month">
+                <el-date-picker type="date" value-format="yyyy-MM" v-model="form.fillinEndtiem">
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col span="6">
               <el-form-item label="预计评分结束时间" prop="yearMonth">
-                <el-date-picker type="date" value-format="yyyy-MM" v-model="form.month">
+                <el-date-picker type="date" value-format="yyyy-MM" v-model="form.markEndtiem">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -71,9 +70,11 @@
         </el-form>
         <el-tabs v-model="activeName" v-if="form.isPublish == 'Y'" @tab-click="btnTabs">
           <el-tab-pane label="绩效列表" name="first">
-            绩效列表
+            <PmList :key="pmListKey" :stage="form"/>
+          </el-tab-pane>
+          <el-tab-pane label="等级参数" name="second">
+            <GcList :key="gcListKey" :stage="form"/>
           </el-tab-pane>
-          <el-tab-pane label="等级参数" name="second">等级参数</el-tab-pane>
         </el-tabs>
         <div class="footer">
           <el-button type="primary" size="mini" @click="btnEdit" v-if="pageState == 'see'">修改</el-button>
@@ -88,6 +89,8 @@
 
 <script>
 import CreatePmDialog from './btnCreatePm.vue'
+import PmList from './pmList.vue'
+import GcList from './gcList.vue'
 import { getStage,addStage,updateStage,publishStage,fillinFinish,startSelfEvaluation,finishSelfEvaluation,openGradeAdjust,closeGradeAdjust,cendToSalary} from "@/api/business/ehr/pm/stage";
 
 export default {
@@ -98,7 +101,7 @@ export default {
     prop: 'isList',
     event: 'jugislist'
   },
-  components: {CreatePmDialog},
+  components: {CreatePmDialog,PmList,GcList},
   data() {
     return {
       //id
@@ -119,7 +122,11 @@ export default {
       //页面状态
       pageState: null,
       //当前页签
-      activeName: 'first'
+      activeName: 'first',
+      //pmListKey
+      pmListKey: 0,
+      //gcListKey
+      gcListKey: 0,
     }
   },
   async created() {
@@ -159,6 +166,8 @@ export default {
       if(i > -1){
         let id = this.ids[i];
         this.fetchStage(id);
+        this.activeName = 'first';
+        this.pmListKey++;
       }else{
         this.$modal.msgSuccess("已经是当前页第一条了！");
       }
@@ -169,6 +178,8 @@ export default {
       if(i < this.ids.length){
         let id = this.ids[i];
         this.fetchStage(id);
+        this.activeName = 'first';
+        this.pmListKey++;
       }else{
         this.$modal.msgSuccess("已经是当前页最后一条了！");
       }
@@ -424,6 +435,7 @@ export default {
         }
       });
     },
+    //页签切换
     btnTabs(tab, event) {
       console.log(tab, event);
     },