添加按钮权限、添加流程表单关闭提示。

.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=http://haoyi.scyp.ink/prod-api
-VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
-VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
+VUE_APP_API_BASE_URL=http://10.242.144.23/prod-api
+VUE_APP_CAS_BASE_URL=http://10.242.144.23:8888/cas
+VUE_APP_ONLINE_BASE_URL=http://10.242.144.23:8012/onlinePreview

src/css/ali.css

@@ -0,0 +1,76 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 3733417 */
+  /* Color fonts */
+  src:
+    url('font_3733417_ws9m9bvag1h.woff2') format('woff2'),
+    url('font_3733417_ws9m9bvag1h.woff2') format('woff'),
+    url('font_3733417_ws9m9bvag1h.woff2') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-shenglvehao:before {
+  content: "\e708";
+}
+
+.icon-lianxiren:before {
+  content: "\e66f";
+}
+
+.icon-lianxiren1:before {
+  content: "\e654";
+}
+
+.icon-daibanrenwu:before {
+  content: "\eb29";
+}
+
+.icon-rizhi:before {
+  content: "\e627";
+}
+
+.icon-B-lianxiren:before {
+  content: "\e728";
+}
+
+.icon-process:before {
+  content: "\e75d";
+}
+
+.icon-suggest:before {
+  content: "\e767";
+}
+
+.icon-lianxiren2:before {
+  content: "\e6c4";
+}
+
+.icon-lianxiren1-copy:before {
+  content: "\eb2a";
+}
+
+.icon-lianxiren-copy:before {
+  content: "\eb2b";
+}
+
+.icon-rizhi-copy:before {
+  content: "\eb2c";
+}
+
+.icon-process-copy:before {
+  content: "\eb2d";
+}
+
+.icon-process-copy1:before {
+  content: "\eb2e";
+}
+
+.icon-suggest-copy:before {
+  content: "\eb2f";
+}

src/views/activiti/applyHome.vue

@@ -33,19 +33,19 @@
       </div>
     <!--流程表单-->
     <a-modal
-      :destroyOnClose="true"
+      :destroyOnClose="false"
       :title="lcModa.title"
-      v-model="lcModa.visible"
+      :visible="lcModa.visible"
       switchFullscreen
       :footer="null"
       :maskClosable="false"
       :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
       width="80%"
-      height="93%"
+      @cancel="close"
     >
       <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent" :hieg = "lcModa.hieg"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew" :pictureId="lcModa.pictureId" :procInstId="lcModa.procInstId"
-                 @afterSubmit="afterSub" @close="lcModa.visible=false,lcModa.disabled = false">
+                 @afterSubmit="afterSub" @close="closeThis">
       </component>
     </a-modal>
   </a-card>
@@ -131,6 +131,21 @@
           }
         });
       },
