车型判断修改

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

@@ -1951,4 +1951,5 @@ module.exports = {
   datacannotbeedited:'This data cannot be edited',
   Rematchornot:'Rematch or not',
   Modifyremarks:'Modify remarks',
+  Reasonforreturn:'Reason for return',
 }

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

@@ -3907,4 +3907,5 @@ module.exports = {
   datacannotbeedited:'该数据不能进行编辑',
   Rematchornot:'是否重新匹配',
   Modifyremarks:'修改备注',
+  Reasonforreturn:'退回原因'
 }

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

@@ -33,7 +33,7 @@
                        v-model="queryParam.impactHomo"></a-input>
             </div>
           </a-col>
-          <template v-if="toggleSearchStatus && vehicleTypeCode== '全部'">
+          <template v-if="toggleSearchStatus && vehicleTypeCode== $t('whole')">
             <a-col :md="6" :sm="8">
               <div class="box-title-text">
                 <div class="title-text" :title="$t('vehicleType')">
@@ -61,7 +61,7 @@
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
             <a-col :md="6" :sm="24">
-              <a @click="handleToggleSearch" v-if="vehicleTypeCode == '全部'">
+              <a @click="handleToggleSearch" v-if="vehicleTypeCode == $t('whole')">
                 {{ !toggleSearchStatus ? $t('open') : $t('away') }}
                 <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
               </a>
@@ -103,55 +103,55 @@
     </div>
 <!--    全部导出-->
     <div class="table-operator" style='margin-bottom: 19px;text-align: left;margin-top: 20px;'>
-      <div v-show="vehicleTypeCode === '全部'" class="operator-text" @click="handleExportManage('all')"
+      <div v-show="vehicleTypeCode === $t('whole')" class="operator-text" @click="handleExportManage('all')"
            v-has="'otadetail:export'">
         <a-icon type="export" :rotate="-90" />
         {{ $t('export') }}
       </div>
 <!--      全部下发通知-->
-      <div v-show="vehicleTypeCode === '全部'" class="operator-text" @click="issuenotice"
+      <div v-show="vehicleTypeCode === $t('whole')" class="operator-text" @click="issuenotice"
            v-has="'otadetail:Issuenotice'">
         <a-icon type="sound" />
         {{ $t('issuenotice') }}
       </div>
       <!--    studio导出-->
-      <div v-show="vehicleTypeCode !== '全部'"  class="operator-text" @click="handleExportManage('studio')"
+      <div v-show="vehicleTypeCode !== $t('whole')"  class="operator-text" @click="handleExportManage('studio')"
            v-has="'otad:export'">
         <a-icon type="export" :rotate="-90"/>
         {{ $t('export') }}
       </div>
       <!--      studio批量设置-->
-      <div v-show="vehicleTypeCode !== '全部'" class="operator-text" @click="BatchSetting"
+      <div v-show="vehicleTypeCode !== $t('whole')" class="operator-text" @click="BatchSetting"
            v-has="'otad:batchsetting'">
         <a-icon type="setting"  />
         {{ $t('BatchSetting') }}
       </div>
       <!--      studio申请重新匹配-->
-      <div v-show="vehicleTypeCode !== '全部'" class="operator-text" @click="applyforrematch"
+      <div v-show="vehicleTypeCode !== $t('whole')" class="operator-text" @click="applyforrematch"
            v-has="'otad:rematch'">
         <a-icon type="rollback" />
         {{ $t('applyforrematch') }}
       </div>
       <!--      studio保存-->
-      <div v-show="vehicleTypeCode !== '全部'" class="operator-text" @click="preservation"
+      <div v-show="vehicleTypeCode !== $t('whole')" class="operator-text" @click="preservation"
            v-has="'otad:save'">
         <a-icon type="check-circle" />
         {{ $t('preservation') }}
       </div>
       <!--      studio提交-->
-      <div v-show="vehicleTypeCode !== '全部'" class="operator-text" @click="submit"
+      <div v-show="vehicleTypeCode !== $t('whole')" class="operator-text" @click="submit"
            v-has="'otad-submit'">
         <a-icon type="check-circle" />
         {{ $t('submit') }}
       </div>
       <!--      manger确认-->
-      <div v-show="vehicleTypeCode !== '全部'" class="operator-text" @click="confirm"
+      <div v-show="vehicleTypeCode !== $t('whole')" class="operator-text" @click="confirm"
            v-has="'otaman:confirm'">
         <a-icon type="check-circle" />
         {{ $t('confirm') }}
       </div>
       <!--      manger退回-->
-      <div v-show="vehicleTypeCode !== '全部'" class="operator-text" @click="sendBack"
+      <div v-show="vehicleTypeCode !== $t('whole')" class="operator-text" @click="sendBack"
            v-has="'otaman:return'">
         <a-icon type="rollback" />
         {{ $t('sendBack') }}
