From 051abca66db233f5dbde3f69aa706422e1ac9fd9 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 16:41:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
admin/src/views/business/bikeRepair.vue | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/admin/src/views/business/bikeRepair.vue b/admin/src/views/business/bikeRepair.vue
index c49203c..143b16a 100644
--- a/admin/src/views/business/bikeRepair.vue
+++ b/admin/src/views/business/bikeRepair.vue
@@ -8,7 +8,7 @@
<el-form-item label="杞﹁締缂栧彿" prop="binkeId">
<el-input v-model="searchForm.binkeId" placeholder="璇疯緭鍏ヨ溅杈嗙紪鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鐘舵�� 0寰呭鐞� 1宸插鐞� 2鍏朵粬" prop="status">
+ <el-form-item label="鐘舵��" prop="status">
<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨">
<el-option
label="寰呭鐞�"
@@ -45,36 +45,38 @@
stripe
border
>
- <el-table-column prop="creator" label="鍒涘缓浜�" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="linkname" label="鑱旂郴浜�" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="binkeId" label="杞﹁締缂栫爜" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="editDate" label="杞︾被鍨�" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="param" label="闂绫诲瀷" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="openid" label="鍒涘缓浜�" min-width="180px" align="center"></el-table-column>
+ <el-table-column prop="linkname" label="鑱旂郴浜�" min-width="100px" align="center">
+ <template slot-scope="{row}">
+ {{ `${row.linkname} ${row.linkphone}` }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="bikeCode" label="杞﹁締缂栫爜" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="bikeTypeName" label="杞︾被鍨�" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="param" label="闂绫诲瀷" min-width="100px" show-overflow-tooltip align="center">
+ <template slot-scope="{row}">
+ <div class="long-title-style">{{ row.param }}</div>
+ </template>
+ </el-table-column>
<!-- <el-table-column prop="param" label="杞﹁締闂" min-width="100px"></el-table-column> -->
- <el-table-column prop="content" label="闂璇存槑" min-width="100px" align="center"></el-table-column>
+ <el-table-column prop="content" label="闂璇存槑" min-width="100px" show-overflow-tooltip align="center">
+ <template slot-scope="{row}">
+ <div class="long-title-style">{{ row.content }}</div>
+ </template>
+ </el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px" align="center"></el-table-column>
- <el-table-column prop="status" label="鐘舵��" min-width="100px" align="center">
+ <el-table-column prop="status" label="鐘舵��" min-width="80px" align="center">
<template slot-scope="{row}">
<div v-if="row.status==0" style="color: red;">寰呭鐞�</div>
<div v-else-if="row.status==1">宸插鐞�</div>
<div v-else>鍏朵粬</div>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" min-width="100px" align="center">
+ <el-table-column label="鎿嶄綔" min-width="80px" fixed="right" align="center">
<template slot-scope="{row}">
<el-button v-if="row.status==0" type="text" @click="dealAction(row)">澶勭悊</el-button>
</template>
</el-table-column>
- <!-- <el-table-column prop="isdeleted" label="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�" min-width="100px"></el-table-column>
- <el-table-column prop="longitude" label="缁忓害" min-width="100px"></el-table-column>
- <el-table-column prop="latitude" label="绾害" min-width="100px"></el-table-column>
- <el-table-column prop="addr" label="璇︾粏鍦板潃" min-width="100px"></el-table-column>
- <el-table-column prop="paramId" label="杞﹁締闂鍘熷洜缂栫爜锛堝叧鑱攂ase_param)" min-width="100px"></el-table-column>
- <el-table-column prop="info" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="linkphone" label="鑱旂郴鐢佃瘽" min-width="100px"></el-table-column>
- <el-table-column prop="dealUser" label="澶勭悊浜虹紪鐮侊紙鍏宠仈system_user)" min-width="100px"></el-table-column>
- <el-table-column prop="dealDate" label="澶勭悊鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="dealInfo" label="澶勭悊澶囨敞" min-width="100px"></el-table-column> -->
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -83,6 +85,7 @@
>
</pagination>
</template>
+ <OperaRepairDealWindow ref="operaRepairDealWindow" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -90,10 +93,11 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+import OperaRepairDealWindow from '@/components/business/OperaRepairDealWindow'
export default {
name: 'BikeRepair',
extends: BaseTable,
- components: { TableLayout, Pagination },
+ components: { TableLayout, Pagination, OperaRepairDealWindow },
data () {
return {
value1: [],
@@ -133,7 +137,7 @@
},
methods: {
dealAction(row) {
-
+ this.$refs.operaRepairDealWindow.open('澶勭悊', row)
}
},
}
--
Gitblit v1.9.3