Merge branch 'dev' of http://172.16.100.139/new-business/drp-web into dev

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

@@ -15,12 +15,12 @@
       </div>
       <div v-loading="loading">
         <el-form size="mini" ref="dataForm" :model="form" :rules="rules">
-          <el-descriptions :column="6 ">
+          <el-descriptions :column="6">
             <el-descriptions-item label="员工编号">{{form.staff}}</el-descriptions-item>
             <el-descriptions-item label="员工姓名">{{form.staffName}}</el-descriptions-item>
             <el-descriptions-item label="入职日期">{{form.dateJoin}}</el-descriptions-item>
             <el-descriptions-item label="转正日期">{{form.probationComplete}}</el-descriptions-item>
-            <el-descriptions-item label="部门">{{form.deptName}}</el-descriptions-item>
+            <el-descriptions-item label="部门" span="2">{{form.deptName}}</el-descriptions-item>
             <el-descriptions-item label="职位">{{form.jobName}}</el-descriptions-item>
             <el-descriptions-item label="评估周期">{{form.name}}</el-descriptions-item>
             <el-descriptions-item label="评估人">{{form.evaluatorName}}</el-descriptions-item>
@@ -33,6 +33,7 @@
           <el-descriptions :column="6 ">
             <el-descriptions-item label="自评分" v-if="form.status > 3">{{form.saMark}}</el-descriptions-item>
             <el-descriptions-item label="上级评分" v-if="form.status > 4">{{form.ldMark}}</el-descriptions-item>
+            <el-descriptions-item label="综合得分" v-if="form.status > 4">{{form.mark}}</el-descriptions-item>
           </el-descriptions>
           <el-descriptions v-if="form.status > 3">
             <el-descriptions-item label="个人总结">{{form.summary}}</el-descriptions-item>

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

@@ -2,57 +2,64 @@
   <div>
     <div class="app-container" v-if="isList">
       <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true">
-        <el-form-item label="部门">
-          <el-cascader
-            v-model="treeValue"
-            :options="deptTree"
-            :props="{ checkStrictly: true }"
-            ref="cascaderHandle"
-            clearable
-            @change="handleChange"
-            >
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="员工">
-          <el-input
-            v-model="queryParams.params.staffCodeOrName"
-            clearable
-            @keyup.enter.native="btnSearch"
-          />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select
-            size="mini"
-            v-model="queryParams.status"
-            placeholder=""
-            clearable
-          >
-            <el-option
-              v-for="dict in dict.type.ehr_pm_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="月份" prop="month">
-          <el-date-picker type="month" value-format="yyyy-MM" v-model="queryParams.month">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="评估人" prop="evaluatorName">
-          <el-input
-            v-model="queryParams.evaluatorName"
-            clearable
-            @keyup.enter.native="btnSearch"
-          />
-        </el-form-item>
-        <el-form-item label="只看自己的">
-          <el-checkbox v-model="queryParams.params.oneself" @change="btnOneself"></el-checkbox>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="btnSearch">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="btnResetQuery">重置</el-button>
-        </el-form-item>
+        <el-row >
+          <el-col :span="18">
+            <el-form-item label="部门">
+              <el-cascader
+                v-model="treeValue"
+                :options="deptTree"
+                :props="{ checkStrictly: true }"
+                ref="cascaderHandle"
+                clearable
+                @change="handleChange"
+                placeholder=""
+                >
+              </el-cascader>
+            </el-form-item>
+            <el-form-item label="员工">
+              <el-input
+                v-model="queryParams.params.staffCodeOrName"
+                clearable
+                @keyup.enter.native="btnSearch"
+              />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+              <el-select
+                size="mini"
+                v-model="queryParams.status"
+                placeholder=""
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.ehr_pm_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="月份" prop="month">
+              <el-date-picker type="month" value-format="yyyy-MM" v-model="queryParams.month">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="评估人" prop="evaluatorName">
+              <el-input
+                v-model="queryParams.evaluatorName"
+                clearable
+                @keyup.enter.native="btnSearch"
+              />
+            </el-form-item>
+            <el-form-item label="只看自己的">
+              <el-checkbox v-model="queryParams.params.oneself" @change="btnOneself"></el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item style="float:right">
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="btnSearch">搜索</el-button>
+              <el-button icon="el-icon-refresh" size="mini" @click="btnResetQuery">重置</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div style="float:right">
         <el-badge :value="verifyCount" class="item" style="margin: 0 10px" v-if="verifyCount > 0">
@@ -74,7 +81,7 @@
         <el-table-column label="月度" align="center" prop="month" />
         <el-table-column label="自评分" align="center" prop="saMark" />
         <el-table-column label="上级评分" align="center" prop="ldMark" />
-        <el-table-column label="分数" align="center" prop="mark" />
+        <el-table-column label="综合得分" align="center" prop="mark" />
         <el-table-column label="等级" align="center" prop="grade" />
         <el-table-column label="绩效系数" align="center" prop="coefficient" />
         <el-table-column label="状态" align="center" prop="status" >

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

@@ -131,7 +131,7 @@ export default {
   async created() {
     this.pageState = this.enterState;
     if(this.enterState == 'add'){
-      this.form.stage = 0;
+      this.form.stage = "0";
       this.form.isPublish = 'N';
       this.form.isAdjust = 'N';
     }

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

@@ -20,13 +20,14 @@
       <el-table size="mini" v-loading="loading" :data="listData" height="500px" @row-dblclick="btnDetails">
         <el-table-column label="编号" align="center" prop="id" />
         <el-table-column label="名称" align="center" prop="name" />
+        <el-table-column label="月份" align="center" prop="month" />
         <el-table-column label="阶段" align="center" prop="stage" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.ehr_pm_status" :value="scope.row.stage"/>
           </template>
         </el-table-column>
         <el-table-column label="创建时间" align="center" prop="createTime" />
-        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建人" align="center" prop="createByName" />
         <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
             <el-button