From b8c400737f3f2ab806b46b29311fa96442e93c2a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 29 Jan 2024 11:17:36 +0800
Subject: [PATCH] 有选择小区的地方是否做过滤处理
---
src/views/property/inviteTenders.vue | 2
src/views/property/oiae.vue | 2
src/views/property/propertyCapitalApply.vue | 935 +++++++++++++++++++++++++++++-----------------------------
src/views/property/ownersCommittee.vue | 2
src/views/property/propertyCompanyDistrict.vue | 2
5 files changed, 472 insertions(+), 471 deletions(-)
diff --git a/src/views/property/inviteTenders.vue b/src/views/property/inviteTenders.vue
index b91c1ab..1dd609f 100644
--- a/src/views/property/inviteTenders.vue
+++ b/src/views/property/inviteTenders.vue
@@ -689,7 +689,7 @@
this.loading = false
this.selectionClear()
})
- getDistrictTree(params = {}).then((res) => {
+ getDistrictTree({ filterFlag: 1 }).then((res) => {
const data = res.data.data
this.districtTree = data
const column = this.findObject(this.option.column, "articleList")
diff --git a/src/views/property/oiae.vue b/src/views/property/oiae.vue
index 6e6301c..c6cf91f 100644
--- a/src/views/property/oiae.vue
+++ b/src/views/property/oiae.vue
@@ -703,7 +703,7 @@
this.loading = false
this.selectionClear()
})
- getDistrictTree(params = {}).then((res) => {
+ getDistrictTree({ filterFlag: 1 }).then((res) => {
const data = res.data.data
this.districtTree = data
const column = this.findObject(this.option.column, "articleList")
diff --git a/src/views/property/ownersCommittee.vue b/src/views/property/ownersCommittee.vue
index 6c83d50..8495221 100644
--- a/src/views/property/ownersCommittee.vue
+++ b/src/views/property/ownersCommittee.vue
@@ -568,7 +568,7 @@
this.loading = false
this.selectionClear()
})
- getDistrictTree(params = {}).then((res) => {
+ getDistrictTree({ filterFlag: 1 }).then((res) => {
const data = res.data.data
this.districtTree = data
const column = this.findObject(this.option.column, "articleList")
diff --git a/src/views/property/propertyCapitalApply.vue b/src/views/property/propertyCapitalApply.vue
index 3bb2e02..1b052d1 100644
--- a/src/views/property/propertyCapitalApply.vue
+++ b/src/views/property/propertyCapitalApply.vue
@@ -1,506 +1,507 @@
<!-- 物业公司管理 -->
<template>
- <basic-container>
- <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
- v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
- @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
- @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+ <basic-container>
+ <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
+ v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
+ :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
+ @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+ @refresh-change="refreshChange" @on-load="onLoad">
- <template slot-scope="{ row, size, index }" slot="menu">
- <el-button :size="size" type="text" v-if="row.applyStatus === 4" @click="handleWork(row)">调整申请
- </el-button>
- <el-button :size="size" type="text" @click="goDetail(row)">查看申请
- </el-button>
- <!-- <el-button :size="size" type="text" @click="goDetail(row)">删 除
+ <template slot-scope="{ row, size, index }" slot="menu">
+ <el-button :size="size" type="text" v-if="row.applyStatus === 4" @click="handleWork(row)">调整申请
+ </el-button>
+ <el-button :size="size" type="text" @click="goDetail(row)">查看申请
+ </el-button>
+ <!-- <el-button :size="size" type="text" @click="goDetail(row)">删 除
</el-button> -->
- </template>
- <!-- <template slot="menuLeft">
+ </template>
+ <!-- <template slot="menuLeft">
<el-button size="small" icon="el-icon-delete" plain v-if="permission.propertyCapitalApply_delete"
@click="handleDelete">删 除
</el-button>
</template> -->
- <!-- <template slot="constructionSchemeUrlsType" slot-scope="{file}">
+ <!-- <template slot="constructionSchemeUrlsType" slot-scope="{file}">
<span>{{ file }}</span>
</template> -->
- </avue-crud>
- </basic-container>
+ </avue-crud>
+ </basic-container>
</template>
<script>
- import {
+import {
getList,
remove,
update,
add,
getPropertyCapitalApply
- } from "@/api/property/propertyCapitalApply"
- import {
+} from "@/api/property/propertyCapitalApply"
+import {
mapGetters
- } from "vuex"
- import website from '@/config/website'
- import func from "@/util/func"
- export default {
- data() {
- return {
- form: {
- // constructionSchemeUrls:[]
- },
- query: {},
- loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0,
- },
- datetime: "",
- selectionList: [],
- option: {
- labelWidth: 154,
- searchLabelWidth: 96,
- searchShow: true,
- searchMenuSpan: 3,
- menuWidth: 210,
+} from "vuex"
+import website from '@/config/website'
+import func from "@/util/func"
+export default {
+ data () {
+ return {
+ form: {
+ // constructionSchemeUrls:[]
+ },
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ datetime: "",
+ selectionList: [],
+ option: {
+ labelWidth: 154,
+ searchLabelWidth: 96,
+ searchShow: true,
+ searchMenuSpan: 3,
+ menuWidth: 210,
- height: "auto",
- calcHeight: 54,
- dialogWidth: 1150,
- tip: false,
- border: true,
- //stripe:true,
- index: true,
- editBtn: false,
- viewBtn: false,
- delBtn: false,
- selection: true,
- dialogClickModal: false,
- column: [{
- width: 220,
- overHidden: true,
- label: '小区名称',
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- prop: "districtName",
- search: true,
- searchSpan: 4,
- rules: [{
- required: true,
- message: "请输入小区名称",
- trigger: "blur",
- }],
- },
+ height: "auto",
+ calcHeight: 54,
+ dialogWidth: 1150,
+ tip: false,
+ border: true,
+ //stripe:true,
+ index: true,
+ editBtn: false,
+ viewBtn: false,
+ delBtn: false,
+ selection: true,
+ dialogClickModal: false,
+ column: [{
+ width: 220,
+ overHidden: true,
+ label: '小区名称',
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ prop: "districtName",
+ search: true,
+ searchSpan: 4,
+ rules: [{
+ required: true,
+ message: "请输入小区名称",
+ trigger: "blur",
+ }],
+ },
- {
- hide: true,
- parent: false,
- label: "小区",
- prop: "districtId",
- search: false,
- type: 'tree',
- dicUrl: `/api/blade-district/district/getDistrictTree`,
- props: {
- label: "name",
- value: "id"
- },
- defaultExpandedKeys: ["361102003"],
- span: 12,
- width: 260,
- rules: [{
- required: true,
- message: "请选择小区",
- trigger: "blur",
- }, ],
- },
+ {
+ hide: true,
+ parent: false,
+ label: "小区",
+ prop: "districtId",
+ search: false,
+ type: 'tree',
+ dicUrl: `/api/blade-district/district/getDistrictTree?filterFlag=1`,
+ props: {
+ label: "name",
+ value: "id"
+ },
+ defaultExpandedKeys: ["361102003"],
+ span: 12,
+ width: 260,
+ rules: [{
+ required: true,
+ message: "请选择小区",
+ trigger: "blur",
+ },],
+ },
- {
- label: '维修项目名称',
- prop: 'name',
- searchSpan: 5,
- searchLabelWidth: 124,
- search: true,
- span: 12,
- rules: [{
- required: true,
- message: "请输入维修项目名称",
- trigger: "blur",
- }, ],
+ {
+ label: '维修项目名称',
+ prop: 'name',
+ searchSpan: 5,
+ searchLabelWidth: 124,
+ search: true,
+ span: 12,
+ rules: [{
+ required: true,
+ message: "请输入维修项目名称",
+ trigger: "blur",
+ },],
+ },
+ {
+ width: 100,
+ label: "预计开工时间",
+ prop: "runTime",
+ span: 12,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ rules: [{
+ required: true,
+ message: "请选择合同开始时间",
+ trigger: "blur",
+ },],
+ },
+ {
+ width: 100,
+ label: "预计竣工时间",
+ prop: "completedTime",
+ span: 12,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ rules: [{
+ required: true,
+ message: "请选择合同结束时间",
+ trigger: "blur",
+ },],
+ },
+ {
+ label: "项目分摊方式",
+ prop: "allocationWay",
+ value: '按建筑面积分摊',
+ span: 12,
+ row: true,
+ },
+ {
+ width: 110,
+ label: '联系人',
+ prop: 'linkman',
+ span: 12,
+ searchSpan: 4,
+ searchLabelWidth: 80,
+ search: true,
+ rules: [{
+ required: true,
+ message: "请输入联系人",
+ trigger: "blur",
+ },],
+ },
+ {
+ width: 120,
+ label: '联系方式',
+ prop: 'linkPhone',
+ span: 12,
+ rules: [{
+ required: true,
+ message: "请输入联系方式",
+ trigger: "blur",
+ },],
+ },
+ {
+ width: 100,
+ label: '申请时间',
+ prop: 'applyTime',
+ span: 12,
+ display: false,
+ }, {
+ label: '审核进度',
+ prop: 'applyStatus',
+ span: 12,
+ display: false,
+ dicData: [{
+ label: "待审核",
+ value: 0,
+ }, {
+ label: "业委会",
+ value: 1,
+ }, {
+ label: "街道",
+ value: 2,
+ }, {
+ label: "住建局",
+ value: 3,
+ }, {
+ label: "调整申请",
+ value: 4,
+ }, {
+ label: "审核通过",
+ value: 5,
+ }, {
+ label: "审核不通过",
+ value: 6,
+ }]
+ },
+ {
+ label: "项目预算总金额(元)",
+ prop: "budgetAmount",
+ span: 12,
+ hide: true,
+ type: 'number',
+ precision: 2,
+ value: '0.00'
+ },
+ {
+ label: "实际预算金额(元)",
+ prop: "actualAmount",
+ span: 12,
+ hide: true,
+ type: 'number',
+ precision: 2,
+ value: '0.00'
+ },
+ {
+ label: "自筹金额(元)",
+ prop: "selfAmount",
+ span: 12,
+ hide: true,
+ type: 'number',
+ precision: 2,
+ value: '0.00'
+ },
+ {
+ label: "预算应拨付金额(元)",
+ prop: "budgetAppropriateAmount",
+ span: 12,
+ hide: true,
+ type: 'number',
+ precision: 2,
+ value: '0.00'
+ },
+ {
+ label: "项目摘要",
+ span: 24,
+ hide: true,
+ prop: "projectDigest",
+ placeholder: "例如:“XX小区XX栋XX设施设备维修，总的预算金额是X，是否含有审价，本次维修涉及范围共XX户，总面积的建筑面积为XX平方米”",
+ type: "textarea"
+ },
+ {
+ label: "项目进度描述",
+ span: 24,
+ hide: true,
+ prop: "projectDescribe",
+ type: "textarea"
+ },
+ {
+ label: '施工方案附件',
+ prop: 'constructionSchemeUrls',
+ type: 'upload',
+ span: 24,
+ hide: true,
+ multiple: true,
+ // showFileList: true,
+ propsHttp: {
+ res: 'data',
+ name: "originalName",
+ url: "link"
+ },
+ action: '/api/blade-resource/oss/endpoint/put-file-attach',
+ rules: [{
+ required: true,
+ message: "请上传施工方案",
+ trigger: "blur",
+ },],
+ }
+ ],
},
- {
- width: 100,
- label: "预计开工时间",
- prop: "runTime",
- span: 12,
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- rules: [{
- required: true,
- message: "请选择合同开始时间",
- trigger: "blur",
- }, ],
- },
- {
- width: 100,
- label: "预计竣工时间",
- prop: "completedTime",
- span: 12,
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- rules: [{
- required: true,
- message: "请选择合同结束时间",
- trigger: "blur",
- }, ],
- },
- {
- label: "项目分摊方式",
- prop: "allocationWay",
- value: '按建筑面积分摊',
- span: 12,
- row: true,
- },
- {
- width: 110,
- label: '联系人',
- prop: 'linkman',
- span: 12,
- searchSpan: 4,
- searchLabelWidth: 80,
- search: true,
- rules: [{
- required: true,
- message: "请输入联系人",
- trigger: "blur",
- }, ],
- },
- {
- width: 120,
- label: '联系方式',
- prop: 'linkPhone',
- span: 12,
- rules: [{
- required: true,
- message: "请输入联系方式",
- trigger: "blur",
- }, ],
- },
- {
- width: 100,
- label: '申请时间',
- prop: 'applyTime',
- span: 12,
- display: false,
- }, {
- label: '审核进度',
- prop: 'applyStatus',
- span: 12,
- display: false,
- dicData: [{
- label: "待审核",
- value: 0,
- }, {
- label: "业委会",
- value: 1,
- }, {
- label: "街道",
- value: 2,
- }, {
- label: "住建局",
- value: 3,
- }, {
- label: "调整申请",
- value: 4,
- }, {
- label: "审核通过",
- value: 5,
- }, {
- label: "审核不通过",
- value: 6,
- }]
- },
- {
- label: "项目预算总金额(元)",
- prop: "budgetAmount",
- span: 12,
- hide: true,
- type: 'number',
- precision: 2,
- value: '0.00'
- },
- {
- label: "实际预算金额(元)",
- prop: "actualAmount",
- span: 12,
- hide: true,
- type: 'number',
- precision: 2,
- value: '0.00'
- },
- {
- label: "自筹金额(元)",
- prop: "selfAmount",
- span: 12,
- hide: true,
- type: 'number',
- precision: 2,
- value: '0.00'
- },
- {
- label: "预算应拨付金额(元)",
- prop: "budgetAppropriateAmount",
- span: 12,
- hide: true,
- type: 'number',
- precision: 2,
- value: '0.00'
- },
- {
- label: "项目摘要",
- span: 24,
- hide: true,
- prop: "projectDigest",
- placeholder: "例如:“XX小区XX栋XX设施设备维修，总的预算金额是X，是否含有审价，本次维修涉及范围共XX户，总面积的建筑面积为XX平方米”",
- type: "textarea"
- },
- {
- label: "项目进度描述",
- span: 24,
- hide: true,
- prop: "projectDescribe",
- type: "textarea"
- },
- {
- label: '施工方案附件',
- prop: 'constructionSchemeUrls',
- type: 'upload',
- span: 24,
- hide: true,
- multiple: true,
- // showFileList: true,
- propsHttp: {
- res: 'data',
- name: "originalName",
- url: "link"
- },
- action: '/api/blade-resource/oss/endpoint/put-file-attach',
- rules: [{
- required: true,
- message: "请上传施工方案",
- trigger: "blur",
- }, ],
- }
- ],
- },
- data: [],
- }
+ data: [],
+ }
},
watch: {},
computed: {
- ...mapGetters(["permission", "userInfo"]),
- permissionList() {
- return {
- addBtn: this.vaildData(this.permission.propertyCapitalApply_add, true),
- viewBtn: this.vaildData(this.permission.propertyCapitalApply_view, true),
- delBtn: this.vaildData(this.permission.propertyCapitalApply_delete, true),
- editBtn: this.vaildData(this.permission.propertyCapitalApply_edit, true),
- }
- },
- ids() {
- let ids = []
- this.selectionList.forEach((ele) => {
- ids.push(ele.id)
- })
- return ids.join(",")
- },
+ ...mapGetters(["permission", "userInfo"]),
+ permissionList () {
+ return {
+ addBtn: this.vaildData(this.permission.propertyCapitalApply_add, true),
+ viewBtn: this.vaildData(this.permission.propertyCapitalApply_view, true),
+ delBtn: this.vaildData(this.permission.propertyCapitalApply_delete, true),
+ editBtn: this.vaildData(this.permission.propertyCapitalApply_edit, true),
+ }
+ },
+ ids () {
+ let ids = []
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id)
+ })
+ return ids.join(",")
+ },
},
methods: {
- handleWork(row) {
- this.$router.push({
- path: `/work/process/maintenanceFundApply/edit/${row.taskId}/${row.processInstanceId}/${row.id}`
- })
- },
- goDetail(row) {
- this.$router.push({
- path: `/work/process/maintenanceFundApply/detail/${row.processInstanceId}/${row.id}`
- })
- },
- rowSave(row, done, loading) {
- row.constructionSchemeUrls = func.join(row.constructionSchemeUrls)
- if (row.constructionSchemeUrls.length > 0) {
- var urls = []
- var split = row.constructionSchemeUrls.split(",")
- split.forEach(url => {
- var names = url.split("jczz/")
- urls.push(names[1])
- })
- row.constructionSchemeUrls = urls.join(",")
- }
- row.propertyFlag = 1
- add(row).then(
- () => {
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!",
+ handleWork (row) {
+ this.$router.push({
+ path: `/work/process/maintenanceFundApply/edit/${row.taskId}/${row.processInstanceId}/${row.id}`
})
+ },
+ goDetail (row) {
+ this.$router.push({
+ path: `/work/process/maintenanceFundApply/detail/${row.processInstanceId}/${row.id}`
+ })
+ },
+ rowSave (row, done, loading) {
+ row.constructionSchemeUrls = func.join(row.constructionSchemeUrls)
+ if (row.constructionSchemeUrls.length > 0) {
+ var urls = []
+ var split = row.constructionSchemeUrls.split(",")
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.constructionSchemeUrls = urls.join(",")
+ }
+ row.propertyFlag = 1
+ add(row).then(
+ () => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
+ rowUpdate (row, index, done, loading) {
+ if (row.constructionSchemeUrls.length > 0) {
+ var urls = []
+ var split = row.constructionSchemeUrls.split(",")
+ split.forEach(url => {
+ var names = url.split("jczz/")
+ urls.push(names[1])
+ })
+ row.constructionSchemeUrls = urls.join(",")
+ }
+ update(row).then(
+ () => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ done()
+ },
+ (error) => {
+ window.console.log(error)
+ loading()
+ }
+ )
+ },
+ rowDel (row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(row.id)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ })
+ },
+ searchReset () {
+ this.query = {}
+ this.onLoad(this.page)
+ },
+ searchChange (params, done) {
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
done()
- },
- (error) => {
- window.console.log(error)
- loading()
- }
- )
- },
- rowUpdate(row, index, done, loading) {
- if (row.constructionSchemeUrls.length > 0) {
- var urls = []
- var split = row.constructionSchemeUrls.split(",")
- split.forEach(url => {
- var names = url.split("jczz/")
- urls.push(names[1])
- })
- row.constructionSchemeUrls = urls.join(",")
- }
- update(row).then(
- () => {
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!",
- })
- done()
- },
- (error) => {
- window.console.log(error)
- loading()
- }
- )
- },
- rowDel(row) {
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- return remove(row.id)
- })
- .then(() => {
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!",
- })
- })
- },
- searchReset() {
- this.query = {}
- this.onLoad(this.page)
- },
- searchChange(params, done) {
- this.query = params
- this.page.currentPage = 1
- this.onLoad(this.page, params)
- done()
- },
- selectionChange(list) {
- this.selectionList = list
- },
- selectionClear() {
- this.selectionList = []
- this.$refs.crud.toggleSelection()
- },
- handleDelete() {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据")
- return
- }
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(() => {
- return remove(this.ids)
- })
- .then(() => {
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!",
- })
+ },
+ selectionChange (list) {
+ this.selectionList = list
+ },
+ selectionClear () {
+ this.selectionList = []
this.$refs.crud.toggleSelection()
- })
- },
- beforeOpen(done, type) {
- if (["edit", "view"].includes(type)) {
- getPropertyCapitalApply(this.form.id).then((res) => {
- this.form = res.data.data
- this.form.propertyFlag = 1
- if (this.form.constructionSchemeUrls.length > 0) {
- var urls = []
- var names = this.form.constructionSchemeUrls.split(",")
- names.forEach(name => {
- urls.push(website.minioUrl + name)
- })
- this.form.constructionSchemeUrls = urls.join(",")
+ },
+ handleDelete () {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据")
+ return
}
- })
- }
- // con
- done()
- },
- currentChange(currentPage) {
- this.page.currentPage = currentPage
- },
- sizeChange(pageSize) {
- this.page.pageSize = pageSize
- },
- refreshChange() {
- this.onLoad(this.page, this.query)
- },
- onLoad(page, params = {}) {
- const {
- dateTime
- } = this.query
- let values = {
- ...params,
- }
- if (dateTime) {
- values = {
- ...params,
- startTime: dateTime[0],
- endTime: dateTime[1],
- ...this.query,
- }
- values.dateTime = null
- }
- this.loading = true
- getList(page.currentPage, page.pageSize, values).then((res) => {
- const data = res.data.data
- this.page.total = data.total
- this.data = data.records
- this.data.forEach(item => {
- if (item.constructionSchemeUrls.length > 0) {
- var urls = []
- var names = item.constructionSchemeUrls.split(",")
- names.forEach(name => {
- urls.push(website.minioUrl + name)
- })
- item.constructionSchemeUrls = urls.join(",")
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(this.ids)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.$refs.crud.toggleSelection()
+ })
+ },
+ beforeOpen (done, type) {
+ if (["edit", "view"].includes(type)) {
+ getPropertyCapitalApply(this.form.id).then((res) => {
+ this.form = res.data.data
+ this.form.propertyFlag = 1
+ if (this.form.constructionSchemeUrls.length > 0) {
+ var urls = []
+ var names = this.form.constructionSchemeUrls.split(",")
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ this.form.constructionSchemeUrls = urls.join(",")
+ }
+ })
}
- })
- this.loading = false
- this.selectionClear()
- })
- }
+ // con
+ done()
+ },
+ currentChange (currentPage) {
+ this.page.currentPage = currentPage
+ },
+ sizeChange (pageSize) {
+ this.page.pageSize = pageSize
+ },
+ refreshChange () {
+ this.onLoad(this.page, this.query)
+ },
+ onLoad (page, params = {}) {
+ const {
+ dateTime
+ } = this.query
+ let values = {
+ ...params,
+ }
+ if (dateTime) {
+ values = {
+ ...params,
+ startTime: dateTime[0],
+ endTime: dateTime[1],
+ ...this.query,
+ }
+ values.dateTime = null
+ }
+ this.loading = true
+ getList(page.currentPage, page.pageSize, values).then((res) => {
+ const data = res.data.data
+ this.page.total = data.total
+ this.data = data.records
+ this.data.forEach(item => {
+ if (item.constructionSchemeUrls.length > 0) {
+ var urls = []
+ var names = item.constructionSchemeUrls.split(",")
+ names.forEach(name => {
+ urls.push(website.minioUrl + name)
+ })
+ item.constructionSchemeUrls = urls.join(",")
+ }
+ })
+ this.loading = false
+ this.selectionClear()
+ })
+ }
}
- }
+}
</script>
<style>
- .avue-upload__icon {
+.avue-upload__icon {
line-height: 6;
- }
+}
</style>
\ No newline at end of file
diff --git a/src/views/property/propertyCompanyDistrict.vue b/src/views/property/propertyCompanyDistrict.vue
index 5bcbdeb..deb2c23 100644
--- a/src/views/property/propertyCompanyDistrict.vue
+++ b/src/views/property/propertyCompanyDistrict.vue
@@ -94,7 +94,7 @@
prop: "districtId",
search: false,
type: 'tree',
- dicUrl: `/api/blade-district/district/getDistrictTree`,
+ dicUrl: `/api/blade-district/district/getDistrictTree?filterFlag=0`,
props: {
label: "name",
value: "id"
--
Gitblit v1.9.3