chenrui 4 years ago
parent
commit
e38742362e

+ 78 - 78
src/config/router.config.js

@@ -666,8 +666,8 @@ export const asyncRouterMap = [
         component: PageView,
         meta: {
           title: '库存管理',
-          icon: 'shop'
-          // permission: 'M_shop'
+          icon: 'shop',
+          permission: 'M_inventory'
         },
         children: [
           {
@@ -677,8 +677,8 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '库存查询',
-              icon: 'monitor'
-              // permission: 'M_goodsManage_list'
+              icon: 'monitor',
+              permission: 'M_inventory_inventoryQuery_list'
             },
             hideChildrenInMenu: true,
             children: [
@@ -689,8 +689,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '库存列表',
                   icon: 'monitor',
-                  hidden: true
-                  // permission: 'M_goodsManage_list'
+                  hidden: true,
+                  permission: 'M_inventory_inventoryQuery_list'
                 }
               },
               {
@@ -733,8 +733,8 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '仓库管理',
-              icon: 'deployment-unit'
-              // permission: 'M_goodsManage_list'
+              icon: 'deployment-unit',
+              permission: 'M_inventory_warehouse_list'
             },
             hideChildrenInMenu: true,
             children: [
@@ -745,8 +745,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '仓库列表',
                   icon: 'deployment-unit',
-                  hidden: true
-                  // permission: 'M_goodsManage_list'
+                  hidden: true,
+                  permission: 'M_inventory_warehouse_list'
                 }
               },
               {
@@ -756,8 +756,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '仓位列表',
                   icon: 'deployment-unit',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
+                  hidden: true,
+                  permission: 'M_inventory_warehouse_storingLocation_list'
                 }
               }
             ]
@@ -862,8 +862,8 @@ export const asyncRouterMap = [
         component: PageView,
         meta: {
           title: '客户管理',
-          icon: 'idcard'
-          // permission: 'M_shop'
+          icon: 'idcard',
+          permission: 'M_customer_customerInfo_list'
         },
         children: [
           {
@@ -873,8 +873,8 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '客户管理',
-              icon: 'idcard'
-              // permission: 'M_goodsManage_list'
+              icon: 'idcard',
+              permission: 'M_customer_customerInfo_list'
             },
             hideChildrenInMenu: true,
             children: [
@@ -885,8 +885,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '客户列表',
                   icon: 'idcard',
-                  hidden: true
-                  // permission: 'M_goodsManage_list'
+                  hidden: true,
+                  permission: 'M_customer_customerInfo_list'
                 }
               },
               {
@@ -896,8 +896,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '新增客户',
                   icon: 'idcard',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
+                  hidden: true,
+                  permission: 'B_customer_customerInfo_add'
                 }
               },
               {
@@ -907,8 +907,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '编辑客户',
                   icon: 'idcard',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
+                  hidden: true,
+                  permission: 'B_customer_customerInfo_edit'
                 }
               }
             ]
@@ -922,8 +922,8 @@ export const asyncRouterMap = [
         component: PageView,
         meta: {
           title: '产品管理',
-          icon: 'shopping'
-          // permission: 'M_shop'
+          icon: 'shopping',
+          permission: 'M_product'
         },
         children: [
           {
@@ -933,8 +933,8 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '产品信息管理(自建)',
-              icon: 'file-text'
-              // permission: 'M_goodsManage_list'
+              icon: 'file-text',
+              permission: 'M_product_dealerProduct_list'
             },
             hideChildrenInMenu: true,
             children: [
@@ -945,8 +945,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '产品信息列表',
                   icon: 'file-text',
-                  hidden: true
-                  // permission: 'M_goodsManage_list'
+                  hidden: true,
+                  permission: 'M_product_dealerProduct_list'
                 }
               },
               {
@@ -956,8 +956,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '新增产品',
                   icon: 'file-text',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
+                  hidden: true,
+                  permission: 'B_product_dealerProduct_add'
                 }
               },
               {
@@ -967,8 +967,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '编辑产品',
                   icon: 'file-text',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
+                  hidden: true,
+                  permission: 'B_product_dealerProduct_edit'
                 }
               }
             ]
@@ -980,8 +980,8 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '产品信息管理(箭冠)',
-              icon: 'file-text'
-              // permission: 'M_goodsManage_list'
+              icon: 'file-text',
+              permission: 'M_product_product_list'
             },
             hideChildrenInMenu: true,
             children: [
@@ -992,8 +992,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '产品信息列表',
                   icon: 'file-text',
-                  hidden: true
-                  // permission: 'M_goodsManage_list'
+                  hidden: true,
+                  permission: 'M_product_product_list'
                 }
               }
             ]
