lanjianrong 5 anni fa
parent
commit
a208c24942

+ 1 - 1
src/pages/Customer/Client/components/AddClient/index.jsx

@@ -28,7 +28,7 @@ const AddClient = props => {
     <ModalDragForm
       {...layout}
       formRef={formRef}
-      modalProps={{ zIndex: 1250 }}
+      modalProps={{ zIndex: 1060, getContainer: false }}
       title="添加客户"
       onVisibleChange={visible => {
         if (visible) {

+ 1 - 1
src/pages/Customer/Client/components/ClientDetail/AddRecord.jsx

@@ -21,7 +21,7 @@ const AddRecord = props => {
 
   return (
     <ModalDragForm
-      modalProps={{ zIndex: 1250 }}
+      modalProps={{ zIndex: 1060, getContainer: false }}
       layout="vertical"
       title="添加服务记录"
       formRef={formRef}

+ 1 - 0
src/pages/Customer/Client/components/ClientDetail/TabList.jsx

@@ -21,6 +21,7 @@ const ContanctTabList = ({ clientId, software }) => {
   const showLongleDrawer = id => {
     toggleDrawer()
     setDrawerProps({
+      zIndex: 1040,
       closable: true,
       onClose: () => toggleDrawer(),
       bodyStyle: {

+ 2 - 2
src/pages/Customer/Company/components/AddCompany/CompanyFormItem.jsx

@@ -41,7 +41,7 @@ const CompanyFormItem = ({ value, onChange }) => {
 
   const showCompanyDrawer = id => {
     setDrawerProps({
-      // zIndex: 1040,
+      zIndex: 1060,
       closable: true,
       onClose: () => toggleDrawer(),
       bodyStyle: {
@@ -55,7 +55,7 @@ const CompanyFormItem = ({ value, onChange }) => {
   const { visible, list, inputVal } = state
   return (
     <Popover
-      zIndex={1250}
+      zIndex={1050}
       placement="bottom"
       visible={visible && list && list.length}
       onVisibleChange={e => setState({ ...state, visible: e })}

+ 1 - 1
src/pages/Customer/Company/components/AddCompany/index.jsx

@@ -26,7 +26,7 @@ const AddCompanyModal = ({ reload, dataId, dataType, onConfirm, dispatch, nature
   const [showDataItem, setShowDataItem] = useState(false)
   return (
     <ModalDragForm
-      modalProps={{ zIndex: 1250, getContainer: false }}
+      modalProps={{ zIndex: 1050, getContainer: false }}
       formRef={formRef}
       title="添加新单位"
       {...layout}

+ 1 - 1
src/pages/Customer/Company/components/ChangeCompany/index.jsx

@@ -40,7 +40,7 @@ const ChangeCompanyInput = props => {
   }
   const handleConnectCustomer = () => {
     setModalProps({
-      zIndex: 1250,
+      zIndex: 1050,
       width: '60vw',
       modalRender: node => (
         <SearchModal onSelect={refreshClient} node={node} dataId={dataId} preUrl={actionPayload} />

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

@@ -96,7 +96,7 @@ const SyncClient = ({ customer, client }) => {
         </div> */}
       </Button>
       <Modal
-        zIndex={1250}
+        zIndex={1060}
         width="70%"
         title={`同步 ${customer.companyName} 信息`}
         getContainer={false}

+ 9 - 7
src/pages/Customer/Company/components/CompanyDetail/TabList.jsx

@@ -25,6 +25,7 @@ const CompanyTabList = ({ initData, customerId, client, software, customer }) =>
   const showDrawer = id => {
     toggleDrawer()
     setDrawerProps({
+      zIndex: 1040,
       closable: true,
       onClose: () => toggleDrawer(),
       bodyStyle: {
@@ -39,6 +40,7 @@ const CompanyTabList = ({ initData, customerId, client, software, customer }) =>
   const showLongleDrawer = id => {
     toggleDrawer()
     setDrawerProps({
+      zIndex: 1040,
       closable: true,
       onClose: () => toggleDrawer(),
       bodyStyle: {
@@ -134,14 +136,14 @@ const CompanyTabList = ({ initData, customerId, client, software, customer }) =>
     if (code === consts.RET_CODE.SUCCESS) {
       message.success('新增成功')
       setState({ ...state, data: values })
+      // 请求完了
+      setAddCustomerService({ ...addCustomerService, loading: false, visible: false })
+      // 刷新数据
+      dispatch({
+        type: 'refresh/commitAction',
+        payload: 'company'
+      })
     }
-    // 请求完了
-    setAddCustomerService({ ...addCustomerService, loading: false, visible: false })
-    // 刷新数据
-    dispatch({
-      type: 'refresh/commitAction',
-      payload: 'company'
-    })
   }
 
   const handleAddClient = async values => {

+ 2 - 2
src/pages/workbench/Dashboard/components/RatioPanels.jsx

@@ -184,7 +184,7 @@ const RatioPanels = ({ dataType, staffIds, retioCyclical, dataPermission }) => {
   }
   const showDrawer = id => {
     setDrawerProps({
-      zIndex: '1200',
+      zIndex: 1040,
       closable: true,
       onClose: () => toggleDrawer(),
       bodyStyle: {
@@ -198,7 +198,7 @@ const RatioPanels = ({ dataType, staffIds, retioCyclical, dataPermission }) => {
   // 展示单位
   const showDrawerComapny = id => {
     setDrawerProps({
-      zIndex: '1200',
+      zIndex: 1040,
       closable: true,
       onClose: () => toggleDrawer(),
       bodyStyle: {

+ 2 - 1
src/pages/workbench/Dashboard/index.jsx

@@ -14,6 +14,7 @@ import RatioPanels from './components/RatioPanels'
 import PermSelect, { PermDataTypeEunm } from '@/pages/Customer/Company/components/PermSelect'
 import { getAuthCache, getPermAuthCache, setAuthCache } from '@/utils/auth'
 import { WORKBENCH_CYCLICAL_KEY } from '@/utils/cache/cacheEnum'
+import styles from './index.less'
 
 const Dashboard = () => {
   const timer = useRef(null)
@@ -228,7 +229,7 @@ const Dashboard = () => {
     setState({ ...state, immediate: true, params: { ...state.params, cyclical: value } })
   }
   return (
-    <div>
+    <div className={styles.dashboard}>
       <div className="shadow-card">
         <ProTable
           bordered

+ 7 - 0
src/pages/workbench/Dashboard/index.less

@@ -0,0 +1,7 @@
+.dashboard {
+  overflow: -moz-scrollbars-none !important;
+  -ms-overflow-style: none !important;
+  &::-webkit-scrollbar {
+    width: 0 !important;
+  }
+}