From d196157ca3ca298c70a0bfe62fb2ea67e0200ccf Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 12:14:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/contract/contract-result/index.vue | 23 ++++++++---------------
src/api/platform/contract-result.js | 4 ++--
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/src/api/platform/contract-result.js b/src/api/platform/contract-result.js
index 046393a..70f61b7 100644
--- a/src/api/platform/contract-result.js
+++ b/src/api/platform/contract-result.js
@@ -10,9 +10,9 @@
}
// 鏌ヨ鑰冩牳缁撴灉璇︽儏
-export function resultRecord(id) {
+export function resultRecord(id, contractId) {
return request({
- url: '/contract/result/record/list?resultId=' + id,
+ url: '/contract/result/record/list?resultId=' + id + '&contractId=' + contractId,
method: 'get'
})
}
diff --git a/src/views/system/contract/contract-result/index.vue b/src/views/system/contract/contract-result/index.vue
index ad78377..5e585e6 100644
--- a/src/views/system/contract/contract-result/index.vue
+++ b/src/views/system/contract/contract-result/index.vue
@@ -71,7 +71,7 @@
<!-- v-hasPermi="['system:checkResult:add']"-->
<!-- >鏂板</el-button>-->
<!-- </el-col>-->
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button
type="danger"
plain
@@ -82,8 +82,8 @@
@click="handleDelete"
>鍒犻櫎</el-button
>
- </el-col>
- <el-col :span="1.5">
+ </el-col> -->
+ <!-- <el-col :span="1.5">
<el-button
type="warning"
plain
@@ -93,11 +93,11 @@
@click="handleExport"
>瀵煎嚭</el-button
>
- </el-col>
- <right-toolbar
+ </el-col> -->
+ <!-- <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
- ></right-toolbar>
+ ></right-toolbar> -->
</el-row>
<el-row v-loading="loading">
@@ -214,14 +214,7 @@
width="300"
>
</el-table-column>
- <el-table-column
- label="鎵ｅ噺鏂瑰紡"
- align="center"
- prop="deductCategory"
- width="180px"
- >
- </el-table-column>
- <el-table-column prop="num" label="閲忓��"> </el-table-column>
+ <el-table-column prop="num" label="娆℃暟"> </el-table-column>
<el-table-column prop="score" label="鎵ｅ垎"> </el-table-column>
</el-table>
</el-dialog>
@@ -365,7 +358,7 @@
this.manualScoreOpen = true;
},
handleDetail(row) {
- resultRecord(row.id).then((res) => {
+ resultRecord(row.id, row.contractId).then((res) => {
this.tableData = res.rows;
});
this.detail = row;
--
Gitblit v1.8.0