@@ -1005,8 +1005,8 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '产品品牌管理',
-              icon: 'sketch'
-              // permission: 'M_goodsManage_list'
+              icon: 'sketch',
+              permission: 'M_product_dealerProductBrand_list'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1017,8 +1017,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '产品品牌列表',
                   icon: 'sketch',
-                  hidden: true
-                  // permission: 'M_goodsManage_list'
+                  hidden: true,
+                  permission: 'M_product_dealerProductBrand_list'
                 }
               }
             ]
@@ -1030,8 +1030,8 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '产品分类管理',
-              icon: 'sliders'
-              // permission: 'M_goodsManage_list'
+              icon: 'sliders',
+              permission: 'M_product_dealerProductType_list'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1042,8 +1042,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '产品分类列表',
                   icon: 'sliders',
-                  hidden: true
-                  // permission: 'M_goodsManage_list'
+                  hidden: true,
+                  permission: 'M_product_dealerProductType_list'
                 }
               }
             ]
@@ -1057,8 +1057,8 @@ export const asyncRouterMap = [
         component: PageView,
         meta: {
           title: '供应商管理',
-          icon: 'team'
-          // permission: 'M_shop'
+          icon: 'team',
+          permission: 'M_supplier_supplierInfo_list'
         },
         children: [
           {
@@ -1068,8 +1068,8 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '供应商管理',
-              icon: 'team'
-              // permission: 'M_goodsManage_list'
+              icon: 'team',
+              permission: 'M_supplier_supplierInfo_list'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1080,8 +1080,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '供应商列表',
                   icon: 'team',
-                  hidden: true
-                  // permission: 'M_goodsManage_list'
+                  hidden: true,
+                  permission: 'M_supplier_supplierInfo_list'
                 }
               },
               {
@@ -1091,8 +1091,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '新增供应商',
                   icon: 'team',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
+                  hidden: true,
+                  permission: 'B_supplier_supplierInfo_add'
                 }
               },
               {
@@ -1102,8 +1102,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '编辑供应商',
                   icon: 'team',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
+                  hidden: true,
+                  permission: 'B_supplier_supplierInfo_edit'
                 }
               }
             ]
@@ -1572,8 +1572,8 @@ export const asyncRouterMap = [
         component: PageView,
         meta: {
           title: '基础设置',
-          icon: 'pushpin'
-          // permission: 'M_shop'
+          icon: 'pushpin',
+          permission: 'M_basicData'
         },
         children: [
           {
@@ -1583,8 +1583,8 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '店内调出类型管理',
-              icon: 'interaction'
-              // permission: 'M_goodsManage_list'
+              icon: 'interaction',
+              permission: 'M_basicData_storeTransferOutType_list'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1595,8 +1595,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '店内调出类型管理列表',
                   icon: 'interaction',
-                  hidden: true
-                  // permission: 'M_goodsManage_list'
+                  hidden: true,
+                  permission: 'M_basicData_storeTransferOutType_list'
                 }
               }
             ]
@@ -1608,8 +1608,8 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '散件入库类型管理',
-              icon: 'gold'
-              // permission: 'M_goodsManage_list'
+              icon: 'gold',
+              permission: 'M_basicData_bulkPartsType_list'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1620,8 +1620,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '散件入库类型列表',
                   icon: 'gold',
-                  hidden: true
-                  // permission: 'M_goodsManage_list'
+                  hidden: true,
+                  permission: 'M_basicData_bulkPartsType_list'
                 }
               }
             ]
@@ -1633,8 +1633,8 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '费用类型管理',
-              icon: 'pay-circle'
-              // permission: 'M_goodsManage_list'
+              icon: 'pay-circle',
+              permission: 'M_basicData_expenseType_list'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1645,8 +1645,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '费用类型列表',
                   icon: 'pay-circle',
-                  hidden: true
-                  // permission: 'M_goodsManage_list'
+                  hidden: true,
+                  permission: 'M_basicData_expenseType_list'
                 }
               }
             ]
@@ -1683,8 +1683,8 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '客户类型管理',
-              icon: 'idcard'
-              // permission: 'M_goodsManage_list'
+              icon: 'idcard',
+              permission: 'M_basicData_customerType_list'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1695,8 +1695,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '客户类型列表',
                   icon: 'idcard',
