From af4bfe0203ee30d4026c3b230e19288098c85f75 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 20 一月 2025 18:39:46 +0800
Subject: [PATCH] 开发
---
admin/src/views/operation/components/deviceDetail.vue | 281 +++++++++++++++
admin/src/api/system/common.js | 4
admin/src/views/workorder/components/problemReportingDetails.vue | 85 +++-
admin/src/views/operation/components/deviceEdit.vue | 356 ++++++++++++++++---
admin/src/views/operation/device.vue | 2
admin/src/views/workorder/components/detail.vue | 2
admin/src/views/workorder/components/handleProblem.vue | 302 +++++++++++-----
admin/src/views/workorder/problemReporting.vue | 46 +
8 files changed, 882 insertions(+), 196 deletions(-)
diff --git a/admin/src/api/system/common.js b/admin/src/api/system/common.js
index 0e99bcf..d0b2af7 100644
--- a/admin/src/api/system/common.js
+++ b/admin/src/api/system/common.js
@@ -71,6 +71,10 @@
export function upload (data) {
return request.post('/visitsAdmin/cloudService/public/upload', data)
}
+// 鎵归噺涓婁紶鏂囦欢鍒癋TP
+export function uploadBatch (data) {
+ return request.post('/visitsAdmin/cloudService/public/uploadBatch', data)
+}
// 鑾峰彇鐪佸競鍖烘爲
export function getCityTree (data) {
return request.post('/visitsAdmin/cloudService/business/areas/treeList', data)
diff --git a/admin/src/views/operation/components/deviceDetail.vue b/admin/src/views/operation/components/deviceDetail.vue
index f3181aa..02633b3 100644
--- a/admin/src/views/operation/components/deviceDetail.vue
+++ b/admin/src/views/operation/components/deviceDetail.vue
@@ -1,7 +1,14 @@
<template>
- <GlobalWindow width="720px" title="璁惧璇︽儏" :visible.sync="visible" :confirm-working="isWorking" @close="close"
+ <GlobalWindow width="100%" title="璁惧璇︽儏" :withFooter="false" :visible.sync="visible" :confirm-working="isWorking" @close="close"
@confirm="confirm">
- <div class="main">
+ <div style="width: 100%; position: sticky; top: 0; left: 0; z-index: 999; background: #ffffff;">
+ <div class="tabs">
+ <div class="tab" :class="{ active: activeTabs === 0 }" @click="tabsClick(0)">璁惧淇℃伅</div>
+ <div class="tab" :class="{ active: activeTabs === 1 }" @click="tabsClick(1)">杩愮淮璁板綍</div>
+ <div class="tab" :class="{ active: activeTabs === 2 }" @click="tabsClick(2)">宸℃璁板綍</div>
+ </div>
+ </div>
+ <div class="main" v-if="activeTabs === 0">
<div class="title">
<span>鍩虹淇℃伅</span>
</div>
@@ -32,6 +39,18 @@
<div class="val">{{ info.addr }}</div>
</div>
<div class="item">
+ <div class="la">鎵�灞為」鐩�</div>
+ <div class="val">{{ info.projectName }}</div>
+ </div>
+ <div class="item">
+ <div class="la">鍏宠仈鎴挎簮</div>
+ <div class="val">{{ info.buildingName }} / {{ info.floorName }} / {{info.roomName}}</div>
+ </div>
+ <div class="item">
+ <div class="la">璐叆鏃堕棿</div>
+ <div class="val">{{ info.buyDate }}</div>
+ </div>
+ <div class="item">
<div class="la">璁惧鐘舵��</div>
<spa class="val" v-if="info.status == 0">姝ｅ父</spa>
<spa class="val" v-if="info.status == 1">鎹熷潖</spa>
@@ -48,24 +67,189 @@
<div v-if="info.fileFullUrl" class="item" style="width: 100%;">
<div class="la">鐓х墖</div>
<div class="val">
- <img class="photo" :src="info.fileFullUrl" alt="">
+ <el-image
+ style="width: 100px; height: 100px"
+ :src="info.fileFullUrl"
+ :preview-src-list="[info.fileFullUrl]">
+ </el-image>
+ </div>
+ </div>
+ <div class="item" style="width: 100%;">
+ <div class="la">闄勪欢</div>
+ <div class="val">
+ <el-table
+ :data="info.multifileList ? info.multifileList : []"
+ border
+ style="width: 100%">
+ <el-table-column
+ prop="name"
+ label="闄勪欢鍚嶇О">
+ </el-table-column>
+ <el-table-column
+ prop="userName"
+ label="鎿嶄綔浜�">
+ </el-table-column>
+ <el-table-column
+ prop="createDate"
+ label="鎿嶄綔鏃堕棿">
+ </el-table-column>
+ </el-table>
</div>
</div>
</div>
</div>
+ <div class="title">
+ <span>渚涘簲鍟嗕俊鎭�</span>
+ </div>
+ <div class="main_content">
+ <div class="list">
+ <div class="item">
+ <div class="la">渚涘簲鍟�</div>
+ <div class="val">{{info.supplier}}</div>
+ </div>
+ <div class="item">
+ <div class="la">鑱旂郴浜�</div>
+ <div class="val">{{info.supplierLinker}}</div>
+ </div>
+ <div class="item">
+ <div class="la">鑱旂郴鏂瑰紡</div>
+ <div class="val">{{info.supplierPhone}}</div>
+ </div>
+ </div>
+ </div>
+ <div class="title">
+ <span>缁翠繚淇℃伅</span>
+ </div>
+ <div class="main_content">
+ <div class="list">
+ <div class="item">
+ <div class="la">缁翠繚璐熻矗浜�</div>
+ <div class="val">{{info.maintenanceUserName}}</div>
+ </div>
+ <div class="item">
+ <div class="la">缁翠繚鍒版湡鏃�</div>
+ <div class="val">{{info.maintenanceOverDate}}</div>
+ </div>
+ <div class="item" style="width: 100%;">
+ <div class="la">缁翠繚璇存槑</div>
+ <div class="val">{{info.maintenanceContent}}</div>
+ </div>
+ </div>
+ </div>
</div>
+ <div class="main" v-if="activeTabs === 1">
+ <el-table
+ :data="infoList"
+ border
+ style="width: 100%">
+ <el-table-column
+ prop="realName"
+ label="杩愮淮浜哄憳">
+ </el-table-column>
+ <el-table-column
+ label="璁惧鐘舵��">
+ <template slot-scope="{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="remark"
+ label="杩愮淮澶囨敞">
+ </el-table-column>
+ <el-table-column
+ prop="dealDate"
+ label="杩愮淮鏃堕棿">
+ </el-table-column>
+ <el-table-column
+ label="鎿嶄綔">
+ <template slot-scope="{row}">
+ <el-button type="text" @click="handleDetail(row)">鏌ョ湅璇︽儏</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="page"
+ :page-sizes="[10, 20, 30, 40]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="total">
+ </el-pagination>
+ </div>
+ <div class="main" v-if="activeTabs === 2">
+ <el-table
+ :data="infoList"
+ border
+ style="width: 100%">
+ <el-table-column
+ prop="schemeTitle"
+ label="璁″垝鍚嶇О">
+ </el-table-column>
+ <el-table-column
+ prop="taskCode"
+ label="浠诲姟缂栧彿">
+ </el-table-column>
+ <el-table-column
+ label="浠诲姟鏃堕棿">
+ <template slot-scope="{row}">
+ {{row.startDate}} ~ {{row.endDate}}
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="realname"
+ label="宸℃浜�">
+ </el-table-column>
+ <el-table-column
+ label="宸℃缁撴灉">
+ <template slot-scope="{row}">
+ <span v-if="row.dealStatus === 0">姝ｅ父</span>
+ <span v-if="row.dealStatus === 1">寮傚父</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="宸℃闄勪欢">
+ <template slot-scope="{row}">
+ <el-image
+ v-if="row.multifileList && row.multifileList.length > 0"
+ style="width: 100px; height: 100px"
+ :src="row.multifileList[0].fileurlFull"
+ :preview-src-list="[row.multifileList[0].fileurlFull]">
+ </el-image>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="content"
+ label="宸℃璇存槑">
+ </el-table-column>
+ </el-table>
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="page"
+ :page-sizes="[10, 20, 30, 40]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="total">
+ </el-pagination>
+ </div>
+ <Detail ref="DetailRef" />
</GlobalWindow>
</template>
<script>
import GlobalWindow from '@/components/common/GlobalWindow'
import BaseOpera from '@/components/base/BaseOpera'
+import Detail from './maintainDetail'
import { detailById } from '@/api/Inspection/device.js'
-import { getUserList } from '@/api/system/user'
-import { Message, Loading } from 'element-ui'
+import { fetchList } from '@/api/Inspection/deviceRecord.js'
+import { getDetail } from '@/api/Inspection/ywPatrolTask.js'
export default {
components: {
- GlobalWindow
+ GlobalWindow,
+ Detail
},
extends: BaseOpera,
data() {
@@ -73,19 +257,83 @@
id: '',
visible: false,
info: {},
-
+ activeTabs: 0,
+ fileList: [],
+
+ infoList: [],
+ total: 0,
+ pageSize: 10,
+ page: 1
}
},
methods: {
+ handleSizeChange(e) {
+ this.pageSize = e
+ if (this.activeTabs === 1) {
+ this.getyunwei()
+ } else if (this.activeTabs === 2) {
+ this.getXunJian()
+ }
+ },
+ handleCurrentChange(e) {
+ this.page = e
+ if (this.activeTabs === 1) {
+ this.getyunwei()
+ } else if (this.activeTabs === 2) {
+ this.getXunJian()
+ }
+ },
getDetail() {
+ this.this.activeTabs = 0
const { id } = this
detailById(id).then(res => {
this.info = res
})
},
+ handleDetail(row) {
+ this.$refs.DetailRef.visible = true
+ this.$refs.DetailRef.getDetail(row.id)
+ },
close() {
this.visible = false
this.$emit('close')
+ },
+ tabsClick(val) {
+ this.activeTabs = val
+ this.pageSize = 10
+ this.page = 1
+ this.infoList = []
+ if (val === 1) {
+ this.getyunwei()
+ } else if (val === 2) {
+ this.getXunJian()
+ }
+ },
+ // 鑾峰彇璁惧杩愮淮璁板綍
+ getyunwei() {
+ fetchList({
+ capacity: this.pageSize,
+ page: this.page,
+ model: {
+ deviceId: this.id
+ }
+ }).then(res => {
+ this.infoList = res.records
+ this.total = res.total
+ })
+ },
+ // 宸℃璁板綍
+ getXunJian() {
+ getDetail({
+ capacity: this.pageSize,
+ page: this.page,
+ model: {
+ deviceId: this.id
+ }
+ }).then(res => {
+ this.infoList = res.records
+ this.total = res.total
+ })
}
}
}
@@ -93,7 +341,24 @@
<style lang="scss" scoped>
@import '@/assets/style/variables.scss';
-
+.tabs {
+ border-bottom: 1px solid #DFE2E8;
+ display: flex;
+ .tab {
+ height: 58px;
+ line-height: 58px;
+ font-size: 16px;
+ color: #666666;
+ margin-right: 30px;
+ cursor: pointer;
+ }
+
+ .active {
+ font-weight: 500;
+ color: $primary-color;
+ border-bottom: 2px solid $primary-color;
+ }
+}
.main {
padding-top: 20px;
diff --git a/admin/src/views/operation/components/deviceEdit.vue b/admin/src/views/operation/components/deviceEdit.vue
index 4c5c8f7..1b125ed 100644
--- a/admin/src/views/operation/components/deviceEdit.vue
+++ b/admin/src/views/operation/components/deviceEdit.vue
@@ -1,52 +1,170 @@
<template>
<GlobalWindow :title="param.id ? '缂栬緫璁惧' : '鏂板缓璁惧'" :confirmWorking="subLoading" :visible.sync="isShowModal"
- width="600px" @close="close" @confirm="handleSub">
+ width="100%" @close="close" @confirm="handleSub">
<el-form :model="param" ref="paramRef" :rules="rules">
- <el-form-item label="璁惧缂栫爜" prop="code">
- <el-input v-model="param.code" placeholder="璇疯緭鍏�" v-trim />
- </el-form-item>
- <el-form-item label="璁惧鍚嶇О" prop="name">
- <el-input v-model="param.name" placeholder="璇疯緭鍏�" v-trim />
- </el-form-item>
- <el-form-item label="璁惧鍨嬪彿" prop="">
- <el-input v-model="param.modelNo" placeholder="璇疯緭鍏�" v-trim />
- </el-form-item>
- <el-form-item label="璁惧鍒嗙被" prop="cateId">
- <el-cascader v-model="param.cateIds" @change="changeSel" placeholder="璇烽�夋嫨璁惧鍒嗙被" clearable :options="cateList"
- :props="{
- label: 'name',
- value: 'id',
- children: 'childCategoryList'
- }"></el-cascader>
- </el-form-item>
- <el-form-item label="璁惧绠＄悊鍛�" prop="">
- <el-select v-model="param.userId" clearable filterable>
- <el-option v-for="item in staffList" :label="item.realname" :value="item.id"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鎵�鍦ㄤ綅缃�" prop="">
- <el-input v-model="param.addr" placeholder="璇疯緭鍏�" v-trim />
-
- </el-form-item>
- <el-form-item label="渚涘簲鍟�" prop="">
- <el-input v-model="param.supplier" placeholder="璇疯緭鍏�" v-trim />
- </el-form-item>
- <el-form-item label="杩愮淮鍐呭" prop="">
- <el-input type="textarea" :rows="4" v-model="param.content" placeholder="璇疯緭鍏�" />
- </el-form-item>
- <el-form-item label="璁惧鐘舵��" prop="">
- <el-select v-model="param.status" filterable>
- <el-option :value="0" label="姝ｅ父"></el-option>
- <el-option :value="1" label="鎹熷潖"></el-option>
- <el-option :value="2" label="鎶ュ簾"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鐓х墖" prop="">
- <UploadAvatarImage :file="{ 'imgurlfull': param.fileFullUrl, 'imgurl': param.fileUrl }"
- :uploadData="{ folder: 'ywDevice/' }" @uploadSuccess="uploadAvatarSuccess" @uploadEnd="isUploading = false"
- @uploadBegin="isUploading = true" />
- </el-form-item>
+ <div style="width: 100%; display: flex; align-items: center; justify-content: space-between; flex-wrap: wrap; padding-top: 20px; box-sizing: border-box;">
+ <div class="title">鍩虹淇℃伅</div>
+ <div style="width: 31%;">
+ <el-form-item label="璁惧缂栫爜" prop="code">
+ <el-input v-model="param.code" placeholder="璇疯緭鍏�" v-trim />
+ </el-form-item>
+ </div>
+ <div style="width: 31%;">
+ <el-form-item label="璁惧鍚嶇О" prop="name">
+ <el-input v-model="param.name" placeholder="璇疯緭鍏�" v-trim />
+ </el-form-item>
+ </div>
+ <div style="width: 31%;">
+ <el-form-item label="璁惧鍨嬪彿" prop="modelNo">
+ <el-input v-model="param.modelNo" placeholder="璇疯緭鍏�" v-trim />
+ </el-form-item>
+ </div>
+ <div style="width: 31%;">
+ <el-form-item label="璁惧鍒嗙被" prop="cateIds">
+ <el-cascader v-model="param.cateIds" @change="changeSel" placeholder="璇烽�夋嫨璁惧鍒嗙被" clearable :options="cateList"
+ :props="{
+ label: 'name',
+ value: 'id',
+ children: 'childCategoryList'
+ }"></el-cascader>
+ </el-form-item>
+ </div>
+ <div style="width: 31%;">
+ <el-form-item label="璁惧绠＄悊鍛�" prop="userId">
+ <el-select v-model="param.userId" clearable filterable>
+ <el-option v-for="item in staffList" :label="item.realname" :value="item.id"></el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ <div style="width: 31%;">
+ <el-form-item label="鎵�鍦ㄤ綅缃�" prop="addr">
+ <el-input v-model="param.addr" placeholder="璇疯緭鍏�" v-trim />
+ </el-form-item>
+ </div>
+ <div style="width: 31%;">
+ <el-form-item label="鎵�灞為」鐩�" prop="projectId">
+ <el-select v-model="param.projectId" @change="changeProject" filterable>
+ <el-option v-for="item in projectList" :label="item.name" :value="item.id"></el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ <div style="width: 31%;">
+ <el-form-item label="鍏宠仈鎴挎簮" prop="rooms">
+ <el-cascader v-model="param.rooms" :disabled="!param.projectId" ref="cascader" @change="getHouseVal" placeholder="璇烽�夋嫨鍏宠仈鎴挎簮" :options="houseList"
+ :props="{
+ label: 'name',
+ value: 'id',
+ children: 'projectDataVOList'
+ }"></el-cascader>
+ </el-form-item>
+ </div>
+ <div style="width: 31%;">
+ <el-form-item label="璐叆鏃堕棿" prop="buyDate">
+ <el-date-picker
+ v-model="param.buyDate"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ </div>
+ <div style="width: 31%;">
+ <el-form-item label="璁惧鐘舵��" prop="status">
+ <el-select v-model="param.status" filterable>
+ <el-option :value="0" label="姝ｅ父"></el-option>
+ <el-option :value="1" label="鎹熷潖"></el-option>
+ <el-option :value="2" label="鎶ュ簾"></el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ <div style="width: 100%;">
+ <el-form-item label="杩愮淮鍐呭" prop="content">
+ <el-input type="textarea" :rows="4" v-model="param.content" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </div>
+ <div style="width: 100%;">
+ <el-form-item label="鐓х墖" prop="">
+ <UploadAvatarImage :file="{ 'imgurlfull': param.fileFullUrl, 'imgurl': param.fileUrl }"
+ :uploadData="{ folder: 'ywDevice/' }" @uploadSuccess="uploadAvatarSuccess" @uploadEnd="isUploading = false"
+ @uploadBegin="isUploading = true" />
+ <div style="width: 100%; height: 40px;"></div>
+ </el-form-item>
+ </div>
+ <div style="width: 100%;">
+ <el-form-item label="闄勪欢" prop="multifileList">
+ <div style="display: flex; flex-direction: column; align-items: flex-start;">
+ <el-button type="text" @click="$refs.uploadFile.click()">+娣诲姞闄勪欢</el-button>
+ <el-table
+ :data="param.multifileList"
+ border
+ style="width: 100%">
+ <el-table-column
+ prop="name"
+ label="闄勪欢鍚嶇О">
+ </el-table-column>
+ <el-table-column
+ prop="createUserName"
+ label="鎿嶄綔浜�">
+ </el-table-column>
+ <el-table-column
+ prop="createTime"
+ label="鎿嶄綔鏃堕棿">
+ </el-table-column>
+ <el-table-column
+ label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button type="text" @click="deleFile(scope.$index)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-form-item>
+ </div>
+
+ <div class="title">渚涘簲鍟嗕俊鎭�</div>
+ <div style="width: 31%;">
+ <el-form-item label="渚涘簲鍟�" prop="supplier">
+ <el-input v-model="param.supplier" placeholder="璇疯緭鍏�" v-trim />
+ </el-form-item>
+ </div>
+ <div style="width: 31%;">
+ <el-form-item label="鑱旂郴浜�" prop="supplierLinker">
+ <el-input v-model="param.supplierLinker" placeholder="璇疯緭鍏�" v-trim />
+ </el-form-item>
+ </div>
+ <div style="width: 31%;">
+ <el-form-item label="鑱旂郴鏂瑰紡" prop="supplierPhone">
+ <el-input v-model="param.supplierPhone" placeholder="璇疯緭鍏�" v-trim />
+ </el-form-item>
+ </div>
+
+ <div class="title">缁翠繚淇℃伅</div>
+ <div style="width: 31%;">
+ <el-form-item label="缁翠繚璐熻矗浜�" prop="maintenanceUserId">
+ <el-select v-model="param.maintenanceUserId" clearable filterable>
+ <el-option v-for="item in staffList" :label="item.realname" :value="item.id"></el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ <div style="width: 31%;">
+ <el-form-item label="缁翠繚鍒版湡鏃�" prop="maintenanceOverDate">
+ <el-date-picker
+ v-model="param.maintenanceOverDate"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ </div>
+ <div style="width: 31%;"></div>
+ <div style="width: 100%;">
+ <el-form-item label="缁翠繚璇存槑" prop="maintenanceContent">
+ <el-input v-model="param.maintenanceContent" type="textarea" placeholder="璇疯緭鍏�" v-trim />
+ </el-form-item>
+ </div>
+ </div>
</el-form>
+ <input type="file" ref="uploadFile" style="position: fixed; top: -20px; left: 0;" @change="getFile" />
</GlobalWindow>
</template>
@@ -56,7 +174,10 @@
import { fetchList } from '@/api/business/category'
import { create, updateById, detailById } from '@/api/Inspection/device'
import { getUserList } from '@/api/system/user'
-import { Message } from 'element-ui'
+import { uploadBatch } from '@/api/system/common'
+import { getProjectList, tree } from '@/api/project/ywProject'
+import { Loading, Message } from 'element-ui'
+import { mapState } from 'vuex'
export default {
components: { GlobalWindow, UploadAvatarImage },
data() {
@@ -64,22 +185,126 @@
isShowModal: false,
subLoading: false,
param: {
- status: 0
+ code: '',
+ name: '',
+ modelNo: '',
+ cateIds: '',
+ userId: '',
+ addr: '',
+ projectId: '',
+ rooms: [],
+ buildingId: '',
+ floorId: '',
+ roomId: '',
+
+ supplier: [],
+ buyDate: '',
+ content: '',
+ supplierLinker: '',
+ supplierPhone: '',
+ maintenanceUserId: '',
+ maintenanceOverDate: '',
+ maintenanceContent: '',
+ status: 0,
+ multifileList: []
},
- cateList: [],
rules: {
- name: [{ required: true, message: '璇疯緭鍏�' }],
- code: [{ required: true, message: '璇疯緭鍏�' }],
- cateId: [{ required: true, message: '璇烽�夋嫨' }],
+ name: [{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }],
+ code: [{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }],
+ cateId: [{ required: true, message: '璇烽�夋嫨', trigger: 'blur' }],
+ projectId: [{ required: true, message: '璇烽�夋嫨', trigger: 'blur' }],
+ rooms: [{ required: true, message: '璇烽�夋嫨', trigger: 'blur' }]
},
- staffList: []
-
+ loadings: false,
+ cateList: [],
+ houseList: [],
+ staffList: [],
+ projectList: []
}
+ },
+ computed: {
+ ...mapState(['userInfo'])
},
created() {
this.initData()
+ this.getProjectLists()
+ console.log(this.userInfo)
},
methods: {
+ getHouseVal(e) {
+ this.param.buildingId = e[1]
+ this.param.floorId = e[2]
+ this.param.roomId = e[3]
+ },
+ changeProject(e) {
+ this.getHouseTree()
+ },
+ getHouseTree() {
+ tree({
+ projectId: this.param.projectId
+ }).then(res => {
+ this.addParamToArray(res)
+ this.houseList = res
+ })
+ },
+ addParamToArray(arr) {
+ for (let i = 0; i < arr.length; i++) {
+ const currentItem = arr[i].projectDataVOList
+ if (currentItem && currentItem.length >= 0) {
+ currentItem.forEach(item => {
+ if (item.lv === 3) {
+ delete item.projectDataVOList
+ }
+ })
+ }
+ if (currentItem && currentItem.length > 0) {
+ this.addParamToArray(currentItem)
+ }
+ }
+ },
+ deleFile(index) {
+ this.param.multifileList.splice(index, 1)
+ },
+ // 鑾峰彇椤圭洰
+ getProjectLists() {
+ getProjectList({})
+ .then(res => {
+ this.projectList = res
+ })
+ },
+ // 涓婁紶闄勪欢
+ getFile(e) {
+ this.loadings = Loading.service({
+ lock: true,
+ text: 'Loading',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ let formDate = new FormData()
+ formDate.append('folder', 'YW_DEVICE')
+ formDate.append('file', e.target.files[0])
+ uploadBatch(formDate)
+ .then(res => {
+ this.param.multifileList.push({ ...res[0], fileurl: res[0].imgaddr, name: res[0].originname, createUserName: this.userInfo.realname, createTime: this.getDate() })
+ })
+ .finally(() => {
+ e.target.files = null
+ this.loadings.close()
+ })
+ },
+ getDate() {
+ const currentDate = new Date();
+
+ const year = currentDate.getFullYear(); // 鑾峰彇褰撳墠骞翠唤
+ const month = currentDate.getMonth() + 1; // 鑾峰彇褰撳墠鏈堜唤 (0-11锛屾墍浠ラ渶瑕� +1)
+ const day = currentDate.getDate(); // 鑾峰彇褰撳墠鏃ユ湡
+ const hours = currentDate.getHours(); // 鑾峰彇褰撳墠灏忔椂
+ const minutes = currentDate.getMinutes(); // 鑾峰彇褰撳墠鍒嗛挓
+ const seconds = currentDate.getSeconds(); // 鑾峰彇褰撳墠绉掗挓
+
+ return `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day} `
+ + `${hours < 10 ? '0' + hours : hours}:${minutes < 10 ? '0' + minutes : minutes}:${seconds < 10 ? '0' + seconds : seconds}`;
+ },
handleSub() {
const { param, subLoading } = this
this.$refs['paramRef'].validate((valid) => {
@@ -100,6 +325,15 @@
getDetail(id) {
detailById(id).then(res => {
this.param = res
+ this.param.rooms = [res.projectId, res.buildingId, res.floorId, res.roomId]
+ this.param.multifileList = res.multifileList.map(item => {
+ return {
+ ...item,
+ createUserName: item.userName,
+ createTime: item.createDate
+ }
+ })
+ this.getHouseTree()
const cateId = this.param.cateId || ''
setTimeout(() => {
if (cateId) {
@@ -108,7 +342,6 @@
item.childCategoryList.forEach(item2 => {
if (item2.id == cateId) {
this.$set(this.param, 'cateIds', [item.id, item2.id])
- console.log('cateId', this.form)
}
})
}
@@ -149,4 +382,17 @@
}
}
}
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+ @import '@/assets/style/variables.scss';
+ .title {
+ width: 100%;
+ font-weight: 500;
+ font-size: 18px;
+ color: $primary-color;
+ margin-bottom: 10px;
+ display: flex;
+ align-items: center;
+ }
+</style>
diff --git a/admin/src/views/operation/device.vue b/admin/src/views/operation/device.vue
index 770219c..43a7339 100644
--- a/admin/src/views/operation/device.vue
+++ b/admin/src/views/operation/device.vue
@@ -120,8 +120,6 @@
this.$nextTick(() => {
this.$refs.EditRef.isShowModal = true
if (row && row.id) {
- console.log('---')
-
this.$refs.EditRef.getDetail(row.id)
}
})
diff --git a/admin/src/views/workorder/components/detail.vue b/admin/src/views/workorder/components/detail.vue
index 5b4caa0..322d71d 100644
--- a/admin/src/views/workorder/components/detail.vue
+++ b/admin/src/views/workorder/components/detail.vue
@@ -1,5 +1,5 @@
<template>
- <GlobalWindow width="960px" title="宸ュ崟璇︽儏" :visible.sync="visible" :confirm-working="isWorking" @close="close"
+ <GlobalWindow width="100%" title="宸ュ崟璇︽儏" :visible.sync="visible" :confirm-working="isWorking" @close="close"
@confirm="confirm">
<div class="main">
<div class="title">
diff --git a/admin/src/views/workorder/components/handleProblem.vue b/admin/src/views/workorder/components/handleProblem.vue
index 47a1896..6d9faa1 100644
--- a/admin/src/views/workorder/components/handleProblem.vue
+++ b/admin/src/views/workorder/components/handleProblem.vue
@@ -1,95 +1,111 @@
<template>
<GlobalWindow
- title="闂涓婃姤"
- :showConfirm="false"
+ :title="title"
:visible.sync="visible"
- width="100%">
+ width="100%"
+ @confirm="confirm">
<div class="wt">
<div class="wt_head">
<div class="wt_head_title">
- 闂璇︽儏
- <el-tag style="margin-left: 10px;">杞伐鍗�</el-tag>
+ <div class="title">闂璇︽儏</div>
+ <el-tag style="margin-left: 10px;" v-if="info.dealStatus === 0">寰呭鐞�</el-tag>
+ <el-tag style="margin-left: 10px;" v-if="info.dealStatus === 1">宸茶浆宸ュ崟</el-tag>
+ <el-tag style="margin-left: 10px;" v-if="info.dealStatus === 2">宸插叧闂�</el-tag>
</div>
- <el-button>鏌ョ湅宸ュ崟</el-button>
</div>
<div class="wt_content">
<div class="wt_content_row" style="width: 25%;">
- 浣嶇疆锛�-
+ 浣嶇疆锛歿{info.position || '-'}}
</div>
<div class="wt_content_row" style="width: 25%;">
- 涓婃姤浜猴細寮犱笁涓�
+ 涓婃姤浜猴細{{info.name || '-'}}
</div>
<div class="wt_content_row" style="width: 50%;">
- 涓婃姤浜虹數璇濓細180553847234
+ 涓婃姤浜虹數璇濓細{{info.phone || '-'}}
</div>
<div class="wt_content_row" style="width: 100%; margin-top: 15px;">
- 涓婃姤鏃堕棿锛�2024-11-21 12:00:23
+ 涓婃姤鏃堕棿锛歿{info.submitDate || '-'}}
</div>
<div class="wt_content_row" style="width: 100%; margin-top: 15px;">
- 闂鎻忚堪锛氳繖鏄棶棰樻弿杩拌繖鏄棶棰樻弿杩拌繖鏄棶棰樻弿杩拌繖鏄棶棰樻弿杩拌繖鏄棶棰樻弿杩拌繖鏄棶棰樻弿杩拌繖鏄棶棰樻弿杩拌繖鏄棶棰樻弿杩�
+ 闂鎻忚堪锛歿{info.content || '-'}}
</div>
- <div class="wt_content_row" style="width: 100%; margin-top: 15px;">
+ <div class="wt_content_row" style="width: 100%; margin-top: 15px; margin-bottom: 20px;">
<div class="wt_content_row_label">闂鍥剧墖锛�</div>
- <div class="wt_content_row_list">
- <div class="wt_content_row_list_img">
- <img src="" alt="" />
+ <div class="wt_content_row_list" v-if="info.fileList && info.fileList.length >= 0">
+ <div class="wt_content_row_list_img" v-for="(item, index) in info.fileList" :key="index">
+ <el-image
+ style="width: 100px; height: 100px"
+ :src="item.fileurlFull"
+ :preview-src-list="info.fileList.map(item => item.fileurlFull)">
+ </el-image>
</div>
</div>
</div>
</div>
- <el-form :model="form" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
- <el-form-item label="澶勭悊鏂瑰紡" prop="resource">
- <el-radio-group v-model="form.resource">
+ <el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm">
+ <el-form-item label="澶勭悊鏂瑰紡" prop="dealType">
+ <el-radio-group v-model="form.dealType">
<el-radio :label="0">杞伐鍗�</el-radio>
<el-radio :label="1">鍏抽棴闂</el-radio>
</el-radio-group>
</el-form-item>
- <div style="display: flex; align-items: center;">
- <el-form-item label="浣嶇疆绫诲瀷" prop="region">
- <el-select v-model="form.resource" placeholder="璇烽�夋嫨浣嶇疆绫诲瀷">
- <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
- <el-option label="鍖哄煙浜�" value="beijing"></el-option>
- </el-select>
+ <template>
+ <div style="display: flex; align-items: center;" v-if="form.dealType === 0">
+ <el-form-item label="浣嶇疆绫诲瀷" prop="workOrderAreaType">
+ <el-select v-model="form.workOrderAreaType" placeholder="璇烽�夋嫨浣嶇疆绫诲瀷">
+ <el-option label="瀹ゅ唴缁翠慨" :value="0"></el-option>
+ <el-option label="鍏叡鍖哄煙" :value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎶ヤ慨鍖哄煙" prop="rooms">
+ <el-cascader v-model="form.rooms" ref="cascader" @change="getHouseVal" placeholder="璇烽�夋嫨鎶ヤ慨鍖哄煙" :options="houseList"
+ :props="{
+ label: 'name',
+ value: 'id',
+ children: 'projectDataVOList'
+ }"></el-cascader>
+ </el-form-item>
+ </div>
+ <div style="display: flex; align-items: center;">
+ <el-form-item label="宸ュ崟鍒嗙被" prop="workOrderCateId">
+ <el-cascader v-model="form.workOrderCateId" @change="changeSel" placeholder="璇烽�夋嫨鍒嗙被" clearable :options="cateList"
+ :props="{
+ label: 'name',
+ value: 'id',
+ children: 'childCategoryList'
+ }"></el-cascader>
+ </el-form-item>
+ <el-form-item label="涓婇棬鏃堕棿" prop="workOrderGetDate">
+ <el-date-picker v-model="form.workOrderGetDate" type="date" value-format="yyyy-MM-dd" placeholder="閫夋嫨涓婇棬鏃堕棿"></el-date-picker>
+ </el-form-item>
+ </div>
+ <el-form-item label="鎻忚堪" prop="dealInfo">
+ <el-input
+ type="textarea"
+ :rows="5"
+ placeholder="璇疯緭鍏ユ弿杩�"
+ v-model="form.dealInfo">
+ </el-input>
</el-form-item>
- <el-form-item label="鎶ヤ慨鍖哄煙" prop="resource">
- <el-select v-model="form.resource" placeholder="璇烽�夋嫨鎶ヤ慨鍖哄煙">
- <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
- <el-option label="鍖哄煙浜�" value="beijing"></el-option>
- </el-select>
+ <el-form-item label="闂鍥剧墖" prop="resource">
+ <el-upload
+ :action="base"
+ :file-list="form.workOrderFileList"
+ accept=".png,.jpg,.jpeg,.PNG,.JPG"
+ :on-success="getFile"
+ :data="{ folder: 'YW_PROBLEM' }"
+ list-type="picture-card">
+ <i class="el-icon-plus"></i>
+ </el-upload>
</el-form-item>
- </div>
- <div style="display: flex; align-items: center;">
- <el-form-item label="宸ュ崟鍒嗙被" prop="resource">
- <el-select v-model="form.resource" placeholder="璇烽�夋嫨宸ュ崟鍒嗙被">
- <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
- <el-option label="鍖哄煙浜�" value="beijing"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="涓婇棬鏃堕棿" prop="resource">
- <el-date-picker v-model="form.resource" type="date" placeholder="閫夋嫨涓婇棬鏃堕棿"></el-date-picker>
- </el-form-item>
- </div>
- <el-form-item label="鎻忚堪" prop="resource">
- <el-input
- type="textarea"
- :rows="5"
- placeholder="璇疯緭鍏ユ弿杩�"
- v-model="form.resource">
- </el-input>
- </el-form-item>
- <el-form-item label="闂鍥剧墖" prop="resource">
- <el-upload
- action="https://jsonplaceholder.typicode.com/posts/"
- list-type="picture-card">
- <i class="el-icon-plus"></i>
- </el-upload>
- </el-form-item>
- <el-form-item label="鍏抽棴闂" prop="resource">
+ </template>
+
+ <el-form-item label="鍏抽棴璇存槑" v-if="form.dealType === 1">
<el-input
type="textarea"
:rows="5"
placeholder="璇疯緭鍏ュ叧闂棶棰�"
- v-model="form.resource">
+ v-model="form.dealInfo">
</el-input>
</el-form-item>
</el-form>
@@ -100,6 +116,8 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
+ import { fetchList as getCateList } from '@/api/business/category.js'
+ import { tree } from '@/api/project/ywProject'
export default {
name: "handleProblem",
extends: BaseOpera,
@@ -107,27 +125,111 @@
data() {
return {
info: {},
+ cateList: [],
+ base: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/uploadBatch',
form: {
- resource: 0
+ dealType: 0,
+ workOrderAreaType: '',
+ workOrderCateId: '',
+ workOrderGetDate: '',
+ dealInfo: '',
+ workOrderFileList: [],
+ rooms: [],
+
+ workOrderProjectId: '',
+ workOrderBuildId: '',
+ workOrderFloorId: '',
+ workOrderRoomId: ''
},
+ houseList: [],
rules: {
- resource: [
- { required: true, message: '璇烽�夋嫨', trigger: 'change' }
+ dealType: [
+ { required: true, message: '璇烽�夋嫨', trigger: 'blur' }
+ ],
+ workOrderAreaType: [
+ { required: true, message: '璇烽�夋嫨', trigger: 'blur' }
+ ],
+ workOrderCateId: [
+ { required: true, message: '璇烽�夋嫨', trigger: 'blur' }
+ ],
+ dealInfo: [
+ { required: true, message: '璇疯緭鍏�', trigger: 'blur' }
+ ],
+ rooms: [
+ { required: true, message: '璇烽�夋嫨', trigger: 'blur' }
]
}
}
},
+ created() {
+ this.config({
+ api: '/ywProblem'
+ })
+ },
methods: {
-
+ open (title, target) {
+ this.title = title
+ this.info = target
+ this.getCate()
+ this.getHouseTree()
+ this.visible = true
+ },
+ getHouseVal(e) {
+ this.form.workOrderFloorId = e[2]
+ this.form.workOrderRoomId = e[3]
+ },
+ getHouseTree() {
+ tree({}).then(res => {
+ this.addParamToArray(res)
+ this.houseList = res
+ })
+ },
+ addParamToArray(arr) {
+ for (let i = 0; i < arr.length; i++) {
+ const currentItem = arr[i].projectDataVOList
+ if (currentItem && currentItem.length >= 0) {
+ currentItem.forEach(item => {
+ if (item.lv === 3) {
+ delete item.projectDataVOList
+ }
+ })
+ }
+ if (currentItem && currentItem.length > 0) {
+ this.addParamToArray(currentItem)
+ }
+ }
+ },
+ getFile(e) {
+ console.log(e)
+ this.form.workOrderFileList.push({ ...e })
+ },
+ changeSel(e) {
+ if (e && e.length == 2) {
+ this.$set(this.form, 'workOrderCateId', e[1])
+ } else {
+ this.$set(this.form, 'workOrderCateId', '')
+ }
+ },
+ getCate() {
+ getCateList({
+ model: { type: 3 },
+ capacity: 1000,
+ page: 1,
+ }).then(res => {
+ this.cateList = res.records || []
+ })
+ },
}
}
</script>
<style lang="scss" scoped>
+ @import '@/assets/style/variables.scss';
.wt {
width: 100%;
display: flex;
flex-direction: column;
+
.wt_head {
width: 100%;
padding: 20px 0;
@@ -135,46 +237,62 @@
display: flex;
align-items: center;
justify-content: space-between;
+
.wt_head_title {
display: flex;
align-items: center;
font-size: 16px;
color: black;
margin-right: 10px;
- }
- }
- .wt_content {
- width: 100%;
- display: flex;
- align-items: center;
- flex-wrap: wrap;
- .wt_content_row {
- font-size: 14px;
- color: rgb(51, 51, 51);
- display: flex;
- align-items: self-start;
- .wt_content_row_label {
- flex-shrink: 0;
- font-size: 14px;
- color: rgb(51, 51, 51);
- }
- .wt_content_row_list {
- flex: 1;
+
+ .title {
+ font-weight: 500;
+ font-size: 18px;
+ color: $primary-color;
display: flex;
align-items: center;
- .wt_content_row_list_img {
- width: 106px;
- height: 93px;
+ }
+ }
+
+ .wt_content {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+
+ .wt_content_row {
+ font-size: 14px;
+ color: rgb(51, 51, 51);
+ display: flex;
+ align-items: self-start;
+
+ .wt_content_row_label {
+ flex-shrink: 0;
+ font-size: 14px;
+ color: rgb(51, 51, 51);
+ }
+
+ .wt_content_row_list {
+ flex: 1;
display: flex;
align-items: center;
- justify-content: center;
- overflow-x: hidden;
- margin-right: 15px;
- &:last-child {
- margin: 0 !important;
- }
- img {
- width: 100%;
+
+ .wt_content_row_list_img {
+ width: 106px;
+ height: 93px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ overflow-x: hidden;
+ margin-right: 15px;
+
+ &:last-child {
+ margin: 0 !important;
+ }
+
+ img {
+ width: 100%;
+ }
}
}
}
diff --git a/admin/src/views/workorder/components/problemReportingDetails.vue b/admin/src/views/workorder/components/problemReportingDetails.vue
index 213c8d9..5093d72 100644
--- a/admin/src/views/workorder/components/problemReportingDetails.vue
+++ b/admin/src/views/workorder/components/problemReportingDetails.vue
@@ -1,83 +1,124 @@
<template>
<GlobalWindow
- title="闂涓婃姤璇︽儏"
+ :title="title"
:showConfirm="false"
:visible.sync="visible"
width="100%">
<div class="wt">
<div class="wt_head">
<div class="wt_head_title">
- 闂璇︽儏
- <el-tag style="margin-left: 10px;">杞伐鍗�</el-tag>
+ <div class="title">闂璇︽儏</div>
+ <el-tag style="margin-left: 10px;" v-if="form.dealStatus === 0">寰呭鐞�</el-tag>
+ <el-tag style="margin-left: 10px;" v-if="form.dealStatus === 1">宸茶浆宸ュ崟</el-tag>
+ <el-tag style="margin-left: 10px;" v-if="form.dealStatus === 2">宸插叧闂�</el-tag>
</div>
- <el-button>鏌ョ湅宸ュ崟</el-button>
+ <el-button @click="handleDetail" v-if="form.dealStatus === 1">鏌ョ湅宸ュ崟</el-button>
</div>
<div class="wt_content">
<div class="wt_content_row" style="width: 25%;">
- 浣嶇疆锛�-
+ 浣嶇疆锛歿{form.position || '-'}}
</div>
<div class="wt_content_row" style="width: 25%;">
- 涓婃姤浜猴細寮犱笁涓�
+ 涓婃姤浜猴細{{form.name || '-'}}
</div>
<div class="wt_content_row" style="width: 50%;">
- 涓婃姤浜虹數璇濓細180553847234
+ 涓婃姤浜虹數璇濓細{{form.phone || '-'}}
</div>
<div class="wt_content_row" style="width: 100%; margin-top: 15px;">
- 涓婃姤鏃堕棿锛�2024-11-21 12:00:23
+ 涓婃姤鏃堕棿锛歿{form.submitDate || '-'}}
</div>
<div class="wt_content_row" style="width: 100%; margin-top: 15px;">
- 闂鎻忚堪锛氳繖鏄棶棰樻弿杩拌繖鏄棶棰樻弿杩拌繖鏄棶棰樻弿杩拌繖鏄棶棰樻弿杩拌繖鏄棶棰樻弿杩拌繖鏄棶棰樻弿杩拌繖鏄棶棰樻弿杩拌繖鏄棶棰樻弿杩�
+ 闂鎻忚堪锛歿{form.content || '-'}}
</div>
<div class="wt_content_row" style="width: 100%; margin-top: 15px;">
<div class="wt_content_row_label">闂鍥剧墖锛�</div>
- <div class="wt_content_row_list">
- <div class="wt_content_row_list_img">
- <img src="" alt="" />
+ <div class="wt_content_row_list" v-if="form.fileList && form.fileList.length >= 0">
+ <div class="wt_content_row_list_img" v-for="(item, index) in form.fileList" :key="index">
+ <el-image
+ style="width: 100px; height: 100px"
+ :src="item.fileurlFull"
+ :preview-src-list="form.fileList.map(item => item.fileurlFull)">
+ </el-image>
</div>
</div>
</div>
</div>
<div class="wt_head">
<div class="wt_head_title">
- 澶勭悊缁撴灉
+ <div class="title">闂璇︽儏</div>
</div>
</div>
<div class="wt_content">
<div class="wt_content_row" style="width: 100%;">
- 澶勭悊浜猴細寮犱笁-琛屾斂閮�
+ 澶勭悊浜猴細{{form.dealUserName}}-{{form.dealUserCompanyName}}
</div>
<div class="wt_content_row" style="width: 100%; margin-top: 15px;">
- 澶勭悊鏃堕棿锛�2024-11-21 12:00:23
+ 澶勭悊鏃堕棿锛歿{form.dealDate || '-'}}
</div>
<div class="wt_content_row" style="width: 100%; margin-top: 15px;">
- 澶勭悊缁撴灉锛氳浆宸ュ崟
+ 澶勭悊缁撴灉锛歿{returnText(form.dealStatus)}}
</div>
- <div class="wt_content_row" style="width: 100%; margin-top: 15px;">
- 鍏抽棴璇存槑锛氳鏄庤鏄庤鏄庤鏄庤鏄庤鏄庤鏄庤鏄庤鏄庤鏄庤鏄庤鏄庤鏄庤鏄庤鏄庤鏄庤鏄�
+ <div class="wt_content_row" style="width: 100%; margin-top: 15px;" v-if="form.dealStatus === 2">
+ 鍏抽棴璇存槑锛歿{form.dealInfo}}
</div>
</div>
</div>
+ <!-- 宸ュ崟璇︽儏 -->
+ <Detail v-if="showDetail" ref="DetailRef" @close="showDetail = false" />
</GlobalWindow>
</template>
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
+ import Detail from './detail'
export default {
name: "problemReportingDetails",
extends: BaseOpera,
- components: { GlobalWindow },
+ components: { GlobalWindow, Detail },
data() {
return {
- info: {}
+ form: {},
+ showDetail: false,
}
},
methods: {
-
+ open (title, target) {
+ this.title = title
+ this.form = target
+ console.log(this.form)
+ this.visible = true
+ },
+ handleDetail() {
+ this.showDetail = true
+ this.$nextTick(() => {
+ this.$refs.DetailRef.visible = true
+ this.$refs.DetailRef.id = this.form.workorderId
+ this.$refs.DetailRef.getDetail()
+ })
+ },
+ returnText(status) {
+ if (status === 0) {
+ return '寰呭鐞�'
+ } else if (status === 1) {
+ return '宸茶浆宸ュ崟'
+ } else if (status === 2) {
+ return '宸插叧闂�'
+ } else {
+ return ''
+ }
+ }
}
}
</script>
-
+<style lang="scss" scoped>
+ @import '@/assets/style/variables.scss';
+ .title {
+ font-weight: 500;
+ font-size: 18px;
+ color: $primary-color;
+ }
+</style>
<style lang="scss" scoped>
.wt {
width: 100%;
diff --git a/admin/src/views/workorder/problemReporting.vue b/admin/src/views/workorder/problemReporting.vue
index 814bd32..ce2e560 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>
@@ -30,7 +30,11 @@
<el-table v-loading="isWorking.search" :data="tableData.list" stripe>
<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 prop="categoryName" 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>
@@ -48,8 +52,8 @@
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" @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: [],
@@ -99,7 +103,17 @@
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