Procházet zdrojové kódy

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

zhangdan před 3 roky
rodič
revize
dc76cd80f5

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

@@ -73,6 +73,246 @@ export const asyncRouterMap = [
           }
         ]
       },
+      // 销售管理
+      {
+        path: '/salesManagement',
+        redirect: '/salesManagement/salesQuery',
+        component: PageView,
+        meta: {
+          title: '销售管理',
+          icon: 'account-book',
+          permission: 'M_salesManage'
+        },
+        children: [
+          {
+            path: '/salesManagement/salesQuery',
+            redirect: '/salesManagement/salesQuery/list',
+            name: 'salesQuery',
+            component: BlankLayout,
+            meta: {
+              title: '销售单',
+              icon: 'monitor',
+              permission: 'M_salesQueryList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'salesQueryList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/list.vue'),
+                meta: {
+                  title: '销售单列表',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'M_salesQueryList'
+                }
+              },
+              {
+                path: 'detail/:sn',
+                name: 'salesDetail',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/detail.vue'),
+                meta: {
+                  title: '销售单详情',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'B_salesDetail'
+                }
+              },
+              {
+                path: 'add/:id/:sn/:priceType',
+                name: 'salesAdd',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/edit.vue'),
+                meta: {
+                  title: '新增销售单',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'B_salesNews'
+                }
+              },
+              {
+                path: 'edit/:id/:sn/:priceType',
+                name: 'salesEdit',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/edit.vue'),
+                meta: {
+                  title: '编辑销售单',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'B_salesEdit'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/urgentItemsOffset',
+            redirect: '/salesManagement/urgentItemsOffset/list',
+            name: 'urgentItemsOffset',
+            component: BlankLayout,
+            meta: {
+              title: '急件冲减',
+              icon: 'rocket',
+              permission: 'M_urgentItemsOffsetList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'urgentItemsOffsetList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/urgentItemsOffset/list.vue'),
+                meta: {
+                  title: '急件冲减列表',
+                  icon: 'rocket',
+                  hidden: true,
+                  permission: 'M_urgentItemsOffsetList'
+                }
+              },
+              {
+                path: 'detail/:sn',
+                name: 'urgentItemsOffsetDetail',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/urgentItemsOffset/detail.vue'),
+                meta: {
+                  title: '急件冲减详情',
+                  icon: 'rocket',
+                  hidden: true,
+                  permission: 'M_urgentDetail'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/salesReturn',
+            redirect: '/salesManagement/salesReturn/list',
+            name: 'salesReturn',
+            component: BlankLayout,
+            meta: {
+              title: '销售退货',
+              icon: 'fund',
+              permission: 'M_salesReturnList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'salesReturnList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesReturn/list.vue'),
+                meta: {
+                  title: '退货单列表',
+                  icon: 'fund',
+                  hidden: true,
+                  permission: 'M_salesReturnList'
+                }
+              },
+              {
+                path: 'detail/:id/:sn',
+                name: 'salesReturnDetail',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesReturn/detail.vue'),
+                meta: {
+                  title: '退货单详情',
+                  icon: 'fund',
+                  hidden: true,
+                  permission: 'B_salesReturnDetail'
+                }
+              },
+              {
+                path: 'salesReturnGrabEdit/:id/:sn/:buyerSn',
+                name: 'salesReturnGrabEdit',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesReturn/salesReturnGrabEdit.vue'),
+                meta: {
+                  title: '编辑退货单(抓单)',
+                  icon: 'fund',
+                  hidden: true,
+                  permission: 'B_salesReturnEdit'
+                }
+              },
+              {
+                path: 'salesReturnEdit/:id/:sn/:buyerSn',
+                name: 'salesReturnEdit',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesReturn/salesReturnEdit.vue'),
+                meta: {
+                  title: '编辑退货单(不抓单)',
+                  icon: 'fund',
+                  hidden: true,
+                  permission: 'B_salesReturnEdit'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/productPricing',
+            redirect: '/salesManagement/productPricing/list',
+            name: 'productPricing',
+            component: BlankLayout,
+            meta: {
+              title: '产品报价',
+              icon: 'file-search',
+              permission: 'M_productPricingList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'productPricingList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/productPricing/list.vue'),
+                meta: {
+                  title: '产品报价列表',
+                  icon: 'file-search',
+                  hidden: true,
+                  permission: 'M_productPricingList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/giftRecord',
+            redirect: '/salesManagement/giftRecord/list',
+            name: 'giftRecord',
+            component: BlankLayout,
+            meta: {
+              title: '赠品记录',
+              icon: 'file-search',
+              permission: 'M_giftRecordList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'giftRecordList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/giftRecord/list.vue'),
+                meta: {
+                  title: '赠品记录列表',
+                  icon: 'file-search',
+                  hidden: true,
+                  permission: 'M_giftRecordList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/salesman',
+            redirect: '/salesManagement/salesman/list',
+            name: 'salesman',
+            component: BlankLayout,
+            meta: {
+              title: '业务员管理',
+              icon: 'file-search',
+              permission: 'M_salesman_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'salesmanList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesman/list.vue'),
+                meta: {
+                  title: '业务员列表',
+                  icon: 'file-search',
+                  hidden: true,
+                  permission: 'M_salesman_list'
+                }
+              }
+            ]
+          }
+        ]
+      },
       // 数字货架
       {
         path: '/numsGoodsShelves',
@@ -80,8 +320,8 @@ export const asyncRouterMap = [
         component: PageView,
         meta: {
           title: '数字货架',
-          icon: 'hdd'
-          // permission: 'M_numsGoodsShelves'
+          icon: 'hdd',
+          permission: 'M_numsGoodsShelves'
         },
         children: [
           {
@@ -91,8 +331,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '货架设置',
-              icon: 'monitor'
-              // permission: 'M_shelfSet'
+              icon: 'monitor',
+              permission: 'M_shelfSet'
             },
             hideChildrenInMenu: true,
             children: [
@@ -128,8 +368,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '货架监控',
-              icon: 'monitor'
-              // permission: 'M_shelfMonitoring'
+              icon: 'monitor',
+              permission: 'M_shelfMonitoring'
             },
             hideChildrenInMenu: true,
             children: [
@@ -165,8 +405,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '补货管理',
-              icon: 'monitor'
-              // permission: 'M_replenishmentManagement'
+              icon: 'monitor',
+              permission: 'M_replenishmentManagement'
             },
             hideChildrenInMenu: true,
             children: [
@@ -190,8 +430,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '调回管理',
-              icon: 'monitor'
-              // permission: 'M_recallManagement'
+              icon: 'monitor',
+              permission: 'M_recallManagement'
             },
             hideChildrenInMenu: true,
             children: [
@@ -215,8 +455,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '结算管理',
-              icon: 'monitor'
-              // permission: 'M_settlementManagement'
+              icon: 'monitor',
+              permission: 'M_settlementManagement'
             },
             hideChildrenInMenu: true,
             children: [
@@ -264,8 +504,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '提现管理',
-              icon: 'monitor'
-              // permission: 'M_withdrawalManagement'
+              icon: 'monitor',
+              permission: 'M_withdrawalManagement'
             },
             hideChildrenInMenu: true,
             children: [
@@ -289,8 +529,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '调回入库',
-              icon: 'monitor'
-              // permission: 'M_recallManagement'
+              icon: 'monitor',
+              permission: 'M_recallStockManagement'
             },
             hideChildrenInMenu: true,
             children: [
@@ -346,246 +586,6 @@ export const asyncRouterMap = [
           // }
         ]
       },
-      // 销售管理
-      {
-        path: '/salesManagement',
-        redirect: '/salesManagement/salesQuery',
-        component: PageView,
-        meta: {
-          title: '销售管理',
-          icon: 'account-book',
-          permission: 'M_salesManage'
-        },
-        children: [
-          {
-            path: '/salesManagement/salesQuery',
-            redirect: '/salesManagement/salesQuery/list',
-            name: 'salesQuery',
-            component: BlankLayout,
-            meta: {
-              title: '销售单',
-              icon: 'monitor',
-              permission: 'M_salesQueryList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'salesQueryList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/list.vue'),
-                meta: {
-                  title: '销售单列表',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'M_salesQueryList'
-                }
-              },
-              {
-                path: 'detail/:sn',
-                name: 'salesDetail',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/detail.vue'),
-                meta: {
-                  title: '销售单详情',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'B_salesDetail'
-                }
-              },
-              {
-                path: 'add/:id/:sn/:priceType',
-                name: 'salesAdd',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/edit.vue'),
-                meta: {
-                  title: '新增销售单',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'B_salesNews'
-                }
-              },
-              {
-                path: 'edit/:id/:sn/:priceType',
-                name: 'salesEdit',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/edit.vue'),
-                meta: {
-                  title: '编辑销售单',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'B_salesEdit'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/urgentItemsOffset',
-            redirect: '/salesManagement/urgentItemsOffset/list',
-            name: 'urgentItemsOffset',
-            component: BlankLayout,
-            meta: {
-              title: '急件冲减',
-              icon: 'rocket',
-              permission: 'M_urgentItemsOffsetList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'urgentItemsOffsetList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/urgentItemsOffset/list.vue'),
-                meta: {
-                  title: '急件冲减列表',
-                  icon: 'rocket',
-                  hidden: true,
-                  permission: 'M_urgentItemsOffsetList'
-                }
-              },
-              {
-                path: 'detail/:sn',
-                name: 'urgentItemsOffsetDetail',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/urgentItemsOffset/detail.vue'),
-                meta: {
-                  title: '急件冲减详情',
-                  icon: 'rocket',
-                  hidden: true,
-                  permission: 'M_urgentDetail'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/salesReturn',
-            redirect: '/salesManagement/salesReturn/list',
-            name: 'salesReturn',
-            component: BlankLayout,
-            meta: {
-              title: '销售退货',
-              icon: 'fund',
-              permission: 'M_salesReturnList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'salesReturnList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesReturn/list.vue'),
-                meta: {
-                  title: '退货单列表',
-                  icon: 'fund',
-                  hidden: true,
-                  permission: 'M_salesReturnList'
-                }
-              },
-              {
-                path: 'detail/:id/:sn',
-                name: 'salesReturnDetail',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesReturn/detail.vue'),
-                meta: {
-                  title: '退货单详情',
-                  icon: 'fund',
-                  hidden: true,
-                  permission: 'B_salesReturnDetail'
-                }
-              },
-              {
-                path: 'salesReturnGrabEdit/:id/:sn/:buyerSn',
-                name: 'salesReturnGrabEdit',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesReturn/salesReturnGrabEdit.vue'),
-                meta: {
-                  title: '编辑退货单(抓单)',
-                  icon: 'fund',
-                  hidden: true,
-                  permission: 'B_salesReturnEdit'
-                }
-              },
-              {
-                path: 'salesReturnEdit/:id/:sn/:buyerSn',
-                name: 'salesReturnEdit',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesReturn/salesReturnEdit.vue'),
-                meta: {
-                  title: '编辑退货单(不抓单)',
-                  icon: 'fund',
-                  hidden: true,
-                  permission: 'B_salesReturnEdit'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/productPricing',
-            redirect: '/salesManagement/productPricing/list',
-            name: 'productPricing',
-            component: BlankLayout,
-            meta: {
-              title: '产品报价',
-              icon: 'file-search',
-              permission: 'M_productPricingList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'productPricingList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/productPricing/list.vue'),
-                meta: {
-                  title: '产品报价列表',
-                  icon: 'file-search',
-                  hidden: true,
-                  permission: 'M_productPricingList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/giftRecord',
-            redirect: '/salesManagement/giftRecord/list',
-            name: 'giftRecord',
-            component: BlankLayout,
-            meta: {
-              title: '赠品记录',
-              icon: 'file-search',
-              permission: 'M_giftRecordList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'giftRecordList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/giftRecord/list.vue'),
-                meta: {
-                  title: '赠品记录列表',
-                  icon: 'file-search',
-                  hidden: true,
-                  permission: 'M_giftRecordList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/salesman',
-            redirect: '/salesManagement/salesman/list',
-            name: 'salesman',
-            component: BlankLayout,
-            meta: {
-              title: '业务员管理',
-              icon: 'file-search',
-              permission: 'M_salesman_list'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'salesmanList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesman/list.vue'),
-                meta: {
-                  title: '业务员列表',
-                  icon: 'file-search',
-                  hidden: true,
-                  permission: 'M_salesman_list'
-                }
-              }
-            ]
-          }
-        ]
-      },
       // 采购管理
       {
         path: '/purchasingManagement',

+ 18 - 6
src/views/numsGoodsShelves/shelfSet/basicInfoModal.vue

@@ -17,7 +17,15 @@
         :rules="rules"
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol">
-        <a-form-model-item label="关联客户" prop="customerSn">
+        <a-form-model-item prop="customerSn">
+          <template slot="label">
+            <a-tooltip placement="top">
+              <template slot="title">
+                <span>此数字货架,归属于您的哪一位客户。如果没有搜索到客户,请在客户管理功能中新建客户。</span>
+              </template>
+              关联客户<a-icon type="question-circle" style="color: rgba(0,0,0,.65);font-size: 16px;margin-left: 2px;vertical-align: sub;cursor: pointer;" />
+            </a-tooltip>
+          </template>
           <custList ref="custList" :isEnabled="true" @change="custChange"></custList>
         </a-form-model-item>
       </a-form-model>
@@ -56,8 +64,8 @@ export default {
       spinning: false,
       isShow: this.openModal, //  是否打开弹框
       formItemLayout: {
-        labelCol: { span: 4 },
-        wrapperCol: { span: 18 }
+        labelCol: { span: 5 },
+        wrapperCol: { span: 17 }
       },
       form: {
         customerSn: undefined
@@ -114,9 +122,13 @@ export default {
         if (this.nowData.customerSn) {
           const _this = this
           this.$nextTick(() => {
-            _this.form.customerSn = _this.nowData.customerSn
-            _this.$refs.custList.fetchUser(_this.nowData.customerName)
-            _this.$refs.custList.dealerName = { key: _this.nowData.customerSn, label: _this.nowData.customerName, row: _this.nowData }
+            _this.form.customerSn = _this.nowData.customerEntity && _this.nowData.customerEntity.customerSn
+            _this.$refs.custList.fetchUser(_this.nowData.customerEntity && _this.nowData.customerEntity.customerName)
+            _this.$refs.custList.dealerName = {
+              key: _this.nowData.customerEntity && _this.nowData.customerEntity.customerSn,
+              label: _this.nowData.customerEntity && _this.nowData.customerEntity.customerName,
+              row: _this.nowData
+            }
           })
         }
       }