From a48fa4a7469b87f830251161f812a19dc9729ee9 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期日, 28 四月 2024 14:18:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/calculate/report/index.vue | 278 +++++++++++++++++++------------------------------------
1 files changed, 98 insertions(+), 180 deletions(-)
diff --git a/src/views/system/calculate/report/index.vue b/src/views/system/calculate/report/index.vue
index 6dea7bd..df97728 100644
--- a/src/views/system/calculate/report/index.vue
+++ b/src/views/system/calculate/report/index.vue
@@ -1,54 +1,7 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
- <el-form-item label="鏍哥畻瀵硅薄" prop="checkUnitId">
- <el-input
- v-model="queryParams.checkUnitName"
- placeholder="璇疯緭鍏ユ牳绠楀璞�"
- clearable
- @clear="handleQuery"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鏍哥畻鏃堕棿">
- <el-date-picker
- v-model="daterangeCheckTime"
- style="width: 240px"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
-
- <el-row :gutter="10" class="mb8">
-<!-- <el-col :span="1.5">-->
-<!-- <el-button-->
-<!-- type="primary"-->
-<!-- plain-->
-<!-- icon="el-icon-plus"-->
-<!-- size="mini"-->
-<!-- @click="handleAdd"-->
-<!-- v-hasPermi="['system:checkResult:add']"-->
-<!-- >鏂板</el-button>-->
-<!-- </el-col>-->
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- >鍒犻櫎</el-button>
- </el-col>
+ <el-row style="margin-left: 10px" :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="warning"
@@ -56,25 +9,25 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- >瀵煎嚭</el-button>
+ >瀵煎嚭鎵�鏈夋暟鎹�</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-card class="box-card" v-for="(item) in checkResultList">
<div slot="header" class="clearfix">
- <span>{{ checkUnitName }}</span>
+ <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.checkTime }}</span>
+ <div class="text item">鍚堝悓<span class="time">{{ item.contractName }}</span></div>
+ <div class="text item">鏈�杩戞墸鍑忛噾棰�<span class="time">{{ item.latestDeductMoney }}</span></div>
+ <div class="text item">绱鎵ｅ噺閲戦<span class="time">{{ item.deductMoney }}</span></div>
+ <div class="text item">鏈�杩戞牳绠楁湀浠�
+ <span v-if="item.latestTime" class="time">{{ new Date(item.latestTime).getFullYear() }}骞磠{ new Date(item.latestTime).getMonth() }}鏈�</span>
+ <span v-else class="time">鏆傛棤</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>
+ <el-button size="small" round style="float: right;margin-bottom: 18px;" @click="handlePublish(item)" v-if="item.status === 'not_publish'" :disabled="!item.canPublish" v-hasPermi="['system:calculate:report:status']">纭鍙戝竷</el-button>
+ <el-button size="small" round style="float: right;margin-bottom: 18px;" @click="handlePublish(item)" v-if="item.status === 'published'" v-hasPermi="['system:calculate:report:status']">鍙栨秷鍙戝竷</el-button>
</el-card>
<pagination
@@ -86,6 +39,14 @@
/>
<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,58 +56,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%;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
- prop="score"
- label="鎵ｅ垎绯绘暟"
- width="180">
- <template slot-scope="scope">
- <el-tooltip class="item" effect="dark" :content="'鑰冩牳瑙勫垯锛�' + scope.row.description" placement="top">
- <span>{{ scope.row.value }}</span>
- </el-tooltip>
- </template>
- </el-table-column>
- <el-table-column
- label="鎵ｅ噺閲戦(鍏�)"
- prop="money"
- width="180">
- <template slot-scope="scope">
- <el-input type="number"
+ <el-table-column
+ label="鎵ｅ噺閲戦(鍏�)"
+ prop="deductMoney"
+ width="180">
+ <template slot-scope="scope">
+ <el-input
+ :disabled="!scope.row.latest"
+ type="number"
:precision="2" :step="0.1"
:min="0" :max="1000000"
- v-model="scope.row.money"
- placeholder="璇疯緭鍏ユ墸鍑忛噾棰�">
- </el-input>
- </template>
- </el-table-column>
+ 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 type="primary" @click="submitForm">淇� 瀛�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -164,31 +120,16 @@
</template>
<script>
-import { listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/check-result";
+import { getCalculateReports, getCalculateReportById, backfill, updatePublishStatus } 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',
- value: '0.01',
- money: '',
- description: '姣忓皯1鍒嗘墸褰撴湀鎬绘湇鍔¤垂鐨�1%銆備緥濡傦細褰撴湀鑰冩牳寰楀垎91.5鍒嗭紝鎵ｉ櫎褰撴湀鏈嶅姟璐�3.5%鐨勯噾棰�',
- }, {
- time: '2024-04-03',
- score: '95',
- value: '0',
- money: '',
- description: '姣忓皯1鍒嗘墸褰撴湀鎬绘湇鍔¤垂鐨�1%銆備緥濡傦細褰撴湀鑰冩牳寰楀垎91.5鍒嗭紝鎵ｉ櫎褰撴湀鏈嶅姟璐�3.5%鐨勯噾棰�',
- }, ],
+ detail:{},
manualScoreOpen: false,
manualScoreForm: {},
manualScoreTitle: '',
@@ -253,8 +194,8 @@
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;
});
@@ -290,28 +231,28 @@
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)
- this.detail = row;
- this.detail.carOnlineRate = '97%';
- this.detailTitle = this.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);
+ let text = row.status === 'published' ? '鍙栨秷鍙戝竷' : '鍙戝竷';
+ this.$modal.confirm('纭瑕併��' + text + "銆戙��" + row.contractName + "銆戙��" + new Date(row.latestTime).getMonth() + "鏈堛��" + '鐨勬牳绠楁姤鍛婂悧锛�').then(function() {
+ // return publishCheckResult(ids);
}).then(() => {
- this.getList();
- this.$modal.msgSuccess(text + "鎴愬姛");
+ updatePublishStatus(row.id).then(res => {
+ this.getList();
+ this.$modal.msgSuccess(text + "鎴愬姛");
+ })
}).catch(() => {});
},
@@ -326,58 +267,24 @@
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.detailOpen = false;
- 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.filter(item => item.latest)
+ }
+ if (data.recordList.length > 0) {
+ 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(() => {});
+ })
+ } else {
+ this.detailOpen = false;
+ }
+
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
@@ -385,6 +292,7 @@
...this.queryParams
}, `checkResult_${new Date().getTime()}.xlsx`)
},
+ /** 鍚堣琛� */
getSummaries(param) {
const { columns, data } = param;
const sums = [];
@@ -393,6 +301,7 @@
sums[index] = '鍚堣';
return;
}
+
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
@@ -403,19 +312,26 @@
return prev;
}
}, 0);
- sums[index] += ' 鍏�';
if (column.property === 'score') {
- sums[index] = '-'; // 鎴栬�呭叾浠栦綘鎯宠鏄剧ず鐨勫唴瀹�
+ sums[index] = '-';
}
- if (column.property === 'value') {
- sums[index] = '-'; // 鎴栬�呭叾浠栦綘鎯宠鏄剧ず鐨勫唴瀹�
+ if (column.property === 'deductMoney') {
+ sums[index] += ' 鍏�';
}
} else {
- sums[index] = 'N/A';
+ sums[index] = '-';
}
});
-
return sums;
+ },
+ toScorePage() {
+ // 浣跨敤Vue Router杩涜椤甸潰璺宠浆
+ this.$router.push('/contract/score/index');
+ },
+
+ // 鍒犻櫎鎸夐挳
+ handleDelete() {
+
}
}
};
@@ -441,6 +357,8 @@
clear: both
}
.box-card {
- width: 480px;
+ width: calc(33% - 20px);
+ min-width: 300px;
+ margin: 15px 10px;
}
</style>
--
Gitblit v1.8.0