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/ProjectCertificationInventoryEOServiceImpl.java

@@ -2251,7 +2251,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			});
 			this.processInfoDetailEOService.updateBatchById(processInfoDetailEOList);
 		}
-		
+
 		List<String> userIdList = Arrays.asList(transferUserId.split(","));
 		List<SysUser> userInfoList = this.sysUserService.querySysUserListByIdList(userIdList);
 		this.sendMessageByTemplateId(
@@ -2427,7 +2427,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 						return flag;
 					}).collect(Collectors.toList());
 					if (CollectionUtils.isNotEmpty(toBeSubmitDataList)) {
-						
+
 						this.sendMessageByTemplateId(
 								toBeSubmitDataList,
 								TemplateInfoEnum2.CERTIFICATION_MESSAGE18.getValue(),
@@ -3053,21 +3053,21 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		try {
 			String title = "";
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-				title = "类别,检验项目,配置项,WVTA ID," +
+				title = "*类别,*检验项目,*配置项,*WVTA ID," +
-						"*标准编号,*责任领域,工程接口人,责任人," +
+						"*标准编号,*责任领域,*工程接口人,*责任人," +
-						"交付物类型,截止日期";
+						"交付物类型,*交付物模板,*截止日期";
 			}else {
-				title = "Category,Inspection Items,Configuration Item,WVTA ID," +
+				title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
-						"*Standard No,*Responsible Field,Eng. Interface,Assignee," +
+						"*Standard No,*Responsible Field,*Eng. Interface,*Assignee," +
-						"Deliverable Type,Due Date";
+						"Deliverable Type,*Deliverable Template,*Due Date";
 			}
 
 			List<String> list = Arrays.asList(title.split(","));
 			int index = 0;
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
-				index = list.indexOf("截止日期") + 1;
+				index = list.indexOf("*截止日期") + 1;
 			}else{
-				index = list.indexOf("Due Date") + 1;
+				index = list.indexOf("*Due Date") + 1;
 			}
 
 			//创建临时文件夹
@@ -3087,25 +3087,23 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 			cellStyleTemp.setWrapText(true);//自动换行
 
 			CellRangeAddress region =
-					new CellRangeAddress(1, 1, 0, 15); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
+					new CellRangeAddress(1, 1, 0, 10); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
 			sheet.addMergedRegion(region);
 			String explain= "";
 			if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){
 				explain = "填写说明\n" +
 						"1.导入数据从第三行开始\n" +
 						"2.所有带*号的字段必须填写\n"+
-						"3.责任人,交付物类型,工程接口人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
+						"3.责任人,交付物类型,工程接口人,编号,责任领域,字段是单选属性,必须和系统中的对应字段选项相匹配\n" +
-						"4.编号,责任领域,字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" +
+						"4.类别,WVTA ID,检验项目,配置项,填写文本内容\n" +
-						"5.类别,WVTA ID,检验项目,填写文本内容\n" +
+						"5.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
-						"6.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
 			}else{
 				explain = "Filling explanation\n" +
 						"1.Import data starts at the fourth line\n" +
 						"2.All fields marked with * must be filled in\n"+
-						"3.Assignee,Deliverable Type,Deliverable Type,Eng. Interface,Fields are radio attributes that must match the corresponding field option in the system\n" +
+						"3.Assignee,Deliverable Type,Eng. Interface,Standard No,Responsible Field,Fields are radio attributes that must match the corresponding field option in the system\n" +
-						"4.Standard No,Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
+						"4.Category,WVTA ID,Configuration Item,Inspection Items,Fill in the text\n" +
-						"5.Category,WVTA ID,Inspection Items,Fill in the text\n" +
+						"5.Deliverable Template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. doc";
-						"6.Deliverable Template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B.docx";
 			}
 			for(int i = 0; i < 2; i++){
 				//表头
@@ -3120,7 +3118,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 						}
 					}
 				}else {
-					short height = (short) (7 * 252);
+					short height = (short) (6 * 252);
 					row.setHeight((short) height);
 					Cell cell = row.createCell(0);
 					cell.setCellStyle(cellStyleTemp);

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

@@ -1743,7 +1743,7 @@ module.exports = {
   afterthesoftwareversionupgraded:'软件版本号升级后',
   beforetheOSversionupgraded:'操作系统版本号升级前',
   aftertheoperatingsystemversionupgraded:'操作系统版本号升级后',
-  initialpackageforintegrityinflammatorydata:'初始软件包的完整性炎症数据',
+  initialpackageforintegrityinflammatorydata:'初始软件包的完整性验证数据',
   upgradepackageintegrityverificationdata:'升级包完整性验证数据',
   upgradepackagesize:'升级包大小',
   differentialupgradeornot:'是否差分升级',

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

@@ -22,41 +22,39 @@
       :columns="columns"
       style="margin-bottom: 20px"
     >
-      <!--      配置情况-->
+    <span slot="functionname" slot-scope="text,record">
-      <span slot="configuration" slot-scope="text,record">
+          <a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.gnmc"></a-input>
-            <a-radio-group>
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
       </span>
-      <!--      可升级-->
+      <span slot="upgradedestinationype" slot-scope="text,record">
-      <span slot="whetheritcanbeupgraded" slot-scope="text,record">
+          <a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sjmdlx"></a-input>
-            <a-radio-group>
-                    <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-                    <a-radio :value="2"> {{ $t('not') }} </a-radio>
-            </a-radio-group>
       </span>
-      <!--       自动化级别-->
-      <span slot="drivingautomationlevel" slot-scope="text,record">
-                    <j-dict-select-tag class="box-input"
-                                       :disabled="disable"
-                                       :placeholder="$t('PleaseSelect')"
-                                       :type="'select'"
-                                       :triggerChange="false"/>
-      </span>
-      <!--       升级前-->
       <span slot="preupgrade" slot-scope="text,record">
-          <a-input :placeholder="$t('ifNot')" :title="$t('ifNot')"></a-input>
+          <a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjqbgcs"></a-input>
       </span>
-      <!--       升级后-->
       <span slot="afterupgrade" slot-scope="text,record">
-          <a-input :placeholder="$t('ifNot')" :title="$t('ifNot')"></a-input>
+          <a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjhbgcs"></a-input>
       </span>
+      <span slot="functionalchangedescription" slot-scope="text,record">
+        <a-input :placeholder="$t('pleaseEnter')" v-model="record.gnbgms" ></a-input>
+      </span>
+      <span slot="variationofapplicableconditions" slot-scope="text,record">
+          <a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sytjbg"></a-input>
+      </span>
+      <span slot="upgradetheelectroniccontrollerinvolved" slot-scope="text,record">
+          <a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sjsjkzq"></a-input>
+      </span>
+      <span slot="functiondescription" slot-scope="text,record">
+          <a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.gnbgms"></a-input>
+      </span>
+      <span slot="applicationconditions" slot-scope="text,record">
+          <a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sytjbg"></a-input>
+      </span>
+   
+ 
       <!--      操作列-->
       <span slot="operation" slot-scope="text,record">
-          <a class="text-operation">{{$t('addcontroller')}}</a>
+          <a class="text-operation" @click="addlineAtBot">{{$t('add')}}</a>
-          <a class="text-operation">{{$t('addfunction')}}</a>
+          <a class="text-operation" @click="deleteData(record)">{{$t('delete')}}</a>
-          <a class="text-operation">{{$t('delete')}}</a>
       </span>
     </a-table>
     <div>
@@ -86,8 +84,7 @@ export default {
     return {
       dataSource: [
         {
-          key:1,
+        
-          functionname:'ceshi',
         }
       ],
       loading: false,
@@ -98,108 +95,83 @@ export default {
           align: 'left',
           dataIndex: 'functionname',
           ellipsis: true,
-          width: 170
+          width: 170,
+          scopedSlots: { customRender: 'functionname' },
         },
         {
-          title: this.$t('configuration'),
+          title: this.$t('upgradedestinationype'),
           align: 'left',
-          dataIndex: 'configuration',
+          dataIndex: 'upgradedestinationype',
           ellipsis: true,
-          width: 170
+          width: 170,
+          scopedSlots: { customRender: 'upgradedestinationype' },
+        },
+          {
+          title: this.$t('adjustmentofchangedBulletinparameters'),
+          align: 'left',
+          dataIndex: 'adjustmentofchangedBulletinparameters',
+          ellipsis: true,
+          width: 170,
+          children: [
+            {
+              title: this.$t('preupgrade'),
+              align: 'left',
+              dataIndex: 'preupgrade',
+              ellipsis: true,
+              width: 170,
+          scopedSlots: { customRender: 'preupgrade' },
+            },
+            {
+              title: this.$t('afterupgrade'),
+              align: 'left',
+              dataIndex: 'afterupgrade',
+              ellipsis: true,
+              width: 170,
+          scopedSlots: { customRender: 'afterupgrade' },
+            },
+          ]
         },
         {
-          title: this.$t('whetheritcanbeupgraded'),
+          title: this.$t('functionalchangedescription'),
           align: 'left',
-          dataIndex: 'whetheritcanbeupgraded',
+          dataIndex: 'functionalchangedescription',
           ellipsis: true,
-          width: 170
+          width: 170,
+          scopedSlots: { customRender: 'functionalchangedescription' },
         },
         {
-          title: this.$t('drivingautomationlevel'),
+          title: this.$t('variationofapplicableconditions'),
           align: 'left',
-          dataIndex: 'drivingautomationlevel',
+          dataIndex: 'variationofapplicableconditions',
           ellipsis: true,
-          width: 170
+          width: 170,
+          scopedSlots: { customRender: 'variationofapplicableconditions' },
         },
         {
-          title: this.$t('technicalparameters'),
+          title: this.$t('upgradetheelectroniccontrollerinvolved'),
           align: 'left',
-          dataIndex: 'technicalparameters',
+          dataIndex: 'upgradetheelectroniccontrollerinvolved',
           ellipsis: true,
-          width: 170
+          width: 170,
+          scopedSlots: { customRender: 'upgradetheelectroniccontrollerinvolved' },
         },
         {
           title: this.$t('functiondescription'),
           align: 'left',
           dataIndex: 'functiondescription',
           ellipsis: true,
-          width: 170
+          width: 170,
+          scopedSlots: { customRender: 'functiondescription' },
         },
         {
           title: this.$t('applicationconditions'),
           align: 'left',
           dataIndex: 'applicationconditions',
           ellipsis: true,
-          width: 170
-        },
-        {
-          title: this.$t('controllerparameter'),
-          align: 'left',
-          dataIndex: 'controllerparameter',
-          ellipsis: true,
           width: 170,
-          children: [
+          scopedSlots: { customRender: 'applicationconditions' },
-            {
-              title: this.$t('electronic'),
-              align: 'left',
-              dataIndex: 'electronic',
-              ellipsis: true,
-              width: 170
-            },
-            {
-              title: this.$t('electroniccontrollerproductionenterprises'),
-              align: 'left',
-              dataIndex: 'electroniccontrollerproductionenterprises',
-              ellipsis: true,
-              width: 170
-            },
-            {
-              title: this.$t('electroniccontrollertype'),
-              align: 'left',
-              dataIndex: 'electroniccontrollertype',
-              ellipsis: true,
-              width: 170
-            },
-            {
-              title: this.$t('hardwareversioninformation'),
-              align: 'left',
-              dataIndex: 'hardwareversioninformation',
-              ellipsis: true,
-              width: 170
-            },
-            {
-              title: this.$t('softwaredevelopmententerprise'),
-              align: 'left',
-              dataIndex: 'softwaredevelopmententerprise',
-              ellipsis: true,
-              width: 170
-            },
-            {
-              title: this.$t('operatingsystemversion'),
-              align: 'left',
-              dataIndex: 'operatingsystemversion',
-              ellipsis: true,
-              width: 170
-            },
-            {
-              title: this.$t('inflammatorydata'),
-              align: 'left',
-              dataIndex: 'inflammatorydata',
-              ellipsis: true,
-              width: 170
-            },
-          ]
         },
+      
         {
           title: this.$t('operation'),
           align: 'left',
@@ -216,6 +188,7 @@ export default {
   },
   mounted() {
     // this.getList()
+    this.getData()
   },
   methods: {
     // 模板下载
@@ -250,12 +223,40 @@ export default {
         }
       })
     },
+    getData(){
+      let otaIdT=localStorage.getItem('otaIdT')
+        if(otaIdT==null){
+          otaIdT=''
+        }
+        let otaId=localStorage.getItem('otaId')
+        if(otaId==null){
+          otaId=''
+        }
+        getAction('/ota/otaBaSjSjfzbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
+          this.dataSource =res.result.list == null ?  {} : res.result.list
+        })
+    },
+    save(){
+      postAction('/ota/otaBaSjSjfzbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{
+          console.log(res);
+          this.$message.success(this.$t('SavedSuccessfully'))
+        })
+    },
     last(){
+      this.save()
       this.$emit('beupgradedonlineup')
     },
     next(){
+      this.save()
       this.$emit('beupgradedonlinedown')
     },
+    addlineAtBot(){
+      let obj={}
+        this.dataSource.push(obj)
+      },
+      deleteData(record){
+        this.dataSource.splice(this.dataSource.indexOf(record),1)
+      },
     uploadSuccess(data) {
       let attIdList = []
       if (data && data.length > 0) {

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

@@ -37,34 +37,28 @@
         <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjkzqmc" ></a-input>
       </span>
       <span slot="adaptivehardwareversion" slot-scope="text,record">
-        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.xtmc"></a-input>
+        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.yjbb"></a-input>
       </span>
       <span slot="beforethesoftwareversionupgraded" slot-scope="text,record">
-        <a-input :placeholder="$t('pleaseEnter')" v-model="record.xtmc" ></a-input>
+        <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjqrjbb" ></a-input>
       </span>
       <span slot="afterthesoftwareversionupgraded" slot-scope="text,record">
-        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.xtmc"></a-input>
+        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.sjhrjbb"></a-input>
       </span>
       <span slot="beforetheOSversionupgraded" slot-scope="text,record">
-        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.xtmc"></a-input>
+        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.sjqczxt"></a-input>
       </span>
       <span slot="aftertheoperatingsystemversionupgraded" slot-scope="text,record">
-        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.xtmc"></a-input>
+        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.sjhczxt"></a-input>
-      </span>
-      <span slot="softwaredevelopmententerprise" slot-scope="text,record">
-        <a-input :placeholder="$t('pleaseEnter')" v-model="record.xtmc" ></a-input>
-      </span>
-      <span slot="initialpackageforintegrityinflammatorydata" slot-scope="text,record">
-        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.xtmc"></a-input>
       </span>
       <span slot="upgradepackageintegrityverificationdata" slot-scope="text,record">
-        <a-input :placeholder="$t('pleaseEnter')" v-model="record.xtmc" ></a-input>
+        <a-input :placeholder="$t('pleaseEnter')" v-model="record.sjbyzsj" ></a-input>
       </span>
         <span slot="upgradepackagesize" slot-scope="text,record">
-        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.xtmc"></a-input>
+        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.sjbdx"></a-input>
         </span>
         <span slot="differentialupgradeornot" slot-scope="text,record">
-        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.xtmc"></a-input>
+        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.sfcfsj"></a-input>
       </span>
       <!--      操作列-->
       <span slot="operation" slot-scope="text,record">
@@ -76,7 +70,7 @@
       <a-button @click="clickButtonToUpload" type="primary">{{$t('uploadattachment')}}</a-button>
     </div>
     <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" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
       <a-button type="primary" style='width: 73px' @click='next'>{{$t('next')}}</a-button>
     </div>
@@ -194,22 +188,7 @@ export default {
               width: 170,
               scopedSlots: { customRender: 'aftertheoperatingsystemversionupgraded' },
             },
-            {
+         
-              title: this.$t('softwaredevelopmententerprise'),
-              align: 'left',
-              dataIndex: 'softwaredevelopmententerprise',
-              ellipsis: true,
-              width: 170,
-              scopedSlots: { customRender: 'softwaredevelopmententerprise' },
-            },
-            {
-              title: this.$t('initialpackageforintegrityinflammatorydata'),
-              align: 'left',
-              dataIndex: 'initialpackageforintegrityinflammatorydata',
-              ellipsis: true,
-              width: 170,
-              scopedSlots: { customRender: 'initialpackageforintegrityinflammatorydata' },
-            },
             {
               title: this.$t('upgradepackageintegrityverificationdata'),
               align: 'left',
@@ -252,6 +231,7 @@ export default {
   },
   mounted() {
     // this.getList()
+    this.getData()
   },
   methods: {
     // 模板下载
@@ -298,10 +278,31 @@ export default {
         }
       })
     },
+    getData(){
+      let otaIdT=localStorage.getItem('otaIdT')
+        if(otaIdT==null){
+          otaIdT=''
+        }
+        let otaId=localStorage.getItem('otaId')
+        if(otaId==null){
+          otaId=''
+        }
+        getAction('/ota/otaBaSjSjxtbh/queryByOtaId',{otaIdT:otaIdT,otaId:otaId}).then(res=>{
+          this.dataSource =res.result.list == null ?  {} : res.result.list
+        })
+    },
+    save(){
+        postAction('/ota/otaBaSjSjxtbh/add' ,{otaId:localStorage.getItem('otaId')== undefined ? '' :localStorage.getItem('otaId'),list:this.dataSource}).then(res=>{
+          console.log(res);
+          this.$message.success(this.$t('SavedSuccessfully'))
+        })
+    },
     last(){
+      this.save()
       this.$emit('upgradedonlineup')
     },
     next(){
+      this.save()
       this.$emit('upgradedonlinedown')
     },
     addlineAtBot(){

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

@@ -360,10 +360,14 @@ import { message } from 'ant-design-vue'
         })
         
       },