-                  hidden: true
-                  // permission: 'M_goodsManage_list'
+                  hidden: true,
+                  permission: 'M_basicData_customerType_list'
                 }
               }
             ]
@@ -1710,8 +1710,8 @@ export const asyncRouterMap = [
         component: PageView,
         meta: {
           title: '权限管理',
-          icon: 'lock'
-          // permission: 'M_auth_0'
+          icon: 'lock',
+          permission: 'M_powerMD_0'
         },
         children: [
           {
@@ -1720,8 +1720,8 @@ export const asyncRouterMap = [
             component: () => import(/* webpackChunkName: "auth" */ '@/views/power/user/userList.vue'),
             meta: {
               title: '用户管理',
-              icon: 'user'
-              // permission: 'M_auth_userList'
+              icon: 'user',
+              permission: 'M_powerMD_user_list'
             }
           },
           {
@@ -1730,8 +1730,8 @@ export const asyncRouterMap = [
             component: () => import(/* webpackChunkName: "auth" */ '@/views/power/role/roleList.vue'),
             meta: {
               title: '角色管理',
-              icon: 'solution'
-              // permission: 'M_auth_roleList'
+              icon: 'solution',
+              permission: 'M_powerMD_role_list'
             }
           }
         ]

+ 9 - 4
src/views/basicData/bulkPartsTypeManagement/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="bulkPartsTypeList-wrap">
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="bulkPartsTypeList-add" type="primary" @click="handleEdit()">新增散件类型</a-button>
+      <a-button v-if="$hasPermissions('B_basicData_bulkPartsType_add')" id="bulkPartsTypeList-add" type="primary" @click="handleEdit()">新增散件类型</a-button>
     </div>
     <!-- 列表 -->
     <s-table
@@ -16,9 +16,14 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" @click="handleEdit(record)" id="bulkPartsTypeList-edit-btn">编辑</a-button>
-        <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleDel(record)" id="bulkPartsTypeList-del-btn" style="margin: 0 0 0 8px;">删除</a-button>
+        <a-button v-if="$hasPermissions('B_basicData_bulkPartsType_edit')" size="small" type="link" @click="handleEdit(record)" id="bulkPartsTypeList-edit-btn">编辑</a-button>
+        <a-button
+          v-if="$hasPermissions('B_basicData_bulkPartsType_del')"
+          size="small"
+          type="link"
+          @click="handleDel(record)"
+          id="bulkPartsTypeList-del-btn"
+          style="margin: 0 0 0 8px;">删除</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑散件类型 -->

+ 3 - 4
src/views/basicData/customerTypeManagement/list.vue

@@ -18,7 +18,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="customerTypeList-add" type="primary" @click="handleEdit()">新增客户类型</a-button>
+      <a-button v-if="$hasPermissions('B_basicData_customerType_add')" id="customerTypeList-add" type="primary" @click="handleEdit()">新增客户类型</a-button>
     </div>
     <!-- 列表 -->
     <s-table
@@ -32,9 +32,8 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" @click="handleEdit(record)" id="customerTypeList-edit-btn">编辑</a-button>
-        <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleDel(record)" id="customerTypeList-del-btn">删除</a-button>
+        <a-button size="small" v-if="$hasPermissions('B_basicData_customerType_edit')" type="link" @click="handleEdit(record)" id="customerTypeList-edit-btn">编辑</a-button>
+        <a-button size="small" v-if="$hasPermissions('B_basicData_customerType_del')" type="link" @click="handleDel(record)" id="customerTypeList-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑客户类型 -->

+ 4 - 6
src/views/basicData/expenseType/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="expenseTypeList-wrap">
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="expenseTypeList-add" type="primary" @click="handleAdd()" style="margin-top: 18px;">新增一级类型</a-button>
+      <a-button v-if="$hasPermissions('B_basicData_expenseType_add')" id="expenseTypeList-add" type="primary" @click="handleAdd()" style="margin-top: 18px;">新增一级类型</a-button>
     </div>
     <!-- 列表 -->
     <s-table
@@ -18,25 +18,23 @@
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
         <a-button
-          v-if="record.typeLevel<3"
+          v-if="record.typeLevel<3 && $hasPermissions('B_basicData_expenseType_add')"
           type="link"
           size="small"
           icon="plus"
           class="btn-add-s"
           id="expenseType-addSubItem"
           @click="handleAdd(record)">新增子级</a-button>
-        <a-divider type="vertical" style="margin: 0;" />
         <a-button
-          v-if="record.pid != 0"
+          v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_edit')"
           type="link"
           size="small"
           icon="edit"
           class="btn-edit-s"
           id="expenseType-edit"
           @click="handleEdit(record)">编辑</a-button>
-        <a-divider type="vertical" style="margin: 0;" />
         <a-button
-          v-if="record.pid != 0"
+          v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_del')"
           type="link"
           size="small"
           icon="delete"

+ 3 - 4
src/views/basicData/storeTransferOutTypeManagement/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="storeTransferOutTypeList-wrap">
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="storeTransferOutTypeList-add" type="primary" @click="handleEdit()">新增店内调出类型</a-button>
+      <a-button v-if="$hasPermissions('B_basicData_storeTransferOutType_add')" id="storeTransferOutTypeList-add" type="primary" @click="handleEdit()">新增店内调出类型</a-button>
     </div>
     <!-- 列表 -->
     <s-table
@@ -16,9 +16,8 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" @click="handleEdit(record)" id="storeTransferOutTypeList-edit-btn">编辑</a-button>
-        <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleDel(record)" id="storeTransferOutTypeList-del-btn">删除</a-button>
+        <a-button v-if="$hasPermissions('B_basicData_storeTransferOutType_edit')" size="small" type="link" @click="handleEdit(record)" id="storeTransferOutTypeList-edit-btn">编辑</a-button>
+        <a-button v-if="$hasPermissions('B_basicData_storeTransferOutType_del')" size="small" type="link" @click="handleDel(record)" id="storeTransferOutTypeList-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑店内调出类型 -->

+ 1 - 1
src/views/customerManagement/customerInfo/edit.vue

@@ -23,7 +23,7 @@
           </a-col>
           <a-col :span="8">
             <a-form-model-item label="联系电话" prop="contactTel">
-              <a-input id="customerManagementEdit-contactTel" :maxLength="20" v-model="form.contactTel" placeholder="请输入联系电话(最多20个字符)" allowClear />
+              <a-input id="customerManagementEdit-contactTel" :maxLength="11" v-model="form.contactTel" placeholder="请输入联系电话(最多11个字符)" allowClear />
             </a-form-model-item>
           </a-col>
           <a-col :span="8">

+ 11 - 30
src/views/customerManagement/customerInfo/list.vue

@@ -18,16 +18,7 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="客户名称">
-              <a-select
-                id="customerManagementList-customerName"
-                placeholder="请选择"
-                allowClear
-                v-model="queryParam.customerName"
-                :showSearch="true"
-                option-filter-prop="children"
-                :filter-option="filterOption">
-                <a-select-option v-for="item in custAllList" :key="item.customerSn" :value="item.customerName">{{ item.customerName }}</a-select-option>
-              </a-select>
+              <a-input id="customerManagementList-customerName" v-model.trim="queryParam.customerName" allowClear placeholder="请输入客户名称"/>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -102,7 +93,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="customerManagementList-add" type="primary" @click="handleEdit()">新增客户</a-button>
+      <a-button v-if="$hasPermissions('B_customer_customerInfo_add')" id="customerManagementList-add" type="primary" @click="handleEdit()">新增客户</a-button>
       <!-- <a-button id="customerManagementList-merge" @click="handleMerge" style="margin: 0 0 0 15px;">客户合并</a-button> -->
     </div>
     <!-- 列表 -->
@@ -117,11 +108,14 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" @click="handleEdit(record)" id="customerManagementList-edit-btn">编辑</a-button>
-        <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleDetail(record)" id="customerManagementList-detail-btn">详情</a-button>
-        <a-divider type="vertical" v-if="record.satelliteFlag!=1" style="margin: 0;" />
-        <a-button size="small" type="link" v-if="record.satelliteFlag!=1" @click="handleDel(record)" id="customerManagementList-del-btn">删除</a-button>
+        <a-button size="small" v-if="$hasPermissions('B_customer_customerInfo_edit')" type="link" @click="handleEdit(record)" id="customerManagementList-edit-btn">编辑</a-button>
+        <a-button size="small" v-if="$hasPermissions('B_customer_customerInfo_detail')" type="link" @click="handleDetail(record)" id="customerManagementList-detail-btn">详情</a-button>
+        <a-button
+          size="small"
+          v-if="$hasPermissions('B_customer_customerInfo_del') && record.satelliteFlag!=1"
+          type="link"
+          @click="handleDel(record)"
+          id="customerManagementList-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 客户详情 -->
@@ -132,7 +126,7 @@
 <script>
 import moment from 'moment'
 import { getArea } from '@/api/data'
-import { custList, custDel, custAllList } from '@/api/customer'
+import { custList, custDel } from '@/api/customer'
 import { custTypeAllList } from '@/api/custType'
 import { STable, VSelect } from '@/components'
 import customerManagementDetailModal from './detailModal.vue'
@@ -196,7 +190,6 @@ export default {
       addrProvinceList: [], //  省下拉
       addrCityList: [], //  市下拉
       addrDistrictList: [], //  区下拉
-      custAllList: [], //  客户 下拉数据
       custTypeList: [], //  客户类型 下拉数据
       openModal: false, //  查看客户详情  弹框
       itemId: '' //  当前客户id
@@ -262,17 +255,6 @@ export default {
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
-    // 客户无分页列表数据
-    getCustAllList () {
-      const _this = this
-      custAllList().then(res => {
-        if (res.status == 200) {
-          _this.custAllList = res.data || []
-        } else {
-          _this.custAllList = []
-        }
-      })
-    },
     //  获取客户类型列表
     getCustTypeList () {
       const _this = this
@@ -330,7 +312,6 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.getArea('province')
-      vm.getCustAllList()
       vm.getCustTypeList()
     })
   }

+ 0 - 1
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -78,7 +78,6 @@
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
         <a-button size="small" type="link" @click="goDetail(record)" id="inventoryQueryList-detail-btn">库存详情</a-button>
-        <a-divider type="vertical" style="margin: 0;" />
         <a-button size="small" type="link" style="margin-left: 8px" @click="goWarehouseDetail(record)" id="inventoryQueryList-warehouseDetail-btn">出入库明细</a-button>
       </template>
     </s-table>

+ 4 - 6
src/views/inventoryManagement/warehouse/list.vue

@@ -18,7 +18,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="warehouseList-add" type="primary" @click="handleEdit()">新增仓库</a-button>
+      <a-button v-if="$hasPermissions('B_inventory_warehouse_add')" id="warehouseList-add" type="primary" @click="handleEdit()">新增仓库</a-button>
     </div>
     <!-- 列表 -->
     <s-table
@@ -31,11 +31,9 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" @click="goStoringLocation(record)" id="warehouseList-storingLocation-btn">仓位管理</a-button>
-        <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleEdit(record)" id="warehouseList-edit-btn">编辑</a-button>
-        <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleDel(record)" id="warehouseList-del-btn">删除</a-button>
+        <a-button size="small" v-if="$hasPermissions('M_inventory_warehouse_storingLocation')" type="link" @click="goStoringLocation(record)" id="warehouseList-storingLocation-btn">仓位管理</a-button>
+        <a-button size="small" v-if="$hasPermissions('B_inventory_warehouse_edit')" type="link" @click="handleEdit(record)" id="warehouseList-edit-btn">编辑</a-button>
+        <a-button size="small" v-if="$hasPermissions('B_inventory_warehouse_del')" type="link" @click="handleDel(record)" id="warehouseList-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑仓库 -->

+ 3 - 4
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -25,7 +25,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="storingLocationList-add" type="primary" @click="handleEdit()">新增仓位</a-button>
+        <a-button v-if="$hasPermissions('B_inventory_warehouse_storingLocation_add')" id="storingLocationList-add" type="primary" @click="handleEdit()">新增仓位</a-button>
       </div>
       <strong style="display: block;margin: 30px 0 20px;">所属仓库:{{ $route.query.name }}</strong>
       <!-- 列表 -->
@@ -39,9 +39,8 @@
         bordered>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button size="small" type="link" @click="handleEdit(record)" id="storingLocationList-edit-btn">编辑</a-button>
-          <a-divider type="vertical" style="margin: 0;" />
-          <a-button size="small" type="link" @click="handleDel(record)" id="storingLocationList-del-btn">删除</a-button>
+          <a-button size="small" v-if="$hasPermissions('B_inventory_warehouse_storingLocation_edit')" type="link" @click="handleEdit(record)" id="storingLocationList-edit-btn">编辑</a-button>
+          <a-button size="small" v-if="$hasPermissions('B_inventory_warehouse_storingLocation_del')" type="link" @click="handleDel(record)" id="storingLocationList-del-btn">删除</a-button>
         </template>
       </s-table>
     </a-card>

+ 12 - 5
src/views/power/role/roleList.vue

@@ -29,7 +29,7 @@
     </div>
     <a-divider />
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal" id="roleList-openModal">新增</a-button>
+      <a-button v-if="$hasPermissions('B_powerMD_role_add')" type="primary" icon="plus" @click="openModal" id="roleList-openModal">新增</a-button>
     </div>
 
     <s-table
@@ -42,7 +42,14 @@
       bordered>
       <!-- 启用禁用 -->
       <span slot="status" slot-scope="text, record">
-        <a-switch checkedChildren="启用" unCheckedChildren="禁用" id="roleList-isEnable" v-model="record.isEnable" @change="changeFlagHandle(text, record)" />
+        <a-switch
+          v-if="$hasPermissions('B_powerMD_role_enable')"
+          checkedChildren="启用"
+          unCheckedChildren="禁用"
+          id="roleList-isEnable"
+          v-model="record.isEnable"
+          @change="changeFlagHandle(text, record)" />
+        <span v-else>{{ record.isEnable==1?'已启用':'已禁用' }}</span>
       </span>
       <!-- 角色描述 -->
       <template slot="remarks" slot-scope="text, record">
@@ -50,13 +57,13 @@
       </template>
       <!-- 操作 -->
       <span slot="action" slot-scope="text, record">
-        <a-icon type="setting" title="菜单权限" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="openMenuModal(record)" />
-        <a-icon type="edit" title="编辑" :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}" @click="handleEdit(record)" />
+        <a-icon v-if="$hasPermissions('M_powerMD_role_menu')" type="setting" title="菜单权限" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="openMenuModal(record)" />
+        <a-icon v-if="$hasPermissions('B_powerMD_role_edit')" type="edit" title="编辑" :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}" @click="handleEdit(record)" />
         <a-icon
           type="delete"
           title="删除"
           :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}"
