From 41799ddaa25422993f3a47016704e48f85a02c8c Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 8 Nov 2022 14:02:14 +0800 Subject: [PATCH 1/6] 11 --- src/views/modules/base/epidemic/natFocus/natFocusList.vue | 2 +- .../modules/base/epidemic/natFocus/natFocusListHistory.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue index db5c57903..4c5f3e83d 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue @@ -559,7 +559,7 @@ export default { async mounted () { //磐石街道：1580460084738760705 this.customerId = localStorage.getItem("customerId"); - this.isPanshi = true + this.isPanshi = false this.reasonTitle = '关注原因' if (this.customerId === '1580460084738760705') { this.isPanshi = true diff --git a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue index 32d97869a..ff1f92040 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue @@ -501,7 +501,7 @@ export default { async mounted () { //磐石街道：1580460084738760705 this.customerId = localStorage.getItem("customerId"); - this.isPanshi = true + this.isPanshi = false this.reasonTitle = '关注原因' if (this.customerId === '1580460084738760705') { this.isPanshi = true From b396b9c574591515cf982aa8d3bfdde6d04f66b0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 8 Nov 2022 16:00:01 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=94=B9=E5=90=8D=E5=92=8Curl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/epidemic/natInfo/natList.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue index 5bf223997..df240421a 100644 --- a/src/views/modules/base/epidemic/natInfo/natList.vue +++ b/src/views/modules/base/epidemic/natInfo/natList.vue @@ -144,7 +144,7 @@ 定时 + @click="handleTiming()">更新数据 Date: Tue, 8 Nov 2022 16:18:09 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=83=9F=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base/epidemic/natInfo/natList.vue | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue index 5bf223997..61ff4a530 100644 --- a/src/views/modules/base/epidemic/natInfo/natList.vue +++ b/src/views/modules/base/epidemic/natInfo/natList.vue @@ -141,7 +141,8 @@ size="small" @click="handleExport">导出 - 定时 @@ -318,6 +319,8 @@ export default { pageNo: 0, tableLoading: false, isResiUser: true, + customerId: '', + isYantai: false, agencyId: '', orgTypeList: [ @@ -382,6 +385,16 @@ export default { }, async mounted () { + //磐石街道：1580460084738760705 + //烟台客户id: 1535072605621841922 + this.customerId = localStorage.getItem("customerId"); + this.isYantai = false + + if (this.customerId === '1535072605621841922') { + this.isYantai = true + + } + this.updateBtnAuths(); const { user } = this.$store.state From 78420401b9d5841087b65857adcea4ad4a4d0af8 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 8 Nov 2022 16:32:35 +0800 Subject: [PATCH 4/6] =?UTF-8?q?mint=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.js b/src/main.js index f5f3634b1..a5f04b0b1 100644 --- a/src/main.js +++ b/src/main.js @@ -1,7 +1,7 @@ import Vue from "vue"; import Element from "element-ui"; -// import Mint from "mint-ui"; -// import "mint-ui/lib/style.css"; +import Mint from "mint-ui"; +import "mint-ui/lib/style.css"; import App from "@/App"; import i18n from "@/i18n"; @@ -60,7 +60,7 @@ Vue.config.productionTip = false; // Vue.use(renProcessRunning); // Vue.use(renProcessDetail); // Vue.use(Element); -// Vue.use(Mint); +Vue.use(Mint); Vue.use(Element, { size: "default", From 017595803b130365addb757106b37390e0360bb2 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 8 Nov 2022 17:02:05 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/pages/staffRegister.vue | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/views/pages/staffRegister.vue b/src/views/pages/staffRegister.vue index 97db79617..70b7dec5d 100644 --- a/src/views/pages/staffRegister.vue +++ b/src/views/pages/staffRegister.vue @@ -14,11 +14,12 @@
+
+ - - - {{placeOrgName}} - + {{placeOrgName}} + +
+
+ - - - {{placeOrgName}} - + {{placeOrgName}} + +
Date: Wed, 9 Nov 2022 09:01:03 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityParty/regionalParty/activitysDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/communityParty/regionalParty/activitysDetail.vue b/src/views/modules/communityParty/regionalParty/activitysDetail.vue index 68b768518..bb36e0caa 100644 --- a/src/views/modules/communityParty/regionalParty/activitysDetail.vue +++ b/src/views/modules/communityParty/regionalParty/activitysDetail.vue @@ -12,7 +12,7 @@
服务事项： - {{ formData.serviceMatterShow }} + {{ formData.serviceMatterName }}
活动标题：