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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java

@@ -1744,17 +1744,17 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 			String title = "";
 			if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
 				title = "*类别,*检验项目,*配置项,*WVTA ID," +
-						"*编号,*责任领域,交付物模板,*交付物类型,";
+						"*编号,*责任领域,*交付物类型,交付物模板,";
 			}else{
 				title = "*Category,*Inspection Items,*Configuration Item,*WVTA ID," +
-						"*Number,*Responsible Field,Deliverable Template,*Deliverable Type,";
+						"*Number,*Responsible Field,*Deliverable Type,Deliverable Template,";
 			}
 			List<String> list = Arrays.asList(title.split(","));
 			int index = 0;
 			if(CutEnum.CN.getValue().equals(authDummyInventoryInfoEO.getCut())){
-				index = list.indexOf("*交付物类型") + 1;
+				index = list.indexOf("交付物模板") + 1;
 			}else{
-				index = list.indexOf("*Deliverable Type") + 1;
+				index = list.indexOf("Deliverable Template") + 1;
 			}
 
 			//创建临时文件夹

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -1446,6 +1446,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
             map.put("db_field_txt", paramsConfigEO.getConfigName());
             map.put("type", true); //配置列 标识
             map.put("isLock", paramsConfigEO.getIsLock()); //配置列 冻结标识
+            map.put("headFieldCn","查看");
+            map.put("headFieldEn","View");
+            map.put("moduleFlag","参数项收集清单");
+            map.put("field",paramsConfigEO.getId());
             listConfig.add(map);
         }
 