+      closeThis(){
+        this.lcModa.visible=false
+        this.lcModa.disabled = false
+      },
+      close(){
+        this.$confirm({
+          title: "关闭",
+          content: `确定关闭当前页面？`,
+          centered: true,
+          onOk: () => {
+            this.lcModa.visible=false
+            this.lcModa.disabled = false
+          },
+        })
+      },
       filterDictText(dictOptions, text) {
         if (dictOptions instanceof Array) {
           for (let dictItem of dictOptions) {

src/views/activiti/applyList.vue

@@ -92,29 +92,29 @@
           </template>
           <template v-else-if="r.status == 1">
 
-            <a href="javascript:void(0);" v-if="r.procInstStatus == 1" @click="handelSubmitCancel(r)"  style="color:#8000ff;">撤回</a>
+            <a href="javascript:void(0);" v-if="r.procInstStatus == 1" @click="handelSubmitCancel(r)"  style="color:#8000ff;" v-has="'applyList:back'">撤回</a>
             <a-divider type="vertical" v-if="r.procInstStatus == 1"/>
-            <a href="javascript:void(0);" @click="history(r)" style="color:blue;">查看进度</a>
+            <a href="javascript:void(0);" @click="history(r)" style="color:blue;" v-has="'applyList:veiw'">查看进度</a>
             <a-divider type="vertical" />
-            <a href="javascript:void(0);" @click="detail(r)" style="color:#999;">表单数据</a>
+            <a href="javascript:void(0);" @click="detail(r)" style="color:#999;" v-has="'applyList:from'">表单数据</a>
           </template>
           <template v-else-if="(r.status == 2 && r.result == 3) || r.status == 3">
             <a-popconfirm title="确定提交申请吗?" @confirm="() => apply(r)">
               <a href="javascript:void(0);" style="color:#00A0E9;">重新申请</a>
             </a-popconfirm>
             <a-divider type="vertical" />
-            <a href="javascript:void(0);" @click="edit(r)" style="color:#000000;">编辑</a>
+            <a href="javascript:void(0);" @click="edit(r)" style="color:#000000;" v-has="'applyList:edit'">编辑</a>
             <a-divider type="vertical" />
-            <a href="javascript:void(0);" @click="history(r)" style="color:blue;">审批历史</a>
-             <a-divider type="vertical" />
+            <a href="javascript:void(0);" @click="history(r)" style="color:blue;" v-has="'applyList:history'">审批历史</a>
+             <a-divider type="vertical" v-has="'applyList:delete'"/>
             <a-popconfirm title="确定删除吗?" @confirm="() => removes(r)">
-              <a href="javascript:void(0);"  style="color: red">删除</a>
+              <a href="javascript:void(0);"  style="color: red" v-has="'applyList:delete\''">删除</a>
             </a-popconfirm>
           </template>
           <template v-else>
-            <a href="javascript:void(0);" @click="detail(r)" style="color:#999;">表单数据</a>
+            <a href="javascript:void(0);" @click="detail(r)" style="color:#999;" v-has="'applyList:from'">表单数据</a>
             <a-divider type="vertical" />
-            <a href="javascript:void(0);" @click="history(r)" style="color:blue;">审批历史</a>
+            <a href="javascript:void(0);" @click="history(r)" style="color:blue;" v-has="'applyList:history'">审批历史</a>
           </template>
       </span>
       <!-- 字符串超长截取省略号显示-->
@@ -144,7 +144,7 @@
                     <a-row>
                       <a-col span="12" :title="item.name">{{item.name}} </a-col>
                       <a-col span="12" style="text-align: right;">
-                        <a href="javascript:void (0)" @click="chooseProcess(item)">发起申请</a>
+                        <a href="javascript:void (0)" @click="chooseProcess(item)" v-has="'applyList:apply'">发起申请</a>
                       </a-col>
                     </a-row>
                   </div>
@@ -159,7 +159,7 @@
       </div>
     </a-drawer>
     <!--流程表单-->
-    <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" height="93%">
+    <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" >
       <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent" :hieg ="lcModa.hieg"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew" :procInstId="lcModa.procInstId" :pictureId="lcModa.pictureId"
                  @afterSubmit="afterSub" @loadData="reloadData" @close="lcModa.visible=false,lcModa.disabled = false"></component>

src/views/activiti/doneManage.vue

@@ -103,12 +103,12 @@
           </a-table-column>
           <a-table-column title="操作" dataIndex="action"   align="center">
             <template slot-scope="t,r,i">
-              <a href="javascript:void(0);" @click="detail(r)" >流程数据</a>
+              <a href="javascript:void(0);" @click="detail(r)" v-has="'doneManage:from'">流程数据</a>
               <!--<a-divider type="vertical" />
               <a href="javascript:void(0);" @click="history(r)" >审批历史</a>-->
-              <a-divider type="vertical" />
+              <a-divider type="vertical"  v-has="'doneManage:delete'"/>
               <a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">
-                <a style="color: red;">删除</a>
+                <a style="color: red;" v-has="'doneManage:delete'">删除</a>
               </a-popconfirm>
             </template>
           </a-table-column>
@@ -122,7 +122,7 @@
       </div>
     </a-modal>
     <!--流程表单-->
-    <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" height="93%">
+    <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" >
       <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew" :procInstId="lcModa.procInstId" :pictureId="lcModa.pictureId"
                  @close="lcModa.visible=false,lcModa.disabled = false"></component>

src/views/activiti/form/ProcessMaterialWarehousingForm.vue

@@ -874,6 +874,6 @@
 
 <style scoped>
   .div_process {
-    margin-top: 30px;
+    padding-top: 30px;
   }
 </style>

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -170,7 +170,6 @@
         </a-form-item>
       </div>
       <a-form-item v-if="isPlanType" :wrapperCol="{ span: 24 }" style="text-align: center">
-
         <a-button type="primary" @click="handleSubmit">保存</a-button>
         <a-button style="margin-left: 8px" type="primary" @click="saveAndpassTask">通过</a-button>
         <!--                <a-button type="primary"  @click="ewrold">下载</a-button>-->
@@ -434,7 +433,7 @@
               key: 'materialPrice',
               type: FormTypes.inputNumber,
               disabled: this.disabled,
-              width: '200px',
+              width: '130px',
               placeholder: '请输入${title}',
               defaultValue: ''
             },
@@ -465,7 +464,7 @@
               key: 'materialQuantity',
               type: FormTypes.inputNumber,
               disabled: this.disabled,
-              width: '200px',
+              width: '120px',
               placeholder: '请输入${title}',
               defaultValue: ''
             },
@@ -474,7 +473,7 @@
               key: 'materialAmount',
               type: FormTypes.inputNumber,
               disabled: true,
-              width: '200px',
+              width: '120px',
               placeholder: '请输入${title}',
               defaultValue: ''
             },
