Merge remote-tracking branch 'origin/dev_20230808_OTA' into dev_20230808_OTA

jero-web/src/common/lang/en-us.js

@@ -1950,4 +1950,5 @@ module.exports = {
   lock:'lock',
   datacannotbeedited:'This data cannot be edited',
   Rematchornot:'Rematch or not',
+  Modifyremarks:'Modify remarks',
 }

jero-web/src/common/lang/zh-cn.js

@@ -3906,4 +3906,5 @@ module.exports = {
   lock:'锁定',
   datacannotbeedited:'该数据不能进行编辑',
   Rematchornot:'是否重新匹配',
+  Modifyremarks:'修改备注',
 }

jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue

@@ -103,61 +103,55 @@
     </div>
 <!--    全部导出-->
     <div class="table-operator" style='margin-bottom: 19px;text-align: left;margin-top: 20px;'>
-      <div v-if="vehicleTypeCode == '全部'" class="operator-text" @click="handleExportManage('all')"
+      <div v-if="vehicleTypeCode === '全部'" class="operator-text" @click="handleExportManage('all')"
            v-has="'otadetail:export'">
         <a-icon type="export" :rotate="-90" />
         {{ $t('export') }}
       </div>
 <!--      全部下发通知-->
-      <div v-if="vehicleTypeCode == '全部'" class="operator-text" @click="issuenotice"
+      <div v-if="vehicleTypeCode === '全部'" class="operator-text" @click="issuenotice"
            v-has="'otadetail:Issuenotice'">
         <a-icon type="sound" />
         {{ $t('issuenotice') }}
       </div>
       <!--    studio导出-->
-      <div v-if="vehicleTypeCode != '全部'"  class="operator-text" @click="handleExportManage('studio')"
+      <div v-if="vehicleTypeCode !== '全部'"  class="operator-text" @click="handleExportManage('studio')"
            v-has="'otad:export'">
         <a-icon type="export" :rotate="-90"/>
         {{ $t('export') }}
       </div>
       <!--      studio批量设置-->
-      <div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="BatchSetting"
+      <div v-if="vehicleTypeCode !== '全部'" class="operator-text" @click="BatchSetting"
            v-has="'otad:batchsetting'">
         <a-icon type="setting"  />
         {{ $t('BatchSetting') }}
       </div>
       <!--      studio申请重新匹配-->
-      <div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="applyforrematch"
+      <div v-if="vehicleTypeCode !== '全部'" class="operator-text" @click="applyforrematch"
            v-has="'otad:rematch'">
         <a-icon type="rollback" />
         {{ $t('applyforrematch') }}
       </div>
       <!--      studio保存-->
-      <div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="preservation"
+      <div v-if="vehicleTypeCode !== '全部'" class="operator-text" @click="preservation"
            v-has="'otad:save'">
         <a-icon type="check-circle" />
         {{ $t('preservation') }}
       </div>
       <!--      studio提交-->
-      <div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="submit"
+      <div v-if="vehicleTypeCode !== '全部'" class="operator-text" @click="submit"
            v-has="'otad-submit'">
         <a-icon type="check-circle" />
         {{ $t('submit') }}
       </div>
-      <!--      manger导出-->
-<!--      <div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="handleExportManage('manger')"-->
-<!--           v-has="'otaman:export'">-->
-<!--        <a-icon type="export" :rotate="-90"/>-->
-<!--        {{ $t('export') }}-->
-<!--      </div>-->
       <!--      manger确认-->
-      <div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="confirm"
+      <div v-if="vehicleTypeCode !== '全部'" class="operator-text" @click="confirm"
            v-has="'otaman:confirm'">
         <a-icon type="check-circle" />
         {{ $t('confirm') }}
       </div>
       <!--      manger退回-->
-      <div v-if="vehicleTypeCode != '全部'" class="operator-text" @click="sendBack"
+      <div v-if="vehicleTypeCode !== '全部'" class="operator-text" @click="sendBack"
            v-has="'otaman:return'">
         <a-icon type="rollback" />
         {{ $t('sendBack') }}
@@ -1016,24 +1010,23 @@ export default {
       // console.log('menuId',this.menuId)
       let dateName = moment(new Date()).format('YYYYMMDD')
       let name = ''
+      let url = ''
       switch (code){
         case 'all':
-          name = this.softwareversion;
+          url = 'ota/otaManageApplyEO/allCarExportXls'
           break;
         case 'studio':
-          name = this.softwareversion;
-          break;
-        case 'manger':
-          name = this.softwareversion;
+          url = 'ota/otaManageApplyEO/oneCarExportXls'
           break;
       }
       let exportName = name + ' ' + dateName + '.xlsx'
       let query = {
         exportName: exportName,
-        idList: this.selectedRowKeys.join(','),
+        selections: this.selectedRowKeys.join(','),
+        ...this.queryParam
       }
 
-      downloadFile('split/sarFileSplitItems/exportSplitInfoZip', exportName, query, this.selectClear)
+      downloadFile(url, exportName, query, this.selectClear)
     },
     // 下发通知
     issuenotice(){

jero-web/src/views/otamanagement/otaAuthentication/components/remark.vue

@@ -1,7 +1,7 @@
 <!--批量设置-->
 <template>
   <a-modal
-    :title="$t('BatchSetting')"
+    :title="$t('Modifyremarks')"
     :width="600"
     :visible="visible"
     :confirm-loading="confirmLoading"