@@ -1454,6 +1458,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         for (int i = 0; i < fieldList.size(); i++) {
             OnlCgformField onlCgformField = fieldList.get(i);
             Map<String, Object> map = new HashMap<>();
+            map.put("headFieldCn",onlCgformField.getDbFieldTxt());
+            map.put("headFieldEn",onlCgformField.getDbFieldEnName());
+            map.put("moduleFlag","参数项收集清单");
+            map.put("field",onlCgformField.getDbFieldName());
             String dbFieldName = onlCgformField.getDbFieldName();
             if ("nio_number".equals(dbFieldName) || "params_name".equals(dbFieldName)) {
                 map.put("click5", true);
@@ -1532,6 +1540,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         }
 
         Map<String, Object> operatorMap = new HashMap<>();
+        operatorMap.put("headFieldCn","操作");
+        operatorMap.put("headFieldEn","Operation");
+        operatorMap.put("moduleFlag","参数项收集清单");
         if (CutEnum.CN.getValue().equals(cut)) {
             operatorMap.put("db_field_txt", "操作");
         } else {
@@ -1541,6 +1552,11 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         list.add(operatorMap);
 
         list.addAll(indexOfDescription + 1, listConfig);
+        int count = 0;
+        for (Map<String, Object> map : list) {
+            //排序字段赋值，用于自定义列表
+            map.put("sortParams",String.valueOf(count++));
+        }
         return list;
     }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java

@@ -1,6 +1,7 @@
 package com.jero.modules.head.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.head.entity.HeadCustomEO;
@@ -8,7 +9,6 @@ import com.jero.modules.head.enums.AffirmFlagEnum;
 import com.jero.modules.head.mapper.HeadCustomEOMapper;
 import com.jero.modules.head.service.IHeadCustomEOService;
 import com.jero.modules.head.vo.HeadCustomVO;
-import net.sf.saxon.functions.ConstantFunction;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -17,14 +17,12 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Date;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 /**
  * @Description: 自定义表头
  * @Author: jero-boot

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

@@ -725,9 +725,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 		try {
 			String titleOne = "";
 			if(CutEnum.CN.getValue().equals(cut)){
-				titleOne = "责任领域,法规工程师,工程接口人,认证工程师,备注";
+				titleOne = "责任领域,法规工程师,工程接口人,工程接口人-法规工程师设置,工程接口人-认证工程师设置,备注";
 			}else{
-				titleOne = "Responsible Field,Regulation Engineer,Engineering Interface,Homologation Engineer,Comments";
+				titleOne = "Responsible Field,Regulation Engineer,Engineering Interface,Project Interface Person Regulation Engineer Setting,Project Interface Person Certification Engineer Setting,Comments";
 			}
 
 			//创建临时文件夹
@@ -799,8 +799,10 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 					dataRow.createCell(0).setCellValue(dataList.get(j - 2).getDutyTerritory());
 					dataRow.createCell(1).setCellValue(dataList.get(j - 2).getLawEngineerName());
 					dataRow.createCell(2).setCellValue(dataList.get(j - 2).getEngineeringInterfacePersonName());
-					dataRow.createCell(3).setCellValue(dataList.get(j - 2).getCertificationEngineerName());
+					//dataRow.createCell(3).setCellValue(dataList.get(j - 2).getCertificationEngineerName());
-					dataRow.createCell(4).setCellValue(dataList.get(j - 2).getRemark());
+					dataRow.createCell(3).setCellValue(dataList.get(j - 2).getEngineerLawSetName());
+					dataRow.createCell(4).setCellValue(dataList.get(j - 2).getEngineerAttSetName());
+					dataRow.createCell(5).setCellValue(dataList.get(j - 2).getRemark());
 
 				}
 			}
@@ -1076,7 +1078,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 
 						String lawEngineerName = row.getCell(1, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
 						String engineeringInterfacePersonName = row.getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
-						String certificationEngineerName = row.getCell(3,Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
+						// String certificationEngineerName = row.getCell(3,Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString();
 
 						if(StringUtils.isBlank(lawEngineerName)){
 							projectRelatedPersonnel.setLawEngineerName("");
@@ -1088,11 +1090,11 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 						}else{
 							projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringInterfacePersonName);
 						}
-						if(StringUtils.isBlank(certificationEngineerName)){
+						/*if(StringUtils.isBlank(certificationEngineerName)){
 							projectRelatedPersonnel.setCertificationEngineerName("");
 						}else{
 							projectRelatedPersonnel.setCertificationEngineerName(certificationEngineerName);
-						}
+						}*/
 //						//除了责任领域全有值->可以
 //						if(StringUtils.isNotBlank(lawEngineerName) && StringUtils.isNotBlank(engineeringInterfacePersonName) && StringUtils.isNotBlank(certificationEngineerName)) {
 //							projectRelatedPersonnel.setLawEngineerName(lawEngineerName);
@@ -1112,7 +1114,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 //						}
 
 						//导入的备注为数字,被识别成小数点后一位
-						Cell remarkCell = row.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+						Cell remarkCell = row.getCell(3, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
 						remarkCell.setCellType(CellType.STRING);
 						String remark = remarkCell.toString();
 						if(StringUtils.isNotEmpty(remark)) {
@@ -1358,7 +1360,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 			if (StringUtils.isNotBlank(projectRelatedPersonnel.getCertificationEngineerName())){
 				List<String> certificationEngineerNameList = Arrays.asList(projectRelatedPersonnel.getCertificationEngineerName().split(","));
 				//校验是否为项目基础表设定的认证工程师
-				List<ProjectRelatedPersonnel> baseCertificationEngineerList = queryCertificationEngineer(projectId);
+				/*List<ProjectRelatedPersonnel> baseCertificationEngineerList = queryCertificationEngineer(projectId);
 				List<String> baseCertificationEngineerNameList = baseCertificationEngineerList.stream().map(e -> e.getCertificationEngineerName()).collect(Collectors.toList());
 				//转为小写后在判断
 				List<String> baseCertificationEngineerNameListTemp = new ArrayList<>();
@@ -1375,7 +1377,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 						}
 						break;
 					}
-				}
+				}*/
 //				for(String certificationEngineerName : certificationEngineerNameList){
 //					if(!baseCertificationEngineerNameList.contains(certificationEngineerName.toLowerCase())){
 //						//中英切换提示语
@@ -1641,25 +1643,25 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 			//法规工程师异常提示语
 			if(ProjectRoleEnum.REGULATI_ENGINEER.getValue().equals(personnelType)){
 				if(CutEnum.CN.getValue().equals(cut)) {
-					message.append("导入的工程接口人姓名有误,请检查第" + row + "行");
+					message.append("导入的法规工程师姓名有误,请检查第" + row + "行。");
 				}else{
-					message.append("The imported engineering interface person is wrong.Please check line " + row );
+					message.append("The imported Regulatory engineer is wrong.Please check line " + row +".");
 				}
 			}
 			//认证工程师异常提示语
 			if(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue().equals(personnelType)){
 				if(CutEnum.CN.getValue().equals(cut)) {
-					message.append("导入的认证工程师姓名有误,请检查第" + row + "行");
+					message.append("导入的认证工程师姓名有误,请检查第" + row + "行。");
 				}else {
-					message.append("The imported certification engineer is wrong.Please check line " + row );
+					message.append("The imported certification engineer is wrong.Please check line " + row +".");
 				}
 			}
 			//工程接口人异常提示语
 			if(ProjectRoleEnum.ENGINEERING_INTERFACE_PERSON.getValue().equals(personnelType)){
 				if(CutEnum.CN.getValue().equals(cut)) {
-					message.append("导入的工程接口人姓名有误,请检查第" + row + "行");
+					message.append("导入的工程接口人姓名有误,请检查第" + row + "行。");
 				}else{
-					message.append("The imported engineering interface person is wrong.Please check line " + row );
+					message.append("The imported engineering interface person is wrong.Please check line " + row +".");
 				}
 			}
 		}else{

jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue

@@ -279,6 +279,22 @@
                 <!--              @click="clickButtonToUpload(record.verifyDeliverableTemplate)">{{$t('viewFile')}}</a>-->
            <span v-else>--</span>
         </span>
+              <span slot="verifyDeliverableTemplate" slot-scope="text,record">
+                   <span class="viewFile"
+                         @click="viewFileClick(record.verifyDeliverableTemplate)"
+                         v-if="record.verifyDeliverableTemplate">
+                     {{$t('viewFile')}}
+                </span>
+                <span v-else>--</span>
+              </span>
+              <span slot="designDeliverableTemplate" slot-scope="text,record">
+                   <span class="viewFile"
+                         @click="viewFileClick(record.designDeliverableTemplate)"
+                         v-if="record.designDeliverableTemplate">
+                     {{$t('viewFile')}}
+                </span>
+                <span v-else>--</span>
+              </span>
             </a-table>
             <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
               {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}}
@@ -293,6 +309,7 @@
     <transferList :url="url" @transferListForm="transferListForm" ref="transferListRef" @visible='sVisible'/>
     <transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
     <batSetting :url="url" ref="batSettingRef" @batSettingList="batSettingList"/>
+    <viewFileModel ref="viewFileModelRef"/>
     <a-modal
       :title="$t('deliverableTemplate')"
       :width="600"
@@ -333,6 +350,7 @@
   import addModel from './addModel'
   import editModel from './editModel'
   import UpdateLog from '@/components/UpdateLog/index'
+  import viewFileModel from '@/components/viewFileModel/index'
   import batSetting from './batSetting'
   import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
   import transferList from './transferList'
@@ -352,7 +370,8 @@
       editModel,
       UpdateLog,
       batSetting,
-      globalAdvancedQuery
+      globalAdvancedQuery,
+      viewFileModel
     },
     mixins: [ResizeColumnProvide, ResizeHeader],
     data() {
@@ -543,6 +562,14 @@
                 ellipsis: true,
                 scopedSlots: { customRender: 'designDeliverableTemplateName' }
               },
+              {
+                title: this.$t('deliverableTemplate'),
+                dataIndex: 'designDeliverableTemplate',
+                align: 'left',
+                width: 180,
+                ellipsis: true,
+                scopedSlots: { customRender: 'designDeliverableTemplate' }
+              },
               // {
               //   title: this.$t('Sponsor'),
               //   dataIndex: 'designInitiatorName',
@@ -584,6 +611,14 @@
                 ellipsis: true,
                 scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
               },
+              {
+                title: this.$t('deliverableTemplate'),
+                dataIndex: 'verifyDeliverableTemplate',
+                align: 'left',
+                width: 180,
+                ellipsis: true,
+                scopedSlots: { customRender: 'verifyDeliverableTemplate' }
+              },
               {
                 title: this.$t('personLiable'),
                 dataIndex: 'verifyDuty_dictText',
@@ -607,13 +642,13 @@
               }
             ]
           },
-          {
+          // {
-            title: this.$t('operation'),
+          //   title: this.$t('operation'),
-            align: 'left',
+          //   align: 'left',
-            fixed: 'right',
+          //   fixed: 'right',
-            width: 240,
+          //   width: 240,
-            scopedSlots: { customRender: 'operation' }
+          //   scopedSlots: { customRender: 'operation' }
-          }
+          // }
         ],
         columnsAll: [],
         confirmLoading: false,
@@ -791,12 +826,22 @@
             key: 20,
             moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
           },
+          {
+            sort: '',
+            name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('deliverableTemplate'),
+            headFieldCn: '交付物模板',
+            headFieldEn: 'Deliverable Template',
+            field: 'designDeliverableTemplate',
+            affirmFlag: '1',
+            key: 21,
+            moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
+          },
           {
             sort: '',
             name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('personLiable'),
             headFieldCn: '责任人',
             headFieldEn: 'Assignee',
-            field: 'designDutyName',
+            field: 'designDuty_dictText',
             affirmFlag: '1',
             key: 22,
             moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
@@ -821,12 +866,22 @@
             key: 30,
             moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
           },
+          {
+            sort: '',
+            name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('deliverableTemplate'),
+            headFieldCn: '交付物模板',
+            headFieldEn: 'Deliverable Template',
+            field: 'verifyDeliverableTemplate',
+            affirmFlag: '3',
+            key: 31,
+            moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
+          },
           {
             sort: '',
             name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('personLiable'),
             headFieldCn: '责任人',
             headFieldEn: 'Assignee',
-            field: 'verifyDutyName',
+            field: 'verifyDuty_dictText',
             affirmFlag: '3',
             key: 32,
             moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
@@ -1075,7 +1130,11 @@
           moduleFlag: this.$route.query.title == '市场清单详情' ? '虚拟清单详情' : '维护清单'
         }).then((res) => {
           if (res.success) {
-            this.columnsAll = res.result
+            if(res.result && res.result.length > 0){
+              this.columnsAll = res.result
+            }else{
+              this.columnsAll = this.column
+            }
             for (let j = 0; j < this.columnsAll.length; j++) {
               for (let i = 0; i < this.column.length; i++) {
                 if (this.columnsAll[j].title == this.$t('confirmationOfDesignConformity')) {
@@ -1122,7 +1181,7 @@
               title: this.$t('operation'),
               align: 'left',
               fixed: 'right',
-              width: 160,
+              width: 240,
               scopedSlots: { customRender: 'operation' }
             })
 
@@ -1379,7 +1438,10 @@
           }
         })
         window.open(newUrl.href, '_blank')
-      }
+      },
+      viewFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
+      },
     }
   }
 </script>
@@ -1615,6 +1677,14 @@
   ::v-deep .ant-table-thead > tr > th .ant-table-header-column {
     max-width: none !important;
   }
+  .viewFile {
+    color: #00B3BE;
+    cursor: pointer;
+  }
+  ::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']){
+    text-align: left;
+    padding-left: 16px!important;
+  }
 </style>
 <style lang="less">
   .popconfirm {

jero-web/src/views/documentTools/virtualList/index.vue

@@ -48,10 +48,10 @@
     </div>
     <div>
       <!--       :components="drag(columns)"   bordered-->
+<!--             :components="drag(columns,'columns')"-->
       <a-table
         ref="table"
         size="middle"
-        :components="drag(columns,'columns')"
         :loading="loading"
         :pagination="false"
         :scroll="{x: '100%'}"
@@ -62,7 +62,7 @@
         :columns="columns"
       >
         <span slot="VirtualListName" slot-scope="text,record">
-          <a @click="VirtualListNameClick(record)">{{text}}</a>
+          <a @click="VirtualListNameClick(record)" :title="text">{{text}}</a>
         </span>
         <span slot="operation" slot-scope="text,record">
 <!--          v-if="record.createBy == userData.username || administrators"-->
@@ -221,21 +221,21 @@
             title: this.$t('VirtualListName'),
             align: 'left',
             dataIndex: 'name',
-            width: 484,
+            width: '40',
             ellipsis: true,
             scopedSlots: { customRender: 'VirtualListName' }
           },
           {
             title: this.$t('listStatus'),
             align: 'left',
-            width: 540,
+            width: '20%',
             ellipsis: true,
             dataIndex: 'state_dictText'
           },
           {
             title: this.$t('creater'),
             align: 'left',
-            width: 260,
+            width: '20%',
             ellipsis: true,
             dataIndex: 'createBy'
           },

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

