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

zhangyongtian

2024-09-11 48338f6e5bd42fc3617d44c49aa825046e1f1730

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

 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-11 11:29:10
 * @LastEditTime: 2024-09-11 11:34:07
 * @FilePath: \gzDyh\gz-customerSystem\src\views\register\handleFeedback\component\CaseResult.jsx
 * @Description: 结案申请
 */
@@ -99,6 +99,14 @@
      formRefWrite.current.setFieldValue('windupContent', '鉴于以上协议内容已经双方确认，并认为该协议内容公平合理，能够妥善解决双方的纠纷。建议双方当事人按照协议内容执行，以实现纠纷的最终解决。')
    } else {
      formRefWrite.current.setFieldValue('windupContent', '')
    }
  }

  const handleTemplate3 = (type) => {
    if (type === 1) {
      failRef.current.setFieldValue('windupContent', '经过多次调解，尽管纠纷化解人员尽最大努力帮助双方找到解决方案，但由于以下原因，当事人双方未能达成一致意见：[详细说明化解未成功的原因之一][详细说明化解未成功的原因之二][……][……]鉴于上述情况，纠纷化解人员认为目前无法通过调解方式解决双方的争议，建议双方考虑采取其他合法途径解决纠纷。')
    } else {
      failRef.current.setFieldValue('windupContent', '')
    }
  }

@@ -450,27 +458,18 @@
                </tr>
              </table>
            </Col>
            <Col span={24}>
            <Col span={24} style={{ position: 'relative' }}>
              <div style={{ position: 'absolute', display: 'flex ', top: '28px', zIndex: 1 }}>
                <div className='myTag' style={{ marginRight: '22px' }} onClick={() => { handleTemplate3(1) }}>公共模板：化解不成功结案意见范本</div>
              </div>
              <FormItem
                label={
                  <>
                    <div style={{ display: 'flex' }}>
                      结案意见
                      <div className="must" style={{ marginLeft: '4px' }}>必填</div>
                    </div>
                    <div className='modeMore'>
                      <div className='caseResult-textarea'>公共模板：化解不成功结案意见范本</div>
                      <div style={{ color: '#1A6FB8' }} onClick={() => setMode(!mode)}>更多模板</div>
                    </div>
                  </>
                }
                label={(<div style={{ display: 'flex' }}>结案意见<div className="must">必填</div></div>)}
                field='windupContent'
                rules={[{ message: '请填写事项概况', required: true }]}
              >
                <Input.TextArea
                  rows={5}
                  wrapperStyle={{ width: '100%' }}
                  value='鉴于以上协议内容已经双方确认，并认为该协议内容公平合理，能够妥善解决双方的纠纷。建议双方当事人按照协议内容执行，以实现纠纷的最终解决。'
                <TextArea
                  autoSize={{ minRows: 4, maxRows: 8 }}
                  placeholder='请填写'
                  style={{ marginTop: '40px' }}
                />
              </FormItem>
            </Col>

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

@@ -138,9 +138,12 @@
  }

  const getByIdRole = async () => {
    console.log(feedbackInfoData?.handleUserId, 'feedbackInfoData?.handleUserId')
    const res = await getByIdRoleApi(feedbackInfoData?.handleUserId)
    if(res.type){
      setPersonView(!personView)
    setPersonData(res.data)

    }
  }


@@ -185,9 +188,9 @@
  const getFeedbackInfo = async () => {
    const res = await getFeedbackInfoApi(caseId)
    if (res.type) {
      setFeedbackInfoData(res.data)
      setFeedbackInfoData(() => res.data)
      console.log(res.data, 'res.data')
      getByIdRole();
      // getByIdRole();
    }
  }

@@ -269,7 +272,7 @@
  }

  const handlePersonView = () => {
    setPersonView(!personView)
    getByIdRole();

  }

@@ -366,7 +369,7 @@
                    caseId && managerName ?
                      <WantUserTag name={managerName} onClose={() => setWantUser({ wantUserId: null, wantUserName: null })} />
                      :
                      <Button onClick={() => setIsModalVisible(true)} style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} type='outline'>选择</Button>
                      <Button onClick={() => { setIsModalVisible(true); }} style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} type='outline'>选择</Button>
                  }
                </FormItem>
              </Col>
@@ -407,7 +410,6 @@
                              wrapperStyle={{ width: '100%' }}
                            />
                          </FormItem>

                        </Col>
                        <Col span={24}>
                          <FormItem
@@ -420,7 +422,7 @@
                          >
                            <ArcoUpload
                              params={{
                                action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${caseId}&ownerId=${caseId}&ownerType=${'22_00018-501'}`,
                                action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${caseId}&ownerId=${id}&ownerType=${'22_00018-501'}`,
                              }}
                              field='file1'
                              // handleChangeFile={handleChangeFile}
@@ -543,7 +545,7 @@
            </tr>
            <tr>
              <th bgcolor="#F7F8FA" className="table-title">所属部门</th>
              <td>{personData?.deptName}</td>
              <td>{personData?.unitName}</td>
              <th bgcolor="#F7F8FA" className="table-title">职务</th>
              <td>{personData?.userRoles}</td>
            </tr>

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

