From d492850f1cc64ddcfaf43798af9c76c2505414fd Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 一月 2025 18:24:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/workorder/problemReporting.vue | 70 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 28 deletions(-)
diff --git a/admin/src/views/workorder/problemReporting.vue b/admin/src/views/workorder/problemReporting.vue
index 98a65ed..1de3fb4 100644
--- a/admin/src/views/workorder/problemReporting.vue
+++ b/admin/src/views/workorder/problemReporting.vue
@@ -2,14 +2,14 @@
<TableLayout :permissions="['business:ywworkorder:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鎻忚堪" prop="roomNum">
- <el-input v-model="searchForm.roomNum" placeholder="璇疯緭鍏ユ弿杩�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鎻忚堪" prop="content">
+ <el-input v-model="searchForm.content" placeholder="璇疯緭鍏ユ弿杩�" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item prop="areaType" label="澶勭悊鐘舵��">
- <el-select v-model="searchForm.areaType">
- <el-option label="鏈鐞�" value="0"></el-option>
- <el-option label="鐢熸垚宸ュ崟" value="1"></el-option>
- <el-option label="鍏抽棴淇濅慨" value="1"></el-option>
+ <el-form-item prop="dealStatus" label="澶勭悊鐘舵��">
+ <el-select v-model="searchForm.dealStatus">
+ <el-option label="鏈鐞�" :value="0"></el-option>
+ <el-option label="宸茶浆宸ュ崟" :value="1"></el-option>
+ <el-option label="宸插叧闂�" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="涓婃姤鏃堕棿">
@@ -18,7 +18,7 @@
@change="changeSelDate"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
- type="daterange"></el-date-picker>
+ type="daterange" />
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -28,28 +28,32 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe>
- <el-table-column prop="areaType" label="鎻忚堪" min-width="70px"></el-table-column>
- <el-table-column prop="areaType" label="浣嶇疆" min-width="100px"></el-table-column>
- <el-table-column prop="categoryName" label="鐜板満鍥剧墖" min-width="100px"></el-table-column>
- <el-table-column prop="creatorName" label="涓婃姤浜�" min-width="80px"></el-table-column>
- <el-table-column prop="createDate" label="涓婃姤浜虹數璇�" min-width="100px"></el-table-column>
- <el-table-column prop="dealUserName" label="涓婃姤鏃堕棿" min-width="80px"></el-table-column>
+ <el-table-column prop="remark" label="鎻忚堪" min-width="70px"></el-table-column>
+ <el-table-column prop="position" label="浣嶇疆" min-width="100px"></el-table-column>
+ <el-table-column label="鐜板満鍥剧墖" min-width="100px">
+ <template slot-scope="{row}">
+ {{row.fileList ? row.fileList.length : 0}}寮�
+ </template>`
+ </el-table-column>
+ <el-table-column prop="name" label="涓婃姤浜�" min-width="80px"></el-table-column>
+ <el-table-column prop="phone" label="涓婃姤浜虹數璇�" min-width="100px"></el-table-column>
+ <el-table-column prop="submitDate" label="涓婃姤鏃堕棿" min-width="80px"></el-table-column>
<el-table-column label="澶勭悊鐘舵��" min-width="70px">
<template slot-scope="{row}">
- <span v-if="row.dealStatus == 0">寰呮寚娲�</span>
- <span v-if="row.dealStatus == 1">宸叉寚娲�</span>
- <span v-if="row.dealStatus == 2">宸插鐞�</span>
- </template>
+ <span v-if="row.dealStatus === 0">寰呭鐞�</span>
+ <span v-if="row.dealStatus === 1">宸茶浆宸ュ崟</span>
+ <span v-if="row.dealStatus === 2">宸插叧闂�</span>
+ </template>`
</el-table-column>
- <el-table-column prop="creatorName" label="澶勭悊浜�" min-width="80px"></el-table-column>
+ <el-table-column prop="dealUserName" label="澶勭悊浜�" min-width="80px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:ywworkorder:update'])"
label="鎿嶄綔"
width="130"
fixed="right">
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.handleProblem.open()">澶勭悊</el-button>
- <el-button type="text" @click="$refs.problemReportingDetails.open()">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" v-if="row.dealStatus === 0" @click="$refs.handleProblem.open('闂涓婃姤', row)">澶勭悊</el-button>
+ <el-button type="text" @click="$refs.problemReportingDetails.open('闂涓婃姤璇︽儏', row)">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
@@ -79,10 +83,10 @@
showDetail: false,
searchForm: {
selDate: [],
- areaIds: '',
- projectId: '',
- buildingId: '',
- cateId: '',
+ dealDateStart: '',
+ dealDateEnd: '',
+ content: '',
+ dealStatus: ''
},
projectList: [],
buildList: [],
@@ -91,15 +95,25 @@
},
created() {
this.config({
- module: '杩愮淮宸ュ崟淇℃伅琛�',
- api: '/workorder/ywWorkorder',
+ module: '闂涓婃姤淇℃伅琛�',
+ api: '/ywProblem',
'field.id': 'id',
'field.main': 'id'
})
this.search()
},
methods: {
-
+ // 鎼滅储妗嗛噸缃�
+ reset () {
+ this.$refs.searchForm.resetFields()
+ this.searchForm.dealDateStart = ''
+ this.searchForm.dealDateEnd = ''
+ this.search()
+ },
+ changeSelDate(e) {
+ this.searchForm.dealDateStart = e[0]
+ this.searchForm.dealDateEnd = e[1]
+ }
}
}
</script>
--
Gitblit v1.9.3