diff --git a/project/sass/apps/AppSpecialDisabled/AppSpecialDisabled.vue b/project/sass/apps/AppSpecialDisabled/AppSpecialDisabled.vue index ba82b653..0441ba35 100644 --- a/project/sass/apps/AppSpecialDisabled/AppSpecialDisabled.vue +++ b/project/sass/apps/AppSpecialDisabled/AppSpecialDisabled.vue @@ -9,12 +9,14 @@ + + diff --git a/project/sass/apps/AppSpecialDisabled/components/Detail.vue b/project/sass/apps/AppSpecialDisabled/components/Detail.vue index 68015423..508790a1 100644 --- a/project/sass/apps/AppSpecialDisabled/components/Detail.vue +++ b/project/sass/apps/AppSpecialDisabled/components/Detail.vue @@ -1,30 +1,51 @@ - + - + + - - - - - 详情 - - - - + + + + + + + + + + + + + + + + + + + + {{ item.name.substr(item.name.length - 2) }} + {{ item.name }} + + {{ item.visitTime }} + + {{ item.title }} + {{ item.description }} + + + + + 现实状态: + {{ dict.getLabel('visitCondolenceReality', item.reality) }} + + + + @@ -41,14 +62,21 @@ data () { return { - info: {} + currIndex: 0, + tabTitle: ['人员信息', '走访记录'], + info: {}, + list: [], + idNumberInfo: {} } }, created () { if (this.params && this.params.id) { this.id = this.params.id - this.dict.load(['epidemicRecentHealth', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicMemberType', 'epidemicRecentTestResult']).then(() => { + + this.dict.load('appSpecialSituation', 'appSpecialPlacement', 'appSpecialDenger', 'appSpecialCrime', + 'appSpecialControl', 'appSpecialDebug', 'appSpecialDrug', 'appSpecialChangeType', 'appSpecialCure', 'appSpecialDengerLevel', + 'appSpecialDisableLevel', 'appSpecialDisableType', 'appSpecialHealth', 'appSpecialMarriage', 'appSpecialTypeFive','isReflection','yesOrNo').then(() => { this.getInfo(this.params.id) }) } @@ -56,17 +84,17 @@ methods: { getInfo (id) { - this.instance.post(`/app/appepidemicreportmember/queryDetailById?id=${id}`).then(res => { + this.instance.post(`/app/appspecialdisabled/queryDetailById?id=${id}`).then(res => { if (res.code === 0) { this.info = res.data - this.currIndex = 0 + this.idNumberInfo = this.idCardNoUtil.getIdCardInfo(res.data.idNumber) } }) }, cancel (isRefresh) { this.$emit('change', { - type: 'list', + type: 'List', isRefresh: !!isRefresh }) } @@ -75,4 +103,77 @@ diff --git a/project/sass/apps/AppSpecialDisabled/components/List.vue b/project/sass/apps/AppSpecialDisabled/components/List.vue index 430d6260..644c0655 100644 --- a/project/sass/apps/AppSpecialDisabled/components/List.vue +++ b/project/sass/apps/AppSpecialDisabled/components/List.vue @@ -4,6 +4,10 @@ + + 添加 + + 详情 + 编辑 删除 @@ -58,13 +63,11 @@ }, colConfigs: [ { prop: 'name', label: '姓名' }, - { prop: 'phone', align: 'center', label: '手机号码' }, - { prop: 'areaName', align: 'center', label: '所属地区', width: '200px' }, - { prop: 'reportTime', align: 'center', label: '上报时间', width: '200px' }, - { prop: 'healthCode', align: 'center', label: '健康码', formart: v => v ? this.dict.getLabel('epidemicHealthCode', v) : '-' }, - { prop: 'checkTime', align: 'center', label: '核酸日期', formart: v => v ? v.split(' ')[0] : '-' }, - { prop: 'checkResult', align: 'center', label: '检测结果', formart: v => v ? this.dict.getLabel('epidemicRecentTestResult', v) : '-' }, - { prop: 'today', align: 'center', label: '今日上报', formart: v => v === '0' ? '未上报' : '已上报' }, + { prop: 'idNumber', align: 'center', label: '身份证号' }, + { prop: 'gender', align: 'center', label: '性别' }, + { prop: 'birthday', align: 'center', label: '出生日期' }, + { prop: 'age', align: 'center', label: '年龄', }, + { prop: 'phone', align: 'center', label: '联系方式' } ], tableData: [], total: 0, @@ -83,37 +86,56 @@ }, created () { - this.loading = true - this.dict.load(['epidemicTouchInFourteen']).then(() => { + this.dict.load('sex').then(() => { this.getList() }) }, methods: { getList () { - this.instance.post(`/app/appepidemicreportmember/list`, null, { + this.instance.post(`/app/appspecialdisabled/list`, null, { params: { ...this.search } }).then(res => { if (res.code == 0) { - this.tableData = res.data.records + this.tableData = res.data.records.map(v => { + let info = this.idCardNoUtil.getIdCardInfo(v.idNumber) + v.birthday = info.birthday + v.age = this.$calcAge(v.idNumber) + v.gender = info.gender + + return v + }) this.total = res.data.total - this.loading = false - } else { - this.loading = false } - }).catch(() => { - this.loading = false + }) + }, + + toEdit (e) { + this.$emit('change', { + type: 'Add', + params: { + type: 'Add', + id: e + } + }) + }, + + toAdd() { + this.$emit('change', { + type: 'Add', + params: { + type: 'Add', + } }) }, remove(id) { this.$confirm('确定删除该数据?').then(() => { - this.instance.post(`/app/appepidemicreportmember/delete?ids=${id}`).then(res => { + this.instance.post(`/app/appspecialadjustment/delete?ids=${id}`).then(res => { if (res.code == 0) { this.$message.success('删除成功!') - this.getTotalInfo() this.getList() } }) diff --git a/project/sass/apps/AppSpecialMental/AppSpecialMental.vue b/project/sass/apps/AppSpecialMental/AppSpecialMental.vue index ea0951f0..0bd73451 100644 --- a/project/sass/apps/AppSpecialMental/AppSpecialMental.vue +++ b/project/sass/apps/AppSpecialMental/AppSpecialMental.vue @@ -9,12 +9,14 @@ + + diff --git a/project/sass/apps/AppSpecialMental/components/Detail.vue b/project/sass/apps/AppSpecialMental/components/Detail.vue index 68015423..b2b03a85 100644 --- a/project/sass/apps/AppSpecialMental/components/Detail.vue +++ b/project/sass/apps/AppSpecialMental/components/Detail.vue @@ -1,30 +1,52 @@ - + - + + - - - - - 详情 - - - - + + + + + + + + + + + + + + + + + + + + + {{ item.name.substr(item.name.length - 2) }} + {{ item.name }} + + {{ item.visitTime }} + + {{ item.title }} + {{ item.description }} + + + + + 现实状态: + {{ dict.getLabel('visitCondolenceReality', item.reality) }} + + + + @@ -41,14 +63,21 @@ data () { return { - info: {} + currIndex: 0, + tabTitle: ['人员信息', '走访记录'], + info: {}, + list: [], + idNumberInfo: {} } }, created () { if (this.params && this.params.id) { this.id = this.params.id - this.dict.load(['epidemicRecentHealth', 'epidemicRecentTravel', 'epidemicTouchInFourteen', 'epidemicMemberType', 'epidemicRecentTestResult']).then(() => { + + this.dict.load('appSpecialSituation', 'appSpecialPlacement', 'appSpecialDenger', 'appSpecialCrime', + 'appSpecialControl', 'appSpecialDebug', 'appSpecialDrug', 'appSpecialChangeType', 'appSpecialCure', 'appSpecialDengerLevel', + 'appSpecialDisableLevel', 'appSpecialDisableType', 'appSpecialHealth', 'appSpecialMarriage', 'appSpecialTypeFive','isReflection','yesOrNo').then(() => { this.getInfo(this.params.id) }) } @@ -56,17 +85,17 @@ methods: { getInfo (id) { - this.instance.post(`/app/appepidemicreportmember/queryDetailById?id=${id}`).then(res => { + this.instance.post(`/app/appspecialmental/queryDetailById?id=${id}`).then(res => { if (res.code === 0) { this.info = res.data - this.currIndex = 0 + this.idNumberInfo = this.idCardNoUtil.getIdCardInfo(res.data.idNumber) } }) }, cancel (isRefresh) { this.$emit('change', { - type: 'list', + type: 'List', isRefresh: !!isRefresh }) } @@ -75,4 +104,77 @@ diff --git a/project/sass/apps/AppSpecialMental/components/List.vue b/project/sass/apps/AppSpecialMental/components/List.vue index e51ef8d8..d5cf2943 100644 --- a/project/sass/apps/AppSpecialMental/components/List.vue +++ b/project/sass/apps/AppSpecialMental/components/List.vue @@ -4,6 +4,10 @@ + + 添加 + + 详情 + 编辑 删除 @@ -58,13 +63,11 @@ }, colConfigs: [ { prop: 'name', label: '姓名' }, - { prop: 'phone', align: 'center', label: '手机号码' }, - { prop: 'areaName', align: 'center', label: '所属地区', width: '200px' }, - { prop: 'reportTime', align: 'center', label: '上报时间', width: '200px' }, - { prop: 'healthCode', align: 'center', label: '健康码', formart: v => v ? this.dict.getLabel('epidemicHealthCode', v) : '-' }, - { prop: 'checkTime', align: 'center', label: '核酸日期', formart: v => v ? v.split(' ')[0] : '-' }, - { prop: 'checkResult', align: 'center', label: '检测结果', formart: v => v ? this.dict.getLabel('epidemicRecentTestResult', v) : '-' }, - { prop: 'today', align: 'center', label: '今日上报', formart: v => v === '0' ? '未上报' : '已上报' }, + { prop: 'idNumber', align: 'center', label: '身份证号' }, + { prop: 'gender', align: 'center', label: '性别' }, + { prop: 'birthday', align: 'center', label: '出生日期' }, + { prop: 'age', align: 'center', label: '年龄', }, + { prop: 'phone', align: 'center', label: '联系方式' } ], tableData: [], total: 0, @@ -83,37 +86,56 @@ }, created () { - this.loading = true - this.dict.load(['epidemicTouchInFourteen']).then(() => { + this.dict.load('sex').then(() => { this.getList() }) }, methods: { getList () { - this.instance.post(`/app/appepidemicreportmember/list`, null, { + this.instance.post(`/app/appspecialmental/list`, null, { params: { ...this.search } }).then(res => { if (res.code == 0) { - this.tableData = res.data.records + this.tableData = res.data.records.map(v => { + let info = this.idCardNoUtil.getIdCardInfo(v.idNumber) + v.birthday = info.birthday + v.age = this.$calcAge(v.idNumber) + v.gender = info.gender + + return v + }) this.total = res.data.total - this.loading = false - } else { - this.loading = false } - }).catch(() => { - this.loading = false + }) + }, + + toEdit (e) { + this.$emit('change', { + type: 'Add', + params: { + type: 'Add', + id: e + } + }) + }, + + toAdd() { + this.$emit('change', { + type: 'Add', + params: { + type: 'Add', + } }) }, remove(id) { this.$confirm('确定删除该数据?').then(() => { - this.instance.post(`/app/appepidemicreportmember/delete?ids=${id}`).then(res => { + this.instance.post(`/app/appspecialmental/delete?ids=${id}`).then(res => { if (res.code == 0) { this.$message.success('删除成功!') - this.getTotalInfo() this.getList() } })
{{ item.description }}