-
新增房屋
@@ -162,6 +163,7 @@ let loading // 加载动画
export default {
data () {
return {
+ source: 'tree',//来源
importRoomLoading: false,
total: 0,
pageSize: 20,
@@ -236,6 +238,7 @@ export default {
async loadTable (source, treeObj, ownerName, ownerPhone, rentFlag) {
+ this.source = source
this.tableLoading = true
if (source === 'tree') {//来源于tree，查询数据清空
@@ -272,8 +275,8 @@ export default {
this.total = data.total
this.validTableDataNum = 0
data.list.forEach(item => {
- item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + '单元' + item.doorName
- item.unitNumShow = item.unitNum + '单元'
+ item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + item.doorName
+
if (item.agencyId === this.staffAgencyId) {
item.showBtn = true
this.validTableDataNum++
@@ -298,6 +301,7 @@ export default {
this.formTitle = '房屋详情'
this.formShow = true
this.$nextTick(() => {
+
this.$refs.ref_form.initForm('detail', row, this.agencyObj)
})
},
@@ -307,6 +311,7 @@ export default {
this.formTitle = '新增房屋'
this.formShow = true
this.$nextTick(() => {
+ console.log(this.agencyObj)
this.$refs.ref_form.initForm('add', null, this.agencyObj)
})
},
diff --git a/src/views/modules/base/epidemic/travelForm.vue b/src/views/modules/base/epidemic/travelForm.vue
index 456b2fc49..9647aef24 100644
--- a/src/views/modules/base/epidemic/travelForm.vue
+++ b/src/views/modules/base/epidemic/travelForm.vue
@@ -346,21 +346,20 @@ export default {
return w + 'px'
},
lzayLoadArea(node, resolve) {
- this.getArea(node, resolve)
- // setTimeout(() => {
-
- // }, 1000)
+ // this.getArea(node, resolve)
+ setTimeout(() => {
+ this.getArea(node, resolve)
+ }, 200)
},
async initForm (type, row) {
console.log('row----', row)
this.formType = type
this.formData.agencyId = this.agencyId
if (type != 'add') {
- this.formData = { ...row, channel: [], content: '' }
- this.sourceAllCode = row.sourceAddressPathCode && row.sourceAddressPathCode.split(',')
+ // this.formData = { ...row, channel: [], content: '' }
+ await this.loadFormData(row.id)
+
- if (row.userType == 'icresi') this.isFromResi = true
- else this.nowAllCode = row.presentAddressPathCode && row.presentAddressPathCode.split(',')
} else {
const { user } = this.$store.state
this.nowAllCode = user.areaCodePath
@@ -507,35 +506,20 @@ export default {
this.handleSelAddress(personItem.houseId)
},
- async loadFormData () {
+ async loadFormData (id) {
- // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/detail'
- const url = '/epmetuser/icNat/detail'
+ const url = '/epmetuser/tripreport/detail'
let params = {
- icNatId: this.icNatId,
+ id,
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
- this.formData = data
- this.formData.icNatId = this.icNatId
- this.fileList = []
- if (data.fileName) {
- let obj = {
- name: data.fileName,
- type: data.attachmentType,
- url: data.attachmentUrl,
- }
- // data.attachmentList.forEach(element => {
- // element.name = element.fileName
- // element.type = element.attachmentType
- // element.size = element.attachmentSize
- // });
- this.fileList.push(obj)
-
- }
-
- this.hideUploadEdit = this.fileList.length >= this.limitNum;
-
+ console.log('deda-------', data)
+ this.formData = { ...data, channel: [], content: '' }
+ this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
+
+ if (data.userType == 'icresi') this.isFromResi = true
+ else this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
} else {
this.$message.error(msg)
}
@@ -592,58 +576,6 @@ export default {
},
- handleRemove (file, fileList) {
- this.hideUploadEdit = fileList.length >= this.limitNum;
- this.formData.fileName = ''
- this.formData.attachmentUrl = ''
- this.formData.attachmentType = ''
- this.fileList = []
-
- },
- handlePictureCardPreview (file) {
- this.dialogImageUrl = file.url;
- this.dialogVisible = true;
- },
-
- handleEditChange (file, fileList) {
- this.hideUploadEdit = fileList.length >= this.limitNum;
-
- },
-
- beforeUpload (file) {
- const array = file.name.split('.')
- const extension = array[array.length - 1]
- // const isLt1M = (file.size / 1024 / 1024) < 5
- if (extension !== 'jpg'
- && extension !== 'png'
- && extension !== 'gif'
- ) {
- this.$message.error('只能上传jpg、png、gif文件！')
- return false
- }
- // if (!isLt1M) {
- // this.$message.error('上传文件大小不能超过 5MB!')
- // }
- // return isLt1M
-
- },
-
- handleFileSuccess (res, file) {
-
- if (res.code === 0 && res.msg === 'success') {
- const array = file.name.split('.')
- const fileType = array[array.length - 1]
-
- this.formData.fileName = file.name
- this.formData.attachmentUrl = res.data.url
- this.formData.attachmentType = 'image'
-
- file.attachmentFormat = fileType
- file.attachmentSize = file.size
-
- } else this.$message.error(res.msg)
- },
-
resetData () {
this.$refs.ref_form.resetFields()
this.formData.sourceAddressCode = ''
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
new file mode 100644
index 000000000..0e42a655c
--- /dev/null
+++ b/src/views/modules/base/organization/organization.vue
@@ -0,0 +1,2195 @@
+
+
+
+
+
+
+ {{ breadcrumb.name }}
+ {{ breadcrumb.name }}
+ 修改
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 进入
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 进入
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 进入
+
+
+
+
+
+
+
+
+
+ {{ role }}
+
+
+
+
+ 新增
+
+
+ 修改
+ 查看
+ 调动
+ 禁用
+
+
+
+
+
+
+
+
+
+ {{ role }}
+
+
+
+
+ 新增
+
+
+ 修改
+ 查看
+ 调动
+ 禁用
+
+
+
+
+
+
+
+
+
+ {{ role }}
+
+
+
+
+ 新增
+
+
+ 修改
+ 查看
+ 调动
+ 禁用
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 当前点击坐标为：
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+ 禁用后该用户将无法登录系统，是否继续？
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关 闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/modules/shequ/cpts/fangwu-info.vue b/src/views/modules/shequ/cpts/fangwu-info.vue
index 15babd2f4..272489744 100644
--- a/src/views/modules/shequ/cpts/fangwu-info.vue
+++ b/src/views/modules/shequ/cpts/fangwu-info.vue
@@ -9,7 +9,7 @@
class="form"
>
@@ -17,7 +17,7 @@
@@ -25,7 +25,7 @@
{{ dataForm.ownerName }}
{{ dataForm.ownerPhone }}
-
+
{{ dataForm.statusName }}
@@ -21,7 +21,7 @@
@@ -29,7 +29,7 @@
@@ -37,32 +37,32 @@
{{ dataForm.reportTypeName }}
-
+
{{ dataForm.reportUserName }}
{{ dataForm.reportTime }}
-
+
{{ dataForm.demandUserName }}
@@ -71,7 +71,7 @@
@@ -84,7 +84,7 @@
dataForm.serviceEndTime &&
dataForm.status == 'finished'
"
- label="实际服务时间"
+ label="实际服务时间："
label-width="150px"
style="display: block"
>
@@ -97,7 +97,7 @@
@@ -108,7 +108,7 @@
@@ -117,7 +117,7 @@
@@ -126,7 +126,7 @@
@@ -208,7 +208,7 @@ export default {
.div_btn {
display: flex;
- justify-content: flex-end;
+ justify-content: center;
}
.el-tabs {
margin: 0 20px;
diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue
index 3eed29d44..44e86cca3 100644
--- a/src/views/modules/shequ/index.vue
+++ b/src/views/modules/shequ/index.vue
@@ -138,7 +138,7 @@
label="用途">
+ label="房屋状态">
diff --git a/src/views/modules/visual/warning/components/screen-table/index.vue b/src/views/modules/visual/warning/components/screen-table/index.vue
index e5606ec92..b0e0df0d6 100644
--- a/src/views/modules/visual/warning/components/screen-table/index.vue
+++ b/src/views/modules/visual/warning/components/screen-table/index.vue
@@ -23,33 +23,10 @@
:key="indexs"
:style="tableContentStyle[indexs]"
>
-