@@ -1569,7 +1568,6 @@
 
 <style scoped>
   .div_process {
-    margin-top: 30px;
-
+    padding-top: 30px;
   }
 </style>

src/views/activiti/processFinishManage.vue

@@ -116,10 +116,10 @@
             <template slot-scope="t,r,i"  >
               <!--<a href="javascript:void(0);" style="color: green;" @click="history(r)" >审批历史</a>
               <a-divider type="vertical" />-->
-              <a href="javascript:void(0);" style="color: blue;" @click="detail(r)" >流程数据</a>
-              <a-divider type="vertical" />
+              <a href="javascript:void(0);" style="color: blue;" @click="detail(r)" v-has="'processFinishManage:from'">流程数据</a>
+              <a-divider type="vertical" v-has="'processFinishManage:delete'"/>
               <a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">
-                <a style="color: red;">删除</a>
+                <a style="color: red;" v-has="'processFinishManage:delete'">删除</a>
               </a-popconfirm>
             </template>
           </a-table-column>
@@ -133,7 +133,7 @@
       </div>
     </a-modal>
     <!--流程表单-->
-    <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" height="93%">
+    <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" >
       <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew" :procInstId="lcModa.procInstId" :pictureId="lcModa.pictureId"
                  @close="lcModa.visible=false,lcModa.disabled = false"></component>

src/views/activiti/processInsManage.vue

@@ -98,12 +98,12 @@
               </template>-->
               <!--<a href="javascript:void(0);" style="color: blue;" @click="history(r)" >审批详情</a>
               <a-divider type="vertical" />-->
-              <a href="javascript:void(0);" style="color: #999;" @click="detail(r)" >流程数据</a>
-              <a-divider type="vertical" />
-              <a href="javascript:void(0);" style="color: #999;" @click="detailActionLog(r)" >操作记录</a>
+              <a href="javascript:void(0);" style="color: #999;" @click="detail(r)" v-has="'processInsManage:from'">流程数据</a>
               <a-divider type="vertical" />
+              <a href="javascript:void(0);" style="color: #999;" @click="detailActionLog(r)" v-has="'processInsManage:history'">操作记录</a>
+              <a-divider type="vertical" v-has="'processInsManage:delete'"/>
               <a-popconfirm title="确定删除吗?" @confirm="() => remove(r)">
-                <a style="color: red;">删除</a>
+                <a style="color: red;" v-has="'processInsManage:delete'">删除</a>
               </a-popconfirm>
             </template>
           </a-table-column>
@@ -135,7 +135,7 @@
       </div>
     </a-modal>
     <!--流程表单-->
-    <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" height="93%">
+    <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" >
       <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew"  :procInstId="lcModa.procInstId" :pictureId="lcModa.pictureId"
                  @close="lcModa.visible=false,lcModa.disabled = false"></component>

src/views/activiti/todoManage.vue

@@ -117,21 +117,21 @@
           <a-table-column title="操作" dataIndex="" align="center">
             <template slot-scope="t,r,i">
               <span v-if="!Boolean(r.isSuspended)">
-                <a href="javascript:void(0);" @click="detail(r)" style="color: blue">查看并处理</a>
+                <a href="javascript:void(0);" @click="detail(r)" style="color: blue" v-has="'todoManage:toDo'">查看并处理</a>
               </span>
 
               <span v-if="Boolean(r.isSuspended)" style="color: #999999;" title="流程已被挂起，无法操作！">
                 查看并处理
-                <a-divider type="vertical"/>
+                <a-divider type="vertical" v-has="'todoManage:toDoOther'"/>
                 委托他人代办
               </span>
               <span v-else>
-                <a-divider type="vertical"/>
+                <a-divider type="vertical" v-has="'todoManage:toDoOther'"/>
                 <!--<a href="javascript:void(0);" @click="passTask(r)" style="color: green">通过</a>
                 <a-divider type="vertical" />
                 <a href="javascript:void(0);" @click="backTask(r)" style="color: orange">驳回</a>
                 <a-divider type="vertical" />-->
