From d18dd7951c236a56e4a100406fde5b7ceb7d3e07 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 11 四月 2024 15:46:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/calculate/report/index.vue | 71 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 13 deletions(-)
diff --git a/src/views/system/calculate/report/index.vue b/src/views/system/calculate/report/index.vue
index 25100df..f586a94 100644
--- a/src/views/system/calculate/report/index.vue
+++ b/src/views/system/calculate/report/index.vue
@@ -64,12 +64,10 @@
<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>
+ <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>
@@ -85,7 +83,7 @@
@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>
<el-descriptions class="margin-top" :column="3" border>
<!-- <template slot="extra">-->
<!-- <el-button type="primary" size="small">鎿嶄綔</el-button>-->
@@ -109,7 +107,7 @@
:data="tableData"
show-summary
:summary-method="getSummaries"
- style="width: 100%">
+ style="width: 100%;text-align:center">
<el-table-column
prop="time"
label="鏍哥畻鏃ユ湡"
@@ -118,14 +116,45 @@
<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="ruleName"
+ label="閫傜敤瑙勫垯"
doNotSum>
</el-table-column>
<el-table-column
+ prop="score"
+ label="鎵ｅ垎绯绘暟"
+ >
+ <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"
- label="鎵ｅ噺閲戦(鍏�)">
+ width="180">
+ <template slot-scope="scope">
+ <el-input type="number"
+ :precision="2" :step="0.1"
+ :min="0" :max="1000000"
+ v-model="scope.row.money"
+ 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>
<!-- 娣诲姞鎴栦慨鏀硅�冩牳缁撴灉瀵硅瘽妗� -->
@@ -156,11 +185,17 @@
tableData: [{
time: '2024-03-03',
score: '94',
- money: '10',
+ value: '1%',
+ ruleName: '<95',
+ money: '',
+ description: '姣忓皯1鍒嗘墸褰撴湀鎬绘湇鍔¤垂鐨�1%銆備緥濡傦細褰撴湀鑰冩牳寰楀垎91.5鍒嗭紝鎵ｉ櫎褰撴湀鏈嶅姟璐�3.5%鐨勯噾棰�',
}, {
time: '2024-04-03',
score: '95',
- money: '0',
+ value: '0',
+ ruleName: '鈮�95',
+ money: '',
+ description: '涓嶆墸娆�',
}, ],
manualScoreOpen: false,
manualScoreForm: {},
@@ -234,7 +269,7 @@
},
// 鍙栨秷鎸夐挳
cancel() {
- this.open = false;
+ this.detailOpen = false;
this.reset();
},
// 琛ㄥ崟閲嶇疆
@@ -270,9 +305,10 @@
})
},
handleDetail(row) {
+ console.log("row", row)
this.detail = row;
this.detail.carOnlineRate = '97%';
- this.detailTitle = row.checkUnitName + '鑰冩牳缁撴灉';
+ this.detailTitle = this.checkUnitName + '鑰冩牳缁撴灉';
this.detailOpen = true;
},
@@ -322,6 +358,7 @@
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
+ this.detailOpen = false;
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
@@ -356,6 +393,7 @@
...this.queryParams
}, `checkResult_${new Date().getTime()}.xlsx`)
},
+ /** 鍚堣琛� */
getSummaries(param) {
const { columns, data } = param;
const sums = [];
@@ -378,13 +416,20 @@
if (column.property === 'score') {
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>
--
Gitblit v1.8.0