完善权限控制

src/pages/details/otherLawsStandDetails/index.vue

@@ -56,8 +56,13 @@
                     <p class="half"><label style=" margin-right: 157px;">适用车型</label><span>{{ sarStandardsInfoEO.lawsSycx || '-' }}</span></p>
                     <p class="half"><label style=" margin-right: 95px;">是否纳入认证清单</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? '是' : (sarStandardsInfoEO.isRelateAccess ? '否':'-')}}</span></p>
                     <p class="half"><label style=" margin-right: 190px;">年度</label><span>{{ sarStandardsInfoEO.lawsYear || '-' }}</span></p>
-                    <p class="half"><label style=" margin-right: 95px;">福田转发通知文号</label><span>{{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}</span></p>
+                    <p class="half"><label style=" margin-right: 95px;">福田转发通知文号</label>
-                    <p class="half"><label style=" margin-right: 125px;">通知文号链接</label><span>{{ sarStandardsInfoEO.notisyncNumLink || '-' }}</span></p>
+                      <a v-if="sarStandardsInfoEO.notisyncNumLink && sarStandardsInfoEO.notisyncNumLink!== ''" :href="sarStandardsInfoEO.notisyncNumLink" target="_blank" style="cursor: pointer;color: rgb(45, 140, 240);">
+                        {{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}
+                      </a>
+                      <span v-else>{{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}</span>
+                    </p>
+                    <!--<p class="half"><label style=" margin-right: 125px;">通知文号链接</label><span>{{ sarStandardsInfoEO.notisyncNumLink || '-' }}</span></p>-->
                     <p class="half"><label style=" margin-right: 157px;">信息简报</label><span>{{ sarStandardsInfoEO.lawsBulletin || '-' }}</span></p>
                     <p class="half"><label style=" margin-right: 190px;">标签</label><span>{{ sarStandardsInfoEO.lawsLabel || '-' }}</span></p>
                     <p class="half"><label style=" margin-right: 62px;">备注（最终政策发布）</label><span>{{ sarStandardsInfoEO.lawsRemark || '-' }}</span></p>

src/pages/policyRegulation/meeting/index.vue

@@ -78,11 +78,13 @@
           ref="selection"
           :data="data"
           tooltip-effect="dark"
-          style="width:100%;"
+          style="width:100%;height: calc(100% - 57px)"
+          height="string"
           border
           class="drag-table"
           @sort-change="sortChange"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px', padding: 0}"
+          :cell-style="{padding: 0}"
           @selection-change="selectionChange"
       >
         <el-table-column
@@ -129,13 +131,14 @@
           </template>
         </el-table-column>
         <el-table-column
+            v-if="isPermission('62cdf3d570941c154d28371632ccfa2e,71155d105e930bb8e7881a8a9809646a') > 0"
             prop="action"
             label="操作"
             align="center"
         >
           <template slot-scope="scope">
-            <a class="table-jump" style="color: #2d8cf0" @click="openDrawer('edit', scope.row)">编辑</a>
+            <a class="table-jump" v-btn-permission="'62cdf3d570941c154d28371632ccfa2e'" style="color: #2d8cf0" @click="openDrawer('edit', scope.row)">编辑</a>
-            <a class="table-jump" style="color: #f56c6c;margin-left: 10px" @click="onDelete(scope.row.id)">删除</a>
+            <a class="table-jump" v-btn-permission="'71155d105e930bb8e7881a8a9809646a'" style="color: #f56c6c;margin-left: 10px" @click="onDelete(scope.row.id)">删除</a>
           </template>
         </el-table-column>
       </el-table>
@@ -158,6 +161,8 @@ import editDrawer from "./components/editDrawer";
 import AdvancedSearch from './components/advancedSearch'
 import ImportZip from '@/components/hzwlComponents/importZip'
 import ExportDialog from '@/components/hzwlComponents/exportDialog'
+import store from "@/store";
+
 export default {
   name: "meeting",
   components: {
@@ -194,6 +199,21 @@ export default {
     this.getData()
   },
   methods: {
+    isPermission (value) {
+      let hasCount = 0
+      let set =new Set( value.split(","))
+      let menuList = store.getters.getMenuList
+      if (menuList === '') {
+        return hasCount
+      } else {
+        menuList.map((menu) => {
+          if ( set.has(menu.id)|| value === undefined || value === '') {
+            hasCount++
+          }
+        })
+      }
+      return hasCount
+    },
     async getData () {
       this.searchForm.pageSize = this.searchForm.pageSize || this.$store.getters.userInfo.configContent
       this.searchForm.page = this.searchForm.page || 1

src/pages/policyRegulation/policy/components/editDrawer.vue

@@ -763,7 +763,6 @@ export default {
           {validator: this.verify.valiateEnName, trigger: 'change'}
         ],
         lawsNo: [
-          {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'},
           {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'}
         ],
         issueTime: [
@@ -812,7 +811,6 @@ export default {
           {validator: this.verify.valiateEnName, trigger: 'change'}
         ],
         lawsNo: [
-          {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'},
           {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'}
         ],
         issueCompany: [
@@ -857,168 +855,7 @@ export default {
       orgData: [],
       isSubmit: false,
       sarType: 'FOREIGN_LAWS',
-      //#region
-      // defaultAddFormFieldRules: {
-      //   lawsType: [
-      //     {required: true, message: '政策分类不能为空', trigger: 'change'}
-      //   ],
-      //   lawsNumber: [
-      //     {required: true, type: 'string', message: '政策编号不能为空', trigger: 'change'},
-      //     {type: 'string', max: 100, message: '政策编号不能超过100个字符', trigger: 'change'}
-      //   ],
-      //   lawsName: [
-      //     {required: true, message: '中文名称不能为空', trigger: 'change'},
-      //     {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'},
-      //     {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
-      //   ],
-      //   lawsEnName: [
-      //     {required: false, message: '英文名称不能为空', trigger: 'change'},
-      //     {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'},
-      //     {validator: this.verify.valiateEnName, trigger: 'change'}
-      //   ],
-      //   lawsNo: [
-      //     {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'},
-      //     {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'}
-      //   ],
-      //   issueCompany: [
-      //     {required: true, type: 'string', message: '发文单位不能为空', trigger: 'change'},
-      //     {type: 'string', max: 100, message: '发文单位不能超过100个字符', trigger: 'change'}
-      //   ],
-      //   lawsTextState: [
-      //     {required: true, message: '文本状态不能为空', trigger: 'change'}
-      //   ],
-      //   isRelateAccess: [
-      //     {required: true, message: '是否纳入认证清单不能为空', trigger: 'change'}
-      //   ],
-      //   lawsYear: [
-      //     {required: true, message: '年度不能为空', trigger: 'change'}
-      //   ],
-      //   lawsNotisyncNum: [
-      //     {type: 'string', max: 500, message: '福田转发通知文号不能超过500个字符', trigger: 'change'}
-      //   ],
-      //   lawsRemark: [
-      //     {type: 'string', max: 500, message: '备注不能超过500个字符', trigger: 'change'}
-      //   ],
-      // },
-      //#endregion
       dynamicFormField: [],
-      // defaultAddFormField: {
-      //   regionShow: '亚洲',
-      //   region: '2T8PFTSYE7',
-      //   issueUnit: '', // 发布部门
-      //   assemClass: '',
-      //   id: '',
-      //   standType: 'INLAND', // 标准分类
-      //   country: 'CN',
-      //   standSort: '',
-      //   applyArctic: '',
-      //   standNumber: '',
-      //   standYear: '',
-      //   standName: '',
-      //   standEnName: '',
-      //   standStatus: '',
-      //   standCode: '',
-      //   standNature: '',
-      //   replaceStandNum: '',
-      //   replaceStandNumId: '',
-      //   // replaceStandNumCope: '',
-      //   replaceStandNumList: [],
-      //   replacedStandNum: '',
-      //   interStandNum: '',
-      //   adoptExtent: '',
-      //   emergyKind: '',
-      //   applyAuth: '',
-      //   issueTime: '',
-      //   putTime: '',
-      //   newcarPutTime: '',
-      //   productPutTime: '',
-      //   newproductPutTime: '',
-      //   draftingUnit: '',
-      //   draftUser: '',
-      //   standFile: '',
-      //   standModifyFile: '',
-      //   draftFile: '',
-      //   opinionFile: '',
-      //   sentScreenFile: '',
-      //   approvalFile: '',
-      //   relevanceFile: '',
-      //   standFileList: [],
-      //   standModifyFileList: [],
-      //   draftFileList: [],
-      //   wtoPublicFileList: [],
-      //   finalizeFileList: [],
-      //   opinionFileList: [],
-      //   sentScreenFileList: [],
-      //   approvalFileList: [],
-      //   relevanceFileList: [],
-      //   firstDraftFileList: [],
-      //   lawsExplainFileList: [],
-      //   tags: '',
-      //   synopsis: '',
-      //   responsibleUnit: '',
-      //   category: '',
-      //   remark: '',
-      //   menuId: '',
-      //   upReplaceNumFlag: 0, // 记录是否修改了代替政策编号
-      //   upNumFlag: 0,
-      //   orgName: '', // 部门名称
-      //   registerPutTime: '', // 注册登记车实施日期
-      //   standExpirationTime: '', // 标准失效日期
-      //   issueTextTime: '', //  标准发布文本获得时间（印刷版）
-      //   revisionProjectNo: '', // 标准修订立项号
-      //   recieveConfirmResult: '', // 已收到以下部门适法性确认结果
-      //   trialFirstCar: '', // 试验首款车
-      //   domainAssume: '', // 领域担当
-      //   budgetBenchmark: '', // 预算基准
-      //   planCompletionTime: '', // 制修订计划完成时间
-      //   enterNextStageTime: '', // 预测进入下制修订阶段时间
-      //   firstDraftFile: '', // 初稿
-      //   standAttribute: '', // 法规种类
-      //   isCertiStand: '', // 是否为认证标准
-      //   isNoticeApply: '', //  是否公告适用
-      //   isNationRing: '',
-      //   isNorthRing: '', //  是否北环适用
-      //   isCccApply: '', //  是否CCC适用
-      //   isEnergyStand: '', // 是否为新能源专向标准
-      //   issueTimeCm: '', // 发布日期是否明确
-      //   newcarPutTimeCm: '', // 新车型实施日期 是否明确
-      //   productPutTimeCm: '', // 在产车实施日期 是否明确
-      //   isQuestion: '', // 是否结题
-      //   draftState: '', // 参与起草情况
-      //   reviseBasis: '', // 修订依据
-      //   unProjectTime: '', // 未立项—获稿时间
-      //   projectTime: '', // 立项—获稿时间
-      //   estimatedNextTime: '', // 预计进入下一阶段时间
-      //   finalizeTime: '', // 结题时间
-      //   wtoPublicFile: '',
-      //   finalizeFile: '', // 结题附件
-      //   noticeCertPutTime: '',
-      //   cccCertPutTime: '',
-      //   nationCertPutTime: '',
-      //   northCertPutTime: '',
-      //   noticeProductPutTime: '',
-      //   cccProductPutTime: '',
-      //   nationProductPutTime: '',
-      //   northProductPutTime: '',
-      //   lawsExplainText: '',
-      //   lawsExplainKeyword: '',
-      //   lawsExplainFile: '',
-      //   lawsExplainQuote: '',
-      //   testItems: '',
-      //   lawsExplainQuoteList: [],
-      //   testItemsList: [],
-      //   firstDraftFileTime: '',
-      //   firstDraftFileFeedback: '',
-      //   wtoPublicFileTime: '',
-      //   wtoPublicFileFeedback: '',
-      //   opinionFileTime: '',
-      //   opinionFileFeedback: '',
-      //   sentScreenFileTime: '',
-      //   sentScreenFileFeedback: '',
-      //   approvalFileTime: '',
-      //   approvalFileFeedback: '',
-      //   certPutTimeList: []
-      // }, // 标准新增过程中用到的对象
       choiceTitle: '', // 人员选择
       modalShowRoleFlag: false,
       nodeList: [],

src/pages/policyRegulation/policy/components/mainTable.vue

@@ -116,104 +116,19 @@
           </span>
         </template>
       </el-table-column>
-      <!--#region-->
+      <el-table-column
-      <!--<el-table-column-->
+          v-if="isPermission('1a8b50a3541387dc2818fc361ea3ab31,dca69b895a88c2e3a3bf16d44e34fc04,b98579c3d0514ba75c4d1b21c9d5aa17,c158e787202d1e67f75d5a2f9da889df') > 0"
-      <!--    show-overflow-tooltip-->
+          prop="action"
-      <!--    label="政策编号"-->
+          label="操作"
-      <!--    width="150"-->
+          align="center"
-      <!--&gt;-->
+          min-width="120"
-      <!--  <template slot-scope="scope">-->
+      >
-      <!--    &lt;!&ndash;                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>&ndash;&gt;-->
-      <!--    <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber }}</a>-->
-      <!--    <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber }}</a>-->
-      <!--    <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsNumber }}</a>-->
-      <!--  </template>-->
-      <!--</el-table-column>-->
-      <!--<el-table-column-->
-      <!--    show-overflow-tooltip-->
-      <!--    prop="lawsEnName"-->
-      <!--    label="英文名称"-->
-      <!--    min-width="300"-->
-      <!--&gt;-->
-      <!--  <template slot-scope="scope">-->
-      <!--    <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsEnName }}</a>-->
-      <!--    <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsEnName }}</a>-->
-      <!--    <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.lawsEnName }}</a>-->
-      <!--  </template>-->
-      <!--</el-table-column>-->
-      <!--<el-table-column-->
-      <!--    prop="XCXSSRQLAWS"-->
-      <!--    label="新车实施日期"-->
-      <!--    sortable-->
-      <!--    width="150"-->
-      <!--&gt;-->
-      <!--  <template slot-scope="scope">-->
-      <!--    <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" :title="arr(scope.row.XCXSSRQLAWS)">{{ arr(scope.row.XCXSSRQLAWS) || ''}}</span>-->
-      <!--    <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" :title="arr(scope.row.XCXSSRQLAWS)">{{arr(scope.row.XCXSSRQLAWS) || ''}}</span>-->
-      <!--    <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" :title="arr(scope.row.XCXSSRQLAWS)">{{arr(scope.row.XCXSSRQLAWS) || ''}}</span>-->
-      <!--  </template>-->
-      <!--</el-table-column>-->
-      <!--#endregion-->
-      <el-table-column fixed="right"
-                       v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbo,fd83032ae5f41a0021b00e93c88edbbr,fd83032ae5f41a0021b00e93c88edbbk')>0"
-                       label="操作" align="center" width="100">
         <template slot-scope="scope">
-
+          <a class="table-jump" v-btn-permission="'1a8b50a3541387dc2818fc361ea3ab31'" v-if="scope.row.collectBtn" style="color: #2d8cf0" @click="handleCommand([scope.row, '收藏'])">收藏</a>
-          <div  v-if="isPermission('fd83032ae5f41a0021b00e93c88edbbo,fd83032ae5f41a0021b00e93c88edbbr,fd83032ae5f41a0021b00e93c88edbbk') == 1"
+          <a class="table-jump" v-btn-permission="'dca69b895a88c2e3a3bf16d44e34fc04'" v-else style="color: #2d8cf0" @click="handleCommand([scope.row, '取消收藏'])">取消收藏</a>
-                @command="handleCommand"
+          <a class="table-jump" v-btn-permission="'b98579c3d0514ba75c4d1b21c9d5aa17'" style="color: #2d8cf0;margin-left: 10px" @click="handleCommand([scope.row, '编辑'])">编辑</a>
-          >
+          <a class="table-jump" v-btn-permission="'c158e787202d1e67f75d5a2f9da889df'" style="color: #f56c6c;margin-left: 10px" @click="handleCommand([scope.row, '删除'])">删除</a>
-            <el-button type="text" v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbo'"
-                       v-if="scope.row.collectBtn"
-                       @click="handleCommand([scope.row, '收藏'])"
-            >收藏
-            </el-button>
-            <el-button type="text" v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbo'"
-                       v-else
-                       @click="handleCommand([scope.row, '取消收藏'])"
-            >取消收藏
-            </el-button>
-            <el-button type="text" @click="handleCommand([scope.row, '编辑'])"
-                       v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbr'">编辑
-            </el-button>
-            <el-button type="text" @click="handleCommand([scope.row, '删除']) "
-                       v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbk'">删除
-            </el-button>
-          </div>
-
-          <div v-else>
-
-            <div @click.stop style="display: inline-block">
-              <el-dropdown trigger="click" @command="handleCommand">
-                <i class="iconfont">&#xe61e;</i>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item
-                      v-if="scope.row.collectBtn"
-                      :command="[scope.row, '收藏']"
-                      v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbo'"
-                  >
-                    收藏
-                  </el-dropdown-item>
-                  <el-dropdown-item
-                      v-else
-                      :command="[scope.row, '取消收藏']"
-                      v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbo'"
-                  >
-                    取消收藏
-                  </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbr'">
-                    编辑
-                  </el-dropdown-item>
-                  <!--                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>-->
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbk'">
-                    删除
-                  </el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-            </div>
-
-          </div>
         </template>
-
       </el-table-column>
     </el-table>
     <pagination :page="lawsStandInfoSearch.page" :total="total"
@@ -676,7 +591,8 @@ export default {
     },
     convert(value, dict) {
       if (this.dict[dict]) {
-        return this.dict[dict].find(item => item.value === value)?.label || value
+        return value.split(',').map(v => this.dict[dict].find(item => item.value === v)?.label || v).join(',')
+        // return this.dict[dict].find(item => item.value === value)?.label || value
       } else {
         return value
       }

src/pages/policyRegulation/policy/components/policySearch.vue

@@ -46,18 +46,18 @@
                   type="primary"
                   size="mini"
                   class="common-button-primary"
-                  v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbl'"
+                  v-btn-permission="'776298201c756873ddc8000eb716e347'"
                   @click="getBussionStandTableBtn(lawsStandInfoSearch)">
                 查询
               </el-button>
               <el-button
                   size="mini"
                   class="common-button-default"
-                  v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbh'"
+                  v-btn-permission="'f0e6ba2b9736b77f9a271addf692b9c0'"
                   @click="clearAllSearch('lawsStandInfoSearch')">清空
               </el-button>
               <el-button size="mini" type="primary" class="common-button-primary"
-                  v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbi'" @click="selectMoreBtn">高级检索
+                  v-btn-permission="'2e08f0dcb187e214127f971419f91174'" @click="selectMoreBtn">高级检索
               </el-button>
             </el-form-item>
           </el-form>

src/pages/policyRegulation/policy/components/policyTable.vue

@@ -29,7 +29,7 @@
           round
           @click="exportStandard"
           title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
-          v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbj'"
+          v-btn-permission="'15e322e28629ee9e55283d12e3167e21'"
       ><i class="iconfont">&#xe6e9;</i>导出</el-button>
       <!--        <el-button-->
       <!--          class="common-button-default"-->
@@ -48,13 +48,13 @@
           class="common-button-default"
           round
           @click="configurationStandard"
-          v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbf'"
+          v-btn-permission="'1a6c9118cd677304924f81e02d58ac06'"
       ><i class="iconfont">&#xe669;</i>配置政策</el-button>
       <el-button
           class="common-button-default"
           round
           @click="deleteEnterStandFromKind(2)"
-          v-btn-permission="'fd83032ae5f41a0021b00e93c88edbbd'"
+          v-btn-permission="'0f54e3b982693ff122287b85785c9c37'"
       ><i class="iconfont">&#xe611;</i>移除政策</el-button>
     </div>
     <!--table-->

src/pages/policyRegulation/policyTopics/index.vue

@@ -91,11 +91,13 @@
           ref="selection"
           :data="data"
           tooltip-effect="dark"
-          style="width:100%;"
+          style="width:100%;height: calc(100% - 57px)"
+          height="string"
           border
           class="drag-table"
           @sort-change="sortChange"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px', padding: 0}"
+          :cell-style="{padding: 0}"
           @selection-change="selectionChange"
       >
         <el-table-column
@@ -132,13 +134,14 @@
         >
         </el-table-column>
         <el-table-column
+            v-if="isPermission('4930216cff743a9e8235bcc71ec54b34,0cfab6ab180c2d080a8ba9ef8b8449f8') > 0"
             prop="action"
             label="操作"
             align="center"
         >
           <template slot-scope="scope">
-            <a class="table-jump" style="color: #2d8cf0" @click="openDrawer('edit', scope.row)">编辑</a>
+            <a class="table-jump" v-btn-permission="'4930216cff743a9e8235bcc71ec54b34'" style="color: #2d8cf0" @click="openDrawer('edit', scope.row)">编辑</a>
-            <a class="table-jump" style="color: #f56c6c;margin-left: 10px" @click="onDelete(scope.row.id)">删除</a>
+            <a class="table-jump" v-btn-permission="'0cfab6ab180c2d080a8ba9ef8b8449f8'" style="color: #f56c6c;margin-left: 10px" @click="onDelete(scope.row.id)">删除</a>
           </template>
         </el-table-column>
       </el-table>
@@ -161,6 +164,7 @@ import AdvancedSearch from './components/advancedSearch'
 import editDrawer from "./components/editDrawer";
 import ImportZip from '@/components/hzwlComponents/importZip'
 import ExportDialog from '@/components/hzwlComponents/exportDialog'
+import store from "@/store";
 
 export default {
   name: "policyTopics",
@@ -209,6 +213,21 @@ export default {
     this.getData()
   },
   methods: {
+    isPermission (value) {
+      let hasCount = 0
+      let set =new Set( value.split(","))
+      let menuList = store.getters.getMenuList
+      if (menuList === '') {
+        return hasCount
+      } else {
+        menuList.map((menu) => {
+          if ( set.has(menu.id)|| value === undefined || value === '') {
+            hasCount++
+          }
+        })
+      }
+      return hasCount
+    },
     async getData () {
       this.searchForm.pageSize = this.searchForm.pageSize || this.$store.getters.userInfo.configContent
       this.searchForm.page = this.searchForm.page || 1

src/pages/policyRegulation/regulatoryMaterials/components/RegulatoryMaterialsMain.vue

@@ -95,11 +95,13 @@
           ref="tableRef"
           :data="data"
           tooltip-effect="dark"
-          style="width:100%;"
+          style="width:100%;height: calc(100% - 57px)"
+          height="string"
           border
           class="drag-table"
           @sort-change="sortChange"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px', padding: 0}"
+          :cell-style="{padding: 0}"
           @selection-change="selectionChange"
       >
         <el-table-column
@@ -140,6 +142,7 @@
         >
         </el-table-column>
         <el-table-column
+            v-if="isPermission('5ba6c5466021b86fc9d00b25fd46d5c6,ead39a6339efe11b1077982ff12fd3cd') > 0"
             prop="action"
             label="操作"
             align="center"
@@ -166,6 +169,7 @@
 import editDrawer from "./editDrawer";
 import ImportZip from '@/components/hzwlComponents/importZip'
 import ExportDialog from '@/components/hzwlComponents/exportDialog'
+import store from "@/store";
 
 export default {
   name: "RegulatoryMaterialsMain",
@@ -212,6 +216,21 @@ export default {
     }
   },
   methods: {
+    isPermission (value) {
+      let hasCount = 0
+      let set =new Set( value.split(","))
+      let menuList = store.getters.getMenuList
+      if (menuList === '') {
+        return hasCount
+      } else {
+        menuList.map((menu) => {
+          if ( set.has(menu.id)|| value === undefined || value === '') {
+            hasCount++
+          }
+        })
+      }
+      return hasCount
+    },
     userToId (userStr) {
       return (userStr && userStr !== '') ? userStr.split(',').map(item => item.split('(')[1].split(')')[0]) : []
     },

src/pages/processCenter/pages/creatProcess/policyWarehousing/step1.vue

@@ -158,7 +158,6 @@ export default {
         {validator: this.verify.valiateEnName, trigger: 'change'}
       ],
       lawsNo: [
-        {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'},
         {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'}
       ],
       issueTime: [
@@ -211,7 +210,6 @@ export default {
         {validator: this.verify.valiateEnName, trigger: 'change'}
       ],
       lawsNo: [
-        {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'},
         {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'}
       ],
       issueCompany: [