-          v-if="!record.isEnable"
+          v-if="!record.isEnable && $hasPermissions('B_powerMD_role_del')"
           @click="delect(record)" />
       </span>
     </s-table>

+ 6 - 4
src/views/power/user/userList.vue

@@ -28,7 +28,7 @@
     </div>
     <a-divider/>
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal">新增</a-button>
+      <a-button v-if="$hasPermissions('B_powerMD_user_add')" type="primary" icon="plus" @click="openModal">新增</a-button>
     </div>
     <s-table
       ref="table"
@@ -40,26 +40,28 @@
       bordered
     >
       <span slot="status" slot-scope="text, record">
-        <a-switch checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
+        <a-switch v-if="$hasPermissions('B_powerMD_user_enable')" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
+        <span v-else>{{ record.loginFlag==1?'已启用':'已禁用' }}</span>
       </span>
       <span slot="action" slot-scope="text, record">
         <a-icon
           type="edit"
           title="编辑"
           :style="{fontSize: '20px',color:' #1890FF',padding:' 0 10px'}"
+          v-if="$hasPermissions('B_powerMD_user_edit')"
           @click="handleEdit(record)"
         />
         <a-icon
           type="unlock"
           title="重置密码"
-          v-if="record.loginFlag==1"
+          v-if="record.loginFlag==1 && $hasPermissions('B_powerMD_user_restPwd')"
           :style="{fontSize: '20px',color:' #ffaa00',padding: '0 10px'}"
           @click="resetPassword(record)" />
         <a-icon
           type="delete"
           title="删除"
           :style="{fontSize: '20px',color: '#f00',padding: '0 10px'}"
