From 5a81c3f48f91e10183d9ae374024deafd32b6b7d Mon Sep 17 00:00:00 2001 From: yujintao Date: Thu, 12 Sep 2019 17:06:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/partymembers-add-or-update.vue | 130 ++++++++++-------- src/views/modules/user/user-add-or-update.vue | 27 +--- 2 files changed, 79 insertions(+), 78 deletions(-) diff --git a/src/views/modules/user/partymembers-add-or-update.vue b/src/views/modules/user/partymembers-add-or-update.vue index 581a7652..8d6f882a 100755 --- a/src/views/modules/user/partymembers-add-or-update.vue +++ b/src/views/modules/user/partymembers-add-or-update.vue @@ -1,64 +1,88 @@ @@ -86,13 +110,7 @@ export default { streetOptions: [], communityOptions: [], gridOptions: [], - cadreOptions: [{ - cadreFlag: '1', - cadreTitle: '是' - }, { - cadreFlag: '0', - cadreTitle: '否' - }], + cadreOptions: [{ cadreFlag: '1', cadreTitle: '是' }, { cadreFlag: '0', cadreTitle: '否' }], tagOptions: [] } }, @@ -144,7 +162,7 @@ export default { return this.$message.error(res.msg) } this.tagOptions = res.data - }).catch(() => {}) + }).catch(() => { }) }, getStreetList () { this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => { @@ -152,7 +170,7 @@ export default { return this.$message.error(res.msg) } this.streetOptions = res.data - }).catch(() => {}) + }).catch(() => { }) }, getCommunityList () { let choosenItem = this.streetOptions.filter(item => item.id === this.dataForm.streetId)[0] @@ -164,7 +182,7 @@ export default { return this.$message.error(res.msg) } this.communityOptions = res.data - }).catch(() => {}) + }).catch(() => { }) }, getGridList () { let choosenItem = this.communityOptions.filter(item => item.id === this.dataForm.communityId)[0] @@ -175,7 +193,7 @@ export default { return this.$message.error(res.msg) } this.gridOptions = res.data - }).catch(() => {}) + }).catch(() => { }) }, evaluation () { let choosenItem = this.gridOptions.filter(item => item.id === this.dataForm.gridId)[0] @@ -197,14 +215,14 @@ export default { return this.$message.error(res.msg) } this.communityOptions = res.data - }).catch(() => {}) + }).catch(() => { }) this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) } this.gridOptions = res.data - }).catch(() => {}) - }).catch(() => {}) + }).catch(() => { }) + }).catch(() => { }) }, // 表单提交 dataFormSubmitHandle: debounce(function () { @@ -225,7 +243,7 @@ export default { this.$emit('refreshDataList') } }) - }).catch(() => {}) + }).catch(() => { }) }) }, 1000, { 'leading': true, 'trailing': false }) } diff --git a/src/views/modules/user/user-add-or-update.vue b/src/views/modules/user/user-add-or-update.vue index 753b491e..17fb4658 100644 --- a/src/views/modules/user/user-add-or-update.vue +++ b/src/views/modules/user/user-add-or-update.vue @@ -49,15 +49,13 @@ prop="address"> {{dataForm.address}} - -

+ @@ -92,20 +90,8 @@ export default { tagIds: [], registTime: '' }, - partyFlagOptions: [{ - id: '0', - name: '不是' - }, { - id: '1', - name: '是' - }], - cadreOptions: [{ - cadreFlag: '1', - cadreTitle: '是' - }, { - cadreFlag: '0', - cadreTitle: '否' - }], + partyFlagOptions: [{ id: '0', name: '不是' }, { id: '1', name: '是' }], + cadreOptions: [{ cadreFlag: '1', cadreTitle: '是' }, { cadreFlag: '0', cadreTitle: '否' }], tagOptions: [] } }, @@ -130,9 +116,6 @@ export default { partyFlag: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } ], - registerWay: [ - { required: true, message: this.$t('validate.required'), trigger: 'blur' } - ], gridId: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } ] From f4e784193a4e249fbba3fb228f4878e61ff42beb Mon Sep 17 00:00:00 2001 From: liuchuang Date: Thu, 12 Sep 2019 17:20:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=9B=86=E6=88=90?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/index.html b/public/index.html index 791faec3..f5f91e1d 100644 --- a/public/index.html +++ b/public/index.html @@ -13,8 +13,8 @@ window.SITE_CONFIG['storeState'] = {}; // vuex本地储存初始化状态（用于不刷新页面的情况下，也能重置初始化项目中所有状态） window.SITE_CONFIG['contentTabDefault'] = { // 内容标签页默认属性对象 'name': '', // 名称, 由 this.$route.name 自动赋值（默认，名称 === 路由名称 === 路由路径） - 'params': {}, // 参数, 由 this.$route.params 自动赋值 - 'query': {}, // 查询参数, 由 this.$route.query 自动赋值 + 'params': {}, // 参数, 由 this.$route.params 自动赋值 + 'query': {}, // 查询参数, 由 this.$route.query 自动赋值 'menuId': '', // 菜单id（用于选中侧边栏菜单，与this.$store.state.sidebarMenuActiveName进行匹配） 'title': '', // 标题 'isTab': true, // 是否通过tab展示内容? @@ -33,7 +33,7 @@ <% } %> <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %> - + <% } %> <% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %>