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

dminyi

2024-09-09 4590bfea932d6bbde4e54e7ddc96e8bba65efe4c

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-07 16:35:00
 * @LastEditTime: 2024-09-09 10:07:53
 * @LastEditors: dminyi 1301963064@qq.com
 * @Version: 1.0.0
 * @Description: api地址

 gz-customerSystem/src/components/personCard/index.jsx

@@ -32,7 +32,7 @@
  }
  let isAgent = false
  let isAgentFor = false
  const typeList = data.map(item => {
  const typeList = data?.map(item => {
    return item.perType
  })//获取有多少申请人和被申请人
  if (typeList.indexOf('15_020008-1') != -1) {

 gz-customerSystem/src/styles/public.less

@@ -794,6 +794,19 @@
    }
}

//字节对话框
.arco-modal-simple {
    width: 400px;

    .arco-modal-header {
        padding: 0;
    }

    .arco-modal-header {
        text-align: right;
    }
}

//弹窗底部按钮
.dialogFooter {
    width: 100%;

 gz-customerSystem/src/views/filesCheck/newFileCheck.jsx

File was deleted

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

@@ -15,7 +15,11 @@
const Step = Steps.Step;

function getListCaseFlow(data) {
    return $$.ax.request({ url: `caseTask/listCaseFlow`, type: 'get', service: 'mediate', data });
  return $$.ax.request({ url: `caseTask/listCaseFlow`, type: 'get', service: 'mediate', data });
}

function accept(data) {
  return $$.ax.request({ url: `caseTask/accept`, type: 'post', service: 'mediate', data });
}

export default function EventFlow(props) {
@@ -23,7 +27,20 @@
    {
      label: '受理',
      type: 'primary',
      click: () => { },
      click: () => {
        Modal.confirm({
          title: '受理确认',
          content: '确认受理该事件？',
          onOk: async () => {
            const res = await accept({
              caseTaskId: props.caseTaskId
            })
            if(res.type) {
              $$.infoSuccess({ content: '受理成功！' });
            }
          },
        });
      },
      key: 'sl',
    },
    {
@@ -106,7 +123,7 @@
    const res = await getListCaseFlow({
      caseId: props.caseId
    })
    if(res.type) {
    if (res.type) {
      setProgressData(res.data)
    }
  }
@@ -130,7 +147,7 @@
          ref={scrollRef}
          autoHide
        >
          <MatterDetail caseId={props.caseId}/>
          <MatterDetail caseId={props.caseId} />
          <div className='dataSync-hasTabPage' style={{ marginTop: '-8px' }}>
            <Tabs defaultActiveTab='1' >
              <TabPane
@@ -168,7 +185,7 @@
          unmountOnExit={true}
          maskClosable={false}
        >
          <BackModel caseId={props.caseId} onCancel={() => { setBackVisible(false) }}/>
          <BackModel caseId={props.caseId} onCancel={() => { setBackVisible(false) }} />
        </Modal>
        <Modal
          title='上报'
@@ -179,7 +196,7 @@
          unmountOnExit={true}
          maskClosable={false}
        >
          <EscalationModel caseId={props.caseId} onCancel={() => { setEscalationVisible(false) }}/>
          <EscalationModel caseId={props.caseId} onCancel={() => { setEscalationVisible(false) }} />
        </Modal>
        <Modal
          title='交办'
@@ -192,7 +209,7 @@
          autoFocus={false}
          focusLock={false}
        >
          <AssignedModel caseId={props.caseId} onCancel={() => { setAssignedVisible(false) }}/>
          <AssignedModel caseId={props.caseId} onCancel={() => { setAssignedVisible(false) }} />
        </Modal>
        <div className="dataSync-excel">
          <Space size="large" style={{ margin: '4px 14px' }}>

 gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx

@@ -38,7 +38,6 @@
  const [noHandleReason, setNoHandleReason] = useState(false);
  const [radioValue, setRadioValue] = useState(1);
  const [mode, setMode] = useState(false)
  const [visibleType, setVisibleType] = useState(false)

  const tabs = [
    { index: '1', label: '化解成功' },
@@ -117,14 +116,23 @@
    })
    if (res.type) {
      $$.infoSuccess({ content: '提交成功' });
      setVisibleType(false)
      handleOnCancel()
    }
  }


  return (
    <>
      <Modal visible={visibleType || visible} onCancel={handleOnCancel} title='申请结案' centered footer={null} style={{ overflow: 'auto' }}>
      <Modal
        visible={visible}
        onCancel={handleOnCancel}
        title='申请结案'
        centered
        footer={null}
        style={{ overflow: 'auto' }}
        unmountOnExit={true}
        maskClosable={false}
      >
        <div className='caseResult-title'>化解结果</div>
        <div className='caseResult-tabs'>
          {tabs.map((tab) => (

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

@@ -1,8 +1,7 @@
import React, { Fragment, useEffect, useState, useRef } from 'react';
import * as $$ from '@/utils/utility';
import ArcoUpload from '@/components/ArcoUpload';
import NewFileCheck from '../../filesCheck/newFileCheck';
import { IconLink } from '@arco-design/web-react/icon';
import NewFileCheck from './NewFileCheck';
import { Row, Col, Button } from 'antd';
import { Form, Modal } from '@arco-design/web-react';
import {
@@ -114,6 +113,10 @@
    { value: '22_00018-102', label: '证据材料' },
  ]

  useEffect(() => {
    console.log(props.fileInfoList);
  },[props.fileInfoList])

  const personIconType = (v) => {
    switch (v) {
      case '22_00018-101':
@@ -134,7 +137,7 @@

  const handleUpload = () => {
    const newList = tableData.map(item => {
      if(item.ownerType == sourceType) {
      if (item.ownerType == sourceType) {
        const data = fileMap[sourceType]
        return {
          ...item,
@@ -164,7 +167,7 @@
              label=''
              // editData={props.editData}
              handleDelFile={handleDelFile}
              onFileListChange={(v) => { 
              onFileListChange={(v) => {
                setFileMap({
                  '22_00018-101': v
                })
@@ -188,7 +191,7 @@
              label=''
              // editData={props.editData}
              handleDelFile={handleDelFile}
              onFileListChange={(v) => { 
              onFileListChange={(v) => {
                setFileMap({
                  '22_00018-102': v
                })
@@ -257,7 +260,16 @@
        </div>

      </Modal >
      <Modal style={{ width: '1200px' }} visible={filesCheck} onCancel={() => setFilesCheck(false)} footer={null} title='查看事件材料' centered>
      <Modal
        style={{ width: '1200px' }}
        visible={filesCheck}
        onCancel={() => setFilesCheck(false)}
        footer={null}
        title='查看事件材料'
        centered
        unmountOnExit={true}
        maskClosable={false}
      >
        <div style={{ marginTop: '-16px' }}>
          <NewFileCheck />
        </div>

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

New file
@@ -0,0 +1,99 @@
import React, { useState, useEffect, useRef } from 'react';
import { Row, Col, Space } from 'antd';
import { Select, DatePicker, Form, Button } from '@arco-design/web-react';
import * as $$ from '@/utils/utility';

const FormItem = Form.Item;
const appUrl = $$.appUrl;


const NewFileCheck = (props) => {
    const formRef = useRef()

    return (
        <nav className="filesCheck-nav" style={{ borderRight: '1px solid transparent' }}>
            <Form
                ref={formRef}
                layout='horizontal'
                style={{ marginTop: '24px', marginBottom: '20px' }}
                scrollToFirstError={true}
                initialValues={{
                }}//默认值
            >
                <Row gutter={24} style={{ marginRight: '0px' }}>
                    <Col span={7}>
                        <FormItem label='材料类型：' field='type'>
                            <Select
                                placeholder='请选择'
                                allowClear
                                options={[
                                    {
                                        label: '全部',
                                        value: '',
                                    },
                                    {
                                        label: '申请材料',
                                        value: '22_00018-101',
                                    },
                                    {
                                        label: '证据材料',
                                        value: '22_00018-102',
                                    },
                                ]}
                            />
                        </FormItem>
                    </Col>
                    <Col span={7}>
                        <FormItem
                            label='上传时间：'
                            field='time'
                        >
                            <DatePicker.RangePicker
                                separator='~'
                                style={{ width: '100%' }}
                            />
                        </FormItem>
                    </Col>
                    <Col span={7}>
                        <FormItem
                            label='上传人类型：'
                            field='name'
                            onChange={(e) => console.log(e.target.value, 'vvv')}
                        >
                            <Select
                                allowClear
                                style={{ width: '100%' }}
                                options={[
                                    {
                                        label: '工作人员',
                                        value: 1
                                    },
                                    {
                                        label: '当事人',
                                        value: 2
                                    }
                                ]}
                            />
                        </FormItem>
                    </Col>
                    <Col span={3}>
                        <Space>
                            <Button size="middle " type='primary'>查询</Button>
                            <Button size="middle ">查询</Button>
                        </Space>
                    </Col>
                </Row>

            </Form>
            <div style={{ display: 'flex' }}>
                <div style={{ width: '200px' }}>
                </div>
                <div style={{ flex: 1 }}>

                </div>
            </div>
        </nav>
    );
};

export default NewFileCheck;

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

@@ -49,8 +49,7 @@
  }, [fakeData])

  useEffect(() => {
    console.log(props.partyList);
    setFakeData(props.partyList.map(item => {
    setFakeData(props.partyList?.map(item => {
      const fileInfoList = item.fileInfoList
      let file = [];//身份证明材料、企业登记材料
      let file1 = [];//法人、机构身份证明材料、代理人授权委托书
@@ -75,7 +74,7 @@
        file,
        file1
      }
    }))
    }) || [])
  }, [props.partyList])

  //获取当前时间
@@ -391,7 +390,7 @@
          <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>事件材料</h4>
        </Space>
      </Col>
      <FileTable mainId={props.mainId} />
      <FileTable mainId={props.mainId} fileInfoList={props.fileInfoList}/>

      <DocumentScanner
        visible={scanFile}

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

@@ -41,11 +41,11 @@
const Organization = (props) => {
    const formRef = useRef();
    const routeData = useParams();
  const navigate = useNavigate();
    const navigate = useNavigate();
    const [isReview, setIsReview] = useState(false);//预览页面控制
    const [current, setCurrent] = useState(1);
    const [id, setId] = useState();
    const [partyList, setPartyList] = useState([]);//当事人信息，用于子组件回显
    const [editData, setEditData] = useState({});//回显数据

    useEffect(() => {
        if (routeData.id) {
@@ -63,13 +63,14 @@
        if (res.type) {
            const { agentList, personList, ...rest } = res.data
            const parList = agentList.concat(personList)
            formRef.current.setFieldsValue({
            const obj = {
                ...rest,
                fakeData: parList,
                myCaseType: [rest.caseTypeFirst, rest.caseType],
                myQuesAddress: rest.queRoad ? [rest.queProv, rest.queCity, rest.queArea, rest.queRoad] : undefined
            })
            setPartyList(parList)
            }
            formRef.current.setFieldsValue(obj)
            setEditData(obj)
        }
    }

@@ -191,7 +192,13 @@
                        </Steps>
                    </div>
                    <Preview style={{ display: isReview ? '' : 'none' }} data={formRef?.current?.getFields()} />
                    <VisitorRegister formRef={formRef} style={{ display: isReview ? 'none' : '' }} mainId={id} partyList={partyList} />
                    <VisitorRegister
                        formRef={formRef}
                        style={{ display: isReview ? 'none' : '' }}
                        mainId={id}
                        partyList={editData.fakeData}
                        fileInfoList={editData.fileInfoList}
                    />
                    <div className="dataSync-excel">
                        <Space size="large" style={{ margin: '4px 14px' }}>
                            <Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={handleSave} >保存</Button>

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

@@ -12,7 +12,7 @@
import '../index.less';
import TableView from '../../../components/TableView';
import { Modal } from '@arco-design/web-react';
import NewFileCheck from '../../filesCheck/newFileCheck';
import NewFileCheck from '../matterDetail/NewFileCheck';
import * as $$ from '../../../utils/utility';
import { ApplyDialog, AgentDialog, Respondent, Company } from './component/previewTable'