From e9f8a9835fbcba98f9d18f1089990f884b20c957 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期五, 26 四月 2024 14:01:50 +0800
Subject: [PATCH] fix:修改核算报告合计问题
---
src/views/system/calculate/report/index.vue | 179 ++++++++++++++++++++++++++---------------------------------
1 files changed, 80 insertions(+), 99 deletions(-)
diff --git a/src/views/system/calculate/report/index.vue b/src/views/system/calculate/report/index.vue
index 25100df..c9cc9c3 100644
--- a/src/views/system/calculate/report/index.vue
+++ b/src/views/system/calculate/report/index.vue
@@ -63,15 +63,13 @@
<el-card class="box-card" v-for="(item) in checkResultList">
<div slot="header" class="clearfix">
- <span>{{ checkUnitName }}</span>
- <el-button style="float: right; padding: 3px 0" type="text" @click="handleDetail(item)">璇︽儏</el-button>
+ <span>{{ item.unitName }}</span>
+ <el-button style="float: right; padding: 3px 0" type="text" @click="handleDetail(item)">鏍哥畻</el-button>
</div>
- <div class="text item">鍚堝悓<span class="time">{{ checkUnitName }}</span></div>
- <div class="text item">鎬婚噾棰�<span class="time">{{ "1000鍏�" }}</span></div>
- <div class="text item">鎵ｅ噺閲戦<span class="time">{{ "10鍏�" }}</span></div>
- <div class="text item">鍓╀綑閲戦<span class="time">{{ "990鍏�" }}</span></div>
+ <div class="text item">鍚堝悓<span class="time">{{ item.contractName }}</span></div>
+ <div class="text item">鎵ｅ噺閲戦<span class="time">{{ item.deductMoney }}</span></div>
<div class="text item">鏈�鏂版牳绠楁椂闂�
- <span class="time">{{ item.checkTime }}</span>
+ <span class="time">{{ item.whichYear }}骞磠{ item.whichMonth }}鏈�</span>
</div>
<el-button size="small" round style="float: right;margin-bottom: 18px;" @click="handlePublish(item)" v-show="item.publish != 1" v-hasPermi="['result:contract:publish']">纭鍙戝竷</el-button>
<el-button size="small" round style="float: right;margin-bottom: 18px;" @click="handlePublish(item)" v-show="item.publish == 1" v-hasPermi="['result:contract:publish']">宸插彂甯�</el-button>
@@ -85,7 +83,15 @@
@pagination="getList"
/>
- <el-dialog :title="detailTitle" :visible.sync="detailOpen" width="700px" append-to-body>
+ <el-dialog :title="detailTitle" :visible.sync="detailOpen" width="760px" append-to-body>
+ <div style="display: flex; flex-direction: row; width: 100%;margin-bottom: 10px; justify-content: center; align-items: center">
+ <div style="line-height: 16px">搴旂敤瑙勫垯锛�</div>
+ <div v-for="ruleItem in detail.ruleList" style="display: flex; margin-right: 50px;">
+ <div style="line-height: 16px;margin-right: 10px;display: flex; align-items: center">{{ ruleItem.scoreCondition }}鍒�</div>
+ <div style="line-height: 16px;max-width: 300px;word-wrap:break-word;word-break:normal;color: #2273b9">{{ ruleItem.description }}</div>
+ </div>
+ </div>
+
<el-descriptions class="margin-top" :column="3" border>
<!-- <template slot="extra">-->
<!-- <el-button type="primary" size="small">鎿嶄綔</el-button>-->
@@ -95,37 +101,53 @@
<i class="el-icon-user"></i>
鏍哥畻瀵硅薄
</template>
- {{checkUnitName}}
+ {{detail.unitName}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-s-management"></i>
鍚堝悓鍚嶇О
</template>
- {{checkUnitName}}
+ {{detail.contractName}}
</el-descriptions-item>
</el-descriptions>
<el-table
- :data="tableData"
+ align="center"
+ :data="detail.recordList"
show-summary
:summary-method="getSummaries"
- style="width: 100%">
+ style="width: 100%;text-align:center">
<el-table-column
- prop="time"
+ prop="createTime"
label="鏍哥畻鏃ユ湡"
width="180">
</el-table-column>
<el-table-column
prop="score"
label="鑰冩牳鍒嗘暟"
- width="180"
- doNotSum>
+ >
+ <template slot-scope="scope">
+ <el-link @click="toScorePage(scope.row)">{{scope.row.score}}</el-link>
+ </template>
</el-table-column>
<el-table-column
+ label="鎵ｅ噺閲戦(鍏�)"
prop="money"
- label="鎵ｅ噺閲戦(鍏�)">
+ width="180">
+ <template slot-scope="scope">
+ <el-input type="number"
+ :precision="2" :step="0.1"
+ :min="0" :max="1000000"
+ v-model="scope.row.deductMoney"
+ placeholder="璇疯緭鍏ユ墸鍑忛噾棰�">
+ </el-input>
+ </template>
</el-table-column>
</el-table>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitForm">淇� 瀛�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
</el-dialog>
<!-- 娣诲姞鎴栦慨鏀硅�冩牳缁撴灉瀵硅瘽妗� -->
@@ -141,27 +163,16 @@
</template>
<script>
-import { listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/check-result";
+import { getCalculateReports, getCalculateReportById, backfill } from "@/api/platform/calculate-report";
export default {
name: "CheckResult",
data() {
return {
+ manualOpen: false,
detailTitle: '',
detailOpen: false,
- detail:{
-
- },
- checkUnitName:'鎴愰兘x杩愮淮',
- tableData: [{
- time: '2024-03-03',
- score: '94',
- money: '10',
- }, {
- time: '2024-04-03',
- score: '95',
- money: '0',
- }, ],
+ detail:{},
manualScoreOpen: false,
manualScoreForm: {},
manualScoreTitle: '',
@@ -226,15 +237,15 @@
this.queryParams["start"] = this.daterangeCheckTime[0];
this.queryParams["end"] = this.daterangeCheckTime[1];
}
- listCheckResult(this.queryParams).then(response => {
- this.checkResultList = response.rows;
+ getCalculateReports(this.queryParams).then(response => {
+ this.checkResultList = response.data;
this.total = response.total;
this.loading = false;
});
},
// 鍙栨秷鎸夐挳
cancel() {
- this.open = false;
+ this.detailOpen = false;
this.reset();
},
// 琛ㄥ崟閲嶇疆
@@ -263,24 +274,24 @@
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) {
- this.detail = row;
- this.detail.carOnlineRate = '97%';
- this.detailTitle = row.checkUnitName + '鑰冩牳缁撴灉';
- this.detailOpen = true;
-
+ getCalculateReportById(row.id).then(res => {
+ this.detail = res.data
+ this.detailTitle = row.unitName + '鑰冩牳缁撴灉'
+ this.detailOpen = true
+ })
},
handlePublish(row) {
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 + "鎴愬姛");
@@ -298,57 +309,19 @@
this.resetForm("queryForm");
this.handleQuery();
},
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
- this.multiple = !selection.length
- },
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞鑰冩牳缁撴灉";
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.reset();
- const id = row.id || this.ids
- getCheckResult(id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼鑰冩牳缁撴灉";
- });
- },
- /** 鎻愪氦鎸夐挳 */
+ /** 鍥炲～閲戦 */
submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.id != null) {
- updateCheckResult(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addCheckResult(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
+ let data = {
+ id: this.detail.id,
+ recordList: this.detail.recordList
+ }
+ backfill(data).then(res => {
+ if (res.code === 200) {
+ this.$message.success("鎿嶄綔鎴愬姛");
+ this.detailOpen = false;
+ this.getList();
}
- });
- },
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鑰冩牳缁撴灉缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delCheckResult(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ })
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
@@ -356,6 +329,7 @@
...this.queryParams
}, `checkResult_${new Date().getTime()}.xlsx`)
},
+ /** 鍚堣琛� */
getSummaries(param) {
const { columns, data } = param;
const sums = [];
@@ -374,17 +348,22 @@
return prev;
}
}, 0);
- sums[index] += ' 鍏�';
if (column.property === 'score') {
- sums[index] = '-'; // 鎴栬�呭叾浠栦綘鎯宠鏄剧ず鐨勫唴瀹�
+ sums[index] = '-';
+ }
+ if (column.property === 'value') {
+ sums[index] += '鍏�';
}
} else {
- sums[index] = 'N/A';
+ sums[index] = '-';
}
});
-
return sums;
- }
+ },
+ toScorePage() {
+ // 浣跨敤Vue Router杩涜椤甸潰璺宠浆
+ this.$router.push('/contract/score/index');
+ },
}
};
</script>
@@ -409,6 +388,8 @@
clear: both
}
.box-card {
- width: 480px;
+ width: calc(33% - 20px);
+ min-width: 300px;
+ margin: 15px 10px;
}
</style>
--
Gitblit v1.8.0