From 938d93722b6ebaf8953e1e17307ef7739affc3d0 Mon Sep 17 00:00:00 2001 From: wzp <2040239371@qq.com> Date: 星期日, 04 五月 2025 16:21:11 +0800 Subject: [PATCH] feat: 回调地址可配置、回调接口文档和知情同意 --- ruoyi-ui/src/views/system/order/detail.vue | 66 +++++++++++++++----------------- 1 files changed, 31 insertions(+), 35 deletions(-) diff --git a/ruoyi-ui/src/views/system/order/detail.vue b/ruoyi-ui/src/views/system/order/detail.vue index 22aab2e..faf6639 100644 --- a/ruoyi-ui/src/views/system/order/detail.vue +++ b/ruoyi-ui/src/views/system/order/detail.vue @@ -98,9 +98,9 @@ :size="isMobile ? 'mini' : 'medium'" class="responsive-table"> <el-table-column prop="id" label="鏀舵娴佹按" min-width="120" /> - <el-table-column - prop="paidMoneyTime" - label="鏀舵鏃堕棿" + <el-table-column + prop="paidMoneyTime" + label="鏀舵鏃堕棿" min-width="140" :formatter="(row, column, cellValue) => formatDateTime(cellValue)" /> @@ -112,43 +112,28 @@ </el-col> </el-row> - <!-- 杩愯鎯呭喌 --> - <el-row> - <el-col :span="24"> - <el-card class="inner-card"> - <div slot="header"> - <b>杩愯鎯呭喌</b> - <span style="float: right">{{dispatchInfo.carLicense}}</span> - </div> - <el-table - :data="operationInfo" - border - style="width: 100%" - :size="isMobile ? 'mini' : 'medium'" - class="responsive-table"> - <el-table-column prop="status" label="鍑鸿溅鐘舵��" min-width="100" /> - <el-table-column prop="operator" label="鎿嶄綔浜�" min-width="100" /> - <el-table-column prop="operateTime" label="鎿嶄綔鏃堕棿" min-width="140" /> - <el-table-column prop="location" label="鍧愭爣浣嶇疆" min-width="200" show-overflow-tooltip /> - </el-table> - </el-card> - </el-col> - </el-row> <!-- 璁㈠崟鎯呭喌 --> <el-row :gutter="20"> <!-- 璋冨害淇℃伅 --> <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12"> <el-card class="inner-card"> - <div slot="header"><b>璋冨害淇℃伅</b></div> + <div slot="header"><b>璇︽儏</b></div> <el-descriptions :column="isMobile ? 1 : 2" border> - <el-descriptions-item label="鏈嶅姟璇勪环">{{ dispatchInfo.dispatchTime }}</el-descriptions-item> - <el-descriptions-item label="鍙戠エ鐘舵��">{{ dispatchInfo.dispatchStatus }}</el-descriptions-item> - <el-descriptions-item label="鏀粯鐘舵��">{{ dispatchInfo.driver }}</el-descriptions-item> - <el-descriptions-item label="杞︾墝">{{ dispatchInfo.carLicense }}</el-descriptions-item> - <el-descriptions-item label="鍖荤敓">{{ dispatchInfo.doctor }}</el-descriptions-item> - <!-- <el-descriptions-item label="鑱屼綅">{{ dispatchInfo.doctorPosition }}</el-descriptions-item> --> - <el-descriptions-item label="鎶ゅ+">{{ dispatchInfo.nurse }}</el-descriptions-item> + <el-descriptions-item label="鏈嶅姟璇勪环">{{ otherInfo.serviceOrdVisit }}</el-descriptions-item> + <el-descriptions-item label="鍙戠エ鐘舵��">{{ otherInfo.invoiceStatus }}</el-descriptions-item> + <el-descriptions-item label="鐭ユ儏鍚屾剰涔�"> + <div v-if="otherInfo.imageUrls && otherInfo.imageUrls.length > 0" class="image-container"> + <el-image + v-for="image in otherInfo.imageUrls" + :key="image" + :src="image" + :preview-src-list="otherInfo.imageUrls" + class="preview-image" + /> + </div> + <span v-else>鏆傛棤鍥剧墖</span> + </el-descriptions-item> </el-descriptions> </el-card> </el-col> @@ -173,7 +158,7 @@ medicalInfo: {}, dispatchInfo: {}, paymentInfo: [], - operationInfo: [], + otherInfo: [], screenWidth: document.documentElement.clientWidth // 灞忓箷瀹藉害 } }, @@ -204,7 +189,7 @@ this.medicalInfo = data.medicalInfo || {} this.dispatchInfo = data.dispatchInfo || {} this.paymentInfo = data.paymentInfo || [] - this.operationInfo = data.operationInfo || [] + this.otherInfo = data.otherInfo || [] console.log(this.orderInfo) @@ -252,4 +237,15 @@ .el-descriptions-item { padding: 8px !important; } .el-descriptions-item__label { width: 100px !important; } } +.image-container { + display: flex; + flex-wrap: wrap; + gap: 10px; +} +.preview-image { + width: 100px; + height: 100px; + object-fit: cover; + cursor: pointer; +} </style> -- Gitblit v1.9.1