From 14a20df4699cf3d933e2bdbe1ba2aba15ade1059 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 26 十一月 2024 09:20:02 +0800
Subject: [PATCH] 解决冲突
---
admin/src/views/workorder/components/OperaYwWorkorderWindow.vue | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/workorder/components/OperaYwWorkorderWindow.vue b/admin/src/views/workorder/components/OperaYwWorkorderWindow.vue
index 9eb7fcf..8542213 100644
--- a/admin/src/views/workorder/components/OperaYwWorkorderWindow.vue
+++ b/admin/src/views/workorder/components/OperaYwWorkorderWindow.vue
@@ -1,5 +1,5 @@
<template>
- <GlobalWindow width="800px" :title="title" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm">
+ <GlobalWindow width="800px" :title="title" :visible.sync="visible" @close="close" :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">
@@ -18,14 +18,14 @@
</el-select>
</el-form-item>
- <el-form-item label="閫夋嫨妤煎眰" prop="floorId">
+ <el-form-item v-if="form.areaType == 1" 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-option v-for="item in roomList" :label="item.roomNum" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="鍒嗙被" prop="cateId">
@@ -74,7 +74,7 @@
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 { getFloorList } from '@/api/project/yeFloor'
import { fetchList as getCateList } from '@/api/business/category.js'
import { rules } from './config'
export default {
@@ -128,7 +128,7 @@
uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/uploadBatch',
fileList: [],
uploadData: {
- folder: 'HIDDEN_DANGER_FILE'
+ folder: 'YW_WORKORDER_FILE'
},
}
},
@@ -159,6 +159,10 @@
}
})
},
+ close() {
+ this.visible = false
+ this.$emit('close')
+ },
getProject() {
getProjectList({}).then(res => {
this.projectList = res
@@ -175,12 +179,17 @@
changeBuild(e) {
this.$set(this.form, 'floorId', '')
this.$set(this.form, 'roomId', '')
- this.getLevel(e)
- this.getRoom(e)
+ if(this.form.areaType == 1){
+ this.getLevel(e)
+ }else{
+ this.getRoom(e)
+ }
+
+
},
getLevel(buildingId) {
- fetchList({ model: { buildingId }, capacity: 9999, page: 1 }).then(res => {
- this.levelList = res.records
+ getFloorList({ buildingId}).then(res => {
+ this.levelList = res
})
},
getRoom(buildingId) {
@@ -195,7 +204,6 @@
}else{
this.$set(this.form, 'cateId', '')
}
-
},
getCate() {
getCateList({
@@ -247,12 +255,14 @@
fileurlFull: item.url
})
}
- console.log('file', this.fileList)
- // this.$set(this.param, 'faceImg', file.imgurl)
+
+ // console.log('file', this.fileList)
+ this.$set(this.form, 'fileList', this.fileList)
// this.$set(this.param, 'faceImgUrl', file.imgurlfull)
},
handleDelImg(i) {
this.fileList.splice(i, 1)
+ this.$set(this.form, 'fileList', this.fileList)
},
close() {
this.isShowModal = false
--
Gitblit v1.9.3