1.修改三期优化点

jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue

@@ -210,6 +210,7 @@
     <JLoading :loading="JLoading">{{this.$t('pleaseWaitWhileRunning')}}</JLoading>
     <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
     <standardDecompositionSheet ref="standardDecompositionSheetRef"
+                                :gatherResultList="gatherResultList"
                                 @standardDecompositionSheetForm="standardDecompositionSheetForm"/>
   </div>
 </template>

jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue

@@ -32,6 +32,40 @@
                 </a-select>
               </div>
             </a-col>
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('technicalField')">
+                  <span>{{$t('technicalField')}}</span>
+                </div>
+                <a-tree-select
+                  tree-node-filter-prop="title"
+                  v-model="queryParam.technology_territory"
+                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                  class="box-input"
+                  style="width: 100%"
+                  :tree-data="CategoryTreeList"
+                  tree-checkable
+                  :placeholder="$t('PleaseSelect')+$t('technicalField')"
+                />
+              </div>
+            </a-col>
+            <a-col :md="12" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('informationCategory')">
+                  <span>{{$t('informationCategory')}}</span>
+                </div>
+                <j-dict-select-tag class="box-input" v-model="queryParam.information_category"
+                                    :placeholder="$t('PleaseSelect')+$t('informationCategory')"
+                                    :type="'select'"
+                                    :triggerChange="false" :dictCode="'information_category'"/>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
+               <a-col :md="12" :sm="8">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+             </span>
             <!--            <span style="float: right;overflow: hidden;margin-top: 4px" class="table-page-search-submitButtons">-->
             <!--               <a-col :md="12" :sm="24">-->
             <!--                   <div @click="handleModule" class="operator-text">-->
@@ -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