-          v-if="record.loginFlag==0"
+          v-if="record.loginFlag==0 && $hasPermissions('B_powerMD_user_del')"
           @click="delect(record)"/>
       </span>
     </s-table>

+ 4 - 3
src/views/productManagement/productBrand/list.vue

@@ -23,7 +23,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="productBrandList-add" type="primary" @click="handleEdit()">新增品牌</a-button>
+      <a-button v-if="$hasPermissions('B_product_dealerProductBrand_add')" id="productBrandList-add" type="primary" @click="handleEdit()">新增品牌</a-button>
       <!-- <a-button id="productBrandList-import" @click="handleImport">导入品牌</a-button> -->
     </div>
     <!-- 列表 -->
@@ -41,13 +41,14 @@
           id="productBrandList-enable"
           checkedChildren="启用"
           unCheckedChildren="禁用"
+          v-if="$hasPermissions('B_product_dealerProductBrand_enable')"
           @change="changeStatus(record)"
           :checked="record.enabledFlag == 1 ? true : false" />
-        <!-- <span :class="record.enabledFlag==1?'green':'red'" v-else> {{ record.enabledFlag==1? '已启用': '已禁用' }} </span> -->
+        <span v-else> {{ record.enabledFlag==1? '已启用': '已禁用' }} </span>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" @click="handleEdit(record)" id="productBrandList-edit-btn">编辑</a-button>
+        <a-button size="small" v-if="$hasPermissions('B_product_dealerProductBrand_edit')" type="link" @click="handleEdit(record)" id="productBrandList-edit-btn">编辑</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑产品品牌 -->

