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

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);
 

jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue

@@ -36,7 +36,9 @@
       </a-form>
     </div>
     <div class="box-content-right">
-      <div @click="managePublishingClick" class="operator-text">
+      <div @click="managePublishingClick"
+           v-has="'countryCard:managePublishing'"
+           class="operator-text">
         <a-icon type="carry-out"/>
         {{$t('managePublishing')}}
       </div>

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue

@@ -15,7 +15,9 @@
         </template>
       </div>
       <div class="box-content-content">
-        <div class="box-content-content-index" :title="$t('classificationMaintenance')"
+        <div class="box-content-content-index"
+             v-has="'problemKnowledgeBase:classificationMaintenance'"
+             :title="$t('classificationMaintenance')"
              @click="classificationClick">
           <a-icon type="setting"/>
           {{$t('classificationMaintenance')}}
@@ -42,11 +44,15 @@
           <!--          <a-icon type="setting"/>-->
           <!--          {{$t('classificationMaintenance')}}-->
           <!--        </div>-->
-          <div @click="managePublishingClick" class="operator-text-text-index">
+          <div @click="managePublishingClick"
+               v-has="'problemKnowledgeBase:release'"
+               class="operator-text-text-index">
             <a-icon type="carry-out"/>
             {{$t('managePublishing')}}
           </div>
-          <div @click="newlyAddedClick" class="operator-text-text-index">
+          <div @click="newlyAddedClick"
+               v-has="'problemKnowledgeBase:add'"
+               class="operator-text-text-index">
             <a-icon type="plus"/>
             {{$t('newlyAdded')}}
           </div>

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue

@@ -44,19 +44,27 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <div @click="monthlyTitleTemplateClick" class="operator-text">
+      <div @click="monthlyTitleTemplateClick"
+           v-has="'monthlyReportFilling:titleTemplate'"
+           class="operator-text">
         <a-icon type="apartment"/>
         {{$t('monthlyTitleTemplate')}}
       </div>
-      <div @click="monthlyIntegrationAndExportClick" class="operator-text">
+      <div @click="monthlyIntegrationAndExportClick"
+           v-has="'monthlyReportFilling:integratedExport'"
+           class="operator-text">
         <a-icon type="import"/>
         {{$t('monthlyIntegrationAndExport')}}
       </div>
-      <div @click="addContentClick" class="operator-text">
+      <div @click="addContentClick"
+           v-has="'monthlyReportFilling:adding'"
+           class="operator-text">
         <a-icon type="plus"/>
         {{$t('addContent')}}
       </div>
-      <div @click="BatchDeleteClick" class="operator-text">
+      <div @click="BatchDeleteClick"
+           v-has="'monthlyReportFilling:batchDelete'"
+           class="operator-text">
         <a-icon type="delete"/>
         {{$t('BatchDelete')}}
       </div>
@@ -74,10 +82,28 @@
         :columns="columns"
       >
          <span slot="operation" slot-scope="text,record">
-           <a class="text-operation" @click="copyClick(record)">{{$t('copy')}}</a>
+           <a class="text-operation"
-           <a class="text-operation" @click="viewClick(record)">{{$t('view')}}</a>
+              v-has="'monthlyReportFilling:copy'"
-           <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
+              @click="copyClick(record)">
-           <a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
+             {{$t('copy')}}
+           </a>
+           <a class="text-operation"
+              v-has="'monthlyReportFilling:view'"
+              @click="viewClick(record)">
+             {{$t('view')}}
+           </a>
+           <a class="text-operation"
+              v-if="record.createBy == userData.username || administrators"
+              v-has="'monthlyReportFilling:edit'"
+              @click="edit(record)">
+             {{$t('edit')}}
+           </a>
+           <a class="text-operation"
+              v-if="record.createBy == userData.username || administrators"
+              v-has="'monthlyReportFilling:delete'"
+              @click="deleteLib(record)">
+             {{$t('deleteLib')}}
+           </a>
         </span>
       </a-table>
       <div class="page" v-if="dataSource && dataSource.length > 0">
@@ -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',
+            value: '2',
-            name:this.$t('hasBeenExport')
+            name: this.$t('hasBeenExport')
           },
           {
-            value:'1',
+            value: '1',
-            name:this.$t('notExport')
+            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'),

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue

@@ -22,7 +22,7 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <div @click="uploadMonthlyClick" class="operator-text">
+      <div @click="uploadMonthlyClick" v-has="'monthlyReportManagement:upload'" class="operator-text">
         <a-icon type="cloud-upload"/>
         {{$t('uploadMonthly')}}
       </div>
@@ -51,14 +51,16 @@
           </span>
         <span slot="operation" slot-scope="text,record">
            <a class="text-operation"
-              v-if="record.createBy == userData.username"
+              v-has="'monthlyReportManagement:release'"
+              v-if="record.createBy == userData.username || administrators"
               @click="withdraw(record)">
              {{record.issueStatus == 2 ? $t('release') : $t('withdraw')}}
            </a>
            <a class="text-operation"
-              v-if="record.createBy == userData.username && record.issueStatus == 2"
+              v-if="(record.createBy == userData.username || administrators) && record.issueStatus == 2"
               @click="deleteLib(record)">{{$t('deleteLib')}}</a>
            <a class="text-operation"
+              v-has="'monthlyReportManagement:download'"
               v-if="record.createBy == userData.username || record.issueStatus == 1"
               @click="download(record)">{{$t('download')}}</a>
         </span>
@@ -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']),

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

@@ -65,7 +65,9 @@
     </div>
     <div class="table-operator" style="overflow:hidden;margin-bottom: 20px">
       <div style="float: right;margin-bottom: 0px;margin-left: 20px">
-        <div class="operator-text" @click="deriveconformanceresults()">
+        <div class="operator-text"
+             v-has="'complianceKanban:export'"
+             @click="deriveconformanceresults()">
           <a-icon type="solution"/>
           {{ $t('Deriveconformanceresults') }}
         </div>
@@ -96,7 +98,7 @@
 <!--            {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}-->
 <!--        </span>-->
         <span slot="operation" slot-scope="text,record">
-            <a class="text-operation" @click="handlecody(record)">{{$t('view')}}</a>
+            <a class="text-operation" v-has="'complianceKanban:view'" @click="handlecody(record)">{{$t('view')}}</a>
         </span>
       </a-table>
     </div>