From c6ac7827159e71f6906a42ceb29a4f83a2f239f6 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期五, 21 二月 2025 14:12:38 +0800 Subject: [PATCH] ll --- admin/src/views/combo/components/OrderDetail.vue | 140 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 106 insertions(+), 34 deletions(-) diff --git a/admin/src/views/combo/components/OrderDetail.vue b/admin/src/views/combo/components/OrderDetail.vue index 8768d44..075ca64 100644 --- a/admin/src/views/combo/components/OrderDetail.vue +++ b/admin/src/views/combo/components/OrderDetail.vue @@ -1,45 +1,95 @@ <template> - <GlobalWindow :title="title" :visible.sync="visible" :confirm-working="isWorking"> - <div class="title">鏀粯鏄庣粏</div> - <el-table :data="list" stripe border> - <el-table-column prop="id" label="璁㈠崟缂栧彿" show-overflow-tooltip align="center"></el-table-column> - <el-table-column prop="onlineorderId" label="浜ゆ槗鍗曞彿" show-overflow-tooltip align="center"></el-table-column> - <el-table-column prop="refundType" label="浜ゆ槗绫诲瀷" width="100px" align="center"> + <GlobalWindow :title="title" width="1000px" :visible.sync="visible" :confirm-working="isWorking"> + <div class="title">璁㈠崟淇℃伅</div> + <div class="info_warp"> + <div class="item"> + <div class="la">璁㈠崟缂栧彿锛�</div> + <div class="val">{{ info.id }}</div> + </div> + <div class="item"> + <div class="la">璁㈠崟鐘舵�侊細</div> + <div class="val">{{ info.status == 1 ? '宸叉敮浠�' : '鏈敮浠�' }}</div> + </div> + <div class="item"> + <div class="la">涓嬪崟鏃堕棿锛�</div> + <div class="val">{{ info.createDate }}</div> + </div> + <div class="item"> + <div class="la">鏀粯鏃堕棿锛�</div> + <div class="val">{{ info.payDate }}</div> + </div> + <div class="item"> + <div class="la">璁㈠崟閲戦锛�</div> + <div class="val">{{ info.money }}</div> + </div> + <div class="item"> + <div class="la">鏀粯鏂瑰紡锛�</div> + <div class="val">{{ info.payWay == 0 ? '寰俊' : '鏀粯瀹�' }}</div> + </div> + <div class="item"> + <div class="la">鏀粯鍗曞彿锛�</div> + <div class="val">{{ info.onlineOrderid }}</div> + </div> + <div class="item"> + <div class="la">瀹屾垚鏃堕棿锛�</div> + <div class="val">{{ info.closeDate }}</div> + </div> + <div class="item"> + <div class="la">澶囨敞锛�</div> + <div class="val">{{ info.closeInfo }}</div> + </div> + </div> + <div class="title">涔板淇℃伅</div> + <div class="info_warp"> + <div class="item"> + <div class="la">鍛㈢О锛�</div> + <div class="val">{{ form.member.name }}</div> + </div> + <div class="item"> + <div class="la">鎵嬫満鍙凤細</div> + <div class="val">{{ form.member.phone }}</div> + </div> + <div class="item"> + <div class="la">openId锛�</div> + <div class="val">{{ form.member.openid }}</div> + </div> + </div> + <div class="title">鍟嗗搧淇℃伅</div> + <el-table :data="[goods]" stripe border> + <el-table-column prop="name" min-width="100px" label="濂楅鍗�" show-overflow-tooltip align="center"></el-table-column> + <el-table-column prop="refundType" label="鏈夋晥鏈�" min-width="160px" align="center"> <template slot-scope="{row}"> - {{ typeToStr(row.refundType) }} + {{ row.startDate }} 鑷� {{ row.endDate }} </template> </el-table-column> - <el-table-column prop="money" label="浜ゆ槗閲戦(鍏�)" width="100px" align="center"></el-table-column> - <el-table-column prop="payWay" label="娓犻亾" width="100px" align="center"> + <el-table-column label="鏁伴噺" width="80px" align="center"> <template slot-scope="{row}"> - {{ row.payWay==0? '寰俊' : '鏀粯瀹�' }} + <span>1</span> </template> </el-table-column> - <el-table-column prop="payDate" label="浜ゆ槗鏃堕棿" width="150px" align="center"></el-table-column> - + <el-table-column prop="price" label="浠锋牸" width="100px" align="center"></el-table-column> + <el-table-column prop="payWay" label="鐘舵��" width="100px" align="center"> + <template slot-scope="{row}"> + {{ info.status == 1 ? '宸叉敮浠�' : '鏈敮浠�' }} + </template> + </el-table-column> </el-table> - <div class="title">楠戣璁板綍</div> - <el-table - :data="memberRidesList" - stripe - border - > - <el-table-column prop="openid" label="鐢ㄦ埛" width="250px" show-overflow-tooltip align="center"></el-table-column> - <el-table-column prop="bikeCode" label="杞﹁締缂栧彿" width="100px" align="center"></el-table-column> - <el-table-column prop="bikeType" label="杞︾被鍨�" width="200px" align="center"></el-table-column> - <el-table-column prop="rideTime" label="鍊熷嚭鏃堕暱(鍒�)" width="200px" align="center"></el-table-column> - <el-table-column prop="duration" label="璁¤垂鏃堕暱(鍒�)" width="200px" align="center"></el-table-column> - <el-table-column prop="bikeType" label="杞︾被鍨�" width="150px" align="center"></el-table-column> - <el-table-column prop="rentDate" label="鍊熷嚭鏃堕棿" width="150px" align="center"></el-table-column> - <el-table-column prop="backDate" label="杩樿溅鏃堕棿" width="150px" align="center"></el-table-column> - <el-table-column prop="closeStatus" fixed="right" label="缁撶畻鐘舵��" width="100px" align="center"> - <template slot-scope="{row}"> - {{ row.closeStatus == 0 ? '鏈粨绠�' : '宸茬粨绠�' }} + <div v-if="form.refundList && form.refundList.length > 0" class="title">閫�娆句俊鎭�</div> + <el-table v-if="form.refundList && form.refundList.length > 0" :data="form.refundList" stripe border> + <el-table-column prop="createDate" label="閫�娆炬椂闂�" min-width="180px" show-overflow-tooltip align="center"></el-table-column> + <el-table-column prop="money" label="閫�娆鹃噾棰�" min-width="100px" align="center"></el-table-column> + <el-table-column label="鐘舵��" min-width="100px" align="center"> + <template v-slot="{row}"> + <span v-if="row.status == 0">棰勯��娆�</span> + <span v-if="row.status == 1">閫�娆惧け璐�</span> + <span v-if="row.status == 2">閫�娆惧畬鎴�</span> </template> </el-table-column> + <el-table-column prop="reason" label="閫�娆惧娉�" min-width="100px" align="center"></el-table-column> + <el-table-column prop="creatorName" label="鎿嶄綔浜�" min-width="100px" align="center"></el-table-column> </el-table> <div slot="footer"> - <el-button @click="visible=false">杩斿洖</el-button> + <el-button @click="visible = false">杩斿洖</el-button> </div> </GlobalWindow> </template> @@ -52,12 +102,14 @@ name: 'OperaSitesWindow', extends: BaseOpera, components: { GlobalWindow }, - data () { + data() { return { // 琛ㄥ崟鏁版嵁 form: { - goodsorderId: '' + member: {} }, + info: {}, + goods: {}, list: [], memberRidesList: [], // 0缁撶畻閫�娆� 1寮哄埗缁撶畻閫�娆� 2缁撶畻鍚庨��娆� [99: 铏氭嫙type 鏀粯鎶奸噾] @@ -78,7 +130,11 @@ this.title = title this.visible = true // 鏂板缓 + console.log('target', target) + this.form = target + this.info = target.goodsOrder + this.goods = target.discountMember this.$nextTick(() => { this.list = target.payOrderDTOList this.memberRidesList = target.memberRidesList @@ -86,7 +142,7 @@ }) }, typeToStr(type) { - let temp = this.type.find(item => item.id == type ) + let temp = this.type.find(item => item.id == type) return temp ? temp.label : '-' } }, @@ -94,7 +150,23 @@ } </script> -<style scoped> +<style scoped lang="scss"> +.info_warp { + display: flex; + flex-wrap: wrap; + font-size: 14px; + + .item { + display: flex; + width: 33.3%; + margin-bottom: 6px; + + .val { + color: #666666; + } + } +} + .title { font-size: 18px; font-weight: 600; -- Gitblit v1.9.3