From 549240a042edad52f9642721e7b1f51b90ddaf34 Mon Sep 17 00:00:00 2001 From: ZhangXianQiang <1135831638@qq.com> Date: 星期二, 16 四月 2024 15:18:38 +0800 Subject: [PATCH] Merge branch 'master' into dev-threejs --- src/views/system/calculate/order/index.vue | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/views/system/calculate/order/index.vue b/src/views/system/calculate/order/index.vue index c944342..6685b32 100644 --- a/src/views/system/calculate/order/index.vue +++ b/src/views/system/calculate/order/index.vue @@ -75,13 +75,16 @@ <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 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">{{ "瀛e害鑰冩牳" }}</span></div> <div class="text item">鑰冩牳鍒嗘暟<span class="time">{{ item.checkScore }}</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> + <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish == 1" v-hasPermi="['result:contract:publish']">宸插彂甯�</el-button> </div> </el-card> @@ -347,7 +350,7 @@ handleDetail(row) { this.detail = row; this.detail.carOnlineRate = '97%'; - this.detailTitle = row.checkUnitName + '鑰冩牳缁撴灉'; + this.detailTitle = '鑰冩牳缁撴灉'; this.detailOpen = true; }, @@ -430,7 +433,8 @@ this.download('system/checkResult/export', { ...this.queryParams }, `checkResult_${new Date().getTime()}.xlsx`) - } + }, + } }; </script> -- Gitblit v1.8.0