lanjianrong 5 лет назад
Родитель
Сommit
a7a7b1a503

+ 1 - 24
config/routes.js

@@ -25,24 +25,7 @@ export default [
             routes: [
               {
                 path: '/',
-                redirect: '/workbench/dashboard'
-              },
-              {
-                path: '/workbench',
-                name: 'workbench',
-                icon: 'icon-chess',
-                routes: [
-                  {
-                    path: '/workbench',
-                    redirect: '/workbench/dashboard'
-                  },
-                  {
-                    path: '/workbench/dashboard',
-                    name: 'workbench',
-                    icon: 'icon-clipboardcheck',
-                    component: './workbench/Dashboard'
-                  }
-                ]
+                redirect: '/customer/contact'
               },
               {
                 path: '/customer',
@@ -73,12 +56,6 @@ export default [
                     name: 'finance',
                     icon: 'icon-usd-circle',
                     component: './customer/Finance'
-                  },
-                  {
-                    path: '/customer/test',
-                    name: 'test',
-                    icon: 'icon-magic',
-                    component: './customer/Test'
                   }
                 ]
               },

+ 0 - 2
src/layouts/BasicLayout.jsx

@@ -12,8 +12,6 @@ import Authorized from '@/utils/auth/Authorized'
 import RightContent from '@/components/GlobalHeader/RightContent'
 import logo from '../assets/logo.svg'
 import styles from './BasicLayout.less'
-// import '@icon-park/react/styles/index.less'
-// import { IconPark } from '@/components/SvgIcon'
 import BasicModal from '@/components/Modal'
 import { BasicDrawer } from '@/components/Modal'
 import { matchPath } from 'umi'

+ 1 - 1
src/pages/Customer/Company/components/CompanyDetail/CompanyForm.jsx

@@ -38,7 +38,7 @@ const CompanyForm = props => {
       span: 24
     },
     {
-      dataIndex: 'district',
+      dataIndex: 'districtIds',
       label: '公司地区',
       editCellType: 'cascader',
       span: 24

+ 5 - 10
src/pages/Customer/Contact/components/ChangeCompany/index.jsx

@@ -71,8 +71,10 @@ const ChangeCompanyInput = props => {
   }
   const normalValueRender = (
     <Card size="small">
-      <div className="flex-row flex justify-between">
-        <div className={styles.nameContent}>{customerName}</div>
+      <div className="flex justify-between">
+        <div className={styles.nameContent} onClick={handleCompanyClick}>
+          {customerName}
+        </div>
         <div className="w-55px">
           <Tooltip placement="right" title="移除客户">
             <span className={styles.unlinkIcon} onClick={removeCustomer}>
@@ -94,14 +96,7 @@ const ChangeCompanyInput = props => {
   )
   return (
     <div className={styles.companyInput}>
-      <span
-        onClick={() => {
-          if (customerId !== consts.ENCRYPTION_ZERO) {
-            handleCompanyClick()
-          }
-        }}>
-        {customerId !== consts.ENCRYPTION_ZERO ? normalValueRender : notValueRender}
-      </span>
+      {customerId !== consts.ENCRYPTION_ZERO ? normalValueRender : notValueRender}
     </div>
   )
 }

+ 0 - 16
src/pages/Customer/Test/index.jsx

@@ -1,16 +0,0 @@
-import React from 'react'
-
-import { connect } from 'dva'
-import { Add } from '@icon-park/react'
-
-const Test = () => {
-  return (
-    <div>
-      <Add theme="filled" size="20" fill="#868e96" className="zh-pointer" />
-    </div>
-  )
-}
-
-export default connect(({ customer }) => ({
-  natures: customer.natures
-}))(Test)