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

zhangyongtian

2024-09-06 3c3ac0c2c225f763fffb05ad669d76b50b4f6e45

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

 gz-customerSystem/src/assets/images/Audit.png

 gz-customerSystem/src/assets/images/index.js

@@ -61,6 +61,7 @@
import applyRecord from "./applyRecord.png";
import downO from "./downO.png";
import up from "./up.png";
import Audit from "./Audit.png"

export {
  ledger_1,
@@ -116,5 +117,6 @@
  edit,
  applyRecord,
  downO,
  up
  up,
  Audit
};

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

New file
@@ -0,0 +1,139 @@
import React, { useRef, useState } from 'react';
import { Row, Col, Space, Tooltip } from 'antd';
import { Form, Input, Radio, Button } from '@arco-design/web-react';
import { register } from '@/assets/images'
import { question1, } from '@/assets/images';
import ArcoUpload from '@/components/ArcoUpload';
import * as $$ from '@/utils/utility';

const FormItem = Form.Item;
const appUrl = $$.appUrl;
const RadioGroup = Radio.Group;// 根据调解案号获取纠纷登记信息


function delFile(id) {
  return $$.ax.request({ url: `fileInfo/deleteFileById`, type: 'get', service: 'sys', data: { id } });
}



const AuditView = () => {
  const formRef = useRef();
  const [value, setValue] = useState(1);
  const id = 1;

  const onChange = (e) => {
    console.log('radio checked', e.target.value);
    setValue(e.target.value);
  };

  //删除文件
  const handleDelFile = async (id) => {
    const res = await delFile(id)
    if (res.type) {
      $$.infoSuccess({ content: '删除成功！' });
    }
  }

  return (
    <>
      <div className="auditView">
        <Col span={24} className='title'>
          <Space size='small'>
            <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>联合处置申请</h5>
          </Space>
        </Col>
        <Row gutter={[16, 16]}>
          <Col span={24}>
            <div><div className="title-text">添加配合部门</div></div>
            <div>白云区新市街司法所、白云区新市街劳监大队</div>
          </Col>
          <Col span={24}>
            <div><div className="title-text">添加理由</div></div>
            <div>在调解过程中，我们发现需要白云区新市街司法所的专业司法能力支持事项办理，以促进调解工作的顺利进行。</div>
          </Col>
          {/*事项等级分为三级，颜色需要做判断*/}
          <Col span={24}>
            <div className="title"><div className="title-text">申请时间</div></div>
            <div >2024-7-21 12:00</div>
          </Col>
          <Col span={24}>
            <div><div className="title-text">申请人</div></div>
            <div>广州市白云区新市街汇桥北社区委员会 张三丰<img src={register} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '-1px' }}/></div>
          </Col>
        </Row>

      </div>
      <div className="auditView">
        <Col span={24} className='title'>
          <Space size='small'>
            <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>审核</h5>
          </Space>
        </Col>
        <Form
          ref={formRef}
          layout='vertical'
          requiredSymbol={false}
          scrollToFirstError={true}
        >
          <Row style={{ marginBottom: '-16px' }}>
            <Col span={24}>
              <FormItem
                label='审核结果'
                field='majorStatus'
              >
                <RadioGroup options={[{ value: 0, label: '否' }, { value: 1, label: '是' }]} direction='vertical' />
              </FormItem>
            </Col>
            <Col span={24}>
              <FormItem
                label={(<div style={{ display: 'flex' }}>理由说明<div className="must">必填</div></div>)}
                field='handleContent'
                rules={[{ message: '请填写不同意联合处置申请的理由', required: true }]}
              >
                <Input.TextArea
                  maxLength={200}
                  showWordLimit
                  rows={5}
                  placeholder='请完整描述事项概况，应具备5要素：发生时间+发生地点+人物情况+事项起因+事项经过'
                  wrapperStyle={{ width: '100%' }}
                />
              </FormItem>
            </Col>
            <Col span={24}>
              <FormItem
                label={<div style={{ display: 'flex' }}>
                  <span style={{ color: '#86909C' }}>附件材料</span>
                  <Tooltip>
                    <img src={question1} alt="" style={{ width: '13px', height: '13px', margin: '4px 4px 0px 4px' }} />
                  </Tooltip>
                </div>
                }
                field='caseDes'
                rules={[{ message: '请填写事项概况', required: true }]}
              >
                <ArcoUpload
                  params={{
                    action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId='24083010062110001'&&ownerId=${id}&ownerType=22_00018-102`,
                  }}
                  field='file1'
                  // handleChangeFile={handleChangeFile}
                  label=''
                  // editData={props.editData}
                  handleDelFile={handleDelFile}
                />
              </FormItem>
            </Col>
          </Row>
        </Form>
        <Space style={{}}>
          <Button type='primary' >提交</Button>
          <Button type='secondary'>返回上级页面</Button>
        </Space>
      </div>

    </>
  )
}

export default AuditView;

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

@@ -1,6 +1,6 @@
import React, { useState, useRef, useEffect } from 'react';
import { Col, Space, Row, Tooltip } from 'antd';
import { register,} from '@/assets/images';
import { register, } from '@/assets/images';
import { Form, Input, Tabs, Typography, Button, Modal, Select } from '@arco-design/web-react';
import { question1, } from '@/assets/images';
import ProgressStep from '@/components/ProgressStep/VisitStep';
@@ -13,7 +13,7 @@
import ArcoUpload from '@/components/ArcoUpload';
import HandleRecord from '../../matterDetail/HandleRecord';
import SupervisingView from '../../matterDetail/Supervising'

import UniteHandle from '../../matterDetail/UniteHandle'

const Option = Select.Option;
const FormItem = Form.Item;
@@ -107,20 +107,19 @@
  const formRef = useRef();
  const [selectedTab, setSelectedTab] = useState('1'); // 默认选中第一个 tab
  const [selectedTab1, setSelectedTab1] = useState('1'); // 默认选中第一个 tab


  const [wantUser, setWantUser] = useState({});
  const [formView, setFormView] = useState(false);
  const [personView, setPersonView] = useState(false);
  const [supervising, setSupervising] = useState(false)
  const [data, setData] = useState({})
  const [caseResult, SetCaseResult] = useState(false);
  const [response, setResponse] = useState('')
  const [list, setList] = useState([]);
  const [mode, SetMode] = useState(false);
  const [modeDetail, setModeDetail] = useState(false);
  const [radioValue, setRadioValue] = useState('')
  const [detail, setDetail] = useState(false);
  const [uniteHandleView, setUniteHandleView] = useState(false);
  const [isModalVisible, setIsModalVisible] = useState(false);
  const [id, setId] = useState('');
  const [uniteHandleId, setUniteHandleId] = useState('');


  const tabs = [
    { index: '1', label: '承办部门' },
@@ -140,8 +139,6 @@
    { index: '1', label: '公共模板1：回复督办内容收到通用范本' },
  ]

  const [isModalVisible, setIsModalVisible] = useState(false);
  const [id, setId] = useState('')

  const handleTabChange = (newTabIndex) => {
    setSelectedTab(newTabIndex);
@@ -225,17 +222,21 @@
  }

  //获取理由id
  const getNewTimeId = async () => {
  const getNewTimeId = async (type) => {
    const res = await getNewTimeIdApi()
    if (res.type) {
      setId(res.data)
      if (type === 'uniteHandle') {
        setUniteHandleId(res.data)
      }
      if (type === 'addMark')
        setId(res.data)
    }
  }

  //添加办理记录
  const addMark = () => {
    setFormView(!formView);
    getNewTimeId()
    getNewTimeId('addMark')
  }

  //保存信息
@@ -256,6 +257,13 @@
  const Supervising = () => {
    setSupervising(!supervising)
  }

  const uniteHandle = () => {
    getNewTimeId('uniteHandle')
    setUniteHandleView(!uniteHandleView)
  }



  const handleTabChange1 = (newTabIndex) => {
    setSelectedTab1(newTabIndex);
@@ -411,7 +419,7 @@
            </Form>
            <Space style={{ marginTop: '38px', bottom: '4px' }}>
              <Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={() => addMark()}>添加办理记录</Button>
              <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }}>联合处置申请</Button>
              <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => uniteHandle()}>联合处置申请</Button>
              <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => SetCaseResult(!caseResult)}>结案申请</Button>
              <Button type='outline' style={{ color: '#EF6C24', border: '1px solid #EF6C24' }} onClick={() => Supervising()}>督办</Button>
              <Button type='secondary'>返回上级页面</Button>
@@ -523,7 +531,7 @@
              <Col span={24}>
                <FormItem
                  label={<div style={{ display: 'flex' }}><div>督办部门</div><div style={{ color: '#86909C' }}>（可多选）</div></div>}
                  field='caseDes'
                  field=''
                >
                  <Select
                    mode='multiple'
@@ -593,6 +601,7 @@
            </Row>
          </Form>
        </Modal>
        <UniteHandle id={uniteHandleId} visible={uniteHandleView} handleOnCancel={() => setUniteHandleView(false)} />
        <CaseResult visible={caseResult} handleOnCancel={() => SetCaseResult(false)} />

      </div>

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

@@ -1,10 +1,12 @@

/*
 * @Author: dminyi 1301963064@qq.com
 * @Date: 2024-08-09 09:59:43
 * @LastEditors: dminyi 1301963064@qq.com
 * @LastEditTime: 2024-09-03 14:44:51
 * @LastEditTime: 2024-09-06 12:03:54
 * @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
 * @Description: 来访登记
 * 
 */

import React, { useState, useRef, Fragment } from "react";
@@ -12,16 +14,17 @@
import * as $$ from '@/utils/utility';
import "@arco-themes/react-gzzz/css/arco.css";
import '../index.less';
import { Typography, Steps, Tabs, Message } from '@arco-design/web-react';
import { question, register, Matter, transfer } from '@/assets/images'
import { Typography, Steps, Tabs } from '@arco-design/web-react';
import { Audit, Matter, transfer } from '@/assets/images'
import MatterDetail from '../matterDetail';
import Handle from './component/handle';
import AuditView from './component/AuditView'

const Step = Steps.Step;
const TabPane = Tabs.TabPane;
const style = {
  // textAlign: 'center',
  // marginTop: 20,
    // textAlign: 'center',
    // marginTop: 20,
};


@@ -39,6 +42,11 @@
            label: '流转办理',
            key: '2',
            isNeedStep: true,//加上这个就有进度条
        },
        {
            img: Audit,
            label: '审核',
            key: '3',
        },
    ])

@@ -78,13 +86,18 @@
                                </div>
                            }
                            {tabsActive === '1' &&
                                <MatterDetail hasApplet={true} hasEditBtn={true}/>
                                <MatterDetail hasApplet={true} hasEditBtn={true} />
                            }
                            {
                                tabsActive === '2' && <Typography.Paragraph style={style}>
                                    <Handle />
                                </Typography.Paragraph>
                            }
                            {
                                tabsActive === '3' && <Typography.Paragraph style={style}>
                                    <AuditView />
                                </Typography.Paragraph>
                            }
                        </TabPane>
                    })}
                </Tabs>

 gz-customerSystem/src/views/register/index.less

@@ -557,6 +557,12 @@
        display: flex;
        margin-bottom: 4px;

        &-file {
            width: 16px;
            height: 16px;
            margin-top: 4px;
        }

        &-title {
            color: #86909C;
        }
@@ -677,4 +683,17 @@
        cursor: pointer;
        top: 28px;
    }
}

.auditView {
    background: #ffffff;
    margin: 0px 16px 8px 16px;
    padding: 12px 0px 12px 16px;
}

.title {
    display: flex;
    align-items: center;
    margin-bottom: 4px;

}

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

@@ -1,11 +1,13 @@
import React, { useState, useEffect } from 'react';
import { Typography, Button } from 'antd';
import { CheckOutlined, } from '@ant-design/icons';
import React, { useState, useRef } from 'react';
import { Button } from 'antd';
import * as $$ from '@/utils/utility';
import { Form, Input, Modal, Upload } from '@arco-design/web-react';
import { IconLink } from '@arco-design/web-react/icon';


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


const DocumentScanner = ({
  visible,
@@ -13,11 +15,12 @@
  onCancel

}) => {

  const formRef = useRef();
  const [scanFile, setScanFile] = useState(false);
  const [scanImage, setScanImage] = useState(false);
  const [scaned, setScaned] = useState(false);
  const [fileView, setFileView] = useState();
  const [scanContent, setScanContent] = useState('');

  const handleUploadChange = (info, currentFile) => {
    if (info.length > 0) {
@@ -27,10 +30,28 @@
      ...currentFile,
      url: URL.createObjectURL(currentFile.originFile),
    });
    setScanContent(fileView.response.data.ocrResult.wordsResult[0])


  };

  const handleScaned = () => {
    setScaned(true)
    formRef.current.setFieldValue('scanContent', scanContent)

  }

  const handleText = () => {
    onConfirm(scanContent);
    setScanFile(false);
    setScanImage(false);
    setScaned(false);

  }


  console.log(fileView, 'fileView')
  console.log(scanContent, 'scanContent')

  return (
    <>
@@ -51,7 +72,8 @@
              // multiple
              limit={1}
              accept='image/*'
              // action='/'
              headers={{ Authorization: $$.getSessionStorage('customerSystemToken') }}
              action={`${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/recognitionText`}
              onDrop={(e) => {
              }}
              tip='支持png、 jpg、pdf等格式文件上传，每次上传大小不超过10M'
@@ -92,19 +114,32 @@
            objectFit: 'contain',
          }}
        />
        <div><Button type="primary" onClick={() => setScaned(true)} style={{ marginTop: '20px' }}>开始识别</Button></div>
        <div><Button type="primary" onClick={() => handleScaned()} style={{ marginTop: '20px' }}>开始识别</Button></div>
      </Modal>
      <Modal style={{ width: '1200px' }} visible={scaned} onCancel={() => setScaned(false)} footer={null} title='识别上传材料' centered>
        <div style={{  marginBottom: '8px' }}>识别内容</div>
        <Input.TextArea
          showWordLimit
          rows={5}
          placeholder=''
          wrapperStyle={{ width: '100%' }}
          defaultValue='识别内容'
          onChange={(v) => console.log(v, 'vvvvvv')}
        />
        <div style={{ marginTop: '24px' }}><Button type="primary" onClick={() => { onConfirm(); setScanFile(false); setScanImage(false); setScaned(false); }}>使用文字</Button></div>
        <Form
          ref={formRef}
          layout='vertical'
          requiredSymbol={false}
          scrollToFirstError={true}
          initialValues={{
          }}//默认值
        >
          <FormItem
            label='识别内容'
            field='scanContent'
          >
            <Input.TextArea
              showWordLimit
              rows={5}
              placeholder=''
              wrapperStyle={{ width: '100%' }}
              onChange={(v) => console.log(v, 'vvvvvv')}
            />
            <div style={{ marginTop: '24px' }}><Button type="primary" onClick={() => { handleText() }}>使用文字</Button></div>
          </FormItem>

        </Form>
      </Modal>

    </>

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

@@ -2,13 +2,13 @@
 * @Author: dminyi 1301963064@qq.com
 * @Date: 2024-09-06 09:54:09
 * @LastEditors: dminyi 1301963064@qq.com
 * @LastEditTime: 2024-09-06 10:36:42
 * @LastEditTime: 2024-09-06 11:03:29
 * @FilePath: \gzDyh\gz-customerSystem\src\views\register\matterDetail\Supervising.jsx
 * @Description: 督办
 */
import React, { useState } from 'react';
import { Form, Input, Tabs, Typography, Empty, Radio, Button, Modal, Select } from '@arco-design/web-react';
import { Col, Space, Row, Tooltip } from 'antd';
import { Form, Input, Radio, Button, Modal } from '@arco-design/web-react';
import { Col, Space, Row, } from 'antd';
import { knock } from '@/assets/images/icon'
import { link, register } from '@/assets/images';
import { question1, } from '@/assets/images';
@@ -30,7 +30,7 @@


const SupervisingView = (id) => {
  const [radioValue, setRadioValue] = useState('')
  const [radioValue, setRadioValue] = useState('1')
  const [response, setResponse] = useState('')
  const [selectedTab1, setSelectedTab1] = useState('1'); // 默认选中第一个 tab
  const [detail, setDetail] = useState(false);
@@ -83,7 +83,7 @@
        value={radioValue}
        onChange={(v) => setRadioValue(v)}
      >
        <Radio value='1' style={{ flex: 1, textAlign: 'center' }}>未回复</Radio>
        <Radio value='1' style={{ flex: 1, textAlign: 'center' }} >未回复</Radio>
        <Radio value='2' style={{ flex: 1, textAlign: 'center' }}>已回复</Radio>
      </RadioGroup>
      {
@@ -102,12 +102,12 @@
            <div>张三丰</div>
          </div>
          <div className='Supervising-item'>
            <div className='Supervising-item-title'>督办内容：</div>
            <div>该纠纷事件目前群众较为关注，现要求相关部门即刻启动纠纷化解工作。请负责同事务必于本周内制定出具体解决方案，并确保与当事人进行有效沟通。请各位积极响应，高效协作，争取在最短时间内妥善处理完毕。</div>
            <div className='Supervising-item-title' style={{ width: '70px' }}>督办内容：</div>
            <div style={{ flex: 1 }}>该纠纷事件目前群众较为关注，现要求相关部门即刻启动纠纷化解工作。请负责同事务必于本周内制定出具体解决方案，并确保与当事人进行有效沟通。请各位积极响应，高效协作，争取在最短时间内妥善处理完毕。</div>
          </div>
          <div className='Supervising-item'>
            <div className='Supervising-item-title'>督办附件：</div>
            <img src={link} alt='' style={{ width: '16px' }} />
            <img src={link} alt='' className='Supervising-item-file' />
            <div>2</div>
          </div>
          <Button className='Supervising-btn' size='small' type='outline' onClick={() => handleResponse()}>回复</Button>
@@ -232,7 +232,7 @@
          </Form>
        </div>
      </Modal>
      <ModeSelect onCancel={() => SetMode(false)} mode={mode}/>
      <ModeSelect onCancel={() => SetMode(false)} mode={mode} />
      <Modal visible={detail} onCancel={() => setDetail(false)} title='督办回复详情' centered footer={null}>
        <Col span={24} style={{ marginBottom: '8px' }}>
          <Space size='small'>

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

New file
@@ -0,0 +1,119 @@
import React, { useState, useRef } from 'react';
import { Form, Input, Tabs, Typography, Button, Modal, Select } from '@arco-design/web-react';
import { Col, Space, Row, Tooltip } from 'antd';
import ArcoUpload from '@/components/ArcoUpload';
import * as $$ from '@/utils/utility';
import { question1, } from '@/assets/images';

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

function delFile(id) {
  return $$.ax.request({ url: `fileInfo/deleteFileById`, type: 'get', service: 'sys', data: { id } });
}


const UniteHandle = ({ id, visible, handleOnCancel }) => {
  const formRef = useRef();
  const [supervising, setSupervising] = useState(false);
  const [fileVisible, setFileVisible] = useState(false);

  const options = [
    { value: '1', label: '一' }, { value: '2', label: '二' }, { value: '3', label: '三' }
  ];




  //删除文件
  const handleDelFile = async (id) => {
    const res = await delFile(id)
    if (res.type) {
      $$.infoSuccess({ content: '删除成功！' });
    }
  }

  const handleSupervising = () => {
    setSupervising(!supervising)
  }


  return (
    <>
      <Modal visible={visible} onCancel={handleOnCancel} title='联合处置申请' centered footer={null}>
        <Form
          ref={formRef}
          layout='vertical'
          requiredSymbol={false}
          scrollToFirstError={true}
          initialValues={{
            suggestion: ''
          }}//默认值
        >
          <Row>
            <Col span={24}>
              <FormItem
                label={<div style={{ display: 'flex' }}><div>添加配合部门</div><div style={{ color: '#86909C' }}>（可多选）</div></div>}
                field=''
              >
                <Select
                  mode='multiple'
                  placeholder='请选择督办部门'
                  style={{}}
                  allowClear
                >
                  {options.map((option) => (
                    <Option key={option.value} value={option.value} onChange={(v) => console.log(v, 'vvvvvv')}>
                      {option.label}
                    </Option>
                  ))}
                </Select>
              </FormItem>
            </Col>
            <Col span={24}>
              <FormItem
                field='suggestion'
                label={(<div style={{ display: 'flex' }}>添加理由<div className="must">必填</div></div>)}
              >
                <Input.TextArea
                  rows={5}
                  wrapperStyle={{ width: '700px' }}
                  value='在事项办理过程中：因[......业务]涉及白云区新市街司法所因[......业务]涉及白云区新市街劳监大队特申请将上述部门列为配合部门，请审批'
                />
              </FormItem>
            </Col>
            <Col span={24}>
              <FormItem
                label={
                  <div>
                    附件材料
                    <Tooltip onClick={() => setFileVisible(true)}>
                      <img src={question1} alt="" style={{ width: '13px', height: '13px', margin: '-3px 4px 0px 4px' }} />
                    </Tooltip>
                  </div>
                }
                field='caseDes'
                rules={[{ message: '请填写事项概况', required: true }]}
              >
                <ArcoUpload
                  params={{
                    action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId='24083010062110001'&&ownerId=${id}&ownerType=22_00018-508`,
                  }}
                  field='file1'
                  // handleChangeFile={handleChangeFile}
                  label=''
                  // editData={props.editData}
                  handleDelFile={handleDelFile}
                />
              </FormItem>
            </Col>
            <Button type='primary' style={{ marginTop: '-16px' }} onClick={() => handleSupervising()}>提交申请</Button>
          </Row>
        </Form>
      </Modal>
    </>
  )
}

export default UniteHandle;

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

@@ -186,7 +186,7 @@
              data={fakeData}
            />
          </div>
          <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '4px' }}>
          <Col span={24} className='title'>
            <Space size='small'>
              <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>纠纷基本情况</h5>
            </Space>
@@ -272,7 +272,7 @@
            bordered={true}
            style={{ marginBottom: '20px' }}
          />
          <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '4px' }}>
          <Col span={24} className='title'>
            <Space size='small'>
              <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>登记信息</h5>
            </Space>

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

@@ -280,9 +280,12 @@
    setDialogType(type)
  }

  const handleConfirm = () => {
  const handleConfirm = (scanContent) => {
    // 处理确认逻辑
    props.formRef.current.setFieldValue('caseDes', scanContent)
    setScanFile(false);
    console.log(scanContent,'scanContent')

  };

  const handleCancel = () => {