From 222a623191c8dbd934a45c5da32c6c6883c8587f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 06 九月 2024 00:18:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/contract/contract-result/index.vue | 39 ++++++++++++++++-----------------------
1 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/src/views/system/contract/contract-result/index.vue b/src/views/system/contract/contract-result/index.vue
index 20c0f51..e97a6e6 100644
--- a/src/views/system/contract/contract-result/index.vue
+++ b/src/views/system/contract/contract-result/index.vue
@@ -6,7 +6,6 @@
size="small"
:inline="true"
v-show="showSearch"
- label-width="100px"
>
<el-form-item label="鑰冩牳瀵硅薄" prop="unitId">
<el-select
@@ -50,11 +49,11 @@
<el-button
type="primary"
icon="el-icon-search"
- size="mini"
+ size="small"
@click="handleQuery"
>鎼滅储</el-button
>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+ <el-button icon="el-icon-refresh" size="small" @click="resetQuery"
>閲嶇疆</el-button
>
</el-form-item>
@@ -71,7 +70,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 +81,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,14 +92,14 @@
@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">
+ <el-row v-if="checkResultList && checkResultList.length > 0" v-loading="loading">
<el-col
:xl="8"
:lg="8"
@@ -135,7 +134,7 @@
style="float: right"
@click="handlePublish(item)"
v-show="item.publish != 1"
- v-hasPermi="['result:contract:publish']"
+ v-hasPermi="['contract:result:publish']"
>纭鍙戝竷</el-button
>
<el-button
@@ -144,13 +143,14 @@
style="float: right"
disabled
v-show="item.publish == 1"
- v-hasPermi="['result:contract:publish']"
+ v-hasPermi="['contract:result:publish']"
>宸插彂甯�</el-button
>
</div>
</el-card>
</el-col>
</el-row>
+ <el-empty v-else description="鏆傛棤鏁版嵁"></el-empty>
<pagination
v-show="total > 0"
@@ -172,8 +172,8 @@
placeholder="璇蜂负璇ュ崟浣嶆墦鍒�"
/>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitManualScore">纭� 瀹�</el-button>
<el-button @click="cancelManualScore">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitManualScore">纭� 瀹�</el-button>
</div>
</el-dialog>
@@ -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>
@@ -231,8 +224,8 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
</div>
</el-dialog>
</div>
@@ -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