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

src/api/business/ehr/pm/flow.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 查询阶段详细
+export function getFlow(id) {
+  return request({
+    url: '/ehr/pm/flow/' + id,
+    method: 'get'
+  })
+}

src/api/business/ehr/pm/performance.js

@@ -16,3 +16,48 @@ export function getPerformance(id) {
     method: 'get'
   })
 }
+
+// 保存绩效
+export function savePerformance(data) {
+  return request({
+    url: '/ehr/pm/performance/save',
+    method: 'put',
+    data: data
+  })
+}
+
+// 填写完成
+export function fillinFinish(data) {
+  return request({
+    url: '/ehr/pm/performance/fillinFinish',
+    method: 'post',
+    data: data
+  })
+}
+
+//绩效确认
+export function verify(data) {
+  return request({
+    url: '/ehr/pm/performance/verify',
+    method: 'post',
+    data: data
+  })
+}
+
+// 自评完成
+export function selfestimate(data) {
+  return request({
+    url: '/ehr/pm/performance/selfestimate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 上级评论
+export function superiorevaluation(data) {
+  return request({
+    url: '/ehr/pm/performance/superiorevaluation',
+    method: 'post',
+    data: data
+  })
+}

src/api/business/ehr/pm/psnrelation.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 查询人员关系列表
+export function listPsnrelation(query) {
+  return request({
+    url: '/ehr/pm/psnrelation/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询人员关系详细
+export function getPsnrelation(id) {
+  return request({
+    url: '/ehr/pm/psnrelation/' + id,
+    method: 'get'
+  })
+}
+
+// 保存人员关系
+export function savePsnrelation(data) {
+  return request({
+    url: '/ehr/pm/psnrelation',
+    method: 'post',
+    data: data
+  })
+}

src/api/business/ehr/pm/stage.js

@@ -50,4 +50,31 @@ export function publishStage(data) {
     method: 'post',
     data: data
   })
-}
+}
+
+// 填写结束
+export function fillinFinish(data) {
+  return request({
+    url: '/ehr/pm/stage/fillinFinish',
+    method: 'post',
+    data: data
+  })
+}
+
+//开始自评
+export function startSelfEvaluation(data) {
+  return request({
+    url: '/ehr/pm/stage/startSelfEvaluation',
+    method: 'post',
+    data: data
+  })
+}
+
+//结束自评
+export function finishSelfEvaluation(data) {
+  return request({
+    url: '/ehr/pm/stage/finishSelfEvaluation',
+    method: 'post',
+    data: data
+  })
+}

src/api/sso/ssoLogin.js

@@ -7,4 +7,12 @@ export function sso(data) {
     method: 'post',
     data: data
   })
+}
+
+//根据员工工号获取token
+export function ehrLogin(code) {
+  return request({
+    'url': '/login/ehr/' + code,
+    'method': 'get',
+  })
 }

src/assets/styles/ruoyi.scss

@@ -178,7 +178,8 @@
 }
 
 .el-card__header {
-	padding: 14px 15px 7px;
+	// padding: 14px 15px 7px;
+	padding: 0px 15px 0px;
 	min-height: 40px;
 }
 

src/components/super-form/index.vue

