常熟吴彦祖 2 months ago
parent
commit
ecce1895e0
  1. 35
      src/views/modules/supplierPerformance/myPerformanceEvaluateRequest.vue
  2. 31
      src/views/modules/supplierPerformance/perMyScore.vue
  3. 35
      src/views/modules/supplierPerformance/performanceEvaluateRequest.vue
  4. 25
      src/views/modules/supplierPerformance/performanceEvaluateRequestApprove.vue
  5. 74
      src/views/modules/supplierPerformance/performanceEvaluateRequestReview.vue
  6. 19
      src/views/modules/supplierPerformance/supplierPerformanceStatusOptions.js

35
src/views/modules/supplierPerformance/myPerformanceEvaluateRequest.vue

@ -2,7 +2,7 @@
<div class="customer-css"> <div class="customer-css">
<!-- 查询条件 --> <!-- 查询条件 -->
<el-form :inline="true" label-position="top" class="pi-search-form"> <el-form :inline="true" label-position="top" class="pi-search-form">
<el-form-item label="请求编号">
<el-form-item label="任务单号">
<el-input v-model="searchData.requestNo" style="width:140px" @keyup.enter.native="getList" /> <el-input v-model="searchData.requestNo" style="width:140px" @keyup.enter.native="getList" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -36,13 +36,11 @@
<el-form-item label="状态"> <el-form-item label="状态">
<el-select v-model="searchData.statusList" multiple collapse-tags clearable style="width:150px" <el-select v-model="searchData.statusList" multiple collapse-tags clearable style="width:150px"
placeholder="All"> placeholder="All">
<el-option label="未开始" value="未开始" />
<el-option label="进行中" value="进行中" />
<el-option label="已完成" value="已完成" />
<el-option label="已审核" value="已审核" />
<el-option label="待审批" value="待审批" />
<el-option label="审批通过" value="审批通过" />
<el-option label="审批拒绝" value="审批拒绝" />
<el-option
v-for="item in taskStatusOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=" "> <el-form-item label=" ">
@ -54,7 +52,7 @@
<!-- Evaluate Request 列表 --> <!-- Evaluate Request 列表 -->
<el-table :data="dataList" :height="requestTableHeight - 100" border highlight-current-row v-loading="loading" <el-table :data="dataList" :height="requestTableHeight - 100" border highlight-current-row v-loading="loading"
@row-click="rowClick" ref="mainTable" style="width:100%;margin-bottom:8px"> @row-click="rowClick" ref="mainTable" style="width:100%;margin-bottom:8px">
<el-table-column prop="requestNo" label="请求编号" min-width="140" header-align="center" align="left" />
<el-table-column prop="requestNo" label="任务单号" min-width="140" header-align="center" align="left" />
<el-table-column prop="supplierNo" label="供应商编号" width="120" header-align="center" align="left" /> <el-table-column prop="supplierNo" label="供应商编号" width="120" header-align="center" align="left" />
<el-table-column prop="supplierName" label="供应商名称" min-width="200" header-align="center" align="left" show-overflow-tooltip /> <el-table-column prop="supplierName" label="供应商名称" min-width="200" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="wantedCompleteDate" label="预计完成时间" width="160" header-align="center" align="center" /> <el-table-column prop="wantedCompleteDate" label="预计完成时间" width="160" header-align="center" align="center" />
@ -80,7 +78,7 @@
<el-row :gutter="10" style="margin-top:12px"> <el-row :gutter="10" style="margin-top:12px">
<el-col :span="16"> <el-col :span="16">
<div class="sub-panel-header"> <div class="sub-panel-header">
<span style="font-size:16px">季度供应商绩效评级请求</span>
<span style="font-size:16px">考核单</span>
</div> </div>
<el-table :data="indicatorList" size="mini" border :height="indicatorTableHeight" highlight-current-row <el-table :data="indicatorList" size="mini" border :height="indicatorTableHeight" highlight-current-row
ref="indicatorTable" @row-click="selectIndicatorRow" v-loading="indicatorLoading"> ref="indicatorTable" @row-click="selectIndicatorRow" v-loading="indicatorLoading">
@ -113,7 +111,7 @@
<!-- 调整供应商等级 --> <!-- 调整供应商等级 -->
<el-dialog title="调整供应商等级" :visible.sync="adjustVisible" width="420px" :close-on-click-modal="false" v-drag> <el-dialog title="调整供应商等级" :visible.sync="adjustVisible" width="420px" :close-on-click-modal="false" v-drag>
<el-form label-position="top" size="small"> <el-form label-position="top" size="small">
<el-form-item label="请求编号">
<el-form-item label="任务单号">
<el-input v-model="currentRequest.requestNo" disabled /> <el-input v-model="currentRequest.requestNo" disabled />
</el-form-item> </el-form-item>
<el-form-item label="供应商名称"> <el-form-item label="供应商名称">
@ -135,7 +133,7 @@
</el-dialog> </el-dialog>
<!-- 新建 / 编辑 绩效请求弹窗 --> <!-- 新建 / 编辑 绩效请求弹窗 -->
<el-dialog :title="isEdit ? '编辑绩效评估请求' : '新增绩效评估请求'" :visible.sync="createDialogVisible" :width="isEdit ? '760px' : '940px'" top="4vh"
<el-dialog :title="isEdit ? '编辑绩效评估考核' : '新增绩效评估考核'" :visible.sync="createDialogVisible" :width="isEdit ? '760px' : '940px'" top="4vh"
:close-on-click-modal="false" v-drag> :close-on-click-modal="false" v-drag>
<el-form :inline="true" label-position="top" size="mini" class="create-top-form"> <el-form :inline="true" label-position="top" size="mini" class="create-top-form">
<el-form-item :required="true"> <el-form-item :required="true">
@ -152,7 +150,7 @@
<el-form-item label=" " style="margin-top:-2px" v-if="!isEdit"> <el-form-item label=" " style="margin-top:-2px" v-if="!isEdit">
<el-button size="small" type="primary" :disabled="!createForm.templateNo" @click="openTemplateIndicatorDialog">指标信息</el-button> <el-button size="small" type="primary" :disabled="!createForm.templateNo" @click="openTemplateIndicatorDialog">指标信息</el-button>
</el-form-item> </el-form-item>
<el-form-item v-if="isEdit" label="请求编号">
<el-form-item v-if="isEdit" label="任务单号">
<el-input v-model="createForm.requestNo" disabled style="width:150px" /> <el-input v-model="createForm.requestNo" disabled style="width:150px" />
</el-form-item> </el-form-item>
<el-form-item label=" " style="margin-top:-2px" v-if="isEdit"> <el-form-item label=" " style="margin-top:-2px" v-if="isEdit">
@ -296,6 +294,10 @@ import {
} from '@/api/supplierPerformance/performanceEvaluateRequestBuild.js' } from '@/api/supplierPerformance/performanceEvaluateRequestBuild.js'
import Chooselist from '@/views/modules/common/Chooselist_eam' import Chooselist from '@/views/modules/common/Chooselist_eam'
import {getTemplateIndicators} from "../../../api/supplierPerformance/performanceIndicatorTemplate"; import {getTemplateIndicators} from "../../../api/supplierPerformance/performanceIndicatorTemplate";
import {
PERF_TASK_STATUS_OPTIONS,
PERF_TASK_STATUS_DEFAULT
} from './supplierPerformanceStatusOptions.js'
export default { export default {
components: { components: {
@ -310,6 +312,7 @@ export default {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
totalPage: 0, totalPage: 0,
taskStatusOptions: PERF_TASK_STATUS_OPTIONS,
searchData: { searchData: {
site: this.$store.state.user.site, site: this.$store.state.user.site,
username: this.$store.state.user.name, username: this.$store.state.user.name,
@ -401,7 +404,7 @@ export default {
calcHeight() { this.$nextTick(()=> { this.height = window.innerHeight - 40 }) }, calcHeight() { this.$nextTick(()=> { this.height = window.innerHeight - 40 }) },
getList() { getList() {
this.loading = true this.loading = true
if (this.searchData.statusList.length === 0) this.searchData.statusList = ['未开始','进行中','已完成','已审核','待审批','审批通过','审批拒绝']
if (this.searchData.statusList.length === 0) this.searchData.statusList = [...PERF_TASK_STATUS_DEFAULT]
const params = { ...this.searchData, statusList: this.searchData.statusList, page: this.pageIndex, limit: this.pageSize,selectType: 1 } const params = { ...this.searchData, statusList: this.searchData.statusList, page: this.pageIndex, limit: this.pageSize,selectType: 1 }
searchEvaluateRequestList(params).then(({data}) => { searchEvaluateRequestList(params).then(({data}) => {
if (data && (data.code === 0 || data.code === '0')) { if (data && (data.code === 0 || data.code === '0')) {
@ -486,10 +489,10 @@ export default {
} }
const hasScored = indicators.some(i => Number(i.score) > 0) const hasScored = indicators.some(i => Number(i.score) > 0)
if (hasScored) { if (hasScored) {
this.$message.error('该请求存在已评分指标 ,禁止删除')
this.$message.error('该考核任务存在已评分指标,禁止删除')
return return
} }
this.$confirm('确认删除该请求: ' + row.requestNo + ' ?', '提示', { type: 'warning' }).then(() => {
this.$confirm('确认删除该考核任务: ' + row.requestNo + ' ?', '提示', { type: 'warning' }).then(() => {
deleteEvaluateRequest({ id: row.id, site }).then(({data: delData}) => { deleteEvaluateRequest({ id: row.id, site }).then(({data: delData}) => {
if (delData && (delData.code === 0 || delData.code === '0')) { this.$message.success('删除成功'); this.getList() } if (delData && (delData.code === 0 || delData.code === '0')) { this.$message.success('删除成功'); this.getList() }
else { this.$message.error((delData && delData.msg) || '删除失败') } else { this.$message.error((delData && delData.msg) || '删除失败') }

31
src/views/modules/supplierPerformance/perMyScore.vue

@ -2,7 +2,7 @@
<div class="customer-css"> <div class="customer-css">
<!-- 查询条件 --> <!-- 查询条件 -->
<el-form :inline="true" label-position="top" class="pi-search-form"> <el-form :inline="true" label-position="top" class="pi-search-form">
<el-form-item label="请求编号">
<el-form-item label="任务单号">
<el-input v-model="searchData.requestNo" style="width:140px" @keyup.enter.native="getList" /> <el-input v-model="searchData.requestNo" style="width:140px" @keyup.enter.native="getList" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -35,13 +35,11 @@
</el-form-item> </el-form-item>
<el-form-item label="状态"> <el-form-item label="状态">
<el-select v-model="searchData.statusList" multiple collapse-tags style="width:150px" placeholder="All"> <el-select v-model="searchData.statusList" multiple collapse-tags style="width:150px" placeholder="All">
<el-option label="未开始" value="未开始" />
<el-option label="进行中" value="进行中" />
<el-option label="已完成" value="已完成" />
<el-option label="已审核" value="已审核" />
<el-option label="待审批" value="待审批" />
<el-option label="审批通过" value="审批通过" />
<el-option label="审批拒绝" value="审批拒绝" />
<el-option
v-for="item in taskStatusOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=" "> <el-form-item label=" ">
@ -58,7 +56,7 @@
<a v-if="canScore(scope.row)" class="customer-a" @click.stop="openEditDialog(scope.row)">评分</a> <a v-if="canScore(scope.row)" class="customer-a" @click.stop="openEditDialog(scope.row)">评分</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="requestNo" label="请求编号" min-width="140" header-align="center" align="left" />
<el-table-column prop="requestNo" label="任务单号" min-width="140" header-align="center" align="left" />
<el-table-column prop="supplierNo" label="供应商编码" width="120" header-align="center" align="left" /> <el-table-column prop="supplierNo" label="供应商编码" width="120" header-align="center" align="left" />
<el-table-column prop="supplierName" label="供应商名称" min-width="200" header-align="center" align="left" show-overflow-tooltip /> <el-table-column prop="supplierName" label="供应商名称" min-width="200" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="wantedCompleteDate" label="预计完成时间" width="160" header-align="center" align="center" /> <el-table-column prop="wantedCompleteDate" label="预计完成时间" width="160" header-align="center" align="center" />
@ -75,7 +73,7 @@
<el-row :gutter="10" style="margin-top:12px"> <el-row :gutter="10" style="margin-top:12px">
<el-col :span="24"> <el-col :span="24">
<div class="sub-panel-header"> <div class="sub-panel-header">
<span style="font-size:16px">季度供应商绩效评级请求</span>
<span style="font-size:16px">考核单</span>
</div> </div>
<el-table :data="indicatorList" size="mini" border :height="indicatorTableHeight" highlight-current-row <el-table :data="indicatorList" size="mini" border :height="indicatorTableHeight" highlight-current-row
ref="indicatorTable" v-loading="indicatorLoading"> ref="indicatorTable" v-loading="indicatorLoading">
@ -93,7 +91,7 @@
<el-dialog :title="'打分'" :close-on-click-modal="false" v-drag :visible.sync="createDialogVisible" <el-dialog :title="'打分'" :close-on-click-modal="false" v-drag :visible.sync="createDialogVisible"
width="960px"> width="960px">
<el-form :inline="true" label-position="top" size="mini" class="create-top-form"> <el-form :inline="true" label-position="top" size="mini" class="create-top-form">
<el-form-item label="请求编号" :required="true">
<el-form-item label="任务单号" :required="true">
<!-- 允许编辑模式下修改模板号: 去掉 :disabled="isEdit" --> <!-- 允许编辑模式下修改模板号: 去掉 :disabled="isEdit" -->
<el-input v-model="createForm.requestNo" style="width:150px" disabled/> <el-input v-model="createForm.requestNo" style="width:150px" disabled/>
</el-form-item> </el-form-item>
@ -109,7 +107,7 @@
<el-input v-model="createForm.createBy" style="width:150px" disabled/> <el-input v-model="createForm.createBy" style="width:150px" disabled/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span style="font-size:12px">季度供应商绩效评级请求</span>
<span style="font-size:12px">考核单</span>
<el-row :gutter="10" style="margin-top:4px"> <el-row :gutter="10" style="margin-top:4px">
<el-col :span="16"> <el-col :span="16">
<div class="sub-panel-header" style="border-bottom:1px solid #ebeef5"> <div class="sub-panel-header" style="border-bottom:1px solid #ebeef5">
@ -176,6 +174,10 @@ import {
} from "../../../api/supplierPerformance/performanceIndicatorTemplate"; } from "../../../api/supplierPerformance/performanceIndicatorTemplate";
import {getEvaluateRequestIndicatorsOfScore} from "../../../api/supplierPerformance/myPerformanceEvaluateRequest"; import {getEvaluateRequestIndicatorsOfScore} from "../../../api/supplierPerformance/myPerformanceEvaluateRequest";
import { saveEvaluateRequestIndicatorScore } from '@/api/supplierPerformance/myPerformanceEvaluateRequest.js' import { saveEvaluateRequestIndicatorScore } from '@/api/supplierPerformance/myPerformanceEvaluateRequest.js'
import {
PERF_TASK_STATUS_OPTIONS,
PERF_TASK_STATUS_DEFAULT
} from './supplierPerformanceStatusOptions.js'
export default { export default {
components: { components: {
@ -190,6 +192,7 @@ export default {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
totalPage: 0, totalPage: 0,
taskStatusOptions: PERF_TASK_STATUS_OPTIONS,
searchData: { searchData: {
site: this.$store.state.user.site, site: this.$store.state.user.site,
username: this.$store.state.user.name, username: this.$store.state.user.name,
@ -304,7 +307,7 @@ export default {
calcHeight() { this.$nextTick(()=> { this.height = window.innerHeight - 40 }) }, calcHeight() { this.$nextTick(()=> { this.height = window.innerHeight - 40 }) },
getList() { getList() {
this.loading = true this.loading = true
if (this.searchData.statusList.length === 0) this.searchData.statusList = ['未开始','进行中','已完成','已审核','待审批','审批通过','审批拒绝']
if (this.searchData.statusList.length === 0) this.searchData.statusList = [...PERF_TASK_STATUS_DEFAULT]
const params = { ...this.searchData, statusList: this.searchData.statusList, page: this.pageIndex, limit: this.pageSize,selectType: 3 } const params = { ...this.searchData, statusList: this.searchData.statusList, page: this.pageIndex, limit: this.pageSize,selectType: 3 }
searchEvaluateRequestList(params).then(({data}) => { searchEvaluateRequestList(params).then(({data}) => {
if (data && (data.code === 0 || data.code === '0')) { if (data && (data.code === 0 || data.code === '0')) {
@ -374,7 +377,7 @@ export default {
}, },
saveScore(saveType) { saveScore(saveType) {
if (this.createSaving) return if (this.createSaving) return
if (!this.currentRequest || !this.currentRequest.id) { this.$message.warning('缺少当前请求'); return }
if (!this.currentRequest || !this.currentRequest.id) { this.$message.warning('缺少当前考核单'); return }
if (!this.canScore(this.currentRequest)) { this.$message.warning('当前状态不允许评分'); return } if (!this.canScore(this.currentRequest)) { this.$message.warning('当前状态不允许评分'); return }
// (0) // (0)
const scored = (this.indicatorList||[]).filter(it => it && it.indicatorCode && it.score !== '' && it.score !== null && Number(it.score) !== 0) const scored = (this.indicatorList||[]).filter(it => it && it.indicatorCode && it.score !== '' && it.score !== null && Number(it.score) !== 0)

35
src/views/modules/supplierPerformance/performanceEvaluateRequest.vue

@ -2,7 +2,7 @@
<div class="customer-css"> <div class="customer-css">
<!-- 查询条件 --> <!-- 查询条件 -->
<el-form :inline="true" label-position="top" class="pi-search-form"> <el-form :inline="true" label-position="top" class="pi-search-form">
<el-form-item label="请求编号">
<el-form-item label="任务单号">
<el-input v-model="searchData.requestNo" style="width:140px" @keyup.enter.native="getList" /> <el-input v-model="searchData.requestNo" style="width:140px" @keyup.enter.native="getList" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -35,13 +35,11 @@
</el-form-item> </el-form-item>
<el-form-item label="状态"> <el-form-item label="状态">
<el-select v-model="searchData.statusList" multiple collapse-tags clearable style="width:150px" placeholder="All"> <el-select v-model="searchData.statusList" multiple collapse-tags clearable style="width:150px" placeholder="All">
<el-option label="未开始" value="未开始" />
<el-option label="进行中" value="进行中" />
<el-option label="已完成" value="已完成" />
<el-option label="已审核" value="已审核" />
<el-option label="待审批" value="待审批" />
<el-option label="审批通过" value="审批通过" />
<el-option label="审批拒绝" value="审批拒绝" />
<el-option
v-for="item in taskStatusOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=" "> <el-form-item label=" ">
@ -60,7 +58,7 @@
<!-- <a class="customer-a" @click.stop="removeRequest(scope.row)">Delete</a>--> <!-- <a class="customer-a" @click.stop="removeRequest(scope.row)">Delete</a>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column prop="requestNo" label="请求编号" min-width="140" header-align="center" align="left" />
<el-table-column prop="requestNo" label="任务单号" min-width="140" header-align="center" align="left" />
<el-table-column prop="supplierNo" label="供应商编码" width="120" header-align="center" align="left" /> <el-table-column prop="supplierNo" label="供应商编码" width="120" header-align="center" align="left" />
<el-table-column prop="supplierName" label="供应商名称" min-width="200" header-align="center" align="left" show-overflow-tooltip /> <el-table-column prop="supplierName" label="供应商名称" min-width="200" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="wantedCompleteDate" label="预计完成时间" width="160" header-align="center" align="center" /> <el-table-column prop="wantedCompleteDate" label="预计完成时间" width="160" header-align="center" align="center" />
@ -77,7 +75,7 @@
<el-row :gutter="10" style="margin-top:12px"> <el-row :gutter="10" style="margin-top:12px">
<el-col :span="16"> <el-col :span="16">
<div class="sub-panel-header"> <div class="sub-panel-header">
<span style="font-size:16px">季度供应商绩效评级请求</span>
<span style="font-size:16px">考核单</span>
</div> </div>
<el-table :data="indicatorList" size="mini" border :height="indicatorTableHeight" highlight-current-row <el-table :data="indicatorList" size="mini" border :height="indicatorTableHeight" highlight-current-row
ref="indicatorTable" @row-click="selectIndicatorRow" v-loading="indicatorLoading"> ref="indicatorTable" @row-click="selectIndicatorRow" v-loading="indicatorLoading">
@ -110,7 +108,7 @@
<!-- 调整供应商等级 --> <!-- 调整供应商等级 -->
<el-dialog title="调整供应商等级" :visible.sync="adjustVisible" width="420px" :close-on-click-modal="false" v-drag> <el-dialog title="调整供应商等级" :visible.sync="adjustVisible" width="420px" :close-on-click-modal="false" v-drag>
<el-form label-position="top" size="small"> <el-form label-position="top" size="small">
<el-form-item label="请求编号">
<el-form-item label="任务单号">
<el-input v-model="currentRequest.requestNo" disabled /> <el-input v-model="currentRequest.requestNo" disabled />
</el-form-item> </el-form-item>
<el-form-item label="供应商名称"> <el-form-item label="供应商名称">
@ -132,7 +130,7 @@
</el-dialog> </el-dialog>
<!-- 新建 / 编辑 绩效请求弹窗 --> <!-- 新建 / 编辑 绩效请求弹窗 -->
<el-dialog :title="isEdit ? '编辑绩效评估请求' : '新增绩效评估请求'" :visible.sync="createDialogVisible" :width="isEdit ? '760px' : '940px'" top="4vh"
<el-dialog :title="isEdit ? '编辑绩效评估考核' : '新增绩效评估考核'" :visible.sync="createDialogVisible" :width="isEdit ? '760px' : '940px'" top="4vh"
:close-on-click-modal="false" v-drag> :close-on-click-modal="false" v-drag>
<el-form :inline="true" label-position="top" size="mini" class="create-top-form"> <el-form :inline="true" label-position="top" size="mini" class="create-top-form">
<el-form-item :required="true"> <el-form-item :required="true">
@ -149,7 +147,7 @@
<el-form-item label=" " style="margin-top:-2px" v-if="!isEdit"> <el-form-item label=" " style="margin-top:-2px" v-if="!isEdit">
<el-button size="small" type="primary" :disabled="!createForm.templateNo" @click="openTemplateIndicatorDialog">Indicator Info</el-button> <el-button size="small" type="primary" :disabled="!createForm.templateNo" @click="openTemplateIndicatorDialog">Indicator Info</el-button>
</el-form-item> </el-form-item>
<el-form-item v-if="isEdit" label="请求编号">
<el-form-item v-if="isEdit" label="任务单号">
<el-input v-model="createForm.requestNo" disabled style="width:150px" /> <el-input v-model="createForm.requestNo" disabled style="width:150px" />
</el-form-item> </el-form-item>
<el-form-item label=" " style="margin-top:-2px" v-if="isEdit"> <el-form-item label=" " style="margin-top:-2px" v-if="isEdit">
@ -262,6 +260,10 @@ import {
} from '@/api/supplierPerformance/performanceEvaluateRequestBuild.js' } from '@/api/supplierPerformance/performanceEvaluateRequestBuild.js'
import Chooselist from '@/views/modules/common/Chooselist_eam' import Chooselist from '@/views/modules/common/Chooselist_eam'
import {getTemplateIndicators} from "../../../api/supplierPerformance/performanceIndicatorTemplate"; import {getTemplateIndicators} from "../../../api/supplierPerformance/performanceIndicatorTemplate";
import {
PERF_TASK_STATUS_OPTIONS,
PERF_TASK_STATUS_DEFAULT
} from './supplierPerformanceStatusOptions.js'
export default { export default {
components: { components: {
@ -276,6 +278,7 @@ export default {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
totalPage: 0, totalPage: 0,
taskStatusOptions: PERF_TASK_STATUS_OPTIONS,
searchData: { searchData: {
site: this.$store.state.user.site, site: this.$store.state.user.site,
username: this.$store.state.user.name, username: this.$store.state.user.name,
@ -367,7 +370,7 @@ export default {
calcHeight() { this.$nextTick(()=> { this.height = window.innerHeight - 40 }) }, calcHeight() { this.$nextTick(()=> { this.height = window.innerHeight - 40 }) },
getList() { getList() {
this.loading = true this.loading = true
if (this.searchData.statusList.length === 0) this.searchData.statusList = ['未开始','进行中','已完成','已审核','待审批','审批通过','审批拒绝']
if (this.searchData.statusList.length === 0) this.searchData.statusList = [...PERF_TASK_STATUS_DEFAULT]
const params = { ...this.searchData, statusList: this.searchData.statusList, page: this.pageIndex, limit: this.pageSize,selectType: 2 } const params = { ...this.searchData, statusList: this.searchData.statusList, page: this.pageIndex, limit: this.pageSize,selectType: 2 }
searchEvaluateRequestList(params).then(({data}) => { searchEvaluateRequestList(params).then(({data}) => {
if (data && (data.code === 0 || data.code === '0')) { if (data && (data.code === 0 || data.code === '0')) {
@ -452,10 +455,10 @@ export default {
} }
const hasScored = indicators.some(i => Number(i.score) > 0) const hasScored = indicators.some(i => Number(i.score) > 0)
if (hasScored) { if (hasScored) {
this.$message.error('该请求存在已评分指标 ,禁止删除')
this.$message.error('该考核任务存在已评分指标,禁止删除')
return return
} }
this.$confirm('确认删除该请求: ' + row.requestNo + ' ?', '提示', { type: 'warning' }).then(() => {
this.$confirm('确认删除该考核任务: ' + row.requestNo + ' ?', '提示', { type: 'warning' }).then(() => {
deleteEvaluateRequest({ id: row.id, site }).then(({data: delData}) => { deleteEvaluateRequest({ id: row.id, site }).then(({data: delData}) => {
if (delData && (delData.code === 0 || delData.code === '0')) { this.$message.success('删除成功'); this.getList() } if (delData && (delData.code === 0 || delData.code === '0')) { this.$message.success('删除成功'); this.getList() }
else { this.$message.error((delData && delData.msg) || '删除失败') } else { this.$message.error((delData && delData.msg) || '删除失败') }

25
src/views/modules/supplierPerformance/performanceEvaluateRequestApprove.vue

@ -2,7 +2,7 @@
<div class="customer-css"> <div class="customer-css">
<!-- 查询条件 --> <!-- 查询条件 -->
<el-form :inline="true" label-position="top" class="pi-search-form"> <el-form :inline="true" label-position="top" class="pi-search-form">
<el-form-item label="请求编号">
<el-form-item label="任务单号">
<el-input v-model="searchData.requestNo" style="width:140px" @keyup.enter.native="getList" /> <el-input v-model="searchData.requestNo" style="width:140px" @keyup.enter.native="getList" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -35,9 +35,11 @@
</el-form-item> </el-form-item>
<el-form-item label="状态"> <el-form-item label="状态">
<el-select v-model="searchData.statusList" multiple collapse-tags clearable style="width:150px" placeholder="All"> <el-select v-model="searchData.statusList" multiple collapse-tags clearable style="width:150px" placeholder="All">
<el-option label="待审批" value="待审批" />
<el-option label="审批通过" value="审批通过" />
<el-option label="审批拒绝" value="审批拒绝" />
<el-option
v-for="item in reviewStatusOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=" "> <el-form-item label=" ">
@ -53,7 +55,7 @@
<a v-if="canApprove(scope.row)" class="customer-a" @click.stop="openApproveDialog(scope.row)">Approve</a> <a v-if="canApprove(scope.row)" class="customer-a" @click.stop="openApproveDialog(scope.row)">Approve</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="requestNo" label="请求编号" min-width="120" header-align="center" align="left" />
<el-table-column prop="requestNo" label="任务单号" min-width="120" header-align="center" align="left" />
<el-table-column prop="supplierNo" label="供应商编号" width="120" header-align="center" align="left" /> <el-table-column prop="supplierNo" label="供应商编号" width="120" header-align="center" align="left" />
<el-table-column prop="supplierName" label="供应商名称" min-width="200" header-align="center" align="left" show-overflow-tooltip /> <el-table-column prop="supplierName" label="供应商名称" min-width="200" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="wantedCompleteDate" label="预计完成时间" width="160" header-align="center" align="center" /> <el-table-column prop="wantedCompleteDate" label="预计完成时间" width="160" header-align="center" align="center" />
@ -75,7 +77,7 @@
<el-row :gutter="10" style="margin-top:12px"> <el-row :gutter="10" style="margin-top:12px">
<el-col :span="16"> <el-col :span="16">
<div class="sub-panel-header"> <div class="sub-panel-header">
<span style="font-size:16px">请求</span>
<span style="font-size:16px">考核单</span>
</div> </div>
<el-table :data="indicatorList" size="mini" border :height="indicatorTableHeight" highlight-current-row <el-table :data="indicatorList" size="mini" border :height="indicatorTableHeight" highlight-current-row
ref="indicatorTable" v-loading="indicatorLoading" @row-click="selectIndicatorRow"> ref="indicatorTable" v-loading="indicatorLoading" @row-click="selectIndicatorRow">
@ -107,7 +109,7 @@
<!-- Approve 弹窗 --> <!-- Approve 弹窗 -->
<el-dialog title="批准" :visible.sync="approveDialogVisible" width="374px" top="8vh" :close-on-click-modal="false" v-drag> <el-dialog title="批准" :visible.sync="approveDialogVisible" width="374px" top="8vh" :close-on-click-modal="false" v-drag>
<el-form :inline="true" label-position="top" class="create-top-form"> <el-form :inline="true" label-position="top" class="create-top-form">
<el-form-item label="请求编号">
<el-form-item label="任务单号">
<el-input v-model="approveForm.requestNo" disabled style="width:120px" /> <el-input v-model="approveForm.requestNo" disabled style="width:120px" />
</el-form-item> </el-form-item>
<el-form-item label="创建者"> <el-form-item label="创建者">
@ -139,6 +141,10 @@
<script> <script>
import { searchEvaluateRequestList, getEvaluateRequestIndicators, updateEvaluateRequest, getEvaluateRequestIndicatorProgress } from '@/api/supplierPerformance/myPerformanceEvaluateRequest.js' import { searchEvaluateRequestList, getEvaluateRequestIndicators, updateEvaluateRequest, getEvaluateRequestIndicatorProgress } from '@/api/supplierPerformance/myPerformanceEvaluateRequest.js'
import {updateEvaluateRequestReviewOrApprove} from "../../../api/supplierPerformance/myPerformanceEvaluateRequest"; import {updateEvaluateRequestReviewOrApprove} from "../../../api/supplierPerformance/myPerformanceEvaluateRequest";
import {
PERF_REVIEW_STATUS_OPTIONS,
PERF_REVIEW_STATUS_DEFAULT
} from './supplierPerformanceStatusOptions.js'
import Chooselist from '@/views/modules/common/Chooselist_eam' import Chooselist from '@/views/modules/common/Chooselist_eam'
export default { export default {
components: { components: {
@ -153,8 +159,9 @@ export default {
pageIndex:1, pageIndex:1,
pageSize:20, pageSize:20,
totalPage:0, totalPage:0,
reviewStatusOptions: PERF_REVIEW_STATUS_OPTIONS,
searchData:{ site:this.$store.state.user.site, username:this.$store.state.user.name, requestNo:'', searchData:{ site:this.$store.state.user.site, username:this.$store.state.user.name, requestNo:'',
supplierNo:'', supplierName:'', createBy:'', wantedCompleteDateStart:'', wantedCompleteDateEnd:'', createDateStart:'', createDateEnd:'', statusList:['待审批'] },
supplierNo:'', supplierName:'', createBy:'', wantedCompleteDateStart:'', wantedCompleteDateEnd:'', createDateStart:'', createDateEnd:'', statusList:['已审核'] },
currentRequest:{}, currentRequest:{},
indicatorList:[], indicatorList:[],
indicatorLoading:false, indicatorLoading:false,
@ -200,7 +207,7 @@ export default {
calcHeight(){ this.$nextTick(()=> { this.height = window.innerHeight - 40 }) }, calcHeight(){ this.$nextTick(()=> { this.height = window.innerHeight - 40 }) },
getList(){ getList(){
this.loading=true this.loading=true
if (this.searchData.statusList.length === 0) this.searchData.statusList = ['待审批','审批通过','审批拒绝']
if (this.searchData.statusList.length === 0) this.searchData.statusList = [...PERF_REVIEW_STATUS_DEFAULT]
const params={ ...this.searchData, statusList: this.searchData.statusList, page:this.pageIndex, limit:this.pageSize, selectType:1 } const params={ ...this.searchData, statusList: this.searchData.statusList, page:this.pageIndex, limit:this.pageSize, selectType:1 }
searchEvaluateRequestList(params).then(({data})=> { searchEvaluateRequestList(params).then(({data})=> {
if(data && (data.code===0||data.code==='0')){ if(data && (data.code===0||data.code==='0')){

74
src/views/modules/supplierPerformance/performanceEvaluateRequestReview.vue

@ -2,7 +2,7 @@
<div class="customer-css"> <div class="customer-css">
<!-- 查询条件 --> <!-- 查询条件 -->
<el-form :inline="true" label-position="top" class="pi-search-form"> <el-form :inline="true" label-position="top" class="pi-search-form">
<el-form-item label="请求编号">
<el-form-item label="任务单号">
<el-input v-model="searchData.requestNo" style="width:140px" @keyup.enter.native="getList" /> <el-input v-model="searchData.requestNo" style="width:140px" @keyup.enter.native="getList" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -35,11 +35,11 @@
</el-form-item> </el-form-item>
<el-form-item label="状态"> <el-form-item label="状态">
<el-select v-model="searchData.statusList" multiple collapse-tags clearable style="width:150px" placeholder="All"> <el-select v-model="searchData.statusList" multiple collapse-tags clearable style="width:150px" placeholder="All">
<el-option label="已完成" value="已完成" />
<el-option label="已审核" value="已审核" />
<el-option label="待审批" value="待审批" />
<el-option label="审批通过" value="审批通过" />
<el-option label="审批拒绝" value="审批拒绝" />
<el-option
v-for="item in reviewStatusOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=" "> <el-form-item label=" ">
@ -50,16 +50,12 @@
<!-- 列表 --> <!-- 列表 -->
<el-table :data="dataList" :height="requestTableHeight - 100" border highlight-current-row v-loading="loading" <el-table :data="dataList" :height="requestTableHeight - 100" border highlight-current-row v-loading="loading"
@row-click="rowClick" @current-change="handleMainCurrentChange" ref="mainTable" style="width:100%;margin-bottom:8px"> @row-click="rowClick" @current-change="handleMainCurrentChange" ref="mainTable" style="width:100%;margin-bottom:8px">
<el-table-column fixed="right" label="操作" width="175" header-align="center" align="center">
<el-table-column fixed="right" label="操作" width="80" header-align="center" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="canOperate(scope.row)">
<a class="customer-a" @click.stop="openReviewDialog(scope.row)">审核</a>
<span style="color:#dcdfe6;margin:0 4px">|</span>
<a class="customer-a" @click.stop="submitForApprove(scope.row)">提交上级审批</a>
</template>
<a v-if="canOperate(scope.row)" class="customer-a" @click.stop="openReviewDialog(scope.row)">审核</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="requestNo" label="请求编号" min-width="120" header-align="center" align="left" />
<el-table-column prop="requestNo" label="任务单号" min-width="120" header-align="center" align="left" />
<el-table-column prop="supplierNo" label="供应商编码" width="120" header-align="center" align="left" /> <el-table-column prop="supplierNo" label="供应商编码" width="120" header-align="center" align="left" />
<el-table-column prop="supplierName" label="供应商名称" min-width="200" header-align="center" align="left" show-overflow-tooltip /> <el-table-column prop="supplierName" label="供应商名称" min-width="200" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="wantedCompleteDate" label="预计完成时间" width="160" header-align="center" align="center" /> <el-table-column prop="wantedCompleteDate" label="预计完成时间" width="160" header-align="center" align="center" />
@ -81,7 +77,7 @@
<el-row :gutter="10" style="margin-top:12px"> <el-row :gutter="10" style="margin-top:12px">
<el-col :span="16"> <el-col :span="16">
<div class="sub-panel-header"> <div class="sub-panel-header">
<span style="font-size:16px">请求</span>
<span style="font-size:16px">考核单</span>
</div> </div>
<el-table :data="indicatorList" size="mini" border :height="indicatorTableHeight" highlight-current-row <el-table :data="indicatorList" size="mini" border :height="indicatorTableHeight" highlight-current-row
ref="indicatorTable" v-loading="indicatorLoading" @row-click="selectIndicatorRow"> ref="indicatorTable" v-loading="indicatorLoading" @row-click="selectIndicatorRow">
@ -115,7 +111,7 @@
v-drag> v-drag>
<el-form :inline="true" label-position="top" class="create-top-form"> <el-form :inline="true" label-position="top" class="create-top-form">
<el-form-item <el-form-item
label="请求编号"><el-input v-model="reviewForm.requestNo" disabled style="width: 120px"/></el-form-item>
label="任务单号"><el-input v-model="reviewForm.requestNo" disabled style="width: 120px"/></el-form-item>
<el-form-item label="审核人"><el-input v-model="reviewForm.createBy" disabled style="width: 120px"/></el-form-item> <el-form-item label="审核人"><el-input v-model="reviewForm.createBy" disabled style="width: 120px"/></el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" size="mini" class="create-top-form"> <el-form :inline="true" label-position="top" size="mini" class="create-top-form">
@ -130,6 +126,7 @@
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" :loading="reviewSaving" @click="saveReview">审核</el-button> <el-button type="primary" :loading="reviewSaving" @click="saveReview">审核</el-button>
<el-button type="danger" :loading="voidSaving" @click="voidReview">作废</el-button>
<el-button @click="reviewDialogVisible=false">取消</el-button> <el-button @click="reviewDialogVisible=false">取消</el-button>
</span> </span>
</el-dialog> </el-dialog>
@ -139,7 +136,11 @@
<script> <script>
import { searchEvaluateRequestList, getEvaluateRequestIndicators, getEvaluateRequestIndicatorProgress } from '@/api/supplierPerformance/myPerformanceEvaluateRequest.js' import { searchEvaluateRequestList, getEvaluateRequestIndicators, getEvaluateRequestIndicatorProgress } from '@/api/supplierPerformance/myPerformanceEvaluateRequest.js'
import {updateEvaluateRequestReviewOrApprove} from "../../../api/supplierPerformance/myPerformanceEvaluateRequest";
import { updateEvaluateRequestReviewOrApprove } from '@/api/supplierPerformance/myPerformanceEvaluateRequest'
import {
PERF_REVIEW_STATUS_OPTIONS,
PERF_REVIEW_STATUS_DEFAULT
} from './supplierPerformanceStatusOptions.js'
import Chooselist from '@/views/modules/common/Chooselist_eam' import Chooselist from '@/views/modules/common/Chooselist_eam'
export default { export default {
components: { components: {
@ -154,6 +155,7 @@ export default {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
totalPage: 0, totalPage: 0,
reviewStatusOptions: PERF_REVIEW_STATUS_OPTIONS,
searchData: { searchData: {
site: this.$store.state.user.site, site: this.$store.state.user.site,
username: this.$store.state.user.name, username: this.$store.state.user.name,
@ -172,6 +174,7 @@ export default {
indicatorLoading: false, indicatorLoading: false,
reviewDialogVisible: false, reviewDialogVisible: false,
reviewSaving: false, reviewSaving: false,
voidSaving: false,
reviewForm: { id:'', requestNo:'', supplierNo:'', supplierName:'', createBy:'', comments:'' }, reviewForm: { id:'', requestNo:'', supplierNo:'', supplierName:'', createBy:'', comments:'' },
viewIndicatorCode: '', viewIndicatorCode: '',
progressList: [], progressList: [],
@ -186,7 +189,6 @@ export default {
mounted() { this.calcHeight(); window.addEventListener('resize', this.calcHeight); this.getList() }, mounted() { this.calcHeight(); window.addEventListener('resize', this.calcHeight); this.getList() },
beforeDestroy() { window.removeEventListener('resize', this.calcHeight) }, beforeDestroy() { window.removeEventListener('resize', this.calcHeight) },
methods: { methods: {
//
getBaseList (val) { getBaseList (val) {
this.tagNo = val this.tagNo = val
this.$nextTick(() => { this.$nextTick(() => {
@ -199,14 +201,10 @@ export default {
this.$refs.baseList.init(val, strVal, conSql) this.$refs.baseList.init(val, strVal, conSql)
}) })
}, },
/* 列表方法的回调 */
getBaseData (val) { getBaseData (val) {
console.log('Chooselist返回的数据:', val, 'tagNo:', this.tagNo)
if (this.tagNo === 501) { if (this.tagNo === 501) {
// - SQL: SupplierID, SupplierName
const supplierNoVal = val.SupplierID || val.supplierID || val.supplierId || '' const supplierNoVal = val.SupplierID || val.supplierID || val.supplierId || ''
this.searchData.supplierNo = supplierNoVal this.searchData.supplierNo = supplierNoVal
console.log('供应商编码赋值:', supplierNoVal)
} }
}, },
calcHeight() { this.$nextTick(()=> { this.height = window.innerHeight - 40 }) }, calcHeight() { this.$nextTick(()=> { this.height = window.innerHeight - 40 }) },
@ -223,7 +221,7 @@ export default {
}, },
getList() { getList() {
this.loading = true this.loading = true
if (this.searchData.statusList.length === 0) this.searchData.statusList = ['已完成','已审核','待审批','审批通过','审批拒绝']
if (this.searchData.statusList.length === 0) this.searchData.statusList = [...PERF_REVIEW_STATUS_DEFAULT]
const params = { ...this.searchData, statusList: this.searchData.statusList , page: this.pageIndex, limit: this.pageSize, selectType: 1 } const params = { ...this.searchData, statusList: this.searchData.statusList , page: this.pageIndex, limit: this.pageSize, selectType: 1 }
searchEvaluateRequestList(params).then(({data})=> { searchEvaluateRequestList(params).then(({data})=> {
if (data && (data.code===0||data.code==='0')) { if (data && (data.code===0||data.code==='0')) {
@ -349,23 +347,36 @@ export default {
this.reviewDialogVisible = true this.reviewDialogVisible = true
}, },
saveReview(){ saveReview(){
if (this.reviewSaving) return
if (this.reviewSaving || this.voidSaving) return
const c = (this.reviewForm.comments||'').trim() const c = (this.reviewForm.comments||'').trim()
if(!c){ this.$message.warning('Comments不能为空'); return } if(!c){ this.$message.warning('Comments不能为空'); return }
this.reviewSaving = true this.reviewSaving = true
const payload = { site:this.$store.state.user.site, id:this.reviewForm.id, requestNo:this.reviewForm.requestNo, const payload = { site:this.$store.state.user.site, id:this.reviewForm.id, requestNo:this.reviewForm.requestNo,
comments:c, updateBy:this.$store.state.user.name, updateType: 1 } comments:c, updateBy:this.$store.state.user.name, updateType: 1 }
updateEvaluateRequestReviewOrApprove(payload).then(({data})=> { updateEvaluateRequestReviewOrApprove(payload).then(({data})=> {
if (data && (data.code===0||data.code==='0')) { this.$message.success('Saved'); this.reviewDialogVisible=false; this.getList() } else { this.$message.error((data&&data.msg)||'Save failed') }
}).catch(e=> this.$message.error('Save failed: '+ e.message)).finally(()=> { this.reviewSaving=false })
if (data && (data.code===0||data.code==='0')) { this.$message.success('审核成功'); this.reviewDialogVisible=false; this.getList() } else { this.$message.error((data&&data.msg)||'审核失败') }
}).catch(e=> this.$message.error('审核失败: '+ e.message)).finally(()=> { this.reviewSaving=false })
}, },
submitForApprove(row){
this.$confirm('确认提交到审批?','提示',{type:'warning'}).then(()=> {
const payload = { site:this.$store.state.user.site, id:row.id, requestNo:row.requestNo, status:'待审批',
updateBy:this.$store.state.user.name, updateType: 2 }
voidReview() {
if (this.reviewSaving || this.voidSaving) return
this.$confirm('是否作废该绩效审核单?', '提示', { type: 'warning' }).then(() => {
this.voidSaving = true
const payload = {
site: this.$store.state.user.site,
id: this.reviewForm.id,
requestNo: this.reviewForm.requestNo,
updateBy: this.$store.state.user.name,
updateType: 4
}
updateEvaluateRequestReviewOrApprove(payload).then(({ data }) => { updateEvaluateRequestReviewOrApprove(payload).then(({ data }) => {
if (data && (data.code===0||data.code==='0')) { this.$message.success('已提交'); this.getList() } else { this.$message.error((data&&data.msg)||'提交失败') }
}).catch(e=> this.$message.error('提交失败: '+ e.message))
if (data && (data.code === 0 || data.code === '0')) {
this.$message.success('作废成功')
this.reviewDialogVisible = false
this.getList()
} else {
this.$message.error((data && data.msg) || '作废失败')
}
}).catch(e => this.$message.error('作废失败: ' + e.message)).finally(() => { this.voidSaving = false })
}).catch(() => {}) }).catch(() => {})
} }
} }
@ -376,3 +387,4 @@ export default {
.pi-search-form { margin-top:0; } .pi-search-form { margin-top:0; }
.sub-panel-header { display:flex; align-items:center; justify-content:space-between; font-weight:600; padding:4px 6px; background:#f5f7fa; border:1px solid #ebeef5; border-bottom:none; } .sub-panel-header { display:flex; align-items:center; justify-content:space-between; font-weight:600; padding:4px 6px; background:#f5f7fa; border:1px solid #ebeef5; border-bottom:none; }
</style> </style>

19
src/views/modules/supplierPerformance/supplierPerformanceStatusOptions.js

@ -0,0 +1,19 @@
/** 绩效管理 - 考核任务状态下拉(静态,不含上级审批流程状态) */
export const PERF_TASK_STATUS_OPTIONS = [
{ label: '未开始', value: '未开始' },
{ label: '进行中', value: '进行中' },
{ label: '已完成', value: '已完成' },
{ label: '已审核', value: '已审核' },
{ label: '已作废', value: '已作废' }
]
export const PERF_TASK_STATUS_DEFAULT = ['未开始', '进行中', '已完成', '已审核', '已作废']
/** 绩效审核页状态下拉 */
export const PERF_REVIEW_STATUS_OPTIONS = [
{ label: '已完成', value: '已完成' },
{ label: '已审核', value: '已审核' },
{ label: '已作废', value: '已作废' }
]
export const PERF_REVIEW_STATUS_DEFAULT = ['已完成', '已审核', '已作废']
Loading…
Cancel
Save