diff --git a/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue index 991840758..429801ecc 100644 --- a/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue @@ -4,8 +4,8 @@ - - + + @@ -13,8 +13,8 @@ - - + + @@ -68,7 +68,7 @@ 确 定 -
+ @@ -79,7 +79,7 @@ import { Loading } from 'element-ui'; // 引入Loading服务 import { requestPost, requestGet } from '@/js/dai/request'; import daiMap from '@/utils/dai-map'; import nextTick from 'dai-js/tools/nextTick'; -import record from './record'; + let loading; // 加载动画 let map; var search; @@ -154,9 +154,9 @@ export default { remark: '' }, dataRule: { - placeOrgName: [{ required: true, message: '场所名称不能为空', trigger: 'bulr' }], + name: [{ required: true, message: '场所名称不能为空', trigger: 'bulr' }], // placeCategory: [{ required: true, message: '场所类别不能为空', trigger: 'bulr' }], - placeType: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }], + category: [{ required: true, message: '场所类型不能为空', trigger: 'bulr' }], // result: [{ required: true, message: '巡查结果不能为空', trigger: 'bulr' }], // scaleTotal: [{ required: true, validator: checkNum, trigger: 'bulr' }], gridId: [{ required: true, message: '所属组织不能为空', trigger: 'bulr' }], @@ -173,7 +173,7 @@ export default { }; }, watch: {}, - components: { record }, + components: { }, created() {}, async mounted() { console.log('detailId', this.detailId); @@ -220,7 +220,7 @@ export default { } }, async getDetail() { - const url = `/actual/base/enterprise/detail/${this.detailId}`; + const url = `/actual/base/cityManagement/detail/${this.detailId}`; const { data, code, msg } = await requestPost(url); if (code === 0) { console.log('详情数据', data); @@ -230,16 +230,7 @@ export default { this.$message.error(msg); } }, - async getList() { - const url = `/actual/base/enterprise/patrollist/${this.detailId}`; - let params = {}; - const { data, code, msg } = await requestPost(url, params); - if (code === 0) { - this.list = data; - } else { - this.$message.error(msg); - } - }, + handleComfirm() { this.save(); }, @@ -271,6 +262,7 @@ export default { async save() { console.log('this.formData', this.formData); + // this.formData.agencyId=this.agencyId; var url = ''; var params = {}; if (this.pageType == 'add') { diff --git a/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue b/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue index ee3fb059a..877b480fd 100644 --- a/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue +++ b/src/views/modules/shequzhili/tuceng/chengshiguanli/index.vue @@ -9,24 +9,20 @@
- - + + - - - - + + + + - - - - 查询 @@ -64,28 +60,34 @@ - + + + - - - - - - - - - + @@ -131,17 +133,14 @@ export default { user: '', agencyId: '', formData: { - placeOrgName: '', + name: '', gridId: '', - - placeType: '', - - address: '', - + category: '', + address: '' }, pageType: 'list', // 列表list 新增add 处理dispose 详情info gridList: [], //所属网格list--场所区域 - placeTypeList: [], //场所类型 + categoryNameList: [], //场所类型 tableData: [], resultArray: [{ value: '0', label: '合格' }, { value: '1', label: '不合格' }], @@ -169,7 +168,7 @@ export default { this.user = this.$store.state.user; this.agencyId = this.user.agencyId; this.loadGrid(); - this.loadplaceType(); + this.loadcategoryName(); this.getTableData(); }, methods: { @@ -199,7 +198,7 @@ export default { }, //场所类型 - async loadplaceType() { + async loadcategoryName() { const url = '/sys/dict/data/dictlist'; let params = { @@ -207,7 +206,7 @@ export default { }; const { data, code, msg } = await requestPost(url, params); if (code === 0) { - this.placeTypeList = data; + this.categoryNameList = data; } else { this.$message.error(msg); } @@ -247,8 +246,8 @@ export default { }); }, handleAdd(row, type) { - if (row.enterpriseId) { - this.detailId = row.enterpriseId; + if (row.id) { + this.detailId = row.id; } this.pageType = type; if (type == 'view') { @@ -280,7 +279,7 @@ export default { type: 'warning' }) .then(() => { - this.del(rowData.enterpriseId); + this.del(rowData.id); }) .catch(err => {}); }, @@ -326,12 +325,10 @@ export default { }, resetSearch() { this.formData = { - placeOrgName: '', + name: '', gridId: '', - - placeType: '', - - address: '', + category: '', + address: '' }; this.pageNo = 1; this.getTableData(); diff --git a/src/views/modules/shequzhili/tuceng/chengshiguanli/record.vue b/src/views/modules/shequzhili/tuceng/chengshiguanli/record.vue deleted file mode 100644 index ffa70108a..000000000 --- a/src/views/modules/shequzhili/tuceng/chengshiguanli/record.vue +++ /dev/null @@ -1,433 +0,0 @@ - - - - - diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue index f1f582155..f3da22ba4 100644 --- a/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue +++ b/src/views/modules/shequzhili/tuceng/gonggongfuwu/index.vue @@ -60,14 +60,7 @@ - - - - +