From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
admin/src/views/business/bikeRepair.vue | 104 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 76 insertions(+), 28 deletions(-)
diff --git a/admin/src/views/business/bikeRepair.vue b/admin/src/views/business/bikeRepair.vue
index c49203c..76be78b 100644
--- a/admin/src/views/business/bikeRepair.vue
+++ b/admin/src/views/business/bikeRepair.vue
@@ -2,13 +2,13 @@
<TableLayout :permissions="['business:bikerepair:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鐢ㄦ埛" prop="creator">
- <el-input v-model="searchForm.creator" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鐢ㄦ埛" prop="openid">
+ <el-input v-model="searchForm.openid" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="杞﹁締缂栧彿" prop="binkeId">
- <el-input v-model="searchForm.binkeId" placeholder="璇疯緭鍏ヨ溅杈嗙紪鍙�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="杞﹁締缂栫爜" prop="bikeCode">
+ <el-input v-model="searchForm.bikeCode" 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="寰呭鐞�"
@@ -26,12 +26,15 @@
<el-date-picker
v-model="value1"
type="daterange"
+ @change="selectDate"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡">
</el-date-picker>
</el-form-item>
-
+
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -45,36 +48,46 @@
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}">
+ <el-button type="text" @click="showProblem(row)">鐐瑰嚮鏌ョ湅</el-button>
+ </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>
+ <el-button v-if="row.status == 0" type="text" @click="dealAction(row)">澶勭悊</el-button>
+ <el-popover
+ v-else
+ placement="bottom"
+ width="200"
+ trigger="click"
+ :content="row.dealInfo">
+ <el-button slot="reference" type="text">鏌ョ湅澶囨敞</el-button>
+ </el-popover>
</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 +96,8 @@
>
</pagination>
</template>
+ <OperaRepairDealWindow ref="operaRepairDealWindow" @success="handlePageChange"/>
+ <RepairDetailWindow ref="repairDetailWindow"/>
</TableLayout>
</template>
@@ -90,18 +105,22 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
+import OperaRepairDealWindow from '@/components/business/OperaRepairDealWindow'
+import RepairDetailWindow from '@/components/business/RepairDetailWindow'
+import { formatDateTime } from '@/utils/util'
+import { getFileList } from '@/api/business/bikeRepair'
export default {
name: 'BikeRepair',
extends: BaseTable,
- components: { TableLayout, Pagination },
+ components: { TableLayout, Pagination, OperaRepairDealWindow, RepairDetailWindow },
data () {
return {
- value1: [],
+ value1: [new Date(), new Date()],
// 鎼滅储
searchForm: {
id: '',
createDate: '',
- creator: '',
+ openid: '',
editDate: '',
editor: '',
isdeleted: '',
@@ -118,6 +137,8 @@
dealUser: '',
dealDate: '',
dealInfo: '',
+ startDate: '',
+ endDate: '',
content: ''
}
}
@@ -129,10 +150,37 @@
'field.id': 'id',
'field.main': 'id'
})
+ this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
this.search()
},
methods: {
+ reset() {
+ this.searchForm.startDate = ''
+ this.searchForm.endDate = ''
+ this.value1 = []
+ this.$refs.searchForm.resetFields()
+ this.search()
+ },
+ selectDate(v) {
+ this.searchForm.startDate = ''
+ this.searchForm.endDate = ''
+ if (v) {
+ this.searchForm.startDate = v[0]
+ this.searchForm.endDate = v[1]
+ }
+ this.search()
+ },
dealAction(row) {
+ this.$refs.operaRepairDealWindow.open('澶勭悊', row)
+ },
+ showProblem(row) {
+ getFileList(row.id)
+ .then(res => {
+ this.$refs.repairDetailWindow.open('闂璇存槑',{ imgList: res.map(item => item.fileurlfull), ...row })
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
}
},
--
Gitblit v1.9.3