申请记录的完善

src/components/ZflowTable/index.tsx

@@ -18,6 +18,7 @@ export type ZflowTableType = {
   rtfOpinion: string
   status?: any
   updateTime: string
+  isUse: 0 | 1
 }
 type Props = {
   tableArr: ZflowTableType[]
@@ -30,9 +31,10 @@ function ZflowTable({ tableArr, closeFu }: Props) {
   const tableLastBtn = useMemo(() => {
     return [
       {
-        title: '审批结构',
+        title: '审批结果',
         render: (item: ZflowTableType) => {
-          const txt1 = item.status === 1 ? '同意' : item.status === 2 ? '不同意' : '（空）'
+          let txt1 = item.status === 1 ? '同意' : item.status === 2 ? '不同意' : '待处理'
+          if (item.isUse === 0) txt1 = '（空）'
           const txt2 = item.isAuto === 1 ? '（自动）' : ''
           return txt1 + txt2
         }
@@ -46,7 +48,7 @@ function ZflowTable({ tableArr, closeFu }: Props) {
                 查看
               </Button>
             )
-          } else return '-'
+          } else return '（空）'
         }
       }
     ]

src/pages/B_enterTibet/B1collect/B1edit/index.tsx

@@ -381,7 +381,10 @@ function B1edit() {
 
       {/* 底部按钮 */}
       <div className='B1btn'>
-        {['3', '4'].includes(key) && topInfo.audits && topInfo.audits.length ? (
+        {['3', '4'].includes(key) &&
+        topInfo.audits &&
+        topInfo.audits.length &&
+        [3, 4, 5].includes(topInfo.status) ? (
           <Button type='primary' onClick={() => setAuditsShow(true)}>
             申请记录
           </Button>

src/pages/B_enterTibet/B2identify/B2edit/index.tsx

@@ -470,7 +470,10 @@ function B2edit() {
 
       {/* 底部按钮 */}
       <div className='B2btn'>
-        {['3', '4'].includes(key) && topInfo.audits && topInfo.audits.length ? (
+        {['3', '4'].includes(key) &&
+        topInfo.audits &&
+        topInfo.audits.length &&
+        [3, 4, 5].includes(topInfo.status) ? (
           <Button type='primary' onClick={() => setAuditsShow(true)}>
             申请记录
           </Button>

src/pages/B_enterTibet/B34typeIn/B34edit/index.tsx

@@ -511,7 +511,10 @@ function B34edit({ type }: Props) {
       </div>
       {/* 底部按钮 */}
       <div className='B34btn'>
-        {['3', '4'].includes(key) && topInfo.audits && topInfo.audits.length ? (
+        {['3', '4'].includes(key) &&
+        topInfo.audits &&
+        topInfo.audits.length &&
+        [3, 4, 5].includes(topInfo.status) ? (
           <Button type='primary' onClick={() => setAuditsShow(true)}>
             申请记录
           </Button>

src/pages/C_goodsManage/C1register/C1look/index.tsx

@@ -213,7 +213,10 @@ function C1look() {
 
       {/* 底部按钮 */}
       <div className='C1lBtn'>
-        {['3', '4'].includes(key) && topInfo.audits && topInfo.audits.length ? (
+        {['3', '4'].includes(key) &&
+        topInfo.audits &&
+        topInfo.audits.length &&
+        [3, 4, 5].includes(topInfo.status) ? (
           <Button type='primary' onClick={() => setAuditsShow(true)}>
             申请记录
           </Button>

src/pages/C_goodsManage/C21wealth/C21edit/index.tsx

@@ -488,7 +488,10 @@ function C21edit() {
 
       {/* 底部按钮 */}
       <div className='D4btn'>
-        {['3', '4'].includes(key) && topInfo.audits && topInfo.audits.length ? (
+        {['3', '4'].includes(key) &&
+        topInfo.audits &&
+        topInfo.audits.length &&
+        [3, 4, 5].includes(topInfo.status) ? (
           <Button type='primary' onClick={() => setAuditsShow(true)}>
             申请记录
           </Button>

src/pages/C_goodsManage/C22goodEdit/C22look/index.tsx

@@ -267,7 +267,10 @@ function C22look() {
 
       {/* 底部按钮 */}
       <div className='C22lBtn'>
-        {['3', '4'].includes(key) && topInfo.audits && topInfo.audits.length ? (
+        {['3', '4'].includes(key) &&
+        topInfo.audits &&
+        topInfo.audits.length &&
+        [3, 4, 5].includes(topInfo.status) ? (
           <Button type='primary' onClick={() => setAuditsShow(true)}>
             申请记录
           </Button>

src/pages/D_storeManage/D4impStor/D4edit/index.tsx

@@ -681,7 +681,10 @@ function D4edit() {
 
         {/* 底部按钮 */}
         <div className='D4btn'>
-          {['3', '4'].includes(key) && topInfo.audits && topInfo.audits.length ? (
+          {['3', '4'].includes(key) &&
+          topInfo.audits &&
+          topInfo.audits.length &&
+          [3, 4, 5].includes(topInfo.status) ? (
             <Button type='primary' onClick={() => setAuditsShow(true)}>
               申请记录
             </Button>

src/pages/D_storeManage/D5moveStor/D5edit/index.tsx

@@ -709,7 +709,10 @@ function D5edit() {
 
         {/* 底部按钮 */}
         <div className='D5btn'>
-          {['3', '4'].includes(key) && topInfo.audits && topInfo.audits.length ? (
+          {['3', '4'].includes(key) &&
+          topInfo.audits &&
+          topInfo.audits.length &&
+          [3, 4, 5].includes(topInfo.status) ? (
             <Button type='primary' onClick={() => setAuditsShow(true)}>
               申请记录
             </Button>

src/pages/D_storeManage/D6putsStor/D6edit/index.tsx

@@ -809,7 +809,10 @@ function D6edit() {
 
         {/* 底部按钮 */}
         <div className='D6btn'>
-          {['3', '4'].includes(key) && topInfo.audits && topInfo.audits.length ? (
+          {['3', '4'].includes(key) &&
+          topInfo.audits &&
+          topInfo.audits.length &&
+          [3, 4, 5].includes(topInfo.status) ? (
             <Button type='primary' onClick={() => setAuditsShow(true)}>
               申请记录
             </Button>

src/pages/D_storeManage/D7check/D7edit/index.tsx

@@ -502,7 +502,10 @@ function D7edit() {
 
       {/* 底部按钮 */}
       <div className='D4btn'>
-        {['3', '4'].includes(key) && topInfo.audits && topInfo.audits.length ? (
+        {['3', '4'].includes(key) &&
+        topInfo.audits &&
+        topInfo.audits.length &&
+        [3, 4, 5].includes(topInfo.status) ? (
           <Button type='primary' onClick={() => setAuditsShow(true)}>
             申请记录
           </Button>

src/pages/D_storeManage/D8cancel/D8edit/index.tsx

@@ -503,7 +503,10 @@ function D8edit() {
 
         {/* 底部按钮 */}
         <div className='D8btn'>
-          {['3', '4'].includes(key) && topInfo.audits && topInfo.audits.length ? (
+          {['3', '4'].includes(key) &&
+          topInfo.audits &&
+          topInfo.audits.length &&
+          [3, 4, 5].includes(topInfo.status) ? (
             <Button type='primary' onClick={() => setAuditsShow(true)}>
               申请记录
             </Button>

src/pages/E_goodsStorage/E1accident/E1edit/index.tsx

@@ -558,7 +558,10 @@ function E1edit() {
 
       {/* 底部按钮 */}
       <div className='E1btn'>
-        {['3', '4'].includes(key) && topInfo.audits && topInfo.audits.length ? (
+        {['3', '4'].includes(key) &&
+        topInfo.audits &&
+        topInfo.audits.length &&
+        [3, 4, 5].includes(topInfo.status) ? (
           <Button type='primary' onClick={() => setAuditsShow(true)}>
             申请记录
           </Button>

src/pages/E_goodsStorage/E3actuality/E3edit/index.tsx

@@ -522,7 +522,10 @@ function E3edit() {
 
       {/* 底部按钮 */}
       <div className='E3btn'>
-        {['3', '4'].includes(key) && topInfo.audits && topInfo.audits.length ? (
+        {['3', '4'].includes(key) &&
+        topInfo.audits &&
+        topInfo.audits.length &&
+        [3, 4, 5].includes(topInfo.status) ? (
           <Button type='primary' onClick={() => setAuditsShow(true)}>
             申请记录
           </Button>

src/pages/E_goodsStorage/E4repair/E4edit/index.tsx

@@ -577,7 +577,10 @@ function E4edit() {
 
         {/* 底部按钮 */}
         <div className='E4btn'>
-          {['3', '4'].includes(key) && topInfo.audits && topInfo.audits.length ? (
+          {['3', '4'].includes(key) &&
+          topInfo.audits &&
+          topInfo.audits.length &&
+          [3, 4, 5].includes(topInfo.status) ? (
             <Button type='primary' onClick={() => setAuditsShow(true)}>
               申请记录
             </Button>

src/pages/F_exhibition/F1exhibition/F1edit/index.tsx

@@ -564,7 +564,10 @@ function F1edit() {
 
       {/* 底部按钮 */}
       <div className='D4btn'>
-        {['3', '4'].includes(key) && topInfo.audits && topInfo.audits.length ? (
+        {['3', '4'].includes(key) &&
+        topInfo.audits &&
+        topInfo.audits.length &&
+        [3, 4, 5].includes(topInfo.status) ? (
           <Button type='primary' onClick={() => setAuditsShow(true)}>
             申请记录
           </Button>

src/utils/tableData.ts

@@ -52,11 +52,11 @@ selectObj['入藏去向'].forEach(v => {
 // 申请状态
 export const statusObj = {
   1: '草稿',
-  6: '待提交',
   2: '待审批',
   3: '审批不通过',
   4: '已完成',
-  5: '待盘点'
+  6: '待提交'
+  // 5: '待盘点'
 }
 
 // 业务中心
@@ -148,9 +148,9 @@ export const B3eTableC = [
 ]
 
 export const B3FtableC = [
-  ['txt', '节点名称', 'name'],
-  ['txt', '提交日期', 'updateTime'],
-  ['txt', '处理人', 'creatorName']
+  ['txt', '节点名称', 'nodeName'],
+  ['txt', '提交日期', 'createTime'],
+  ['txt', '处理人', 'handler']
 ]
 
 export const D1GtableC = [