up

src/pages/Benter/B3auth/B3edit/index.tsx

@@ -3,17 +3,9 @@ import styles from './index.module.scss'
 import { rowArrTemp } from '@/pages/Zother/data'
 import { InfoProvider } from '@/pages/Zother/InfoContext'
 import EditTop from '@/pages/Zother/EditTop'
-import { Button } from 'antd'
-import { API_getGoodsLists } from '@/store/action/Cledger/C1ledger'
-import { B3API_obj } from '@/store/action/Benter/B3auth'
+import { B3_APIgetClueList, B3API_obj } from '@/store/action/Benter/B3auth'
 import EditBtn from '@/pages/Zother/EditBtn'
-import { openLink } from '@/utils/history'
-import MyPopconfirm from '@/components/MyPopconfirm'
-import { goodsSonTableC } from '@/utils/tableData'
-import { sgBaseFormDataGood, sgTopSelectDomGood } from '@/pages/Zother/SonGoodsList/data'
-import EditTopDom from '@/pages/Zother/EditTopDom'
-import { GoodsType } from '@/pages/Zother/SonGoodsList/data'
-import ImageLazy from '@/components/ImageLazy'
+import { B3moreList } from '../data'
 
 const rowArr = [
   {
@@ -23,86 +15,6 @@ const rowArr = [
   ...rowArrTemp('入藏').slice(1)
 ]
 
-const rowArrDom = [
-  {
-    name: `关联藏品`,
-    must: true,
-    type: 'ChildTable',
-    key: 'goods',
-    full: true,
-    placeHolder: '选择藏品',
-    SelectGoodsProps: {
-      myType: '藏品',
-      isOne: true,
-      API_getList: API_getGoodsLists,
-      baseFormData: sgBaseFormDataGood,
-      topSelectDom: sgTopSelectDomGood,
-      columnsTemp: goodsSonTableC(true)
-    },
-    func: () => {
-      console.log('选择藏品')
-    },
-    callBackChildren: (selectedRows: GoodsType[], setSnapsFu: any) => {
-      return (
-        <div className='snipInfo'>
-          <ImageLazy width={60} height={60} src={selectedRows[0].thumb || ''} />
-          <div style={{ flex: 1, textAlign: 'left' }}>
-            {selectedRows[0]?.num ? selectedRows[0]?.num + '-' + selectedRows[0]?.name : ''}
-          </div>
-          <div>
-            <Button
-              style={{ marginRight: '0' }}
-              type='text'
-              size='small'
-              onClick={() => openLink(`/goodsLook/${selectedRows[0].id}`)}
-            >
-              查看
-            </Button>
-            <MyPopconfirm
-              txtK='删除'
-              onConfirm={() =>
-                setSnapsFu((prevSnaps: GoodsType[]) =>
-                  prevSnaps.filter(snap => snap.id !== selectedRows[0].id)
-                )
-              }
-            />
-          </div>
-        </div>
-      )
-    }
-  },
-  {
-    name: '鉴定部门',
-    type: 'Input',
-    key: 'unit'
-  },
-  {
-    name: '鉴定人员',
-    must: true,
-    type: 'Input',
-    key: 'member',
-    noNull: true
-  },
-  {
-    name: '鉴定过程',
-    type: 'TextArea',
-    full: true,
-    key: 'course'
-  },
-  {
-    name: '鉴定结论',
-    type: 'TextArea',
-    full: true,
-    key: 'conclusion'
-  },
-  {
-    name: '备注',
-    type: 'TextArea',
-    full: true,
-    key: 'remark'
-  }
-]
-
 function B3edit() {
   return (
     <InfoProvider>
@@ -114,11 +26,12 @@ function B3edit() {
             rowArr={rowArr}
             APIobj={B3API_obj}
             fileUpInfo={{ myUrl: 'cms/order/auth/upload', dirCode: 'auth' }}
-          />
-          <EditTopDom
-            rowArr={rowArrDom}
-            fileUpInfo={{ myUrl: 'cms/order/auth/upload', dirCode: 'auth' }}
-            Tit='鉴定报告'
+            // 第二个模块
+            moreDom={{
+              txt: '鉴定报告',
+              API: B3_APIgetClueList,
+              domList: B3moreList
+            }}
           />
 
           {/* 底部按钮 */}

src/pages/Benter/B3auth/data.ts

@@ -0,0 +1,32 @@
+export const B3moreList = [
+  {
+    name: '鉴定部门',
+    type: 'Input',
+    key: 'unit'
+  },
+  {
+    name: '鉴定人员',
+    must: true,
+    type: 'Input',
+    key: 'member',
+    noNull: true
+  },
+  {
+    name: '鉴定过程',
+    type: 'TextArea',
+    full: true,
+    key: 'course'
+  },
+  {
+    name: '鉴定结论',
+    type: 'TextArea',
+    full: true,
+    key: 'conclusion'
+  },
+  {
+    name: '备注',
+    type: 'TextArea',
+    full: true,
+    key: 'remark'
+  }
+]

src/pages/Zother/EditInput/index.module.scss

@@ -0,0 +1,4 @@
+// .EditInput {
+//   :global {
+//   }
+// }

src/pages/Zother/EditInput/index.tsx

@@ -0,0 +1,94 @@
+import React, { useCallback } from 'react'
+import classNames from 'classnames'
+import dayjs from 'dayjs'
+import { useInfo } from '../InfoContext'
+import { Cascader, DatePicker, Input } from 'antd'
+import TextArea from 'antd/es/input/TextArea'
+
+type Props = {
+  item: any
+  isLook: boolean
+}
+
+function EditInput({ item, isLook }: Props) {
+  const { info, setInfoFu } = useInfo()
+
+  // 数据改变
+  const dataChangeFu = useCallback(
+    (val: any, item: any) => {
+      const type = item.type
+      const key = item.key
+
+      if (type === 'DatePicker') {
+        setInfoFu({ ...info, [key]: dayjs(val).format('YYYY-MM-DD') })
+      } else if (['TextArea', 'Input'].includes(type)) {
+        const varRes = item.noNull ? val.replace(/\s+/g, '') : val
+        setInfoFu({
+          ...info,
+          [key]: varRes
+        })
+      } else if (type === 'Cascader') {
+        setInfoFu({ ...info, dictIdApply: val ? val.join(',') : '' })
+      }
+    },
+    [info, setInfoFu]
+  )
+
+  return (
+    <div className={classNames('Edtop1row', item.full ? 'Edtop1rowFull' : '')}>
+      <div className='Edtop1ll'>
+        {item.must ? <span>* </span> : null}
+        {item.name}：
+      </div>
+
+      <div className='Edtop1rr'>
+        {item.type === 'txt' ? (
+          <>
+            {dayjs(info.createTime).format('YYYY年MM月DD日')}-{info.deptName}-{info.creatorName}
+          </>
+        ) : item.type === 'DatePicker' ? (
+          <DatePicker
+            disabled={isLook}
+            allowClear={!item.must}
+            value={dayjs(info[item.key as 'date'])}
+            onChange={e => dataChangeFu(e, item)}
+            disabledDate={current => current && current > dayjs().endOf('day')}
+          />
+        ) : item.type === 'Input' ? (
+          <Input
+            readOnly={isLook}
+            placeholder='请输入'
+            value={info[item.key as 'date']}
+            onChange={e => dataChangeFu(e.target.value, item)}
+            maxLength={item.maxLength || 30}
+            showCount
+          />
+        ) : item.type === 'Cascader' ? (
+          <Cascader
+            disabled={isLook}
+            changeOnSelect
+            options={item.options}
+            placeholder={isLook ? '（空）' : '请选择'}
+            fieldNames={{ label: 'name', value: 'id', children: 'children' }}
+            allowClear={!item.must}
+            value={info[item.key as 'date'] ? (info[item.key as 'date'] as string).split(',') : []}
+            onChange={e => dataChangeFu(e, item)}
+          />
+        ) : item.type === 'TextArea' ? (
+          <TextArea
+            readOnly={isLook}
+            placeholder={isLook ? '（空）' : '请输入'}
+            value={info[item.key as 'date']}
+            onChange={e => dataChangeFu(e.target.value, item)}
+            maxLength={item.maxLength || 500}
+            showCount
+          />
+        ) : null}
+      </div>
+    </div>
+  )
+}
+
+const MemoEditInput = React.memo(EditInput)
+
+export default MemoEditInput

src/pages/Zother/EditTop/index.module.scss

@@ -44,6 +44,24 @@
             margin-right: 15px;
           }
         }
+
+        .Edtop1rr2 {
+          border-radius: 6px;
+          overflow: hidden;
+          width: calc(48% - 100px);
+          border: 1px solid #ccc;
+          height: 60px;
+          display: flex;
+          padding-right: 10px;
+          justify-content: space-between;
+          & > div {
+            height: 100%;
+            line-height: 60px;
+          }
+          .Edtop1rr2Txt {
+            color: var(--txtColor);
+          }
+        }
       }
       .Edtop1rowFull {
         width: 100%;

src/pages/Zother/EditTop/index.tsx

@@ -1,16 +1,21 @@
-import { useCallback, useEffect, useMemo } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 import styles from './index.module.scss'
 import { selectObj } from '@/utils/dataChange'
 import { useParams } from 'react-router-dom'
-import dayjs from 'dayjs'
-import { Button, Cascader, DatePicker, Input } from 'antd'
-import classNames from 'classnames'
+import { Button } from 'antd'
 import TextArea from 'antd/es/input/TextArea'
 import { useInfo } from '../InfoContext'
 import Z3upFiles from '@/components/Z3upFiles'
 import { API_objType } from '@/store/action/Dmanage/D1register'
 import { editPageToTopFu } from '@/utils/authority'
 import { FileUpInfoType } from '../data'
+import EditInput from '../EditInput'
+import SelectGoods from '../SelectGoods'
+import { GoodsType, sgBaseFormDataGood, sgTopSelectDomGood } from '../SonGoodsList/data'
+import { goodsSonTableC } from '@/utils/tableData'
+import ImageLazy from '@/components/ImageLazy'
+import { openLink } from '@/utils/history'
+import MyPopconfirm from '@/components/MyPopconfirm'
 
 export const pageKeyTxtObj = {
   1: '新增',
@@ -33,10 +38,19 @@ type Props = {
   APIobj: API_objType
   // 上传附件的信息
   fileUpInfo: FileUpInfoType
+  // 第二个模块
+  moreDom?: {
+    txt: string
+    API: any
+    domList: any[]
+    tit?: string
+    myUrl?: string
+    dirCode?: string
+  }
 }
 
-function EditTop({ rowArr, pageTxt, APIobj, fileUpInfo }: Props) {
-  const { info, setInfoFu, setSnapsFu, timeKey, auditInfo, setAuditInfoFu } = useInfo()
+function EditTop({ rowArr, pageTxt, APIobj, fileUpInfo, moreDom }: Props) {
+  const { info, setInfoFu, snaps, setSnapsFu, timeKey, auditInfo, setAuditInfoFu } = useInfo()
 
   const { key, id } = useParams<any>()
   // key:1 新增 2编辑 3审批 4查看
@@ -96,27 +110,6 @@ function EditTop({ rowArr, pageTxt, APIobj, fileUpInfo }: Props) {
     return Reflect.get(pageKeyTxtObj, key)
   }, [key])
 
-  // 数据改变
-  const dataChangeFu = useCallback(
-    (val: any, item: any) => {
-      const type = item.type
-      const key = item.key
-
-      if (type === 'DatePicker') {
-        setInfoFu({ ...info, [key]: dayjs(val).format('YYYY-MM-DD') })
-      } else if (['TextArea', 'Input'].includes(type)) {
-        const varRes = item.noNull ? val.replace(/\s+/g, '') : val
-        setInfoFu({
-          ...info,
-          [key]: varRes
-        })
-      } else if (type === 'Cascader') {
-        setInfoFu({ ...info, dictIdApply: val ? val.join(',') : '' })
-      }
-    },
-    [info, setInfoFu]
-  )
-
   // 订单申请状态
   const statusTxt = useMemo(() => {
     let txt = ''
@@ -127,6 +120,9 @@ function EditTop({ rowArr, pageTxt, APIobj, fileUpInfo }: Props) {
     return txt
   }, [info.status, key])
 
+  // 选择单个藏品
+  const [selectShow, setSelectShow] = useState(false)
+
   return (
     <div className={styles.EditTop}>
       <div className='pageTitle'>
@@ -186,64 +182,7 @@ function EditTop({ rowArr, pageTxt, APIobj, fileUpInfo }: Props) {
           </div>
           <div className='Edtop1'>
             {rowArr.map((item, index) => (
-              <div
-                key={index}
-                className={classNames('Edtop1row', item.full ? 'Edtop1rowFull' : '')}
-              >
-                <div className='Edtop1ll'>
-                  {item.must ? <span>* </span> : null}
-                  {item.name}：
-                </div>
-                <div className='Edtop1rr'>
-                  {item.type === 'txt' ? (
-                    <>
-                      {dayjs(info.createTime).format('YYYY年MM月DD日')}-{info.deptName}-
-                      {info.creatorName}
-                    </>
-                  ) : item.type === 'DatePicker' ? (
-                    <DatePicker
-                      disabled={isLook}
-                      allowClear={!item.must}
-                      value={dayjs(info[item.key as 'date'])}
-                      onChange={e => dataChangeFu(e, item)}
-                      disabledDate={current => current && current > dayjs().endOf('day')}
-                    />
-                  ) : item.type === 'Input' ? (
-                    <Input
-                      readOnly={isLook}
-                      placeholder='请输入'
-                      value={info[item.key as 'date']}
-                      onChange={e => dataChangeFu(e.target.value, item)}
-                      maxLength={item.maxLength || 30}
-                      showCount
-                    />
-                  ) : item.type === 'Cascader' ? (
-                    <Cascader
-                      disabled={isLook}
-                      changeOnSelect
-                      options={item.options}
-                      placeholder={isLook ? '（空）' : '请选择'}
-                      fieldNames={{ label: 'name', value: 'id', children: 'children' }}
-                      allowClear={!item.must}
-                      value={
-                        info[item.key as 'date']
-                          ? (info[item.key as 'date'] as string).split(',')
-                          : []
-                      }
-                      onChange={e => dataChangeFu(e, item)}
-                    />
-                  ) : item.type === 'TextArea' ? (
-                    <TextArea
-                      readOnly={isLook}
-                      placeholder={isLook ? '（空）' : '请输入'}
-                      value={info[item.key as 'date']}
-                      onChange={e => dataChangeFu(e.target.value, item)}
-                      maxLength={item.maxLength || 500}
-                      showCount
-                    />
-                  ) : null}
-                </div>
-              </div>
+              <EditInput key={index} item={item} isLook={isLook} />
             ))}
 
             {/* 附件 */}
@@ -254,8 +193,100 @@ function EditTop({ rowArr, pageTxt, APIobj, fileUpInfo }: Props) {
               </div>
             </div>
           </div>
+
+          {/* 第二个模块 */}
+          {moreDom ? (
+            <>
+              <div className='EdTit'>
+                <div>{moreDom.txt}</div>
+              </div>
+              <div className='Edtop1'>
+                <div className='Edtop1row Edtop1rowFull'>
+                  <div className='Edtop1ll'>{moreDom.tit || '关联藏品'}：</div>
+                  {snaps.length > 0 ? (
+                    <div className='Edtop1rr2'>
+                      <ImageLazy
+                        width={60}
+                        height={60}
+                        src={snaps[0].thumb || snaps[0].thumbPc}
+                        srcBig={snaps[0].thumbPc || snaps[0].thumb}
+                      />
+                      <div className='Edtop1rr2Txt'>
+                        {snaps[0]?.num ? snaps[0]?.num + ' - ' + snaps[0]?.name : ''}
+                      </div>
+                      <div>
+                        <Button
+                          type='text'
+                          size='small'
+                          onClick={() => openLink(`/goodsLook/${snaps[0].id}`)}
+                        >
+                          查看
+                        </Button>
+                        <MyPopconfirm txtK='删除' onConfirm={() => setSnapsFu([])} />
+                      </div>
+                    </div>
+                  ) : (
+                    <div className='Edtop1rr'>
+                      <Button
+                        type='primary'
+                        onClick={() => {
+                          setSelectShow(true)
+                        }}
+                      >
+                        选择藏品
+                      </Button>
+                    </div>
+                  )}
+                </div>
+
+                {moreDom.domList.map((item, index) => (
+                  <EditInput key={index} item={item} isLook={isLook} />
+                ))}
+
+                {/* 附件 */}
+                <div className='Edtop1row Edtop1rowFull'>
+                  <div className='Edtop1ll'>附件：</div>
+                  <div className='Edtop1rr'>
+                    <Z3upFiles
+                      isLook={isLook}
+                      myUrl={moreDom.myUrl || fileUpInfo.myUrl}
+                      dirCode={moreDom.dirCode || fileUpInfo.dirCode}
+                      filesKey='files2'
+                    />
+                  </div>
+                </div>
+              </div>
+            </>
+          ) : null}
         </>
       ) : null}
+
+      {/* 选择单个藏品 */}
+      {selectShow && moreDom ? (
+        <SelectGoods
+          myType='藏品'
+          isOne={true}
+          API_getList={moreDom.API}
+          closeFu={() => setSelectShow(false)}
+          baseFormData={sgBaseFormDataGood}
+          topSelectDom={sgTopSelectDomGood}
+          columnsTemp={goodsSonTableC(true)}
+          oldCheckArr={snaps}
+          dataResFu={data => {
+            // 需要过滤掉已经有id的-不替换数据，没有id的替换数据 因为数据可能已经在另外一个弹窗更新了
+            const nowIds = snaps.map(v => v.id)
+            const dataRes: GoodsType[] = data.map((v, i) => {
+              v.idTemp = v.id + 'goood'
+              // 优先使用已存在的snap数据，否则使用新数据
+              const item = nowIds.includes(v.id) ? snaps[i] : v
+              return item
+            })
+            console.log('--------', dataRes)
+
+            setSnapsFu(dataRes)
+          }}
+        />
+      ) : null}
     </div>
   )
 }

src/pages/Zother/EditTopDom/index.module.scss

@@ -1,64 +0,0 @@
-.EditTop {
-  :global {
-    .EdTit {
-      padding: 15px;
-      font-weight: 700;
-      font-size: 18px;
-      display: flex;
-      justify-content: space-between;
-      .ant-btn {
-        margin-left: 15px;
-      }
-      .EdTitBtn {
-        pointer-events: none;
-      }
-    }
-
-    .Edtop1 {
-      border-top: 1px solid #ccc;
-      padding: 15px;
-      display: flex;
-      justify-content: space-between;
-      flex-wrap: wrap;
-      .Edtop1row {
-        display: flex;
-        width: 48%;
-        margin-bottom: 15px;
-        min-height: 32px;
-        line-height: 32px;
-        .Edtop1ll {
-          font-weight: 700;
-          width: 100px;
-          text-align: right;
-
-          span {
-            color: #ff4d4f;
-          }
-        }
-        .Edtop1rr {
-          width: calc(100% - 100px);
-          & > div {
-            width: 100%;
-          }
-          .ant-btn {
-            margin-right: 15px;
-          }
-
-          .snipInfo {
-            border-radius: 6px;
-            width: calc(48% - 50px);
-            border: 1px solid #ccc;
-            height: 60px;
-            display: flex;
-            align-items: center;
-            gap: 20px;
-            justify-content: space-around;
-          }
-        }
-      }
-      .Edtop1rowFull {
-        width: 100%;
-      }
-    }
-  }
-}

src/pages/Zother/EditTopDom/index.tsx

@@ -1,181 +0,0 @@
-import { useCallback, useMemo, useState } from 'react'
-import styles from './index.module.scss'
-import { useParams } from 'react-router-dom'
-import dayjs from 'dayjs'
-import { Button, Cascader, DatePicker, Input } from 'antd'
-import classNames from 'classnames'
-import TextArea from 'antd/es/input/TextArea'
-import { useInfo } from '../InfoContext'
-import Z3upFiles from '@/components/Z3upFiles'
-import { FileUpInfoType } from '../data'
-import SelectGoods from '@/pages/Zother/SelectGoods'
-import { GoodsType } from '../SonGoodsList/data'
-
-type Props = {
-  // 顶部信息录入
-  rowArr: any[]
-  // 上传附件的信息
-  fileUpInfo: FileUpInfoType
-  Tit: string
-}
-
-function EditTopDom({ rowArr, fileUpInfo, Tit }: Props) {
-  const { info, setInfoFu, snaps, setSnapsFu } = useInfo()
-
-  const { key } = useParams<any>()
-  // key:1 新增 2编辑 3审批 4查看
-
-  const isLook = useMemo(() => {
-    return ['3', '4'].includes(key)
-  }, [key])
-
-  // 控制选择藏品弹窗显示
-  const [showChildTable, setShowChildTable] = useState(false)
-
-  // 数据改变
-  const dataChangeFu = useCallback(
-    (val: any, item: any) => {
-      const type = item.type
-      const key = item.key
-
-      if (type === 'DatePicker') {
-        setInfoFu({ ...info, [key]: dayjs(val).format('YYYY-MM-DD') })
-      } else if (['TextArea', 'Input'].includes(type)) {
-        const varRes = item.noNull ? val.replace(/\s+/g, '') : val
-        setInfoFu({
-          ...info,
-          [key]: varRes
-        })
-      } else if (type === 'Cascader') {
-        setInfoFu({ ...info, dictIdApply: val ? val.join(',') : '' })
-      }
-    },
-    [info, setInfoFu]
-  )
-
-  return (
-    <div className={styles.EditTop}>
-      {info.id ? (
-        <>
-          <div className='EdTit'>
-            <div>{Tit}</div>
-          </div>
-          <div className='Edtop1'>
-            {rowArr.map((item, index) => (
-              <div
-                key={index}
-                className={classNames('Edtop1row', item.full ? 'Edtop1rowFull' : '')}
-              >
-                <div className='Edtop1ll'>
-                  {item.must ? <span>* </span> : null}
-                  {item.name}：
-                </div>
-                <div className='Edtop1rr'>
-                  {item.type === 'txt' ? (
-                    <>
-                      {dayjs(info.createTime).format('YYYY年MM月DD日')}-{info.deptName}-
-                      {info.creatorName}
-                    </>
-                  ) : item.type === 'DatePicker' ? (
-                    <DatePicker
-                      disabled={isLook}
-                      allowClear={!item.must}
-                      value={dayjs(info[item.key as 'date'])}
-                      onChange={e => dataChangeFu(e, item)}
-                      disabledDate={current => current && current > dayjs().endOf('day')}
-                    />
-                  ) : item.type === 'Input' ? (
-                    <Input
-                      readOnly={isLook}
-                      placeholder='请输入'
-                      value={info[item.key as 'date']}
-                      onChange={e => dataChangeFu(e.target.value, item)}
-                      maxLength={item.maxLength || 30}
-                      showCount
-                    />
-                  ) : item.type === 'Cascader' ? (
-                    <Cascader
-                      disabled={isLook}
-                      changeOnSelect
-                      options={item.options}
-                      placeholder={isLook ? '（空）' : '请选择'}
-                      fieldNames={{ label: 'name', value: 'id', children: 'children' }}
-                      allowClear={!item.must}
-                      value={
-                        info[item.key as 'date']
-                          ? (info[item.key as 'date'] as string).split(',')
-                          : []
-                      }
-                      onChange={e => dataChangeFu(e, item)}
-                    />
-                  ) : item.type === 'TextArea' ? (
-                    <TextArea
-                      readOnly={isLook}
-                      placeholder={isLook ? '（空）' : '请输入'}
-                      value={info[item.key as 'date']}
-                      onChange={e => dataChangeFu(e.target.value, item)}
-                      maxLength={item.maxLength || 500}
-                      showCount
-                    />
-                  ) : item.type === 'ChildTable' ? (
-                    <>
-                      {snaps.length > 0 ? (
-                        item.callBackChildren(snaps, setSnapsFu)
-                      ) : (
-                        <Button
-                          type='primary'
-                          onClick={() => {
-                            setShowChildTable(true)
-                            item.func()
-                          }}
-                        >
-                          {item.placeHolder}
-                        </Button>
-                      )}
-
-                      {showChildTable && (
-                        <SelectGoods
-                          myType='藏品'
-                          isOne={item.SelectGoodsProps.isOne}
-                          API_getList={item.SelectGoodsProps.API_getList}
-                          closeFu={() => setShowChildTable(false)}
-                          baseFormData={item.SelectGoodsProps.baseFormData}
-                          topSelectDom={item.SelectGoodsProps.topSelectDom}
-                          columnsTemp={item.SelectGoodsProps.columnsTemp}
-                          oldCheckArr={snaps}
-                          dataResFu={data => {
-                            // 需要过滤掉已经有id的-不替换数据，没有id的替换数据 因为数据可能已经在另外一个弹窗更新了
-                            const nowIds = snaps.map(v => v.id)
-                            const dataRes: GoodsType[] = data.map((v, i) => {
-                              v.idTemp = v.id + 'goood'
-                              // 优先使用已存在的snap数据，否则使用新数据
-                              const item = nowIds.includes(v.id) ? snaps[i] : v
-
-                              return item
-                            })
-
-                            setSnapsFu(dataRes)
-                          }}
-                        />
-                      )}
-                    </>
-                  ) : null}
-                </div>
-              </div>
-            ))}
-
-            {/* 附件 */}
-            <div className='Edtop1row Edtop1rowFull'>
-              <div className='Edtop1ll'>附件：</div>
-              <div className='Edtop1rr'>
-                <Z3upFiles isLook={isLook} {...fileUpInfo} filesKey='files2' />
-              </div>
-            </div>
-          </div>
-        </>
-      ) : null}
-    </div>
-  )
-}
-
-export default EditTopDom

src/pages/Zother/SelectGoods/index.tsx

@@ -77,7 +77,7 @@ function SelectGoods({
     if (timeKey === 0) obj.pageSize = 99999
 
     const res = await API_getList(obj)
-    console.log(res)
+    // console.log(res)
     if (res.code === 0) {
       let resArr: any[] = res.data.records || []
 

src/store/action/Benter/B3auth.ts

@@ -20,13 +20,6 @@ export const B3_APIgetList = (data: any): any => {
 }
 
 /**
- * 藏品登记-鉴定新增-案例对象
- */
-export const B3_APIgoodsSave = (data: any) => {
-  return http.post('cms/order/auth/add', data)
-}
-
-/**
  * 藏品鉴定-藏品列表(取总账数据)-分页
  */
 export const B3_APIgetClueList = (data: any) => {