+ 4 - 4
src/views/productManagement/productCategory/list.vue

@@ -2,7 +2,7 @@
   <a-card size="small" :bordered="false" class="productCategoryList-wrap">
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="productCategoryList-add" type="primary" @click="handleAdd()" style="margin-top: 18px;">新增一级分类</a-button>
+      <a-button v-if="$hasPermissions('B_product_dealerProductType_add')" id="productCategoryList-add" type="primary" @click="handleAdd()" style="margin-top: 18px;">新增一级分类</a-button>
     </div>
     <!-- 列表 -->
     <s-table
@@ -18,7 +18,7 @@
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
         <a-button
-          v-if="record.productTypeLevel<3"
+          v-if="record.productTypeLevel<3 && $hasPermissions('B_product_dealerProductType_add')"
           type="link"
           size="small"
           icon="plus"
@@ -26,7 +26,7 @@
           id="productCategory-addSubItem"
           @click="handleAdd(record)">新增子级</a-button>
         <a-button
-          v-if="record.pid != 0"
+          v-if="record.pid != 0 && $hasPermissions('B_product_dealerProductType_edit')"
           type="link"
           size="small"
           icon="edit"
@@ -34,7 +34,7 @@
           id="productCategory-edit"
           @click="handleEdit(record)">编辑</a-button>
         <a-button
