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

src/views/enterpriseStandardLibrary/plan/PlanList.vue

@@ -193,7 +193,7 @@
         <!--    操作栏   -->
         <div slot="action" slot-scope="{record}" class="action-span-cell">
           <a @click="handleDetail(record)" class="table-ope-btn" v-has="'enterpriseStandardLibrary:plan:detail'">{{ $t('view') }}</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="isHasPermission('enterpriseStandardLibrary:plan:detail') && record.allowDel && isHasPermission('enterpriseStandardLibrary:plan:delete')" type="vertical" />
           <a @click="handleDelete(record.id)" class="table-ope-btn" v-if="record.allowDel" v-has="'enterpriseStandardLibrary:plan:delete'">{{ $t('delete') }}</a>
         </div>
 
@@ -207,6 +207,7 @@ import { queryDepartTreeList } from '@/api/api'
 import JTable from '@/components/jero/JTable'
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import { downFile } from '../../../api/manage'
+import { isHasPermission } from '@/utils/hasPermission'
 
 export default {
   name: 'PlanList',
@@ -424,6 +425,7 @@ export default {
     this.currentDate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
   },
   methods: {
+    isHasPermission,
     // 获取组织机构树
     getSysCategoryTree () {
       queryDepartTreeList().then((res) => {

src/views/standardRegulationLibrary/documentDynamics/DocumentDynamicsList.vue

@@ -85,6 +85,6 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
-
+@import '~@assets/less/common.less';
 </style>