From 44d9a94ceafae734add7d09628fd2ac132f0ee83 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期一, 29 四月 2024 09:03:54 +0800
Subject: [PATCH] Merge branch 'master' into dev-threejs
---
src/views/system/calculate/order/index.vue | 77 +++++---------------------------------
1 files changed, 10 insertions(+), 67 deletions(-)
diff --git a/src/views/system/calculate/order/index.vue b/src/views/system/calculate/order/index.vue
index 6cba56b..f694391 100644
--- a/src/views/system/calculate/order/index.vue
+++ b/src/views/system/calculate/order/index.vue
@@ -10,18 +10,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鑰冩牳棰戠巼" prop="frequency">
- <el-select v-model="queryParams.frequency" clearable @clear="handleQuery" placeholder="鑰冩牳棰戠巼">
- <el-option
- label="鏈堝害鑰冩牳"
- value="1">
- </el-option>
- <el-option
- label="瀛ｅ害鑰冩牳"
- value="2">
- </el-option>
- </el-select>
- </el-form-item>
<el-form-item label="鑰冩牳鏃堕棿">
<el-date-picker
v-model="daterangeCheckTime"
@@ -74,15 +62,13 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-card class="box-card" v-for="(item) in checkResultList">
+ <el-card class="box-card" v-for="item in checkResultList" :key="item.id">
<div slot="header" class="clearfix">
- <span>{{ checkUnitName }}</span>
+ <span>{{ item.contractName }}</span>
<el-button style="float: right; padding: 3px 6px" 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">{{ examineName }}</span></div>
- <div class="text item">鑰冩牳棰戠巼<span class="time">{{ "瀛ｅ害鑰冩牳" }}</span></div>
- <div class="text item">鑰冩牳鍒嗘暟<span class="time">{{ item.checkScore }}</span></div>
+ <div class="text item">鑰冩牳<span class="time">{{ item.unitName }}</span></div>
+ <div class="text item">鑰冩牳鍒嗘暟<span class="time">{{ item.score }}</span></div>
<div class="text item">鑰冩牳鏃堕棿
<span class="time">{{ item.checkTime }}</span>
<el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish != 1" v-hasPermi="['result:contract:publish']">纭鍙戝竷</el-button>
@@ -90,37 +76,6 @@
</div>
</el-card>
- <!-- <el-table v-loading="loading" :data="checkResultList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="鑰冩牳瀵硅薄" align="center" prop="checkUnitName" />
- <el-table-column label="鑰冩牳" align="center" prop="examineName" />
- <el-table-column label="鑰冩牳鑼冨洿":formatter="examineRangeFormatter" align="center" prop="examineRange" />
- <el-table-column label="鑰冩牳棰戠巼" :formatter="frequencyFormatter" align="center" prop="frequency" />
- <el-table-column label="鑰冩牳鍒嗘暟" falign="center" prop="checkScore" />
- <el-table-column label="鑰冩牳鏃堕棿" align="center" prop="checkTime" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-view"
- @click="handleDetail(scope.row)"
- >璇︽儏</el-button>
- <el-button
- type="text"
- size="mini"
- icon="el-icon-edit"
- @click="handleSetManualScore(scope.row)"
- >浜哄伐鎵撳垎</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- >鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
<pagination
v-show="total>0"
@@ -128,7 +83,7 @@
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
- /> -->
+ />
<el-dialog :title="manualScoreTitle" :visible.sync="manualScoreOpen" width="500px" append-to-body>
<el-input v-model="manualScoreForm.manualScore" type="number" placeholder="璇蜂负璇ュ崟浣嶆墦鍒�"/>
@@ -140,36 +95,26 @@
<el-dialog :title="detailTitle" :visible.sync="detailOpen" width="700px" append-to-body>
<el-descriptions class="margin-top" :column="3" border>
-<!-- <template slot="extra">-->
-<!-- <el-button type="primary" size="small">鎿嶄綔</el-button>-->
-<!-- </template>-->
<el-descriptions-item>
<template slot="label">
<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>
- {{examineName}}
- </el-descriptions-item>
- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-timer"></i>
- 鑰冩牳棰戠巼
- </template>
- <el-tag size="small">{{detail.frequency === 1 ? '鏈堝害鑰冩牳' : '瀛ｅ害鑰冩牳'}}</el-tag>
+ {{detail.contractName}}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-medal"></i>
缁煎悎鍒嗘暟
</template>
- <el-tag type="danger" size="small">{{detail.checkScore}}</el-tag>
+ <el-tag type="danger" size="small">{{detail.score}}</el-tag>
</el-descriptions-item>
</el-descriptions>
<el-table
@@ -217,8 +162,6 @@
detail:{
},
- checkUnitName: '鎴愰兘x杩愮淮',
- examineName: '鎴愰兘x杩愮淮鑰冩牳',
tableData: [{
name: '瑙嗛骞冲潎鍦ㄧ嚎鐜�',
content: '97%',
@@ -461,6 +404,6 @@
clear: both
}
.box-card {
- width: 480px;
+ width: 350px;
}
</style>
--
Gitblit v1.8.0