权限控制

jshERP-web/src/components/page/GlobalLayout.vue

@@ -92,6 +92,7 @@
   import { triggerWindowResizeEvent } from '@/utils/util'
   import { mapState, mapActions } from 'vuex'
   import { mixin, mixinDevice } from '@/utils/mixin.js'
+  import Vue from 'vue'
 
   export default {
     name: 'GlobalLayout',
@@ -157,6 +158,7 @@
         // update-begin-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常
         let storeKey = 'route:title:' + this.activeMenu.url
         this.$ls.set(storeKey, this.activeMenu.text)
+        Vue.ls.set('funId', this.activeMenu.id, 7 * 24 * 60 * 60 * 1000);
         // update-end-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常
       },
       findMenuBykey(menus,key){

jshERP-web/src/mixins/JeecgListMixin.js

@@ -51,7 +51,9 @@ export const JeecgListMixin = {
       /** 高级查询拼接方式 */
       superQueryMatchType: 'and',
       /** 是否加载时就执行 */
-      disableMixinCreated: false
+      disableMixinCreated: false,
+      /* 按钮权限 */
+      btnEnableList: '',
     }
   },
   created() {
@@ -60,6 +62,8 @@ export const JeecgListMixin = {
         this.loadData();
         //初始化字典配置 在自己页面定义
         this.initDictConfig();
+        //初始化按钮权限
+        this.initActiveBtnStr();
       }
   },
   methods:{
@@ -342,6 +346,21 @@ export const JeecgListMixin = {
       let url = getFileAccessHttpUrl(text)
       window.open(url);
     },
+    /* 按钮权限 */
+    initActiveBtnStr() {
+      let funId = Vue.ls.get('funId'); //功能id
+      let btnStrList = Vue.ls.get('winBtnStrList'); //按钮功能列表 JSON字符串
+      this.btnEnableList = ""; //按钮列表
+      if (funId && btnStrList) {
+        for (let i = 0; i < btnStrList.length; i++) {
+          if (btnStrList[i].funId == funId) {
+            if (btnStrList[i].btnStr) {
+              this.btnEnableList = btnStrList[i].btnStr;
+            }
+          }
+        }
+      }
+    }
   }
 
 }

jshERP-web/src/views/bill/AllocationOutList.vue

@@ -38,10 +38,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -63,10 +63,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '调拨出库')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>

jshERP-web/src/views/bill/AssembleList.vue

@@ -38,10 +38,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -63,10 +63,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '组装单')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>

jshERP-web/src/views/bill/DisassembleList.vue

@@ -38,10 +38,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -63,10 +63,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '拆卸单')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>

jshERP-web/src/views/bill/OtherInList.vue

@@ -38,10 +38,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -63,10 +63,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '其它入库')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>

jshERP-web/src/views/bill/OtherOutList.vue

@@ -38,10 +38,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -63,10 +63,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '其它出库')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>

jshERP-web/src/views/bill/PurchaseBackList.vue

@@ -38,10 +38,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -63,10 +63,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '采购退货出库')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>

jshERP-web/src/views/bill/PurchaseInList.vue

@@ -38,10 +38,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -63,10 +63,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '采购入库')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>

jshERP-web/src/views/bill/PurchaseOrderList.vue

@@ -38,12 +38,12 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-          <a-menu-item key="2" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
+          <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
-          <a-menu-item key="3" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
+          <a-menu-item key="3" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -65,10 +65,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '采购订单')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>
@@ -91,6 +91,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { BillListMixin } from './mixins/BillListMixin'
   import JDate from '@/components/jeecg/JDate'
+  import Vue from 'vue'
   export default {
     name: "PurchaseOrderList",
     mixins:[JeecgListMixin,BillListMixin],
@@ -166,6 +167,9 @@
         }
       }
     },
+    created() {
+      this.removeStatusColumn()
+    },
     computed: {
 
     },

jshERP-web/src/views/bill/RetailBackList.vue

@@ -38,10 +38,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -63,10 +63,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '零售退货入库')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>

