Explorar el Código

feat: 暂时性注释掉通知中心-消息、代办

lanjianrong hace 4 años
padre
commit
83f93cfc27

+ 4 - 6
src/components/RightContent/NoticeIcon/index.tsx

@@ -43,8 +43,7 @@ const getNoticeData = notices => {
           color={color}
           style={{
             marginRight: 0
-          }}
-        >
+          }}>
           {newNotice.extra}
         </Tag>
       ) as any
@@ -148,8 +147,7 @@ const NoticeIconView = () => {
       clearText="清空"
       viewMoreText="查看更多"
       onViewMore={() => history.push('/hr/notification')}
-      clearClose
-    >
+      clearClose>
       <NoticeIcon.Tab
         tabKey="notification"
         count={unreadMsg.notification}
@@ -158,7 +156,7 @@ const NoticeIconView = () => {
         emptyText="你已查看所有通知"
         showViewMore
       />
-      <NoticeIcon.Tab
+      {/* <NoticeIcon.Tab
         tabKey="message"
         count={unreadMsg.message}
         list={noticeData.message}
@@ -173,7 +171,7 @@ const NoticeIconView = () => {
         count={unreadMsg.event}
         list={noticeData.event}
         showViewMore
-      />
+      /> */}
     </NoticeIcon>
   )
 }

+ 8 - 0
src/pages/Customer/Company/components/CompanyDetail/TabList.jsx

@@ -117,6 +117,14 @@ const CompanyTabList = ({
     </Menu>
   )
 
+  console.log(
+    Array.from(
+      new Set(client.client?.map(item => item.department)).map(item => ({
+        text: item,
+        value: item
+      }))
+    )
+  )
   const columns = [
     {
       title: '优先级',

+ 2 - 2
src/pages/Hr/Notification/components/AddMessage.jsx

@@ -84,8 +84,8 @@ const AddMessage = props => {
           name="msgType"
           required
           options={[
-            { label: '通知', value: msgTypeEnum.NotificationOne },
-            { label: '消息', value: msgTypeEnum.Message }
+            { label: '通知', value: msgTypeEnum.NotificationOne }
+            // { label: '消息', value: msgTypeEnum.Message }
           ]}
         />
         <ProFormDependency name={['msgType']}>

+ 1 - 1
src/pages/Hr/Notification/index.jsx

@@ -124,7 +124,7 @@ const Notification = () => {
                       <Tag color="purple">
                         {intl.formatMessage({ id: `component.globalHeader.${item.msgType}` })}
                       </Tag>{' '}
-                      '发布',
+                      '发布范围',
                       <span className="ml-2">全公司</span>
                     </div>
                   }

+ 1 - 1
src/pages/Statistic/Software/Usage/index.jsx

@@ -178,7 +178,7 @@ const Usage = () => {
         search={false}
         columns={columns}
         actionRef={tRef}
-        rowkey="name"
+        rowkey="id"
         toolbar={{
           title: [
             <Select