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/score/default/index.vue | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/src/views/system/score/default/index.vue b/src/views/system/score/default/index.vue index 538e637..bb3d5be 100644 --- a/src/views/system/score/default/index.vue +++ b/src/views/system/score/default/index.vue @@ -49,7 +49,7 @@ <el-table-column label="鑰冩牳瑙勫垯" align="center" prop="ruleName" width="120" :show-overflow-tooltip="true" /> <el-table-column label="鑰冩牳鎸囨爣" align="center" prop="num" width="120" /> <el-table-column label="鑰冩牳鎵e垎" align="center" prop="score" width="120" /> - <el-table-column label="鍒涘缓浜�" align="center" prop="createUser" /> + <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" /> <el-table-column label="瀹℃牳鐘舵��" align="center" prop="auditingStatus"> <template slot-scope="scope"> <el-tag @@ -60,6 +60,7 @@ <el-table-column label="瀹℃牳浜�" align="center" prop="auditingUser" /> <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"> <template slot-scope="scope"> + <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">璇︽儏</el-button> <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleAuditing(scope.row)" v-hasPermi="['default:audit']" v-if="scope.row.auditingStatus === '寰呭鏍�'">瀹℃牳</el-button> <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" @@ -146,6 +147,31 @@ <el-button @click="cancel">鍙� 娑�</el-button> </div> </el-dialog> + + <!-- 璇︽儏 --> + <el-dialog title="杩愮淮鑰冩牳璇︽儏" :visible.sync="openView" width="800px" append-to-body> + <el-form ref="form" :model="view" label-width="150px" size="mini"> + <el-row> + <el-col> + <el-form-item label="鑰冩牳鍗曚綅锛�">{{ view.unitName }}</el-form-item> + <el-form-item label="鑰冩牳鍚堝悓锛�">{{ view.contractName }} </el-form-item> + <el-form-item label="鑰冩牳瑙勫垯锛�">{{ view.ruleName }} </el-form-item> + <el-form-item label="鑰冩牳鎸囨爣锛�">{{ view.num }} </el-form-item> + <el-form-item label="鑰冩牳鎵e垎锛�">{{ view.score }} </el-form-item> + <el-form-item label="鍒涘缓浜猴細">{{ view.createUser }} </el-form-item> + <el-form-item label="鍒涘缓鏃堕棿锛�">{{ view.createTime }} </el-form-item> + <el-form-item label="瀹℃牳鐘舵�侊細">{{ view.auditingStatus }} </el-form-item> + <el-form-item label="瀹℃牳澶囨敞锛�">{{ view.remark }} </el-form-item> + <el-form-item label="瀹℃牳浜猴細">{{ view.auditingUser }} </el-form-item> + <el-form-item label="瀹℃牳鏃堕棿锛�">{{ view.auditingTime }} </el-form-item> + </el-col> + </el-row> + </el-form> + <div slot="footer" class="dialog-footer"> + <el-button @click="openView = false">鍏� 闂�</el-button> + </div> + </el-dialog> + </div> </template> @@ -158,6 +184,8 @@ name: "Auditing", data() { return { + view: {}, + openView: false, needNum: false, options: [], auditingOpen: false, @@ -241,6 +269,11 @@ this.getUnitSelect(); }, methods: { + /** 璇︾粏鎸夐挳鎿嶄綔 */ + handleView(row) { + this.openView = true; + this.view = row; + }, /** * 閫夋嫨瑙勫垯 */ -- Gitblit v1.8.0