up

src/components/MyPopconfirm.tsx

@@ -2,7 +2,15 @@ import React, { useMemo } from 'react'
 import { Button, Popconfirm } from 'antd'
 
 type Props = {
-  txtK: '删除' | '取消' | '重置密码' | '退出登录' | '清空' | '撤回' | '恢复'
+  txtK:
+    | '删除'
+    | '取消'
+    | '重置密码'
+    | '退出登录'
+    | '清空数据'
+    | '撤回'
+    | '恢复'
+    | '导入当前合格数据'
   onConfirm: () => void
   Dom?: React.ReactNode
   loc?: 'bottom'
@@ -15,9 +23,10 @@ function MyPopconfirm({ txtK, onConfirm, Dom, loc }: Props) {
       取消: ['放弃编辑后，信息将不会保存!', '放弃'],
       重置密码: ['密码重制后为Aa147852，是否重置?', '重置'],
       退出登录: ['确定退出吗?', '确定'],
-      清空: ['确定清空吗?', '确定'],
+      清空数据: ['确定清空吗?', '确定'],
       撤回: ['确定撤回吗?', '确定'],
-      恢复: ['确定恢复吗?', '确定']
+      恢复: ['确定恢复吗?', '确定'],
+      导入当前合格数据: ['确定导入吗?如数据太大可能需要等待', '确定']
     }
     return Reflect.get(obj, txtK) || ['', '']
   }, [txtK])
