Explorar el Código

EHR-绩效:功能优化

001295 hace 1 año
padre
commit
e9e5fce1fe

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

@@ -3,7 +3,7 @@
     <div slot="header" class="clearfix">
       <span style="font-weight:bold">分数调整</span>
       <div style="float: right; padding: 3px 0" type="text">
-        <el-button type="primary" size="mini" :loading="loading" @click="btnAdjustMark" v-if="flow.status == 0">调整完成</el-button>
+        <el-button type="primary" size="mini" :loading="loading" @click="btnAdjustMark" v-if="flow.status == 0">确认调整</el-button>
         <el-button size="mini" plain @click="btnBack">返回</el-button>
       </div>
     </div>

+ 8 - 5
src/views/business/ehr/pm/awaitMarkPm/detail.vue

@@ -33,10 +33,10 @@
             <el-descriptions-item label="个人总结">{{form.summary}}</el-descriptions-item>
           </el-descriptions>
           <el-descriptions v-if="form.status > 4">
-            <el-descriptions-item label="评语">{{form.comment}}</el-descriptions-item>
+            <el-descriptions-item label="评语">{{form.comment}}</el-descriptions-item>
           </el-descriptions>
           <div v-if="flow.status == 0">
-            <el-form-item label="评语" prop="comment">
+            <el-form-item label="评语" prop="comment">
               <el-input type="textarea" v-model="form.comment"></el-input>
             </el-form-item>
           </div>
@@ -71,7 +71,7 @@
             <el-table-column width="80" label="自评分" align="center" prop="selfScoring"/>
             <el-table-column :show-overflow-tooltip="!isUnfold" label="自评语" align="center" prop="selfComment"/>
             <el-table-column width="80" label="上级评分" align="center" prop="leaderScoring" v-if="flow.status != 0"/>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="上级评语" align="center" prop="leaderComment" v-if="flow.status != 0"/>
+            <el-table-column :show-overflow-tooltip="!isUnfold" label="评分说明" align="center" prop="leaderComment" v-if="flow.status != 0"/>
             <el-table-column width="85" label="上级评分" align="center" prop="leaderScoring" :render-header="addRedStar" v-if="flow.status == 0">
               <template slot-scope="scope">
                 <el-form-item :prop="'performanceItem.'+scope.$index+'.leaderScoring'" :rules="{required: true,message: ' ',trigger: 'blur'}">
@@ -79,9 +79,9 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="上级评语" align="center" prop="leaderComment" :render-header="addRedStar" v-if="flow.status == 0">
+            <el-table-column :show-overflow-tooltip="!isUnfold" label="评分说明" align="center" prop="leaderComment" v-if="flow.status == 0">
               <template slot-scope="scope">
-                <el-form-item :prop="'performanceItem.'+scope.$index+'.leaderComment'" :rules="{required: true,message: ' ',trigger: 'blur'}">
+                <el-form-item :prop="'performanceItem.'+scope.$index+'.leaderComment'">
                   <el-input size="mini" type="textarea" v-model="scope.row.leaderComment"/>
                 </el-form-item>
               </template>
@@ -220,6 +220,9 @@ export default {
     },
     //评写完成
     async btnverify(){
+      if("000001,001194".includes(this.$store.state.user.name)){
+        this.form.comment = '-';
+      }
       this.$refs["dataForm"].validate(async (valid, obj) => {
         if (valid) {
           //保存绩效数据

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

@@ -46,7 +46,7 @@
             <el-descriptions-item label="评语">{{form.comment}}</el-descriptions-item>
           </el-descriptions>
           <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>
+            <el-button type="primary" size="mini" @click="btnAddRow" v-if="this.$store.state.user.name == form.staff && form.status == '0' && form.performanceItem.length <= 4">增加指标</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>

+ 5 - 4
src/views/business/ehr/pm/stagecontrol/gcList.vue

@@ -2,7 +2,7 @@
   <div>
     <el-row>
       <el-col span="11">
-        业务组
+        <el-tag>业务组</el-tag>
         <el-table size="mini" v-loading="loading" :data="c1ListData">
           <el-table-column label="编号" align="center" prop="id" />
           <el-table-column label="名称" align="center" prop="name" />
@@ -11,11 +11,12 @@
           <el-table-column label="系数" align="center" prop="coefficient" />
         </el-table>
       </el-col>
-      <el-col span="2">
-        -
+      <el-col span="2" style="border:1px solid transparent">
+        <dev style="white-space: pre-wrap;text-align: left">
+        </dev>
       </el-col>
       <el-col span="11">
-        非业务组
+        <el-tag>非业务组</el-tag>
         <el-table size="mini" v-loading="loading" :data="c2ListData">
           <el-table-column label="编号" align="center" prop="id" />
           <el-table-column label="名称" align="center" prop="name" />