diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
index 0f2595d22..048c0ee08 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java
@@ -454,7 +454,7 @@ public class WordUtil {
String applyScope = lawsMonthlyReportWriteEO.getApplyScope();//适用范围
String state = lawsMonthlyReportWriteEO.getState();//状态
String useMethod = lawsMonthlyReportWriteEO.getUseMethod();//用法
- String implementCar = lawsMonthlyReportWriteEO.getImplementCar();//实施车型
+// String implementCar = lawsMonthlyReportWriteEO.getImplementCar();//实施车型
String newCarImplementTime = lawsMonthlyReportWriteEO.getNewCarImplementTime();//新车型实施日期
String productionCarImplementTime = lawsMonthlyReportWriteEO.getProductionCarImplementTime();//在产车实施日期
String contentCn = lawsMonthlyReportWriteEO.getContentCn();//主要内容中文
@@ -504,7 +504,7 @@ public class WordUtil {
String stateName = dictItem(sysDictItems, state,cut, DictCodeReportEnum.STATE.getValue());
String useMethodName = dictItem(sysDictItems, useMethod,cut, DictCodeReportEnum.USEMETHOD.getValue());
- XWPFTable table = document.createTable(11, 2);
+ XWPFTable table = document.createTable(10, 2);
//表格属性
CTTblPr tablePr = table.getCTTbl().addNewTblPr();
//固定列宽(英文和数字的时候自动换行)
@@ -534,19 +534,19 @@ public class WordUtil {
//第5行
setCellThree(table,3, "用法",useMethodName,sysDictItems,DictCodeReportEnum.USEMETHOD.getValue());
//第6行
- setCell(table,4, "实施车型",implementCar);
+// setCell(table,4, "实施车型",implementCar);
//第7行
- setCell(table,5, "新车型实施日期",newCarImplementTime);
+ setCell(table,4, "新车型实施日期",newCarImplementTime);
//第8行
- setCell(table,6, "在产车实施日期",productionCarImplementTime);
+ setCell(table,5, "在产车实施日期",productionCarImplementTime);
//第9行
- setCell(table,7, "主要内容",contentCn);
+ setCell(table,6, "主要内容",contentCn);
//第10行
- setCell(table,8, "NIO工作进展",workProgressCn);
+ setCell(table,7, "NIO工作进展",workProgressCn);
//第11行
- setCell(table,9, "法规联系人",lawsContact);
+ setCell(table,8, "法规联系人",lawsContact);
//第12行
- setCell(table,10, "链接",link);
+ setCell(table,9, "链接",link);
}else{
//第1行
setCell(table,0, "Related Areas",technologyTerritoryName);
@@ -559,19 +559,19 @@ public class WordUtil {
//第5行
setCellThree(table,3,"Usage",useMethodName,sysDictItems,DictCodeReportEnum.APPLYSCOPE.getValue());
//第6行
- setCell(table,4,"Implementation Model",implementCar);
+// setCell(table,4,"Implementation Model",implementCar);
//第7行
- setCell(table,5,"New Type Execution Date",newCarImplementTime);
+ setCell(table,4,"New Type Execution Date",newCarImplementTime);
//第8行
- setCell(table,6,"New Vehicle Execution Date",productionCarImplementTime);
+ setCell(table,5,"New Vehicle Execution Date",productionCarImplementTime);
//第9行
- setCell(table,7,"Main Content",contentEn);
+ setCell(table,6,"Main Content",contentEn);
//第10行
- setCell(table,8,"NIO Work Progress",workProgressEn);
+ setCell(table,7,"NIO Work Progress",workProgressEn);
//第11行
- setCell(table,9,"Regulatory Contact",lawsContact);
+ setCell(table,8,"Regulatory Contact",lawsContact);
//第12行
- setCell(table, 10,"Link",link);
+ setCell(table, 9,"Link",link);
}
// ctTblLayoutType.setType(STTblLayoutType.FIXED);
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue
index 228ec1dcb..b0c7bc728 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue
@@ -36,7 +36,9 @@
-
+
{{$t('managePublishing')}}
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
index daab20b60..349bc2805 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
@@ -15,7 +15,9 @@
-
{{$t('classificationMaintenance')}}
@@ -42,11 +44,15 @@
-
+
{{$t('managePublishing')}}
-
+
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
index 0fa66b3aa..2be197f75 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue
@@ -44,19 +44,27 @@
-
+
{{$t('monthlyTitleTemplate')}}
-
+
{{$t('monthlyIntegrationAndExport')}}
-
+
-
+
@@ -74,10 +82,28 @@
:columns="columns"
>
- {{$t('copy')}}
- {{$t('view')}}
- {{$t('edit')}}
- {{$t('deleteLib')}}
+
+ {{$t('copy')}}
+
+
+ {{$t('view')}}
+
+
+ {{$t('edit')}}
+
+
+ {{$t('deleteLib')}}
+
@@ -103,6 +129,7 @@
import fillTable from './modules/fillTable'
import fillAdd from './modules/fillAdd'
import moment from 'moment'
+ import { mapGetters } from 'vuex'
export default {
name: 'RegulationMonthlyFill',
@@ -118,14 +145,14 @@
list: '/report/lawsMonthlyReportWriteEO/page',
exportData: '/report/lawsMonthlyReportWriteEO/exportMonthlyReport'
},
- exportStatusList:[
+ exportStatusList: [
{
- value:'2',
- name:this.$t('hasBeenExport')
+ value: '2',
+ name: this.$t('hasBeenExport')
},
{
- value:'1',
- name:this.$t('notExport')
+ value: '1',
+ name: this.$t('notExport')
}
],
loading: false,
@@ -192,15 +219,27 @@
width: 190,
scopedSlots: { customRender: 'operation' }
}
- ]
+ ],
+ userData:{},
+ administrators:false
}
},
mounted() {
this.queryParam.month = moment(new Date()).format('YYYY-MM')
this.getList()
+ this.userData = this.userInfo()
+ this.administrators = false
+ if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+ this.userInfo().userRoleList.forEach(res => {
+ if (res.roleCode == 'admin') {
+ this.administrators = true
+ }
+ })
+ }
},
methods: {
- copyClick(row){
+ ...mapGetters(['userInfo']),
+ copyClick(row) {
let _this = this
this.$confirm({
content: _this.$t('ConfirmReplication'),
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
index 09ff3b0f0..a89cbe2cd 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
@@ -22,7 +22,7 @@
-
+
@@ -51,14 +51,16 @@
{{record.issueStatus == 2 ? $t('release') : $t('withdraw')}}
{{$t('deleteLib')}}
{{$t('download')}}
@@ -110,6 +112,7 @@
downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
downLoadImgUrl: window._CONFIG['domianWebImgURL'] + '/sys/common/download',
userData: {},
+ administrators:false,
columns: [
{
title: this.$t('RegulationMonthlyName'),
@@ -161,6 +164,14 @@
mounted() {
this.getList()
this.userData = this.userInfo()
+ this.administrators = false
+ if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+ this.userInfo().userRoleList.forEach(res => {
+ if (res.roleCode == 'admin') {
+ this.administrators = true
+ }
+ })
+ }
},
methods: {
...mapGetters(['userInfo']),
diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index f10dccbfc..0543db04a 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -41,11 +41,11 @@
{{title && title.length > 18?title.slice(0,17)+'...':title}}
- onContextMenuClick(treeKey, menuKey, record)">
- {{$t('Addingfolder')}}
- {{$t('Addingsubfolders')}}
- {{$t('Editfolder')}}
- {{$t('Deletefolders')}}
+ onContextMenuClick(treeKey, menuKey, record)">
+ {{$t('Addingfolder')}}
+ {{$t('Addingsubfolders')}}
+ {{$t('Editfolder')}}
+ {{$t('Deletefolders')}}
@@ -82,16 +82,17 @@
{{ $t('uploadTime') }}
-
+
+ class="box-input"
+ @change="onChange"
+ style='margin-left: -1px'
+ v-model="queryParams.time"
+ :disabled="false"/>
-
+
@@ -106,18 +107,22 @@
+
-
+
+
+
+ .split-detail-search-header {
+ .ant-col-sm-8 {
+ min-width: 300px;
+ }
-
\ No newline at end of file
diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue
index 4dd1c1f39..6ec89741c 100644
--- a/jero-web/src/views/regulationsKanban/index.vue
+++ b/jero-web/src/views/regulationsKanban/index.vue
@@ -65,7 +65,9 @@