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

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

@@ -1,6 +1,15 @@
 import request from '@/utils/request'
 
-// 查询阶段详细
+// 查询流程列表
+export function listFlow(query) {
+  return request({
+    url: '/ehr/pm/flow/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询流程详细
 export function getFlow(id) {
   return request({
     url: '/ehr/pm/flow/' + id,

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

@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+// 查询绩效列表
+export function listPerformance(query) {
+  return request({
+    url: '/ehr/pm/gradeAdjust/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询调整数量
+export function count() {
+  return request({
+    url: '/ehr/pm/gradeAdjust/count',
+    method: 'get'
+  })
+}
+
+// 查询绩效详细
+export function getPerformance(id) {
+  return request({
+    url: '/ehr/pm/gradeAdjust/' + id,
+    method: 'get'
+  })
+}
+
+// 修改绩效
+export function gradeAdjust(data) {
+  return request({
+    url: '/ehr/pm/gradeAdjust',
+    method: 'put',
+    data: data
+  })
+}

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

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 查询绩效详细
+export function getGradeconfig(id) {
+  return request({
+    url: '/ehr/pm/gradeconfig/' + id,
+    method: 'get'
+  })
+}

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

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+// 查询绩效列表
+export function listMarkAdjust(query) {
+  return request({
+    url: '/ehr/pm/markAdjust/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询绩效详细
+export function getPerformance(id) {
+  return request({
+    url: '/ehr/pm/markAdjust/' + id,
+    method: 'get'
+  })
+}
+
+// 修改绩效
+export function updatePerformance(data) {
+  return request({
+    url: '/ehr/pm/markAdjust',
+    method: 'put',
+    data: data
+  })
+}

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

@@ -60,4 +60,20 @@ export function superiorevaluation(data) {
     method: 'post',
     data: data
   })
+}
+
+// 查询当月绩效id
+export function getCurrentMonthId() {
+  return request({
+    url: '/ehr/pm/performance/getCurrentMonthId',
+    method: 'get'
+  })
+}
+
+// 查询下月绩效id
+export function getNextMonthId() {
+  return request({
+    url: '/ehr/pm/performance/getNextMonthId',
+    method: 'get'
+  })
 }

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

@@ -78,3 +78,30 @@ export function finishSelfEvaluation(data) {
     data: data
   })
 }
+
+//开启等级调整
+export function openGradeAdjust(data) {
+  return request({
+    url: '/ehr/pm/stage/openGradeAdjust',
+    method: 'post',
+    data: data
+  })
+}
+
+//关闭等级调整
+export function closeGradeAdjust(data) {
+  return request({
+    url: '/ehr/pm/stage/closeGradeAdjust',
+    method: 'post',
+    data: data
+  })
+}
+
+//过数到薪资
+export function cendToSalary(data) {
+  return request({
+    url: '/ehr/pm/stage/cendToSalary',
+    method: 'post',
+    data: data
+  })
+}

src/api/purchase/equipmentData.js

@@ -25,10 +25,35 @@ export function addEquipment(data) {
     data: data
   })
 }
+// 设备产品数据库新增
+export function editEquipment(data) {
+  return request({
+    url: `/device/origin`,
+    method: 'put',
+    data: data
+  })
+}
 // 设备产品数据库详情
 export function getEquipmentDetail(id) {
   return request({
     url: `/device/origin/${id}`,
     method: 'get',
   })
+}
+// 设备产品数据库删除
+export function deleteEquipments(data) {
+  return request({
+    url: `/device/origin/delete`,
+    method: 'post',
+    data: data
+  })
+}
+// 设备产品数据库导出
+export function exportEquipments(data) {
+  return request({
+    url: `/device/origin/export`,
+    method: 'post',
+    data: data,
+    responseType: 'blob'
+  })
 }

src/api/purchase/purchaseDemand.js

@@ -93,4 +93,19 @@ export function confirmSubmit(data) {
     method: 'POST',
     data: data
   })
+}
+// 需求窗口期配置列表获取
+export function getDemandWindowList() {
+  return request({
+    url: `/pu/setting/list`,
+    method: 'get',
+  })
+}
+// 需求窗口期配置保存
+export function saveDemandWindow(data) {
+  return request({
+    url: `/pu/setting/update`,
+    method: 'POST',
+    data: data
+  })
 }

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

@@ -0,0 +1,218 @@
+<template>
+  <div>
+    <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>
+      </div>
+    </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>
+      <div style="float:right">
+      </div>
+      <el-table size="mini" height="500px" v-loading="loading" :data="listData">
+        <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="month" />
+        <el-table-column label="权重" align="center" prop="weight" />
+        <el-table-column label="自评分" align="center" prop="saMark" />
+        <el-table-column label="上级评分" align="center" prop="ldMark" />
+        <el-table-column label="调整分" align="center" prop="ajMark" />
+        <el-table-column label="调整分等级" align="center" prop="ajGrade" />
+        <el-table-column label="最终等级" align="center" prop="grade" />
+        <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="btnAdjustMark(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>
+
+    <el-dialog title="分数调整" :visible.sync="formOpen" width="1000px" :close-on-click-modal="false" :show-close="false">
+      <el-descriptions :column="1">
+        <el-descriptions-item label="员工编号">{{form.staff}}</el-descriptions-item>
+        <el-descriptions-item label="员工姓名">{{form.staffName}}</el-descriptions-item>
+        <el-descriptions-item label="自评分">{{form.saMark}}</el-descriptions-item>
+        <el-descriptions-item label="上级评分">{{form.ldMark}}</el-descriptions-item>
+        <el-descriptions-item label="调整分">{{form.ajMark}}</el-descriptions-item>
+        <el-descriptions-item label="调整分等级">{{form.grade}}</el-descriptions-item>
+        <el-descriptions-item label="调整分原因">{{form.ajCause}}</el-descriptions-item>
+      </el-descriptions>
+      <el-form size="mini" label-position="right" ref="form" :model="form" :rules="formRules" label-width="80px">
+        <el-form-item label="最终等级" prop="grade">
+          <el-select v-model="form.grade" >
+            <el-option
+              v-for="dict in ehr_pm_gradeconfig"
+              :key="dict.name"
+              :label="dict.name"
+              :value="dict.name"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="调整原因" prop="cause">
+          <el-input v-model="form.cause"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="btnClose">取 消</el-button>
+        <el-button size="mini" type="primary" @click="btnConfirm">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listPerformance,getPerformance,gradeAdjust} from "@/api/business/ehr/pm/gradeadjust";
+import { getGradeconfig} from "@/api/business/ehr/pm/gradeconfig";
+
+export default {
+  name: "AdjustGrade",
+  dicts: ['ehr_pm_status'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      listData: [],
+      //表单数据
+      form:{},
+      //是否显示行明细弹出层
+      formOpen:false,
+      //当行明细校验规则
+      formRules:{
+        grade: [
+          { required: true, message: "调整等级不能为空", trigger: "blur" },
+        ],
+        cause: [
+          { required: true, message: "调整原因不能为空", trigger: "blur" },
+        ],
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        sourceId: null,
+        staffName: null,
+      },
+      //页面显示
+      isList: true,
+      //页面状态
+      page: '',
+      //详情id
+      rowId: '',
+      //等级配置数据
+      ehr_pm_gradeconfig:[],
+    };
+  },
+  created() {
+    this.queryParams.sourceId = this.$route.params.id;
+    getGradeconfig(this.$route.params.gradeconfigId).then(response => {
+      this.ehr_pm_gradeconfig = response.data.gradeconfigItem;
+    });
+    this.getList();
+  },
+  methods: {
+    /** 查询绩效列表 */
+    getList() {
+      this.loading = true;
+      listPerformance(this.queryParams).then(response => {
+        this.listData = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    btnSearch() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    btnResetQuery() {
+      this.resetForm("queryForm");
+      this.btnSearch();
+    },
+    /** 刷新 */
+    refresh(){
+      this.resetForm("queryForm");
+      this.getList();
+    },
+    //调整分数
+    async btnAdjustMark(row){
+      await getPerformance(row.id).then(res => {
+        if (res.code === 200) {
+          this.form = res.data
+          this.formOpen = true;
+         }
+      })
+    },
+    //取消
+    btnClose(){
+      this.formOpen = false;
+    },
+    //确定
+    btnConfirm(){
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          gradeAdjust(this.form).then(response => {
+            this.$modal.msgSuccess("保存成功");
+            this.formOpen = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    //返回
+    btnBack(){
+      this.$router.back();
+    },
+  }
+};
+</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/adjustMark/detail.vue

@@ -0,0 +1,394 @@
+<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="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="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 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" 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 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">
+            <template slot-scope="scope">
+              <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 width="80" label="权重" align="center" prop="weight"/>
+          <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>
+            </template>
+          </el-table-column>
+          <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.number="scope.row.selfScoring"
+                onkeyup="value=value.replace(/[^\d||/.]/g,'')"
+                oninput="if(value){value=value.replace(/[^\d]/g,'')} if(value<=0){value=0} if(value>100){value=100}"
+                :maxlength="3"
+                :minlength="1"
+              >
+              </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" :rows="3" 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>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-card>
+    
+    <el-dialog title="指标明细" :visible.sync="rowDataOpen" width="1000px" :close-on-click-modal="false" :show-close="false">
+      <el-form size="mini" label-position="right" ref="rowDataForm" :model="rowData" :rules="rowRules" label-width="80px">
+        <el-form-item label="评估方面" prop="aspect">
+          <el-select v-model="rowData.aspect" >
+            <el-option
+              v-for="dict in dict.type.ehr_pm_aspect"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="评估指标" prop="target">
+          <el-input v-model="rowData.target"></el-input>
+        </el-form-item>
+        <el-form-item label="评估说明" prop="instructions">
+          <el-input type="textarea" v-model="rowData.instructions" :rows="5"></el-input>
+        </el-form-item>
+        <el-form-item label="角色" prop="role">
+          <el-select v-model="rowData.role" >
+            <el-option
+              v-for="dict in dict.type.ehr_pm_role"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="加/减分项" prop="asItem">
+          <el-checkbox v-model="rowData.asItem"></el-checkbox>
+        </el-form-item>
+        <el-form-item label="权重(%)" prop="weight" v-if="!rowData.asItem">
+          <el-input 
+            v-model.number="rowData.weight"
+            onkeyup="value=value.replace(/[^\d||/.]/g,'')"
+            oninput="if(value){value=value.replace(/[^\d]/g,'')} if(value<=0){value=0} if(value>100){value=100}"
+            :maxlength="3"
+            :minlength="1"
+          >
+            <i slot="suffix" style="color: #000;font-style:normal;margin-right: 10px;">%</i>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="绩效标准" prop="standard">
+          <el-input type="textarea" v-model="rowData.standard" :rows="5"></el-input>
+        </el-form-item>
+        <el-form-item label="数据来源" prop="source">
+          <el-input v-model="rowData.source"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="btnRowClose">取 消</el-button>
+        <el-button size="mini" type="primary" @click="btnRowConfirm">确 定</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+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',
+  dicts: ['ehr_pm_aspect','ehr_pm_role'],
+  props: ['pageStu','rowId',"ids"],
+  model: {
+    prop: 'isList',
+    event: 'jugislist'
+  },
+  data() {
+    return {
+      //id
+      id:null,
+      //表单
+      form:{},
+      //遮罩
+      loading: false,
+      //单行明细
+      rowData:{},
+      //是否显示行明细弹出层
+      rowDataOpen:false,
+      //当行明细校验规则
+      rowRules:{
+        aspect: [
+          { required: true, message: "评估方面不能为空", trigger: "blur" },
+        ],
+        target: [
+          { required: true, message: "评估指标不能为空", trigger: "blur" },
+        ],
+        instructions: [
+          { required: true, message: "评估说明不能为空", trigger: "blur" },
+        ],
+        role: [
+          { required: true, message: "角色不能为空", trigger: "blur" },
+        ],
+        weight: [
+          { required: true, message: "权重不能为空", trigger: "blur" },
+        ],
+        standard: [
+          { required: true, message: "绩效标准不能为空", trigger: "blur" },
+        ],
+        source: [
+          { required: true, message: "数据来源不能为空", trigger: "blur" },
+        ],
+      },
+      //是否展开
+      isUnfold:false,
+      //明细权重合计值
+      weightSum: 0,
+    }
+  },
+  async created() {
+    this.id = this.rowId;
+    this.fetchPerformance(this.id);
+    if(this.pageStu == 'add'){
+    }
+    if(this.pageStu == 'edit' || this.pageStu == 'see') {
+    }
+  },
+  watch: {
+  },
+  methods: {
+    //返回
+    btnBack(){
+      this.$emit('jugislist', true)
+      this.$emit('refresh')
+    },
+    //查询详情
+    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;
+      })
+    },
+    //增行
+    btnAddRow(){
+      this.rowData = {assessId: this.form.id};
+      this.rowDataOpen = true;
+    },
+    //修改
+    async btnEdit(row){
+      await getPerformanceItem(row.id).then(res => {
+        if (res.code === 200) {
+          this.rowData = res.data
+          this.rowDataOpen = true;
+         }
+      })
+    },
+    //删行
+    btnDelete(row){
+      this.$modal.confirm('是否确认删除【"' + row.aspect + '"】数据项？').then(function() {
+        return delPerformanceItem(row.id);
+      }).then(() => {
+        this.fetchPerformance(this.id);
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    //单行明细取消
+    btnRowClose(){
+      this.rowDataOpen = false;
+    },
+    //单行明细确认
+    btnRowConfirm(){
+      this.$refs["rowDataForm"].validate(valid => {
+        if (valid) {
+          if (this.rowData.id != undefined) {
+            updatePerformanceItem(this.rowData).then(response => {
+              this.$modal.msgSuccess("保存成功");
+              this.rowDataOpen = false;
+              this.fetchPerformance(this.id);
+            });
+          } else {
+            addPerformanceItem(this.rowData).then(response => {
+              this.$modal.msgSuccess("保存成功");
+              this.rowDataOpen = false;
+              this.fetchPerformance(this.id);
+            });
+          }
+        }
+      });
+    },
+    //展开/收起
+    btnUnfold(){
+      this.isUnfold = !this.isUnfold;
+    },
+    //上一个
+    btnPreviou(){
+      let i = this.ids.indexOf(this.id) - 1;
+      if(i > -1){
+        let id = this.ids[i];
+        this.fetchPerformance(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.fetchPerformance(id);
+      }else{
+        this.$modal.msgSuccess("已经是当前页最后一条了！");
+      }
+      
+    },
+    //合计
+    getSummaries(param){
+      const { columns, data } = param;
+      let val = data.reduce((sum, e) => sum + Number(e.weight || 0), 0);
+      this.weightSum = val;
+      return ['合计','','','',val];
+    },
+    //提交
+    btnSubmit(){
+      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(() => {      
+        });
+      }
+    },
+    //复制指标
+    btnCopyItem(){
+
+    },
+    //指标修改记录
+    btnLog(){
+
+    },
+    //指标审批记录
+    btnApproveLog(){
+      
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.btn_group {
+  z-index: 500;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  line-height: var(--footer-height);
+  color: #fff;
+}
+</style>

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

@@ -0,0 +1,208 @@
+<template>
+  <div>
+    <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>
+      </div>
+    </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>
+      <div style="float:right">
+      </div>
+      <el-table size="mini" height="500px" v-loading="loading" :data="listData">
+        <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="month" />
+        <el-table-column label="权重" align="center" prop="weight" />
+        <el-table-column label="自评分" align="center" prop="saMark" />
+        <el-table-column label="上级评分" align="center" prop="ldMark" />
+        <el-table-column label="调整分" align="center" prop="ajMark" />
+        <el-table-column label="调整分等级" align="center" prop="ajGrade" />
+        <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="btnAdjustMark(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>
+
+    <el-dialog title="分数调整" :visible.sync="formOpen" width="1000px" :close-on-click-modal="false" :show-close="false">
+      <el-descriptions :column="1">
+        <el-descriptions-item label="员工编号">{{form.staff}}</el-descriptions-item>
+        <el-descriptions-item label="员工姓名">{{form.staffName}}</el-descriptions-item>
+        <el-descriptions-item label="自评分">{{form.saMark}}</el-descriptions-item>
+        <el-descriptions-item label="上级评分">{{form.ldMark}}</el-descriptions-item>
+      </el-descriptions>
+      <el-form size="mini" label-position="right" ref="form" :model="form" :rules="formRules" label-width="80px">
+        <el-form-item label="调整分" prop="ajMark">
+          <el-input 
+            v-model.number="form.ajMark"
+            onkeyup="value=value.replace(/[^\d||/.]/g,'')"
+            oninput="if(value){value=value.replace(/[^\d]/g,'')} if(value<=0){value=0} if(value>100){value=100}"
+            :maxlength="3"
+            :minlength="1"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="调整原因" prop="ajCause">
+          <el-input v-model="form.ajCause"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="btnClose">取 消</el-button>
+        <el-button size="mini" type="primary" @click="btnConfirm">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listMarkAdjust,getPerformance,updatePerformance} from "@/api/business/ehr/pm/markadjust";
+
+export default {
+  name: "AdjustMark",
+  dicts: ['ehr_pm_status'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 表格数据
+      listData: [],
+      //表单数据
+      form:{},
+      //是否显示行明细弹出层
+      formOpen:false,
+      //当行明细校验规则
+      formRules:{
+        ajMark: [
+          { required: true, message: "调整分不能为空", trigger: "blur" },
+        ],
+        ajCause: [
+          { required: true, message: "调整原因不能为空", trigger: "blur" },
+        ],
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        sourceId: null,
+        staffName: null,
+      },
+      //页面显示
+      isList: true,
+      //页面状态
+      page: '',
+      //详情id
+      rowId: '',
+    };
+  },
+  created() {
+    this.queryParams.sourceId = this.$route.params.id;
+    this.getList();
+  },
+  methods: {
+    /** 查询绩效列表 */
+    getList() {
+      this.loading = true;
+      listMarkAdjust(this.queryParams).then(response => {
+        this.listData = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    btnSearch() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    btnResetQuery() {
+      this.resetForm("queryForm");
+      this.btnSearch();
+    },
+    /** 刷新 */
+    refresh(){
+      this.resetForm("queryForm");
+      this.getList();
+    },
+    //调整分数
+    async btnAdjustMark(row){
+      await getPerformance(row.id).then(res => {
+        if (res.code === 200) {
+          this.form = res.data
+          this.formOpen = true;
+         }
+      })
+    },
+    //取消
+    btnClose(){
+      this.formOpen = false;
+    },
+    //确定
+    btnConfirm(){
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          updatePerformance(this.form).then(response => {
+            this.$modal.msgSuccess("保存成功");
+            this.formOpen = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    //返回
+    btnBack(){
+      this.$router.back();
+    },
+  }
+};
+</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/mark/index.vue

@@ -51,7 +51,15 @@
           <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>
+              <el-input 
+                size="mini" 
+                v-model.number="scope.row.leaderScoring"
+                onkeyup="value=value.replace(/[^\d||/.]/g,'')"
+                oninput="if(value){value=value.replace(/[^\d]/g,'')} if(value<=0){value=0} if(value>100){value=100}"
+                :maxlength="3"
+                :minlength="1"
+              >
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column :show-overflow-tooltip="!isUnfold" label="上级评语" align="center" prop="leaderComment">

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

@@ -0,0 +1,67 @@
+<template>
+  <div>
+    <el-button 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">
+        <el-table-column label="时间" align="center" prop="createTime" />
+        <el-table-column label="阶段" align="center" prop="performanceStatus" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.ehr_pm_status" :value="scope.row.performanceStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="评估人" align="center" prop="staffName" />
+        <el-table-column label="状态" align="center" prop="status" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.ehr_pm_flow_status" :value="scope.row.status"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="结果" align="center" prop="result" />
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+
+<script>
+import { listFlow} from "@/api/business/ehr/pm/flow";
+export default {
+  name: "ApproveLogDialog",
+  dicts: ['ehr_pm_status','ehr_pm_flow_status'],
+  props: ['pmId'],
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 1000,
+        performanceId: null,
+      },
+      // 总条数
+      total: 0,
+      // 表格数据
+      listData: [],
+      // 遮罩层
+      loading: true,
+      // 是否显示弹出层
+      open: false,
+    };
+  },
+  watch: {},
+  methods: {
+    //点击了当前按钮
+    click() {
+      this.queryParams.performanceId = this.pmId;
+      this.open = true;
+      this.loading = true;
+      listFlow(this.queryParams).then(response => {
+        this.listData = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+  },
+  created() {},
+  mounted() {},
+  destroyed() {},
+};
+</script>

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

@@ -0,0 +1,87 @@
+<template>
+  <div>
+    <el-button 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">
+        <el-table-column label="员工" align="center" prop="staffName" />
+        <el-table-column label="评估周期" align="center" prop="name" />
+        <el-table-column label="月度" align="center" prop="month" />
+        <el-table-column label="创建时间" align="center" prop="createTime" />
+        <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-document-copy"
+                @click="btnCopy(scope.row)"
+              >复制</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listPerformance,getPerformance} from "@/api/business/ehr/pm/performance";
+export default {
+  name: "CopyItemDialog",
+  props: [],
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        staff: null,
+      },
+      // 总条数
+      total: 0,
+      // 表格数据
+      listData: [],
+      // 遮罩层
+      loading: true,
+      // 是否显示弹出层
+      open: false,
+    };
+  },
+  methods: {
+    /** 查询绩效列表 */
+    getList() {
+      this.loading = true;
+      listPerformance(this.queryParams).then(response => {
+        this.listData = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    //点击了当前按钮
+    click() {
+      this.queryParams.staff = this.$store.state.user.name;
+      this.open = true;
+      this.getList();
+    },
+    //复制
+    async btnCopy(row){
+      let res = await getPerformance(row.id);
+      if(res.code === 200){
+        this.$emit('setItems',res.data.performanceItem);
+        this.$modal.msgSuccess("复制成功");
+        this.open = false;
+      }
+    },
+  },
+  created() {},
+};
+</script>
+

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

@@ -3,12 +3,11 @@
     <el-card>
       <div slot="header" class="clearfix">
         <span style="font-weight:bold">绩效考核表</span>
-        <div style="float: right; padding: 3px 0" type="text">
+        <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 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>
+          <CopyItemDialog style="margin: 0 10px" @setItems="setItems" v-if="this.$store.state.user.name == form.staff && form.status == '0'"></CopyItemDialog>
+          <ApproveLogDialog style="margin: 0 10px" :pmId="form.id"></ApproveLogDialog>
           <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>
@@ -47,26 +46,42 @@
             </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 :show-overflow-tooltip="!isUnfold" label="评估说明" align="center" prop="instructions">
+            <template slot-scope="scope">
+              <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 width="80" label="权重" align="center" prop="weight"/>
-          <el-table-column :show-overflow-tooltip="!isUnfold" label="绩效标准" align="center" prop="standard" />
+          <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>
+            </template>
+          </el-table-column>
           <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>
+              <el-input 
+                size="mini" 
+                v-model.number="scope.row.selfScoring"
+                onkeyup="value=value.replace(/[^\d||/.]/g,'')"
+                oninput="if(value){value=value.replace(/[^\d]/g,'')} if(value<=0){value=0} if(value>100){value=100}"
+                :maxlength="3"
+                :minlength="1"
+              >
+              </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>
+              <el-input size="mini" type="textarea" :rows="3" v-model="scope.row.selfComment"></el-input>
             </template>
           </el-table-column>
 
@@ -100,7 +115,7 @@
           <el-input v-model="rowData.target"></el-input>
         </el-form-item>
         <el-form-item label="评估说明" prop="instructions">
-          <el-input type="textarea" v-model="rowData.instructions"></el-input>
+          <el-input type="textarea" v-model="rowData.instructions" :rows="5"></el-input>
         </el-form-item>
         <el-form-item label="角色" prop="role">
           <el-select v-model="rowData.role" >
@@ -116,10 +131,18 @@
           <el-checkbox v-model="rowData.asItem"></el-checkbox>
         </el-form-item>
         <el-form-item label="权重(%)" prop="weight" v-if="!rowData.asItem">
-          <el-input v-model="rowData.weight"></el-input>
+          <el-input 
+            v-model.number="rowData.weight"
+            onkeyup="value=value.replace(/[^\d||/.]/g,'')"
+            oninput="if(value){value=value.replace(/[^\d]/g,'')} if(value<=0){value=0} if(value>100){value=100}"
+            :maxlength="3"
+            :minlength="1"
+          >
+            <i slot="suffix" style="color: #000;font-style:normal;margin-right: 10px;">%</i>
+          </el-input>
         </el-form-item>
         <el-form-item label="绩效标准" prop="standard">
-          <el-input type="textarea" v-model="rowData.standard"></el-input>
+          <el-input type="textarea" v-model="rowData.standard" :rows="5"></el-input>
         </el-form-item>
         <el-form-item label="数据来源" prop="source">
           <el-input v-model="rowData.source"></el-input>
@@ -135,6 +158,8 @@
 </template>
 
 <script>
+import ApproveLogDialog from './btnApproveLog.vue'
+import CopyItemDialog from './btnCopyItem.vue'
 import { getPerformance,fillinFinish,selfestimate} from "@/api/business/ehr/pm/performance";
 import { getPerformanceItem,addPerformanceItem,updatePerformanceItem,batchUpdatePerformanceItem,delPerformanceItem} from "@/api/business/ehr/pm/performanceitem";
 
@@ -146,6 +171,7 @@ export default {
     prop: 'isList',
     event: 'jugislist'
   },
+  components: {ApproveLogDialog,CopyItemDialog},
   data() {
     return {
       //id
@@ -173,7 +199,7 @@ export default {
           { required: true, message: "角色不能为空", trigger: "blur" },
         ],
         weight: [
-          { required: true, message: "权重", trigger: "blur" },
+          { required: true, message: "权重不能为空", trigger: "blur" },
         ],
         standard: [
           { required: true, message: "绩效标准不能为空", trigger: "blur" },
@@ -341,18 +367,21 @@ export default {
         });
       }
     },
-    //复制指标
-    btnCopyItem(){
-
-    },
-    //指标修改记录
-    btnLog(){
-
+    //设置明细
+    setItems(items){
+      console.log(111);
+      items.forEach((e) => {
+        e.id = null;
+        e.standard = null;
+        e.selfScoring = null;
+        e.selfComment = null;
+        e.leaderScoring = null;
+        e.leaderComment = null;
+        e.weightedScore = null;
+      });
+      this.form.performanceItem = items;
+      return true;
     },
-    //指标审批记录
-    btnApproveLog(){
-      
-    }
   }
 }
 </script>

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

@@ -29,7 +29,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="只看自己的">
-          <el-checkbox v-model="queryParams.params.oneself"></el-checkbox>
+          <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>
@@ -37,8 +37,9 @@
         </el-form-item>
       </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>
+        <el-button type="primary" size="mini" @click="btnGradeAdjust" v-if="adjustCount > 0">等级调整({{adjustCount}})</el-button>
+        <el-button type="primary" size="mini" @click="btnCurrentMonth">本月绩效</el-button>
+        <el-button type="primary" size="mini" @click="btnNextMonth">下月绩效</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" />
@@ -46,16 +47,17 @@
         <el-table-column label="评估周期" align="center" prop="name" />
         <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="saMark" />
+        <el-table-column label="上级评分" align="center" prop="ldMark" />
         <el-table-column label="等级" align="center" prop="grade" />
-        <el-table-column label="绩效系数" align="center" prop="" />
+        <el-table-column label="绩效系数" align="center" prop="coefficient" />
         <el-table-column label="状态" align="center" prop="status" >
           <template slot-scope="scope">
             <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">
-        <template slot-scope="scope">
+          <template slot-scope="scope">
             <el-button
               size="mini"
               type="text"
@@ -76,12 +78,31 @@
       </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} from "@/api/business/ehr/pm/performance";
+import { listPerformance,getCurrentMonthId,getNextMonthId} from "@/api/business/ehr/pm/performance";
+import { count} from "@/api/business/ehr/pm/gradeadjust";
+import { listStage} from "@/api/business/ehr/pm/stage";
 
 export default {
   name: "assess",
@@ -149,9 +170,25 @@ export default {
       page: '',
       //详情id
       rowId: '',
+      //等级调整数量
+      adjustCount: null,
+      //等级调整周期列表
+      stageList:[],
+      //等级调整周期列表弹出层
+      stageListOpen:false,
+      //等级调整周期列表遮罩层
+      stageListLoading: true,
+      //等级调整周期列表查询条件
+      stageListQueryParams:{
+        isAdjust:"Y"
+      }
     };
   },
-  created() {
+  async created() {
+    let res = await count();
+    this.adjustCount = res.row;
+    //数据权限配置
+    this.queryParams.params = {dataPermission:"Y"};
     this.getList();
   },
   methods: {
@@ -188,7 +225,49 @@ export default {
       this.rowId = row.id;
       this.page = 'add';
       this.isList = false;
-    }
+    },
+    //只看自己按钮
+    btnOneself(){
+      this.btnSearch();
+    },
+    //等级调整
+    btnGradeAdjust(){
+      this.stageListOpen = true;
+      this.getlistStage();
+    },
+    //查看当月绩效
+    async btnCurrentMonth(){
+      let res = await getCurrentMonthId();
+      this.rowId = res.id;
+      this.page = 'add';
+      this.ids = [res.id];
+      this.isList = false;
+    },
+    //查看下月绩效
+    async btnNextMonth(){
+      let res = await getNextMonthId();
+      if(!res.id){
+        this.$modal.msgSuccess("未查询到下月绩效！");
+      }else{
+        this.rowId = res.id;
+        this.page = 'add';
+        this.ids = [res.id];
+        this.isList = false;
+      }
+      
+    },
+    //查询周期列表
+    getlistStage() {
+      this.stageListLoading = true;
+      listStage(this.stageListQueryParams).then(response => {
+        this.stageList = response.rows;
+        this.stageListLoading = false;
+      });
+    },
+    //进入调整
+    btnEntryAdjust(row){
+      this.$router.push({ name: 'AdjustGrade', params: { id: row.id,gradeconfigId: row.gradeconfigId } });
+    },
   }
 };
 </script>

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

@@ -9,6 +9,10 @@
           <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" type="primary" plain @click="btnOpenGradeAdjust" v-if="form.stage == '5' && form.isAdjust == 'N' && form.isSalary == 'N'">开启等级调整</el-button>
+          <el-button size="mini" type="primary" plain @click="btnCloseGradeAdjust" v-if="form.stage == '5' && form.isAdjust == 'Y' && form.isSalary == 'N'">关闭等级调整</el-button>
+          <el-button size="mini" type="primary" plain @click="btnAdjustMark" v-if="form.stage == '5' && form.isSalary == 'N'">分数调整</el-button>
+          <el-button size="mini" type="primary" plain @click="btnCendToSalary" v-if="form.stage == '5' && form.isSalary == 'N'">过数到薪资</el-button>
           <el-button size="mini" plain @click="btnPreviou">上一个</el-button>
           <el-button size="mini" plain @click="btnNext">下一个</el-button>
         </div>
@@ -50,7 +54,7 @@
 </template>
 
 <script>
-import { getStage,addStage,updateStage,publishStage,fillinFinish,startSelfEvaluation,finishSelfEvaluation} from "@/api/business/ehr/pm/stage";
+import { getStage,addStage,updateStage,publishStage,fillinFinish,startSelfEvaluation,finishSelfEvaluation,openGradeAdjust,closeGradeAdjust,cendToSalary} from "@/api/business/ehr/pm/stage";
 
 export default {
   name: 'detail',
@@ -86,6 +90,7 @@ export default {
     if(this.enterState == 'add'){
       this.form.stage = 0;
       this.form.isPublish = 'N';
+      this.form.isAdjust = 'N';
     }
     if(this.enterState == 'edit' || this.enterState == 'see') {
       this.id = this.rowId;
@@ -187,6 +192,52 @@ export default {
       }).catch(() => {      
       });
     },
+    //开启等级调整
+    btnOpenGradeAdjust(){
+      this.$confirm('确认要开启等级调整？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'success'
+      }).then(() => {
+        openGradeAdjust(this.form).then(response => {
+          this.fetchStage(this.id);
+          this.$modal.msgSuccess("已开始");
+        });
+      }).catch(() => {      
+      });
+    },
+    //关闭等级调整
+    btnCloseGradeAdjust(){
+      this.$confirm('确认要关闭等级调整？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'success'
+      }).then(() => {
+        closeGradeAdjust(this.form).then(response => {
+          this.fetchStage(this.id);
+          this.$modal.msgSuccess("已关闭");
+        });
+      }).catch(() => {      
+      });
+    },
+    //分数调整
+    btnAdjustMark(){
+      this.$router.push({ name: 'AdjustMark', params: { id: this.id } });
+    },
+    //过数到薪资
+    btnCendToSalary(){
+      this.$confirm('确认要同步到薪资绩效系数吗？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'success'
+      }).then(() => {
+        cendToSalary(this.form).then(response => {
+          this.fetchStage(this.id);
+          this.$modal.msgSuccess("操作成功");
+        });
+      }).catch(() => {      
+      });
+    },
     //修改
     btnEdit(){
       this.pageState = "edit";

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

@@ -88,9 +88,6 @@ export default {
     };
   },
   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);
   },
@@ -147,6 +144,9 @@ export default {
     //绩效确认
     async btnverify(val){
       this.flow.status = val;
+      if(this.flow.status == 2){
+        this.flow.result = "同意";
+      }
       await verify(this.flow).then(res => {
         if (res.code === 200) {
           this.fetchPerformance(this.$route.query.performanceId);

src/views/ehrentrance.vue

@@ -29,7 +29,7 @@ export default {
         ehrLogin(code).then(res => {
           if (res.code === 200) {
             let token = res.token
-            setToken(token)
+            setToken(token);
             this.$store.commit('SET_TOKEN', token)
             this.$store.dispatch("GetInfo").then(() => {})
             console.log("str", str)

src/views/purchase/PurchaseDemandList/add.vue

@@ -153,6 +153,15 @@
               </el-select>
             </el-form-item>
          </el-col>
+
+          <el-col :span="1.5">
+            <el-form-item label="是否超需求可用周期">
+              <el-select v-model="basicForm.isBeyondRap" disabled size="mini" style="width: 200px">
+                <el-option v-for=" item in options" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+         </el-col>
       </el-row>
 
 
@@ -577,6 +586,7 @@ export default {
         planType: 'ZJH',
         demandDate: '',
         source: '4',
+        isBeyondRap: '',
         billType: 'ZQBH',
         isCustomerSpecified: 'N',
         isProcess: '',

src/views/purchase/PurchaseDemandList/index.vue

@@ -154,6 +154,7 @@
 
         
         <div class="btn_grooup">
+          <el-button type="primary" size="mini" @click="demandWindow">需求窗口期</el-button>
           <el-button type="primary" size="mini" @click="addDivision">新增</el-button>
 
           <el-dropdown size="mini" @command="handleCommand">
@@ -319,6 +320,45 @@
       </div>
     </el-dialog>
 
+    <!-- 需求窗口期 -->
+    <el-dialog title="需求窗口期" :visible.sync="setDemand.open" @close="closeDemand" width="800px">
+      <div slot="footer">
+        <el-button size="mini" @click="setDemand.open = false">取 消</el-button>
+        <el-button type="primary" size="mini" @click="saveDemand">保 存</el-button>
+      </div>
+      <el-table
+        :data="setDemand.gridData"
+      >
+        <el-table-column property="ways" label="方案">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.ways" size="mini" disabled>
+              <el-option v-for="dict in dict.type.sys_plan_type" :key="dict.value" :label="dict.label" :value="dict.value">
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column property="category" label="类型">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.category" size="mini" disabled>
+              <el-option v-for="dict in dict.type.sys_plan_type" :key="dict.value" :label="dict.label" :value="dict.value">
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column property="deadline" label="截止星期/月份">
+          <template slot-scope="scope">
+            <el-input-number size="mini" :min=1 :max="scope.row.ways == 'ZJH' ? 7 : 12 " v-model="scope.row.deadline" clearable @input=changeDeadline(scope.row)></el-input-number>
+          </template>
+        </el-table-column>
+        <el-table-column property="remark" label="备注">
+          <template slot-scope="scope">
+            <el-input size="mini" v-model="scope.row.remark" clearable></el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+      <span style="color: red">注:周计划星期填写范围1-7，月计划填写范围1-12</span>
+    </el-dialog>
+
     <Add v-model="isList" v-if="!isList" :pageStu="page" :disable="disable" :row="rowDetail" @refresh="searchList"/>
   
     <Refers ref="refer" @doSubmit="selectionsToInput" :single="true"/>
@@ -336,7 +376,7 @@ import TreeRefers from '@/components/Refers/sigleTreeRefer.vue'
 import CollapseTransition from '@/components/MyCollapse/collapse.vue'
 // 流程收回
 import { rebacktWork } from '@/api/purchase/workSpace.js'
-import {getDemandList, delDemand, downLoadDemand, exportDemand, submitDemand, confirmSubmit } from '@/api/purchase/purchaseDemand.js'
+import {getDemandList, delDemand, downLoadDemand, exportDemand, submitDemand, confirmSubmit, getDemandWindowList, saveDemandWindow } from '@/api/purchase/purchaseDemand.js'
 export default {
   name: 'PurchaseDemandList',
   components: {
@@ -446,6 +486,10 @@ export default {
       hiddenabled: true,
     },
   })),
+    setDemand: {
+      open: false,
+      gridData: []
+    }
     }
   },
   created() {
@@ -862,6 +906,30 @@ export default {
       this.classOptions.push(selection)
       this.download.category = selection.code
     },
+    // 需求窗口期配置
+    demandWindow() {
+      this.setDemand.open = true
+      this.$nextTick(() => {
+        getDemandWindowList().then(res => {
+          if (res.code === 200) {
+            this.setDemand.gridData = res.rows
+          }
+        })
+      })
+    },
+    saveDemand() {
+      let params = this.setDemand.gridData
+      saveDemandWindow(params).then(res => {
+        if (res.code === 200) {
+          this.$modal.notifySuccess("保存成功");
+          this.setDemand.open = false
+        }
+      })
+    },
+    changeDeadline(row) {
+      row.delFlag = '2'
+    },
+    closeDemand() {}
   }
 }
 </script>

src/views/purchase/equipmentData/add.vue

@@ -47,33 +47,6 @@
             </el-form-item>
           </el-col>
 
-          <!-- <el-col :span="1.5">
-            <el-form-item label="省份" prop="province">
-              <el-input clearable :disabled="sonDisable" size="mini" v-model="basicForm.province">
-              </el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="1.5">
-            <el-form-item label="大区负责人" prop="largeZoneCommander">
-              <el-input clearable :disabled="sonDisable" size="mini" v-model="basicForm.largeZoneCommander">
-              </el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="1.5">
-            <el-form-item label="业务经理" prop="serviceManager">
-              <el-input clearable :disabled="sonDisable" size="mini" v-model="basicForm.serviceManager">
-              </el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="1.5">
-            <el-form-item label="售后工程师" prop="afterSalesEngineer">
-              <el-input clearable :disabled="sonDisable" size="mini" v-model="basicForm.afterSalesEngineer">
-              </el-input>
-            </el-form-item>
-          </el-col> -->
         </el-row>
 
         <el-row>
@@ -86,10 +59,11 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item label="文件上传" prop="fileIds">
+            <el-form-item label="文件上传" prop="sysMaterialDeviceOriginFileList">
             <el-upload
               class="upload-demo"
-              :action="url + basicForm.id"
+              :action="url"
+              :headers="headers"
               :on-preview="handlePreview"
               :on-success='handleSuccess'
               :on-remove="handleRemove"
@@ -97,7 +71,7 @@
               multiple
               :limit="1"
               :on-exceed="handleExceed"
-              :file-list="basicForm.fileIds">
+              :file-list="basicForm.sysMaterialDeviceOriginFileList">
               <el-button size="small" type="primary">点击上传</el-button>
               <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div> -->
             </el-upload>
@@ -126,7 +100,7 @@
       </el-form>
 
       <div class="btn_group">
-        <el-button type="primary" size="mini"  @click="editPage" v-if="sonPageStu == 'check' && row.status == '0'">编辑</el-button>
+        <el-button type="primary" size="mini"  @click="editPage" v-if="sonPageStu == 'check'">编辑</el-button>
         <el-button type="primary" size="mini"  @click="save" v-if="sonPageStu == 'add' || sonPageStu == 'edit'">保存</el-button>
         <el-button size="mini" plain @click="back">返回</el-button>
       </div>
@@ -189,7 +163,8 @@
 </template>
 
 <script>
-import { addEquipment, getEquipmentDetail } from '@/api/purchase/equipmentData.js'
+import { getToken } from "@/utils/auth";
+import { addEquipment, getEquipmentDetail, editEquipment } from '@/api/purchase/equipmentData.js'
 export default {
   components: {
   },
@@ -212,21 +187,24 @@ export default {
         model: '',
         referencePrice: '',
         parameters: '',
+        isDeleteFile: '',
         sysMaterialDeviceOriginItemList: [],
-        fileIds: [],
+        sysMaterialDeviceOriginFileList: [],
         isProjectOrFactoryEmpower: '',
         remark: '',
       },
-      sonModal: {
+      sonModel: {
         province: null,
         largeZoneCommander: null,
         serviceManager: null,
         afterSalesEngineer: null,
+        delFlag: '0'
       },
       basicRules: {},
       ids:[],
       delDemandItemList:[],
-      url: process.env.VUE_APP_BASE_API + '/device/origin/upload?deviceOriginId='
+      headers: { Authorization: "Bearer " + getToken() },
+      url: process.env.VUE_APP_BASE_API + '/device/origin/upload'
     }
   },
   created() {
@@ -247,14 +225,36 @@ export default {
         }
       })
     },
-    editPage() {},
+    editPage() {
+      this.sonPageStu = 'edit'
+      this.sonDisable = false
+    },
     async save() {
-      await addEquipment(this.basicForm).then(res => {
-        if(res.code === 200) {
-          this.$modal.alertSuccess("保存成功");
-          this.back()
-        }
-      })
+      console.log(this.sonPageStu)
+      // return false
+      if (this.sonPageStu == 'add') {
+        await addEquipment(this.basicForm).then(res => {
+          if(res.code === 200) {
+            this.$modal.notifySuccess("新增保存成功");
+            this.back()
+          }
+        })
+      } else if (this.sonPageStu == 'edit') {
+        let list = []
+        list.push(...this.basicForm.sysMaterialDeviceOriginItemList, ...this.delDemandItemList)
+        // 深拷贝一下参数对象
+        let param = JSON.parse(JSON.stringify(this.basicForm))
+        console.log('深拷贝对象',param);
+        param.sysMaterialDeviceOriginItemList = list
+        await editEquipment(param).then(res => {
+          if(res.code === 200) {
+            this.$modal.notifySuccess("编辑保存成功");
+            this.sonPageStu = 'check'
+            this.sonDisable = true
+            this.getDetails(this.row)
+          }
+        })
+      }
     },
     back() {
       this.$emit('jugislist', true)
@@ -269,6 +269,7 @@ export default {
     addLine() {
       const newLine = {...this.sonModel}
       this.basicForm.sysMaterialDeviceOriginItemList.push(newLine)
+      console.log(this.basicForm.sysMaterialDeviceOriginItemList)
     },
     delLines() {
       let delArr = this.$refs.table.getCheckboxRecords()
@@ -291,14 +292,21 @@ export default {
     },
     handleRemove(file, fileList) {
       console.log(file, fileList);
-      this.basicForm.fileIds = []
+      // 编辑删除了文件给标识
+      if (this.sonPageStu == 'edit') {
+        this.basicForm.isDeleteFile = '0'
+      }
+      this.basicForm.sysMaterialDeviceOriginFileList = []
     },
     handlePreview(file) {
       console.log(file);
     },
     handleSuccess(response, file, fileList) {
       console.log(response)
-      this.basicForm.fileIds = response.data
+      if (this.sonPageStu == 'edit') {
+        this.basicForm.isDeleteFile = '0'
+      }
+      this.basicForm.sysMaterialDeviceOriginFileList = response.data
     },
     handleExceed(files, fileList) {
       this.$message.warning(`当前限制选择1个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);

src/views/purchase/equipmentData/index.vue

@@ -6,8 +6,62 @@
         style="position: relative;"
       >
       <!-- <span>设备产品数据库</span> -->
-      <el-form class="search_area" label-width="100px">
+      <el-form class="search_area" label-width="auto">
         <el-row :gutter="10">
+          <el-col :span="1.5">
+            <el-form-item label="通用名称">
+                <el-input
+                  v-model.trim="params.commonName"
+                  size="mini"
+                  clearable
+                  style="width: 200px"
+                />
+              </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
+            <el-form-item label="注册名">
+                <el-input
+                  v-model.trim="params.registrationName"
+                  size="mini"
+                  clearable
+                  style="width: 200px"
+                />
+              </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
+            <el-form-item label="厂家名称">
+                <el-input
+                  v-model.trim="params.factoryName"
+                  size="mini"
+                  clearable
+                  style="width: 200px"
+                />
+              </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
+            <el-form-item label="型号">
+                <el-input
+                  v-model.trim="params.model"
+                  size="mini"
+                  clearable
+                  style="width: 200px"
+                />
+              </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
+            <el-form-item label="参考价格">
+                <el-input
+                  v-model.trim="params.referencePrice"
+                  size="mini"
+                  clearable
+                  style="width: 200px"
+                />
+              </el-form-item>
+          </el-col>
 
           <el-col :span="1.5">
             <el-form-item label="设备类别">
@@ -19,9 +73,40 @@
                 />
               </el-form-item>
           </el-col>
+
+          <el-col :span="1.5">
+            <el-form-item label="是否项目/厂家年度授权">
+                <el-select clearable v-model="params.isProjectOrFactoryEmpower" size="mini" style="width: 200px">
+                  <el-option v-for="dict in dict.type.sys_equipment_type" :key="dict.value" :label="dict.label" :value="dict.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
+            <el-form-item label="参数">
+                <el-input
+                  v-model.trim="params.parameters"
+                  size="mini"
+                  clearable
+                  style="width: 200px"
+                />
+              </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
+            <el-form-item label="备注">
+                <el-input
+                  v-model.trim="params.remark"
+                  size="mini"
+                  clearable
+                  style="width: 200px"
+                />
+              </el-form-item>
+          </el-col>
         </el-row>
 
-        <div style="position: absolute;top: 10px;right: 10px;">
+        <div style="position: absolute;top: 18px;right: 10px;">
           <el-button type="primary" size="mini" @click="searchList">搜索</el-button>
           <el-button size="mini" plain @click="resetList">重置</el-button>
         </div>
@@ -29,11 +114,16 @@
 
       <div class="btn_grooup">
         <el-button type="primary" size="mini" @click="addDivision">新增</el-button>
+        <el-button type="primary" size="mini" @click="delItems">删除</el-button>
         <el-button type="primary" size="mini" @click="downLoadMb">下载模板</el-button>
         <el-button type="primary" size="mini" @click="upload.open = true">导入数据</el-button>
+        <el-button type="primary" size="mini" @click="exportData">导出数据</el-button>
       </div>
       <el-super-ux-table
+        id="data-table"
         v-model="tableData"
+        index
+        checkbox
         :size="size"
         :dict="dict"
         :page="pageInfo"
@@ -44,7 +134,10 @@
         storage-key="equipmentDataSuperTable"
         @row-dblclick="useSee"
         @row-select="useSelect"
+        @selection-change="handleSelectionChange"
+        @row-click="rowSelect"
         @pagination="useQuery(params, pageInfo)"
+        ref="tables"
       >
         <ux-table-column
           fixed="right"
@@ -100,10 +193,10 @@
 <script>
 // 导入的token
 import { getToken } from "@/utils/auth";
-import { getEquipmentDataList, downLoadMb} from '@/api/purchase/equipmentData.js'
+import { getEquipmentDataList, downLoadMb, deleteEquipments, exportEquipments} from '@/api/purchase/equipmentData.js'
 export default {
   name: "equipmentData",
-  dicts: [],
+  dicts: ['sys_equipment_type'],
   components: {
     Add: () => import("./add.vue"),
     ElSuperUxTable: () => import("@/components/super-ux-table/index.vue"),
@@ -131,13 +224,19 @@ export default {
       page: '',
       disable: false,
       rowDetail: {},
-
       size: "mini",
       loading: false,
       params: {
-        materialCode: '',
-        materialName: '',
-        deviceCategory: ''
+        commonName: '',
+        registrationName: '',
+        deviceCategory: '',
+        factoryName: '',
+        model: '',
+        referencePrice: '',
+        parameters: '',
+        isDeleteFile: '',
+        isProjectOrFactoryEmpower: '',
+        remark: ''
       },
       pageInfo: {
         pageNum: 1,
@@ -148,16 +247,26 @@ export default {
       selectData: [],
       // SearchColumns: SearchColumns,
       TableColumns: [
-        { item: { key: "commonName", title: "通用名称", width: 150 }, attr: {} },
-        { item: { key: "registrationName", title: "注册名", width: 150 }, attr: {} },
-        { item: { key: "deviceCategory", title: "设备类别", width: 150 }, attr: {} },
-        { item: { key: "factoryName", title: "厂家名称", width: 150 }, attr: {} },
-        { item: { key: "model", title: "型号", width: 150 }, attr: {} },
-        { item: { key: "referencePrice", title: "参考价格", width: 150 }, attr: {} },
-        { item: { key: "isProjectOrFactoryEmpower", title: "是否项目/厂家年度授权", width: 150 }, attr: {} },
-        { item: { key: "parameters", title: "参数", width: 150 }, attr: {} },
-        { item: { key: "remark", title: "备注", width: 150 }, attr: {} },
-      ],
+        { item: { key: "commonName", title: "通用名称" }, attr: {} },
+        { item: { key: "registrationName", title: "注册名" }, attr: {} },
+        { item: { key: "deviceCategory", title: "设备类别" }, attr: {} },
+        { item: { key: "factoryName", title: "厂家名称" }, attr: {} },
+        { item: { key: "model", title: "型号"}, attr: {} },
+        { item: { key: "referencePrice", title: "参考价格" }, attr: {} },
+        { item: { key: "isProjectOrFactoryEmpower", title: "是否项目/厂家年度授权" }, attr: {is: "el-dict-tag", dictName: "sys_equipment_type"} },
+        { item: { key: "parameters", title: "参数" }, attr: {} },
+        { item: { key: "remark", title: "备注"}, attr: {} },
+      ].map(({ item, attr }) => ({
+      attr,
+      item: {
+        ...item,
+        sortabled: true,
+        fixedabled: true,
+        filterabled: true,
+        hiddenabled: true,
+      },
+      })),
+      ids: []
     }
   },
   created() {
@@ -166,6 +275,14 @@ export default {
   methods: {
     useSee() {},
     useSelect() {},
+    handleSelectionChange(selection) {
+      console.log('选中', selection)
+      this.ids = selection.map(item => item.id)
+      console.log('选中数组', this.ids)
+    },
+    rowSelect(row) {
+      this.$refs.tables.toggleRowSelection([{row: row}]);
+    },
     // 加载列表
     async useQuery(prop, page) {
       let params = {...prop, ...page}
@@ -175,6 +292,37 @@ export default {
           this.pageInfo.total = res.total
         }
       })
+      // 获取搜索框和表格元素
+      const searchInput = this.params.parameters;
+      const table = document.querySelector('#data-table'); 
+      // 监听搜索框输入事件
+      // searchInput.addEventListener('input', () => {
+      // 获取搜索关键字
+      const keyword = searchInput; 
+      // 如果搜索关键字为空，移除所有高亮样式
+      if (!keyword) {
+        table.querySelectorAll('.highlight').forEach(el => {
+          el.classList.remove('highlight');
+        });
+        return;
+      } 
+      // 遍历表格中的每个单元格
+      table.querySelectorAll('td').forEach(td => {
+        console.log('td',td)
+        // 获取单元格文本内容
+        const cellText = td.innerHTML.trim().toLowerCase();
+
+        // 如果单元格内容包含搜索关键字，添加高亮样式
+        if (cellText.includes(keyword)) {
+          // 将匹配到的关键字替换为带有高亮样式的文本
+          const highlightedText = cellText.replace(new RegExp(keyword, 'gi'), match => `<span class="highlight">${match}</span>`);
+          td.innerHTML = highlightedText;
+        } else {
+          // 移除高亮样式
+          td.innerHTML = cellText;
+        }
+      });
+      // });
     },
     // 新增
     addDivision() {
@@ -182,6 +330,18 @@ export default {
       this.page = 'add'
       this.disable = false
     },
+    delItems() {
+      if (this.ids.length <= 0) {
+        this.$modal.notifyWarning("至少勾选一条数据");
+      } else {
+        deleteEquipments(this.ids).then(res => {
+          if(res.code === 200) {
+            this.$modal.notifySuccess("删除成功");
+            this.useQuery(this.params, this.pageInfo)
+          }
+       })
+      }
+    },
     // 下载模板
     async downLoadMb() {
       this.$modal.loading("正在下载模板，请稍后...");
@@ -233,9 +393,16 @@ export default {
     },
     resetList() {
       this.params = {
-        materialCode: '',
-        materialName: '',
+        commonName: '',
+        registrationName: '',
         deviceCategory: '',
+        factoryName: '',
+        model: '',
+        referencePrice: '',
+        parameters: '',
+        isDeleteFile: '',
+        isProjectOrFactoryEmpower: '',
+        remark: ''
       }
       this.useQuery(this.params, this.pageInfo)
     },
@@ -245,7 +412,39 @@ export default {
       this.rowDetail = row
       this.disable = true
     },
-    delItem(row) {},
+    delItem(row) {
+      console.log(row)
+      const param = [row.id]
+      deleteEquipments(param).then(res => {
+        if(res.code === 200) {
+          this.$modal.notifySuccess("删除成功");
+          this.useQuery(this.params, this.pageInfo)
+        }
+      })
+    },
+    // 导出
+    exportData() {
+      this.$modal.loading("正在导出数据，请稍后...");
+      exportEquipments(this.params).then(res => {
+        this.$modal.closeLoading();
+        const blob = new Blob([res], {
+          type: "application/vnd.ms-excel;charset=UTF-8",
+        });// 创建一个类文件对象：Blob对象表示一个不可变的、原始数据的类文件对象
+        const downloadElement = document.createElement("a"); //创建a标签
+        const href = window.URL.createObjectURL(blob); // 创建下载的链接
+        // var temp = res.headers["content-disposition"]; 
+        // var fileName = decodeURIComponent(temp.split("filename=")[1]); // 中文需要转码 (前端乱码）
+        // var name = fileName.split(";")[0]; //切割成文件名
+        downloadElement.href = href;  //下载地址
+        downloadElement.download = '设备产品数据导出' + this.parseTime(new Date().getTime()) + ".xlsx"; // 下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click(); // 点击下载
+        document.body.removeChild(downloadElement); // 下载完成移除元素
+        window.URL.revokeObjectURL(href); // 释放blob对象
+      }).catch(err => {
+        this.$modal.closeLoading();
+      })
+    },
   }
 }
 </script>
@@ -261,4 +460,7 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
+::v-deep .highlight {
+  background: yellow !important;
+}
 </style>