From 470bd526f3e62ad331409a542638d836fea20665 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 23 十一月 2024 17:37:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/workorder/components/OperaYwWorkorderWindow.vue | 149 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 126 insertions(+), 23 deletions(-)
diff --git a/admin/src/views/workorder/components/OperaYwWorkorderWindow.vue b/admin/src/views/workorder/components/OperaYwWorkorderWindow.vue
index f292342..9eb7fcf 100644
--- a/admin/src/views/workorder/components/OperaYwWorkorderWindow.vue
+++ b/admin/src/views/workorder/components/OperaYwWorkorderWindow.vue
@@ -1,5 +1,5 @@
<template>
- <GlobalWindow :title="title" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm">
+ <GlobalWindow width="800px" :title="title" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm">
<el-form :model="form" ref="form" :rules="rules">
<el-form-item label="浣嶇疆绫诲瀷" prop="areaType">
<el-select v-model="form.areaType">
@@ -7,17 +7,38 @@
<el-option label="鍏叡缁翠慨" value="1"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鎶ヤ慨鍖哄煙">
-
- </el-form-item>
- <el-form-item label="鍒嗙被" prop="cateId">
- <el-select v-model="form.cateId">
- <el-option label="" value=""></el-option>
+ <el-form-item label="閫夋嫨椤圭洰" prop="projectId">
+ <el-select v-model="form.projectId" clearable filterable @change="getBuild">
+ <el-option v-for="item in projectList" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
- <el-form-item label="涓婇棬鏃堕棿" prop="getDate">
- <el-date-picker type="datetime" v-model="form.getDate" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="璇烽�夋嫨涓婇棬鏃堕棿"></el-date-picker>
+ <el-form-item label="閫夋嫨妤煎畤" prop="buildingId">
+ <el-select v-model="form.buildingId" clearable filterable @change="changeBuild">
+ <el-option v-for="item in buildList" :label="item.name" :value="item.id" />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="閫夋嫨妤煎眰" prop="floorId">
+ <el-select v-model="form.floorId">
+ <el-option v-for="item in levelList" clearable filterable :label="item.name" :value="item.id" />
+ </el-select>
+ </el-form-item>
+ <el-form-item v-if="form.areaType == 0" label="閫夋嫨鎴块棿" prop="roomId">
+ <el-select v-model="form.roomId" clearable filterable>
+ <el-option v-for="item in roomList" :label="item.name" :value="item.id" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍒嗙被" prop="cateId">
+ <el-cascader v-model="form.areaIds" @change="changeSel" placeholder="璇烽�夋嫨宸℃鍖哄煙" clearable :options="cateList"
+ :props="{
+ label: 'name',
+ value: 'id',
+ children: 'childCategoryList'
+ }"></el-cascader>
+ </el-form-item>
+ <el-form-item label="涓婇棬鏃堕棿" v-if="form.areaType == 0" prop="getDate">
+ <el-date-picker type="datetime" v-model="form.getDate" format="yyyy-MM-dd HH:mm"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="璇烽�夋嫨涓婇棬鏃堕棿"></el-date-picker>
</el-form-item>
<el-form-item label="鐜板満鍥剧墖">
<div class="file_list">
@@ -37,8 +58,8 @@
</div>
</div>
</el-form-item>
- <el-form-item label="鎯呭喌璇存槑" prop="content">
- <el-input type="textarea" :rows="4" v-model="form.content" placeholder="璇疯緭鍏ユ儏鍐佃鏄�" v-trim />
+ <el-form-item label="鎻忚堪" prop="content">
+ <el-input type="textarea" :rows="4" v-model="form.content" placeholder="璇疯緭鍏�" :maxlength="300" v-trim />
</el-form-item>
</el-form>
<!-- -->
@@ -49,7 +70,13 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
-import { Loading } from 'element-ui'
+import { Loading, Message } from 'element-ui'
+import { getProjectList } from '@/api/project/ywProject'
+import { getBuildList } from '@/api/project/ywBuilding'
+import { getRoomList } from '@/api/project/ywRoom'
+import { fetchList } from '@/api/project/yeFloor'
+import { fetchList as getCateList } from '@/api/business/category.js'
+import { rules } from './config'
export default {
name: 'OperaYwWorkorderWindow',
extends: BaseOpera,
@@ -63,6 +90,7 @@
createDate: '',
editor: '',
editDate: '',
+ floor: '',
isdeleted: '',
title: '',
remark: '',
@@ -72,6 +100,7 @@
getDate: '',
projectId: '',
buildingId: '',
+ floorId: '',
roomId: '',
userId: '',
phone: '',
@@ -90,8 +119,12 @@
},
loadingInstance: null,
// 楠岃瘉瑙勫垯
- rules: {
- },
+ rules,
+ projectList: [],
+ buildList: [],
+ levelList: [],
+ roomList: [],
+ cateList: [],
uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/uploadBatch',
fileList: [],
uploadData: {
@@ -106,11 +139,79 @@
})
},
methods: {
- beforeUpload (file) {
- if (['video/mp4', 'video/ogg', 'video/flv', 'video/avi', 'video/wmv', 'video/rmvb', 'image/jpeg','image/jpg', 'image/png', 'image/gif'].indexOf(file.type) == -1) {
+ open(title, target) {
+ this.title = title
+ this.visible = true
+ this.getProject()
+ this.getCate()
+ // 鏂板缓
+ if (target == null) {
+ this.$nextTick(() => {
+ this.$refs.form.resetFields()
+ this.form[this.configData['field.id']] = null
+ })
+ return
+ }
+ // 缂栬緫
+ this.$nextTick(() => {
+ for (const key in this.form) {
+ this.form[key] = target[key]
+ }
+ })
+ },
+ getProject() {
+ getProjectList({}).then(res => {
+ this.projectList = res
+ })
+ },
+ getBuild(projectId) {
+ this.$set(this.form, 'buildingId', '')
+ this.$set(this.form, 'floorId', '')
+ this.$set(this.form, 'roomId', '')
+ getBuildList({ projectId }).then(res => {
+ this.buildList = res
+ })
+ },
+ changeBuild(e) {
+ this.$set(this.form, 'floorId', '')
+ this.$set(this.form, 'roomId', '')
+ this.getLevel(e)
+ this.getRoom(e)
+ },
+ getLevel(buildingId) {
+ fetchList({ model: { buildingId }, capacity: 9999, page: 1 }).then(res => {
+ this.levelList = res.records
+ })
+ },
+ getRoom(buildingId) {
+ const { form } = this
+ getRoomList({ buildingId }).then(res => {
+ this.roomList = res
+ })
+ },
+ changeSel(e) {
+ if(e && e.length == 2){
+ this.$set(this.form, 'cateId', e[1])
+ }else{
+ this.$set(this.form, 'cateId', '')
+ }
+
+ },
+ getCate() {
+ getCateList({
+ model: { type: 3 },
+ capacity: 1000,
+ page: 1,
+ }).then(res => {
+ this.cateList = res.records || []
+ })
+ },
+ beforeUpload(file) {
+ if (['video/mp4', 'video/ogg', 'video/flv', 'video/avi', 'video/wmv', 'video/rmvb', 'image/jpeg', 'image/jpg', 'image/png', 'image/gif'].indexOf(file.type) == -1) {
this.$message.error('璇蜂笂浼犳纭殑瑙嗛/鍥剧墖鏍煎紡')
return false
}
+ if (this.fileList.length > 8) return Message.warning('鐜板満鍥剧墖涓嶈兘瓒呰繃9寮�')
this.loadingInstance = Loading.service({
lock: true,
text: 'Loading',
@@ -120,14 +221,14 @@
},
uploadError() {
this.$nextTick(() => { // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
- if(this.loadingInstance){
+ if (this.loadingInstance) {
this.loadingInstance.close()
}
})
},
- uploadAvatarSuccess (file) {
+ uploadAvatarSuccess(file) {
this.$nextTick(() => { // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
- if(this.loadingInstance){
+ if (this.loadingInstance) {
this.loadingInstance.close()
}
})
@@ -150,10 +251,10 @@
// this.$set(this.param, 'faceImg', file.imgurl)
// this.$set(this.param, 'faceImgUrl', file.imgurlfull)
},
- handleDelImg (i) {
+ handleDelImg(i) {
this.fileList.splice(i, 1)
},
- close(){
+ close() {
this.isShowModal = false
this.$emit('close')
}
@@ -164,7 +265,8 @@
.file_list {
display: flex;
flex-wrap: wrap;
- .avatar-uploader{
+
+ .avatar-uploader {
width: 92px;
height: 92px;
display: flex;
@@ -172,6 +274,7 @@
align-items: center;
border: 1px dashed #d9d9d9;
}
+
.item {
width: 92px;
max-height: 92px;
--
Gitblit v1.9.3