-      async save(){
+       save(){
         this.$refs.ruleForm.validate(valid=>{
           if(valid){
-            postAction('/ota/otaBaCxJbxx/add',{ otaId:localStorage.getItem('otaId'),...this.form}).then( res => {
+            let otaId = localStorage.getItem('otaId')
+            if(otaId==null || otaId == undefined){
+              otaId=''
+            }
+            postAction('/ota/otaBaCxJbxx/add',{ otaId:otaId,...this.form}).then( res => {
            if(res.code == 200){
             localStorage.setItem('otaId', res.result.otaId)
              this.$message.success(this.$t('SavedSuccessfully'))

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

@@ -95,7 +95,7 @@
       <div style='width: 300px'>
         <span class='content-text' style='background: #f3f6f6;line-height: 50px;text-align: center;color: #191E29;font-weight: bold'>{{$t('fillincontent')}}</span>
         <span class='radio-text'>
-          <a-radio-group style='margin-left: 40px;' v-model="query.wlaqyqPz">
+          <a-radio-group style='margin-left: 40px;' v-model="query.jgld">
                     <a-radio :value="1"> {{ $t('yes') }} </a-radio>
                     <a-radio :value="2"> {{ $t('not') }} </a-radio>
             </a-radio-group>
@@ -299,7 +299,7 @@ export default {
       },
       dataSource: [
         {
-          key: 'wlaqyqSl',
+          key: 'jgldSl',
           val:'',
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
@@ -307,7 +307,7 @@ export default {
           fillincontent:this.$t('yesisselected'),
         },
         {
-          key: 'wlaqyqBzwz', 
+          key: 'jgldBzwz', 
           val:'',
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
@@ -315,7 +315,7 @@ export default {
           fillincontent:this.$t('forwardXquantity'),
         },
         {
-          key: 'wlaqyqGgxh',
+          key: 'jgldGgxh',
           val:'',
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('ineffectiveupgrades'),
@@ -323,7 +323,7 @@ export default {
           fillincontent:this.$t('yesisselected'),
         },
         {
-          key: 'wlaqyqScqy',
+          key: 'jgldScqy',
           val:'',
           componentname: this.$t('networksecurityrequirements'),
           configuration: this.$t('productionenterprise'),
@@ -890,10 +890,6 @@ export default {
              
               this.dataSource.forEach(item=>{
                  for(let key in res.result.bj){
-                  if(Number(res.result.bj[key])!=NaN &&Number(res.result.bj[key])!=0 && key !='id'){
-                    console.log(key);
-                    res.result.bj[key]=Number(res.result.bj[key])
-                  }
                   if(item.key==key){
                     item.val=res.result.bj[key]
                   }

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

@@ -179,7 +179,7 @@
                     </div>
                     <a-form-model-item class="itemModel" prop="deliverableTemplate">
                       <a-button type="primary" class="button-text"
-                                @click="clickButtonToUpload('deliverableTemplate',index)">
+                                @click="clickButtonToUpload('deliverableTemplate',index,true)">
                         {{ (item.deliverableTemplate === 'null' || item.deliverableTemplate === ''
                         ||
                         item.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
@@ -719,12 +719,19 @@
         }
         this.formInline = { ...this.formInline }
       },
-      clickButtonToUpload(item, index) {
+      clickButtonToUpload(item, index,isTrue) {
         this.numIndex = index
         this.$refs.uploadFile.perentHandleFunc()
         this.$refs.uploadFile.visible = true
         this.uploadName = item
-        getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+        let ids = ''
+        console.log(index)
+        if (isTrue){
+          ids = this.formInline.dataList[index][item]
+        }else{
+          ids = this.formInline[item]
+        }
+        getAction('sys/common/getFileInfos', { id: ids }).then((res) => {
           if (res.success) {
             this.$refs.uploadFile.perentHandleFunc(res.result)
           } else {

jero-web/src/views/virtualAuthenticationList/components/editModel.vue

@@ -1,148 +1,153 @@
 <template>
-  <a-drawer
+  <div>
-    :title="$t('edit')"
+    <a-drawer
-    :maskClosable="false"
+      :title="$t('edit')"
-    :width="900"
+      :maskClosable="false"
-    placement="right"
+      :width="900"
-    :closable="true"
+      placement="right"
-    @close="handleCancel"
+      :closable="true"
-    :visible="visible"
+      @close="handleCancel"
-    style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      :visible="visible"
-    <a-spin :spinning="confirmLoading">
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
-      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+      <a-spin :spinning="confirmLoading">
-        <a-row :gutter="24">
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
-          <a-col :span="12">
+          <a-row :gutter="24">
-            <div class="box-title-text">
+            <a-col :span="12">
-              <div class="title-text">
+              <div class="box-title-text">
-                <span class="Required">*</span>
+                <div class="title-text">
-                <span class="title-text-text" :title="$t('regulationNo')">{{$t('regulationNo')}}</span>
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('regulationNo')">{{$t('regulationNo')}}</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="serialNumber">
+                  <a-input @click.native="serialNumberClick"
+                           class="box-input"
+                           :placeholder="$t('PleaseSelect')+$t('regulationNo')"
+                           v-model="formInline.serialNumber"></a-input>
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="serialNumber">
+            </a-col>
-                <j-dict-select-tag class="box-input"
+            <a-col :span="12">
-                                   v-model="formInline.serialNumber"
+              <div class="box-title-text">
-                                   :disabled="true"
+                <div class="title-text">
-                                   :placeholder="$t('PleaseSelect')+$t('regulationNo')"
+                  <span class="Required">*</span>
-                                   :type="'select'"
+                  <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
-                                   :triggerChange="false"/>
+                </div>
-              </a-form-model-item>
+                <a-form-model-item class="itemModel" prop="dutyTerritory">
-            </div>
+                  <j-dict-select-tag class="box-input"
-          </a-col>
+                                     v-model="formInline.dutyTerritory"
-          <a-col :span="12">
+                                     :disabled="disabled"
-            <div class="box-title-text">
+                                     :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-              <div class="title-text">
+                                     :type="'select'"
-                <span class="Required">*</span>
+                                     :triggerChange="false" :dictCode="'duty_territory'"/>
-                <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="dutyTerritory">
+            </a-col>
-                <j-dict-select-tag class="box-input"
-                                   v-model="formInline.dutyTerritory"
-                                   :disabled="disabled"
-                                   :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'duty_territory'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="Required">*</span>
-                <span class="title-text-text" :title="'WVTA ID'">WVTA ID</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="wvtaId">
-                <a-input class="box-input"
-                         :disabled="disabled"
-                         v-model="formInline.wvtaId"
-                         :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
           </a-row>
-        <a-row :gutter="24">
+          <a-row :gutter="24">
-          <a-col :span="12">
+            <a-col :span="12">
-            <div class="box-title-text">
+              <div class="box-title-text">
-              <div class="title-text">
+                <div class="title-text">
-                <span class="Required">*</span>
+                  <span class="Required">*</span>
-                <span class="title-text-text" :title="$t('category')">{{$t('category')}}</span>
+                  <span class="title-text-text" :title="'WVTA ID'">WVTA ID</span>
+                </div>
+                <a-form-model-item class="itemModel" prop="wvtaId">
+                  <a-input class="box-input"
+                           :disabled="disabled"
+                           v-model="formInline.wvtaId"
+                           :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="category">
+            </a-col>
-                <a-input class="box-input"
+          </a-row>
-                         v-model="formInline.category"
+          <a-row :gutter="24">
-                         :disabled="disabled"
+            <a-col :span="12">
-                         :placeholder="$t('PleaseEnter')+$t('category')" />
+              <div class="box-title-text">
-              </a-form-model-item>
+                <div class="title-text">
-            </div>
+                  <span class="Required">*</span>
-          </a-col>
+                  <span class="title-text-text" :title="$t('category')">{{$t('category')}}</span>
-          <a-col :span="12">
+                </div>
-            <div class="box-title-text">
+                <a-form-model-item class="itemModel" prop="category">
-              <div class="title-text">
+                  <a-input class="box-input"
-                <span class="Required">*</span>
+                           v-model="formInline.category"
-                <span class="title-text-text" :title="$t('inspectionItems')">{{$t('inspectionItems')}}</span>
+                           :disabled="disabled"
+                           :placeholder="$t('PleaseEnter')+$t('category')" />
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel" prop="inspectionItem">
+            </a-col>
-                <a-input class="box-input"
+            <a-col :span="12">
-                         v-model="formInline.inspectionItem"
+              <div class="box-title-text">
-                         :disabled="disabled"
+                <div class="title-text">
-                         :placeholder="$t('PleaseEnter')+$t('inspectionItems')"/>
+                  <span class="Required">*</span>
-              </a-form-model-item>
+                  <span class="title-text-text" :title="$t('inspectionItems')">{{$t('inspectionItems')}}</span>
-            </div>
+                </div>
-          </a-col>
+                <a-form-model-item class="itemModel" prop="inspectionItem">
-        </a-row>
+                  <a-input class="box-input"
-        <a-row :gutter="24">
+                           v-model="formInline.inspectionItem"
-          <a-col :span="12">
+                           :disabled="disabled"
-            <div class="box-title-text">
+                           :placeholder="$t('PleaseEnter')+$t('inspectionItems')"/>
-              <div class="title-text">
+                </a-form-model-item>
-                <span class="Required">*</span>
-                <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="configItem">
+            </a-col>
-                <a-input class="box-input"
+          </a-row>
-                         v-model="formInline.configItem"
+          <a-row :gutter="24">
-                         :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
+            <a-col :span="12">
-              </a-form-model-item>
+              <div class="box-title-text">
-            </div>
+                <div class="title-text">
-          </a-col>
+                  <span class="Required">*</span>
-          <a-col :span="12">
+                  <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
-            <div class="box-title-text">
+                </div>
-              <div class="title-text">
+                <a-form-model-item class="itemModel" prop="configItem">
-                <span class="Required">*</span>
+                  <a-input class="box-input"
-                <span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
+                           v-model="formInline.configItem"
+                           :placeholder="$t('PleaseEnter')+$t('configurationItem')"/>
+                </a-form-model-item>
               </div>
-              <a-form-model-item class="itemModel"
+            </a-col>
-                                 prop="deliverableType"
+            <a-col :span="12">
-                                 :rules="[{ required: true, message: $t('typeOfDeliverables') + $t('cannotEmpty'), trigger: 'change'},]"
+              <div class="box-title-text">
-              >
+                <div class="title-text">
-                <a-tree-select
+                  <span class="Required">*</span>
-                  tree-node-filter-prop="title"
+                  <span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
-                  v-model="formInline.deliverableType"
+                </div>
-                  :maxTagCount="1"
+                <a-form-model-item class="itemModel"
-                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                                   prop="deliverableType"
-                  class="box-input"
+                                   :rules="[{ required: true, message: $t('typeOfDeliverables') + $t('cannotEmpty'), trigger: 'change'},]"
-                  style="width: 100%"
+                >
-                  :tree-data="DeliverableTreeList"
+                  <a-tree-select
-                  :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
+                    tree-node-filter-prop="title"
-                />
+                    v-model="formInline.deliverableType"
-              </a-form-model-item>
+                    :maxTagCount="1"
-            </div>
+                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
-          </a-col>
+                    class="box-input"
-        </a-row>
+                    style="width: 100%"
-      </a-form-model>
+                    :tree-data="DeliverableTreeList"
-    </a-spin>
+                    :placeholder="$t('PleaseSelect')+$t('typeOfDeliverables')"
-    <div class="drawer-bootom-button">
+                  />
-      <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
+                </a-form-model-item>
-      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+              </div>
-    </div>
+            </a-col>
-  </a-drawer>
+          </a-row>
+        </a-form-model>
+      </a-spin>
+      <div class="drawer-bootom-button">
+        <a-button style="margin-right: .8rem" @click="handleCancel">{{$t('cancel')}}</a-button>
+        <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">{{$t('submit')}}</a-button>
+      </div>
+    </a-drawer>
+    <codeNumber ref="codeNumber" @regulation="regulation" />
+  </div>
 </template>
 
 <script>
 import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+import codeNumber from './codeNumber'
 
 export default {
   name:'editModel',
   props: ['url'],
+  components:{
+    codeNumber
+  },
   data() {
     return {
       visible: false,
@@ -215,6 +220,9 @@ export default {
     handleCancel() {
       this.visible = false
     },
+    serialNumberClick(){
+      this.$refs.codeNumber.add()
+    },
     editModel(item) {
       this.visible = true
       this.$nextTick(() => {
@@ -261,6 +269,14 @@ export default {
         }
       })
     },
+    regulation(item,data) {
+      this.formInline.serialNumber = item
+      this.formInline.bussDocumentLibraryId = data
+      this.$nextTick(()=>{
+        this.formInline = {... this.formInline}
+        this.$refs.ruleForm.validateField(['serialNumber'])
+      })
+    }
   }
 }
 </script>