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

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

Browse Source
This commit is contained in:
wangzhijiang
2022-09-01 09:44:05 +08:00
parent db53b94361 bf99157dcb
commit 75f45498f4
6 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/entity/ExtRepoData.java
+2 -2
View File
@@ -40,7 +40,7 @@ public class ExtRepoData implements Serializable {
private java.lang.String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
@@ -50,7 +50,7 @@ public class ExtRepoData implements Serializable {
private java.lang.String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java
+1 -1
View File
@@ -146,7 +146,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
this.updateById(lawsMonthlyReportManageEO);
// 同步es
// syncElasticsearch(id, issueStatus, issueTime);
syncElasticsearch(id, issueStatus, issueTime);
}
private void syncElasticsearch(String id, String issueStatus, Date issueTime) {
jero-web/src/views/dashboard/components/myList.vue
+4 -2
View File
@@ -10,7 +10,7 @@
<div class="myList-box-content" v-if="dataSource.length > 0">
<div class="myList-box-content-box" v-for="(item,index) in dataSource" :key="index" @click="prcClick(item)">
<div class="top">
<span class="top-text" :title="item.prcNum">{{item.prcNum}}</span>
<span class="top-text" :title="item.prcName">{{item.prcName}}</span>
<span class="top-admin" :title="prcTypeName[item.prcType]">{{prcTypeName[item.prcType]}}</span>
</div>
<div class="button">
@@ -43,7 +43,9 @@
dataSource: [],
loading: false,
prcTypeName: {
1: this.$t('taskConfirmationProcess')
1: this.$t('taskConfirmationProcess'),
5:this.$t('collectionOfRegulatoryOpinionsProcess'),
6:this.$t('regulatoryTechnologyAssessmentProcess')
}
}
},
jero-web/src/views/documentManage/collection/index.vue
+7 -7
View File
@@ -1,8 +1,8 @@
<template>
<div class="collection">
<a-card :bordered="false">
<!-- <a-tabs :model="activeTab" @change="callback">-->
<!-- <a-tab-pane :key="$t('DocumentLibrary')" :tab="$t('DocumentLibrary')">-->
<a-tabs :model="activeTab" @change="callback">
<a-tab-pane :key="$t('DocumentLibrary')" :tab="$t('DocumentLibrary')">
<div class="collection-search-wrapper">
<div class="collection-search-header">
<div class="table-page-search-wrapper">
@@ -90,11 +90,11 @@
/>
</div>
</div>
<!-- </a-tab-pane>-->
<!-- <a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')">-->
<!-- <problemKnowledgeBaseList ref="problemKnowledgeBaseListRef"/>-->
<!-- </a-tab-pane>-->
<!-- </a-tabs>-->
</a-tab-pane>
<a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')">
<problemKnowledgeBaseList ref="problemKnowledgeBaseListRef"/>
</a-tab-pane>
</a-tabs>
</a-card>
</div>
</template>
jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
+1
View File
@@ -48,6 +48,7 @@
<a-input-number class="box-input"
:placeholder="$t('PleaseEnter')+item.db_field_txt"
:disabled="disabled"
:min="0"
v-model="formInline[item.db_field_name]" :max="99999999"/>
</a-form-model-item>
</div>
jero-web/src/views/documentTools/searchCenter/index.vue
+4 -4
View File
@@ -65,10 +65,10 @@
<a-tab-pane :key="$t('whole')" :tab="$t('whole')"></a-tab-pane>
<a-tab-pane :key="$t('DocumentLibrary')" :tab="$t('DocumentLibrary')" force-render>
</a-tab-pane>
<!-- <a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')" force-render>-->
<!-- </a-tab-pane>-->
<!-- <a-tab-pane :key="$t('monthlyReportRegulations')" :tab="$t('monthlyReportRegulations')" force-render>-->
<!-- </a-tab-pane>-->
<a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')" force-render>
</a-tab-pane>
<a-tab-pane :key="$t('monthlyReportRegulations')" :tab="$t('monthlyReportRegulations')" force-render>
</a-tab-pane>
</a-tabs>
</div>
</div>