Merge branch 'dev' into 'purchaseDev'

Dev20231218

See merge request new-business/drp-web!619

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

@@ -156,6 +156,7 @@ export default {
       this.loading = true;
       await verify(this.flow).then(res => {
         if (res.code === 200) {
+          console.log("this.$route.query",this.$route.query);
           this.fetchPerformance(this.$route.query.performanceId);
           this.fetchFlow(this.$route.query.flowId);
           this.$modal.msgSuccess("已确认");

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

@@ -1,88 +0,0 @@
-<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} from "@/api/business/ehr/pm/performance";
-export default {
-  name: "CopyItemDialog",
-  props: ["id"],
-  data() {
-    return {
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        staff: null,
-        params:{
-          neId: 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){
-      this.$emit('setItems',row.id);
-      this.open = false;
-    },
-  },
-  created() {
-    this.queryParams.params.neId = this.id;
-  },
-};
-</script>
-

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

@@ -73,9 +73,7 @@
 <script>
 import ApproveLogDialog from './btnApproveLog.vue'
 import AdjustlogDialog from './btnAjMarkLog.vue'
-import CopyItemDialog from './btnCopyItem.vue'
-import { getPerformance,fillinFinish,selfestimate,copyItem} from "@/api/business/ehr/pm/performance";
-import { getPerformanceItem,addPerformanceItem,updatePerformanceItem,delPerformanceItem} from "@/api/business/ehr/pm/performanceitem";
+import { getPerformance} from "@/api/business/ehr/pm/performance";
 
 export default {
   name: 'detail',
@@ -85,7 +83,7 @@ export default {
     prop: 'isList',
     event: 'jugislist'
   },
-  components: {ApproveLogDialog,AdjustlogDialog,CopyItemDialog},
+  components: {ApproveLogDialog,AdjustlogDialog},
   data() {
     return {
       //id

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

@@ -1,88 +0,0 @@
-<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} from "@/api/business/ehr/pm/performance";
-export default {
-  name: "CopyItemDialog",
-  props: ["id"],
-  data() {
-    return {
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        staff: null,
-        params:{
-          neId: 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){
-      this.$emit('setItems',row.id);
-      this.open = false;
-    },
-  },
-  created() {
-    this.queryParams.params.neId = this.id;
-  },
-};
-</script>
-

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

@@ -57,9 +57,7 @@
 <script>
 import ApproveLogDialog from './btnApproveLog.vue'
 import AdjustlogDialog from './btnAjMarkLog.vue'
-import CopyItemDialog from './btnCopyItem.vue'
-import { getPerformance,fillinFinish,selfestimate,copyItem} from "@/api/business/ehr/pm/performance";
-import { getPerformanceItem,addPerformanceItem,updatePerformanceItem,delPerformanceItem} from "@/api/business/ehr/pm/performanceitem";
+import { getPerformance} from "@/api/business/ehr/pm/performance";
 
 export default {
   name: 'detail',
@@ -69,7 +67,7 @@ export default {
     prop: 'isList',
     event: 'jugislist'
   },
-  components: {ApproveLogDialog,AdjustlogDialog,CopyItemDialog},
+  components: {ApproveLogDialog,AdjustlogDialog},
   data() {
     return {
       //id

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

@@ -1,88 +0,0 @@
-<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} from "@/api/business/ehr/pm/performance";
-export default {
-  name: "CopyItemDialog",
-  props: ["id"],
-  data() {
-    return {
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        staff: null,
-        params:{
-          neId: 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){
-      this.$emit('setItems',row.id);
-      this.open = false;
-    },
-  },
-  created() {
-    this.queryParams.params.neId = this.id;
-  },
-};
-</script>
-

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

@@ -5,8 +5,6 @@
         <span style="font-weight:bold">绩效考核表</span>-{{form.name}}
         <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 type="primary" size="mini" @click="btnSubmit" :loading="loading" v-if="this.$store.state.user.name == form.staff && (form.status == '0' || form.status == '3')">提交</el-button>
-          <CopyItemDialog style="margin: 0 10px" @setItems="setItems" v-if="this.$store.state.user.name == form.staff && form.status == '0'" :id="rowId"></CopyItemDialog>
           <ApproveLogDialog style="margin: 0 10px" :pmId="form.id"></ApproveLogDialog>
           <AdjustlogDialog style="margin: 0 10px" :pmId="form.id"></AdjustlogDialog>
           <el-button size="mini" plain @click="btnPreviou" v-if="ids">上一个</el-button>
@@ -31,25 +29,16 @@
             </el-descriptions-item>
           </el-descriptions>
           <el-descriptions :column="6 ">
-            <el-descriptions-item label="自评分" v-if="form.status > 3">{{form.saMark}}</el-descriptions-item>
-            <el-descriptions-item label="上级评分" v-if="form.status > 4">{{form.ldMark}}</el-descriptions-item>
-            <el-descriptions-item label="综合得分" v-if="form.status > 4">{{form.mark}}</el-descriptions-item>
+            <el-descriptions-item label="自评分">{{form.saMark}}</el-descriptions-item>
+            <el-descriptions-item label="上级评分">{{form.ldMark}}</el-descriptions-item>
+            <el-descriptions-item label="综合得分">{{form.mark}}</el-descriptions-item>
           </el-descriptions>
-          <el-descriptions v-if="form.status > 3">
+          <el-descriptions>
             <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-form-item label="个人总结" prop="summary">
-              <el-input type="textarea" placeholder="总结本月工作的亮点和暗点" v-model="form.summary"></el-input>
-            </el-form-item>
-          </div>
-          <el-descriptions v-if="form.status > 4">
+          <el-descriptions>
             <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" border>
             <el-table-column type="index" width="50" label="序号"/>
             <el-table-column width="100" :show-overflow-tooltip="!isUnfold" label="评估方面" align="center" prop="aspect">
@@ -64,109 +53,27 @@
                 <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 :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" :render-header="addRedStar" v-if="this.$store.state.user.name == form.staff && form.status == '3'">
-              <template slot-scope="scope">
-                <el-form-item :prop="'performanceItem.'+scope.$index+'.selfScoring'" :rules="{required: true,message: ' ',trigger: 'blur'}">
-                  <el-input  v-model="scope.row.selfScoring" v-only-number="{max:saMarkMax,min:0,precision:1}" size="mini"/>
-                </el-form-item>
-              </template>
-            </el-table-column>
-            <el-table-column :show-overflow-tooltip="!isUnfold" label="自评语" align="center" prop="selfComment" :render-header="addRedStar" v-if="this.$store.state.user.name == form.staff && form.status == '3'">
-              <template slot-scope="scope">
-                <el-form-item :prop="'performanceItem.'+scope.$index+'.selfComment'" :rules="{required: true,message: ' ',trigger: 'blur'}">
-                  <el-input size="mini" type="textarea" :rows="3" v-model="scope.row.selfComment"></el-input>
-                </el-form-item>
-              </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-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"/>
+            <el-table-column :show-overflow-tooltip="!isUnfold" label="上级评语" align="center" prop="leaderComment"/>
           </el-table>
         </el-form>
       </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="asItem">
-          <el-checkbox v-model="rowData.asItem" @change="handleCheckedChange"></el-checkbox>
-        </el-form-item>
-        <el-form-item label="权重(%)" prop="weight" v-if="!rowData.asItem">
-          <el-input  v-model.number="rowData.weight" v-only-number="{max:100,min:0,precision:0}" size="mini">
-            <i slot="suffix" style="color: #000;font-style:normal;margin-right: 10px;">%</i>
-          </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="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 ApproveLogDialog from './btnApproveLog.vue'
 import AdjustlogDialog from './btnAjMarkLog.vue'
-import CopyItemDialog from './btnCopyItem.vue'
-import { getPerformance,fillinFinish,selfestimate,copyItem} from "@/api/business/ehr/pm/performance";
-import { getPerformanceItem,addPerformanceItem,updatePerformanceItem,delPerformanceItem} from "@/api/business/ehr/pm/performanceitem";
+import { getPerformance} from "@/api/business/ehr/pm/performance";
 
 export default {
   name: 'detail',
@@ -176,49 +83,15 @@ export default {
     prop: 'isList',
     event: 'jugislist'
   },
-  components: {ApproveLogDialog,AdjustlogDialog,CopyItemDialog},
+  components: {ApproveLogDialog,AdjustlogDialog},
   data() {
     return {
       //id
       id:null,
       //表单
       form:{},
-      //提交规则
-      rules:{
-        summary: [
-          { required: true, message: " ", trigger: "blur" },
-        ],
-      },
       //遮罩
       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,
       //明细权重合计值
@@ -259,77 +132,6 @@ export default {
          this.loading = false;
       })
     },
-    //增行
-    btnAddRow(){
-      this.rowData = {};
-      this.rowData.assessId = this.form.id;
-      this.rowDataOpen = true;
-    },
-    //修改
-    async btnEdit(row){
-      this.rowData = {};
-      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.rowData = {};
-      this.rowDataOpen = false;
-    },
-    //单行明细确认
-    btnRowConfirm(){
-      if(this.form.staffDivide == 'C1' && this.rowData.aspect == 0 && this.rowData.weight < 80){
-        this.$modal.msgSuccess("业务组的业绩考核权重不能低于80！");
-        return;
-      }
-      let sum = 100;
-      if(this.rowData.id){
-        let arr = this.form.performanceItem.filter(ele => ele.id != this.rowData.id);
-        sum = arr.reduce((sum, e) => sum + Number(e.weight || 0), 0);
-      }else{
-        sum = this.form.performanceItem.reduce((sum, e) => sum + Number(e.weight || 0), 0);
-      }
-      console.log("sum",sum);
-      console.log("sum + this.rowData.weight",sum + this.rowData.weight);
-      if(sum + this.rowData.weight > 100){
-        this.$modal.msgSuccess("总权重超过100，剩余权重比为" + (100 - sum));
-        return;
-      }
-      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;
@@ -365,69 +167,6 @@ export default {
       }
       return ['合计','','',weight,'','','',selfScoring,'',this.form.ldMark];
     },
-    //提交
-    btnSubmit(){
-      if(this.form.status == '0'){
-        if(this.weightSum != 100){
-          this.$modal.msgWarning("权重不为100%无法提交！");
-          return;
-        }
-        let that = this;
-        this.$modal.confirm('确认提交吗？').then(async function() {
-          that.loading = true;
-          return await fillinFinish(that.form);
-        }).then(() => {
-          that.fetchPerformance(that.id);
-          that.$modal.msgSuccess("提交成功");
-          that.loading = false;
-        }).catch(() => {
-          that.loading = false;
-        });
-      }
-      if(this.form.status == '3'){
-        this.$refs["dataForm"].validate(async valid => {
-          if (valid) {
-            let that = this;
-              this.$modal.confirm('确认提交吗？').then(async function() {
-                that.loading = true;
-                return await selfestimate(that.form);
-              }).then(() => {
-                that.fetchPerformance(that.id);
-                that.$modal.msgSuccess("提交成功");
-                that.loading = false;
-              }).catch(() => {
-                that.loading = false;
-              });
-          }else{
-            this.$modal.msgWarning("评分或评语不能为空！");
-            return false;
-          }
-        });
-      }
-    },
-    //设置明细
-    async setItems(cId){
-      let params = {
-        id : this.id,
-        cId : cId
-      }
-      let res = await copyItem(params);
-      if("200" == res.code){
-        this.$modal.msgSuccess("复制成功");
-        this.fetchPerformance(this.id);
-      }
-    },
-    //选择加减分项后
-    handleCheckedChange(value){
-      this.rowData.weight = 0;
-    },
-    //必选标识
-    addRedStar(h, { column }) {
-      return [
-        h('span', { style: 'color: #F56C6C' }, '*'),
-        h('span', ' ' + column.label)
-      ];
-    },
   }
 }
 </script>

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

@@ -95,32 +95,12 @@
       </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,getCurrentMonthId,getNextMonthId} from "@/api/business/ehr/pm/performance";
-import { getGradeAdjustConut,toDoList} from "@/api/business/ehr/pm/gradeadjust";
-import { getPmVerifyConut} from "@/api/business/ehr/pm/pmverify";
-import { getPmMarkConut} from "@/api/business/ehr/pm/pmmark";
 import { listDept} from "@/api/business/ehr/ehr/dept";
 
 export default {
@@ -131,18 +111,12 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 显示搜索条件
-      showSearch: true,
       // 总条数
       total: 0,
       // 表格数据
       listData: [],
       // id集合
       ids: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -155,35 +129,7 @@ export default {
         status: null,
         month: null,
         dept: null,
-      },
-      // 查询日期范围
-      dateRange: [],
-      pickerOptions: {
-        shortcuts: [{
-          text: '最近一周',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近一个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-            picker.$emit('pick', [start, end]);
-          }
-        }, {
-          text: '最近三个月',
-          onClick(picker) {
-            const end = new Date();
-            const start = new Date();
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-            picker.$emit('pick', [start, end]);
-          }
-        }]
+        evaluatorName: null
       },
       //页面显示
       isList: true,
@@ -191,18 +137,6 @@ export default {
       page: '',
       //详情id
       rowId: '',
-      //等级调整数量
-      adjustCount: null,
-      //等级调整周期列表
-      stageList:[],
-      //等级调整周期列表弹出层
-      stageListOpen:false,
-      //等级调整周期列表遮罩层
-      stageListLoading: true,
-      //待确认数量
-      verifyCount: null,
-      //待评分数量
-      markCount: null,
       //部门树
       deptTree: [],
       //value
@@ -210,23 +144,8 @@ export default {
     };
   },
   async created() {
-    //查询等级调整数量
-    let res = await getGradeAdjustConut();
-    this.adjustCount = res.row;
-    //查询待确认数量
-    res = await getPmVerifyConut();
-    this.verifyCount = res.row;
-    //查询待评分数量
-    res = await getPmMarkConut();
-    this.markCount = res.row;
+    this.queryParams.month = this.getNowFormatDate();
     this.getList();
-    //如果是跳转过来的页面带了参数flowId则直接进入填写页面
-    if(this.$route['query'] !== undefined && this.$route.query['flowId'] !== undefined){
-      this.rowId = this.$route.query.performanceId;
-      this.page = 'add';
-      this.ids = [this.$route.query.performanceId];
-      this.isList = false;
-    }
     listDept().then(response => {
       let arr = response.rows;
       arr.forEach(function(element) {
@@ -244,7 +163,7 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.dept = this.treeValue[this.treeValue.length - 1];
-      listPerformance(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listPerformance(this.queryParams).then(response => {
         this.listData = response.rows;
         this.ids = response.rows.map(item => item.id);
         this.total = response.total;
@@ -259,7 +178,6 @@ export default {
     /** 重置按钮操作 */
     btnResetQuery() {
       this.resetForm("queryForm");
-      this.dateRange = [];
       this.treeValue = [];
       this.queryParams.params.staffCodeOrName = null;
       this.btnSearch();
@@ -267,7 +185,6 @@ export default {
     /** 刷新 */
     refresh(){
       this.resetForm("queryForm");
-      this.dateRange = [];
       this.treeValue = [];
       this.getList();
     },
@@ -277,59 +194,7 @@ export default {
       this.page = 'add';
       this.isList = false;
     },
-    //只看自己按钮
-    btnOneself(){
-      this.btnSearch();
-    },
-    //等级调整
-    btnGradeAdjust(){
-      this.stageListOpen = true;
-      this.getlistStage();
-    },
-    //查看当月绩效
-    async btnCurrentMonth(){
-      let res = await getCurrentMonthId();
-      if(!res.id){
-        this.$modal.msgSuccess("未查询到本月绩效！");
-      }else{
-        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;
-      toDoList().then(response => {
-        this.stageList = response.rows;
-        this.stageListLoading = false;
-      });
-    },
-    //进入调整
-    btnEntryAdjust(row){
-      this.$router.push({ name: 'AdjustGrade', query: { id: row.id,flowId: row.flowId } });
-    },
-    //待确认
-    btnPmVerify(){
-      this.$router.push({name:'PmVerify'});
-    },
-    //待评分
-    btnPmMark(){
-      this.$router.push({name:'PmMark'});
-    },
+    
     arrayToTree(data, pid) {
       let result = []
       this.getChildren(data, result, pid)
@@ -349,6 +214,16 @@ export default {
       console.log("value",value);
       this.$refs.cascaderHandle.dropDownVisible = false;
     },
+    //获取当前年月
+    getNowFormatDate() {
+      let date = new Date(),
+      year = date.getFullYear(),
+      month = date.getMonth() + 1,
+      strDate = date.getDate()
+      if (month < 10) month = `0${month}`
+      if (strDate < 10) strDate = `0${strDate}`
+      return `${year}-${month}`
+    }
   }
 };
 </script>

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="app-container">
-      <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" label-width="68px">
+      <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" @submit.native.prevent>
         <el-row>
           <el-col :span="18">
             <el-form-item label="名称" prop="name">

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">
+      <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" @submit.native.prevent>
         <el-row >
           <el-col :span="18">
             <el-form-item label="部门">
@@ -49,9 +49,9 @@
                 @keyup.enter.native="btnSearch"
               />
             </el-form-item>
-            <el-form-item label="只看自己的">
+            <!-- <el-form-item label="只看自己的">
               <el-checkbox v-model="queryParams.params.oneself" @change="btnOneself"></el-checkbox>
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
           <el-col :span="6">
             <el-form-item style="float:right">
@@ -62,7 +62,7 @@
         </el-row>
       </el-form>
       <div style="float:right">
-        <el-badge :value="verifyCount" class="item" style="margin: 0 10px" v-if="verifyCount > 0">
+        <!-- <el-badge :value="verifyCount" class="item" style="margin: 0 10px" v-if="verifyCount > 0">
           <el-button type="primary" size="mini" @click="btnPmVerify">待确认</el-button>
         </el-badge>
         <el-badge :value="markCount" class="item" style="margin: 0 10px"  v-if="markCount > 0">
@@ -72,7 +72,7 @@
           <el-button type="primary" size="mini" @click="btnGradeAdjust">待分数调整</el-button>
         </el-badge>
         <el-button type="primary" size="mini" @click="btnCurrentMonth">本月绩效</el-button>
-        <el-button type="primary" size="mini" @click="btnNextMonth">下月绩效</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" />
@@ -164,13 +164,13 @@ export default {
         pageNum: 1,
         pageSize: 10,
         params:{
-          dataPermission: 'Y',
-          oneself: true,
+          dataPermission: 'N',
           staffCodeOrName: null,
         },
         status: null,
         month: null,
         dept: null,
+        evaluatorName: null,
       },
       // 查询日期范围
       dateRange: [],
@@ -226,23 +226,23 @@ export default {
     };
   },
   async created() {
-    //查询等级调整数量
-    let res = await getGradeAdjustConut();
-    this.adjustCount = res.row;
-    //查询待确认数量
-    res = await getPmVerifyConut();
-    this.verifyCount = res.row;
-    //查询待评分数量
-    res = await getPmMarkConut();
-    this.markCount = res.row;
+    // //查询等级调整数量
+    // let res = await getGradeAdjustConut();
+    // this.adjustCount = res.row;
+    // //查询待确认数量
+    // res = await getPmVerifyConut();
+    // this.verifyCount = res.row;
+    // //查询待评分数量
+    // res = await getPmMarkConut();
+    // this.markCount = res.row;
     this.getList();
     //如果是跳转过来的页面带了参数flowId则直接进入填写页面
-    if(this.$route['query'] !== undefined && this.$route.query['flowId'] !== undefined){
-      this.rowId = this.$route.query.performanceId;
-      this.page = 'add';
-      this.ids = [this.$route.query.performanceId];
-      this.isList = false;
-    }
+    // if(this.$route['query'] !== undefined && this.$route.query['flowId'] !== undefined){
+    //   this.rowId = this.$route.query.performanceId;
+    //   this.page = 'add';
+    //   this.ids = [this.$route.query.performanceId];
+    //   this.isList = false;
+    // }
     listDept().then(response => {
       let arr = response.rows;
       arr.forEach(function(element) {

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

@@ -1,18 +1,24 @@
 <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 :model="queryParams" ref="queryForm" size="mini" :inline="true" @submit.native.prevent>
+        <el-row>
+          <el-col :span="18">
+            <el-form-item label="员工" prop="staffName">
+              <el-input
+                v-model="queryParams.staffName"
+                clearable
+                @keyup.enter.native="btnSearch"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item style="float:right">
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="btnSearch">搜索</el-button>
+              <el-button icon="el-icon-refresh" size="mini" @click="btnResetQuery">重置</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div style="float:right">
         <el-button type="primary" size="mini" @click="btnGetRelation">同步EHR评估关系</el-button>
@@ -54,6 +60,8 @@ export default {
   components: {detail},
   data() {
     return {
+      // 遮罩层
+      loading: true,
       // 总条数
       total: 0,
       // 表格数据

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

@@ -1,12 +1,30 @@
 <template>
   <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="name" />
-      <el-table-column label="小值" align="center" prop="min" />
-      <el-table-column label="大值" align="center" prop="max" />
-      <el-table-column label="系数" align="center" prop="coefficient" />
-    </el-table>
+    <el-row>
+      <el-col span="11">
+        业务组
+        <el-table size="mini" v-loading="loading" :data="c1ListData">
+          <el-table-column label="编号" align="center" prop="id" />
+          <el-table-column label="名称" align="center" prop="name" />
+          <el-table-column label="小值" align="center" prop="min" />
+          <el-table-column label="大值" align="center" prop="max" />
+          <el-table-column label="系数" align="center" prop="coefficient" />
+        </el-table>
+      </el-col>
+      <el-col span="2">
+        -
+      </el-col>
+      <el-col span="11">
+        非业务组
+        <el-table size="mini" v-loading="loading" :data="c2ListData">
+          <el-table-column label="编号" align="center" prop="id" />
+          <el-table-column label="名称" align="center" prop="name" />
+          <el-table-column label="小值" align="center" prop="min" />
+          <el-table-column label="大值" align="center" prop="max" />
+          <el-table-column label="系数" align="center" prop="coefficient" />
+        </el-table>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
@@ -19,6 +37,10 @@ export default {
     return {
       // 表格数据
       listData: [],
+      //业务组表格数据
+      c1ListData:[],
+      //非业务组表格数据
+      c2ListData:[],
       // 遮罩层
       loading: true,
     };
@@ -33,6 +55,8 @@ export default {
       getGradeconfig(this.stage.gradeconfigId).then(response => {
         console.log(response.data);
         this.listData = response.data.gradeconfigItem;
+        this.c1ListData = this.listData.filter(ele => ele.divide == 'C1');
+        this.c2ListData = this.listData.filter(ele => ele.divide == 'C2');
         this.loading = false;
       });
     },

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

@@ -1,10 +1,10 @@
 <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" @submit.native.prevent>
         <el-row >
           <el-col :span="18">
-            <el-form-item label="名称" prop="name">
+            <el-form-item label="名称">
               <el-input
                 v-model="queryParams.name"
                 clearable