@@ -33,7 +42,7 @@ function MyPopconfirm({ txtK, onConfirm, Dom, loc }: Props) {
     >
       {Dom ? (
         Dom
-      ) : ['删除', '恢复'].includes(txtK) ? (
+      ) : ['删除', '恢复', '导入当前合格数据', '清空数据'].includes(txtK) ? (
         <Button size='small' type='text' danger>
           {txtK}
         </Button>

src/pages/B_enterTibet/B1collect/B1edit/B1MoAdd/index.module.scss

@@ -0,0 +1,34 @@
+.B1MoAdd {
+  :global {
+    .ant-modal-close {
+      display: none;
+    }
+
+    .ant-modal {
+      width: 1000px !important;
+    }
+
+    .B1Mmain {
+      border-top: 1px solid #999999;
+      padding-top: 15px;
+      width: 100%;
+
+      .B1MformBox {
+        display: flex;
+        flex-wrap: wrap;
+        .ant-form-item {
+          width: calc(50% - 20px);
+          margin-right: 40px;
+          &:nth-of-type(2n) {
+            margin-right: 0;
+          }
+        }
+      }
+
+      .ant-form-item-label {
+        max-width: 98px;
+        min-width: 98px;
+      }
+    }
+  }
+}

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

@@ -0,0 +1,78 @@
+import React, { useCallback, useRef } from 'react'
+import styles from './index.module.scss'
+import { Button, Form, FormInstance, Input, Modal, Select } from 'antd'
+import MyPopconfirm from '@/components/MyPopconfirm'
+
+type Props = {
+  sId: number
+  info: any
+  closeFu: () => void
+  succFu: () => void
+}
+
+function B1MoAdd({ sId, info, closeFu, succFu }: Props) {
+  // 设置表单初始数据（区分编辑和新增）
+  const FormBoxRef = useRef<FormInstance>(null)
+
+  // 没有通过校验
+  const onFinishFailed = useCallback(() => {
+    // return MessageFu.warning("有表单不符号规则!");
+  }, [])
+
+  // 通过校验点击确定
+  const onFinish = useCallback(async (values: any) => {}, [])
+
+  return (
+    <Modal
+      wrapClassName={styles.B1MoAdd}
+      destroyOnClose
+      open={true}
+      title={`征集线索-${info.id > 0 ? '编辑' : '新增'}`}
+      footer={
+        [] // 设置footer为空，去掉 取消 确定默认按钮
+      }
+    >
+      <div className='B1Mmain'>
+        <Form
+          scrollToFirstError={true}
+          ref={FormBoxRef}
+          name='basic'
+          onFinish={onFinish}
+          onFinishFailed={onFinishFailed}
+          autoComplete='off'
+        >
+          <div className='B1MformBox'>
+            <Form.Item
+              label='线索名称'
+              name='aaaa'
+              rules={[{ required: true, message: '请输入线索名称' }]}
+            >
+              <Input maxLength={30} showCount placeholder='请输入内容' />
+            </Form.Item>
+
+            <Form.Item
+              label='线索类别'
+              name='bbbb'
+              rules={[{ required: true, message: '请选择线索类别' }]}
+            >
+              <Select placeholder='请选择' />
+            </Form.Item>
+          </div>
+
+          {/* 确定和取消按钮 */}
+          <Form.Item style={{ textAlign: 'center' }}>
+            <Button type='primary' htmlType='submit'>
+              提交
+            </Button>
+            &emsp;
+            <MyPopconfirm txtK='取消' onConfirm={closeFu} />
+          </Form.Item>
+        </Form>
+      </div>
+    </Modal>
+  )
+}
+
+const MemoB1MoAdd = React.memo(B1MoAdd)
+
+export default MemoB1MoAdd

src/pages/B_enterTibet/B1collect/B1edit/index.module.scss

@@ -0,0 +1,125 @@
+.B1edit {
+  background-color: #fff;
+  border-radius: 10px;
+  padding: 15px 24px 0px;
+  :global {
+    .B1Tit {
+      font-size: 18px;
+      font-weight: 700;
+      padding-bottom: 10px;
+      padding-left: 18px;
+      border-bottom: 1px solid #ccc;
+      margin-bottom: 17px;
+      color: var(--themeColor);
+      .ant-btn {
+        margin-left: 15px;
+        pointer-events: none;
+      }
+    }
+    .B1Tit2 {
+      margin-top: 24px;
+      display: flex;
+      justify-content: space-between;
+      padding-bottom: 10px;
+      border-bottom: 1px solid #ccc;
+      margin-bottom: 20px;
+      .B1Tit2ll {
+        font-size: 18px;
+        font-weight: 700;
+        padding-left: 18px;
+        margin-bottom: 17px;
+        color: var(--themeColor);
+      }
+      .B1Tit2rr {
+        position: relative;
+        z-index: 2;
+        .ant-btn {
+          margin-left: 15px;
+        }
+      }
+    }
+
+    .B1main {
+      width: 100%;
+      height: calc(100% - 70px);
+      overflow-y: auto;
+      padding-bottom: 40px;
+
+      .B1rowAll {
+        display: flex;
+        justify-content: space-between;
+        align-items: self-start;
+        font-size: 16px;
+        flex-wrap: wrap;
+        .B1row {
+          width: 48%;
+          display: flex;
+          align-items: center;
+          margin-bottom: 20px;
+          .B1rowll {
+            width: 110px;
+            text-align: right;
+            font-weight: 700;
+            & > span {
+              color: #ff4b1f;
+            }
+          }
+          .B1rowrr {
+            width: calc(100% - 110px);
+            .ant-input-affix-wrapper {
+              width: 300px;
+            }
+            .ant-select {
+              width: 300px;
+            }
+          }
+        }
+        .B1row2 {
+          align-items: self-start;
+          .B1rowll {
+            position: relative;
+            top: 3px;
+          }
+        }
+        .B1row3 {
+          position: relative;
+          top: 4px;
+        }
+
+        .B1rowFull {
+          width: 100%;
+          margin-top: -20px;
+          align-items: self-start;
+          margin-bottom: 0;
+          .B1rowll {
+            position: relative;
+            top: 3px;
+          }
+        }
+      }
+      // 征集线索
+      .B1googsBox {
+        padding-right: 20px;
+        margin-top: 24px;
+
+        .B1tab2Tit {
+          font-weight: 700;
+          color: var(--themeColor);
+        }
+      }
+    }
+
+    .B1btn {
+      position: absolute;
+      bottom: 20px;
+      left: 134px;
+      .ant-btn {
+        margin-right: 20px;
+      }
+    }
+
+    .ant-table-cell {
+      padding: 8px !important;
+    }
+  }
+}

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

@@ -0,0 +1,263 @@
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import styles from './index.module.scss'
+import { useParams } from 'react-router-dom'
+import X3auditInfo from '@/pages/X_stock/X3auditInfo'
+import { MessageFu } from '@/utils/message'
+import history from '@/utils/history'
+import { Button, DatePicker, Input } from 'antd'
+import MyPopconfirm from '@/components/MyPopconfirm'
+import dayjs from 'dayjs'
+import { B3aForm1 } from '../../B3_4page/B3edit/data'
+import Z3upFiles from '@/components/Z3upFiles'
+import ZRichTexts from '@/components/ZRichTexts'
+import MyTable from '@/components/MyTable'
+import { B1TableC } from '@/utils/tableData'
+import { pageTitTxtObj } from '@/pages/D_storeManage/D4impStor/D4edit'
+import B1MoAdd from './B1MoAdd'
+function B1edit() {
+  const { key, id } = useParams<any>()
+
+  // 滚到顶部
+  const sollrDom = useRef<HTMLDivElement>(null)
+
+  useEffect(() => {
+    console.log('key:', key)
+
+    if (sollrDom.current) sollrDom.current.scrollTop = 0
+  }, [key])
+
+  // 上传附件的ref
+  const filesRef = useRef<any>(null)
+  // const filesRes = filesRef.current.filesIdRes();
+
+  // 富文本的ref
+  const ZRichTextRef = useRef<any>(null)
+
+  // 审批意见的ref
+  const ZAuditRef = useRef<any>(null)
+
+  // 设置富文本
+  //  ZRichTextRef.current?.ritxtShowFu(JSON.parse(data.rtf))
+
+  const timeChange = useCallback((e: any) => {
+    console.log(123, e)
+  }, [])
+
+  // 新增的底部按钮点击
+  const btnClickFu = useCallback((val: number) => {
+    const rtf1 = ZRichTextRef.current?.fatherBtnOkFu() || { flag: true }
+    console.log('申请信息富文本', JSON.stringify(rtf1.val || ''))
+
+    const rtf2 = ZAuditRef.current?.resData()
+    console.log('审批信息富文本', rtf2)
+
+    // if (1 + 1 === 2) return
+
+    if (val === 2) {
+      // 存草稿 当前页保存 不跳转
+      MessageFu.success('草稿保存成功')
+    } else {
+      // 跳到详情页
+      history.push(`/collect_edit/4/111`)
+    }
+  }, [])
+
+  // 点击删除
+  const delTableFu = useCallback(async (id: number) => {}, [])
+
+  const tableLastBtn = useMemo(() => {
+    return [
+      {
+        title: '操作',
+        render: (item: any) => {
+          return (
+            <>
+              <Button size='small' type='text' onClick={() => setOpenInfo(item)}>
+                编辑
+              </Button>
+              {['3', '4'].includes(key) ? null : (
+                <MyPopconfirm txtK='删除' onConfirm={() => delTableFu(item.id)} />
+              )}
+            </>
+          )
+        }
+      }
+    ]
+  }, [delTableFu, key])
+
+  // 审批的sta
+  const [auditSta, setAuDitSta] = useState('')
+
+  // 查看模式下的按钮 待完善
+  const lookBtn = useMemo(() => {
+    return (
+      <>
+        <Button type='primary'>创建</Button>
+        <Button type='primary'>提交</Button>
+        <MyPopconfirm
+          txtK='撤回'
+          onConfirm={() => {}}
+          Dom={
+            <Button type='primary' danger>
+              撤回
+            </Button>
+          }
+        />
+
+        <Button type='primary'>审批</Button>
+        <Button type='primary'>编辑</Button>
+        <Button type='primary'>重新提交</Button>
+        <Button type='primary'>导出</Button>
+        <MyPopconfirm
+          txtK='删除'
+          onConfirm={() => {}}
+          Dom={
+            <Button type='primary' danger>
+              删除
+            </Button>
+          }
+        />
+        <Button onClick={() => history.push('/collect')}>返回</Button>
+      </>
+    )
+  }, [])
+
+  // 征集线索
+  const [openInfo, setOpenInfo] = useState<any>({ id: 0 })
+
+  return (
+    <div className={styles.B1edit}>
+      <div className='pageTitle'>藏品征集-{Reflect.get(pageTitTxtObj, key)}</div>
+
+      <div className='B1main'>
+        {['3'].includes(key) ? (
+          <X3auditInfo auditSta={auditSta} auditStaFu={val => setAuDitSta(val)} ref={ZAuditRef} />
+        ) : null}
+
+        {/* 表单字段、附件等 */}
+        <div className='B1Tit'>
+          {/* 待完善 */}
+          申请信息
+          <Button type='dashed'>草稿</Button>
+        </div>
+        <div className='B1rowAll'>
+          <div className='B1row'>
+            <div className='B1rowll'>
+              <span> * </span>计划名称：
+            </div>
+            <div className='B1rowrr'>
+              <Input
+                readOnly={['3', '4'].includes(key)}
+                placeholder='请输入内容'
+                maxLength={30}
+                showCount
+              />
+            </div>
+          </div>
+
+          <div className='B1row'>
+            <div className='B1rowll'>
+              <span> * </span>业务日期：
+            </div>
+            <div className='B1rowrr'>
+              <DatePicker
+                disabled={['3', '4'].includes(key)}
+                allowClear={false}
+                value={dayjs()}
+                onChange={timeChange}
+              />
+            </div>
+          </div>
+
+          {B3aForm1.map(v => (
+            <div className='B1row' key={v.name}>
+              <div className='B1rowll'>{v.name}：</div>
+              <div className='B1rowrr'>
+                这是一段文本
+                {['3', '4'].includes(key) && v.name === '发起人'
+                  ? ' - 查看和审批后面显示创建时间'
+                  : ''}
+              </div>
+            </div>
+          ))}
+
+          <div className='B1row B1row2'>
+            <div className='B1rowll'>附件：</div>
+            <div className='B1rowrr'>
+              <Z3upFiles
+                max={10}
+                isLook={['3', '4'].includes(key)}
+                ref={filesRef}
+                fileCheck={false}
+                dirCode={'xxxxxxx'}
+                myUrl='xxxxxxxxxxxx'
+                lookData={[]}
+                size={500}
+              />
+            </div>
+          </div>
+
+          <div className='B1row'>
+            <div className='B1rowll'>原因事由：</div>
+            <div className='B1rowrr'>
+              <Input
+                readOnly={['3', '4'].includes(key)}
+                placeholder='请输入内容'
+                maxLength={30}
+                showCount
+              />
+            </div>
+          </div>
+
+          <div className='B1row B1rowFull'>
+            <div className='B1rowll'>备注：</div>
+            <div className='B1rowrr'>
+              <ZRichTexts
+                check={false}
+                dirCode={'xxxxxxxx'}
+                isLook={['3', '4'].includes(key)}
+                ref={ZRichTextRef}
+                myUrl='xxxxxxxxxx'
+                isOne={true}
+                upAudioBtnNone={true}
+              />
+            </div>
+          </div>
+        </div>
+
+        {/* 征集线索 */}
+        <div className='B1googsBox'>
+          <div className='B1Tit2'>
+            <div className='B1Tit2ll'>征集线索</div>
+            <div className='B1Tit2rr'>
+              {['3', '4'].includes(key) ? null : (
+                <Button type='primary' onClick={() => setOpenInfo({ id: -1 })}>
+                  新增
+                </Button>
+              )}
+            </div>
+          </div>
+
+          {/* 表格 */}
+          <MyTable
+            list={[{ id: 101 }]}
+            columnsTemp={B1TableC}
+            lastBtn={tableLastBtn}
+            pagingInfo={false}
+          />
+        </div>
+
+        {/* main-end */}
+      </div>
+
+      {/* 征集线索 */}
+      {openInfo.id ? (
+        <B1MoAdd sId={id} info={openInfo} closeFu={() => setOpenInfo({})} succFu={() => {}} />
+      ) : null}
+    </div>
+  )
+}
+
+const MemoB1edit = React.memo(B1edit)
+
+export default MemoB1edit

src/pages/B_enterTibet/B1collect/index.module.scss

@@ -1,4 +1,27 @@
 .B1collect {
+  background-color: #fff;
+  border-radius: 10px;
+  padding: 15px 24px 0;
   :global {
+    .B1top {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 15px;
+      .B1topll {
+        display: flex;
+        & > div {
+          position: relative;
+          margin-right: 15px;
+          display: flex;
+          align-items: center;
+          .ant-input {
+            width: 160px;
+          }
+        }
+      }
+    }
+    .ant-table-cell {
+      padding: 8px !important;
+    }
   }
 }

src/pages/B_enterTibet/B1collect/index.tsx

@@ -1,10 +1,204 @@
-import React from 'react'
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import styles from './index.module.scss'
+import { B3_4inputKeyArr, B3baseFormData, D3InputKeyType } from '../B3_4page'
+import history from '@/utils/history'
+import { Button, DatePicker, Input, Select } from 'antd'
+import MyPopconfirm from '@/components/MyPopconfirm'
+import dayjs from 'dayjs'
+import MyTable from '@/components/MyTable'
+import { B3tableC } from '@/utils/tableData'
+const { RangePicker } = DatePicker
+
 function B1collect() {
+  // 没有接入后端 待完善
+
+  const [formData, setFormData] = useState(B3baseFormData)
+  const formDataRef = useRef(B3baseFormData)
+
+  useEffect(() => {
+    formDataRef.current = formData
+  }, [formData])
+
+  // 点击搜索的 时间戳
+  const [timeKey, setTimeKey] = useState(0)
+
+  // 点击搜索
+  const clickSearch = useCallback(() => {
+    setFormData({ ...formData, pageNum: 1 })
+    setTimeout(() => {
+      setTimeKey(Date.now())
+    }, 50)
+  }, [formData])
+
+  // 时间选择器改变
+  const timeChange = useCallback(
+    (date: any, dateString: any) => {
+      let startTime = ''
+      let endTime = ''
+      if (dateString[0] && dateString[1]) {
+        startTime = dateString[0] + ' 00:00:00'
+        endTime = dateString[1] + ' 23:59:59'
+      }
+      setFormData({ ...formData, startTime, endTime })
+    },
+    [formData]
+  )
+
+  // 封装发送请求的函数
+  const getListFu = useCallback(() => {
+    console.log('发送请求', formDataRef.current)
+  }, [])
+
+  useEffect(() => {
+    getListFu()
+  }, [getListFu, timeKey])
+
+  // 输入框的改变
+  const txtChangeFu = useCallback(
+    (txt: string, key: D3InputKeyType) => {
+      setFormData({
+        ...formData,
+        [key]: txt
+      })
+    },
+    [formData]
+  )
+
+  // 点击重置
+  const resetSelectFu = useCallback(() => {
+    setFormData(B3baseFormData)
+    setTimeout(() => {
+      setTimeKey(Date.now())
+    }, 50)
+  }, [])
+
+  // 页码变化
+  const paginationChange = useCallback(
+    (pageNum: number, pageSize: number) => {
+      setFormData({ ...formData, pageNum, pageSize })
+      setTimeout(() => {
+        setTimeKey(Date.now())
+      }, 50)
+    },
+    [formData]
+  )
+
+  // 点击删除
+  const delTableFu = useCallback(
+    async (id: number) => {
+      getListFu()
+    },
+    [getListFu]
+  )
+
+  // 点击各种操作按钮
+  const btnFu = useCallback((id: number | string, key: string) => {
+    history.push(`/collect_edit/${key}/${id}`)
+  }, [])
+
+  const tableLastBtn = useMemo(() => {
+    //   看状态和账号角色显示按钮 待完善
+    return [
+      {
+        title: '操作',
+        render: (item: any) => {
+          return (
+            <>
+              <Button size='small' type='text' onClick={() => btnFu(item.id, '2')}>
+                编辑
+              </Button>
+              <Button size='small' type='text' onClick={() => btnFu(item.id, '3')}>
+                审批
+              </Button>
+              <Button size='small' type='text' onClick={() => btnFu(item.id, '4')}>
+                查看
+              </Button>
+              <MyPopconfirm txtK='删除' onConfirm={() => delTableFu(item.id)} />
+            </>
+          )
+        }
+      }
+    ]
+  }, [btnFu, delTableFu])
+
   return (
     <div className={styles.B1collect}>
       <div className='pageTitle'>藏品征集</div>
-      <p>待开发</p>
+      <div className='B1top'>
+        <div className='B1topll'>
+          {B3_4inputKeyArr.map(item => (
+            <div key={item.name}>
+              <span>{item.name}：</span>
+              <Input
+                placeholder={`请输入${item.name}`}
+                maxLength={30}
+                value={formData[item.key]}
+                onChange={e => txtChangeFu(e.target.value, item.key)}
+              />
+            </div>
+          ))}
+        </div>
+        <div className='B1toprr'>
+          <Button type='primary'>批量导出</Button>&emsp;
+          <Button type='primary' onClick={() => btnFu('null', '1')}>
+            新增
+          </Button>
+        </div>
+      </div>
+      <div className='B1top'>
+        <div className='B1topll'>
+          <div>
+            <span>发起日期范围：</span>
+            <RangePicker
+              value={
+                formData.startTime ? [dayjs(formData.startTime), dayjs(formData.endTime)] : null
+              }
+              onChange={timeChange}
+            />
+          </div>
+
+          <div>
+            <span>申请状态：</span>
+            <Select
+              placeholder='请选择'
+              style={{ width: 200 }}
+              value={formData.eeee}
+              onChange={e => setFormData({ ...formData, eeee: e })}
+              options={[{ value: '', label: '全部' }]}
+            />
+          </div>
+
+          <div>
+            <span>选择角色：</span>
+            <Select
+              style={{ width: 200 }}
+              placeholder='请选择'
+              options={[]}
+              fieldNames={{ value: 'id', label: 'roleName' }}
+              value={formData.ffff}
+              onChange={e => setFormData({ ...formData, ffff: e })}
+            />
+          </div>
+        </div>
+        <div className='B1toprr'>
+          <Button type='primary' onClick={clickSearch}>
+            查询
+          </Button>
+          &emsp;<Button onClick={resetSelectFu}>重置</Button>
+        </div>
+      </div>
+
+      {/* 表格 */}
+      <MyTable
+        yHeight={610}
+        list={[{ id: 91 }]}
+        columnsTemp={B3tableC}
+        lastBtn={tableLastBtn}
+        pageNum={formData.pageNum}
+        pageSize={formData.pageSize}
+        total={0}
+        onChange={(pageNum, pageSize) => paginationChange(pageNum, pageSize)}
+      />
     </div>
   )
 }

src/pages/C_goodsManage/C4import/index.module.scss

@@ -1,4 +1,24 @@
 .C4import {
+  background-color: #fff;
+  border-radius: 10px;
+  padding: 15px 24px 0;
   :global {
+    .C4tit {
+      color: #999;
+      margin-left: 10px;
+      font-size: 14px;
+      font-weight: 400;
+    }
+    .C4top {
+      text-align: right;
+      margin-bottom: 35px;
+    }
+
+    .C4base {
+      height: 80%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
   }
 }

src/pages/C_goodsManage/C4import/index.tsx

@@ -1,10 +1,69 @@
-import React from 'react'
+import React, { useMemo, useState } from 'react'
 import styles from './index.module.scss'
+import { Button } from 'antd'
+import MyTable from '@/components/MyTable'
+import { C4tableC } from '@/utils/tableData'
+import MyPopconfirm from '@/components/MyPopconfirm'
 function C4import() {
+  const tableLastBtn = useMemo(() => {
+    return [
+      {
+        title: '导入结果',
+        render: (item: any) => (
+          <Button size='small' type='text'>
+            <a href={item.src} download target='_blank' rel='noreferrer'>
+              下载
+            </a>
+          </Button>
+        )
+      },
+      {
+        title: '操作',
+        render: (item: any) => {
+          return (
+            <>
+              <>
+                <MyPopconfirm txtK='导入当前合格数据' onConfirm={() => {}} />
+                <Button size='small' type='text' onClick={() => setList([])}>
+                  重新上传
+                </Button>
+                <MyPopconfirm txtK='清空数据' onConfirm={() => {}} />
+              </>
+            </>
+          )
+        }
+      }
+    ]
+  }, [])
+
+  const [list, setList] = useState<any[]>([])
+
   return (
     <div className={styles.C4import}>
-      <div className='pageTitle'>藏品导入</div>
-      <p>待开发</p>
+      <div className='pageTitle'>
+        藏品导入<span className='C4tit'>最多支持单次导入1000条</span>
+      </div>
+
+      <div className='C4top'>
+        <Button>下载模板</Button>
+      </div>
+      {list.length ? (
+        <MyTable list={list} columnsTemp={C4tableC} lastBtn={tableLastBtn} pagingInfo={false} />
+      ) : (
+        <div className='C4base'>
+          <Button
+            size='large'
+            type='primary'
+            onClick={() =>
+              setList([{ id: 1, hang1: '560', hang2: '520', hang3: '40', src: 'xxxx' }])
+            }
+          >
+            上传表格
+          </Button>
+        </div>
+      )}
+
+      {/* 表格 */}
     </div>
   )
 }

src/pages/C_goodsManage/C6edit/C6add/index.tsx

@@ -232,10 +232,7 @@ function C6add() {
 
   return (
     <div className={styles.C6add}>
-      <div className='pageTitle'>
-        {/* 待完善id */}
-        藏品编辑-{Reflect.get(pageTitTxtObj, key)}-{id}
-      </div>
+      <div className='pageTitle'>藏品编辑-{Reflect.get(pageTitTxtObj, key)}</div>
 
       <div className='C6main' ref={sollrDom}>
         {['3'].includes(key) ? (

src/pages/C_goodsManage/C6edit/index.tsx

@@ -93,7 +93,7 @@ function C6edit() {
 
   // 点击各种操作按钮
   const btnFu = useCallback((id: number | string, key: string) => {
-    history.push(`edit_add/${key}/${id}`)
+    history.push(`/edit_add/${key}/${id}`)
   }, [])
 
   const tableLastBtn = useMemo(() => {

src/pages/Layout/data.ts

@@ -11,37 +11,37 @@ const tabLeftArr: RouterType = [
         name: '数据统计',
         path: '/',
         Com: React.lazy(() => import('../A_workbench/A1dataSta'))
+      },
+      {
+        id: 120,
+        name: '业务中心333',
+        path: '/business',
+        Com: React.lazy(() => import('../A_workbench/A2business'))
+      },
+      {
+        id: 130,
+        name: '流程管理444',
+        path: '/flow',
+        Com: React.lazy(() => import('../A_workbench/A3flow'))
       }
-      // {
-      //   id: 120,
-      //   name: '业务中心',
-      //   path: '/business',
-      //   Com: React.lazy(() => import('../A_workbench/A2business'))
-      // },
-      // {
-      //   id: 130,
-      //   name: '流程管理',
-      //   path: '/flow',
-      //   Com: React.lazy(() => import('../A_workbench/A3flow'))
-      // }
     ]
   },
   {
     id: 2,
     name: '入藏管理',
     son: [
-      // {
-      //   id: 210,
-      //   name: '藏品征集',
-      //   path: '/collect',
-      //   Com: React.lazy(() => import('../B_enterTibet/B1collect'))
-      // },
-      // {
-      //   id: 220,
-      //   name: '藏品鉴定',
-      //   path: '/identify',
-      //   Com: React.lazy(() => import('../B_enterTibet/B2identify'))
-      // },
+      {
+        id: 210,
+        name: '藏品征集111',
+        path: '/collect',
+        Com: React.lazy(() => import('../B_enterTibet/B1collect'))
+      },
+      {
+        id: 220,
+        name: '藏品鉴定222',
+        path: '/identify',
+        Com: React.lazy(() => import('../B_enterTibet/B2identify'))
+      },
       {
         id: 230,
         name: '藏品入馆',
@@ -80,7 +80,7 @@ const tabLeftArr: RouterType = [
       // },
       {
         id: 340,
-        name: '藏品导入333',
+        name: '藏品导入',
         path: '/import',
         Com: React.lazy(() => import('../C_goodsManage/C4import'))
       },
@@ -126,42 +126,42 @@ const tabLeftArr: RouterType = [
         path: '/storSet',
         Com: React.lazy(() => import('../D_storeManage/D2storSet'))
       },
-      // {
-      //   id: 430,
-      //   name: '人员出入库',
-      //   path: '/staff',
-      //   Com: React.lazy(() => import('../D_storeManage/D3staff'))
-      // },
+      {
+        id: 430,
+        name: '人员出入库19',
+        path: '/staff',
+        Com: React.lazy(() => import('../D_storeManage/D3staff'))
+      },
       {
         id: 440,
         name: '入库',
         path: '/impStor',
         Com: React.lazy(() => import('../D_storeManage/D4impStor'))
       },
-      // {
-      //   id: 450,
-      //   name: '移库',
-      //   path: '/moveStor',
-      //   Com: React.lazy(() => import('../D_storeManage/D5moveStor'))
-      // },
+      {
+        id: 450,
+        name: '移库20',
+        path: '/moveStor',
+        Com: React.lazy(() => import('../D_storeManage/D5moveStor'))
+      },
       {
         id: 460,
         name: '出库',
         path: '/putsStor',
         Com: React.lazy(() => import('../D_storeManage/D6putsStor'))
+      },
+      {
+        id: 470,
+        name: '盘点555',
+        path: '/check',
+        Com: React.lazy(() => import('../D_storeManage/D7check'))
+      },
+      {
+        id: 480,
+        name: '注销21',
+        path: '/cancel',
+        Com: React.lazy(() => import('../D_storeManage/D8cancel'))
       }
-      // {
-      //   id: 470,
-      //   name: '盘点',
-      //   path: '/check',
-      //   Com: React.lazy(() => import('../D_storeManage/D7check'))
-      // },
-      // {
-      //   id: 480,
-      //   name: '注销',
-      //   path: '/cancel',
-      //   Com: React.lazy(() => import('../D_storeManage/D8cancel'))
-      // }
     ]
   },
   // {
@@ -318,5 +318,13 @@ export const routerSon: RouterTypeRow = [
     name: '藏品编辑-新增/编辑/审批/查看',
     path: '/edit_add/:key/:id',
     Com: React.lazy(() => import('../C_goodsManage/C6edit/C6add'))
+  },
+
+  // ------------藏品征集------------------
+  {
+    id: 10,
+    name: '藏品征集-新增/编辑/审批/查看',
+    path: '/collect_edit/:key/:id',
+    Com: React.lazy(() => import('../B_enterTibet/B1collect/B1edit'))
   }
 ]

src/utils/tableData.ts

@@ -15,6 +15,14 @@
 //   ];
 
 // 待完善
+export const B1TableC = [
+  ['txt', '线索名称', 'description'],
+  ['txt', '线索类别', 'description'],
+  ['txt', '创建人', 'description'],
+  ['txt', '创建时间', 'description']
+]
+
+// 待完善
 export const B3eTableC = [
   ['img', '封面图', 'thumb'],
   ['txt', '编号类型', 'description'],
@@ -88,6 +96,13 @@ export const C2tableC = [
 ]
 
 // 待完善
+export const C4tableC = [
+  ['txt', '导入数据行数', 'hang1'],
+  ['txt', '合格数据行数', 'hang2'],
+  ['txt', '异常数据行数', 'hang3']
+]
+
+// 待完善
 export const D1tableC = [
   ['txt', '区域名称', 'name1'],
   ['txt', '排架', 'userName'],