jshERP-web/src/views/bill/RetailOutList.vue

@@ -38,10 +38,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -63,10 +63,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '零售出库')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>

jshERP-web/src/views/bill/SaleBackList.vue

@@ -38,10 +38,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -63,10 +63,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '销售退货入库')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>

jshERP-web/src/views/bill/SaleOrderList.vue

@@ -38,12 +38,12 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-          <a-menu-item key="2" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
+          <a-menu-item key="2" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(1)"><a-icon type="check"/>审核</a-menu-item>
-          <a-menu-item key="3" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
+          <a-menu-item key="3" v-if="btnEnableList.indexOf(2)>-1" @click="batchSetStatus(0)"><a-icon type="stop"/>反审核</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -65,10 +65,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '销售订单')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>
@@ -166,6 +166,9 @@
         }
       }
     },
+    created() {
+      this.removeStatusColumn()
+    },
     computed: {
 
     },

jshERP-web/src/views/bill/SaleOutList.vue

@@ -38,10 +38,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -63,10 +63,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '销售出库')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>

jshERP-web/src/views/bill/dialog/BillDetail.vue

@@ -11,6 +11,9 @@
       wrapClassName="ant-modal-cust-warp"
       style="top:5%;height: 100%;overflow-y: hidden">
       <template slot="footer">
+        <a-button key="print" type="primary" @click="handlePrint">
+          打印
+        </a-button>
         <a-button key="back" @click="handleCancel">
           取消
         </a-button>
@@ -1011,6 +1014,9 @@
       close() {
         this.$emit('close');
         this.visible = false;
+      },
+      handlePrint() {
+        window.print();
       }
     }
   }

jshERP-web/src/views/bill/mixins/BillListMixin.js

@@ -1,3 +1,5 @@
+import Vue from 'vue'
+
 export const BillListMixin = {
   computed: {
     importExcelUrl: function(){
@@ -44,6 +46,12 @@ export const BillListMixin = {
     },
     onDateOk(value) {
       console.log(value);
+    },
+    removeStatusColumn() {
+      //没有审核反审核权限的时候直接移除状态列
+      if(this.btnEnableList.indexOf(2)===-1) {
+        this.columns.splice(7,1)
+      }
     }
   }
 }

jshERP-web/src/views/financial/AdvanceInList.vue

@@ -33,10 +33,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -58,10 +58,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '收预付款')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>

jshERP-web/src/views/financial/GiroList.vue

@@ -33,10 +33,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -58,10 +58,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '转账')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>

jshERP-web/src/views/financial/ItemOutList.vue

@@ -33,10 +33,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -58,10 +58,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '支出')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>

jshERP-web/src/views/financial/MoneyInList.vue

@@ -33,10 +33,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -58,10 +58,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '收款')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>

jshERP-web/src/views/financial/MoneyOutList.vue

@@ -33,10 +33,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -58,10 +58,10 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="myHandleDetail(record, '付款')">查看</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="myHandleEdit(record)">编辑</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>

jshERP-web/src/views/material/MaterialCategoryList.vue

@@ -5,8 +5,8 @@
 
         <!-- 按钮操作区域 -->
         <a-row style="margin-left: 14px">
-          <a-button @click="handleAdd()" type="primary">添加类别</a-button>
+          <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd()" type="primary">添加类别</a-button>
-          <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
+          <a-button v-if="btnEnableList.indexOf(1)>-1" title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
           <a-button @click="refresh" type="default" icon="reload">刷新</a-button>
         </a-row>
         <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">

jshERP-web/src/views/material/MaterialList.vue

@@ -49,7 +49,7 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-popover title="表格模板">
           <template slot="content">
@@ -61,9 +61,9 @@
       <a-button type="primary" icon="download" @click="handleExportXls('商品信息')">导出</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-          <a-menu-item key="2" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
+          <a-menu-item key="2" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
-          <a-menu-item key="3" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
+          <a-menu-item key="3" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -86,8 +86,8 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>

