From c003806f0902aec039ebcc69c70ae736d7ddcb37 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 8 Dec 2022 11:20:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/management/detail-main.scss | 11 +- .../scss/modules/management/list-main.scss | 4 + src/views/components/deathSearch copy.vue | 623 ++++++++++++++++++ src/views/components/deathSearch.vue | 490 ++++++-------- src/views/components/resiChangeRecord.vue | 54 +- .../modules/base/huji/immigration/detail.vue | 123 ++-- .../modules/plugins/change/resichange.vue | 62 +- src/views/modules/plugins/change/verify.vue | 561 +++++++--------- 8 files changed, 1165 insertions(+), 763 deletions(-) create mode 100644 src/views/components/deathSearch copy.vue diff --git a/src/assets/scss/modules/management/detail-main.scss b/src/assets/scss/modules/management/detail-main.scss index 309bfe353..1d4a6b5f7 100644 --- a/src/assets/scss/modules/management/detail-main.scss +++ b/src/assets/scss/modules/management/detail-main.scss @@ -125,11 +125,14 @@ } } + + +//-----旧版 + .cell-width-area{ width: 450px } - .div_searchmap { z-index: 1000; position: absolute; @@ -137,7 +140,6 @@ left: 5px; } - .cell-width-1{ width: 250px } @@ -178,16 +180,11 @@ overflow-x: auto; } - .m-btns { display: flex; justify-content: center; } - - -//-----旧版 - .m-info { .info-title { diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss index 944ca823f..131277511 100644 --- a/src/assets/scss/modules/management/list-main.scss +++ b/src/assets/scss/modules/management/list-main.scss @@ -22,6 +22,7 @@ } .div_search_btn{ + margin-right:10px; margin-top:5px; float:right; } @@ -95,6 +96,9 @@ } } + + //---------旧版 + .item_width_2{ width: 138px; } diff --git a/src/views/components/deathSearch copy.vue b/src/views/components/deathSearch copy.vue new file mode 100644 index 000000000..f82185e81 --- /dev/null +++ b/src/views/components/deathSearch copy.vue @@ -0,0 +1,623 @@ + + + + + diff --git a/src/views/components/deathSearch.vue b/src/views/components/deathSearch.vue index 1c46b7e93..25bc772ea 100644 --- a/src/views/components/deathSearch.vue +++ b/src/views/components/deathSearch.vue @@ -1,206 +1,160 @@ @@ -217,7 +171,7 @@ export default { default: '' } }, - data() { + data () { let initForm = (arr, columnName) => { let _form = {} // console.log('formInfo', obj) @@ -278,7 +232,7 @@ export default { shortcuts: [ { text: '最近一周', - onClick(picker) { + onClick (picker) { const end = new Date() const start = new Date() start.setTime(start.getTime() - 3600 * 1000 * 24 * 7) @@ -287,7 +241,7 @@ export default { }, { text: '最近一个月', - onClick(picker) { + onClick (picker) { const end = new Date() const start = new Date() start.setTime(start.getTime() - 3600 * 1000 * 24 * 30) @@ -296,7 +250,7 @@ export default { }, { text: '最近三个月', - onClick(picker) { + onClick (picker) { const end = new Date() const start = new Date() start.setTime(start.getTime() - 3600 * 1000 * 24 * 90) @@ -308,7 +262,7 @@ export default { } }, computed: { - sliceList() { + sliceList () { return function (data, count) { if (data !== undefined) { let index = 0 @@ -324,19 +278,19 @@ export default { } } }, - changeVDisabled() { + changeVDisabled () { return !this.form.VILLAGE_ID }, - changeBDisabled() { + changeBDisabled () { return !this.form.BUILD_ID }, - changeDDisabled() { + changeDDisabled () { return !this.form.UNIT_ID } }, watch: { form: { - handler(val, val2) { + handler (val, val2) { // console.log('valpppp----', val, val2) for (let n in val) { if (this.constForm[n] !== val[n]) { @@ -349,7 +303,7 @@ export default { deep: true } }, - created() { + created () { // this.initForm() // console.log('formcccc---', this.form) this.getGridList() @@ -357,32 +311,32 @@ export default { if (this.columnName) this.handleChangeForm(this.columnName) }, methods: { - initForm() { + initForm () { this.formList.forEach((item) => { this.$set(this.form, item.columnName, '') }) console.log('formcccc---', this.form) }, - handleClearVillage() { + handleClearVillage () { this.form.BUILD_ID = '' this.form.HOME_ID = '' }, - handleClearBuild() { + handleClearBuild () { this.form.BUILD_ID = '' this.form.UNIT_ID = '' this.form.HOME_ID = '' }, - handleClearDan() { + handleClearDan () { this.form.UNIT_ID = '' this.form.HOME_ID = '' }, - resetForm(formName) { - for(const n in this.form) { + resetForm (formName) { + for (const n in this.form) { this.form[n] = '' } this.handleSearch() }, - handleSearch() { + handleSearch () { // console.log('formmmmm---', this.form) const itemTypes = ['daterange', 'timerange'] let arr = this.tempFormList @@ -395,7 +349,7 @@ export default { // columnValue: [] columnValue: itemTypes.includes(item.queryType) || - itemTypes.includes(item.itemType) + itemTypes.includes(item.itemType) ? this.form[item.columnName] : [this.form[item.columnName].toString()] } @@ -410,10 +364,10 @@ export default { let arr3 = [...arr1, ...arr] this.$emit('search', arr3) }, - handleOpenSearch() { + handleOpenSearch () { this.openSearch = !this.openSearch }, - handleChangeGrid(val) { + handleChangeGrid (val) { console.log('val', val) this.form.VILLAGE_ID = '' this.form.BUILD_ID = '' @@ -421,26 +375,26 @@ export default { this.form.HOME_ID = '' this.getValiheList() }, - handleChangeV(val) { + handleChangeV (val) { console.log('val', val) this.form.BUILD_ID = '' this.form.UNIT_ID = '' this.form.HOME_ID = '' this.getBuildList() }, - handleChangeB(val) { + handleChangeB (val) { console.log('val', val) this.form.UNIT_ID = '' this.form.HOME_ID = '' this.getUniList() }, - handleChangeD(val) { + handleChangeD (val) { console.log('val', val) this.form.HOME_ID = '' this.getHouseList() }, // 监听基础form - handleChangeForm(val) { + handleChangeForm (val) { for (let n in this.fixedForm) { if (n === val) { if (this.fixedList.length > 0) { @@ -479,7 +433,7 @@ export default { if (item.columnName === val) item.isChange = true }) }, - getGridList() { + getGridList () { const { user } = this.$store.state this.$http .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' }) @@ -495,7 +449,7 @@ export default { return this.$message.error('网络错误') }) }, - getValiheList() { + getValiheList () { const { user } = this.$store.state this.$http .post('/gov/org/icneighborhood/neighborhoodoption', { @@ -515,7 +469,7 @@ export default { return this.$message.error('网络错误') }) }, - getBuildList() { + getBuildList () { this.$http .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.form.VILLAGE_ID @@ -532,7 +486,7 @@ export default { return this.$message.error('网络错误') }) }, - getUniList() { + getUniList () { this.$http .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.form.BUILD_ID @@ -549,7 +503,7 @@ export default { return this.$message.error('网络错误') }) }, - getHouseList() { + getHouseList () { this.$http .post('/gov/org/ichouse/houseoption', { unitId: this.form.UNIT_ID }) .then(({ data: res }) => { @@ -569,81 +523,11 @@ export default { diff --git a/src/views/components/resiChangeRecord.vue b/src/views/components/resiChangeRecord.vue index a13585a82..4788ca80c 100644 --- a/src/views/components/resiChangeRecord.vue +++ b/src/views/components/resiChangeRecord.vue @@ -1,12 +1,10 @@