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

liuwh

2024-09-14 68f41dad70cc9c90b87258d91300576d7f5682e7

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

 gz-customerSystem/src/api/apiHandler.js

@@ -52,7 +52,6 @@
export const ax = axios;

export function request(value = {}) {
  console.log(value);
  let token = getSessionStorage("customerSystemToken");

  // 无token、非登录、非网格单点跳转时

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

@@ -117,20 +117,20 @@
            token
        })
        if (res.type) {
            setGridStatus(true)
            $$.setSessionStorage('gridToken', '')
            $$.clearSessionStorage();
            $$.setSessionStorage('customerSystemToken', res.data?.token);
            $$.setLocal('customerSystemUser', res.data || {});
            let ctUseroleList = res.data?.ctUseroleList || [];
            console.log(ctUseroleList);
            const roleId = ctUseroleList[0]?.roleId
            const roleName = ctUseroleList[0]?.roleName
            const roleCode = ctUseroleList[0]?.roleCode
            $$.setSessionStorage('role', { roleId: roleId, roleName: roleName });
            setRoleActive({ id: roleId, roleName: roleName, powerMap: {} });
            const res = await switchRoleApi({ roleCode: roleCode });
            if (res.type) {
                $$.setSessionStorage('customerSystemToken', res.data);
                navigate('/mediate/visit/visitWorkBench');
            const result = await switchRoleApi({ roleCode: roleCode });
            if (result.type) {
                $$.setSessionStorage('customerSystemToken', result.data);
                setGridStatus(true)
            }
        }
    }
@@ -207,7 +207,7 @@
            getRolePower(roleActive.id, roleActive.roleName);
        }
    }, [roleActive.id]);

