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

zhangyongtian

2024-09-03 ec720735f47ec0f9ffae7e84b1189bc9a7b1c6ed

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

 gz-customerSystem/src/assets/images/Frame.svg

New file
@@ -0,0 +1,7 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10.6667 2H7.33337V14H10.6667V2Z" stroke="#1A6FB8" stroke-linejoin="round"/>
<path d="M14 2H10.6666V14H14V2Z" stroke="#1A6FB8" stroke-linejoin="round"/>
<path d="M3.33333 2L6 2.33333L4.83333 14L2 13.6667L3.33333 2Z" stroke="#1A6FB8" stroke-linejoin="round"/>
<path d="M12.3334 6V5" stroke="#1A6FB8" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M9 6V5" stroke="#1A6FB8" stroke-linecap="round" stroke-linejoin="round"/>
</svg>

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

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

@@ -143,6 +143,7 @@

//大厅来访
import scan from './scan.svg'
import result from './result.svg'

export {
  mediationCenter,
@@ -267,5 +268,6 @@
  registerChooseModal_3,
  registerChooseModal_4,
  qrCodeImg,
  scan
  scan,
  result
};

 gz-customerSystem/src/assets/images/icon/result.svg

New file
@@ -0,0 +1,7 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10.6667 2H7.33337V14H10.6667V2Z" stroke="#1A6FB8" stroke-linejoin="round"/>
<path d="M14 2H10.6666V14H14V2Z" stroke="#1A6FB8" stroke-linejoin="round"/>
<path d="M3.33333 2L6 2.33333L4.83333 14L2 13.6667L3.33333 2Z" stroke="#1A6FB8" stroke-linejoin="round"/>
<path d="M12.3334 6V5" stroke="#1A6FB8" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M9 6V5" stroke="#1A6FB8" stroke-linecap="round" stroke-linejoin="round"/>
</svg>

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

@@ -53,7 +53,8 @@
import feedback from "./feedback.png";
import fold from "./fold.png";
import down from "./down.png";
import tip from "./tip.png"
import tip from "./tip.png";
import apply from "./apply.png";

export {
  ledger_1,
@@ -102,5 +103,6 @@
  feedback,
  fold,
  down,
  tip
  tip,
  apply
};

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

@@ -31,7 +31,7 @@
  const handleFileListChange = (fileList) => {
    setMyFileList(fileList);
    if (props.onFileListChange) {
      props.onFileListChange(fileList.length);
      props.onFileListChange(fileList);
    }
  };


 gz-customerSystem/src/router/router.js

@@ -2,7 +2,7 @@
 * @Company: hugeInfo
 * @Author: ldh
 * @Date: 2022-03-28 11:22:41
 * @LastEditTime: 2024-08-31 17:09:28
 * @LastEditTime: 2024-09-03 14:58:33
 * @LastEditors: dminyi 1301963064@qq.com
 * @Version: 1.0.0
 * @Description: 路由
@@ -140,6 +140,8 @@
import EventFlow from "../views/register/eventFlow";
//办理反馈
import HandleFeedback from "../views/register/handleFeedback";
//档案信息
import FileMessage from "../views/register/matterDetail/fileMessage";

import Test from "../views/test";

@@ -215,6 +217,8 @@
                        <Route path="visit/:id?" element={<Visit />} />
                        <Route path="visit/eventFlow" element={<EventFlow />} />
                        <Route path="visit/handleFeedback" element={<HandleFeedback />} />
                        <Route path="visit/fileMessage" element={<FileMessage />} />


                        
                        {/* 工作流模块 */}

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

@@ -2,7 +2,7 @@
 * @Author: dminyi 1301963064@qq.com
 * @Date: 2024-09-02 14:49:13
 * @LastEditors: dminyi 1301963064@qq.com
 * @LastEditTime: 2024-09-02 20:52:05
 * @LastEditTime: 2024-09-03 14:44:14
 * @FilePath: \gzDyh\gz-customerSystem\src\views\register\handleFeedback\component\CaseResult.jsx
 * @Description: 结案申请
 */
@@ -326,7 +326,7 @@
              <FormItem
                label={<div style={{ display: 'flex' }}>
                  无法化解理由
                  <Tooltip onClick={() => setNoHandleReason(true)}>
                  <Tooltip onClick={() => setNoHandleReason(!noHandleReason)}>
                    <img src={question1} alt="" style={{ width: '13px', height: '13px', margin: '4px 4px 0px 4px' }} />
                  </Tooltip>
                  <div className="must" style={{ marginLeft: '4px' }}>必填</div>

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

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

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

@@ -444,3 +444,9 @@
    gap: 8px;
    margin-bottom: 8px;
}

.MyDrawer{
    position:absolute;
    z-index: 9999;
}


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

New file
@@ -0,0 +1,81 @@
import React,{useState} from 'react';
import NewPage from '@/components/NewPage';
import { Steps, Tabs } from '@arco-design/web-react';
import {apply} from '@/assets/images';
import {result} from '@/assets/images/icon';

const Step = Steps.Step;
const TabPane = Tabs.TabPane;