@@ -361,7 +361,7 @@ export default {
         importZipUrl: '/ota/otaBaCxList/importData',//导入
       },
       number:'',
-      vehicleTypeCode:'全部',
+      vehicleTypeCode:this.$t('whole'),
       visible: false,
       loading: false,
       toggleSearchStatus: false,
@@ -891,7 +891,7 @@ export default {
   watch:{
     // 监听车型变化
     vehicleTypeCode(){
-      if(this.vehicleTypeCode !== '全部'){
+      if(this.vehicleTypeCode !== this.$t('whole')){
         this.cuList = this.customizeSeList
         this.$forceUpdate()
       }else{
@@ -971,7 +971,7 @@ export default {
         }
       })
       this.selectedRowKeys = []
-      queryParam.appliedVehicleProject = this.vehicleTypeCode == '全部'?queryParam.appliedVehicleProject:this.vehicleTypeCode
+      queryParam.appliedVehicleProject = this.vehicleTypeCode == this.$t('whole')?queryParam.appliedVehicleProject:this.vehicleTypeCode
       queryParam.plannedBpLaunchBatch = this.$route.query.plannedBpLaunchBatch
       let query = {
         pageNo: this.pageNo,
@@ -981,7 +981,7 @@ export default {
         ...queryParam
       }
       this.loading = true
-      let url = this.vehicleTypeCode == '全部'?'/ota/otaManageApplyEO/getOtaPage':'/ota/otaManageApplyEO/getOtaCarPage'
+      let url = this.vehicleTypeCode == this.$t('whole')?'/ota/otaManageApplyEO/getOtaPage':'/ota/otaManageApplyEO/getOtaCarPage'
       getAction(url, query).then((res) => {
         if (res.success) {
           if (res.result.current > 1 && res.result.records.length == 0) {
@@ -1027,7 +1027,7 @@ export default {
       } else if (long && long == 'en-us') {
         this.cut = 'en'
       }
-      this.queryParam.appliedVehicleProject = this.vehicleTypeCode == '全部'?this.queryParam.appliedVehicleProject:this.vehicleTypeCode
+      this.queryParam.appliedVehicleProject = this.vehicleTypeCode == this.$t('whole')?this.queryParam.appliedVehicleProject:this.vehicleTypeCode
       this.queryParam.plannedBpLaunchBatch = this.$route.query.plannedBpLaunchBatch
       let exportName = this.$route.query.plannedBpLaunchBatch
       let query = {
@@ -1314,7 +1314,7 @@ export default {
     },
     getHeader() {
       getAction('head/headCustomEO/list', {
-        moduleFlag: this.vehicleTypeCode == '全部'?'全车型':'分车型'
+        moduleFlag: this.vehicleTypeCode == this.$t('whole')?'全车型':'分车型'
       }).then((res) => {
         if (res.success) {
           if(res.result && res.result.length > 0){
@@ -1323,9 +1323,9 @@ export default {
             })
             this.columnsAll = res.result
           }else{
-            this.columnsAll = this.vehicleTypeCode == '全部'?this.columns:this.columnstype
+            this.columnsAll = this.vehicleTypeCode == this.$t('whole')?this.columns:this.columnstype
           }
-          if(this.vehicleTypeCode == '全部'){
+          if(this.vehicleTypeCode == this.$t('whole')){
             for (let j = 0; j < this.columnsAll.length; j++) {
               for (let i = 0; i < this.columns.length; i++) {
                 if (this.columns[i].dataIndex == this.columnsAll[j].dataIndex) {

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

@@ -1,7 +1,7 @@
 <!--拒绝原因-->
 <template>
   <a-modal
-    :title="$t('rejectReason')"
+    :title="$t('Reasonforreturn')"
     :width="600"
     :visible="visible"
     :confirm-loading="confirmLoading"
@@ -15,11 +15,11 @@
           <div class="box-title-text">
             <div class="title-text">
               <span class="Required">*</span>
-              <span class="title-text-text" :title="$t('rejectReason')">
+              <span class="title-text-text" :title="$t('Reasonforreturn')">
-                {{$t('rejectReason')}}</span>
+                {{$t('Reasonforreturn')}}</span>
             </div>
             <a-form-model-item class="itemModel" prop="rejectReason">
-              <a-textarea :placeholder="$t('pleaseEnter')+$t('rejectReason')"
+              <a-textarea :placeholder="$t('pleaseEnter')+$t('Reasonforreturn')"
                           v-model="formInline.rejectReason"
                           style="width: 90%"
                           :maxLength="200"
@@ -56,7 +56,7 @@ export default {
         rejectReason: [
           {
             required: true,
-            message: this.$t('rejectReason') + this.$t('cannotEmpty'),
+            message: this.$t('Reasonforreturn') + this.$t('cannotEmpty'),
             trigger: 'blur'
           }
         ],