From f18ff6df94830a0147f372f031fa94ab5402ead8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 18 三月 2024 15:57:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/check-result/index.vue | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/src/views/system/check-result/index.vue b/src/views/system/check-result/index.vue
index 80dee17..593bafc 100644
--- a/src/views/system/check-result/index.vue
+++ b/src/views/system/check-result/index.vue
@@ -70,7 +70,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['system:checkResult:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
@@ -80,7 +79,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['system:checkResult:export']"
>瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -90,9 +88,9 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="鑰冩牳瀵硅薄" align="center" prop="checkUnitName" />
<el-table-column label="鑰冩牳" align="center" prop="examineName" />
- <el-table-column label="鑰冩牳鑼冨洿" align="center" prop="examineRange" />
- <el-table-column label="鑰冩牳棰戠巼" align="center" prop="frequency" />
- <el-table-column label="鑰冩牳鍒嗘暟" align="center" prop="checkScore" />
+ <el-table-column label="鑰冩牳鑼冨洿":formatter="examineRangeFormatter" align="center" prop="examineRange" />
+ <el-table-column label="鑰冩牳棰戠巼" :formatter="frequencyFormatter" align="center" prop="frequency" />
+ <el-table-column label="鑰冩牳鍒嗘暟" falign="center" prop="checkScore" />
<el-table-column label="鑰冩牳鏃堕棿" align="center" prop="checkTime" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -101,21 +99,18 @@
type="text"
icon="el-icon-view"
@click="handleDetail(scope.row)"
- v-hasPermi="['system:checkResult:detail']"
>璇︽儏</el-button>
- <el-button
- type="text"
- size="mini"
- icon="el-icon-edit"
- @click="handleSetManualScore(scope.row)"
- v-hasPermi="['system:checkResult:edit']"
- >浜哄伐鎵撳垎</el-button>
+<!-- <el-button-->
+<!-- type="text"-->
+<!-- size="mini"-->
+<!-- icon="el-icon-edit"-->
+<!-- @click="handleSetManualScore(scope.row)"-->
+<!-- >浜哄伐鎵撳垎</el-button>-->
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['system:checkResult:remove']"
>鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -130,7 +125,7 @@
/>
<el-dialog :title="manualScoreTitle" :visible.sync="manualScoreOpen" width="500px" append-to-body>
- <el-input v-model="manualScoreForm.manualScore" type="number" placeholder="璇蜂负璇ュ崟浣嶆墦鍒�"></el-input>
+ <el-input v-model="manualScoreForm.manualScore" type="number" placeholder="璇蜂负璇ュ崟浣嶆墦鍒�"/>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitManualScore">纭� 瀹�</el-button>
<el-button @click="cancelManualScore">鍙� 娑�</el-button>
@@ -173,7 +168,7 @@
<el-descriptions-item>
<template slot="label">
<i class="el-icon-medal"></i>
- 缁煎悎鍒嗘暟
+ 绯荤粺鍒嗘暟
</template>
<el-tag type="danger" size="small">{{detail.checkScore}}</el-tag>
</el-descriptions-item>
@@ -187,7 +182,7 @@
<el-descriptions-item>
<template slot="label">
<i class="el-icon-medal"></i>
- 绯荤粺鍒嗘暟
+ 缁煎悎鍒嗘暟
</template>
<el-tag type="danger" size="small">{{detail.systemScore}}</el-tag>
</el-descriptions-item>
@@ -257,6 +252,22 @@
this.getList();
},
methods: {
+ frequencyFormatter(row) {
+ if (row.frequency === "1") {
+ return "鏈堝害鑰冩牳"
+ }
+ if (row.frequency === "2") {
+ return "瀛ｅ害鑰冩牳"
+ }
+ },
+ examineRangeFormatter(row) {
+ if (row.examineRange === "1") {
+ return "鍒嗗眬鑰冩牳"
+ }
+ if (row.examineRange === "2") {
+ return "甯傚眬鑰冩牳"
+ }
+ },
/** 鏌ヨ鑰冩牳缁撴灉鍒楄〃 */
getList() {
this.loading = true;
@@ -304,11 +315,12 @@
manualScore(this.manualScoreForm).then(res => {
this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
this.cancelManualScore();
+ this.getList();
})
},
handleSetManualScore(row) {
this.manualScoreForm.id = row.id;
- this.manualScoreForm.manualScore = row.manualScore;
+ this.manualScoreForm.manualScore = parseInt(row.manualScore);
this.manualScoreTitle = row.checkUnitName + '浜哄伐鎵撳垎'
this.manualScoreOpen = true;
},
--
Gitblit v1.8.0