Merge branch 'dev_20240116_OTA' into 'master'

Dev 20240116 ota

See merge request laws-nio/laws-weilai!368

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -73,6 +73,8 @@
                       <a-select
                         class="box-input"
                         mode="multiple"
+                        optionFilterProp="children"
+                        :filterOption="filterOption"
                         v-model="formInline.dutyTerritory"
                         :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')">
                         <a-select-option
@@ -2237,6 +2239,9 @@
         this.selectedValue = this.checkedList
         this.indeterminate = false
       },
+      filterOption(input, option) {
+        return option.componentOptions.children[0].children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      },
       getcustomizeList(item) {
         let params = {
           paramsManifestId: this.$route.query.id,

jero-web/src/views/projectManagement/components/ProjectDetails.vue

@@ -281,7 +281,8 @@
       },
       stateExportClick() {
         let query = {
-          projectLibraryId: this.$route.query.id
+          projectLibraryId: this.$route.query.id,
+          appliedVehicleProject:this.queryForm.appliedVehicleProject
         }
         downloadFile('/project/projectLibraryBase/exportProjectProgressStatisticsXls',
           this.queryForm.projectName+'-'+this.queryForm.projectVersion+'-'+this.$t('projectProgressStatistics') + '.xls', query)

jero-web/src/views/projectManagement/components/otastatus.vue

@@ -105,7 +105,11 @@
       idList: {
         type: Array,
         default: []
-      }
+      },
+      queryForm:{
+        type: Object,
+        default: {}
+      },
     },
     data() {
       return {
@@ -149,7 +153,8 @@
       getData() {
         let query = {
           ...this.queryParam,
-          projectId:this.$route.query.id
+          projectId:this.$route.query.id,
+          appliedVehicleProject:this.queryForm.appliedVehicleProject
         }
         getAction('ota/otaManageApplyEO/getStatisticalStatus', query).then((res) => {
           if (res.success) {

jero-web/src/views/projectManagement/components/projectStatus.vue

@@ -26,7 +26,7 @@
                                      v-if="activeKey == $t('parameterCollectionProgressManagement')"/>
       </a-tab-pane>
       <a-tab-pane :key="$t('otastatus')" :tab="$t('otastatus')">
-        <otastatus @currentStatus="currentStatus" :idList="idList" v-if="activeKey == $t('otastatus')"/>
+        <otastatus :queryForm="queryForm" ref="otastatusRef" @currentStatus="currentStatus" :idList="idList" v-if="activeKey == $t('otastatus')"/>
       </a-tab-pane>
       <a-tab-pane :key="$t('Problemanagement')" :tab="$t('Problemanagement')">
         <nonConformance ref="nonConformanceRef" @currentStatus="currentStatus"