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

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

@@ -1508,7 +1508,7 @@ module.exports = {
   applicationconditions:'Application conditions',
   componentname:'Component name',
   fillincontent:'Fill in content',
-  upgradepacketprotectionmeasures:'Upgrade packet protection measures',
+  upgradepacketprotectionmeasuresa:'Software version (set) identification and storage',
   controlsystem:'This section describes how to identify and save the software upgrade version (set) of the electronic control system',
   vehicledynamictype:'Vehicle dynamic type',
   upgradetargetmodel:'Upgrade target model',
@@ -1744,4 +1744,5 @@ module.exports = {
   uploadedfilelarger:'The uploaded file is larger than',
   marketCertificationListDetails:'Market Certification List Details',
   andTheProcessStatusTheList:'And the process status cannot be the data to be checked in the list',
+  pleasefillintherange:'Please fill in the range',
 }

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

@@ -1669,7 +1669,7 @@ module.exports = {
     '(a)告知车辆用户车辆升级的结果(成功或失败)；\n' +
     '\n' +
     '(b)若升级成功，告知车辆用户已实施的变更，用户手册(如果适用)的任何相关更新。',
-  // upgradepacketprotectionmeasures:'软件版本（集）识别与存储',
+  upgradepacketprotectionmeasuresa:'软件版本（集）识别与存储',
   otaupgradedsecuritymeasuresforvehicles:'车辆OTA升级安全措施',
   authenticityandintegrityprotectionmechanism:'真实性、完整性保护机制(可多选)',
   failsafmechanism:'防失效保护机制(可多选)',
@@ -1847,4 +1847,5 @@ module.exports = {
   marketCertificationList:'市场认证清单',
   marketCertificationListDetails:'市场认证清单详情',
   andTheProcessStatusTheList:'并且流程状态不能为清单待校核的数据',
+  pleasefillintherange:'请填写范围',
 }

jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue

@@ -54,7 +54,7 @@
                 {{$t('VINcodelist')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="VINcodelist">
-                <a-textarea :placeholder="$t('pleaseEnter')+$t('VINcodelist')"
+                <a-textarea :placeholder="$t('pleasefillintherange')"
                             v-model="formInline.vinList"
                             :rows="4"
                             :max-length="500"/>

jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue

@@ -58,7 +58,11 @@
         <a-input :placeholder="$t('pleaseEnter')"  v-model="record.sjbdx" :title='record.sjbdx' :max-length="50"></a-input>
         </span>
         <span slot="differentialupgradeornot" slot-scope="text,record" :max-length="50">
-        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.sfcfsj" :title='record.sfcfsj'></a-input>
+<!--        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.sfcfsj" :title='record.sfcfsj'></a-input>-->
+          <a-radio-group v-model="record.sfcfsj">
+            <a-radio :value="1"> {{ $t('yes') }} </a-radio>
+            <a-radio :value="2"> {{ $t('not') }} </a-radio>
+          </a-radio-group>
       </span>
       <!--      操作列-->
       <span slot="operation" slot-scope="text,record">

jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue

@@ -53,10 +53,10 @@
           <a-input :placeholder="$t('ifNot')" :title="record.sjggcs ? record.sjggcs : $t('ifNot')" v-model="record.sjggcs" :max-length="500"></a-input>
       </span>
       <span slot="functiondescription" slot-scope="text,record">
-          <a-input :placeholder="$t('ifNot')" :title="record.gnms ? record.gnms:$t('ifNot')" v-model="record.gnms" :max-length="500"></a-input>
+          <a-input :placeholder="$t('pleaseEnter')" :title="record.gnms ? record.gnms:$t('pleaseEnter')" v-model="record.gnms" :max-length="500"></a-input>
       </span>
       <span slot="applicationconditions" slot-scope="text,record">
-          <a-input :placeholder="$t('ifNot')" :title="record.sytj ? record.sytj:$t('ifNot')" v-model="record.sytj" :max-length="500"></a-input>
+          <a-input :placeholder="$t('pleaseEnter')" :title="record.sytj ? record.sytj:$t('pleaseEnter')" v-model="record.sytj" :max-length="500"></a-input>
       </span>
       <span slot="functiondeelectronicscription" slot-scope="text,record">
           <a-input :placeholder="$t('pleaseEnter')" :title='record.kzqmc' v-model="record.kzqmc" :max-length="50"></a-input>

jero-web/src/views/otamanagement/vehicleinformation/components/other.vue

@@ -6,7 +6,7 @@
           <a-col :span="24">
             <div class="box-title-text-add">
               <div class="title-text-add">
-                <span class="title-text-text" :title="$t('upgradepacketprotectionmeasures')">{{$t('upgradepacketprotectionmeasures')}}</span>
+                <span class="title-text-text" :title="$t('upgradepacketprotectionmeasuresa')">{{$t('upgradepacketprotectionmeasuresa')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="sjbbhcs" >
                 <a-textarea
@@ -43,7 +43,9 @@ export default {
       flag:'',
       rules:{
         sjbbhcs:[
-          { max: 500,message:'最多只能添加500个字符',trigger:'blur'}
+          { max: 500,
+            message:this.$t('upgradepacketprotectionmeasuresa') + this.$t('cannotExceed') + 500 + this.$t('Characters'),
+            trigger:'blur'}
         ]
       }
     }

jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue

@@ -9,7 +9,7 @@
         {{$t('templateDownload')}}
       </div>
     </div>
-    <a-table ref="table" size="middle" :pagination="false" :scroll="{ x: '100%', y: 'calc(100vh - 140px)' }" rowKey="key"
+    <a-table class="table" ref="table" size="middle" :pagination="false" :scroll="{ x: '100%' }" rowKey="key"
       bordered :data-source="dataSource" :columns="columns" style="margin-bottom: 20px">
 
       <span slot="relevantverification" slot-scope="text,record">
@@ -369,4 +369,8 @@ button {
   color: #00B3BE;
   border-color: #00B3BE;
 }
+
+.table {
+  white-space: break-spaces;
+}
 </style>

jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue

@@ -457,7 +457,7 @@
                       :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}"
                       :personneQuery="formInline"
                       :isSingleChoice="true"
-                      v-if="visible"
+                      v-if="personnelVisible"
                       @change="PersonnelSelectionChange"
                       :disabled="disabled"
                       v-model="formInline.dutyPersonName"/>
@@ -509,6 +509,7 @@
         formInline: {},
         confirmLoading: false,
         visible: false,
+        personnelVisible:false,
         yearNameDataList: [],
         rules: {
           serialNumber: [
@@ -631,6 +632,7 @@
 
       addModel() {
         this.visible = true
+        this.personnelVisible = true
         this.title = this.$t('add')
         this.formInline = {}
         this.getRegulationNo()
@@ -643,6 +645,7 @@
       editModel(value) {
         this.formInline = {}
         this.visible = true
+        this.personnelVisible = true
         this.formInline = JSON.parse(JSON.stringify(value))
         // if (this.formInline.deliverableType) {
         //   this.formInline.deliverableType = this.formInline.deliverableType.split(',')
@@ -659,6 +662,7 @@
       },
       handleCancel() {
         this.visible = false
+        this.personnelVisible = false
       },
       handleSubmit() {
         this.$refs.ruleForm.validate(valid => {
@@ -709,6 +713,7 @@
                   this.$message.success(this.$t('OperationSuccessful'))
                 }
                 this.visible = false
+                this.personnelVisible = false
                 this.$emit('addModelForm')
               } else {
                 this.$message.warning(res.message)
@@ -831,9 +836,14 @@
                   this.formInline.dutyPersonName = res.result.engineeringInterfacePersonList[0].name
                   this.formInline.dutyPerson = res.result.engineeringInterfacePersonList[0].value
                 }
+                this.formInline = {...this.formInline}
               } else if (this.engineeringInterfacePersonList.length == 0) {
                 this.formInline.sdt = undefined
               }
+              this.personnelVisible = false
+              this.$nextTick(()=>{
+                this.personnelVisible = true
+              })
             } else {
               this.$nextTick(() => {
                 this.formInline.dataList[index].engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || []