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

2023-04-06 13:54:31 +08:00
parent a24233cb76 4fd0bebdb9
commit 8c3ab91575
10 changed files with 219 additions and 58 deletions
@@ -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;
 			}

 			//创建临时文件夹
@@ -237,7 +237,7 @@ public class OtaBaSjSjmbcxServiceImpl extends ServiceImpl<OtaBaSjSjmbcxMapper, O
        queryWrapper.eq(OtaBaCxJbxx::getGgpc, pc);
        OtaBaCxJbxx jbxx = otaBaCxJbxxService.getOne(queryWrapper, false);
        if (ObjectUtils.isEmpty(jbxx)) {
-            throw new JeroBootException("车型及功能备案《公告》批次:\" + pc + \" 无法找到车型备案数据");
+            throw new JeroBootException("车型及功能备案《公告》批次:" + pc + " 无法找到车型备案数据");
        } else {
            mbcx.setCpsb(jbxx.getCpsb());
            mbcx.setCpmc(jbxx.getCpmc());
@@ -2823,6 +2823,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 		List<AuthDummyInventoryInfoEO> authDummyInventoryInfoEOList = this.authDummyInventoryInfoEOService.list(authDummyInfoQueryWrap);

 		if(CollectionUtils.isNotEmpty(authDummyInventoryInfoEOList)){
+			// 获取该项目相关人员名单信息，用于根据责任领域配置数据 自动设置责任人、接口人。
+			QueryWrapper<ProjectRelatedPersonnel> prpQueryWrap = new QueryWrapper<>();
+			prpQueryWrap.lambda().eq(ProjectRelatedPersonnel::getProjectId,projectLibraryId);
+			List<ProjectRelatedPersonnel> prpEoList = this.projectRelatedPersonnelService.list(prpQueryWrap);
+
 			QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrap = new QueryWrapper<>();
 			lawsInventoryEOQueryWrap.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
 			List<ProjectLawsInventoryEO> projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryEOQueryWrap);
@@ -2849,6 +2854,42 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
 					ProjectCertificationInventoryEO projectCertificationInventoryEOTemp = new ProjectCertificationInventoryEO();
 					BeanUtils.copyProperties(authDummyInventoryInfoEO,projectCertificationInventoryEOTemp);

+					String dutyTerritory = projectCertificationInventoryEOTemp.getDutyTerritory();
+					if(StringUtils.isNotEmpty(dutyTerritory)){
+						if(CollectionUtils.isNotEmpty(prpEoList)){
+							List<ProjectRelatedPersonnel> prpEoListTemp = prpEoList.stream().filter(prpEo -> {
+								boolean flag = false;
+								if (StringUtils.equals(prpEo.getDutyTerritory(), dutyTerritory)) {
+									flag = true;
+								}
+								return flag;
+							}).collect(Collectors.toList());
+
+							if(CollectionUtils.isNotEmpty(prpEoListTemp)){
+								List<String> engineeringInterfacePersonIdList = new ArrayList<>();
+								ProjectRelatedPersonnel prpEo = prpEoListTemp.get(0);
+								if(StringUtils.isNotBlank(prpEo.getEngineeringInterfacePerson())){
+									List<String> engineeringInterfacePersonList = Arrays.asList(prpEo.getEngineeringInterfacePerson().split(","));
+									engineeringInterfacePersonIdList.addAll(engineeringInterfacePersonList);
+								}
+								if(StringUtils.isNotBlank(prpEo.getEngineerAttSet())){
+									List<String> engineerAttSetList = Arrays.asList(prpEo.getEngineerAttSet().split(","));
+									engineeringInterfacePersonIdList.addAll(engineerAttSetList);
+								}
+								if(StringUtils.isNotBlank(prpEo.getEngineerLawSet())){
+									List<String> engineerLawSetList = Arrays.asList(prpEo.getEngineerLawSet().split(","));
+									engineeringInterfacePersonIdList.addAll(engineerLawSetList);
+								}
+
+								engineeringInterfacePersonIdList = engineeringInterfacePersonIdList.stream().distinct().collect(Collectors.toList());
+								if(CollectionUtils.isNotEmpty(engineeringInterfacePersonIdList) && engineeringInterfacePersonIdList.size() == 1){
+									projectCertificationInventoryEOTemp.setSdt(engineeringInterfacePersonIdList.get(0));
+									projectCertificationInventoryEOTemp.setDutyPerson(engineeringInterfacePersonIdList.get(0));
+								}
+							}
+						}
+					}
+
 					projectCertificationInventoryEOTemp.setId(UUID.randomUUID().toString().replace("-", ""));
 					projectCertificationInventoryEOTemp.setProjectLibraryId(projectLibraryId);
 					projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
@@ -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(4).setCellValue(dataList.get(j - 2).getRemark());
+					//dataRow.createCell(3).setCellValue(dataList.get(j - 2).getCertificationEngineerName());
+					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{
@@ -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',
@@ -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 == '市场清单详情' ? '虚拟清单详情' : '维护清单'
@@ -1383,7 +1438,10 @@
          }
        })
        window.open(newUrl.href, '_blank')
-      }
+      },
+      viewFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
+      },
    }
  }
 </script>
@@ -1619,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 {
@@ -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'
          },
@@ -347,9 +347,22 @@
              :title="text">{{text}}</a>
        </span>
      </a-table>
-      <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
-        {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}
+      <div class="page" v-if="dataSource.length > 0">
+        <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'),
-            options:[
+            text: this.$t('designComplianceReview') + this.$t('ProcessStatus'),
+            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'),
-            options:[
+            text: this.$t('verificationAndConformityconfirmation') + this.$t('ProcessStatus'),
+            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 {
@@ -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'"/>
@@ -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'
          },
@@ -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
      }