const FileMessage = (props) => {

  const [tabsActive, setTabsActive] = useState('1');
  const [current, setCurrent] = useState(6);
  const [tabsList, setTabList] = useState([
        {
            img: result,
            label: '档案信息',
            key: '1'
        },
        {
            img: apply,
            label: '申请记录',
            key: '2',
            isNeedStep: true,//加上这个就有进度条
        },
    ])


  return (
    <>
      <NewPage
        pageHead={
          { breadcrumbData: [{ title: '工作台' }, { title: '事件中心' }], title: '详情' }
        }
      >
        <Tabs
          defaultActiveTab='1'
          onChange={(v) => setTabsActive(v)}
          className='myTabContent'
        >
          {tabsList?.map(item => {
            return <TabPane
              key={item.key}
              title={
                <span>
                  {tabsActive === item.key && <img src={item.img} alt="" style={{ width: '16px', height: '16px', margin: '-5px 12px 0px 0px' }} />}
                  <span style={{ fontSize: '16px' }}>{item.label}</span>
                </span>
              }
            >
              {
                item.isNeedStep && <div style={{ backgroundColor: '#fff', margin: '12px 16px 0px 16px', paddingTop: '16px', paddingLeft: '91px' }}>
                  <Steps type='navigation' current={current}>
                    <Step title='来访登记' disabled />
                    <Step title='事件流转' disabled />
                    <Step title='办理反馈' disabled />
                    <Step title='结案审核' disabled />
                    <Step title='当事人评价' disabled />
                    <Step title='结案归档' disabled />
                  </Steps>
                </div>
              }
              {tabsActive === '1' &&
                <></>
              }
              {
                tabsActive === '2' &&
                <></>
              }
            </TabPane>
          })}
        </Tabs>


      </NewPage>
    </>
  )
}

export default FileMessage;

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

@@ -162,9 +162,9 @@
  }


  useEffect(() => {
    getCaseInfo()
  }, [])
  // useEffect(() => {
  //   getCaseInfo()
  // }, [])

  return (
    <div style={{ position: 'relative' }}>

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

@@ -2,7 +2,7 @@
 * @Author: dminyi 1301963064@qq.com
 * @Date: 2024-08-27 16:47:12
 * @LastEditors: dminyi 1301963064@qq.com
 * @LastEditTime: 2024-09-02 20:21:12
 * @LastEditTime: 2024-09-03 14:35:13
 * @FilePath: \gzDyh\gz-customerSystem\src\views\register\visit\component\levelDetail.jsx
 * @Description: 右抽屉提示
 */
@@ -79,6 +79,7 @@

const NoHandleReason = ({ visible, onClose }) => {
    return (
        <div className='MyDrawer'>
        <MyDrawer
            visible={visible}
            onClose={onClose}
@@ -95,6 +96,8 @@
            </div>
        </MyDrawer>

        </div>

    )

}

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

@@ -40,19 +40,16 @@
  const [addVisabled, setAddVisabled] = useState(false);//添加当事人弹窗控制
  const [fakeData, setFakeData] = useState([]);//当事人信息数据
  const [scanFile, setScanFile] = useState(false);
  const [scanImage, setScanImage] = useState(false);
  const [scaned, setScaned] = useState(false);
  const [upload, setUpLoad] = useState(false);
  const [sourceType, setSourceType] = useState('1');
  const [filesCheck, setFilesCheck] = useState(false);
  const [fileView, setFileView] = useState();
  const [fileTip, setFileTip] = useState('0');
  const [mapView, setMapView] = useState(false);
  const [visible, setVisible] = useState(false);
  const [apply, setApply] = useState(false);
  const [editData, setEditData] = useState(null);
  const [agentVisible, setAgentVisible] = useState(false);
  const [fileLength, setFileLength] = useState('');
  const [matterNumber, setMatterNumber] = useState('');
  const peopleMap = {
    '15_020008-1': '申请方',
    '15_020008-2': '被申请方',
@@ -119,10 +116,9 @@
              label='身份证明材料'
              editData={props.editData}
              handleDelFile={handleDelFile}
              onFileListChange={(v) => setFileLength(v)}
              fileTip
              onFileListChange={(v) => { setFileLength(v); console.log(v, 'vvsetFileLength') }}
            />
            {fileLength && <div style={{ position: 'absolute', top: '233px', left: '16px', color: '#86909C' }} > 申请材料累计上传：<span style={{ color: '#1A6FB8' }}>{fileLength}</span></div>}
            {fileLength.length > 0 && <div style={{ position: 'absolute', top: '233px', left: '16px', color: '#86909C' }}>申请材料累计上传：<span style={{ color: '#1A6FB8' }}>{fileLength.length}</span></div>}
          </Col >
        </>
      )
@@ -136,7 +132,7 @@
              params={{
                action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${props.mainId}&&ownerId=${props.mainId}&ownerType=22_00014-2`,
              }}
              field='file'
              field='file1'
              handleChangeFile={handleChangeFile}
              label='身份证明材料'
              editData={props.editData}
@@ -218,7 +214,8 @@
      width: 180,
      render: (text) => (
        <>
          {text}份
        {text}
          {/* {sourceType === '1' ? matterNumber : sourceType === '2' ? evidenceNumber : 0}份 */}
        </>
      )

@@ -327,6 +324,8 @@
    setDialogType(value.perType)
    setEditData(value)
  }

  console.log(sourceType, 'sourceType')


  return (
@@ -615,7 +614,7 @@
                <Row gutter={[32, 0]}>{formType(sourceType)}</Row>
              </Form>
            </Col>
            <Button type="primary" style={{ marginTop: '-20px', marginLeft: '16px' }}>上传完成</Button>
            <Button type="primary" style={{ marginTop: '-20px', marginLeft: '16px' }} onClick={() => { setMatterNumber(fileLength.length); setUpLoad(false) }}>上传完成</Button>
          </Row>
        </div>