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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java

@@ -590,7 +590,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			Map<String, String> infoDiffEn = ListDiff.compareObject(dataListCopy.get(0),projectLawsInventoryEOCopy);
 
 			//设置更新log
-//			setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId());
+			setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId());
 
 
 			//验证用户是否是该法规上级 项目库的studio， 如果是，则同步更新流程
@@ -3752,14 +3752,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			this.saveBatch(projectLawsInventoryEOList);
 
 			//更新log
-//			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-//			String username = sysUser.getUsername();
+			String username = sysUser.getUsername();
-//			String projectLibraryId = projectLawsInventoryEOList.get(0).getProjectLibraryId();
+			String projectLibraryId = projectLawsInventoryEOList.get(0).getProjectLibraryId();
-//			String serialNumber = projectLawsInventoryEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
+			String serialNumber = projectLawsInventoryEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(","));
-//			String contentLog = username+"复制了“"+serialNumber+"”";
+			String contentLog = username+"复制了“"+serialNumber+"”";
-//			String enContentLog =  username+" copied “"+serialNumber+"”";
+			String enContentLog =  username+" copied “"+serialNumber+"”";
-//			projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
+			projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
-//			projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
+			projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
 			this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
 			projectTaskInventoryEOList.forEach(taskInventory -> {
 				this.initConditionAssessmentEO(taskInventory.getProjectLawsInventoryId());
@@ -4052,15 +4052,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			String enContentIndexStart = enContentLog.substring(0,enContentLog.indexOf("“"));
 			String enContent= enContentLog.substring(enContentIndexStart.length()+1,enContentLog.length());
 
-//			if(StringUtils.isNotBlank(content)){
+			if(StringUtils.isNotBlank(content)){
-//				contentLog = contentLog.substring(0, contentLog.length() - 5) + "”";
+				contentLog = contentLog.substring(0, contentLog.length() - 5) + "”";
-//				projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
+				projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue());
-//			}
+			}
 
-//			if(StringUtils.isNotBlank(enContent)){
+			if(StringUtils.isNotBlank(enContent)){
-//				enContentLog = enContentLog.substring(0, enContentLog.length() - 5) + "”";
+				enContentLog = enContentLog.substring(0, enContentLog.length() - 5) + "”";
-//				projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
+				projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue());
-//			}
+			}
 		}
 	}
 

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

@@ -1721,4 +1721,5 @@ module.exports = {
   cantTransferToYourself:"Can't transfer to yourself",
   theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate',
   dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset',
+  noteone:'Note: CSV format is supported. The value is within 20M and the number is 1 to 10',
 }

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

@@ -1821,6 +1821,7 @@ module.exports = {
   note:'注:附件包括测试项目清单、测试报告．测试标准或技术规范',
   format:'支持doc/docx/pdf格式,大小50M以内',
   cantTransferToYourself:"不能转办给自己",
+  noteone:'注:支持CSV格式，大小20M以内，数量1-10个',
   theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起',
   dataWithProcessReleasedCannotBeReset:'流程状态为清单待发布的数据不能被重置',
 }

jero-web/src/views/otamanagement/upgradeactivity/index.vue

@@ -389,8 +389,25 @@ export default {
     },
     // 引用备案
     citeforrecord(){
-
+      if( this.selectedRowKeys.length == 0 ){
-    },
+        this.$message.warning(this.$t('selectLeastOne'))
+      }else{
+        if ( this.selectedRowKeys.length > 1){
+        this.$message.warning(this.$t('OnlyOneSelected'))
+      }else{
+        localStorage.removeItem('otaIdT')
+        localStorage.removeItem('otaId')
+        localStorage.setItem('otaIdT',this.selectedRowKeys[0])
+        if(localStorage.getItem('otaIdT')!=null){
+          this.$router.push({
+        path: '/upgradeactivityrecord',
+        query: {
+          type:1
+        }
+      })
+        }
+      }
+    }},
     // 创建车型
     createvehicleandfunctionrecords() {
       localStorage.removeItem('otaId')

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

@@ -54,6 +54,10 @@
     </a-table>
     <div>
       <a-button @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
+      <div style='margin-top: 20px'>
+        <p>{{$t('note')}}</p>
+        <p>&nbsp;&nbsp;&nbsp;&nbsp;{{$t('format')}}</p>
+      </div>
     </div>
     <div class="bootom-button">
       <a-button style="margin-right:50px">{{$t('preservation')}}</a-button>

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

@@ -12,7 +12,7 @@
               <a-form-model-item class="itemModel" prop="dutyTerritory">
                 <a-input
                   :placeholder="$t('pleaseEnter')"
-                  v-model.trim="queryParam.taskname"></a-input>
+                  v-model.trim="queryParam.rwmc"></a-input>
               </a-form-model-item>
             </div>
           </a-col>
@@ -29,7 +29,7 @@
                                @change="dateChange({db_field_name:'updatereleasetime'})"
                                format="YYYY-MM-DD"
                                :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="queryParam.updatereleasetime"
+                               v-model="queryParam.sjfbsj"
                                :disabled="false"
                                style="width: 100%"/>
               </a-form-model-item>
@@ -48,7 +48,7 @@
                                @change="dateChange({db_field_name:'upgradeplanexpirationtime'})"
                                format="YYYY-MM-DD"
                                :getCalendarContainer="(trigger) => trigger.parentNode"
-                               v-model="queryParam.upgradeplanexpirationtime"
+                               v-model="queryParam.sjjzsj"
                                :disabled="false"
                                style="width: 100%"/>
               </a-form-model-item>
@@ -58,7 +58,7 @@
       </a-form-model>
     </a-spin>
     <div class="bootom-button">
-      <a-button style="margin-right:50px">{{$t('preservation')}}</a-button>
+      <a-button style="margin-right:50px" @click="save">{{$t('preservation')}}</a-button>
       <a-button type="primary" @click='last' style="margin-right:50px">{{$t('last')}}</a-button>
       <a-button type="primary" @click='submit'>{{$t('submit')}}</a-button>
     </div>
@@ -77,21 +77,51 @@ export default {
     return {
       confirmLoading: false,
       disabled: false,
-      queryParam:{}
+      queryParam:{
+        sjjzsj:''
+      }
     }
   },
   mounted() {
-
+  this.getData()
   },
   methods: {
+    getData(){
+      let otaIdT=localStorage.getItem('otaIdT')
+        if(otaIdT==null){
+          otaIdT=''
+        }
+        let otaId=localStorage.getItem('otaId')
+        if(otaId==null){
+          otaId=''
+        }
+        getAction('/ota/otaBaSjQtsjxx/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}),then(res=>{
+          if(res.code == 200){
+            this.queryParam= res.result ==null ? {} :res.result 
+          }
+        })
+    },
+    save(){
+      let otaId = localStorage.getItem('otaId')
+      if(otaId == null || otaId == undefined){
+        otaId=''
+      }
+      this.queryParam.otaId = otaId
+      postAction('/ota/otaBaSjQtsjxx/add' ,this.queryParam).then(res=>{
+        this.$message.success(this.$t('SavedSuccessfully'))
+        console.log(res);
+       })
+    },
+    
     last(){
+      this.save()
       this.$emit('otherup')
     },
     dateChange(item) {
       this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : ''
     },
     submit(){
-
+       this.$router.push('upgradeactivity')
     },
   }
 }

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

