diff --git a/src/views/components/resiTransfer.vue b/src/views/components/resiTransfer.vue index 4daef451..68dfc49e 100644 --- a/src/views/components/resiTransfer.vue +++ b/src/views/components/resiTransfer.vue @@ -1,6 +1,6 @@ @@ -368,7 +368,7 @@ export default { if (!this.dataForm.newBuildingId) { - this.$message.warning('请选择楼宇') + this.$message.warning('楼栋') return false } if (!this.dataForm.newBuildingUnitId) { diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index 9f3b7da9..6fcb0779 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -96,7 +96,7 @@ ref="ref_buildingTable" @refreshTree="refreshTree"> - { - this.$refs['ref_buildingTable'].loadTable(false, this.selTreeObj, this.ownerName, this.ownerPhone, this.rentState) + this.$refs['ref_buildingTable'].loadTable(true, this.selTreeObj, this.ownerName, this.ownerPhone, this.rentState) }) } else { this.$message.warning('请输入查询条件') diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 671b61dd..db301ce2 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -227,9 +227,15 @@ export default { return isChecked }, + loadTreeFromSearch () { + + }, + async loadTable (fromTree, treeObj, ownerName, ownerPhone, rentFlag) { + this.tableLoading = true let params + if (fromTree) { this.agencyObj = treeObj // if (this.agencyObj.level === 'community') {//只有社区和网格显示操作按钮 @@ -247,28 +253,29 @@ export default { // } else { // this.showImportBtn = false // } - params = { - pageSize: this.pageSize, - pageNo: this.pageNo, - level: this.agencyObj.level, - id: this.agencyObj.id, - } - } else { - params = { - pageSize: this.pageSize, - pageNo: this.pageNo, - level: this.agencyObj.level, - id: this.agencyObj.id, - } + + } + params = { + pageSize: this.pageSize, + pageNo: this.pageNo, + level: this.agencyObj.level, + id: this.agencyObj.id, + } + + if (ownerName) { params.ownerName = ownerName + + } + if (ownerPhone) { params.ownerPhone = ownerPhone + + } + if (rentFlag) { params.rentFlag = rentFlag } const url = "/gov/org/house/houselist" - - const { data, code, msg } = await requestPost(url, params) if (code === 0) { diff --git a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue index 5e4861ac..f326af6f 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue @@ -127,8 +127,17 @@ - + + + - - - + + width="170"> + min-width="200"> + width="180"> + min-width="180"> + width="170"> + width="170"> + min-width="200"> + width="90"> + min-width="180"> + min-width="180"> + width="160"> -
- -
- +
+ +
+ - - - + + + - - - + + + - 查询 + 查询 - 重置 + 重置 - +
- - - + + + - + - +
- +
- - + + - + - + + :action="uploadUlr" + :data="{customerId:customerId}" + :show-file-list="false" + :on-success="(response, file, fileList) => handleImgSuccess('managementIcon', response, file, fileList)" + :before-upload="beforeImgUpload"> - + :src="form.managementIcon" + style="width:70px;height:70px" + class="function-icon"> + - + + :action="uploadUlr" + :data="{customerId:customerId}" + :show-file-list="false" + :on-success="(response, file, fileList) => handleImgSuccess('dataIcon', response, file, fileList)" + :before-upload="beforeImgUpload"> - + :src="form.dataIcon" + style="width:70px;height:70px" + class="function-icon"> + - + + :action="uploadUlr" + :data="{customerId:customerId}" + :show-file-list="false" + :on-success="(response, file, fileList) => handleImgSuccess('houseShowIcon', response, file, fileList)" + :before-upload="beforeImgUpload"> - + :src="form.houseShowIcon" + style="width:70px;height:70px" + class="function-icon"> + - 人/楼宇 + 人楼栋 - 人/楼宇 + 人/楼栋
- 取消 - 提交 + 取消 + 提交
@@ -194,7 +204,7 @@ import axios from 'axios' import Sortable from 'sortablejs' import { mapGetters } from 'vuex' export default { - data() { + data () { return { tableLoading: false, btnLoading: false, @@ -214,7 +224,7 @@ export default { { label: '是', value: 1 - },{ + }, { label: '否', value: 0 } @@ -223,7 +233,7 @@ export default { { label: '黄色预警', value: 1 - },{ + }, { label: '红色预警', value: 2 } @@ -296,12 +306,12 @@ export default { ...mapGetters(['clientHeight', 'iframeHeight']) }, - async created() { + async created () { this.customerId = localStorage.getItem('customerId') this.getTableData() this.pageLoading = true }, - mounted() { + mounted () { this.rowDrop() this.$nextTick(() => { this.sHeight = this.$refs.searchCard.$el.offsetHeight + 230 @@ -309,11 +319,11 @@ export default { }) }, methods: { - rowDrop() { + rowDrop () { const tbody = document.querySelector('.el-table__body-wrapper tbody') const _this = this Sortable.create(tbody, { - onEnd({ newIndex, oldIndex }) { + onEnd ({ newIndex, oldIndex }) { const currRow = _this.tableData.splice(oldIndex, 1)[0] _this.tableData.splice(newIndex, 0, currRow) console.log('rowdrap', newIndex, oldIndex) @@ -322,25 +332,25 @@ export default { } }) }, - computedWidth(label) { + computedWidth (label) { const wd = 20 * label.length return wd > 80 ? wd : 80 }, - filterImage(item) { + filterImage (item) { const arr = ['managementIcon', 'dataIcon', 'houseShowIcon'] return arr.includes(item) }, - handleSizeChange(val) { + handleSizeChange (val) { console.log(`每页 ${val} 条`) this.pageSize = val this.getTableData() }, - handleCurrentChange(val) { + handleCurrentChange (val) { console.log(`当前页: ${val}`) this.currentPage = val this.getTableData() }, - handleFilterSpan(row, item) { + handleFilterSpan (row, item) { let _val = '' if (item.options && item.options.length > 0) { item.options.forEach((n) => { @@ -349,23 +359,23 @@ export default { } return _val || row[item.columnName] }, - resetForm(formName) { - + resetForm (formName) { + this.isWarn = '' this.level = '' this.handleSearch(); }, - handleSearch(val) { + handleSearch (val) { console.log('searchhh--', val) this.currentPage = 1 this.conditions = val this.getTableData() }, - handleLevelChange(val) { + handleLevelChange (val) { if (val > this.form.level2) this.form.level2 = val }, - - handlerCancle() { + + handlerCancle () { this.dialogVisible = false }, beforeImgUpload (file) { @@ -391,7 +401,7 @@ export default { this.$message.error(res.msg) } }, - async handleLook(row) { + async handleLook (row) { const _show = { show: 'hidden', hidden: 'show' @@ -413,18 +423,18 @@ export default { return this.$message.error('网络错误') }) }, - async handleEdit(row) { - - this.form = { - ...row, - warn: row.warn == '1' ? true : false, - level1: row.level1 || 0, + async handleEdit (row) { + + this.form = { + ...row, + warn: row.warn == '1' ? true : false, + level1: row.level1 || 0, level2: row.level2 || 0, - level3: row.level3 || 0 + level3: row.level3 || 0 } this.dialogVisible = true }, - async handleSUbmit() { + async handleSUbmit () { this.$refs.ruleForm.validate(async (valid) => { if (valid) { if (this.form.warn) { @@ -443,20 +453,20 @@ export default { } else { this.dialogVisible = false this.getTableData() - } + } }) .catch(() => { return this.$message.error('网络错误') }) - this.btnLoading = false + this.btnLoading = false } else { console.log('error submit!!'); return false; } }); - + }, - handleDel(row) { + handleDel (row) { let params = { formCode: 'resi_base_info', icResiUserId: row.icResiUserId @@ -479,8 +489,8 @@ export default { return this.$message.error('网络错误') }) }, - sortData() { - const _data = this.tableData.map((item, index)=> { + sortData () { + const _data = this.tableData.map((item, index) => { return { id: item.id, sort: index @@ -500,7 +510,7 @@ export default { return this.$message.error('网络错误') }) }, - getTableHeader() { + getTableHeader () { this.$http .post('/oper/customize/icform/tableheaders', { formCode: 'resi_base_info' @@ -516,7 +526,7 @@ export default { return this.$message.error('网络错误') }) }, - async getTableData() { + async getTableData () { this.tableLoading = true let params = { // formCode: 'resi_base_info', @@ -540,7 +550,7 @@ export default { }) this.tableLoading = false } - + } } @@ -580,14 +590,13 @@ export default { } } .avatar-uploader { - ::v-deep - .el-upload { + ::v-deep .el-upload { cursor: pointer; position: relative; overflow: hidden; } .el-upload:hover { - border-color: #409EFF; + border-color: #409eff; } .avatar { width: 70px; @@ -605,8 +614,6 @@ export default { text-align: center; } } - - .resi-btns { margin-top: 20px;