From ce5302d206d325163ee42e603515af0d8866514b Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Mon, 14 Mar 2022 10:33:08 +0800 Subject: [PATCH 1/4] dd --- src/views/modules/base/resi.vue | 3 ++- src/views/modules/communityParty/elegant/index.vue | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 76ac5305..50c5f181 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -492,6 +492,7 @@ export default { await this.$http .post(url, params) .then(res => { + console.log('res----dddd', res) // this.download(res.data, title + '.xls') if (res.headers["content-disposition"]) { let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1]) @@ -1015,7 +1016,7 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg) } else { - // console.log('获取查询详情成功', res.data) + console.log('获取查询详情成功--sss', res) this.searchList = res.data res.data.forEach((item) => { if (item.optionSourceType === 'remote') { diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue index c5a9d56b..521aac20 100644 --- a/src/views/modules/communityParty/elegant/index.vue +++ b/src/views/modules/communityParty/elegant/index.vue @@ -63,10 +63,10 @@ {{importBtnTitle}} {{ exportBtnTitle }} - 下载模板 + @click="handleExportModule('room')">下载模板 --> Date: Mon, 14 Mar 2022 13:32:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?UI=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityService/dqfwzx/cpts/edit.vue | 2 +- .../communityService/dqfwzx/cpts/order.vue | 205 ++++++++---------- .../dqfwzx/cpts/orderList.vue | 106 ++++----- .../modules/communityService/dqfwzx/index.vue | 3 + 4 files changed, 145 insertions(+), 171 deletions(-) diff --git a/src/views/modules/communityService/dqfwzx/cpts/edit.vue b/src/views/modules/communityService/dqfwzx/cpts/edit.vue index 7f7a747c..0138d796 100644 --- a/src/views/modules/communityService/dqfwzx/cpts/edit.vue +++ b/src/views/modules/communityService/dqfwzx/cpts/edit.vue @@ -1,6 +1,6 @@ @@ -155,7 +126,7 @@ var infoWindowList; let loading; // 加载动画 export default { - data() { + data () { return { formType: "add", //表单操作类型 add新增，edit编辑，detail详情 @@ -166,7 +137,7 @@ export default { }, dateOptions: { - disabledDate(time) { + disabledDate (time) { return ( time.getTime() < Date.now() - 3600 * 24 * 1 * 1000 || time.getTime() > Date.now() + 3600 * 24 * 6 * 1000 @@ -188,7 +159,7 @@ export default { }, components: {}, computed: { - dataRule() { + dataRule () { return { appointmentName: [ { required: true, message: "预约人不能为空", trigger: "blur" }, @@ -212,10 +183,10 @@ export default { }, }, - async mounted() {}, + async mounted () { }, methods: { - async initForm(type, row, index) { + async initForm (type, row, index) { this.$refs.ref_form.resetFields(); let item = row.matterList[index]; @@ -226,7 +197,7 @@ export default { } }, - selectTime(index) { + selectTime (index) { // return console.log(index); let list = deepClone(this.timeList); if (!list[index].isAppointment) return false; @@ -302,7 +273,7 @@ export default { return false; }, - async getDateList() { + async getDateList () { let url = "/gov/org/icpartyservicecenter/appointmenttime"; const { @@ -322,7 +293,7 @@ export default { } }, - async getTimeList() { + async getTimeList () { let url = "/gov/org/icpartyservicecenter/appointmenttime"; const { @@ -344,7 +315,7 @@ export default { } }, - async handleComfirm() { + async handleComfirm () { this.btnDisable = true; setTimeout(() => { this.btnDisable = false; @@ -365,7 +336,7 @@ export default { }); }, - async submit() { + async submit () { let url = ""; if (this.formType === "add") { url = "/gov/org/icpartyservicecenter/appointment"; @@ -391,11 +362,11 @@ export default { } }, - handleCancle() { + handleCancle () { this.resetData(); this.$emit("dialogCancle"); }, - resetData() { + resetData () { this.dataForm = { matterId: "", appointmentDate: "", @@ -407,7 +378,7 @@ export default { this.timeList = []; }, // 开启加载动画 - startLoading() { + startLoading () { loading = Loading.service({ lock: true, // 是否锁定 text: "正在加载……", // 加载中需要显示的文字 @@ -415,7 +386,7 @@ export default { }); }, // 结束加载动画 - endLoading() { + endLoading () { // clearTimeout(timer); if (loading) { loading.close(); diff --git a/src/views/modules/communityService/dqfwzx/cpts/orderList.vue b/src/views/modules/communityService/dqfwzx/cpts/orderList.vue index 4f812c75..691e789e 100644 --- a/src/views/modules/communityService/dqfwzx/cpts/orderList.vue +++ b/src/views/modules/communityService/dqfwzx/cpts/orderList.vue @@ -1,55 +1,55 @@ @@ -66,7 +66,7 @@ var infoWindowList; let loading; // 加载动画 export default { - data() { + data () { return { appointmentDate: new Date().toLocaleDateString().split("/").join("-"), matterId: "", @@ -82,10 +82,10 @@ export default { }, }, - async mounted() {}, + async mounted () { }, methods: { - async init(row, index) { + async init (row, index) { let item = row.matterList[index]; if (item) { this.matterId = item.matterId; @@ -93,7 +93,7 @@ export default { } }, - async getList() { + async getList () { let url = "/gov/org/icpartyservicecenter/appointmentrecord"; const { matterId, appointmentDate } = this; @@ -107,14 +107,14 @@ export default { if (code === 0) { this.tableData = data ? data.map((item) => { - item.appointmentTime = item.appointmentTime.join("，"); - return item; - }) + item.appointmentTime = item.appointmentTime.join("，"); + return item; + }) : []; } else { } }, - async handleCancel(index) { + async handleCancel (index) { let url = "/gov/org/icpartyservicecenter/cancelappointment"; const { matterId, tableData } = this; @@ -132,15 +132,15 @@ export default { } }, - handleCancle() { + handleCancle () { this.resetData(); this.$emit("dialogCancle"); }, - resetData() { + resetData () { this.tableData = []; }, // 开启加载动画 - startLoading() { + startLoading () { loading = Loading.service({ lock: true, // 是否锁定 text: "正在加载……", // 加载中需要显示的文字 @@ -148,7 +148,7 @@ export default { }); }, // 结束加载动画 - endLoading() { + endLoading () { // clearTimeout(timer); if (loading) { loading.close(); diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue index 6cdb5bf9..0b2265aa 100644 --- a/src/views/modules/communityService/dqfwzx/index.vue +++ b/src/views/modules/communityService/dqfwzx/index.vue @@ -98,6 +98,7 @@ :title="formTitle" width="850px" top="5vh" + class="dialog-h" @closed="handleClose"> From 2517667cbae620ec44585cb81182069781b23faf Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 14 Mar 2022 13:35:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?UI=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/workSys/demandCate.vue | 247 ++++++++++++----------- 1 file changed, 125 insertions(+), 122 deletions(-) diff --git a/src/views/modules/workSys/demandCate.vue b/src/views/modules/workSys/demandCate.vue index ecd3095f..43593e1a 100644 --- a/src/views/modules/workSys/demandCate.vue +++ b/src/views/modules/workSys/demandCate.vue @@ -1,123 +1,130 @@