jshERP-web/src/views/system/AccountList.vue

@@ -31,10 +31,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -55,13 +55,13 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
-          <a-popconfirm title="确定设为默认吗?" @confirm="() => handleSetDefault(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定设为默认吗?" @confirm="() => handleSetDefault(record.id)">
             <a>设为默认</a>
           </a-popconfirm>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
           <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>
@@ -145,6 +145,14 @@
             that.$message.warning(res.data.message);
           }
         });
+      },
+      handleEdit: function (record) {
+        this.$refs.modalForm.edit(record);
+        this.$refs.modalForm.title = "编辑";
+        this.$refs.modalForm.disableSubmit = false;
+        if(this.btnEnableList.indexOf(1)===-1) {
+          this.$refs.modalForm.isReadOnly = true
+        }
       }
     }
   }

jshERP-web/src/views/system/CustomerList.vue

@@ -31,8 +31,8 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+      <a-upload v-if="btnEnableList.indexOf(1)>-1" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-popover title="导入注意点">
           <template slot="content">
             <p>预收款、期初应收、期初应付、税率均为数值且要大于0；<br/>另外期初应收、期初应付不能同时输入</p>
@@ -43,9 +43,9 @@
       <a-button type="primary" icon="download" @click="handleExportXls('客户信息')">导出</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-          <a-menu-item key="2" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
+          <a-menu-item key="2" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
-          <a-menu-item key="3" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
+          <a-menu-item key="3" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -67,8 +67,8 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>
@@ -157,6 +157,14 @@
           type:'客户',
         }
         this.loadData(1);
+      },
+      handleEdit: function (record) {
+        this.$refs.modalForm.edit(record);
+        this.$refs.modalForm.title = "编辑";
+        this.$refs.modalForm.disableSubmit = false;
+        if(this.btnEnableList.indexOf(1)===-1) {
+          this.$refs.modalForm.isReadOnly = true
+        }
       }
     }
   }

jshERP-web/src/views/system/DepotList.vue

@@ -26,10 +26,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -50,13 +50,13 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
-          <a-popconfirm title="确定设为默认吗?" @confirm="() => handleSetDefault(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定设为默认吗?" @confirm="() => handleSetDefault(record.id)">
             <a>设为默认</a>
           </a-popconfirm>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
           <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>
@@ -142,6 +142,14 @@
             that.$message.warning(res.data.message);
           }
         });
+      },
+      handleEdit: function (record) {
+        this.$refs.modalForm.edit(record);
+        this.$refs.modalForm.title = "编辑";
+        this.$refs.modalForm.disableSubmit = false;
+        if(this.btnEnableList.indexOf(1)===-1) {
+          this.$refs.modalForm.isReadOnly = true
+        }
       }
     }
   }

jshERP-web/src/views/system/FunctionList.vue

@@ -21,10 +21,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -46,8 +46,8 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>
@@ -118,7 +118,14 @@
 
     },
     methods: {
-
+      handleEdit: function (record) {
+        this.$refs.modalForm.edit(record);
+        this.$refs.modalForm.title = "编辑";
+        this.$refs.modalForm.disableSubmit = false;
+        if(this.btnEnableList.indexOf(1)===-1) {
+          this.$refs.modalForm.isReadOnly = true
+        }
+      }
     }
   }
 </script>

jshERP-web/src/views/system/InOutItemList.vue

@@ -35,10 +35,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -60,8 +60,8 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>
@@ -125,7 +125,14 @@
 
     },
     methods: {
-
+      handleEdit: function (record) {
+        this.$refs.modalForm.edit(record);
+        this.$refs.modalForm.title = "编辑";
+        this.$refs.modalForm.disableSubmit = false;
+        if(this.btnEnableList.indexOf(1)===-1) {
+          this.$refs.modalForm.isReadOnly = true
+        }
+      }
     }
   }
 </script>

jshERP-web/src/views/system/MemberList.vue

