Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh ...

dminyi

2024-09-11 678b15974cf4dd0eb130b2677b8a992358b6152f

Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master

 gz-customerSystem/src/api/appUrl.js

@@ -2,7 +2,7 @@
 * @Company: hugeInfo
 * @Author: ldh
 * @Date: 2022-02-16 11:25:57
 * @LastEditTime: 2024-09-11 09:07:08
 * @LastEditTime: 2024-09-11 11:09:56
 * @LastEditors: dminyi 1301963064@qq.com
 * @Version: 1.0.0
 * @Description: api地址

 gz-customerSystem/src/views/register/eventFlow/component/Examine.jsx

@@ -118,7 +118,14 @@
            <Col span={24}>
              <div><div className="title-text">附件材料</div></div>
              <div style={{ color: '#1A6FB8' }}>
                <img src={link} alt="" className="title-file" />{infoData?.file || '-'}
                {infoData?.fileInfoList?.map(res => {
                  return res.fileList.map((result, resIndex) => {
                    return <a href="your-link-here.html" target="_blank">
                      <img src={link} alt="" className="title-file" />{result.trueName}
                      {resIndex !== res.fileList.length - 1 && <>，</>}
                    </a>
                  })
                })}
              </div>
            </Col>
            <Col span={24}>

 gz-customerSystem/src/views/register/matterDetail/FileTable.jsx

@@ -111,8 +111,8 @@
            查看
          </Link>
          {!props.isReview && <Link onClick={() => {
            if (record.fileInfoList && record.fileInfoList.length != 0) {
              let ids = record.fileInfoList?.map(item => item.id).join(',')
            if (record.fileList && record.fileList.length != 0) {
              let ids = record.fileList?.map(item => item.id).join(',')
              handleDelete(ids)
            } else {
              $$.info({ type: 'warning', content: '还没上传关于该材料的文件！' });
@@ -121,8 +121,8 @@
            删除
          </Link>}
          <Link onClick={() => {
            if (record.fileInfoList && record.fileInfoList.length != 0) {
              let ids = record.fileInfoList?.map(item => item.id).join(',')
            if (record.fileList && record.fileList.length != 0) {
              let ids = record.fileList?.map(item => item.id).join(',')
              handleDownlod(ids)
            } else {
              $$.info({ type: 'warning', content: '还没上传关于该材料的文件！' });
@@ -131,11 +131,12 @@
            下载
          </Link>
          {!props.isReview && <Link onClick={() => {
            console.log(record);
            setSourceType(record.ownerType)
            setUpLoadVisible(true)
            setFileInfoList(record.fileInfoList)
            setFileInfoList(record.fileList)
            setTimeout(() => {
              formRef.current.setFieldValue('file', record.fileInfoList)
              formRef.current.setFieldValue('file', record.fileList)
            }, 0)
          }}>
            上传
@@ -151,6 +152,7 @@
  ]

  useEffect(() => {
    console.log(props.fileInfoList);
    if (props.fileInfoList && props.fileInfoList.length != 0) {
      //证明材料
      const applyFile = props.fileInfoList.find(item => item.ownerType == "22_00018-101")
@@ -167,7 +169,7 @@
            size: applyFile.fileList.length,
            fileNames: applyFile.fileList?.map(item => item.trueName).join('，'),
            updateTime: $$.timeFormat(applyFile.fileList[applyFile.fileList.length - 1].updateTime),
            fileInfoList: applyFile.fileList.map(item => {
            fileList: applyFile.fileList.map(item => {
              return {
                ...item,
                uid: item.id,
@@ -182,7 +184,7 @@
            size: evidenceFile.fileList.length,
            fileNames: evidenceFile.fileList?.map(item => item.trueName).join('，'),
            updateTime: $$.timeFormat(evidenceFile.fileList[evidenceFile.fileList.length - 1].updateTime),
            fileInfoList: evidenceFile.fileList.map(item => {
            fileList: evidenceFile.fileList.map(item => {
              return {
                ...item,
                uid: item.id,
@@ -218,17 +220,15 @@

  //上传弹窗完成后的事件
  const handleUpload = () => {

    const newList = tableData.map(item => {
      if (item.ownerType == '22_00018-101') {
        const data = fileMap['22_00018-101'];
        if (data?.length > 0) {
      if (item.ownerType == sourceType) {
        const data = fileMap[sourceType]
          return {
            ...item,
            size: data.length,
            fileNames: data.map(item => item.trueName).join('，'),
            updateTime: $$.timeFormat(data[data.length - 1].updateTime),
            fileInfoList: data.map(item => {
          fileList: data.map(item => {
              return {
                ...item,
                name: item.trueName,
@@ -238,31 +238,12 @@
          }
        } else {
          return item
        }

      }
      if (item.ownerType == '22_00018-102') {
        const data = fileMap['22_00018-102'] || [];
        if (data?.length > 0) {
          return {
            ...item,
            size: data.length,
            fileNames: data.map(item => item.trueName).join('，'),
            updateTime: $$.timeFormat(data[data.length - 1].updateTime),
            fileInfoList: data.map(item => {
              return {
                ...item,
                name: item.trueName,
                uid: item.id,
              }
            }),
          }
        } else {
          return item
        }
      }
    })

    //回传文件数据的时候使用
    if(props.handleSaveList) {
      props.handleSaveList(newList)
    }
    setTableData(newList)
    setUpLoadVisible(false);
  };

 gz-customerSystem/src/views/register/matterDetail/NewFileCheck.jsx

@@ -120,9 +120,9 @@
                        {props.menuList?.map(item => {
                            return <SubMenu
                                key={item.id}
                                title={item.ownerTypeName + `（${item.fileInfoList && item.fileInfoList.length || 0}）`}
                                title={item.ownerTypeName + `（${item.fileList && item.fileList.length || 0}）`}
                            >
                                {item.fileInfoList?.map(res => {
                                {item.fileList?.map(res => {
                                    return <MenuItem key={res.id} onClick={() => { clickItem(res) }}>{res.trueName}</MenuItem>
                                })}
                            </SubMenu>

 gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx

@@ -393,7 +393,14 @@
        </Space>
      </Col>
      <div style={{ marginBottom: '65px' }}>
        <FileTable mainId={props.mainId} fileInfoList={props.fileInfoList} isReview={false} />
        <FileTable
          mainId={props.mainId}
          fileInfoList={props.fileInfoList}
          isReview={false}
          handleSaveList={(list) => {
            props.formRef.current.setFieldValue('fileInfoList', list)
          }}
        />
      </div>
      <DocumentScanner
        visible={scanFile}

 gz-customerSystem/src/views/register/visit/index.jsx

@@ -214,7 +214,7 @@
              <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleReview}>{isReview ? '修改' : '预览'}</Button>
              <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleSubmit}>提交</Button>
              <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => selfAcceptance()}>自行受理</Button>
              <Button type='secondary' onClick={handleReview}>返回上级页面</Button>
                            <Button type='secondary' onClick={() => { navigate(-1) }}>返回上级页面</Button>
            </Space>
          </div>
        </Fragment>

 gz-customerSystem/src/views/register/visit/preview.jsx

@@ -235,8 +235,10 @@
          <div className='MediationInfo-subTitle' style={{ marginTop: '-7px' }}></div><h4>事件材料</h4>
        </Space>
      </Col>
      <div style={{ marginBottom: '65px' }}>
      <FileTable mainId={props.mainId} fileInfoList={props.data?.fileInfoList} isReview={true} />
    </div>
    </div>
  )
}