Merge branch 'dev' of http://120.25.63.219:6088/rex/portalhtml into dev

src/router/modules/customers.js

@@ -23,41 +23,35 @@ const customersRouter = {
     {
       path: '/customersAdd',
       component: () => import('@/views/customers/customers-add'),
-      name: 'CustomersAdd',
+      name: 'CustomersOverviewAdd',
       meta: {title: '代理商新增'},
       hidden: true,
     },
     {
-      path: '/customersDetails/total',
+      path: '/CustomersOverview-detail',
       component: () => import('@/views/customers/customers-details/index.vue'),
-      name: 'customersDetails',
+      name: 'CustomersOverviewDetail',
       meta: {title: '总代理商详情'},
       hidden: true,
     },
     {
-      path: '/customersDetails/province',
+      path: '/CustomersProvince-detail',
       component: () => import('@/views/customers/customers-details/province.vue'),
-      name: 'customersDetails',
+      name: 'CustomersProvinceDetail',
       meta: {title: '省代理商详情'},
       hidden: true,
     },
     {
-      path: '/customersDetails/area',
+      path: '/CustomersCity-detail',
       component: () => import('@/views/customers/customers-details/area.vue'),
-      name: 'customersDetails',
+      name: 'CustomersCityDetail',
       meta: {title: '城市代理商详情'},
       hidden: true,
     },
-    // {
-    //   path: '/potential',
-    //   component: () => import('@/views/customers/potential-customers'),
-    //   name: 'PotentialCustomers',
-    //   meta: { title: 'potentialCustomers' }
-    // },
     {
       path: '/potential-list',
       component: () => import('@/views/customers/potential-list'),
-      name: 'PotentialList',
+      name: 'CustomersProcessDetail',
       meta: {title: '省级代理商审批'},
       hidden: true,
     },
@@ -82,7 +76,7 @@ const customersRouter = {
     {
       path: '/citypotential-list',
       component: () => import('@/views/customers/citypotenial-list'),
-      name: 'CityPotenialList',
+      name: 'CustomersProcessDetail',
       meta: {title: '城市代理商审批'},
       hidden: true,
     },    {

src/router/modules/models.js

@@ -35,22 +35,22 @@ const modelsRouter = {
       path: 'all',
       component: () => import('@/views/models/all-models'),
       name: 'TemplatesAll',
-      meta: { title: '模板' }
+      meta: { title: '全部模板' }
     },
-    {
-      path: 'detail',
-      component: () => import('@/views/contract/contract-detail/detail'),
-      name: 'ContractDetail',
-      hidden: true,
-      meta: { title: '合同详情' }
-    },
-    {
-      path: 'template-edit',
-      component: () => import('@/views/contract/template-detail/edit'),
-      name: 'ContractTemplateDetail',
-      hidden: true,
-      meta: { title: '合同模板编辑' }
-    }
+    // {
+    //   path: 'detail',
+    //   component: () => import('@/views/contract/contract-detail/detail'),
+    //   name: 'ContractDetail',
+    //   hidden: true,
+    //   meta: { title: '合同详情' }
+    // },
+    // {
+    //   path: 'template-edit',
+    //   component: () => import('@/views/contract/template-detail/edit'),
+    //   name: 'ContractTemplateDetail',
+    //   hidden: true,
+    //   meta: { title: '合同模板编辑' }
+    // }
   ]
 }
 export default modelsRouter

src/views/customers/customers-overview/index.vue

@@ -12,6 +12,7 @@
           <el-button
             type="primary"
             icon="el-icon-plus"
+            v-permission='20101'
             @click="handleAdd"
           >添加</el-button>
         </template>
@@ -54,7 +55,7 @@ export default {
     //  编辑
     handleEdit(row) {
       console.log(row)
-      this.$router.push({ path: '/customersDetails/total',query: { objectID: row.ObjectID}})
+      this.$router.push({ path: '/CustomersOverview-detail',query: { objectID: row.ObjectID}})
     },
     //  添加
     handleAdd() {

src/views/customers/municipal-agentList/index.vue

@@ -47,8 +47,8 @@ export default {
   methods: {
     //  编辑
     handleEdit(row) {
-      this.$router.push({ path: '/customersDetails/area',query: { objectID: row.ObjectID}})
-      console.log("编辑", row)
+      this.$router.push({ path: '/CustomersCity-detail',query: { objectID: row.ObjectID}})
+      // console.log("编辑", row)
     },
     //  添加
     handleAdd() {

src/views/customers/provincial-agentList/index.vue

@@ -48,7 +48,7 @@ export default {
   methods: {
     //  编辑
     handleEdit(row) {
-      this.$router.push({ path: '/customersDetails/province',query: { objectID: row.ObjectID}})
+      this.$router.push({ path: '/CustomersProvince-detail',query: { objectID: row.ObjectID}})
       console.log("编辑", row)
     },
     //  添加