-          v-if="record.pid != 0"
+          v-if="record.pid != 0 && $hasPermissions('B_product_dealerProductType_del')"
           type="link"
           size="small"
           icon="delete"

+ 13 - 18
src/views/productManagement/productInfo/edit.vue

@@ -18,36 +18,31 @@
         <a-form-model-item label="产品名称" prop="name">
           <a-input
             id="productInfoEdit-name"
-            :maxLength="30"
+            :maxLength="100"
             v-model="form.name"
-            placeholder="请输入产品名称(最多30个字符)"
+            placeholder="请输入产品名称(最多100个字符)"
             allowClear />
         </a-form-model-item>
         <a-form-model-item label="产品编码" prop="code">
           <a-input
             id="productInfoEdit-code"
-            :maxLength="30"
+            :maxLength="100"
             :disabled="!!$route.params.id"
             v-model="form.code"
-            placeholder="请输入产品编码(最多30个字符)"
+            placeholder="请输入产品编码(最多100个字符)"
             allowClear />
         </a-form-model-item>
         <a-form-model-item label="原厂编码" prop="origCode">
           <a-input
             id="productInfoEdit-origCode"
-            :maxLength="30"
+            :maxLength="200"
             :disabled="!!$route.params.id"
             v-model="form.origCode"
-            placeholder="请输入原厂编码(最多30个字符)"
+            placeholder="请输入原厂编码(最多200个字符,多个编码用逗号隔开)"
             allowClear />
         </a-form-model-item>
         <a-form-model-item label="基本单位" prop="unit">
-          <a-input
-            id="productInfoEdit-unit"
-            :maxLength="30"
-            v-model="form.unit"
-            placeholder="请输入基本单位(最多30个字符)"
-            allowClear />
+          <v-select code="UNIT" id="productInfoEdit-unit" v-model="form.unit" allowClear placeholder="请选择基本单位"></v-select>
         </a-form-model-item>
         <a-form-model-item label="产品品牌" prop="productBrandSn">
           <a-select
@@ -85,33 +80,33 @@
           <a-input-number
             id="productInfoEdit-specialPrice"
             v-model="form.specialPrice"
-            :min="0"
+            :min="1"
             :max="999999"
             :precision="2"
             style="width: 90%;margin-right: 5px;"