@@ -76,10 +76,10 @@
                               <a-button type="primary" class="button-text"
                                         @click="clickButtonToUpload('VINcodelist')">
                                 {{ (formInline.VINcodelist === 'null' || formInline.VINcodelist === '' ||
-                                formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+                                formInline.VINcodelist == null) ? $t('VINcodeupload') : $t('viewUploadedFiles')
                                 }}
                               </a-button>
-                              <p>支持cxv格式，大下20M以内，数量1-10个</p>
+                              <p>{{$t('noteone')}}</p>
                               <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
                             </a-form-model-item>
             </div>

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

@@ -66,9 +66,6 @@
           <a class="text-operation" @click="deleteData(record)" v-if="dataSource.length > 1">{{$t('delete')}}</a>
       </span>
     </a-table>
-    <div>
-      <a-button @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
-    </div>
     <div class="bootom-button">
       <a-button style="margin-right:50px" @click="save">{{$t('preservation')}}</a-button>
       <a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>

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

@@ -389,8 +389,11 @@ this.$forceUpdate()
         })
     },
     save(){
-      
+      let otaId = localStorage.getItem('otaId')
-       this.form.otaId=localStorage.getItem('otaId')
+      if(otaId == null || otaId == undefined){
+        otaId=''
+      }
+       this.form.otaId=otaId
        postAction('/ota/otaBaSjSjyxpg/add',this.form).then(res=>{
         this.$message.success(this.$t('SavedSuccessfully'))
         console.log(res);

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

@@ -158,6 +158,7 @@
                   formInline.xgwj == null) ? $t('uploadattachment') : $t('viewUploadedFiles')
                   }}
                 </a-button>
+                <p>{{$t('format')}}</p>
               </a-form-model-item>
             </div>
           </a-col>
@@ -178,6 +179,7 @@ import { getAction, postAction, deleteAction,downloadFile } from '@/api/manage'
 import ImportFile from '@/components/ImportFileData/index'
 import uploadFile from '@/components/uploadFile/file'
 import moment from 'moment'
+import { post } from '../../../../common/lang/zh-cn'
 
 export default {
   name: 'basicInformation',
@@ -197,7 +199,7 @@ export default {
     }
   },
   mounted() {
-
+ this.getData()
   },
   methods: {// 模板下载
     handleModule() {
@@ -228,8 +230,31 @@ export default {
         }
       })
     },
+    getData(){
+      let otaIdT=localStorage.getItem('otaIdT')
+        if(otaIdT==null){
+          otaIdT=''
+        }
+        let otaId=localStorage.getItem('otaId')
+        if(otaId==null){
+          otaId=''
+        }
+        getAction('/ota/otaBaSjGgnrfs/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}),then(res=>{
+          if(res.code == 200){
+            this.formInline= res.result ==null ? {} :res.result 
+          }
+        })
+    },
     save(){
-
+      let otaId = localStorage.getItem('otaId')
+      if(otaId == null || otaId == undefined){
+        otaId=''
+      }
+      this.formInline.otaId = otaId
+       postAction('/ota/otaBaSjGgnrfs/add' ,this.formInline).then(res=>{
+        this.$message.success(this.$t('SavedSuccessfully'))
+        console.log(res);
+       })
     },
 
     next(){

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

@@ -72,7 +72,7 @@
       </span>
 
       <span slot="softwaredevelopmententerprise" slot-scope="text,record">
-          <a-input :placeholder="$t('pleaseEnter')" v-model="record.yjbbxx" :max-length="500"></a-input>
+          <a-input :placeholder="$t('pleaseEnter')" v-model="record.rjkfqy" :max-length="500"></a-input>
       </span>
       <span slot="operatingsystemversion" slot-scope="text,record">
           <a-input :placeholder="$t('pleaseEnter')" v-model="record.rjkfqy" :max-length="500"></a-input>