@@ -31,8 +31,8 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+      <a-upload v-if="btnEnableList.indexOf(1)>-1" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-popover title="导入注意点">
           <template slot="content">
             <p>预收款、期初应收、期初应付、税率均为数值且要大于0；<br/>另外期初应收、期初应付不能同时输入</p>
@@ -43,9 +43,9 @@
       <a-button type="primary" icon="download" @click="handleExportXls('会员信息')">导出</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-          <a-menu-item key="2" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
+          <a-menu-item key="2" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
-          <a-menu-item key="3" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
+          <a-menu-item key="3" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -157,6 +157,14 @@
           type:'会员',
         }
         this.loadData(1);
+      },
+      handleEdit: function (record) {
+        this.$refs.modalForm.edit(record);
+        this.$refs.modalForm.title = "编辑";
+        this.$refs.modalForm.disableSubmit = false;
+        if(this.btnEnableList.indexOf(1)===-1) {
+          this.$refs.modalForm.isReadOnly = true
+        }
       }
     }
   }

jshERP-web/src/views/system/OrganizationList.vue

@@ -5,8 +5,8 @@
 
         <!-- 按钮操作区域 -->
         <a-row style="margin-left: 14px">
-          <a-button @click="handleAdd()" type="primary">添加机构</a-button>
+          <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd()" type="primary">添加机构</a-button>
-          <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
+          <a-button v-if="btnEnableList.indexOf(1)>-1" title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
           <a-button @click="refresh" type="default" icon="reload">刷新</a-button>
         </a-row>
         <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">

jshERP-web/src/views/system/PersonList.vue

@@ -31,10 +31,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -56,8 +56,8 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>
@@ -123,7 +123,14 @@
 
     },
     methods: {
-
+      handleEdit: function (record) {
+        this.$refs.modalForm.edit(record);
+        this.$refs.modalForm.title = "编辑";
+        this.$refs.modalForm.disableSubmit = false;
+        if(this.btnEnableList.indexOf(1)===-1) {
+          this.$refs.modalForm.isReadOnly = true
+        }
+      }
     }
   }
 </script>

jshERP-web/src/views/system/RoleList.vue

@@ -21,10 +21,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -45,13 +45,13 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
-          <a @click="handleSetFunction(record)">分配功能</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="handleSetFunction(record)">分配功能</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a @click="handleSetPushBtn(record.id)">分配按钮</a>
+          <a v-if="btnEnableList.indexOf(1)>-1" @click="handleSetPushBtn(record.id)">分配按钮</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
           <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>
@@ -157,6 +157,14 @@
           this.roleFunctionModalVisible = false;
           this.handleSetPushBtn(this.currentRoleId)
         }
+      },
+      handleEdit: function (record) {
+        this.$refs.modalForm.edit(record);
+        this.$refs.modalForm.title = "编辑";
+        this.$refs.modalForm.disableSubmit = false;
+        if(this.btnEnableList.indexOf(1)===-1) {
+          this.$refs.modalForm.isReadOnly = true
+        }
       }
     }
   }

jshERP-web/src/views/system/SerialNumberList.vue

@@ -26,11 +26,11 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button @click="handleBatchAdd" type="primary" icon="plus">批量新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleBatchAdd" type="primary" icon="plus">批量新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -52,8 +52,8 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>
@@ -142,6 +142,14 @@
       },
       simpleDateFormat(millisecond, format) {
         return formatDate(millisecond, format)
+      },
+      handleEdit: function (record) {
+        this.$refs.modalForm.edit(record);
+        this.$refs.modalForm.title = "编辑";
+        this.$refs.modalForm.disableSubmit = false;
+        if(this.btnEnableList.indexOf(1)===-1) {
+          this.$refs.modalForm.isReadOnly = true
+        }
       }
     }
   }

jshERP-web/src/views/system/SystemConfigList.vue

@@ -21,10 +21,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -46,8 +46,8 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>
@@ -124,6 +124,14 @@
         } else {
           this.handleAdd()
         }
