diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index e8b54cf6e..913bcd9d3 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -210,6 +210,7 @@ {{this.$t('pleaseWaitWhileRunning')}} diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue index fae28b883..57962084a 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue @@ -32,6 +32,40 @@ + +
+
+ {{$t('technicalField')}} +
+ +
+
+ +
+
+ {{$t('informationCategory')}} +
+ +
+
+ + + {{$t('query')}} + {{$t('reset')}} + + @@ -94,6 +128,7 @@ components: { ImportFile }, + props: ['gatherResultList'], data() { return { visible: false, @@ -101,6 +136,7 @@ confirmLoading: false, selectedRowKeys: [], sarFileSplitInfoList: [], + informationCategoryList:[], url: { list: '/split/sarFileSplitItems/getSplitItemsByPage' }, @@ -151,10 +187,23 @@ queryConditionVOList: [], info_id: '', selectedRowKeysData: [], - standardList: '' + standardList: '', + CategoryTreeList: [] } }, + mounted() { + this.getSysCategoryTree() + }, methods: { + getSysCategoryTree() { + getAction('/sys/category/getSysCategoryTree', {}).then((res) => { + if (res.success) { + this.CategoryTreeList = res.result + } else { + this.CategoryTreeList = [] + } + }) + }, handleModule() { }, @@ -176,6 +225,7 @@ this.standData = row this.sarFileSplitInfoList = this.standData.sarFileSplitInfoList || [] this.sarFileSplitInfoList = [...this.sarFileSplitInfoList] + this.queryParam = {} this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : '' this.visible = true if (this.queryParam.info_id) { @@ -219,10 +269,15 @@ replacePage() { let pageNo = JSON.parse(JSON.stringify(this.pageNo)) let pageSize = JSON.parse(JSON.stringify(this.pageSize)) + let queryParam = JSON.parse(JSON.stringify(this.queryParam)) + if (queryParam.technology_territory && queryParam.technology_territory.length > 0){ + queryParam.technology_territory = queryParam.technology_territory.join(',') + } let query = { pageNo: pageNo + '', pageSize: pageSize + '', info_id: this.queryParam.info_id, + technology_territory:queryParam.technology_territory, menu_id: '' } this.loading = true