diff --git a/src/views/main-sidebar-sub-menu.vue b/src/views/main-sidebar-sub-menu.vue index 132f6dcf8..a3a1bb1e3 100644 --- a/src/views/main-sidebar-sub-menu.vue +++ b/src/views/main-sidebar-sub-menu.vue @@ -31,6 +31,7 @@ + \ No newline at end of file diff --git a/src/views/modules/base/communityYantai/buildForm.vue b/src/views/modules/base/communityYantai/buildForm.vue new file mode 100644 index 000000000..271d1b91a --- /dev/null +++ b/src/views/modules/base/communityYantai/buildForm.vue @@ -0,0 +1,492 @@ + + + + \ No newline at end of file diff --git a/src/views/modules/base/communityYantai/buildTable.vue b/src/views/modules/base/communityYantai/buildTable.vue new file mode 100644 index 000000000..b28c2bd9a --- /dev/null +++ b/src/views/modules/base/communityYantai/buildTable.vue @@ -0,0 +1,886 @@ + + + + diff --git a/src/views/modules/base/communityYantai/community.vue b/src/views/modules/base/communityYantai/community.vue new file mode 100644 index 000000000..aa8a2889b --- /dev/null +++ b/src/views/modules/base/communityYantai/community.vue @@ -0,0 +1,728 @@ + + + + + + + + + + + + + diff --git a/src/views/modules/base/communityYantai/communityDetail.vue b/src/views/modules/base/communityYantai/communityDetail.vue new file mode 100644 index 000000000..f08478197 --- /dev/null +++ b/src/views/modules/base/communityYantai/communityDetail.vue @@ -0,0 +1,263 @@ + + + + + + + diff --git a/src/views/modules/base/communityYantai/communityForm.vue b/src/views/modules/base/communityYantai/communityForm.vue new file mode 100644 index 000000000..3b329ca7d --- /dev/null +++ b/src/views/modules/base/communityYantai/communityForm.vue @@ -0,0 +1,576 @@ + + + + + + + diff --git a/src/views/modules/base/communityYantai/communityTable.vue b/src/views/modules/base/communityYantai/communityTable.vue new file mode 100644 index 000000000..b7e916e4c --- /dev/null +++ b/src/views/modules/base/communityYantai/communityTable.vue @@ -0,0 +1,1050 @@ + + + + + + + diff --git a/src/views/modules/base/communityYantai/roomDetail.vue b/src/views/modules/base/communityYantai/roomDetail.vue new file mode 100644 index 000000000..f1b066107 --- /dev/null +++ b/src/views/modules/base/communityYantai/roomDetail.vue @@ -0,0 +1,303 @@ + + + + diff --git a/src/views/modules/base/communityYantai/roomForm.vue b/src/views/modules/base/communityYantai/roomForm.vue new file mode 100644 index 000000000..496095faa --- /dev/null +++ b/src/views/modules/base/communityYantai/roomForm.vue @@ -0,0 +1,473 @@ + + + + diff --git a/src/views/modules/base/communityYantai/roomTable.vue b/src/views/modules/base/communityYantai/roomTable.vue new file mode 100644 index 000000000..a03e289c7 --- /dev/null +++ b/src/views/modules/base/communityYantai/roomTable.vue @@ -0,0 +1,987 @@ + + + + diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 63d9fb32e..750e0087c 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -223,6 +223,7 @@ :form-info="item.formInfo && item.formInfo" :support-add="item.supportAdd" :form-id="item.columnName" + :labelWidth="'160px'" :form-list="item.itemList" /> @@ -275,7 +276,7 @@ :muti-list="item.mutiList" :form-list="item.itemList" :disabled="disabled" - :label-width="'140px'" + :labelWidth="'140px'" :agency-id="editAgencyId" /> diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue index 3c122790b..bbc79ac31 100644 --- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue +++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue @@ -149,7 +149,8 @@ label="附件" label-width="150px" prop="attach"> - -
+
@@ -585,10 +586,10 @@ export default { } }, - - handlePreview(src) { + + handlePreview (src) { console.log(src) - if(src){ + if (src) { window.open(src); } }, diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue index 685e21816..7e66c198d 100644 --- a/src/views/modules/cpts/base/index.vue +++ b/src/views/modules/cpts/base/index.vue @@ -123,6 +123,7 @@ --> +
- {{ $t('export') }} + 下载模板 + + 导入 + + {{ $t('export') }}
+ +
{ + this.download(data, title + ".xls"); + }, + (rspMsg, data) => { + this.$message.error(rspMsg); + } + ); + }, + // 下载文件 + download (data, fileName) { + if (!data) { + return; + } + + var csvData = new Blob([data]); + + if (window.navigator && window.navigator.msSaveOrOpenBlob) { + window.navigator.msSaveOrOpenBlob(csvData, fileName); + } + // for Non-IE (chrome, firefox etc.) + else { + var a = document.createElement("a"); + document.body.appendChild(a); + a.style = "display: none"; + var url = window.URL.createObjectURL(csvData); + a.href = url; + a.download = fileName; + a.click(); + a.remove(); + window.URL.revokeObjectURL(url); + } + }, + // 上传文件之前的钩子 + beforeUpload (file) { + this.files = file; + + const isText = file.type === "application/vnd.ms-excel"; + const isTextComputer = + file.type === + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; + + if (!isText && !isTextComputer) { + this.$message.error("请选择正确格式的文件"); + this.files = null; + this.fileName = ""; + return false; + } else { + this.fileName = file.name; + return true; + } + }, + async uploadFile () { + if (this.fileName == "") { + this.$message.warning("请选择要上传的文件！"); + return false; + } + + this.$message({ + showClose: true, + message: "导入中，请到系统管理-导入记录中查看进度", + duration: 0, + }); + + //清空上传列表 + this.$refs["upload"].clearFiles(); + let url = ""; + + let fileFormData = new FormData(); + fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名 + + url = "/epmetuser/changeWelfare/pointImport"; + + window.app.ajax.post2( + url, + fileFormData, + (data, rspMsg) => { + if (data.code === 0 && data.msg == "success") { + // this.$message.success('导入成功') + } else { + // this.$message({ + // showClose: true, + // message: rspMsg, + // duration: 0, + // type: "error" + // }) + // this.$message.error(rspMsg) + } + this.loadTable(); + }, + (rspMsg, data) => { }, + { headers: { "Content-Type": "multipart/form-data" } } + ); + }, exportHandle () { const url = this.mixinViewModuleOptions.exportURL this.$http({ @@ -275,6 +405,11 @@ export default { diff --git a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue index 4f651215a..487743d18 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue @@ -74,35 +74,122 @@
居住成员信息
- - - - - - - - - - - - - - - - - - - +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
合同内容
@@ -136,8 +223,10 @@ @@ -163,6 +252,7 @@ export default { data () { return { visible: false, + pageId:'', dataForm: { id: '', flag: '', @@ -204,11 +294,13 @@ export default { { dictValue: '媳婿', dictName: '媳婿' }, { dictValue: '孙子女', dictName: '孙子女' }, { dictValue: '兄弟姐妹', dictName: '兄弟姐妹' }, - { dictValue: '中介', dictName: '中介' } + { dictValue: '其他', dictName: '其他' } ], checkReason: '', checkVisible: false, - disabledBtn: false + disabledBtn: false, + disabledBtn_check: false, + mzOptions:[], } }, computed: { @@ -291,7 +383,8 @@ export default { }, // 获取信息 getInfo () { - this.$http.get(`/pli/power/rentContractInfo/${this.dataForm.id}`).then(({ data: res }) => { + let Url = this.pageId === 'rentcontractinfo' ? 'plirentcontractinfolog' : 'rentContractInfo' + this.$http.get(`/pli/power/${Url}/${this.dataForm.id}`).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } @@ -299,6 +392,7 @@ export default { ...this.dataForm, ...res.data } + this.getMz() }).catch(() => {}) }, // 打开审核不通过对话框 @@ -324,7 +418,9 @@ export default { lessorRelation: this.dataForm.lessorRelation, reason: this.checkReason } + this.disabledBtn_check = true, this.$http.post('/pli/power/rentContractInfo/review', params).then(({ data: res }) => { + this.disabledBtn_check = false if (res.code !== 0) { return this.$message.error(res.msg) } @@ -354,6 +450,15 @@ export default { downFile(fileUrl) { window.open(fileUrl) }, + getMz() { + this.$http.post(`/sys/dict/data/nation`).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.mzOptions = res.data + console.log(res) + }).catch(() => {}) + }, // 表单提交 dataFormSubmitHandle: debounce(function () { this.$refs['dataForm'].validate((valid) => { @@ -396,4 +501,13 @@ export default { // width: 280px; } } +.add-member{ + border-bottom: 1px dashed #dcdfe6; + margin-bottom: 20px; + .el-form-item { + .el-form-item__content{ + width: 190px !important; + } + } +} diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue index 4ee321e33..6a1f7533e 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo.vue @@ -203,9 +203,9 @@ export default { data: function () { return { mixinViewModuleOptions: { - getDataListURL: '/pli/power/rentContractInfo/page', + getDataListURL: '/pli/power/plirentcontractinfolog/page', getDataListIsPage: true, - deleteURL: '/pli/power/rentContractInfo', + deleteURL: '/pli/power/plirentcontractinfolog', deleteIsBatch: true }, optionsV: [], @@ -295,6 +295,7 @@ export default { this.$nextTick(() => { this.$refs.addOrUpdate.dataForm.id = id this.$refs.addOrUpdate.dataForm.flag = flag + this.$refs.addOrUpdate.pageId= 'rentcontractinfo' this.$refs.addOrUpdate.init() }) }, diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue index 9049969df..8a8366e8f 100644 --- a/src/views/modules/plugins/rent/rentcontractreview.vue +++ b/src/views/modules/plugins/rent/rentcontractreview.vue @@ -195,10 +195,13 @@ diff --git a/src/views/modules/renFangTongJi/index.vue b/src/views/modules/renFangTongJi/index.vue index 8fcd403d7..c4b8224fe 100644 --- a/src/views/modules/renFangTongJi/index.vue +++ b/src/views/modules/renFangTongJi/index.vue @@ -1,107 +1,86 @@ @@ -115,10 +94,12 @@ import shequtongji from "./cpts/shequtongji"; export default { name: "renFangTongJi", components: { shequtongji }, - data() { + data () { return { displayedDetail: false, tableData: [], + tableLoading: false, + loadInfo: '', orgId: "", orgType: "", @@ -185,35 +166,35 @@ export default { }; }, computed: { - maxTableHeight() { + maxTableHeight () { return this.clientHeight - 420; }, ...mapGetters(["clientHeight"]), }, watch: { - orgId() { + orgId () { this.getTableData(); }, }, - mounted() { + mounted () { this.getCommunityData(); this.getResiData(); this.getHouseData(); this.getTableData(); }, methods: { - handleClickCard(item) { + handleClickCard (item) { if (item.name == "开通平台社区数") { this.showDetail(); } }, - async showDetail(orgId = "") { + async showDetail (orgId = "") { this.displayedDetail = true; this.detailOrgId = orgId; }, - async getCommunityData() { + async getCommunityData () { const url = "/gov/org/agency/usingCommunityStats"; const { data, code, msg } = await requestPost(url, { @@ -230,7 +211,7 @@ export default { } }, - async getResiData() { + async getResiData () { const url = "/epmetuser/icresiuser/userchart"; const { data, code, msg } = await requestPost(url, { @@ -257,7 +238,7 @@ export default { } }, - async getHouseData() { + async getHouseData () { const url = "/gov/org/house/housechart"; const { data, code, msg } = await requestPost(url, { @@ -286,7 +267,9 @@ export default { } }, - async getTableData() { + async getTableData () { + this.loadInfo = '数据加载中' + this.tableLoading = true const url = "/gov/org/house/subuserhouselist"; const { data, code, msg } = await requestPost(url, { @@ -297,9 +280,17 @@ export default { if (code === 0) { this.tableData = data ? data.map((item) => { - return item; - }) + return item; + }) : []; + + if (this.tableData.length === 0) { + this.loadInfo = '暂无数据' + } else { + this.loadInfo = '' + + } + } }, }, @@ -318,6 +309,7 @@ export default { .item { display: flex; + justify-content: center; width: 24%; margin-top: 15px; // margin-right: 1%; diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue index 8e20b49ef..1f7d8d23f 100644 --- a/src/views/modules/shequ/cpts/people-more.vue +++ b/src/views/modules/shequ/cpts/people-more.vue @@ -308,6 +308,9 @@ export default { data () { return { + customerId: '', + isXiaozhaizi: false, + fieldList: [], groupList: [], groupIndex: 0, @@ -405,6 +408,16 @@ export default { }, mounted () { + //磐石街道：1580460084738760705 + //烟台客户id: 1535072605621841922 + //小寨子客户id: 1536638904600752130 + this.customerId = localStorage.getItem("customerId"); + + this.isXiaozhaizi = false + + if (this.customerId === '1536638904600752130') { + this.isXiaozhaizi = true + } this.getApiData(); }, @@ -589,7 +602,8 @@ export default { tableName: "ic_hs", }, ]; - if (!this.isShundeju) { + + if (!this.isShundeju && !this.isXiaozhaizi) { arr = [ ...arr, { diff --git a/src/views/modules/visual/basicinfo/cpts/people-more.vue b/src/views/modules/visual/basicinfo/cpts/people-more.vue index 3084ebbe4..8decf5b23 100644 --- a/src/views/modules/visual/basicinfo/cpts/people-more.vue +++ b/src/views/modules/visual/basicinfo/cpts/people-more.vue @@ -211,6 +211,9 @@ export default { data () { return { + customerId: '', + isXiaozhaizi: false, + fieldList: [], groupList: [], groupIndex: 0, @@ -395,6 +398,16 @@ export default { }, mounted () { + //磐石街道：1580460084738760705 + //烟台客户id: 1535072605621841922 + //小寨子客户id: 1536638904600752130 + this.customerId = localStorage.getItem("customerId"); + + this.isXiaozhaizi = false + + if (this.customerId === '1536638904600752130') { + this.isXiaozhaizi = true + } this.getApiData(); }, @@ -536,7 +549,7 @@ export default { } }); }); - + await Promise.all( this.groupList.map((subList, index) => { return Promise.all( @@ -564,7 +577,7 @@ export default { tableName: "ic_hs", }, ]; - if (!this.isShundeju) { + if (!this.isShundeju && !this.isXiaozhaizi) { arr = [ ...arr, { diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index 8e39a89e2..98c806eee 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -154,6 +154,17 @@ export default { }, methods: { + // 登陆后跳转逻辑 + skipAfterLogin() { + let href = localStorage.getItem("thePageAtExit"); + if (href && href.indexOf("login") == -1) { + localStorage.removeItem("thePageAtExit"); + location.href = href; + } else { + localStorage.removeItem("thePageAtExit"); + this.$router.replace({ name: "index" }); + } + }, // 获取公钥 getPubKey() { this.$http