+      },
+      handleEdit: function (record) {
+        this.$refs.modalForm.edit(record);
+        this.$refs.modalForm.title = "编辑";
+        this.$refs.modalForm.disableSubmit = false;
+        if(this.btnEnableList.indexOf(1)===-1) {
+          this.$refs.modalForm.isReadOnly = true
+        }
       }
     }
   }

jshERP-web/src/views/system/UnitList.vue

@@ -21,10 +21,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -46,8 +46,8 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>
@@ -107,7 +107,14 @@
 
     },
     methods: {
-
+      handleEdit: function (record) {
+        this.$refs.modalForm.edit(record);
+        this.$refs.modalForm.title = "编辑";
+        this.$refs.modalForm.disableSubmit = false;
+        if(this.btnEnableList.indexOf(1)===-1) {
+          this.$refs.modalForm.isReadOnly = true
+        }
+      }
     }
   }
 </script>

jshERP-web/src/views/system/UserList.vue

@@ -25,13 +25,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator" style="border-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
-          <a-menu-item key="1">
+          <a-menu-item key="1" v-if="btnEnableList.indexOf(1)>-1" ><a-icon type="delete" @click="batchDel"/>删除</a-menu-item>
-            <a-icon type="delete" @click="batchDel"/>
-            删除
-          </a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作
@@ -53,17 +50,17 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
-          <a v-if="depotFlag === '1'" @click="btnSetDepot(record)">分配仓库</a>
+          <a v-if="btnEnableList.indexOf(1)>-1 && depotFlag === '1' " @click="btnSetDepot(record)">分配仓库</a>
-          <a-divider v-if="depotFlag === '1'" type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1 && depotFlag === '1'" type="vertical" />
-          <a v-if="customerFlag === '1'" @click="btnSetCustomer(record)">分配客户</a>
+          <a v-if="btnEnableList.indexOf(1)>-1 && customerFlag === '1'" @click="btnSetCustomer(record)">分配客户</a>
-          <a-divider v-if="customerFlag === '1'" type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1 && customerFlag === '1'" type="vertical" />
           <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical"/>
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical"/>
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
-          <a-divider type="vertical"/>
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical"/>
-          <a-popconfirm title="确定重置密码为123456吗?" @confirm="() => handleReset(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定重置密码为123456吗?" @confirm="() => handleReset(record.id)">
             <a>重置密码</a>
           </a-popconfirm>
         </span>
@@ -156,6 +153,14 @@
         this.loadData(1);
         this.getSystemConfig();
       },
+      handleEdit: function (record) {
+        this.$refs.modalForm.edit(record);
+        this.$refs.modalForm.title = "编辑";
+        this.$refs.modalForm.disableSubmit = false;
+        if(this.btnEnableList.indexOf(1)===-1) {
+          this.$refs.modalForm.isReadOnly = true
+        }
+      },
       handleReset(id) {
         let that = this;
         postAction(that.url.resetPwd, {id: id}).then((res) => {

jshERP-web/src/views/system/VendorList.vue

@@ -31,8 +31,8 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator"  style="margin-top: 5px">
-      <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
+      <a-button v-if="btnEnableList.indexOf(1)>-1" type="primary" icon="plus" @click="handleAdd">新增</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+      <a-upload v-if="btnEnableList.indexOf(1)>-1" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-popover title="导入注意点">
           <template slot="content">
             <p>预收款、期初应收、期初应付、税率均为数值且要大于0；<br/>另外期初应收、期初应付不能同时输入</p>
@@ -43,9 +43,9 @@
       <a-button type="primary" icon="download" @click="handleExportXls('供应商信息')">导出</a-button>
       <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" v-if="btnEnableList.indexOf(1)>-1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-          <a-menu-item key="2" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
+          <a-menu-item key="2" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(true)"><a-icon type="check-square"/>启用</a-menu-item>
-          <a-menu-item key="3" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
+          <a-menu-item key="3" v-if="btnEnableList.indexOf(1)>-1" @click="batchSetStatus(false)"><a-icon type="close-square"/>禁用</a-menu-item>
         </a-menu>
         <a-button style="margin-left: 8px">
           批量操作 <a-icon type="down" />
@@ -67,8 +67,8 @@
         @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical" />
+          <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-popconfirm v-if="btnEnableList.indexOf(1)>-1" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
         </span>
@@ -157,6 +157,14 @@
           type:'供应商',
         }
         this.loadData(1);
+      },
+      handleEdit: function (record) {
+        this.$refs.modalForm.edit(record);
+        this.$refs.modalForm.title = "编辑";
+        this.$refs.modalForm.disableSubmit = false;
+        if(this.btnEnableList.indexOf(1)===-1) {
+          this.$refs.modalForm.isReadOnly = true
+        }
       }
     }
   }