@@ -3,7 +3,7 @@
 * @Author: dminyi 1301963064@qq.com
 * @Date: 2024-08-09 09:59:43
 * @LastEditors: dminyi 1301963064@qq.com
 * @LastEditTime: 2024-09-11 09:28:35
 * @LastEditTime: 2024-09-11 12:20:34
 * @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
 * @Description: 来访登记
 * 
@@ -215,7 +215,7 @@
            </NewPage>
            <div className="gradient-box" onClick={() => handleAi()}>
                <div><img src={Aimge} alt='' style={{ width: '111px', height: '120px' }} /></div>
                <div style={{ color: '#FFFFFF' }}>智能调解助理</div>
                <div style={{ color: '#FFFFFF' }}>穗调解数智人</div>
            </div>
            <AiQuestion
                visible={AiQuestionView}

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

@@ -772,6 +772,12 @@
.marginLeft {
    margin-left: 55px;

    &-tip{
        margin-top: -12px;
    margin-bottom: 12px;
    margin-left: 55px;
    }


    //fontWeight: '600', marginBottom: '16px'
    &-title {

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

@@ -1,3 +1,11 @@
/*
 * @Author: dminyi 1301963064@qq.com
 * @Date: 2024-09-06 09:40:00
 * @LastEditors: dminyi 1301963064@qq.com
 * @LastEditTime: 2024-09-11 12:00:20
 * @FilePath: \gzDyh\gz-customerSystem\src\views\register\matterDetail\HandleRecord.jsx
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
import React, { useState, useRef, useEffect } from 'react';
import * as $$ from '@/utils/utility';
import { Form, Input, Tabs, Typography, Empty, Radio, Button, Modal } from '@arco-design/web-react';
@@ -31,7 +39,7 @@
    <div>
      {list?.length > 0 ?
        <div>
          {list?.map(record => (
          {list?.map((record,index) => (
            <div key={record.id} className='container-bottom-left-record'>
              <div className='container-bottom-left-record-top'>
                {
@@ -57,7 +65,7 @@
                  </tr>
                  <tr>
                    <th bgcolor="#F7F8FA" className="table-title" width="120">办理附件</th>
                    <td>{record.handleUnitName}</td>
                    <td>{record?.fileInfoList?.[0]?.trueName}</td>
                  </tr>
                </table>
              </div>

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

@@ -151,7 +151,7 @@
            </Col>
            <Col span={16}>
              <div className="title"><div className="title-text">是否重大矛盾纠纷</div></div>
              <div>{infoData.majorStatus === '0' ? '否' : infoData.majorStatus === '1' ? '是' : '-'}</div>
              <div>{infoData.majorStatus === '1' ? '是' : '否'}</div>
            </Col>
          </Row>
          <Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '8px', marginTop: '20px' }}>

 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-11 10:12:32
 * @LastEditTime: 2024-09-11 12:25:47
 * @FilePath: \gzDyh\gz-customerSystem\src\views\register\visit\component\levelDetail.jsx
 * @Description: 右抽屉提示
 */
@@ -189,20 +189,22 @@
            <MyDrawer
                visible={visible}
                onClose={onClose}
                title="智能调解助理"
                title="穗调解数智人"
                width={1200}
                style={{ position: 'absolute' }}
                bodyStyle={{ marginTop: '-8px' }}
                titleBefore={true}
            >
                <div style={{ display: 'flex' }}>
                    <div style={{ width: '100px' }}></div>
                    <div className='aiBox'>
                        <div className='aiBox-case'>
                            <div className='aiBox-case-logo'>
                                <img src={caselogo} alt='' className='aiBox-case-logo-img' />
                            </div>
                            <div style={{ flex: 1,marginTop:'4px' }}>{caseDetailAi}</div>
                        </div>
                        <div className='marginLeft-tip' >
                            根据当事人的事项概况和事项申请，推荐以下类案和法条参考：
                        </div>
                        <div className='marginLeft'>
                            <div className='marginLeft-title'>相关案例：</div>
@@ -247,10 +249,12 @@
                        <div className='layerDetail'>
                            <div className='layerDetail-title'>参考案例</div>
                            <div className='layerDetail-name'>{caseDetailView?.caseTitle || '-'}</div>
                            <div className='layerDetail-littleTitle'>基本案情</div>
                            <div className='layerDetail-littleTitle'>案件描述</div>
                            <div className='layerDetail-content'>{caseDetailView?.caseDesc || '-'}</div>
                            <div className='layerDetail-littleTitle'>结果</div>
                            <div className='layerDetail-littleTitle'>群众诉求</div>
                            <div className='layerDetail-content'>{caseDetailView?.caseClaim || '-'}</div>
                            <div className='layerDetail-littleTitle'>和解协议</div>
                            <div className='layerDetail-content'>{caseDetailView?.agreeContent || '-'}</div>
                        </div>
                    }
                    {