-            placeholder="请输入经销批发价(0~999999)"
+            placeholder="请输入经销批发价(1~999999)"
             allowClear /><span>元</span>
         </a-form-model-item>
         <a-form-model-item label="终端价" prop="terminalPrice">
           <a-input-number
             id="productInfoEdit-terminalPrice"
             v-model="form.terminalPrice"
-            :min="0"
+            :min="1"
             :max="999999"
             :precision="2"
             style="width: 90%;margin-right: 5px;"
-            placeholder="请输入终端价(0~999999)"
+            placeholder="请输入终端价(1~999999)"
             allowClear /><span>元</span>
         </a-form-model-item>
         <a-form-model-item label="车主价" prop="carOwnersPrice">
           <a-input-number
             id="productInfoEdit-carOwnersPrice"
             v-model="form.carOwnersPrice"
-            :min="0"
+            :min="1"
             :max="999999"
             :precision="2"
             style="width: 90%;margin-right: 5px;"
-            placeholder="请输入车主价(0~999999)"
+            placeholder="请输入车主价(1~999999)"
             allowClear /><span>元</span>
         </a-form-model-item>
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">

+ 5 - 5
src/views/productManagement/productInfo/list.vue

@@ -72,7 +72,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="productInfoList-add" type="primary" @click="handleEdit()">新增产品</a-button>
+      <a-button v-if="$hasPermissions('B_product_dealerProduct_add')" id="productInfoList-add" type="primary" @click="handleEdit()">新增产品</a-button>
       <!-- <a-button id="productInfoList-import" @click="handleImport" style="margin: 0 15px;">批量导入产品</a-button> -->
     </div>
     <!-- 列表 -->
@@ -96,15 +96,15 @@
           id="productInfoList-enable"
           checkedChildren="启用"
           unCheckedChildren="禁用"
+          v-if="$hasPermissions('B_product_dealerProduct_enable')"
           @change="changeStatus(record)"
           :checked="record.enabledFlag == 1 ? true : false" />
-        <!-- <span :class="record.enabledFlag==1?'green':'red'" v-else> {{ record.enabledFlag==1? '已启用': '已禁用' }} </span> -->
+        <span v-else> {{ record.enabledFlag==1? '已启用': '已禁用' }} </span>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" @click="handleEdit(record)" id="productInfoList-edit-btn">编辑</a-button>
-        <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleDetail(record)" id="productInfoList-detail-btn">详情</a-button>
+        <a-button size="small" v-if="$hasPermissions('B_product_dealerProduct_edit')" type="link" @click="handleEdit(record)" id="productInfoList-edit-btn">编辑</a-button>
+        <a-button v-if="$hasPermissions('B_product_dealerProduct_detail')" size="small" type="link" @click="handleDetail(record)" id="productInfoList-detail-btn">详情</a-button>
       </template>
     </s-table>
     <!-- 产品详情 -->

+ 3 - 7
src/views/supplierManagement/supplierInfo/list.vue

@@ -23,7 +23,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="supplierInfoList-add" type="primary" @click="handleEdit()">新增供应商</a-button>
+      <a-button v-if="$hasPermissions('B_supplier_supplierInfo_add')" id="supplierInfoList-add" type="primary" @click="handleEdit()">新增供应商</a-button>
     </div>
     <!-- 列表 -->
     <s-table
@@ -36,13 +36,9 @@
       :customRow="handleClickRow"
       :scroll="{ x: 1310 }"
       bordered>
-      <!-- 状态 -->
-      <template slot="enabledFlag" slot-scope="text, record">
-        <a-tag :color="record.enabledFlag==1?'green':'red'" >{{ record.enabledFlagDictValue }}</a-tag>
-      </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" @click="handleEdit(record)" id="supplierInfoList-edit-btn">编辑</a-button>
+        <a-button v-if="$hasPermissions('B_supplier_supplierInfo_edit')" size="small" type="link" @click="handleEdit(record)" id="supplierInfoList-edit-btn">编辑</a-button>
       </template>
     </s-table>
   </a-card>
@@ -68,7 +64,7 @@ export default {
         { title: '联系电话', dataIndex: 'contactTel', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '主营内容', dataIndex: 'businessScope', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', scopedSlots: { customRender: 'enabledFlag' }, width: 100, align: 'center' },
+        { title: '状态', dataIndex: 'enabledFlagDictValue', width: 100, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.16.103:8503/qpls-md',
+        target: 'http://192.168.16.217:8503/qpls-md',
         // target: 'http://it.test.zyucgj.com/zyit',
         // target: 'https://it.test.qiubcar.com/zyit',
         ws: false,