WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'fix_2nd_20230315' 到 'master'

Browse Source 
Fix 2nd 20230315

查看合并请求 laws-nio/laws-weilai!296
This commit is contained in:
高嵩
2023-03-19 22:15:18 +08:00
parent c8510aecfc 658f1ded2f
commit 8847f5e544
21 changed files with 1421 additions and 1162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java
+14
View File
@@ -83,6 +83,20 @@ public class BussDocumentLibraryEO implements Serializable {
@ApiModelProperty(value = "对应标准")
private java.lang.String correspondingStandard;
/**代替标准*/
@ApiModelProperty(value = "代替标准")
@Dict(dicCode ="replace_standard")
private java.lang.String replaceStandard;
/**被代替标准*/
@ApiModelProperty(value = "被代替标准")
@Dict(dicCode ="replaced_standard")
private java.lang.String replacedStandard;
@TableField(exist = false)
private java.lang.String cut;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+50 -6
View File
@@ -534,8 +534,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
fieldList = fieldList.stream()
.filter(e -> !"serial_number".equals(e.getDbFieldName())
&& !"title".equals(e.getDbFieldName())
&& !"title_en".equals(e.getDbFieldName())
&& !"state".equals(e.getDbFieldName()))
&& !"title_en".equals(e.getDbFieldName()))
.collect(Collectors.toList());
if (fieldList.size() != 0) {
@@ -1727,6 +1726,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String key = entry.getKey();
Object value = entry.getValue();
if(key.equals("replace_standard_id")){
continue;
}
//es全文新增数据(数据转换)
esFullText(cut, fieldList, categoryList, dictItemList, mapList, sbCn,sbEn, entry);
@@ -1930,6 +1932,26 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
String insertField = mustFields + fieldsBuilder.toString();
String insertValue = mustValues + valuesBuilder.toString();
bussDocumentLibraryEOMapper.insertInfo(insertField, insertValue);
//处理代替标准和被代替标准逻辑
Object repObj = map.get("replace_standard_id");
if(null != repObj) {
String[] replace_standard_list = repObj.toString().split(",");
for (String rs : replace_standard_list) {
BussDocumentLibraryEO bl = bussDocumentLibraryEOMapper.selectById(rs);
if (null != bl) {
String repStr = bl.getReplacedStandard();
if (StringUtils.isNotBlank(repStr)) {
if (!repStr.contains(idTemp)) {
repStr = repStr + "," + idTemp;
}
} else {
repStr = idTemp;
}
bl.setReplacedStandard(repStr);
bussDocumentLibraryEOMapper.updateById(bl);
}
}
}
String replaceStandard = StringUtils.valueOf(map.get("replace_standard"));
if (StringUtils.isNotBlank(replaceStandard)) {
@@ -2623,6 +2645,28 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//删除文档库数据
bussDocumentLibraryEOMapper.deleteById((String) map.get("id"));
bussDocumentLibraryEOMapper.insertInfo(insertField, insertValue);
//处理代替标准和被代替标准逻辑
String docId = (String) map.get("id");
Object repObj = map.get("replace_standard_id");
if(null != repObj){
String[] replace_standard_list = repObj.toString().split(",");
for (String rs : replace_standard_list) {
BussDocumentLibraryEO bl = bussDocumentLibraryEOMapper.selectById(rs);
if (null != bl) {
String repStr = bl.getReplacedStandard();
if (StringUtils.isNotBlank(repStr)) {
if (!repStr.contains(docId)) {
repStr = repStr + "," + docId;
}
} else {
repStr = docId;
}
bl.setReplacedStandard(repStr);
bussDocumentLibraryEOMapper.updateById(bl);
}
}
}
//开始更新ES
map.put("module_type", "文档库");
map.put("module_type_flag", ModuleTypeFlagEnum.DOCUMENT_LIBRARY.getValue());
map.put("create_time", new Date());
@@ -2776,13 +2820,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
//适用车型
StringBuilder msgContentSbCarType = new StringBuilder("Vehicle Type of the " + category + " " + serialNumber + " " + titleEn);
StringBuilder msgContentInfoSbCarType = new StringBuilder("Vehicle Type of the " + category + " " + href);
StringBuilder msgContentSbCarTypeCn = new StringBuilder(categoryCn + " " + serialNumber + " " + title+" 的适用车型改为");
StringBuilder msgContentInfoSbCarTypeCn = new StringBuilder(categoryCn + " " + hrefCn+" 的适用车型改为");
StringBuilder msgContentSbCarTypeCn = new StringBuilder(serialNumber + " " + title+" 的适用车型改为");
StringBuilder msgContentInfoSbCarTypeCn = new StringBuilder(hrefCn+" 的适用车型改为");
//状态
StringBuilder msgContentSbStatus = new StringBuilder("The Status of the " + category + " " + serialNumber + " " + titleEn);
StringBuilder msgContentInfoSbStatus = new StringBuilder("The Status of the " + category + " " + href);
StringBuilder msgContentSbStatusCn = new StringBuilder(categoryCn + " " + serialNumber + " " + title+" 的状态改为");
StringBuilder msgContentInfoSbStatusCn = new StringBuilder(categoryCn + " " + hrefCn+" 的状态改为");
StringBuilder msgContentSbStatusCn = new StringBuilder(serialNumber + " " + title+" 的状态改为");
StringBuilder msgContentInfoSbStatusCn = new StringBuilder(hrefCn+" 的状态改为");
List<String> fileIdLIstTemp = new ArrayList<>();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+2 -1
View File
@@ -2315,7 +2315,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
excelName = baseList.get(0).getName() + " Virtual list.xlsx";
}
//excel
OutputStream excelOS = new FileOutputStream(path + File.separator + excelName);
String excelNameRep = excelName.replace('/', '、');
OutputStream excelOS = new FileOutputStream(path + File.separator + excelNameRep);
ExportParams exportParams = new ExportParams();
exportParams.setType(ExcelType.XSSF);
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+19 -4
View File
@@ -147,12 +147,27 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
@Override
public int compareTo(ProjectLibraryBase o) {
return Integer.valueOf(this.projectVersion)-Integer.valueOf(o.projectVersion);//升序
// return o.id-this.id;//降序
if (!this.getProjectName().equals(o.getProjectName())) {
return this.getProjectName().compareTo(o.getProjectName());//升序
}
if (!this.getYearName().equals(o.getYearName())) {
if (this.getYearName().length() != o.getYearName().length()) {
return this.getYearName().length() - o.getYearName().length();
} else {
return this.getYearName().compareTo(o.getYearName());//升序
}
}
if (!this.getTargetMarket().equals(o.getTargetMarket())) {
return this.getTargetMarket().compareTo(o.getTargetMarket());//升序
}
if (!this.getProjectVersion().equals(o.getProjectVersion())) {
return Integer.valueOf(this.projectVersion) - Integer.valueOf(o.projectVersion);//升序
}
return 0;
}
public String getShowName(){
return projectName+yearName+targetMarket+projectVersion;
public String getShowName() {
return projectName + " " + yearName + "-" + targetMarket + "-" + projectVersion;
}
@Override
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+6 -8
View File
@@ -117,7 +117,6 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
}
}
List<ProjectLibraryBase> projectLibraryBaseLinkedList = new LinkedList<>();
for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
if(StringUtils.isBlank(libraryBase.getParentId())){
@@ -131,13 +130,13 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
projectLibraryBaseLinkedList.addAll(projectLibraryBaseListTemp);
}
}
projectLibraryBaseList.sort(Comparator.comparing(ProjectLibraryBase::getShowName));
Collections.sort(projectLibraryBaseList);
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region");
for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
targetMarket(projectLibraryBase, dictItemList, libraryBase);
Map<String,Object> mapList = new HashMap<>();
List<List<TimeNodeVO>> collect = new ArrayList<>();
List<List<TimeNodeVO>> collect;
if(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime)){
collect = listNew.stream().filter(e -> libraryBase.getId().equals(e.get(0).getProjectId())).collect(Collectors.toList());
}else{
@@ -147,8 +146,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
if(collect.size() != 0){
index ++;
mapList.put("index",index);
mapList.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket()+"-"+libraryBase.getProjectVersion());
mapList.put("projectName",libraryBase.getShowName());
mapList.put("data",collect);
mapList.put("projectInfo",libraryBase);
result.add(mapList);
}
}
@@ -215,9 +215,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
lambdaQueryWrapper.in(ProjectTaskInventoryEO::getProjectLawsInventoryId,projectLawsInventoryEOIdAll);
projectTaskInventoryEOList = projectTaskInventoryEOService.list(lambdaQueryWrapper);
}
projectLibraryBaseList.sort(Comparator.comparing(ProjectLibraryBase::getShowName));
Collections.sort(projectLibraryBaseList);
for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
//处理目标市场
targetMarket(projectLibraryBase, dictItemList, libraryBase);
@@ -234,7 +232,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
projectVersion = "00";
}
Map<String,Object> map = new HashMap<>();
map.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket()+"-"+projectVersion);//项目名称
map.put("projectName",libraryBase.getShowName());//项目名称
map.put("targetMarket",libraryBase.getTargetMarket());//目标市场
//1. 项目当前状态--projectState(蓝/红/黄/绿)-->studio视角下的数据
jero-web/src/common/lang/en-us.js
+3 -2
View File
@@ -1240,9 +1240,9 @@ module.exports = {
dre: 'Dre',
applicableInstructionsMarketList: 'Applicable instructions of market list',
pleaseSelectTheDataCompared: 'Please select the data to be compared',
problemLabel: 'Topic Tag',
problemLabel: 'classification',
personCharge: 'Person in charge',
addLabel: 'Add Tag',
addLabel: 'New Classification',
editLabel: 'Edit Label',
applicableMarket: 'Applicable Market',
templateMaintenance: 'Template Maintenance',
@@ -1384,4 +1384,5 @@ module.exports = {
beforedatein:'In... Before date (inclusive)',
inRecentMonthsin6:'Within 6 months (implemented)',
batchUpdateDeadline:'Batch update deadline',
timeInterval:'Time Interval',
}
jero-web/src/common/lang/zh-cn.js
+3 -2
View File
@@ -1342,9 +1342,9 @@ module.exports = {
dre: '填写人',
applicableInstructionsMarketList: '市场清单适用说明',
pleaseSelectTheDataCompared: '请选择需要对比的数据',
problemLabel: '问题标签',
problemLabel: '分类',
personCharge: '负责人',
addLabel: '新增标签',
addLabel: '新增分类',
editLabel: '编辑标签',
applicableMarket: '适用市场',
templateMaintenance: '模板维护',
@@ -1485,4 +1485,5 @@ module.exports = {
beforedatein:'在...日期之前（包含）',
inRecentMonthsin6:'近6个月内（已实施）',
batchUpdateDeadline:'批量更新截止时间',
timeInterval:'时间区间',
}
jero-web/src/components/Standardselection/index.vue
+14 -10
View File
@@ -83,6 +83,7 @@
visible: false,
confirmLoading: false,
selectedRowKeys: [],
selectedRowList: [],
content: [],
loading: false,
queryParam: {},
@@ -149,16 +150,17 @@
this.visible = false
},
handleSubmit() {
let content = []
// let replace_standard_id = []
let serial_number = []
let replace_standard_id = []
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
let content = JSON.parse(JSON.stringify(this.selectedRowKeys))
// this.content.forEach(res => {
// content.push(res.serial_number)
// replace_standard_id.push(res.id)
// })
this.$emit('input', content.join(','))
// this.$emit('change', this.query.db_field_name, replace_standard_id.join(','))
// let content = JSON.parse(JSON.stringify(this.selectedRowList))
this.selectedRowList.forEach(res => {
serial_number.push(res.serial_number)
replace_standard_id.push(res.id)
})
this.$emit('input', serial_number.join(','))
console.log(replace_standard_id)
this.$emit('change', this.query.db_field_name, replace_standard_id.join(','))
// this.$emit('changecontent', this.content)
this.visible = false
} else {
@@ -168,9 +170,11 @@
indexclick(event) {
this.$emit('input', event.target.value)
},
onSelectChange(value) {
onSelectChange(value,row) {
console.log(value)
console.log(row)
this.selectedRowKeys = value
this.selectedRowList = row
// this.content = []
// value.forEach(val => {
// this.dataList.forEach((res) => {
jero-web/src/components/libraryAddForm/index.vue
+6 -4
View File
@@ -169,6 +169,7 @@
<Standardselection :query="item"
:disabled="disabled"
:standard="formInline"
@change="StandardselectionChange"
v-model="formInline[item.db_field_name]"/>
</a-form-model-item>
</div>
@@ -494,10 +495,11 @@
this.type = 'add'
this.getForm()
},
// StandardselectionChange(value, id) {
// this.formInline[value + '_id'] = id
// this.formInline = { ...this.formInline }
// },
StandardselectionChange(value, id) {
console.log(id)
this.formInline[value + '_id'] = id
this.formInline = { ...this.formInline }
},
PersonnelSelectionChange(value, id) {
this.formInline[value + '_id'] = id
this.formInline = { ...this.formInline }
jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue
+11 -11
View File
@@ -31,17 +31,17 @@
v-model="queryParam.title"></a-input>
</div>
</a-col>
<a-col :md="12" :sm="8">
<div class="box-title-text">
<div class="title-text" :title="$t('status')">
<span>{{$t('status')}}</span>
</div>
<j-dict-select-tag class="box-input" v-model="queryParam.state"
:placeholder="$t('PleaseSelect')+$t('status')"
:type="'select'"
:triggerChange="false" :dictCode="'state'"/>
</div>
</a-col>
<!-- <a-col :md="12" :sm="8">-->
<!-- <div class="box-title-text">-->
<!-- <div class="title-text" :title="$t('status')">-->
<!-- <span>{{$t('status')}}</span>-->
<!-- </div>-->
<!-- <j-dict-select-tag class="box-input" v-model="queryParam.state"-->
<!-- :placeholder="$t('PleaseSelect')+$t('status')"-->
<!-- :type="'select'"-->
<!-- :triggerChange="false" :dictCode="'state'"/>-->
<!-- </div>-->
<!-- </a-col>-->
</template>
<span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="12" :sm="24">
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+18 -18
View File
@@ -931,24 +931,24 @@
key: 3,
moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
},
{
sort: '',
name: this.$t('listConfirmationStatus'),
headFieldCn:'清单确认状态',
headFieldEn:'List Confirmation Status',
field: 'inventoryAffirmStatusName',
key: 4,
moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
},
{
sort: '',
name: this.$t('taskAffirmStatus'),
headFieldCn:'任务确认状态',
headFieldEn:'Task Confirmation Status',
field: 'taskAffirmStatusName',
key: 5,
moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
},
// {
// sort: '',
// name: this.$t('listConfirmationStatus'),
// headFieldCn:'清单确认状态',
// headFieldEn:'List Confirmation Status',
// field: 'inventoryAffirmStatusName',
// key: 4,
// moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
// },
// {
// sort: '',
// name: this.$t('taskAffirmStatus'),
// headFieldCn:'任务确认状态',
// headFieldEn:'Task Confirmation Status',
// field: 'taskAffirmStatusName',
// key: 5,
// moduleFlag:this.$route.query.title == '虚拟清单详情' ? '虚拟清单详情' : '维护清单',
// },
{
sort: '',
name: this.$t('zoneOfApplication'),
jero-web/src/views/externalReports/index.vue
+8 -3
View File
@@ -143,10 +143,10 @@
:columns="columns"
>
<span slot="projectName" slot-scope="text,record" :title="text">
{{ text && text.length > 20 ? text.slice(0, 18) + '...' : text }}
{{ text }}
</span>
<span slot="fileName" slot-scope="text,record" :title="text">
{{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
{{ text }}
</span>
<span slot="operation" slot-scope="text,record">
@@ -382,6 +382,7 @@
{
title: this.$t('fileName'),
align: 'left',
ellipsis: true,
dataIndex: 'fileName',
scopedSlots: { customRender: 'fileName' },
width: 200
@@ -389,6 +390,7 @@
{
title: this.$t('fileDeclaration'),
align: 'left',
ellipsis: true,
dataIndex: 'fileDescription',
scopedSlots: { customRender: 'projectName' },
width: 300
@@ -396,6 +398,7 @@
{
title: this.$t('uploadedBy'),
align: 'left',
ellipsis: true,
dataIndex: 'createBy',
width: 150
},
@@ -407,6 +410,7 @@
{
title: this.$t('uploadTime'),
align: 'left',
ellipsis: true,
dataIndex: 'createTime',
width: 250
},
@@ -414,6 +418,7 @@
title: this.$t('operation'),
align: 'left',
fixed: 'right',
ellipsis: true,
width: 250,
scopedSlots: { customRender: 'operation' }
}
@@ -1123,7 +1128,7 @@
</script>
<style lang="less" scoped>
@import '~@assets/less/common.less';
@import'~@assets/less/common.less';
::v-deep .ant-table-row:first-child {
background: #fff !important;
jero-web/src/views/projectManagement/components/addModel.vue
+2 -2
View File
@@ -76,8 +76,8 @@
<span class="title-text-text" :title="$t('projectVersion')">{{$t('projectVersion')}}</span>
</div>
<a-form-model-item class="itemModel" prop="projectVersion">
<a-input class="box-input"
:disabled="true"
<a-input class="box-input" oninput="javascript:this.value=this.value.replace(/[^\d]$/g,'')"
:maxLength="2"
v-model="formInline.projectVersion"
:placeholder="$t('PleaseEnter')+$t('projectVersion')"/>
</a-form-model-item>
jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
+614 -475
View File
File diff suppressed because it is too large Load Diff
jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+615 -580
View File
File diff suppressed because it is too large Load Diff
jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+6 -6
View File
@@ -61,7 +61,7 @@
dataIndex: 'projectName',
scopedSlots: { customRender: 'RelatedItems' },
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('standardInformation'),
@@ -69,7 +69,7 @@
dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
width: 170
width: 330
},
{
title: this.$t('taskType'),
@@ -83,28 +83,28 @@
align: 'left',
dataIndex: 'lastAssigneeName',
ellipsis: true,
width: 170
width: 150
},
{
title: this.$t('CurrentProcessor'),
align: 'left',
dataIndex: 'assigneeName',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('TaskCutOffTime'),
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 170
width: 150
},
{
title: this.$t('taskStatus'),
align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('operation'),
jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+7 -7
View File
@@ -62,7 +62,7 @@
dataIndex: 'projectName',
ellipsis: true,
scopedSlots: { customRender: 'RelatedItems' },
width: 170
width: 110
},
{
title: this.$t('standardInformation'),
@@ -70,28 +70,28 @@
dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 170
width: 260
},
{
title: this.$t('taskType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
width: 120
},
{
title: this.$t('Sponsor'),
align: 'left',
dataIndex: 'createBy',
ellipsis: true,
width: 170
width: 100
},
{
title: this.$t('TaskCutOffTime'),
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 170,
width: 110,
scopedSlots: { customRender: 'endTime' }
},
{
@@ -99,13 +99,13 @@
align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
width: 80
},
{
title: this.$t('operation'),
align: 'left',
fixed: 'right',
width: 120,
width: 80,
scopedSlots: { customRender: 'operation' }
}
],
jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+6 -6
View File
@@ -67,7 +67,7 @@
dataIndex: 'projectName',
ellipsis: true,
scopedSlots: { customRender: 'RelatedItems' },
width: 170
width: 130
},
{
title: this.$t('standardInformation'),
@@ -75,7 +75,7 @@
dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 170
width: 330
},
{
title: this.$t('taskType'),
@@ -89,28 +89,28 @@
align: 'left',
dataIndex: 'createBy',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('CurrentProcessor'),
align: 'left',
dataIndex: 'assigneeName',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('TaskCutOffTime'),
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 170
width: 150
},
{
title: this.$t('taskStatus'),
align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('operation'),
jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue
+6 -6
View File
@@ -60,42 +60,42 @@
dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
width: 170
width: 330
},
{
title: this.$t('taskType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('LastProcessor'),
align: 'left',
dataIndex: 'lastAssigneeName',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('CurrentProcessor'),
align: 'left',
dataIndex: 'assigneeName',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('TaskCutOffTime'),
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 170
width: 150
},
{
title: this.$t('taskStatus'),
align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('operation'),
jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue
+5 -5
View File
@@ -58,28 +58,28 @@
dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
width: 170
width: 330
},
{
title: this.$t('taskType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('Sponsor'),
align: 'left',
dataIndex: 'createBy',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('TaskCutOffTime'),
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 170,
width: 150,
scopedSlots: { customRender: 'endTime' }
},
{
@@ -87,7 +87,7 @@
align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('operation'),
jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue
+6 -6
View File
@@ -57,42 +57,42 @@
dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 170
width: 330
},
{
title: this.$t('taskType'),
align: 'left',
dataIndex: 'flowTypeShow',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('Sponsor'),
align: 'left',
dataIndex: 'createBy',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('CurrentProcessor'),
align: 'left',
dataIndex: 'assigneeName',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('TaskCutOffTime'),
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
width: 170
width: 150
},
{
title: this.$t('taskStatus'),
align: 'left',
dataIndex: 'statusShow',
ellipsis: true,
width: 170
width: 130
},
{
title: this.$t('operation'),