feat: .

src/pages/A1check/A3result/data.ts

@@ -40,7 +40,7 @@ export const A3topArr = [
   },
   {
     key: 'conform',
-    placeholder: '相符情况',
+    placeholder: '相符状态',
     type: 'Select',
     options: [
       { label: '不相符', value: 0 },

src/pages/A1check/A3result/index.tsx

@@ -22,7 +22,7 @@ const columnsBaseTemp = [
   ['txt', '类别', 'type'],
   ['txt', '盘点状态', 'status'],
   ['txt', '藏品总登记账具体数量（件）', 'pcsRegister'],
-  ['txt', '相符情况', 'conform'],
+  ['txt', '相符状态', 'conform'],
   ['txt', '账物相符（件）', 'pcsConform'],
   ['txt', '账物不符（件）', 'pcsUnConform'],
   ['txt', '不符情形', 'unInfo'],
@@ -70,7 +70,7 @@ const exportColumnsMap = {
     ['txt2', '编号', 'num', 150],
     ['txt2', '名称', 'name', 150],
     ['txt', '盘点状态', 'status'],
-    ['txt', '相符情况', 'conform'],
+    ['txt', '相符状态', 'conform'],
     ['txt', '藏品总登记账具体数量（件）', 'pcsRegister'],
     ['txt', '账物相符（件）', 'pcsConform'],
     ['txt', '账物不符（件）', 'pcsUnConform'],
@@ -144,7 +144,13 @@ function A3result() {
     try {
       const { token } = getTokenInfo()
       const query = topDomRef.current?.getLastQuery?.() || {}
-      const { pageNum: _pageNum, pageSize: _pageSize, deptId: _deptId, deptName: _deptName, ...restQuery } = query
+      const {
+        pageNum: _pageNum,
+        pageSize: _pageSize,
+        deptId: _deptId,
+        deptName: _deptName,
+        ...restQuery
+      } = query
       const searchParams = new URLSearchParams()
 
       Object.entries(restQuery).forEach(([key, value]) => {

src/pages/A1check/A4collect/index.tsx

@@ -54,7 +54,7 @@ const detailColumnsTemp = [
   ['txt', '类别', 'type'],
   ['txt', '盘点状态', 'status'],
   ['txt', '藏品总登记账具体数量（件）', 'pcsRegister'],
-  ['txt', '相符情况', 'conform'],
+  ['txt', '相符状态', 'conform'],
   ['txt', '账物相符（件）', 'pcsConform'],
   ['txt', '账物不符（件）', 'pcsUnConform'],
   ['txt', '不符情形', 'unInfo'],
@@ -102,7 +102,7 @@ const detailExportColumnsMap = {
     ['txt2', '编号', 'num', 150],
     ['txt2', '名称', 'name', 150],
     ['txt', '盘点状态', 'status'],
-    ['txt', '相符情况', 'conform'],
+    ['txt', '相符状态', 'conform'],
     ['txt', '藏品总登记账具体数量（件）', 'pcsRegister'],
     ['txt', '账物相符（件）', 'pcsConform'],
     ['txt', '账物不符（件）', 'pcsUnConform'],
@@ -429,7 +429,7 @@ function A4collect() {
 
   const exportDetailByType = useCallback(
     async (key: keyof typeof detailExportColumnsMap) => {
-        setDetailExportLoading(true)
+      setDetailExportLoading(true)
       try {
         if (key === 'workSheet') {
           await downloadDetailExportFile('cms/checkMatch/exportPDQDGZB', '盘点清点工作表')
@@ -460,7 +460,8 @@ function A4collect() {
           placement='bottomCenter'
           menu={{
             items: detailExportMenuItems,
-            onClick: ({ key }) => void exportDetailByType(key as keyof typeof detailExportColumnsMap)
+            onClick: ({ key }) =>
+              void exportDetailByType(key as keyof typeof detailExportColumnsMap)
           }}
         >
           <div>

src/pages/Layout/index.tsx

@@ -49,7 +49,7 @@ function Layout() {
     const pageIdsLevel2 = [1, 2, 3, 4]
 
     const systemPageIds = [740, 760]
-    const isOkIdArr: number[] = [9901, ...systemPageIds]
+    const isOkIdArr: number[] = [9901]
 
     let checkPageIds: number[] = []
 
@@ -58,6 +58,12 @@ function Layout() {
 
     else if (userInfo.roleId === 1) checkPageIds = [...pageIdsLevel1, ...pageIdsLevel2]
 
+    if (userInfo.roleId === 1) {
+      systemPageIds.forEach(v => {
+        if (!isOkIdArr.includes(v)) isOkIdArr.push(v)
+      })
+    }
+
     checkPageIds.forEach(v => {
       if (!isOkIdArr.includes(v)) isOkIdArr.push(v)
     })

src/pages/Login/index.tsx

@@ -91,7 +91,7 @@ export default function Login() {
 
       <div className='mainRight'>
         {/* logg */}
-        <div className='loginTxt'>欢迎登录111</div>
+        <div className='loginTxt'>欢迎登录</div>
 
         <img className='loginImg' src={require('@/assets/img/login_logo_3.png')} alt='' />
 

src/utils/select.ts

@@ -4,7 +4,7 @@ export type DictStrType =
   | '类别'
   | '质地'
   | '文物级别'
-  | '相符情况'
+  | '相符状态'
   | '不符情形'
   | '不符原因'
   | '生效状态'