From 1a0b6c69df8bafa8d9c612a5ea04a34be712001c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 24 四月 2024 16:01:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/calculate/report/index.vue | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/views/system/calculate/report/index.vue b/src/views/system/calculate/report/index.vue
index 3dab356..3665b14 100644
--- a/src/views/system/calculate/report/index.vue
+++ b/src/views/system/calculate/report/index.vue
@@ -171,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",
@@ -262,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;
@@ -299,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)
@@ -317,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 + "鎴愬姛");
@@ -351,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 = "淇敼鑰冩牳缁撴灉";
@@ -363,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();
@@ -382,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