-                <a href="javascript:void(0);" @click="delegateTask(r)" style="color: #00A0E9">委托他人代办</a>
+                <a href="javascript:void(0);" @click="delegateTask(r)" style="color: #00A0E9" v-has="'todoManage:toDoOther'">委托他人代办</a>
                 <!--<a-divider type="vertical" />-->
               </span>
               <!--<a href="javascript:void(0);" @click="history(r)" style="color: #217dbb">历史</a>-->
@@ -148,7 +148,7 @@
     </a-modal>
     <!--流程表单-->
     <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%"
-             height="93%">
+             >
       <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent"
                  :processData="lcModa.processData" :isNew="lcModa.isNew" :isPlanType="lcModa.isPlanType"
                  :isSourceCapital="lcModa.isSourceCapital"

src/views/dashboard/HomePage.vue

@@ -347,7 +347,7 @@ export default {
 
 </script>
 <style scoped>
-@import url("http://at.alicdn.com/t/c/font_3733417_ws9m9bvag1h.css");
+@import url("/src/css/ali.css");
 
 
 .bottom-card span {

src/views/description/ProcessDescriptionList.vue

@@ -42,19 +42,19 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('品名分类')">导出</a-button>
-      <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/品名分类导入模板_1667997006232_1668004136429.xlsx')">品名分类导入模板</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'description:add'">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('品名分类')" v-has="'description:export'">导出</a-button>
+      <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/品名分类导入模板_1667997006232_1668004136429.xlsx')" v-h="'merchandiseNews:import'">品名分类导入模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
+        <a-button type="primary" icon="import" v-has="'description:export'" v-h="'merchandiseNews:import'">导入</a-button>
       </a-upload>
       <!-- 高级查询区域 -->
 <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"  v-has="'merchandiseNews:delete'"/>删除</a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+        <a-button style="margin-left: 8px" v-has="'description:delete'" v-h="'merchandiseNews:delete'"> 批量操作 <a-icon type="down" /></a-button>
       </a-dropdown>
     </div>
 
@@ -99,11 +99,11 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleEdit(record)" v-has="'description:edit'" v-h="'merchandiseNews:edit'">编辑</a>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical" v-h="'merchandiseNews:delete'"/>
            <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
+                  <a v-h="'merchandiseNews:delete'">删除</a>
            </a-popconfirm>
 <!--          <a-dropdown>-->
 <!--            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->

src/views/materialstorage/ProcessMaterialStorageList.vue

@@ -48,19 +48,19 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('物资储存地址表')">导出</a-button>
-      <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/物资储存位置导入模板_1667998262940.xlsx')">物资储存地址导入模板</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'materialStorageList:add'">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('物资储存地址表')" v-has="'materialStorageList:export'">导出</a-button>
+      <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/物资储存位置导入模板_1667998262940.xlsx')" v-has="'materialStorageList:import'">物资储存地址导入模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
+        <a-button type="primary" icon="import" v-has="'materialStorageList:import'">导入</a-button>
       </a-upload>
       <!-- 高级查询区域 -->
 <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" v-has="'materialStorageList:dekete'"/>删除</a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+        <a-button style="margin-left: 8px" v-has="'materialStorageList:delete'"> 批量操作 <a-icon type="down" /></a-button>
       </a-dropdown>
     </div>
 
@@ -114,11 +114,11 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleEdit(record)" v-has="'materialStorageList:edit'">编辑</a>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical" v-has="'materialStorageList:delete'" />
            <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
+                  <a v-has="'materialStorageList:delete'">删除</a>
            </a-popconfirm>
 <!--          <a-dropdown>-->
 <!--            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->

src/views/merchandisenews/ProcessMerchandiseNewsList.vue

@@ -78,19 +78,19 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'merchandiseNews:add'">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('物资清单表')">导出</a-button>
-      <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/物资清单表12323123_1672369326884.xls')">物资清单表导入模板</a-button>
+      <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/物资清单表12323123_1672369326884.xls')" v-has="'merchandiseNews:import'">物资清单表导入模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
+        <a-button type="primary" icon="import" v-has="'merchandiseNews:import'">导入</a-button>
       </a-upload>
       <!-- 高级查询区域 -->
 <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" v-has="'merchandiseNews:delete'"/>删除</a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+        <a-button style="margin-left: 8px" v-has="'merchandiseNews:delete'"> 批量操作 <a-icon type="down" /></a-button>
       </a-dropdown>
     </div>
 
@@ -147,11 +147,11 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleEdit(record)" v-has="'merchandiseNews:edit'">编辑</a>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical" v-has="'merchandiseNews:delete'" />
              <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
+                  <a v-has="'merchandiseNews:delete'">删除</a>
              </a-popconfirm>
  <!--         <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>

src/views/supplier/ProcessSupplierList.vue

@@ -53,11 +53,11 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('供应商信息')">导出</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'regulate:add'">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('供应商信息')" v-has="'regulate:export'">导出</a-button>
       <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/供应商名称及编码_1668003417087.xlsx')">供应商导入模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
+        <a-button type="primary" icon="import" v-has="'regulate:import'">导入</a-button>
       </a-upload>
 <!--      <a-upload-->
 <!--        name="file"-->
@@ -77,9 +77,9 @@
 <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" v-has="'regulate:delete'"/>删除</a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+        <a-button style="margin-left: 8px" v-has="'regulate:delete'"> 批量操作 <a-icon type="down" /></a-button>
       </a-dropdown>
     </div>
 
@@ -124,7 +124,7 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleEdit(record)" v-has="'regulate:edit'">编辑</a>
 
           <a-divider type="vertical" />
            <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">

src/views/suppliesstronger/ProcessSuppliesStrongerList.vue

@@ -34,11 +34,11 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
 <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
-      <a-button type="primary" icon="download" @click="handleExportXls('物资总库')">导出</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('物资总库')" v-has="'suppliesstronger:export'">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
+        <a-button type="primary" icon="import" v-has="'suppliesstronger:import'">导入</a-button>
       </a-upload>
-      <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/总库导入模板_1669801840316.xlsx')">总库导入模板</a-button>
+      <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/总库导入模板_1669801840316.xlsx')" v-has="'suppliesstronger:import'">总库导入模板</a-button>
       <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
       <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
 <!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->

src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue

@@ -211,7 +211,7 @@
       </a-table>
     </div>
     <!--流程表单-->
-    <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" height="93%">
+    <a-modal :title="lcModa.title" v-model="lcModa.visible" :footer="null" :maskClosable="false" width="80%" >
       <component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent" :hieg ="lcModa.hieg"
                  :processData="lcModa.processData" :isNew = "lcModa.isNew" :procInstId="lcModa.procInstId" :pictureId="lcModa.pictureId"
                  @close="lcModa.visible=false,lcModa.disabled = false"></component>

src/views/system/UserList.vue

@@ -91,7 +91,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator" style="border-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus">添加用户</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'user:add'">添加用户</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('用户信息导入模板')">用户信息导入模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
@@ -171,7 +171,7 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleEdit(record)" v-has="'user:edit'">编辑</a>
 
           <a-divider type="vertical"/>
 

src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue

@@ -59,19 +59,19 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('单位、废旧库房编码')">导出</a-button>
-      <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/废旧物资存储库房编码模板_1668004947302.xlsx')">废旧库房导入模板</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'unitWaste:add'">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('单位、废旧库房编码')" v-has="'unitWaste:export'">导出</a-button>
+      <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/废旧物资存储库房编码模板_1668004947302.xlsx')" v-has="'unitWaste:import'">废旧库房导入模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
+        <a-button type="primary" icon="import" v-has="'unitWaste:import'">导入</a-button>
       </a-upload>
       <!-- 高级查询区域 -->
 <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" v-has="'unitWaste:delete'"/>删除</a-menu-item>
         </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+        <a-button style="margin-left: 8px" v-has="'unitWaste:delete'"> 批量操作 <a-icon type="down" /></a-button>
       </a-dropdown>
     </div>
 
@@ -116,11 +116,11 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleEdit(record)" v-has="'unitWaste:edit'">编辑</a>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical" v-has="'unitWaste:delete'"/>
            <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
+                  <a v-has="'unitWaste:delete'">删除</a>
            </a-popconfirm>
 
 <!--          <a-dropdown>-->

src/views/wastematerials/ProcessWasteMaterialsList.vue

@@ -39,11 +39,11 @@
 
       <!-- 操作按钮区域 -->
       <div class="table-operator">
-        <a-button type="primary" icon="download" @click="handleExportXls('账外物资库')">导出</a-button>
+        <a-button type="primary" icon="download" @click="handleExportXls('账外物资库')" v-has="'wastematerials:export'">导出</a-button>
         <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-          <a-button type="primary" icon="import">导入</a-button>
+          <a-button type="primary" icon="import" v-has="'wastematerials:import'">导入</a-button>
         </a-upload>
-        <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/账外导入模板_1672371645321.xlsx')">帐外导入模板</a-button>
+        <a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/账外导入模板_1672371645321.xlsx')" v-has="'wastematerials:import'">帐外导入模板</a-button>
         <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
         <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
 <!--        <a-dropdown v-if="selectedRowKeys.length > 0">-->