From 01d6b05750a30f2e17d85d917e9bac80b7c34e92 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期五, 26 四月 2024 09:31:34 +0800
Subject: [PATCH] Merge branch 'dev-threejs'
---
src/views/system/calculate/report/index.vue | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/views/system/calculate/report/index.vue b/src/views/system/calculate/report/index.vue
index f586a94..3665b14 100644
--- a/src/views/system/calculate/report/index.vue
+++ b/src/views/system/calculate/report/index.vue
@@ -146,6 +146,7 @@
:precision="2" :step="0.1"
:min="0" :max="1000000"
v-model="scope.row.money"
+ disabled
placeholder="璇疯緭鍏ユ墸鍑忛噾棰�">
</el-input>
</template>
@@ -170,7 +171,7 @@
</template>
<script>
-import { listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/check-result";
+import { getCalculateReports, getCalculateReportById, deleteCalculateReportByIds, addCalculateReport, editCalculateReport } from "@/api/platform/calculate-report";
export default {
name: "CheckResult",
@@ -187,14 +188,14 @@
score: '94',
value: '1%',
ruleName: '<95',
- money: '',
+ money: '10',
description: '姣忓皯1鍒嗘墸褰撴湀鎬绘湇鍔¤垂鐨�1%銆備緥濡傦細褰撴湀鑰冩牳寰楀垎91.5鍒嗭紝鎵ｉ櫎褰撴湀鏈嶅姟璐�3.5%鐨勯噾棰�',
}, {
time: '2024-04-03',
score: '95',
value: '0',
ruleName: '鈮�95',
- money: '',
+ money: '0',
description: '涓嶆墸娆�',
}, ],
manualScoreOpen: false,
@@ -261,7 +262,7 @@
this.queryParams["start"] = this.daterangeCheckTime[0];
this.queryParams["end"] = this.daterangeCheckTime[1];
}
- listCheckResult(this.queryParams).then(response => {
+ getCalculateReports(this.queryParams).then(response => {
this.checkResultList = response.rows;
this.total = response.total;
this.loading = false;
@@ -298,11 +299,11 @@
this.$modal.msgWarning("璇峰～鍐欏垎鏁�");
return
}
- manualScore(this.manualScoreForm).then(res => {
- this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
- this.cancelManualScore();
- this.getList();
- })
+ // manualScore(this.manualScoreForm).then(res => {
+ // this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ // this.cancelManualScore();
+ // this.getList();
+ // })
},
handleDetail(row) {
console.log("row", row)
@@ -316,7 +317,7 @@
let text = row.publish == 1 ? '鍙栨秷鍙戝竷' : '鍙戝竷';
const ids = row.id || this.ids;
this.$modal.confirm('鏄惁纭' + text + '鑰冩牳缁撴灉缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return publishCheckResult(ids);
+ // return publishCheckResult(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess(text + "鎴愬姛");
@@ -350,7 +351,7 @@
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
- getCheckResult(id).then(response => {
+ getCalculateReportById(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "淇敼鑰冩牳缁撴灉";
@@ -362,13 +363,13 @@
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
- updateCheckResult(this.form).then(response => {
+ editCalculateReport(this.form).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
});
} else {
- addCheckResult(this.form).then(response => {
+ addCalculateReport(this.form).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
@@ -381,7 +382,7 @@
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('鏄惁纭鍒犻櫎鑰冩牳缁撴灉缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delCheckResult(ids);
+ return deleteCalculateReportByIds(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
--
Gitblit v1.8.0