@@ -169,7 +169,7 @@ export default {
 </template>
 
 <style scoped>
-.superForm>>>.el-form-item{
-  margin-bottom: 12px;
+.superForm >>> .el-form-item {
+  margin-bottom: 5px;
 }
 </style>

src/components/super-search/index.vue

@@ -117,7 +117,7 @@ export default {
               v-if="attr.is === 'el-select'"
               v-bind="attr"
               v-model="innerValue[item.key]"
-              @change="attr.multiple ? '': $emit('submit')"
+              @change="attr.multiple ? '' : $emit('submit')"
               style="width: 100%"
             >
               <template>
@@ -212,7 +212,7 @@ export default {
 </template>
 
 <style scoped>
-.superForm>>>.el-form-item{
+.superForm >>> .el-form-item {
   margin-bottom: 12px;
 }
 </style>

src/permission.js

@@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/login', '/register', '/test01', '/canteenAddFood', '/canteenAddMenu', '/menuScreen', '/foodScreen','/business/wms/historical-route']
+const whiteList = ['/login', '/register', '/test01', '/ehrentrance', '/canteenAddFood', '/canteenAddMenu', '/menuScreen', '/foodScreen','/business/wms/historical-route']
 
 router.beforeEach((to, from, next) => {
   NProgress.start()

src/router/index.js

@@ -57,6 +57,11 @@ export const constantRoutes = [
     hidden: true
   },
   {
+    path: '/ehrentrance',
+    component: () => import('@/views/ehrentrance'),
+    hidden: true
+  },
+  {
     path: '/canteenAddFood',
     component: () => import('@/views/canteen/addFood'),
     hidden: true

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

@@ -0,0 +1,201 @@
+<template>
+  <div>
+    <el-card v-if="flow.staff == this.$store.state.user.name">
+      <div slot="header" class="clearfix">
+        <span style="font-weight:bold">绩效考核表</span>
+        <div style="float: right; padding: 3px 0" type="text" v-if="flow.status == 0">
+          <el-button size="mini" plain @click="btnTurnDown(1)">驳回</el-button>
+          <el-button size="mini" type="primary" plain @click="btnverify(2)">评写完成</el-button>
+        </div>
+      </div>
+      <div v-loading="loading">
+        <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.oneDeptName}}</el-descriptions-item>
+          <el-descriptions-item label="二级部门">{{form.twoDeptName}}</el-descriptions-item>
+          <el-descriptions-item label="三级部门">{{form.threeDeptName}}</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.startTime}}</el-descriptions-item>
+          <el-descriptions-item label="评估人姓名">{{form.deadlineTime}}</el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions v-if="form.status > 3">
+          <el-descriptions-item label="个人总结">{{form.summary}}</el-descriptions-item>
+        </el-descriptions>
+        <div>
+          评语<el-input type="textarea" v-model="form.comment"></el-input>
+        </div>
+        <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">
+          <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估方面" align="center" prop="aspect">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.ehr_pm_aspect" :value="scope.row.aspect"/>
+            </template>
+          </el-table-column>
+          <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估指标" align="center" prop="target" />
+          <el-table-column :show-overflow-tooltip="!isUnfold" label="评估说明" align="center" prop="instructions" />
+          <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 width="80" label="权重" align="center" prop="weight"/>
+          <el-table-column :show-overflow-tooltip="!isUnfold" label="绩效标准" align="center" prop="standard" />
+          <el-table-column width="100" label="数据来源" align="center" prop="source" />
+          <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">
+            <template slot-scope="scope">
+              <el-input size="mini" v-model="scope.row.leaderScoring"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :show-overflow-tooltip="!isUnfold" label="上级评语" align="center" prop="leaderComment">
+            <template slot-scope="scope">
+              <el-input size="mini" type="textarea" v-model="scope.row.leaderComment"></el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-card>
+
+    <el-dialog title="" :visible.sync="turnDownOpen" width="1000px" :close-on-click-modal="false" :show-close="false">
+      <el-form size="mini" label-position="right" ref="flow" :model="flow" :rules="flowRules" label-width="80px">
+        <el-form-item label="驳回原因" prop="result">
+          <el-input type="textarea" v-model="flow.result"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="btnTurnDownClose">取 消</el-button>
+        <el-button size="mini" type="primary" @click="btnTurnDownConfirm">确 定</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { getPerformance,superiorevaluation,savePerformance} from "@/api/business/ehr/pm/performance";
+import { getFlow} from "@/api/business/ehr/pm/flow";
+
+export default {
+  name: "verify",
+  dicts: ['ehr_pm_aspect','ehr_pm_role'],
+  data() {
+    return {
+      //遮罩层
+      loading: true,
+      //表单
+      form:{},
+      //流程数据
+      flow:{},
+      //流程数据规则
+      flowRules:{
+        result: [
+          { required: true, message: "驳回原因不能为空", trigger: "blur" },
+        ],
+      },
+      //是否展开
+      isUnfold:false,
+      //是否显驳回弹出层
+      turnDownOpen:false,
+    };
+  },
+  created() {
+    console.log("this.$route.query.code",this.$route.query.code);
+    console.log("this.$route.query.performanceId",this.$route.query.performanceId);
+    console.log("this.$route.query.flowId",this.$route.query.flowId);
+    this.fetchPerformance(this.$route.query.performanceId);
+    this.fetchFlow(this.$route.query.flowId);
+  },
+  methods: {
+    //查询详情
+    async fetchPerformance(id){
+      this.loading = true;
+      await getPerformance(id).then(res => {
+        if (res.code === 200) {
+          this.form = res.data;
+          this.id = res.data.id;
+         }
+         this.loading = false;
+      })
+    },
+    //查询流程详情
+    async fetchFlow(id){
+      this.loading = true;
+      await getFlow(id).then(res => {
+        if (res.code === 200) {
+          this.flow = res.data;
+         }
+         this.loading = false;
+      })
+    },
+    //展开/收起
+    btnUnfold(){
+      this.isUnfold = !this.isUnfold;
+    },
+    //合计
+    getSummaries(param){
+      const { columns, data } = param;
+      let val = data.reduce((sum, e) => sum + Number(e.weight || 0), 0);
+      this.weightSum = val;
+      return ['合计','','','',val];
+    },
+    //驳回
+    btnTurnDown(){
+      this.turnDownOpen = true;
+    },
+    //驳回取消
+    btnTurnDownClose(){
+      this.turnDownOpen = false;
+    },
+    //驳回确认
+    btnTurnDownConfirm(){
+      this.$refs["flow"].validate(valid => {
+        if (valid) {
+          this.btnverify(1);
+          this.turnDownOpen = false;
+        }
+      });
+    },
+    //评写完成
+    async btnverify(val){
+      if(val == 2){
+        let v = false;
+        this.form.performanceItem.forEach((item) => {
+          if(!item.leaderScoring || !item.leaderComment){
+            v = true;
+          }
+        });
+        if(v){
+          this.$modal.msgWarning("请评分后再提交！");
+          return;
+        }
+        if(!this.form.comment){
+          this.$modal.msgWarning("请填写评语再提交！");
+          return;
+        }
+      }
+      //保存绩效数据
+      let r = await savePerformance(this.form);
+      console.log("r",r);
+      this.flow.status = val;
+      await superiorevaluation(this.flow).then(res => {
+        if (res.code === 200) {
+          this.fetchPerformance(this.$route.query.performanceId);
+          this.fetchFlow(this.$route.query.flowId);
+          this.$modal.msgSuccess("已确认");
+        }
+        this.loading = false;
+      })
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

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

@@ -5,63 +5,77 @@
         <span style="font-weight:bold">绩效考核表</span>
         <div style="float: right; padding: 3px 0" type="text">
           <el-button size="mini" plain @click="btnBack">返回</el-button>
-          <el-button size="mini" plain @click="btnSubmit">提交</el-button>
-          <el-button size="mini" plain @click="btnCopyItem">复制指标</el-button>
-          <el-button size="mini" plain @click="btnLog">指标修改记录</el-button>
-          <el-button size="mini" plain @click="btnPreviou">上一个</el-button>
-          <el-button size="mini" plain @click="btnNext">下一个</el-button>
+          <el-button size="mini" plain @click="btnSubmit" v-if="this.$store.state.user.name == form.staff && (form.status == '0' || form.status == '3')">提交</el-button>
+          <el-button size="mini" plain @click="btnCopyItem"  v-if="this.$store.state.user.name == form.staff && form.status == '0'">复制指标</el-button>
+          <!-- <el-button size="mini" plain @click="btnLog">指标修改记录</el-button> -->
+          <el-button size="mini" plain @click="btnApproveLog">指标审批记录</el-button>
+          <el-button size="mini" plain @click="btnPreviou" v-if="ids">上一个</el-button>
+          <el-button size="mini" plain @click="btnNext" v-if="ids">下一个</el-button>
         </div>
       </div>
       <div v-loading="loading">
-        <el-descriptions :column="4">
+        <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.year}}</el-descriptions-item>
-          <el-descriptions-item label="二级部门">{{form.startTime}}</el-descriptions-item>
-          <el-descriptions-item label="三级部门">{{form.deadlineTime}}</el-descriptions-item>
-          <el-descriptions-item label="职位">{{form.deadlineTime}}</el-descriptions-item>
-          <el-descriptions-item label="评估周期">{{form.year}}</el-descriptions-item>
+          <el-descriptions-item label="一级部门">{{form.oneDeptName}}</el-descriptions-item>
+          <el-descriptions-item label="二级部门">{{form.twoDeptName}}</el-descriptions-item>
+          <el-descriptions-item label="三级部门">{{form.threeDeptName}}</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.startTime}}</el-descriptions-item>
           <el-descriptions-item label="评估人姓名">{{form.deadlineTime}}</el-descriptions-item>
         </el-descriptions>
-        <el-descriptions :column="4">
-          <el-descriptions-item label="个人总结">{{form.deadlineTime}}</el-descriptions-item>
+        <el-descriptions v-if="form.status > 3">
+          <el-descriptions-item label="个人总结">{{form.summary}}</el-descriptions-item>
         </el-descriptions>
-        <el-descriptions :column="4">
-          <el-descriptions-item label="评语">{{form.year}}</el-descriptions-item>
+        <div v-if="this.$store.state.user.name == form.staff && form.status == '3'">
+          个人总结<el-input type="textarea" v-model="form.summary"></el-input>
+        </div>
+        <el-descriptions v-if="form.status > 4">
+          <el-descriptions-item label="评语">{{form.comment}}</el-descriptions-item>
         </el-descriptions>
         <div style="float:right">
-          <el-button type="primary" size="mini" @click="btnAddRow">增加指标</el-button>
+          <el-button type="primary" size="mini" @click="btnAddRow" v-if="this.$store.state.user.name == form.staff && form.status == '0'">增加指标</el-button>
           <el-button size="mini" @click="btnUnfold">{{isUnfold == true ? "收起" : "展开"}}</el-button>
         </div>
         <el-table size="mini"  :data="form.performanceItem" show-summary :summary-method="getSummaries">
-          <el-table-column label="评估方面" align="center" prop="aspect">
+          <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估方面" align="center" prop="aspect">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.ehr_pm_aspect" :value="scope.row.aspect"/>
             </template>
           </el-table-column>
-          <el-table-column :show-overflow-tooltip="!isUnfold" label="评估指标" align="center" prop="target" />
+          <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估指标" align="center" prop="target" />
           <el-table-column :show-overflow-tooltip="!isUnfold" label="评估说明" align="center" prop="instructions" />
-          <!-- <el-table-column label="评估指标" align="center" prop="target" />
-          <el-table-column label="评估说明" align="center" prop="instructions" /> -->
-          <el-table-column label="角色" align="center" prop="role">
+          <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.aspect"/>
+              <dict-tag :options="dict.type.ehr_pm_role" :value="scope.row.role"/>
             </template>
           </el-table-column>
-          <el-table-column label="权重(%)" align="center" prop="weight" sortable/>
+          <el-table-column width="80" label="权重" align="center" prop="weight"/>
           <el-table-column :show-overflow-tooltip="!isUnfold" label="绩效标准" align="center" prop="standard" />
-          <!-- <el-table-column label="绩效标准" align="center" prop="standard" /> -->
-          <el-table-column label="数据来源" align="center" prop="source" />
-          <el-table-column label="自评分（0-100）" align="center" prop="selfScoring" />
-          <el-table-column label="自评语" align="center" prop="selfComment" />
-          <el-table-column label="上级评分（0-100）" align="center" prop="leaderScoring" />
-          <el-table-column label="上级评语" align="center" prop="leaderComment" />
-          <el-table-column label="加权得分" align="center" prop="weightedScore" />
-          <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
+          <el-table-column width="100" label="数据来源" align="center" prop="source" />
+
+          <el-table-column width="80" label="自评分" align="center" prop="selfScoring" v-if="form.status > 3"/>
+          <el-table-column :show-overflow-tooltip="!isUnfold" label="自评语" align="center" prop="selfComment" v-if="form.status > 3"/>
+          <el-table-column width="80" label="自评分" align="center" prop="selfScoring" v-if="this.$store.state.user.name == form.staff && form.status == '3'">
+            <template slot-scope="scope">
+              <el-input size="mini" v-model="scope.row.selfScoring"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :show-overflow-tooltip="!isUnfold" label="自评语" align="center" prop="selfComment" v-if="this.$store.state.user.name == form.staff && form.status == '3'">
+            <template slot-scope="scope">
+              <el-input size="mini" type="textarea" v-model="scope.row.selfComment"></el-input>
+            </template>
+          </el-table-column>
+
+          <el-table-column width="80" label="上级评分" align="center" prop="leaderScoring" v-if="form.status > 4"/>
+          <el-table-column :show-overflow-tooltip="!isUnfold" label="上级评语" align="center" prop="leaderComment" v-if="form.status > 4"/>
+          <el-table-column width="80" label="加权得分" align="center" prop="weightedScore" v-if="form.status > 4"/>
+        
+          <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" v-if="this.$store.state.user.name == form.staff && form.status == '0'">
+            <template slot-scope="scope">
               <el-button size="mini" type="text" @click="btnEdit(scope.row)">修改</el-button>
               <el-button size="mini" type="text" @click="btnDelete(scope.row)">删行</el-button>
             </template>
@@ -121,8 +135,8 @@
 </template>
 
 <script>
-import { getPerformance} from "@/api/business/ehr/pm/performance";
-import { getPerformanceItem,addPerformanceItem,updatePerformanceItem,delPerformanceItem} from "@/api/business/ehr/pm/performanceitem";
+import { getPerformance,fillinFinish,selfestimate} from "@/api/business/ehr/pm/performance";
+import { getPerformanceItem,addPerformanceItem,updatePerformanceItem,batchUpdatePerformanceItem,delPerformanceItem} from "@/api/business/ehr/pm/performanceitem";
 
 export default {
   name: 'detail',
@@ -282,8 +296,49 @@ export default {
     },
     //提交
     btnSubmit(){
-      if(this.weightSum != 100){
-        this.$modal.msgWarning("权重不为100%无法提交！");
+      if(this.form.status == '0'){
+        if(this.weightSum != 100){
+          this.$modal.msgWarning("权重不为100%无法提交！");
+          return;
+        }
+        this.$confirm('确认提交吗？', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'success'
+        }).then(() => {
+          fillinFinish(this.form).then(response => {
+            this.$modal.msgSuccess("保存成功");
+            this.fetchPerformance(this.id);
+          });
+        }).catch(() => {      
+        });
+      }
+      if(this.form.status == '3'){
+        let v = false;
+        this.form.performanceItem.forEach((item) => {
+          if(!item.selfScoring || !item.selfComment){
+            v = true;
+          }
+        });
+        if(v){
+          this.$modal.msgWarning("请自评后再提交！");
+          return;
+        }
+        if(!this.form.summary){
+          this.$modal.msgWarning("请填写个人总结再提交！");
+          return;
+        }
+        this.$confirm('确认提交吗？', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'success'
+        }).then(() => {
+          selfestimate(this.form).then(response => {
+            this.$modal.msgSuccess("保存成功");
+            this.fetchPerformance(this.id);
+          });
+        }).catch(() => {      
+        });
       }
     },
     //复制指标
@@ -294,6 +349,10 @@ export default {
     btnLog(){
 
     },
+    //指标审批记录
+    btnApproveLog(){
+      
+    }
   }
 }
 </script>

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="app-container" v-if="isList">
-      <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" label-width="68px">
+      <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true">
         <el-form-item label="员工" prop="staffName">
           <el-input
             v-model="queryParams.staffName"
@@ -9,6 +9,28 @@
             @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="只看自己的">
+          <el-checkbox v-model="queryParams.params.oneself"></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>
@@ -16,19 +38,20 @@
       </el-form>
       <div style="float:right">
         <el-button type="primary" size="mini" @click="btnResetQuery">本月绩效</el-button>
+        <el-button type="primary" size="mini" @click="btnResetQuery">下月绩效</el-button>
       </div>
       <el-table size="mini" height="500px" v-loading="loading" :data="listData" @row-dblclick="btnDetails">
+        <el-table-column label="编号" align="center" prop="id" />
         <el-table-column label="员工姓名" align="center" prop="staffName" />
         <el-table-column label="评估周期" align="center" prop="name" />
-        <el-table-column label="开始日期" align="center" prop="" />
-        <el-table-column label="结束日期" align="center" prop="" />
+        <el-table-column label="月度" align="center" prop="month" />
         <el-table-column label="权重" align="center" prop="weight" />
         <el-table-column label="得分" align="center" prop="mark" />
         <el-table-column label="等级" align="center" prop="grade" />
         <el-table-column label="绩效系数" align="center" prop="" />
-        <el-table-column label="状态" align="center" prop="result" >
+        <el-table-column label="状态" align="center" prop="status" >
           <template slot-scope="scope">
-            <dict-tag :options="dict.type.mk_bo_behavior_res" :value="scope.row.result"/>
+            <dict-tag :options="dict.type.ehr_pm_status" :value="scope.row.status"/>
           </template>
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
@@ -62,7 +85,7 @@ import { listPerformance} from "@/api/business/ehr/pm/performance";
 
 export default {
   name: "assess",
-  dicts: ['mk_bo_behavior_res','mk_bo_behavior_type','sys_yes_no','mk_bo_behavior_goal','mk_bo_signintype'],
+  dicts: ['ehr_pm_status'],
   components: {detail},
   data() {
     return {
@@ -84,7 +107,12 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        params:{
+          oneself: true,
+        },
         staffName: null,
+        status: null,
+        month: null,
       },
       // 查询日期范围
       dateRange: [],
@@ -124,12 +152,12 @@ export default {
     };
   },
   created() {
-    // this.queryParams.params = {source:"list"};
     this.getList();
   },
   methods: {
     /** 查询绩效列表 */
     getList() {
+      console.log('this.queryParams',this.queryParams);
       this.loading = true;
       listPerformance(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.listData = response.rows;

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

@@ -0,0 +1,185 @@
+<template>
+  <div>
+    <el-card>
+      <div slot="header" class="clearfix">
+        <span style="font-weight:bold">评估关系</span>
+        <div style="float: right; padding: 3px 0" type="text">
+          <el-button size="mini" plain @click="btnBack">返回</el-button>
+          <el-button size="mini" plain @click="btnPreviou">上一个</el-button>
+          <el-button size="mini" plain @click="btnNext">下一个</el-button>
+        </div>
+      </div>
+      <div v-loading="loading">
+        <el-descriptions :column="6 ">
+          <el-descriptions-item label="员工编号">{{form.staff}}</el-descriptions-item>
+          <el-descriptions-item label="员工姓名">{{form.staffName}}</el-descriptions-item>
+        </el-descriptions>
+
+        <el-table size="mini" :data="form.psnrelationItem" v-if="pageState == 'see'">
+          <el-table-column width="50" label="序号" align="center" type="index" />
+          <el-table-column width="300" label="评估人编码" align="center" prop="staff" />
+          <el-table-column width="300" label="评估人名称" align="center" prop="staffName" />
+        </el-table>
+
+        <div style="float:right" v-if="pageState != 'see'">
+          <el-button type="primary" size="mini" @click="btnAddRow">新增</el-button>
+        </div>
+        <el-table size="mini" :data="form.psnrelationItem" v-if="pageState != 'see'">
+          <el-table-column width="50" label="序号" align="center" type="index" />
+          <el-table-column width="300" label="评估人编码" align="center" prop="staff" />
+          <el-table-column width="300" label="评估人名称" align="center">
+            <template slot-scope="scope">
+              <el-popover-select-v2 size="mini" v-model="form.psnrelationItem[scope.$index].staffName" title="员工" valueKey="name"
+                referName="CONTACTS_PARAM" :dataMapping="{staff:'code',staffName: 'name'}"
+                :source.sync="form.psnrelationItem[scope.$index]">
+              </el-popover-select-v2>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" @click="btnMoveUp(scope.row)">上移</el-button>
+              <el-button size="mini" type="text" @click="btnMoveDown(scope.row)">下移</el-button>
+              <el-button size="mini" type="text" @click="btnDelete(scope.row)">删行</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="footer">
+        <el-button type="primary" size="mini" plain @click="btnEdit" v-if="pageState == 'see'">修改</el-button>
+        <el-button size="mini" plain @click="btnCancel" v-if="pageState != 'see'">取消</el-button>
+        <el-button type="primary" size="mini" plain @click="btnSave" v-if="pageState != 'see'">保存</el-button>
+      </div>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import { getPsnrelation,savePsnrelation} from "@/api/business/ehr/pm/psnrelation";
+  import ElPopoverSelectV2 from "@/components/popover-select-v2"
+export default {
+  name: 'detail',
+  dicts: ['ehr_pm_aspect','ehr_pm_role'],
+  props: ['enterState','rowId',"ids"],
+  components: { ElPopoverSelectV2},
+  model: {
+    prop: 'isList',
+    event: 'jugislist'
+  },
+  data() {
+    return {
+      //id
+      id:null,
+      //表单
+      form:{},
+      //表单校验规则
+      formRules:{
+      },
+      //遮罩
+      loading: false,
+      //页面状态
+      pageState: null,
+    }
+  },
+  async created() {
+    this.pageState = this.enterState;
+    this.id = this.rowId;
+    this.fetchPsnrelation(this.id);
+    if(this.enterState == 'add'){
+    }
+    if(this.enterState == 'edit' || this.enterState == 'see') {
+    }
+  },
+  watch: {
+  },
+  methods: {
+    //返回
+    btnBack(){
+      this.$emit('jugislist', true)
+      this.$emit('refresh')
+    },
+    //查询详情
+    async fetchPsnrelation(id){
+      this.loading = true;
+      await getPsnrelation(id).then(res => {
+        if (res.code === 200) {
+          this.form = res.data;
+          this.id = res.data.id;
+         }
+         this.loading = false;
+      })
+    },
+    //新增
+    btnAddRow(){
+      this.form.psnrelationItem.push({delFlag: 0});
+    },
+    //上移
+    btnMoveUp(){
+
+    },
+    //下移
+    btnMoveDown(){
+
+    },
+    //删除
+    btnDelete(){
+
+    },
+    //修改
+    btnEdit(){
+      this.pageState = "edit";
+    },
+    //取消
+    btnCancel(){
+      if(this.enterState == 'add'){
+        this.btnBack();
+      }else{
+        this.fetchPsnrelation(this.id);
+        this.pageState = "see";
+      }
+    },
+    //保存
+    btnSave(){
+      savePsnrelation(this.form).then(response => {
+        this.$modal.msgSuccess("保存成功");
+        this.pageState = "see";
+      });
+    },
+    //上一个
+    btnPreviou(){
+      let i = this.ids.indexOf(this.id) - 1;
+      if(i > -1){
+        let id = this.ids[i];
+        this.fetchPsnrelation(id);
+      }else{
+        this.$modal.msgSuccess("已经是当前页第一条了！");
+      }
+    },
+    //下一个
+    btnNext(){
+      let i = this.ids.indexOf(this.id) + 1;
+      if(i < this.ids.length){
+        let id = this.ids[i];
+        this.fetchPsnrelation(id);
+      }else{
+        this.$modal.msgSuccess("已经是当前页最后一条了！");
+      }
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.footer {
+  z-index: 500;
+  position: fixed;
+  bottom: 10px;
+  right: 10px;
+  width: 100%;
+  line-height: var(--footer-height);
+  text-align: right;
+}
+.hang ::v-deep .el-form-item__content {
+  margin-left: 0px !important;
+}
+</style>

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

@@ -0,0 +1,129 @@
+<template>
+  <div>
+    <div class="app-container" v-if="isList">
+      <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true">
+        <el-form-item label="员工" prop="staffName">
+          <el-input
+            v-model="queryParams.staffName"
+            clearable
+            @keyup.enter.native="btnSearch"
+          />
+        </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-form>
+      <el-table size="mini" height="500px" v-loading="loading" :data="listData" @row-dblclick="btnDetails">
+        <el-table-column label="员工编号" align="center" prop="staff" />
+        <el-table-column label="员工姓名" align="center" prop="staffName" />
+        <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="btnDetails(scope.row)"
+            >详情</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>
+    <detail v-model="isList" v-if="!isList" :enterState="page" :rowId="rowId" :ids="ids" @refresh="refresh" />
+  </div>
+</template>
+
+<script>
+import detail from './detail.vue'
+import { listPsnrelation} from "@/api/business/ehr/pm/psnrelation";
+export default {
+  name: "psnrelation",
+  components: {detail},
+  data() {
+    return {
+      // 总条数
+      total: 0,
+      // 表格数据
+      listData: [],
+      // id集合
+      ids: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        staffName: null,
+      },
+      //页面显示
+      isList: true,
+      //页面状态
+      page: '',
+      //详情id
+      rowId: '',
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询绩效列表 */
+    getList() {
+      this.loading = true;
+      listPsnrelation(this.queryParams).then(response => {
+        this.listData = response.rows;
+        this.ids = response.rows.map(item => item.id);
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    btnSearch() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    btnResetQuery() {
+      this.resetForm("queryForm");
+      this.dateRange = [];
+      this.btnSearch();
+    },
+    /** 刷新 */
+    refresh(){
+      this.resetForm("queryForm");
+      this.dateRange = [];
+      this.getList();
+    },
+    /** 进入详情 */
+    btnDetails(row){
+      this.rowId = row.id;
+      this.page = 'see';
+      this.isList = false;
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.btn_grooup {
+  margin-bottom: 10px;
+  display: flex;
+  justify-content: flex-end;
+}
+.paginationClass {
+  z-index: 500;
+  position: fixed;
+  bottom: 10px;
+  right: 10px;
+  width: 100%;
+  line-height: var(--footer-height);
+  color: #fff;
+}
+</style>

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

@@ -5,7 +5,10 @@
         <span style="font-weight:bold">阶段控制</span>
         <div style="float: right; padding: 3px 0" type="text" v-if="pageState == 'see'">
           <el-button size="mini" plain @click="btnBack">返回</el-button>
-          <el-button size="mini" type="primary" plain @click="btnPublish" v-if="form.stage == '0'">发布</el-button>
+          <el-button size="mini" type="primary" plain @click="btnPublish" v-if="form.isPublish == 'N'">发布</el-button>
+          <el-button size="mini" type="primary" plain @click="btnFillinFinish" v-if="form.isPublish == 'Y' && form.stage == '0'">结束填写</el-button>
+          <el-button size="mini" type="primary" plain @click="btnStartSelfEvaluation" v-if="form.stage == '2'">开始自评</el-button>
+          <el-button size="mini" type="primary" plain @click="btnFinishSelfEvaluation" v-if="form.stage == '3'">结束自评</el-button>
           <el-button size="mini" plain @click="btnPreviou">上一个</el-button>
           <el-button size="mini" plain @click="btnNext">下一个</el-button>
         </div>
@@ -14,7 +17,11 @@
         <el-descriptions :column="4" v-if="pageState == 'see'">
           <el-descriptions-item label="名称">{{form.name}}</el-descriptions-item>
           <el-descriptions-item label="月份">{{form.month}}</el-descriptions-item>
-          <el-descriptions-item label="阶段">{{form.stage}}</el-descriptions-item>
+          <el-descriptions-item label="阶段" style="margin-left:27px">
+            <div v-for="dict in dict.type.ehr_pm_status" v-if="form.stage == dict.value">
+              <div>{{ dict.label }}</div>
+            </div>
+          </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>
@@ -25,13 +32,13 @@
             </el-col>
             <el-col span="6">
               <el-form-item label="月份" prop="yearMonth">
-                <el-date-picker type="month" v-model="form.month">
+                <el-date-picker type="month" value-format="yyyy-MM" v-model="form.month">
                 </el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
-        <div class="foot">
+        <div class="footer" v-if="form.isPublish == 'N'">
           <el-button type="primary" size="mini" plain @click="btnEdit" v-if="pageState == 'see'">修改</el-button>
           <el-button size="mini" plain @click="btnCancel" v-if="pageState != 'see'">取消</el-button>
           <el-button type="primary" size="mini" plain @click="btnSave" v-if="pageState != 'see'">保存</el-button>
@@ -43,11 +50,11 @@
 </template>
 
 <script>
-import { getStage,addStage,updateStage,publishStage} from "@/api/business/ehr/pm/stage";
+import { getStage,addStage,updateStage,publishStage,fillinFinish,startSelfEvaluation,finishSelfEvaluation} from "@/api/business/ehr/pm/stage";
 
 export default {
   name: 'detail',
-  dicts: ['ehr_pm_aspect',],
+  dicts: ['ehr_pm_status',],
   props: ['enterState','rowId',"ids"],
   model: {
     prop: 'isList',
@@ -78,6 +85,7 @@ export default {
     this.pageState = this.enterState;
     if(this.enterState == 'add'){
       this.form.stage = 0;
+      this.form.isPublish = 'N';
     }
     if(this.enterState == 'edit' || this.enterState == 'see') {
       this.id = this.rowId;
@@ -125,16 +133,59 @@ export default {
     },
     //发布
     btnPublish(){
-      publishStage(this.form).then(response => {
-        this.$modal.msgSuccess("发布成功");
+      this.$confirm('确认要发布吗？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'success'
+      }).then(() => {
+        publishStage(this.form).then(response => {
+          this.fetchStage(this.id);
+          this.$modal.msgSuccess("发布成功");
+        });
+      }).catch(() => {      
+      });
+    },
+    //填写结束
+    btnFillinFinish(){
+      this.$confirm('确认要结束填写吗？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'success'
+      }).then(() => {
+        fillinFinish(this.form).then(response => {
+          this.fetchStage(this.id);
+          this.$modal.msgSuccess("保存成功");
+        });
+      }).catch(() => {      
+      });
+    },
+    //开始自评
+    btnStartSelfEvaluation(){
+      this.$confirm('确认要开启自评吗？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'success'
+      }).then(() => {
+        startSelfEvaluation(this.form).then(response => {
+          this.fetchStage(this.id);
+          this.$modal.msgSuccess("开启成功");
+        });
+      }).catch(() => {      
+      });
+    },
+    //结束自评
+    btnFinishSelfEvaluation(){
+      this.$confirm('确认要结束评分吗？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'success'
+      }).then(() => {
+        finishSelfEvaluation(this.form).then(response => {
+          this.fetchStage(this.id);
+          this.$modal.msgSuccess("结束成功");
+        });
+      }).catch(() => {      
       });
-      // console.log(111);
-      // this.$modal.confirm('确认要发布吗？').then(function() {
-      //   console.log(222);
-      //   return publishStage(this.form);
-      // }).then(() => {
-      //   this.$modal.msgSuccess("发布成功");
-      // }).catch(() => {});
     },
     //修改
     btnEdit(){
@@ -171,7 +222,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.foot {
+.footer {
   z-index: 500;
   position: fixed;
   bottom: 10px;

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

@@ -20,14 +20,13 @@
       <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="stage" />
-        <el-table-column label="创建时间" align="center" prop="createTime" />
-        <el-table-column label="创建人" align="center" prop="createBy" />
-        <!-- <el-table-column label="阶段" align="center" prop="result" >
+        <el-table-column label="阶段" align="center" prop="stage" >
           <template slot-scope="scope">
-            <dict-tag :options="dict.type.mk_bo_behavior_res" :value="scope.row.result"/>
+            <dict-tag :options="dict.type.ehr_pm_status" :value="scope.row.stage"/>
           </template>
-        </el-table-column> -->
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
         <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
             <el-button
@@ -63,7 +62,7 @@ import { listStage,delStage} from "@/api/business/ehr/pm/stage";
 
 export default {
   name: "assess",
-  dicts: [],
+  dicts: ['ehr_pm_status'],
   components: {detail},
   data() {
     return {

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

@@ -0,0 +1,164 @@
+<template>
+  <div>
+    <el-card v-if="flow.staff == this.$store.state.user.name">
+      <div slot="header" class="clearfix">
+        <span style="font-weight:bold">绩效考核表</span>
+        <div style="float: right; padding: 3px 0" type="text" v-if="flow.status == 0">
+          <el-button size="mini" plain @click="btnTurnDown(1)">驳回</el-button>
+          <el-button size="mini" type="primary" plain @click="btnverify(2)">通过</el-button>
+        </div>
+      </div>
+      <div v-loading="loading">
+        <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.oneDeptName}}</el-descriptions-item>
+          <el-descriptions-item label="二级部门">{{form.twoDeptName}}</el-descriptions-item>
+          <el-descriptions-item label="三级部门">{{form.threeDeptName}}</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.startTime}}</el-descriptions-item>
+          <el-descriptions-item label="评估人姓名">{{form.deadlineTime}}</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">
+          <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估方面" align="center" prop="aspect">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.ehr_pm_aspect" :value="scope.row.aspect"/>
+            </template>
+          </el-table-column>
+          <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估指标" align="center" prop="target" />
+          <el-table-column :show-overflow-tooltip="!isUnfold" label="评估说明" align="center" prop="instructions" />
+          <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 width="80" label="权重" align="center" prop="weight"/>
+          <el-table-column :show-overflow-tooltip="!isUnfold" label="绩效标准" align="center" prop="standard" />
+          <el-table-column width="100" label="数据来源" align="center" prop="source" />
+        </el-table>
+      </div>
+    </el-card>
+
+    <el-dialog title="" :visible.sync="turnDownOpen" width="1000px" :close-on-click-modal="false" :show-close="false">
+      <el-form size="mini" label-position="right" ref="flow" :model="flow" :rules="flowRules" label-width="80px">
+        <el-form-item label="驳回原因" prop="result">
+          <el-input type="textarea" v-model="flow.result"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="btnTurnDownClose">取 消</el-button>
+        <el-button size="mini" type="primary" @click="btnTurnDownConfirm">确 定</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { getPerformance,verify} from "@/api/business/ehr/pm/performance";
+import { getFlow} from "@/api/business/ehr/pm/flow";
+
+export default {
+  name: "verify",
+  dicts: ['ehr_pm_aspect','ehr_pm_role'],
+  data() {
+    return {
+      //遮罩层
+      loading: true,
+      //表单
+      form:{},
+      //流程数据
+      flow:{},
+      //流程数据规则
+      flowRules:{
+        result: [
+          { required: true, message: "驳回原因不能为空", trigger: "blur" },
+        ],
+      },
+      //是否展开
+      isUnfold:false,
+      //是否显驳回弹出层
+      turnDownOpen:false,
+    };
+  },
+  created() {
+    console.log("this.$route.query.code",this.$route.query.code);
+    console.log("this.$route.query.performanceId",this.$route.query.performanceId);
+    console.log("this.$route.query.flowId",this.$route.query.flowId);
+    this.fetchPerformance(this.$route.query.performanceId);
+    this.fetchFlow(this.$route.query.flowId);
+  },
+  methods: {
+    //查询详情
+    async fetchPerformance(id){
+      this.loading = true;
+      await getPerformance(id).then(res => {
+        if (res.code === 200) {
+          this.form = res.data;
+          this.id = res.data.id;
+         }
+         this.loading = false;
+      })
+    },
+    //查询流程详情
+    async fetchFlow(id){
+      this.loading = true;
+      await getFlow(id).then(res => {
+        if (res.code === 200) {
+          this.flow = res.data;
+         }
+         this.loading = false;
+      })
+    },
+    //展开/收起
+    btnUnfold(){
+      this.isUnfold = !this.isUnfold;
+    },
+    //合计
+    getSummaries(param){
+      const { columns, data } = param;
+      let val = data.reduce((sum, e) => sum + Number(e.weight || 0), 0);
+      this.weightSum = val;
+      return ['合计','','','',val];
+    },
+    //驳回
+    btnTurnDown(){
+      this.turnDownOpen = true;
+    },
+    //驳回取消
+    btnTurnDownClose(){
+      this.turnDownOpen = false;
+    },
+    //驳回确认
+    btnTurnDownConfirm(){
+      this.$refs["flow"].validate(valid => {
+        if (valid) {
+          this.btnverify(1);
+          this.turnDownOpen = false;
+        }
+      });
+    },
+    //绩效确认
+    async btnverify(val){
+      this.flow.status = val;
+      await verify(this.flow).then(res => {
+        if (res.code === 200) {
+          this.fetchPerformance(this.$route.query.performanceId);
+          this.fetchFlow(this.$route.query.flowId);
+          this.$modal.msgSuccess("已确认");
+        }
+        this.loading = false;
+      })
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

src/views/ehrentrance.vue

@@ -0,0 +1,50 @@
+<template>
+  <div>
+  </div>
+</template>
+
+<script>
+import { setToken,getToken } from '@/utils/auth'
+import { ehrLogin } from '@/api/sso/ssoLogin';
+export default {
+  data () {
+    return {
+    }
+  },
+  created() {
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.jump()
+    })
+  },
+  methods: {
+    jump() {
+      var code = this.GetQueryString('code')
+      var jumpPath = this.GetQueryString('path')
+      let str = jumpPath + window.location.search;
+      if(getToken()){
+        this.$router.push({ path: str});
+      }else{
+        ehrLogin(code).then(res => {
+          if (res.code === 200) {
+            let token = res.token
+            setToken(token)
+            this.$store.commit('SET_TOKEN', token)
+            this.$store.dispatch("GetInfo").then(() => {})
+            console.log("str", str)
+            this.$store.dispatch("GenerateRoutes").then(
+              this.$router.push({ path: str}).catch(()=>{})
+            )
+          }
+        })
+      }
+    },
+    GetQueryString(name) {
+      var  reg = new  RegExp( "(^|&)" + name + "=([^&]*)(&|$)" );
+      var  r = window.location.search.substr(1).match(reg);
+      if (r!= null ) return   unescape(r[2]); return  null ;
+    }
+  }
+}
+</script>

src/views/monitor/system/index.vue

@@ -24,24 +24,24 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="serviceList" border :height="tableHeight">
-      <el-table-column label="业务域" min-width="120" align="center" prop="busDomain" :formatter="formatterBusDomain"/>
-      <el-table-column label="业务类型" min-width="120" align="center" prop="monitorType">
+      <el-table-column label="业务域" min-width="80" align="center" prop="busDomain" :formatter="formatterBusDomain"/>
+      <el-table-column label="业务类型" min-width="60" align="center" prop="monitorType">
         <template slot-scope="scope">
           <span v-if="scope.row.monitorType == 'flow'">流程</span>
           <span v-if="scope.row.monitorType == 'todo'">待办</span>
         </template>
       </el-table-column>
-      <el-table-column label="OA单据信息" min-width="80" align="center" prop="oaIdentity"/>
+      <el-table-column label="OA单据信息" min-width="120" align="center" prop="oaIdentity"/>
       <el-table-column label="业务域单据信息" min-width="120" align="center" prop="docIdentity"/>
       <el-table-column label="所属模块" min-width="80" align="center" prop="busModule" :show-overflow-tooltip="true"/>
       <el-table-column label="状态释意" min-width="80" align="center" prop="busStatusName"/>
-      <el-table-column label="问题原因" min-width="150" align="center" prop="errorMsg"/>
-      <el-table-column label="创建时间" min-width="120" align="center" prop="createTime" :show-overflow-tooltip="true"/>
+      <el-table-column label="问题原因" min-width="180" align="center" prop="errorMsg"/>
+      <el-table-column label="创建时间" min-width="100" align="center" prop="createTime" :show-overflow-tooltip="true"/>
       <el-table-column
         fixed="right"
         label="操作"
         align="center"
-        width="180"
+        width="80"
       >
         <template slot-scope="scope">
           <el-button type="text" size="mini" @click="disposeData(scope.row)">处理</el-button>

src/views/purchase/apply/add/columns.js

@@ -82,10 +82,6 @@ export default function useColumns() {
       attr: { is: "el-input", disabled: true, readonly: true },
     },
     {
-      item: { key: "file", title: "附件", span: 24 },
-      attr: { is: "el-file-upload" },
-    },
-    {
       item: { key: "sourceType", title: "来源单据类型" },
       attr: { is: "el-input", disabled: true, readonly: true },
     },
@@ -99,6 +95,10 @@ export default function useColumns() {
         value: "0",
       },
     },
+    {
+      item: { key: "file", title: "附件", span: 24 },
+      attr: { is: "el-file-upload" },
+    },
   ].map(({ item, attr }) => ({
     attr,
     item: { ...item, hidden: true, span: item.span || 6 },

src/views/purchase/apply/copy/columns.js

@@ -78,14 +78,6 @@ export default function useColumns() {
       },
     },
     {
-      item: { key: "approveTime", title: "单据申请日期" },
-      attr: { is: "el-input", disabled: true, readonly: true },
-    },
-    {
-      item: { key: "file", title: "附件", span: 24 },
-      attr: { is: "el-file-upload" },
-    },
-    {
       item: { key: "sourceType", title: "来源单据类型" },
       attr: { is: "el-input", disabled: true, readonly: true },
     },
@@ -99,6 +91,14 @@ export default function useColumns() {
         value: "0",
       },
     },
+    {
+      item: { key: "approveTime", title: "单据申请日期" },
+      attr: { is: "el-input", disabled: true, readonly: true },
+    },
+    {
+      item: { key: "file", title: "附件", span: 24 },
+      attr: { is: "el-file-upload" },
+    },
   ].map(({ item, attr }) => ({
     attr,
     item: { ...item, hidden: true, span: item.span || 6 },

src/views/purchase/apply/edit/columns.js

@@ -82,10 +82,6 @@ export default function useColumns() {
       attr: { is: "el-input", disabled: true, readonly: true },
     },
     {
-      item: { key: "file", title: "附件", span: 24 },
-      attr: { is: "el-file-upload" },
-    },
-    {
       item: { key: "sourceType", title: "来源单据类型" },
       attr: { is: "el-select", dictName: "price_source", disabled: true, readonly: true },
     },
@@ -99,6 +95,10 @@ export default function useColumns() {
         value: "0",
       },
     },
+    {
+      item: { key: "file", title: "附件", span: 24 },
+      attr: { is: "el-file-upload" },
+    },
   ].map(({ item, attr }) => ({
     attr,
     item: { ...item, hidden: true, span: item.span || 6 },

src/views/purchase/purchase-order/add/column.js

@@ -359,6 +359,8 @@ const PurColumns =[
    {
     key: "remark",
     title: "备注",
+    // span: 12,
+    rows: 1,
     inputType: "Textarea",
     isShow:true,
    },
@@ -1124,6 +1126,7 @@ const CauseColumns =[
   {
     key: "remark",
     title: "备注",
+    rows: 1,
     inputType: "Textarea",
     isShow:true,
    },

src/views/purchase/purchase-order/add/index.vue

@@ -809,7 +809,7 @@ export default {
     >
       <el-card
         :body-style="{
-          padding: '20px',
+          padding: '20px 20px 10px',
           display: 'flex',
           'flex-wrap': 'wrap',
         }"
@@ -870,6 +870,7 @@ export default {
                 v-if="column.inputType === 'Textarea'"
                 v-model="params[column.key]"
                 type="textarea"
+                :rows="column.rows"
                 :placeholder="column.placeholder"
                 :clearable="column.clearable"
                 :disabled="column.disabled"
@@ -1119,7 +1120,7 @@ export default {
 
 <style scoped>
 .orderAddForm >>> .el-form-item {
-  margin-bottom: 12px;
+  margin-bottom: 5px;
 }
 ::v-deep .singleTable .el-form-item {
   margin-bottom: 0px;

src/views/purchase/purchase-order/column.js

@@ -83,51 +83,68 @@ const PurColumns = [
     },
   },
   { 
-    item:{ key: "warehouseName", title: "WMS入库仓库" ,},
+    item:{
+      key: "erpOrderCode", 
+      title: "erp订单编号",
+    },
     attr:{
       isHidden:true,
     },
-    width:100,
-  }, //WMS入库仓库名称
+    width:150,
+  },
   { 
     item:{
-      key: "rebateMoney", 
-      title: "订单使用返利金额" ,
+      key: "deliveryStatus",
+      title: "erp发送状态", 
       width:100,
-      // 
     },
     attr:{
-      isHidden:true,
-      isSummary:true,
+      clearable:true,
+      is: "el-dict-tag",
+      dictName: "order_delivery_status",
     },
   },
-  { 
-    item:{key: "deductionMoney", title: "订单抵扣余款金额" ,},
+  {
+    item:{
+      key: "source",
+      title: "订单来源",  
+      width:80,
+    },
     attr:{
+      is: "el-dict-tag",
+      dictName: "order_source",
       isHidden:true,
-      isSummary:true,
-     
     },
-    width:100,
   },
   { 
-    item:{ key: "approveUser", title: "当前审批人" ,},
+    item:{ key: "warehouseName", title: "WMS入库仓库" ,},
     attr:{
       isHidden:true,
     },
-  },
+    width:100,
+  }, //WMS入库仓库名称
   { 
-    item:{ key: "redeployName", title: "转派人" , width:100 ,},
+    item:{
+      key: "rebateMoney", 
+      title: "订单使用返利金额" ,
+      width:100,
+      // 
+    },
     attr:{
       isHidden:true,
+      isSummary:true,
     },
   },
   { 
-    item:{ key: "redeployDate", title: "转派时间" ,},
+    item:{key: "deductionMoney", title: "订单抵扣余款金额" ,},
     attr:{
       isHidden:true,
+      isSummary:true,
+     
     },
+    width:100,
   },
+  
   { 
     item:{ key: "remark", title: "备注" ,},
     attr:{
@@ -162,6 +179,26 @@ const PurColumns = [
     },
     width:100,
   },
+  {
+    item:{ 
+      key: "closePay",
+      title: "付款关闭",
+      width:80,
+    },
+    attr:{
+      is: "el-checkbox",
+      'true-label':"Y",
+      'false-label':"N",
+      disabled:true,
+      isHidden:true,
+    },
+  },
+  { 
+    item:{ key: "fileNumber", title: "附件数量" ,width:100,},
+    attr:{
+      isHidden:true,
+    },
+  },
   { 
     item:{ key: "invoiceMoney", title: "发票金额" ,},
     attr:{
@@ -216,6 +253,24 @@ const PurColumns = [
       isSummary:true,
     },
   },
+  { 
+    item:{ key: "approveUser", title: "当前审批人" ,},
+    attr:{
+      isHidden:true,
+    },
+  },
+  { 
+    item:{ key: "redeployName", title: "转派人" , width:100 ,},
+    attr:{
+      isHidden:true,
+    },
+  },
+  { 
+    item:{ key: "redeployDate", title: "转派时间" ,},
+    attr:{
+      isHidden:true,
+    },
+  },
 ].map(({ item, attr }) => ({
   attr,
   item: { ...item, hidden: true, fixed: false },
@@ -700,26 +755,27 @@ const CauseColumns = [
       isHidden:true,
     },
   },
+  
   { 
-    item:{ key: "approveUser", title: "当前审批人" ,},
+    item:{ key: "remark", title: "备注" ,},
     attr:{
       isHidden:true,
     },
   },
   { 
-    item:{ key: "redeployName", title: "转派人" , width: 100,},
+    item:{ key: "approveUser", title: "当前审批人" ,},
     attr:{
       isHidden:true,
     },
   },
   { 
-    item:{ key: "redeployDate", title: "转派时间" ,},
+    item:{ key: "redeployName", title: "转派人" , width: 100,},
     attr:{
       isHidden:true,
     },
   },
   { 
-    item:{ key: "remark", title: "备注" ,},
+    item:{ key: "redeployDate", title: "转派时间" ,},
     attr:{
       isHidden:true,
     },

src/views/purchase/purchase-order/edit/index.vue

@@ -837,6 +837,7 @@ export default {
                 v-if="column.inputType === 'Textarea'"
                 v-model="params[column.key]"
                 type="textarea"
+                :rows="column.rows"
                 :placeholder="column.placeholder"
                 :clearable="column.clearable"
                 :disabled="column.disabled"
@@ -1121,7 +1122,7 @@ export default {
 
 <style scoped>
 .orderEditForm >>> .el-form-item {
-  margin-bottom: 12px;
+  margin-bottom: 5px;
 }
 ::v-deep .singleTable .el-form-item {
   margin-bottom: 0px;

src/views/purchase/purchase-order/index.vue

@@ -723,7 +723,6 @@ export default {
 
         <el-button-group style="margin-left: 10px">
           <el-button
-          
             :size="size"
             :disabled="checkedList.length != 1"
             @click="handleCopy"
@@ -739,7 +738,6 @@ export default {
           :key="checkedList.length + 1"
         >
           <el-button
-          
             :size="size"
             @click="handleAllReturn"
             :disabled="judgeIsAllReturn()"
@@ -757,9 +755,7 @@ export default {
           <el-button size="mini" @click="handlePaymentRequest"
             >付款申请</el-button
           >
-          <el-button size="mini" @click="handleDownload"
-            >批量导出</el-button
-          >
+          <el-button size="mini" @click="handleDownload">批量导出</el-button>
         </el-button-group>
         <el-button-group>
           <zp-button
@@ -897,4 +893,6 @@ export default {
   </el-card>
 </template>
 
-<style lang="scss"></style>
+<style lang="scss">
+
+</style>

src/views/purchase/purchase-order/see/index.vue

@@ -293,6 +293,7 @@ export default {
                 v-if="column.inputType === 'Textarea'"
                 v-model="params[column.key]"
                 type="textarea"
+                :rows="column.rows"
                 :placeholder="column.placeholder"
                 :clearable="column.clearable"
                 readonly
@@ -523,7 +524,7 @@ export default {
 
 <style scoped>
 .orderSeeForm >>> .el-form-item {
-  margin-bottom: 12px;
+  margin-bottom: 5px;
 }
 ::v-deep .singleTable .el-form-item {
   margin-bottom: 0px;