diff --git a/project/hlj/app/AppRatingTask/AppRatingTask.vue b/project/hlj/app/AppRatingTask/AppRatingTask.vue index 3d8cbe12..8fa07636 100644 --- a/project/hlj/app/AppRatingTask/AppRatingTask.vue +++ b/project/hlj/app/AppRatingTask/AppRatingTask.vue @@ -7,9 +7,9 @@ - - diff --git a/project/hlj/app/AppRatingTask/components/Detail.vue b/project/hlj/app/AppRatingTask/components/Detail.vue index ba60b08e..477ca135 100644 --- a/project/hlj/app/AppRatingTask/components/Detail.vue +++ b/project/hlj/app/AppRatingTask/components/Detail.vue @@ -1,123 +1,102 @@ @@ -135,6 +114,20 @@ data () { return { info: {}, + form: { + date: '', + name: '', + type: '', + examines: [], + examines1: [], + examinesName2: '', + examinesName1: '' + }, + search: { + current: 1, + size: 10, + name: '' + }, isShow: false, currIndex: 0, isLoading: false, @@ -149,12 +142,11 @@ }, created () { - this.isLoading = true if (this.params && this.params.id) { this.id = this.params.id - this.$dict.load(['EP_registerPersonType', 'EP_communityHandleType', 'EP_highRiskIndustries', 'EP_travelType', 'yesOrNo', 'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_controlMethod', 'EP_abnormalType']).then(() => { - this.getInfo(this.params.id) - }) + // this.$dict.load(['EP_registerPersonType', 'EP_communityHandleType', 'EP_highRiskIndustries', 'EP_travelType', 'yesOrNo', 'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_controlMethod', 'EP_abnormalType']).then(() => { + // this.getInfo(this.params.id) + // }) } }, @@ -174,6 +166,28 @@ }) }, + onUserChange(e, type) { + if (e.length) { + this.form[type] = '1' + } else { + this.form[type] = '' + } + }, + + onConfirm (id) { + this.$refs.form.validate((valid) => { + if (valid) { + this.isShow = false + this.$emit('change', { + type: 'Detail', + params: { + id: id || '' + } + }) + } + }) + }, + cancel () { this.$emit('change', { type: 'List', @@ -185,4 +199,85 @@ diff --git a/project/hlj/app/AppRatingTask/components/FormDetail.vue b/project/hlj/app/AppRatingTask/components/FormDetail.vue new file mode 100644 index 00000000..247e5cde --- /dev/null +++ b/project/hlj/app/AppRatingTask/components/FormDetail.vue @@ -0,0 +1,301 @@ + + + + + diff --git a/project/hlj/app/AppRatingTask/components/List.vue b/project/hlj/app/AppRatingTask/components/List.vue index d8d5c1f4..9d9659cd 100644 --- a/project/hlj/app/AppRatingTask/components/List.vue +++ b/project/hlj/app/AppRatingTask/components/List.vue @@ -5,7 +5,7 @@
@@ -58,6 +69,9 @@ size: 10, name: '' }, + form: { + name: '' + }, colConfigs: [ { prop: 'name', label: '任务名称' }, { prop: 'phone', align: 'center', label: '创建人' }, @@ -67,7 +81,8 @@ ids: [], tableData: [], total: 0, - loading: false + loading: false, + isShow: false } }, @@ -98,11 +113,16 @@ }) }, - toDetail (id) { - this.$emit('change', { - type: 'Detail', - params: { - id: id || '' + onConfirm (id) { + this.$refs.form.validate((valid) => { + if (valid) { + this.isShow = false + this.$emit('change', { + type: 'FormDetail', + params: { + id: id || '' + } + }) } }) },