diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss index dd8a7f865..490652011 100644 --- a/src/assets/scss/modules/management/list-main.scss +++ b/src/assets/scss/modules/management/list-main.scss @@ -106,7 +106,12 @@ } } - +.div-flex{ + .m-page{ + display: flex; + justify-content: space-between; + } +} // 弹性盒子 .f-flex { diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue index 3db8e731f..5fbda8bbe 100644 --- a/src/views/modules/communityParty/regionalParty/activitys.vue +++ b/src/views/modules/communityParty/regionalParty/activitys.vue @@ -385,7 +385,7 @@ export default { //获取服务事项下拉框 async loadService () { - const url = "/heart/serviceitem/dict-list" + const url = "/actual/base/serviceitem/dict-list" let params = { diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue index 1c1dfc789..fed357721 100644 --- a/src/views/modules/communityParty/regionalParty/activitysForm.vue +++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue @@ -315,7 +315,7 @@ export default { //获取服务事项下拉框 async loadService () { - const url = "/heart/serviceitem/dict-list" + const url = "/actual/base/serviceitem/dict-list" let params = { type: 'usable' diff --git a/src/views/modules/communityParty/regionalParty/finishList.vue b/src/views/modules/communityParty/regionalParty/finishList.vue index 40296b06c..fbc1a73f7 100644 --- a/src/views/modules/communityParty/regionalParty/finishList.vue +++ b/src/views/modules/communityParty/regionalParty/finishList.vue @@ -301,8 +301,8 @@ export default { async loadTable () { this.tableLoading = true - const url = '/heart/icpartyunitcompletion/list' - // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunitcompletion/list' + const url = '/actual/base/icpartyunitcompletion/list' + // const url = 'http://yapi.elinkservice.cn/mock/245/actual/base/icpartyunitcompletion/list' let params = { unitId: this.unitId } @@ -375,9 +375,9 @@ export default { }, async addReview (row, tableIndex) { - let url = "/heart/icpartyunitcompletion/save" + let url = "/actual/base/icpartyunitcompletion/save" - // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunitcompletion/save" + // let url = "http://yapi.elinkservice.cn/mock/245/actual/base/icpartyunitcompletion/save" let params = JSON.parse(JSON.stringify(row)) @@ -462,8 +462,8 @@ export default { async deleteRecord (row, tableIndex) { - const url = "/heart/icpartyunitcompletion/delete" - // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunitcompletion/delete" + const url = "/actual/base/icpartyunitcompletion/delete" + // const url = "http://yapi.elinkservice.cn/mock/245/actual/base/icpartyunitcompletion/delete" let params = { id: row.id diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue index 9137a438b..42729924e 100644 --- a/src/views/modules/communityParty/regionalParty/units.vue +++ b/src/views/modules/communityParty/regionalParty/units.vue @@ -217,10 +217,10 @@ trigger="click">
- 同步 + @click="handleSync(scope.row)">同步 -->
@@ -412,7 +412,7 @@ export default { //获取服务事项下拉框 async loadService () { - const url = "/heart/serviceitem/dict-list" + const url = "/actual/base/serviceitem/dict-list" let params = { @@ -451,7 +451,7 @@ export default { async loadTable () { this.tableLoading = true - const url = "/heart/icpartyunit/list" + const url = "/actual/base/icpartyunit/list" // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list" let params = { pageSize: this.pageSize, @@ -544,23 +544,23 @@ export default { }, - async handleSync (row) { + // async handleSync (row) { - this.$confirm("确认同步到通讯录？", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }) - .then(() => { - this.syncUnit(row) - }) - .catch(err => { - if (err == "cancel") { + // this.$confirm("确认同步到通讯录？", "提示", { + // confirmButtonText: "确定", + // cancelButtonText: "取消", + // type: "warning" + // }) + // .then(() => { + // this.syncUnit(row) + // }) + // .catch(err => { + // if (err == "cancel") { - } + // } - }); - }, + // }); + // }, async handleNoSync (row) { this.$confirm("确认取消同步?", "提示", { diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue index 3bb06c249..b588472a7 100644 --- a/src/views/modules/communityParty/regionalParty/unitsForm.vue +++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue @@ -224,7 +224,7 @@ export default { //获取服务事项下拉框 async loadService () { - const url = "/heart/serviceitem/dict-list" + const url = "/actual/base/serviceitem/dict-list" let params = { type: 'usable' // parentCategoryCode: '1010' diff --git a/src/views/modules/communityService/gxxq/addForm.vue b/src/views/modules/communityService/gxxq/addForm.vue index f447c1f55..9ef5544c1 100644 --- a/src/views/modules/communityService/gxxq/addForm.vue +++ b/src/views/modules/communityService/gxxq/addForm.vue @@ -444,6 +444,7 @@ export default { this.formData.content = data.content; this.formData.assignFlag = data.assignFlag this.formData.resiSearchTagId = data.resiSearchTagId; + if( data.assignInfo){ this.newFormData.serviceTimeStart = data.assignInfo.serviceTimeStart; this.newFormData.serviceTimeEnd = data.assignInfo.serviceTimeEnd; this.newFormData.serverOrgType = data.assignInfo.serverOrgType; @@ -455,8 +456,9 @@ export default { data.assignInfo.serviceScopeList[i].objectId ); } - await this.handleChangeServiceTypeLevel1(); await this.getServiceuserList(data.assignInfo.serverOrgType); + } + await this.handleChangeServiceTypeLevel1(); await // this.formData = { ...data }; await this.getTagName(); @@ -696,33 +698,47 @@ export default { objectName: this.newArr[i].objectName, }); } + this.newArr = [] // 如果是编辑的话回填的数据会有数组字符串需要将不是对象属性的过滤掉 let arr = []; + let isOk = false; this.newFormData.serviceScopeList.forEach((item) => { if (typeof item != "string") { arr.push(item); } }); - // 选中的数据中有不是网格或者社区或者楼栋的就停止它 - let isOk = false; - arr.findIndex((item) => { - if ( - item.objectType == "neighborhood" || - item.objectType == "agency" || - item.objectType == "grid" - ) { - isOk = true; - } else { - return (isOk = false); - } - }); - console.log(isOk); - if (!isOk) { - this.newArr = []; - this.$message.error("请选择正确的网格,社区,楼栋!"); - return; - } - this.newFormData.serviceScopeList = arr; + // 选中的数据中有不是网格或者小区或者楼栋的就停止它 + + // arr.forEach((item) => { + // if ( + // item.objectType == "neighborhood" || + // item.objectType == "agency" || + // item.objectType == "grid" + // ) { + // isOk = true; + // } else { + // isOk = false + // this.newArr = []; + // this.newFormData.serviceScopeList = [] + // arr = [] + // this.$message.error("请选择正确的网格,社区,楼栋!"); + // } + // }); + for(let i in arr){ + if(arr[i].objectType == "neighborhood" || + arr[i].objectType == "agency" || + arr[i].objectType == "grid"){ + isOk = true; + }else{ + isOk = false; + console.log( this.newArr,'没有清空?'); + this.$message.error("请选择正确的网格,社区,楼栋!"); + return + } + } + console.log( this.newArr); + this.newFormData.serviceScopeList = arr; + if (!isOk && this.formData.assignFlag) return var url = ""; var params = {}; if (this.formType == "edit") { @@ -749,15 +765,15 @@ export default { } // const url = 'http://yapi.elinkservice.cn/mock/245/governance/icServiceProject/service/initiate' console.log(params); - // const { data, code, msg } = await requestPost(url, params); - - // if (code === 0) { - // this.$message.success("添加成功"); - // this.resetData(); - // this.$emit("handleComfirm"); - // } else if(code>=8000){ - // this.$message.error(msg); - // } + const { data, code, msg } = await requestPost(url, params); + + if (code === 0) { + this.$message.success("添加成功"); + this.resetData(); + this.$emit("handleComfirm"); + } else if(code>=8000){ + this.$message.error(msg); + } }, handleCancle() { diff --git a/src/views/modules/communityService/gxxq/index.vue b/src/views/modules/communityService/gxxq/index.vue index 49799d130..681ab04c3 100644 --- a/src/views/modules/communityService/gxxq/index.vue +++ b/src/views/modules/communityService/gxxq/index.vue @@ -204,7 +204,9 @@
- + + 批量删除 + - - 批量删除 -
diff --git a/src/views/modules/communityService/measure/detail.vue b/src/views/modules/communityService/measure/detail.vue index e9a5e09c5..52d28dabd 100644 --- a/src/views/modules/communityService/measure/detail.vue +++ b/src/views/modules/communityService/measure/detail.vue @@ -86,11 +86,13 @@
-
- 关 闭 - -
+ + + + 关 闭 + + diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue index 7636e6ca2..c1f202d0d 100644 --- a/src/views/modules/communityService/measure/index.vue +++ b/src/views/modules/communityService/measure/index.vue @@ -1,36 +1,44 @@ @@ -521,7 +628,7 @@ import detail from "./detail"; export default { components: { info, detail }, - data () { + data() { return { tableLoading: false, btnLoading: false, @@ -752,7 +859,11 @@ export default { { required: true, message: "上报人不能为空", trigger: "blur" }, ], reportUserMobile: [ - { required: true, message: "上报人联系电话不能为空", trigger: "blur" }, + { + required: true, + message: "上报人联系电话不能为空", + trigger: "blur", + }, ], reportTime: [ { required: true, message: "上报时间不能为空", trigger: "blur" }, @@ -779,18 +890,18 @@ export default { visitableInfo: false, currDemandId: "", infoAddType: "look", - detailShow: false + detailShow: false, }; }, computed: { ...mapGetters(["clientHeight", "iframeHeight"]), - tableHeight () { + tableHeight() { const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh; const _h = this.clientHeight - 280 - this.searchH; return this.$store.state.inIframe ? h : _h; }, }, - async created () { + async created() { this.customerId = localStorage.getItem("customerId"); this.getTableData(); @@ -802,24 +913,24 @@ export default { }, 200); this.pageLoading = true; }, - mounted () { + mounted() { this.$nextTick(() => { this.searchH = this.$refs.searchCard.$el.offsetHeight; console.log("tableHeight", this.tableHeight); }); }, methods: { - 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) => { @@ -828,11 +939,11 @@ export default { } return _val || row[item.columnName]; }, - filterEdit (id) { + filterEdit(id) { const { user } = this.$store.state; return id === user.agencyId; }, - resetForm (formName) { + resetForm(formName) { this.searchForm.reportStartTime = ""; this.searchForm.reportEndTime = ""; this.searchForm.wantServiceStartTime = ""; @@ -844,12 +955,12 @@ export default { this.$refs[formName].resetFields(); this.handleSearch(); }, - handleCateCHange (val) { + handleCateCHange(val) { console.log("val", val); this.searchForm.categoryCode = val[1] || val[0]; this.searchForm.level = val.length; }, - handleCateSlect (val) { + handleCateSlect(val) { console.log("val", val); if (val.length === 1) { this.demandOptions.forEach((item) => { @@ -861,14 +972,14 @@ export default { this.form.categoryCode = val[1]; } }, - handleDemandChange (val) { + handleDemandChange(val) { console.log("val", val, this.selectDemandUser); this.selectDemandUser = val.label; this.form.demandUserName = val.demandUserName; this.form.demandUserMobile = val.demandUserMobile; this.form.demandUserId = val.demandUserId; }, - handleSearch (val) { + handleSearch(val) { console.log("searchhh--", val); this.currentPage = 1; if (Array.isArray(this.reportTime) && this.reportTime.length > 0) { @@ -881,27 +992,27 @@ export default { } this.getTableData(); }, - handelBlurServiceTime (val) { + handelBlurServiceTime(val) { console.log("val", val); if (val.length > 0) { this.form.serviceStartTime = val[0]; this.form.serviceEndTime = val[1]; } }, - handleServiceChange (type, val) { + handleServiceChange(type, val) { if (val === "social_org") { if (type === "add") this.getServiceuserList(val, "add_demand"); else this.getServiceuserList(val, "query_demand"); } else this.getServiceuserList(val, ""); }, - handleGridChange (val) { + handleGridChange(val) { this.getDemandUserList(); }, - handleAdd (addType) { + handleAdd(addType) { this.addType = addType; this.dialogVisible = true; }, - handlerCancle () { + handlerCancle() { // this.form.categoryCode = '' // this.form.parentCode = '' // this.form.demandUserName = '' @@ -917,7 +1028,7 @@ export default { // this.$refs.ruleForm.resetFields() this.dialogVisible = false; }, - async formatRowForm (row, addType, disabled) { + async formatRowForm(row, addType, disabled) { this.form = { ...row, categoryCode: [row.parentCode, row.categoryCode] }; this.addType = addType; @@ -958,27 +1069,26 @@ export default { this.dialogVisible = true; }, - async handleLook (row, type) { - this.detailShow = true - console.log('row', row) + async handleLook(row, type) { + this.detailShow = true; + console.log("row", row); this.$nextTick(() => { - this.$refs.ref_form_detail.initForm(row) - }) + this.$refs.ref_form_detail.initForm(row); + }); // await this.formatRowForm(row, type, true); }, - detailFormCancle () { - - this.detailShow = false + detailFormCancle() { + this.detailShow = false; }, - async handleAppoint (row, type) { + async handleAppoint(row, type) { await this.formatRowForm(row, type, true); }, - async handleFinish (row, type) { + async handleFinish(row, type) { await this.formatRowForm(row, type, true); }, - async handleEdit (row, type) { + async handleEdit(row, type) { await this.formatRowForm(row, type, false); // this.form = { ...row, categoryCode: [row.parentCode, row.categoryCode] } // this.addType = addType @@ -992,12 +1102,12 @@ export default { // console.log('selectDemandUser', this.selectDemandUser) // this.dialogVisible = true }, - formatRowForm2 (row, type) { + formatRowForm2(row, type) { this.visitableInfo = true; this.currDemandId = row.demandRecId; this.infoAddType = type; }, - async addNew () { + async addNew() { const _form = { ...this.form, }; @@ -1016,7 +1126,7 @@ export default { }); this.btnLoading = false; }, - async appointAjax () { + async appointAjax() { const _form = { demandRecId: this.form.demandRecId, serviceType: this.form.serviceType, @@ -1037,7 +1147,7 @@ export default { }); this.btnLoading = false; }, - async finishAjax () { + async finishAjax() { const { reportType, serviceShowFlag, serviceType } = this.form; const _form = { demandRecId: this.form.demandRecId, @@ -1063,7 +1173,7 @@ export default { }); this.btnLoading = false; }, - async editCate () { + async editCate() { const categoryCode = this.form.categoryCode; if (Array.isArray(categoryCode)) { if (categoryCode.length === 1) { @@ -1096,7 +1206,7 @@ export default { }); this.btnLoading = false; }, - handleSUbmit () { + handleSUbmit() { this.$refs.ruleForm.validate(async (valid) => { if (valid) { this.btnLoading = true; @@ -1110,7 +1220,7 @@ export default { } }); }, - handleDel (row) { + handleDel(row) { let params = { demandRecId: row.demandRecId, }; @@ -1132,7 +1242,7 @@ export default { return this.$message.error("网络错误"); }); }, - getTreeData (data) { + getTreeData(data) { if (!Array.isArray(data)) return []; let arr = data.map((item) => { let _item = {}; @@ -1147,7 +1257,7 @@ export default { }); return arr; }, - getFlagData (data, flag) { + getFlagData(data, flag) { if (!Array.isArray(data)) return []; let arr1 = data.filter((item) => item[flag]); let arr2 = arr1.map((item) => { @@ -1158,7 +1268,7 @@ export default { // console.log('arrr-oppp', arr2) return arr2; }, - async getGridList (type, agencyId) { + async getGridList(type, agencyId) { const { user } = await this.$store.state; console.log("user---ppp", user); // addorupdate query @@ -1181,7 +1291,7 @@ export default { return this.$message.error("网络错误"); }); }, - async getDemandUserList () { + async getDemandUserList() { const { user } = await this.$store.state; console.log("user---ppp", user); const params = { @@ -1205,7 +1315,7 @@ export default { }); }, - async getDemandOptions () { + async getDemandOptions() { this.$http .post("/governance/icresidemanddict/demandoption") .then(({ data: res }) => { @@ -1223,7 +1333,7 @@ export default { return this.$message.error("网络错误"); }); }, - async getServiceuserList (serviceType, query) { + async getServiceuserList(serviceType, query) { if (!serviceType) return false; const { demandUserId } = this.form; const params = { @@ -1246,7 +1356,7 @@ export default { return this.$message.error("网络错误"); }); }, - async getDictOptions () { + async getDictOptions() { this.$http .post("/sys/dict/data/dictlist", { dictType: "user_demand_status" }) .then(({ data: res }) => { @@ -1289,7 +1399,7 @@ export default { return this.$message.error("网络错误"); }); }, - async getTableData () { + async getTableData() { this.tableLoading = true; let params = { ...this.searchForm, @@ -1316,8 +1426,7 @@ export default {