wjx 2 лет назад
Родитель
Сommit
4612c7e614

+ 1 - 3
src/pages/launchSystemNew/account/changeRecord.tsx

@@ -54,7 +54,7 @@ function ChangeRecord(props: Props) {
     const handleOk = async () => {
         form.submit()
         let { resourceNames, ...data1 }  = await form.validateFields()
-        let proms = { ...data1, beginTime: moment(data1.beginTime).format('YYYY-MM-DD') + ' 00:00:00' }
+        let proms = { ...data1, beginTime: moment(data1.beginTime).format('YYYY-MM-DD') }
         if (data1.endTime) {
             proms.endTime = moment(data1.endTime).format('YYYY-MM-DD')
         }
@@ -67,8 +67,6 @@ function ChangeRecord(props: Props) {
         })
     }
 
-    console.log('editData---->', editData)
-
     return <div>
 
         <Drawer title={data?.name + ' 变更记录'} placement="right" width={1200} onClose={() => { onClose && onClose() }} visible={visible}>

+ 4 - 4
src/pages/launchSystemNew/account/index.tsx

@@ -125,15 +125,15 @@ const AdAuthorize: React.FC = () => {
             activeKey={activeKey}
             type="card"
             onChange={(activeKey) => {
-                let newQueryForm = JSON.parse(JSON.stringify(queryForm))
-                delete newQueryForm?.groupId
-                delete newQueryForm?.putUserId
                 if (activeKey !== 'contract') {
+                    let newQueryForm = JSON.parse(JSON.stringify(queryForm))
+                    delete newQueryForm?.groupId
+                    delete newQueryForm?.putUserId
+                    setQueryForm(newQueryForm)
                     setActiveKey(activeKey)
                 } else {
                     setShowLeft(!showLeft)
                 }
-                setQueryForm(newQueryForm)
             }}
         >
             <Tabs.TabPane tab='我的' key='1' />

+ 3 - 3
src/pages/launchSystemNew/account/tableConfig.tsx

@@ -19,7 +19,7 @@ export function columnsMp(edit: (params: any) => void, del: (groupId: number, ac
             dataIndex: 'accountId',
             key: 'accountId',
             align: 'center',
-            width: 75,
+            width: 80,
             fixed: 'left'
         },
         {
@@ -108,7 +108,7 @@ export function columnsMp(edit: (params: any) => void, del: (groupId: number, ac
             title: '行业ID',
             dataIndex: 'systemIndustryId',
             key: 'systemIndustryId',
-            width: 100,
+            width: 105,
             align: 'center',
             render: (a: any) => {
                 return <Tooltip title={a}>
@@ -131,7 +131,7 @@ export function columnsMp(edit: (params: any) => void, del: (groupId: number, ac
             dataIndex: 'createTime',
             key: 'createTime',
             align: 'center',
-            width: 140
+            width: 150
         },
         {
             title: '日限额(分)',

+ 13 - 12
src/pages/launchSystemNew/components/teamMembers/index.tsx

@@ -19,16 +19,16 @@ const TeamMembers: React.FC<Props> = (props) => {
     const [userAll, setUserAll] = useState([])
 
     const userInfo = useModel('@@initialState', model => model.initialState?.currentUser)
-    const [userId, setUserId] = useState<any>(userInfo?.userId?.toString())
+    const [userId, setUserId] = useState<number | undefined>(userInfo?.userId ? Number(userInfo?.userId) : undefined)
     /*************************/
 
-    useEffect(() => {
-        onChange?.(userId)
-    }, [userId])
+    // useEffect(() => {
+    //     onChange?.(userId)
+    // }, [userId])
 
     useEffect(() => {
         if (value) {
-            setUserId(value.toString())
+            setUserId(value)
         }
     }, [value])
 
@@ -38,7 +38,7 @@ const TeamMembers: React.FC<Props> = (props) => {
             let res = allOfMember?.data || await allOfMember.run()
             if (res?.data) {
                 let useAll: any = []
-                res?.data?.forEach((item: { key: { userId: any; nickName: any; }; value: any[]; }) => {
+                res?.data?.forEach((item: { key: { userId: number; nickName: any; }; value: any[]; }) => {
                     let obj = {
                         key: item.key.userId,
                         label: item.key.nickName,
@@ -71,19 +71,20 @@ const TeamMembers: React.FC<Props> = (props) => {
             placeholder='名称搜索'
             style={{ width: '100%' }}
             showSearch
+            value={userId ? Number(userId) : undefined}
             filterOption={(input: any, option: any) => {
                 return (option!?.children as unknown as string)?.toLowerCase()?.includes(input?.toLowerCase())
             }}
             loading={allOfMember.loading}
-            allowClear
             onChange={(value: any) => {
                 if (value) {
-                    setUserId(value.toString())
+                    setUserId(value)
                 }
+                onChange?.(value ? value : undefined)
             }}
         >
             {userAll.map((item: any) => {
-                return <Select.Option value={item.key} key={item.key}>{item.label}</Select.Option>
+                return <Select.Option value={Number(item.key)} key={item.key}>{item.label}</Select.Option>
             })}
         </Select>
         <Spin className="menus" spinning={allOfMember.loading}>
@@ -91,11 +92,11 @@ const TeamMembers: React.FC<Props> = (props) => {
                 id='myMenus'
                 theme='light'
                 onClick={(e: any) => {
-                    setUserId(e.key)
+                    setUserId(e.key ? Number(e.key) : undefined)
+                    onChange?.(e.key)
                 }}
-                selectedKeys={userId}
+                selectedKeys={userId ? [userId.toString()] : undefined}
                 mode="inline"
-                multiple={false}
                 items={userAll}
                 style={{
                     overflowY: 'auto',