lanjianrong 5 lat temu
rodzic
commit
01be3b83ab

+ 4 - 4
config/routes.js

@@ -25,7 +25,7 @@ export default [
             routes: [
               {
                 path: '/',
-                redirect: '/Customer/Contact'
+                redirect: '/customer/contact'
               },
               {
                 path: '/workbench',
@@ -34,7 +34,7 @@ export default [
                 routes: [
                   {
                     path: '/workbench',
-                    redirect: '/Workbench/Dashboard'
+                    redirect: '/workbench/dashboard'
                   },
                   {
                     path: '/workbench/dashboard',
@@ -98,7 +98,7 @@ export default [
                     routes: [
                       {
                         path: '/product/lock',
-                        redirect: '/Product/Lock/Lockstore'
+                        redirect: '/product/lock/lockstore'
                       },
                       {
                         path: '/product/lock/lockstore',
@@ -119,7 +119,7 @@ export default [
                     routes: [
                       {
                         path: '/product/cloud',
-                        redirect: '/Product/Cloud/Building'
+                        redirect: '/product/cloud/building'
                       },
                       {
                         path: '/product/cloud/building',

+ 3 - 1
src/pages/Customer/Business/components/AddBusiness.jsx

@@ -56,7 +56,9 @@ const AddBusiness = props => {
                 label="商机状态"
                 options={groupList
                   .find(item => item.value === businessGroupId)
-                  ?.items?.map(i => ({ label: i.name, value: i.id }))}
+                  ?.items?.filter(item => !item.endProcess)
+                  ?.sort((a, b) => a.sort - b.sort)
+                  ?.map(i => ({ label: i.name, value: i.id }))}
                 required
               />
             )}

+ 1 - 1
src/pages/Customer/Contact/components/CustomerModal/index.jsx

@@ -61,7 +61,7 @@ const SearchModal = ({ dataId, onSelect, preUrl }) => {
     const payload = formatValues(values)
     const { code = -1, msg = '新增成功' } = await createCustomer(payload)
     if (code === consts.RET_CODE.SUCCESS) {
-      if (Object.hasOwnProperty.call(values, 'clientId')) {
+      if (Object.hasOwnProperty.call(values, `${preUrl}Id`)) {
         message.success('新增成功并且绑定成功')
         onSelect(values.companyName)
         closeModal()

+ 2 - 2
src/pages/Product/Lock/Lockstore/components/LocksDetail/LockForm.jsx

@@ -1,6 +1,6 @@
-import React, { useEffect } from 'react'
+import React from 'react'
 import { Row, Col, Divider } from 'antd'
-import { ProductLabel } from '@/pages/Product/lock/Lockstore'
+import { ProductLabel } from '@/pages/Product/Lock/Lockstore'
 
 // import EditableForm from '@/components/EditableForm'
 

+ 1 - 1
src/pages/Product/Lock/Lockstore/components/LocksDetail/LockTabList.jsx

@@ -3,7 +3,7 @@ import { Row, Col, List, Tabs, message, Button } from 'antd'
 import { dayjsFormat } from '@/utils/utils'
 import consts from '@/consts'
 import { apiSoftwareAddLonglelog } from '@/services/lock'
-import { ProductLabel } from '@/pages/Product/lock/Lockstore'
+import { ProductLabel } from '@/pages/Product/Lock/Lockstore'
 import LockModal from './LockModal'
 import { lockTypeEnum } from './LockModal'
 import { servicelogEnum, showProductsStatus, showNewLongleStatus, showMarkStatus } from './consts'

+ 3 - 3
src/pages/Product/Lock/Lockstore/components/LocksDetail/index.jsx

@@ -2,9 +2,9 @@ import React, { useState, useEffect } from 'react'
 import { Row, Col } from 'antd'
 import consts from '@/consts'
 import { apiSoftwareDetail } from '@/services/lock'
-import LockForm from '@/pages/Product/lock/Lockstore/components/LocksDetail/LockForm.jsx'
-import LockLowerList from '@/pages/Product/lock/Lockstore/components/LocksDetail/LockLowerList'
-import LockTabList from '@/pages/Product/lock/Lockstore/components/LocksDetail/LockTabList'
+import LockForm from '@/pages/Product/Lock/Lockstore/components/LocksDetail/LockForm.jsx'
+import LockLowerList from '@/pages/Product/Lock/Lockstore/components/LocksDetail/LockLowerList'
+import LockTabList from '@/pages/Product/Lock/Lockstore/components/LocksDetail/LockTabList'
 import { connect } from 'dva'
 
 const Index = props => {

+ 2 - 2
src/pages/Product/Lock/Lockstore/index.jsx

@@ -3,7 +3,7 @@ import { Tag } from 'antd'
 import ProTable from '@ant-design/pro-table'
 import consts from '@/consts'
 import { queryLock } from '@/services/lock'
-import LocksDetail from '@/pages/Product/lock/Lockstore/components/LocksDetail'
+import LocksDetail from '@/pages/Product/Lock/Lockstore/components/LocksDetail'
 import { useModal } from '@/components/Modal'
 import { useTableScroll } from '@/hooks/useAutoTable'
 
@@ -38,7 +38,7 @@ const longleStatusNum = {
 }
 
 const Lockstore = () => {
-  const [selectKeys, setSelectKeys] = useState([])
+  const [selectKeys] = useState([])
   const { toggleDrawer, setDrawerProps } = useModal()
   const [state, setState] = useState({
     params: {},