jshERP-web/src/views/system/modules/AccountModal.vue

@@ -9,6 +9,11 @@
     cancelText="关闭"
     wrapClassName="ant-modal-cust-warp"
     style="top:15%;height: 80%;overflow-y: hidden">
+    <template slot="footer">
+      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
+        关闭
+      </a-button>
+    </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
@@ -40,6 +45,7 @@
         title:"操作",
         visible: false,
         model: {},
+        isReadOnly: false,
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },

jshERP-web/src/views/system/modules/CustomerModal.vue

@@ -9,6 +9,11 @@
     cancelText="关闭"
     wrapClassName="ant-modal-cust-warp"
     style="top:5%;height: 100%;overflow-y: hidden">
+    <template slot="footer">
+      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
+        关闭
+      </a-button>
+    </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-col :span="24/2">
@@ -105,6 +110,7 @@
         title:"操作",
         visible: false,
         model: {},
+        isReadOnly: false,
         labelCol: {
           xs: { span: 24 },
           sm: { span: 6 },

jshERP-web/src/views/system/modules/DepotModal.vue

@@ -9,6 +9,11 @@
     cancelText="关闭"
     wrapClassName="ant-modal-cust-warp"
     style="top:5%;height: 98%;overflow-y: hidden">
+    <template slot="footer">
+      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
+        关闭
+      </a-button>
+    </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓库名称">
@@ -51,6 +56,7 @@
         visible: false,
         model: {},
         userList: [],
+        isReadOnly: false,
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },

jshERP-web/src/views/system/modules/FunctionModal.vue

@@ -9,6 +9,11 @@
     cancelText="关闭"
     wrapClassName="ant-modal-cust-warp"
     style="top:10%;height: 100%;overflow-y: hidden">
+    <template slot="footer">
+      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
+        关闭
+      </a-button>
+    </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="编号">
@@ -54,6 +59,7 @@
         visible: false,
         model: {},
         enabledSwitch: true, //是否启用
+        isReadOnly: false,
         jselectMultiple: {
           options: [
             { text: '编辑', value: '1' },

jshERP-web/src/views/system/modules/InOutItemModal.vue

@@ -9,6 +9,11 @@
     cancelText="关闭"
     wrapClassName="ant-modal-cust-warp"
     style="top:25%;height: 60%;overflow-y: hidden">
+    <template slot="footer">
+      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
+        关闭
+      </a-button>
+    </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="名称">
@@ -37,6 +42,7 @@
         title:"操作",
         visible: false,
         model: {},
+        isReadOnly: false,
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },

jshERP-web/src/views/system/modules/MemberModal.vue

@@ -9,6 +9,11 @@
     cancelText="关闭"
     wrapClassName="ant-modal-cust-warp"
     style="top:5%;height: 100%;overflow-y: hidden">
+    <template slot="footer">
+      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
+        关闭
+      </a-button>
+    </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-col :span="24/2">
@@ -105,6 +110,7 @@
         title:"操作",
         visible: false,
         model: {},
+        isReadOnly: false,
         labelCol: {
           xs: { span: 24 },
           sm: { span: 6 },

jshERP-web/src/views/system/modules/PersonModal.vue

@@ -9,6 +9,11 @@
     cancelText="关闭"
     wrapClassName="ant-modal-cust-warp"
     style="top:25%;height: 50%;overflow-y: hidden">
+    <template slot="footer">
+      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
+        关闭
+      </a-button>
+    </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="姓名">
@@ -35,6 +40,7 @@
         title:"操作",
         visible: false,
         model: {},
+        isReadOnly: false,
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },

jshERP-web/src/views/system/modules/RoleModal.vue

@@ -9,6 +9,11 @@
     cancelText="关闭"
     wrapClassName="ant-modal-cust-warp"
     style="top:5%;height: 85%;overflow-y: hidden">
+    <template slot="footer">
+      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
+        关闭
+      </a-button>
+    </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="角色名称">
@@ -38,6 +43,7 @@
         title:"操作",
         visible: false,
         model: {},
+        isReadOnly: false,
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },

jshERP-web/src/views/system/modules/SerialNumberModal.vue

@@ -9,6 +9,11 @@
     cancelText="关闭"
     wrapClassName="ant-modal-cust-warp"
     style="top:15%;height: 70%;overflow-y: hidden">
+    <template slot="footer">
+      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
+        关闭
+      </a-button>
+    </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="序列号">
@@ -43,6 +48,7 @@
         title:"操作",
         visible: false,
         model: {},
+        isReadOnly: false,
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },

jshERP-web/src/views/system/modules/SystemConfigModal.vue

@@ -9,6 +9,11 @@
     cancelText="关闭"
     wrapClassName="ant-modal-cust-warp"
     style="top:5%;height: 100%;overflow-y: hidden">
+    <template slot="footer">
+      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
+        关闭
+      </a-button>
+    </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="公司名称">
@@ -58,6 +63,7 @@
         depotFlagSwitch: false, //仓库权限状态
         customerFlagSwitch: false, //客户权限状态
         minusStockFlagSwitch: false, //负库存状态
+        isReadOnly: false,
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },

jshERP-web/src/views/system/modules/UnitModal.vue

@@ -9,6 +9,11 @@
     cancelText="关闭"
     wrapClassName="ant-modal-cust-warp"
     style="top:20%;height: 70%;overflow-y: hidden">
+    <template slot="footer">
+      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
+        关闭
+      </a-button>
+    </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="基本单位">
@@ -38,6 +43,7 @@
         title:"操作",
         visible: false,
         model: {},
+        isReadOnly: false,
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },

jshERP-web/src/views/system/modules/UserModal.vue

@@ -9,6 +9,11 @@
     cancelText="关闭"
     wrapClassName="ant-modal-cust-warp"
     style="top:5%;height: 100%;overflow-y: hidden">
+    <template slot="footer">
+      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
+        关闭
+      </a-button>
+    </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-form-item label="登录名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -75,6 +80,7 @@
         orgaTree: [],
         roleList: [],
         userId:"", //保存用户id
+        isReadOnly: false,
         disableSubmit:false,
         dateFormat:"YYYY-MM-DD",
         validatorRules:{

jshERP-web/src/views/system/modules/VendorModal.vue

@@ -9,6 +9,11 @@
     cancelText="关闭"
     wrapClassName="ant-modal-cust-warp"
     style="top:5%;height: 100%;overflow-y: hidden">
+    <template slot="footer">
+      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
+        关闭
+      </a-button>
+    </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-col :span="24/2">
@@ -105,6 +110,7 @@
         title:"操作",
         visible: false,
         model: {},
+        isReadOnly: false,
         labelCol: {
           xs: { span: 24 },
           sm: { span: 6 },

jshERP-web/src/views/user/Login.vue

@@ -225,6 +225,7 @@
         if(res.code==200){
           let err = {};
           if(res.data.msgTip == 'user can login'){
+            Vue.ls.set('winBtnStrList', res.data.userBtn, 7 * 24 * 60 * 60 * 1000);
             this.loginSuccess()
           } else if(res.data.msgTip == 'user is not exist'){
             err.message = '用户不存在';