From 84cab370f2421d6823021e93ecb0e1e47dce4410 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 02 四月 2024 11:52:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/system/work-order/index.vue | 62 +++++++++++++------------------ 1 files changed, 26 insertions(+), 36 deletions(-) diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue index a0f0a1f..80290b5 100644 --- a/src/views/system/work-order/index.vue +++ b/src/views/system/work-order/index.vue @@ -30,17 +30,23 @@ </el-form> <el-row> - <el-col :span="8" v-for="item in workOrderList" :key="item" style="margin: 10px;width: 20%;"> + <el-col :span="8" v-for="item in workOrderList" :key="item" style="width: 390px;margin-left: 40px;margin-top:20px;"> <el-card :body-style="{ padding: '0px' }"> - <img src="https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357" class="image"> - <div style="padding: 14px;"> - <span>{{ item.unitName }}</span> - <span class="time">{{ item.ywPeopleName }}</span> - <div class="bottom clearfix"> - <span style="font-size: 13px;">澶勭悊鏃堕棿</span> - <time class="time">{{ item.ywHandleTime }}</time> - </div> - <div class="bottom clearfix"> + <el-image :preview-src-list="['https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357']" fit="cover" src="https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357" class="image"/> + <div style="padding-right: 10px;padding-top: 10px;float: right;"> + <el-row> + <el-col class="time" :span="24">杩愮淮浜哄憳锛歿{ item.ywPeopleName }}</el-col> + </el-row> + <el-row style="margin-top: 5px"> + <el-col class="time" :span="24">杩愮淮鍗曚綅锛歿{ item.unitName }}</el-col> + </el-row> + <el-row style="margin-top: 5px"> + <el-col :span="24" class="time">宸ュ崟缂栧彿锛歿{ item.workOrderNo }}</el-col> + </el-row> + <el-row style="margin-top: 5px"> + <el-col :span="24" class="time">澶勭悊鏃堕棿锛歿{ item.ywHandleTime }}</el-col> + </el-row> + <el-row> <el-button size="mini" type="text" @@ -57,12 +63,12 @@ <!-- type="text"--> <!-- @click="handleYwResult(scope.row)"--> <!-- >杩愮淮缁撴灉</el-button>--> - <el-button - size="mini" - type="text" - @click="handleCheckResult(item)" - v-hasPermi="['work:order:result']" - >妫�娴嬬粨鏋�</el-button> +<!-- <el-button--> +<!-- size="mini"--> +<!-- type="text"--> +<!-- @click="handleCheckResult(item)"--> +<!-- v-hasPermi="['work:order:result']"--> +<!-- >妫�娴嬬粨鏋�</el-button>--> <el-button size="mini" type="text" @@ -73,7 +79,7 @@ type="text" @click="handleReport(item)" >浜嬪悗鎶ュ</el-button> - </div> + </el-row> </div> </el-card> </el-col> @@ -743,27 +749,11 @@ .time { font-size: 13px; color: #999; - margin-left: 10px; } - -.bottom { - margin-top: 13px; - line-height: 12px; -} - .image { - width: 100%; - display: block; -} - -.clearfix:before, -.clearfix:after { - display: table; - content: ""; -} - -.clearfix:after { - clear: both + width: 125px; + height: 125px; + padding: 10px; } </style> -- Gitblit v1.8.0