@@ -234,13 +234,14 @@ export default {
 
             this.form = res.result
             this.form.otaId=''
-            if (this.$route.query.type == 1 && res.result.cxmb == null && !item) {
+            if(this.$route.query.type == 1 && res.result.cxmb == null && !item){
-              this.form.cxmb = this.form.babh + '-' + this.form.bapc + '-' + this.form.cpxh
+              this.form.cxmb = this.form.babh+'-'+ this.form.bapc+'-'+this.form.cpxh
-            } else {
+            }else {
-              if (this.$route.query.type == 2 && res.result.cxmb == null  && !item) {
+              if(this.$route.query.type == 2 && res.result.cxmb == null && !item){
-                this.form.cxmb = this.form.babh + '-' + this.form.bapc + '-' + this.form.cpxh
+                // this.form.cxmb =  res.result.cxmb ? res.result.cxmb : this.form.djbh+'-'+ this.form.ggpc+'-'+this.form.cpxh
-              } else {
                 this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined
+              }else{
+                this.form.cxmb = res.result.cxmb ? res.result.cxmb : this.form.babh+'-'+ this.form.bapc+'-'+this.form.cpxh
               }
             }
 
@@ -375,7 +376,7 @@ export default {
       localStorage.removeItem('otaId')
       localStorage.removeItem('otaIdT')
       localStorage.setItem('otaIdT', val)
-      this.getData()
+      this.getData('qiehuan')
     },
     update2() {
       this.$forceUpdate()

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

@@ -286,7 +286,7 @@ import { message } from 'ant-design-vue'
        localStorage.removeItem('otaIdT')
        localStorage.setItem('otaIdT',value)
 
-       this.getData()
+       this.getData('qiehuan')
       },
       // 模板下载
       handleModule() {
@@ -337,15 +337,16 @@ import { message } from 'ant-design-vue'
              this.form.cxmb = this.form.djbh+'-'+ this.form.ggpc+'-'+this.form.cpxh
            }else {
             if(this.$route.query.type == 2 && res.result.cxmb == null && !item){
-              this.form.cxmb = this.form.djbh+'-'+ this.form.ggpc+'-'+this.form.cpxh
+              // this.form.cxmb =  res.result.cxmb ? res.result.cxmb : this.form.djbh+'-'+ this.form.ggpc+'-'+this.form.cpxh
-            }else{
               this.form.cxmb = res.result.cxmb ? res.result.cxmb : undefined
+            }else{
+              this.form.cxmb = res.result.cxmb ? res.result.cxmb : this.form.djbh+'-'+ this.form.ggpc+'-'+this.form.cpxh
             }
            }
-           if(res.result.dllx1 == '' ){
+           if(res.result.dllx1 == '' || res.result.dllx1 == null){
               res.result.dllx1 = undefined
             }
-            if(res.result.dllx2 == ''){
+            if(res.result.dllx2 == '' || res.result.dllx2 == null){
               res.result.dllx2 = undefined
             }
 

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -347,9 +347,22 @@
               :title="text">{{text}}</a>
         </span>
       </a-table>
-      <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
+      <div class="page" v-if="dataSource.length > 0">
-        {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :pageSizeOptions="['50','100','200','300']"
+          :current="pageNo"
+          @change="onChangeSize"
+          @showSizeChange="SizeChange"
+        />
       </div>
+      <!--      <div class="buttom-box" v-if="dataSource && dataSource.length > 0">-->
+      <!--        {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}-->
+      <!--      </div>-->
     </div>
     <listAddModel :url="url" @addModelList="addModelList" ref="addModelRef"/>
     <listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/>
@@ -590,6 +603,9 @@
         toggleSearchStatus: false,
         visibleQuestion: false,
         confirmLoadingQuestion: false,
+        pageNo: 1,
+        pageSize: 50,
+        total: 0,
         roleSwitchingList: [],
         formInlineQuestion: {},
         rulesRoleQuestion: {
@@ -693,12 +709,14 @@
           },
           {
             title: this.$t('confirmationOfDesignConformity'),
+            align: 'left',
             children: [
               {
                 title: this.$t('personLiable'),
                 dataIndex: 'designDutyIdName',
                 align: 'left',
                 width: 180,
+                sorter: true,
                 ellipsis: true
               },
               {
@@ -706,6 +724,7 @@
                 dataIndex: 'designDueDate',
                 align: 'left',
                 ellipsis: true,
+                sorter: true,
                 width: 140
               },
               {
@@ -714,6 +733,7 @@
                 align: 'left',
                 ellipsis: true,
                 width: 140,
+                sorter: true,
                 scopedSlots: { customRender: 'designFlowStatusName' }
               },
               {
@@ -728,20 +748,23 @@
           },
           {
             title: this.$t('verificationAndConformityconfirmation'),
+            align: 'left',
             children: [
               {
                 title: this.$t('personLiable'),
                 dataIndex: 'verifyDutyIdName',
                 align: 'left',
                 width: 180,
-                ellipsis: true
+                ellipsis: true,
+                sorter: true
               },
               {
                 title: this.$t('TaskCutOffTime'),
                 dataIndex: 'verifyDueDate',
                 align: 'left',
                 ellipsis: true,
-                width: 140
+                width: 140,
+                sorter: true
               },
               {
                 title: this.$t('ProcessStatus'),
@@ -749,6 +772,7 @@
                 align: 'left',
                 ellipsis: true,
                 width: 180,
+                sorter: true,
                 scopedSlots: { customRender: 'verifyFlowStatusName' }
               },
               {
@@ -1030,7 +1054,7 @@
         url: {
           addModelList: '/project/projectLawsInventoryEO/queryPageDummy',
           queryConditionInventory: '/project/projectLawsInventoryEO/queryConditionInventory',
-          list: '/project/projectLawsInventoryEO/list',
+          list: '/project/projectLawsInventoryEO/page',
           addModel: 'project/projectLawsInventoryEO/add',
           editModel: '/project/projectLawsInventoryEO/edit',
           deleteBatch: '/project/projectLawsInventoryEO/deleteBatch',
@@ -1118,8 +1142,8 @@
           },
           {
             value: 'designFlowStatus',
-            text: this.$t('designComplianceReview')+this.$t('ProcessStatus'),
+            text: this.$t('designComplianceReview') + this.$t('ProcessStatus'),
-            options:[
+            options: [
               {
                 value: 'List to be released',
                 key: 'List to be released',
@@ -1165,12 +1189,12 @@
                 key: 'NA',
                 label: this.$t('NA')
               }
-            ],
+            ]
           },
           {
             value: 'verifyFlowStatus',
-            text: this.$t('verificationAndConformityconfirmation')+this.$t('ProcessStatus'),
+            text: this.$t('verificationAndConformityconfirmation') + this.$t('ProcessStatus'),
-            options:[
+            options: [
               {
                 value: 'List to be released',
                 key: 'List to be released',
@@ -1216,8 +1240,8 @@
                 key: 'NA',
                 label: this.$t('NA')
               }
-            ],
+            ]
-          },
+          }
         ],
         listOptions: [
           {
@@ -1729,15 +1753,17 @@
             }
           }
           if (detailedWarningList && detailedWarningList.length > 0) {
-            if (this.roleSwitchingCode == 0){
+            if (this.roleSwitchingCode == 0) {
               this.questionWarning.push(
               < div > {
-                detailedWarningList.join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed')
+                detailedWarningList
+                .join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed')
               } < /div>)
-            }else if(this.roleSwitchingCode == 1 || this.roleSwitchingCode == 30){
+            } else if (this.roleSwitchingCode == 1 || this.roleSwitchingCode == 30) {
               this.questionWarning.push(
               < div > {
-                detailedWarningList.join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed')+this.$t('andTheProcessStatusTheList')
+                detailedWarningList
+                .join(',') + this.$t('conditionsNotMet') + this.$t('onlyDataInTheReminderProcessBanBeProcessed') + this.$t('andTheProcessStatusTheList')
               } < /div>)
             }
           }
@@ -2029,7 +2055,15 @@
         }
         this.getList()
       },
-
+      onChangeSize(page, pageSize) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(page, pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
       getList() {
         let roleCode = this.roleSwitchingCode
         let queryParam = JSON.parse(JSON.stringify(this.queryParam))
@@ -2048,12 +2082,20 @@
           projectLibraryId: this.$route.query.id,
           orderBy: this.orderBy,
           orderByField: this.orderByField,
-          roleCode: roleCode
+          roleCode: roleCode,
+          pageNo: this.pageNo,
+          pageSize: this.pageSize
         }
         this.loading = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
-            this.dataSource = res.result || []
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
             this.loading = false
             this.JLoading = false
             if (this.dataSource.length == 0) {
@@ -2501,9 +2543,9 @@
 
         }
         if (this.requestsNum == 0) {
-          if (_this.detailedWarningList && _this.detailedWarningList.length > 0){
+          if (_this.detailedWarningList && _this.detailedWarningList.length > 0) {
             _this.promptInformation(_this.detailedWarningList)
-          }else{
+          } else {
             this.$message.warning(_this.$t('theDataYouInitiate'))
           }
           this.JTextLoading = false
@@ -2819,6 +2861,7 @@
   .page {
     text-align: right;
     margin-top: 20px;
+    margin-bottom: 20px;
   }
 
   .operator-text-left {
@@ -2986,6 +3029,14 @@
     max-width: none !important;
   }
 
+  ::v-deep .page .ant-select-selection__rendered {
+    height: 32px!important;
+    line-height: 32px!important;
+  }
+  ::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']){
+    text-align: left;
+    padding-left: 16px!important;
+  }
 </style>
 <style lang="less">
   .box-input .ant-select-selection {

jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue

@@ -14,7 +14,7 @@
               <div class="title-text-search" :title="$t('areaOfResponsibility')">
                 <span>{{$t('areaOfResponsibility')}}</span>
               </div>
-              <j-dict-select-tag class="box-input-search" v-model="queryParam.dutyTerritory"
+              <j-multi-select-tag class="box-input-search" v-model="queryParam.dutyTerritory"
                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                  :type="'select'"
                                  :triggerChange="false" :dictCode="'duty_territory'"/>

jero-web/src/views/projectManagement/components/responsibilityList.vue

@@ -104,7 +104,7 @@
         if (this.queryParam.operatorType == 'queryListingToConfirmStatistics' || this.queryParam.operatorType == 'queryTaskToConfirmStatistics'){
             item.isListing = '1'
         }
-        this.$emit('responsibility', item)
+        // this.$emit('responsibility', item)
       }
     }
   }

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

@@ -15,13 +15,14 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</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"
                            :disabled="disabled"
                            class="box-input"
+                           :title="formInline.serialNumber"
                            :placeholder="$t('PleaseSelect')+$t('regulationNo')"
                            v-model="formInline.serialNumber"></a-input>
                 </a-form-model-item>
@@ -30,7 +31,7 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('areaOfResponsibility')">{{$t('areaOfResponsibility')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="dutyTerritory">
@@ -48,12 +49,13 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</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"
+                           :title="formInline.wvtaId"
                            v-model="formInline.wvtaId"
                            :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
                 </a-form-model-item>
@@ -64,13 +66,14 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('category')">{{$t('category')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="category">
                   <a-input class="box-input"
                            v-model="formInline.category"
                            :disabled="disabled"
+                           :title="formInline.category"
                            :placeholder="$t('PleaseEnter')+$t('category')" />
                 </a-form-model-item>
               </div>
@@ -78,13 +81,14 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('inspectionItems')">{{$t('inspectionItems')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="inspectionItem">
                   <a-input class="box-input"
                            v-model="formInline.inspectionItem"
                            :disabled="disabled"
+                           :title="formInline.inspectionItem"
                            :placeholder="$t('PleaseEnter')+$t('inspectionItems')"/>
                 </a-form-model-item>
               </div>
@@ -94,12 +98,13 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('configurationItem')">{{$t('configurationItem')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="configItem">
                   <a-input class="box-input"
                            v-model="formInline.configItem"
+                           :title="formInline.configItem"
                            :placeholder="$t('PleaseEnter')+$t('configurationItem')"
                            :disabled="disabled"
                   />
@@ -109,7 +114,7 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
+                  <span class="Required" v-if="!disabled">*</span>
                   <span class="title-text-text" :title="$t('typeOfDeliverables')">{{$t('typeOfDeliverables')}}</span>
                 </div>
                 <a-form-model-item class="itemModel"
@@ -264,7 +269,7 @@ export default {
       })
       if(data == 1) {
         this.title = this.$t('view')
-        this.disabled = true,
+        this.disabled = true
         this.button = false
       }
     },
@@ -414,4 +419,10 @@ export default {
   border: 1px #00B3BE solid;
   color: #00B3BE;
 }
+  ::v-deep .ant-input-disabled{
+    color: #040B29;
+  }
+  ::v-deep .ant-select-disabled .ant-select-selection-selected-value{
+    color: #040B29!important;
+  }
 </style>

jero-web/src/views/virtualAuthenticationList/index.vue

@@ -42,10 +42,10 @@
         {{$t('BatchDelete')}}
       </div>
     </div>
+<!--    :components="drag(columns,'columns')"-->
     <a-table
       ref="table"
       size="middle"
-      :components="drag(columns,'columns')"
       :loading="loading"
       :pagination="false"
       :scroll="{x: '100%',y:'calc(100vh - 300px)'}"
@@ -56,7 +56,7 @@
       :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
     >
       <span slot="CertificationListName" slot-scope="text,record">
-          <a @click="CertificationListNameClick(record)">{{text}}</a>
+          <a @click="CertificationListNameClick(record)" :title="text">{{text}}</a>
       </span>
       <span slot="operation" slot-scope="text,record">
 <!--          v-if="record.createBy == userData.username || administrators"-->
@@ -215,21 +215,21 @@
             title: this.$t('CertificationListName'),
             align: 'left',
             dataIndex: 'name',
-            width: 480,
+            width: '40%',
             ellipsis: true,
             scopedSlots: { customRender: 'CertificationListName' }
           },
           {
             title: this.$t('listStatus'),
             align: 'left',
-            width: 536,
+            width: '20%',
             ellipsis: true,
             dataIndex: 'state_dictText'
           },
           {
             title: this.$t('creater'),
             align: 'left',
-            width: 260,
+            width: '20%',
             ellipsis: true,
             dataIndex: 'createBy'
           },

jero-web/vue.config.js

@@ -93,10 +93,11 @@ module.exports = {
          }
        }, */
       '/jero-boot': {
-        target: 'http://10.0.3.22:8080', //请求本地 jero-boot后台项目
+        // target: 'http://10.0.3.22:8080', //请求本地 jero-boot后台项目
         // target: 'http://10.10.10.46:8101', //请求本地 jero-boot后台项目
         // target: 'http://10.0.1.25:8080',
         // target: 'http://10.0.1.5:8080',
+        target: 'http://127.0.0.1:8080',
         ws: false,
         changeOrigin: true
       }