Przeglądaj źródła

Merge branch 'deploy' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy

chenrui 4 lat temu
rodzic
commit
9763ad029f

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

@@ -1111,134 +1111,134 @@ export const asyncRouterMap = [
         ]
       },
       // 散件管理
-      // {
-      //   path: '/bulkManagement',
-      //   redirect: '/bulkManagement/purchaseOrder',
-      //   component: PageView,
-      //   meta: {
-      //     title: '散件管理',
-      //     icon: 'gold'
-      //     // permission: 'M_shop'
-      //   },
-      //   children: [
-      //     {
-      //       path: '/bulkManagement/bulkWarehousingOrder',
-      //       redirect: '/bulkManagement/bulkWarehousingOrder/list',
-      //       name: 'bulkWarehousingOrder',
-      //       component: RouteView,
-      //       meta: {
-      //         title: '散件入库',
-      //         icon: 'gold'
-      //         // permission: 'M_goodsManage_list'
-      //       },
-      //       hideChildrenInMenu: true,
-      //       children: [
-      //         {
-      //           path: 'list',
-      //           name: 'bulkWarehousingOrderList',
-      //           component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/list.vue'),
-      //           meta: {
-      //             title: '散件入库单列表',
-      //             icon: 'gold',
-      //             hidden: true
-      //             // permission: 'M_goodsManage_list'
-      //           }
-      //         },
-      //         {
-      //           path: 'add',
-      //           name: 'bulkWarehousingOrderAdd',
-      //           component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/edit.vue'),
-      //           meta: {
-      //             title: '新增散件入库单',
-      //             icon: 'gold',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         },
-      //         {
-      //           path: 'edit/:id',
-      //           name: 'bulkWarehousingOrderEdit',
-      //           component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/edit.vue'),
-      //           meta: {
-      //             title: '编辑散件入库单',
-      //             icon: 'gold',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         },
-      //         {
-      //           path: 'detail/:id',
-      //           name: 'bulkWarehousingOrderDetail',
-      //           component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/detail.vue'),
-      //           meta: {
-      //             title: '散件入库单详情',
-      //             icon: 'gold',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         }
-      //       ]
-      //     },
-      //     {
-      //       path: '/bulkManagement/bulkReturnGoods',
-      //       redirect: '/bulkManagement/bulkReturnGoods/list',
-      //       name: 'bulkReturnGoods',
-      //       component: RouteView,
-      //       meta: {
-      //         title: '散件退货',
-      //         icon: 'frown'
-      //         // permission: 'M_goodsManage_list'
-      //       },
-      //       hideChildrenInMenu: true,
-      //       children: [
-      //         {
-      //           path: 'list',
-      //           name: 'bulkReturnGoodsList',
-      //           component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkReturnGoods/list.vue'),
-      //           meta: {
-      //             title: '散件退货列表',
-      //             icon: 'frown',
-      //             hidden: true
-      //             // permission: 'M_goodsManage_list'
-      //           }
-      //         },
-      //         {
-      //           path: 'add',
-      //           name: 'bulkReturnGoodsAdd',
-      //           component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkReturnGoods/edit.vue'),
-      //           meta: {
-      //             title: '新增散件退货单',
-      //             icon: 'frown',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         },
-      //         {
-      //           path: 'edit/:id',
-      //           name: 'bulkReturnGoodsEdit',
-      //           component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkReturnGoods/edit.vue'),
-      //           meta: {
-      //             title: '编辑散件退货单',
-      //             icon: 'frown',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         },
-      //         {
-      //           path: 'detail/:id',
-      //           name: 'bulkReturnGoodsDetail',
-      //           component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkReturnGoods/detail.vue'),
-      //           meta: {
-      //             title: '散件退货单详情',
-      //             icon: 'frown',
-      //             hidden: true
-      //             // permission: 'B_goodsManage_edit'
-      //           }
-      //         }
-      //       ]
-      //     }
-      //   ]
-      // },
+      {
+        path: '/bulkManagement',
+        redirect: '/bulkManagement/purchaseOrder',
+        component: PageView,
+        meta: {
+          title: '散件管理',
+          icon: 'gold'
+          // permission: 'M_shop'
+        },
+        children: [
+          {
+            path: '/bulkManagement/bulkWarehousingOrder',
+            redirect: '/bulkManagement/bulkWarehousingOrder/list',
+            name: 'bulkWarehousingOrder',
+            component: RouteView,
+            meta: {
+              title: '散件入库',
+              icon: 'gold'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'bulkWarehousingOrderList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/list.vue'),
+                meta: {
+                  title: '散件入库单列表',
+                  icon: 'gold',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
+              },
+              {
+                path: 'add',
+                name: 'bulkWarehousingOrderAdd',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/edit.vue'),
+                meta: {
+                  title: '新增散件入库单',
+                  icon: 'gold',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'edit/:id',
+                name: 'bulkWarehousingOrderEdit',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/edit.vue'),
+                meta: {
+                  title: '编辑散件入库单',
+                  icon: 'gold',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'detail/:id',
+                name: 'bulkWarehousingOrderDetail',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/detail.vue'),
+                meta: {
+                  title: '散件入库单详情',
+                  icon: 'gold',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              }
+            ]
+          },
+          {
+            path: '/bulkManagement/bulkReturnGoods',
+            redirect: '/bulkManagement/bulkReturnGoods/list',
+            name: 'bulkReturnGoods',
+            component: RouteView,
+            meta: {
+              title: '散件退货',
+              icon: 'frown'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'bulkReturnGoodsList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkReturnGoods/list.vue'),
+                meta: {
+                  title: '散件退货列表',
+                  icon: 'frown',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
+              },
+              {
+                path: 'add',
+                name: 'bulkReturnGoodsAdd',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkReturnGoods/edit.vue'),
+                meta: {
+                  title: '新增散件退货单',
+                  icon: 'frown',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'edit/:id',
+                name: 'bulkReturnGoodsEdit',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkReturnGoods/edit.vue'),
+                meta: {
+                  title: '编辑散件退货单',
+                  icon: 'frown',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'detail/:id',
+                name: 'bulkReturnGoodsDetail',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkReturnGoods/detail.vue'),
+                meta: {
+                  title: '散件退货单详情',
+                  icon: 'frown',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              }
+            ]
+          }
+        ]
+      },
       // 财务管理
       {
         path: '/financialManagement',

+ 2 - 2
src/views/customerManagement/customerInfo/list.vue

@@ -95,7 +95,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button v-if="$hasPermissions('B_customer_customerInfo_add')" id="customerManagementList-add" type="primary" @click="handleEdit()">新增</a-button>
+      <a-button v-if="$hasPermissions('B_customer_customerInfo_add')" id="customerManagementList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
       <!-- <a-button id="customerManagementList-merge" @click="handleMerge" style="margin: 0 0 0 15px;">客户合并</a-button> -->
     </div>
     <!-- 列表 -->
@@ -106,7 +106,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1100 }"
+      :scroll="{ x: 1100, y: 300 }"
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">