|
@@ -267,7 +267,7 @@
|
|
267
|
<div class="indicator-name">{{ item.indicatorName }}</div>
|
267
|
<div class="indicator-name">{{ item.indicatorName }}</div>
|
|
268
|
<div class="indicator-value">{{ item.score }}/次</div>
|
268
|
<div class="indicator-value">{{ item.score }}/次</div>
|
|
269
|
<div class="indicator-count">{{ item.occurCount }}次</div>
|
269
|
<div class="indicator-count">{{ item.occurCount }}次</div>
|
|
270
|
- <div class="indicator-qcDeptType">{{ item.qcDeptType }}</div>
|
|
|
|
|
|
270
|
+
|
|
271
|
<div class="indicator-total">{{ item.scoreResult }}</div>
|
271
|
<div class="indicator-total">{{ item.scoreResult }}</div>
|
|
272
|
<div class="indicator-actions">
|
272
|
<div class="indicator-actions">
|
|
273
|
<el-button type="primary" link icon="Edit" @click="editIndicator(groupIndex, itemIndex)"></el-button>
|
273
|
<el-button type="primary" link icon="Edit" @click="editIndicator(groupIndex, itemIndex)"></el-button>
|
|
@@ -483,14 +483,14 @@
|
|
483
|
<el-dialog :title="indicatorDialog.title" v-model="indicatorDialog.visible" width="60%">
|
483
|
<el-dialog :title="indicatorDialog.title" v-model="indicatorDialog.visible" width="60%">
|
|
484
|
<el-form label-width="150px" class="indicator-form" :model="indicatorDialog.form" :rules="indicatorDialog.rules">
|
484
|
<el-form label-width="150px" class="indicator-form" :model="indicatorDialog.form" :rules="indicatorDialog.rules">
|
|
485
|
<el-form-item label="指标名称" prop="indicatorId" required>
|
485
|
<el-form-item label="指标名称" prop="indicatorId" required>
|
|
486
|
-
|
|
|
|
487
|
- <el-select v-model="indicatorDialog.form.indicatorId" placeholder="搜索指标名称" filterable remote reserve-keyword
|
|
|
|
488
|
- :remote-method="searchIndicators" :loading="indicatorDialog.loading" style="flex: 1;"
|
|
|
|
489
|
- @change="onIndicatorNameChange">
|
|
|
|
490
|
- <el-option v-for="item in indicatorDialog.indicatorOptions" :key="item.id" :label="item.name"
|
|
|
|
491
|
- :value="item.id" />
|
|
|
|
492
|
- </el-select>
|
|
|
|
493
|
-
|
|
|
|
|
|
486
|
+
|
|
|
|
487
|
+ <el-select v-model="indicatorDialog.form.indicatorId" placeholder="搜索指标名称" filterable remote reserve-keyword
|
|
|
|
488
|
+ :remote-method="searchIndicators" :loading="indicatorDialog.loading" style="flex: 1;"
|
|
|
|
489
|
+ @change="onIndicatorNameChange">
|
|
|
|
490
|
+ <el-option v-for="item in indicatorDialog.indicatorOptions" :key="item.id" :label="item.name"
|
|
|
|
491
|
+ :value="item.id" />
|
|
|
|
492
|
+ </el-select>
|
|
|
|
493
|
+
|
|
494
|
</el-form-item>
|
494
|
</el-form-item>
|
|
495
|
|
495
|
|
|
496
|
<el-form-item label="分值/单位">
|
496
|
<el-form-item label="分值/单位">
|
|
@@ -508,9 +508,11 @@
|
|
508
|
</div>
|
508
|
</div>
|
|
509
|
</el-form-item>
|
509
|
</el-form-item>
|
|
510
|
|
510
|
|
|
511
|
- <template v-for="(detail, index) in (indicatorDialog.form.personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList || [])" :key="index">
|
|
|
|
|
|
511
|
+ <template
|
|
|
|
512
|
+ v-for="(detail, index) in (indicatorDialog.form.personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList || [])"
|
|
|
|
513
|
+ :key="index">
|
|
512
|
<div style="display: flex; align-items: center; gap: 10px; margin-bottom: 10px;">
|
514
|
<div style="display: flex; align-items: center; gap: 10px; margin-bottom: 10px;">
|
|
513
|
- <h4 style="margin: 0;">明细{{ index + 1 }}</h4>
|
|
|
|
|
|
515
|
+ <h4 style="margin-left: 80px;">明细{{ index + 1 }}</h4>
|
|
514
|
<el-button type="danger" size="small" @click="removeRewardPunishmentDetail(index)">删除</el-button>
|
516
|
<el-button type="danger" size="small" @click="removeRewardPunishmentDetail(index)">删除</el-button>
|
|
515
|
</div>
|
517
|
</div>
|
|
516
|
<el-form-item label="检查部门">
|
518
|
<el-form-item label="检查部门">
|
|
@@ -526,7 +528,8 @@
|
|
526
|
</el-form-item>
|
528
|
</el-form-item>
|
|
527
|
<el-form-item v-if="indicatorDialog.form.score > 0" label="奖励">
|
529
|
<el-form-item v-if="indicatorDialog.form.score > 0" label="奖励">
|
|
528
|
<div style="display: flex; align-items: center; gap: 10px;">
|
530
|
<div style="display: flex; align-items: center; gap: 10px;">
|
|
529
|
- <el-input-number v-model="detail.amount" :min="0" :precision="2" style="width: 200px;" @change="updateTotal" />
|
|
|
|
|
|
531
|
+ <el-input-number v-model="detail.amount" :min="0" :precision="2" style="width: 200px;"
|
|
|
|
532
|
+ @change="updateTotal" />
|
|
530
|
<span>元</span>
|
533
|
<span>元</span>
|
|
531
|
</div>
|
534
|
</div>
|
|
532
|
</el-form-item>
|
535
|
</el-form-item>
|
|
@@ -535,7 +538,8 @@
|
|
535
|
</el-form-item>
|
538
|
</el-form-item>
|
|
536
|
<el-form-item v-if="indicatorDialog.form.score < 0" label="扣罚">
|
539
|
<el-form-item v-if="indicatorDialog.form.score < 0" label="扣罚">
|
|
537
|
<div style="display: flex; align-items: center; gap: 10px;">
|
540
|
<div style="display: flex; align-items: center; gap: 10px;">
|
|
538
|
- <el-input-number v-model="detail.amount" :min="0" :precision="2" style="width: 200px;" @change="updateTotal" />
|
|
|
|
|
|
541
|
+ <el-input-number v-model="detail.amount" :min="0" :precision="2" style="width: 200px;"
|
|
|
|
542
|
+ @change="updateTotal" />
|
|
539
|
<span>元</span>
|
543
|
<span>元</span>
|
|
540
|
</div>
|
544
|
</div>
|
|
541
|
</el-form-item>
|
545
|
</el-form-item>
|
|
@@ -1025,11 +1029,14 @@ const submitForm = async () => {
|
|
1025
|
if (submitData.assessmentMonth) {
|
1029
|
if (submitData.assessmentMonth) {
|
|
1026
|
submitData.assessmentMonth = submitData.assessmentMonth.replace('-', '')
|
1030
|
submitData.assessmentMonth = submitData.assessmentMonth.replace('-', '')
|
|
1027
|
}
|
1031
|
}
|
|
1028
|
-
|
|
|
|
|
|
1032
|
+
|
|
1029
|
if (submitData.indicatorGroups && submitData.indicatorGroups.length > 0) {
|
1033
|
if (submitData.indicatorGroups && submitData.indicatorGroups.length > 0) {
|
|
1030
|
submitData.personnelMonthlyAssessmentIndicatorDetailList = submitData.indicatorGroups.flatMap(group =>
|
1034
|
submitData.personnelMonthlyAssessmentIndicatorDetailList = submitData.indicatorGroups.flatMap(group =>
|
|
1031
|
group.items.map(item => ({
|
1035
|
group.items.map(item => ({
|
|
1032
|
- ...item
|
|
|
|
|
|
1036
|
+ ...item,
|
|
|
|
1037
|
+ indicatorName: item.name || item.indicatorName,
|
|
|
|
1038
|
+ indicatorId: item.id || item.indicatorId,
|
|
|
|
1039
|
+ indicatorCode: item.code || item.indicatorCode,
|
|
1033
|
}))
|
1040
|
}))
|
|
1034
|
)
|
1041
|
)
|
|
1035
|
delete submitData.indicatorGroups
|
1042
|
delete submitData.indicatorGroups
|
|
@@ -1173,7 +1180,7 @@ const onIndicatorNameChange = (value) => {
|
|
1173
|
console.log(value, indicatorDialog.indicatorOptions, "indicatorDialog.indicatorOptions")
|
1180
|
console.log(value, indicatorDialog.indicatorOptions, "indicatorDialog.indicatorOptions")
|
|
1174
|
const selected = indicatorDialog.indicatorOptions.find(item => item.id === value)
|
1181
|
const selected = indicatorDialog.indicatorOptions.find(item => item.id === value)
|
|
1175
|
if (selected) {
|
1182
|
if (selected) {
|
|
1176
|
- indicatorDialog.form = { ...selected, occurCount: 1, personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList: [] }
|
|
|
|
|
|
1183
|
+ indicatorDialog.form = { ...selected, indicatorId: selected.id, indicatorName: selected.name, occurCount: 1, personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList: [] }
|
|
1177
|
updateTotal()
|
1184
|
updateTotal()
|
|
1178
|
}
|
1185
|
}
|
|
1179
|
}
|
1186
|
}
|