From 71030e1f80635b7332136a488bc2cc8bd36fc04c Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期二, 19 十一月 2024 11:40:37 +0800 Subject: [PATCH] Merge branch 'hc-dataproduct-v1112' into lsf-dataproduct-1024 --- src/views/fysp/evaluation/components/precheck/CompPreCheck.vue | 34 +++++++++++++++++++++++++++++----- 1 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/views/fysp/evaluation/components/precheck/CompPreCheck.vue b/src/views/fysp/evaluation/components/precheck/CompPreCheck.vue index 7001369..3bb8745 100644 --- a/src/views/fysp/evaluation/components/precheck/CompPreCheck.vue +++ b/src/views/fysp/evaluation/components/precheck/CompPreCheck.vue @@ -6,12 +6,23 @@ <el-step title="鑷姩璇勪及" /> </el-steps> <CompCheckArea v-show="stepIndex == 0" v-model="stepIndex" @change="onAreaChange"></CompCheckArea> - <CompCheckSource v-show="stepIndex == 1" v-model="stepIndex" ref="refSource"></CompCheckSource> - <CompCheckExemption v-show="stepIndex == 2" v-model="stepIndex"></CompCheckExemption> + <CompCheckSource + v-show="stepIndex == 1" + v-model="stepIndex" + ref="refSource" + @change="onDataSourceChange" + ></CompCheckSource> + <CompCheckExemption + v-show="stepIndex == 2" + v-model="stepIndex" + @change="onExemptionChange" + ></CompCheckExemption> <CompCheckConfirm v-show="stepIndex == 3" v-model="stepIndex" :area-info="area" + :data-source="dataSource" + :exemption-items="exemptionItems" @start="onNewTask" ></CompCheckConfirm> </template> @@ -35,7 +46,13 @@ return { // 鎿嶄綔姝ラ涓嬫爣 stepIndex: 0, - area: {} + area: { + _locations: {}, + _scenetype: {} + }, + dataSource: {}, + // 璞佸厤鏉$洰 + exemptionItems: {} }; }, methods: { @@ -44,7 +61,8 @@ */ onAreaChange(val) { const v = val.value; - this.area = { + this.area = v; + const a = { provincecode: v._locations.pCode, provincename: v._locations.pName, citycode: v._locations.cCode, @@ -58,7 +76,13 @@ online: true, sourceType: v.sourceType }; - this.$refs.refSource.startCheck(this.area); + this.$refs.refSource.startCheck(a); + }, + onDataSourceChange(val) { + this.dataSource = val; + }, + onExemptionChange(val) { + this.exemptionItems = val; }, /** * 鑷姩璇勪及鍓嶇疆鍚堣鎬ф鏌� -- Gitblit v1.9.3