console.log(gridStatus);
    return (
        <>
            <Header

 gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx

@@ -7,6 +7,7 @@
import ReviewProgress from './ReviewProgress';
import * as $$ from '@/utils/utility';
import { useNavigate } from 'react-router-dom';
import { getOffset, getSize } from '@/utils/utility';

const RadioGroup = Radio.Group;
const FormItem = Form.Item;
@@ -36,10 +37,13 @@
export default function ReviewExamine(props) {
  const navigate = useNavigate();
  const formRef = useRef();
  const scrollRef = useRef(null);
  const [result, setResult] = useState()
  const [infoData, setInfoData] = useState({});
  const [id, setId] = useState();
  const [progressData, setProgressData] = useState({})
  const [reasonRadio, setReasonRadio] = useState();
  const [height, setHeight] = useState(500);
  const options = [
    {
      label: '材料不完整',
@@ -58,26 +62,42 @@
      value: '4'
    },
  ]
 console.log(props.id,'props.idprops.id')

  useEffect(() => {
    getInfoData()
    getAppId()
    // getAppId()
    getProData()
    onWindowResize()
    window.addEventListener("resize", onWindowResize);
    // 返回一个函数，该函数会在组件卸载前执行  
    return () => {
      // 组件销毁时执行  
      window.removeEventListener("resize", onWindowResize);
    };
  }, [])

  const onWindowResize = () => {
    let offsetTop = 0;
    if (scrollRef.current.container) {
      offsetTop = getOffset(scrollRef.current.container).top;
    }
    setHeight(getSize().windowH - offsetTop - 80)
  };

  //获取id
  const getAppId = async () => {
    const res = await getId()
    if (res.type) {
      setId(res.data)
    }
  }
  // const getAppId = async () => {
  //   const res = await getId()
  //   if (res.type) {
  //     setId(res.data)
  //   }
  // }

  //回显数据
  const getInfoData = async () => {
    const res = await getData({ caseTaskId: props.caseTaskId })
    if (res.type) {
      setInfoData(res.data || {})
      setId(res.data.id)
    }
  }

@@ -97,7 +117,7 @@
        if (!errors) {
          const { file, myNoUp, ...rest } = formRef.current.getFields()
          requestSubmit({
            id: props.id,
            id: id,
            caseId: props.caseId,
            caseTaskId: props.caseTaskId,
            ...rest
@@ -125,8 +145,8 @@

  return (
    <div className='dataSync'>
      <div className='dataSync-noBackTabPage'>
        <Scrollbars style={{ height: '100%' }} autoHide>
      <div className='dataSync-noBackTabPage' style={{ background: '#fff' }}>
        <Scrollbars style={{ height: height + 'px' }} autoHide ref={scrollRef}>
          <div className='whiteBox'>
            <Space size='small'>
              <div className='MediationInfo-subTitle' style={{ marginTop: '-8px' }}></div><h5>结案申请</h5>
@@ -166,7 +186,7 @@
              </Col>
            </Row>
          </div>
          <div style={{ display: 'flex', marginTop: '8px' }}>
          <div style={{ display: 'flex', borderTop: '8px solid #f0f2f5' }}>
            <div className='whiteBox' style={{ flex: 1, marginRight: '8px' }}>
              <Space size='small'>
                <div className='MediationInfo-subTitle' style={{ marginTop: '-8px' }}></div><h5>审核</h5>
@@ -176,6 +196,8 @@
                layout='vertical'
                requiredSymbol={false}
                initialValues={{
                  auditResult: '24_00004-1',
                  auditResultName: '同意'
                }}//默认值
                scrollToFirstError
              >
@@ -212,17 +234,23 @@
                            direction='vertical'
                            options={options}
                            onChange={(value) => {
                              setReasonRadio(value)
                              if (value !== '4') {
                              const obj = options.find(item => item.value === value)
                              formRef.current.setFieldValue('audit_content', obj.label)
                                formRef.current.setFieldValue('auditContent', obj.label)
                              } else {
                                formRef.current.setFieldValue('auditResultName', '')
                              }
                            }}
                          >
                          </RadioGroup>
                        </FormItem>
                      </Col>
                      <Col span={24}>
                      {
                        reasonRadio === '4' && <Col span={24}>
                        <FormItem
                          label=' '
                          field='audit_content'
                            field='auditContent'
                          rules={[{ required: true, message: '理由不能为空' }]}
                        >
                          <TextArea
@@ -231,6 +259,7 @@
                          />
                        </FormItem>
                      </Col>
                      }
                      <Col span={24} className="doubleFile">
                        <ArcoUpload
                          params={{
@@ -245,15 +274,6 @@
                  }
                </Row>
              </Form>
              <div className='dialogFooter'>
                <Button
                  type="primary"
                  className="dialogPrimary"
                  onClick={handleSubmit}
                >
                  提交
                </Button>
              </div>
            </div>
            {
              (infoData.caseLevel === 1 || infoData.caseLevel === 2) &&
@@ -266,6 +286,16 @@
            }
          </div>
        </Scrollbars>
        <div className='dialogFooter' style={{ margin: 0, padding: '16px 12px' }}>
          <Button
            type="primary"
            className="dialogPrimary"
            onClick={handleSubmit}
          >
            提交
          </Button>
          <Button type='secondary' onClick={() => navigate(-1)}>返回上级页面</Button>
        </div>
      </div>
    </div>
  )

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

@@ -34,6 +34,8 @@
  const [infoData, setInfoData] = useState({});
  const [id, setId] = useState();
  const [height, setHeight] = useState(500);
  const [agreeRadio, setAgreeRadio] = useState();
  const [reasonRadio, setReasonRadio] = useState();
  const mainFlag = props.type == 'htsh' ? 'return' : 'appear'
  const options = [
    {
@@ -69,7 +71,7 @@
    if (scrollRef.current.container) {
      offsetTop = getOffset(scrollRef.current.container).top;
    }
    setHeight(getSize().windowH - offsetTop - 74)
    setHeight(getSize().windowH - offsetTop - 80)
  };

  //回显数据
@@ -117,7 +119,8 @@

  return (
    <div className='dataSync'>
      <div className='dataSync-noBackTabPage'>
      <div className='dataSync-noBackTabPage' style={{ background: '#fff' }}>
        <Scrollbars style={{ height: height + 'px' }} autoHide ref={scrollRef}>
        <div className='whiteBox'>
          <Space size='small'>
            <div className='MediationInfo-subTitle' style={{ marginTop: '-8px' }}></div><h5>{props.type === 'htsh' ? '回退申请' : '上报申请'}</h5>
@@ -154,8 +157,7 @@
            </Col>
          </Row>
        </div>
        <div className='whiteBox' style={{ marginTop: '8px' }}>
          <Scrollbars style={{ height: height + 'px' }} autoHide ref={scrollRef}>
          <div className='whiteBox' style={{ borderTop: '8px solid #f0f2f5' }}>
            <Space size='small'>
              <div className='MediationInfo-subTitle' style={{ marginTop: '-8px' }}></div><h5>审核</h5>
            </Space>
@@ -164,6 +166,8 @@
              layout='vertical'
              requiredSymbol={false}
              initialValues={{
                auditResult: '24_00004-1',
                auditResultName: "同意"
              }}//默认值
              scrollToFirstError
            >
@@ -177,6 +181,7 @@
                      direction='vertical'
                      options={$$.options.auditResult}
                      onChange={(value) => {
                        setAgreeRadio(value)
                        if (value) {
                          const data = $$.options.auditResult.find(item => item.value === value)
                          formRef.current.setFieldValue('auditResultName', data.label)
@@ -187,6 +192,8 @@
                    />
                  </FormItem>
                </Col>
                {agreeRadio == '24_00004-2' &&
                  <>
                <Col span={24}>
                  <FormItem
                    label={(<div style={{ display: 'flex' }}>理由说明<div className="must">必填</div></div>)}
@@ -197,14 +204,20 @@
                      direction='vertical'
                      options={options}
                      onChange={(value) => {
                            setReasonRadio(value)
                            if (value !== '2') {
                        const obj = options.find(item => item.value === value)
                        formRef.current.setFieldValue('auditContent', obj.label)
                            } else {
                              formRef.current.setFieldValue('auditContent', '')
                            }
                      }}
                    >
                    </RadioGroup>
                  </FormItem>
                </Col>
                <Col span={24}>
                    {
                      reasonRadio === '2' && <Col span={24}>
                  <FormItem
                    label=' '
                    field='auditContent'
@@ -212,10 +225,11 @@
                  >
                    <TextArea
                      autoSize={{ minRows: 4, maxRows: 8 }}
                      placeholder='请填写回退的具体理由'
                            placeholder={`请填写不同意${props.type === 'htsh' ? '回退' : '上报'}的具体理由`}
                    />
                  </FormItem>
                </Col>
                    }
                <Col span={24} className="doubleFile">
                  <ArcoUpload
                    params={{
@@ -226,10 +240,13 @@
                    handleDelFile={handleDelFile}
                  />
                </Col>
                  </>
                }
              </Row>
            </Form>
          </div>
          </Scrollbars>
          <div className='dialogFooter'>
        <div className='dialogFooter' style={{ margin: 0, padding: '16px 12px' }}>
            <Button
              type="primary"
              className="dialogPrimary"
@@ -237,7 +254,7 @@
            >
              提交
            </Button>
          </div>
          <Button type='secondary' onClick={() => navigate(-1)}>返回上级页面</Button>
        </div>
      </div>
    </div>

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

@@ -31,6 +31,7 @@
  const [id, setId] = useState();
  const [infoData, setInfoData] = useState({});
  const [height, setHeight] = useState(500);
  const [agreeRadio, setAgreeRadio] = useState();

  useEffect(() => {
    getInfoData()
@@ -48,7 +49,7 @@
    if (scrollRef.current.container) {
      offsetTop = getOffset(scrollRef.current.container).top;
    }
    setHeight(getSize().windowH - offsetTop - 74)
    setHeight(getSize().windowH - offsetTop - 80)
  };

  //回显数据
@@ -93,7 +94,8 @@

  return (
    <div className='dataSync'>
      <div className='dataSync-noBackTabPage'>
      <div className='dataSync-noBackTabPage' style={{ background: '#fff' }}>
        <Scrollbars style={{ height: height + 'px' }} autoHide ref={scrollRef}>
        <div className="whiteBox">
          <Col span={24} className='title'>
            <Space size='small'>
@@ -124,8 +126,7 @@
          </Row>

        </div>
        <div className='whiteBox' style={{ marginTop: '8px' }}>
          <Scrollbars style={{ height: height + 'px' }} autoHide ref={scrollRef}>
          <div className='whiteBox' style={{ borderTop: '8px solid #f0f2f5' }}>
            <Space size='small'>
              <div className='MediationInfo-subTitle' style={{ marginTop: '-8px' }}></div><h5>审核</h5>
            </Space>
@@ -134,6 +135,8 @@
              layout='vertical'
              requiredSymbol={false}
              initialValues={{
                auditResult: '24_00004-1',
                auditResultName: "同意"
              }}//默认值
              scrollToFirstError
            >
@@ -147,6 +150,7 @@
                      direction='vertical'
                      options={$$.options.auditResult}
                      onChange={(value) => {
                        setAgreeRadio(value)
                        if (value) {
                          const data = $$.options.auditResult.find(item => item.value === value)
                          formRef.current.setFieldValue('auditResultName', data.label)
@@ -157,6 +161,8 @@
                    />
                  </FormItem>
                </Col>
                {agreeRadio == '24_00004-2' &&
                  <>
                <Col span={24}>
                  <FormItem
                    label={(<div style={{ display: 'flex' }}>理由说明<div className="must">必填</div></div>)}
@@ -186,10 +192,13 @@
                    handleDelFile={handleDelFile}
                  />
                </Col>
                  </>
                }
              </Row>
            </Form>
          </div>
          </Scrollbars>
          <div className='dialogFooter'>
        <div className='dialogFooter' style={{ margin: 0, padding: '16px 12px' }}>
            <Button
              type="primary"
              className="dialogPrimary"
@@ -197,7 +206,6 @@
            >
              提交
            </Button>
          </div>
        </div>
      </div>
    </div>

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

@@ -213,7 +213,7 @@
            scrollToFirstError={true}
            requiredSymbol={false}
            initialValues={{
              agreeType: 1,
              agreeType: 2,
            }} //默认值
          >
            <Col span={8}>

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

@@ -141,7 +141,6 @@
    const getCaseInfo = async (id) => {
        const res = await getCaseInfoApi(id)
        if (res.type) {
            console.log(res, 'res')
            let caseDes = res.data.caseDes;
            let caseClaim = res.data.caseClaim;
            setCaseDetailAi(caseDes)

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

@@ -225,8 +225,8 @@
    },
    {
      title: '回退部门',
      dataIndex: 'backUnit',
      key: 'backUnit',
      dataIndex: 'organizingUnit',
      key: 'organizingUnit',
      width: 150,
    },
    {

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

@@ -29,7 +29,7 @@
      const partyList = data.personList.concat(data.agentList)
      setInfoData({
        ...data,
        questionName: data.queProvName === null ? '-' : data.queProvName + '/' + data.queCityName + '/' + data.queAreaName + '/' + data.queRoadName,
        questionName: data.queProvName === null ? '-' : data.queCityName + '/' + data.queAreaName + '/' + data.queRoadName,
        caseType: data.caseTypeFirstName === null ? '-' : data.caseTypeFirstName + '/' + data.caseTypeName
      })
      setFakeData(partyList.map(item => {
@@ -39,15 +39,19 @@
        if (fileInfoList && fileInfoList.length != 0) {
          fileInfoList.forEach(item => {
            if (item.ownerType == '22_00018-202' || item.ownerType == '22_00018-203') {
              item.fileList.forEach(res => {
              file.push({
                name: item.fileList[0].trueName,
                uid: item.fileList[0].id,
                                    ...res,
                                    uid: res.id,
                                })
              })
            }
            if (item.ownerType == '22_00018-204' || item.ownerType == '22_00018-207') {
              item.fileList.forEach(res => {
              file1.push({
                name: item.fileList[0].trueName,
                uid: item.fileList[0].id,
                                    ...res,
                                    uid: res.id,
                                })
              })
            }
          })
@@ -57,7 +61,7 @@
          file,
          file1
        }
      }))
      }) || [])
    }

  }

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

@@ -147,7 +147,7 @@
          <div ><div className="title-text">问题属地</div></div>
          <div>
            {props.data?.queProvName ?
              `${props.data.queProvName}/${props.data.queCityName}/${props.data.queAreaName}/${props.data.queRoadName}`
              `${props.data.queCityName}/${props.data.queAreaName}/${props.data.queRoadName}`
              : '-'
            }
          </div>