From 8e9f556423b0e3a19ce70df2bca8c351035368b0 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 12 Sep 2024 16:06:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh

---
 gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx |   40 +++++++++++++++++++++++++++-------------
 1 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index 27c6b4e..6582b3e 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -183,6 +183,7 @@
         initialValues={{
           caseLevel: 3,
           visitTime: getFormattedDateTime(),
+          occurTime: getFormattedDateTime(),
           majorStatus: 0,
         }}//默认值
       >
@@ -276,22 +277,27 @@
             </FormItem>
           </Col>
           <Col span={8}>
-            <FormItem label='问题属地' field='myQuesAddress'>
+            <FormItem 
+              label={(<div style={{ display: 'flex' }}>问题属地<div className="must">必填</div></div>)}
+              field='myQuesAddress'
+              rules={[{ message: '请选择问题属地', required: true }]}
+              >
               <Cascader
                 placeholder='请选择'
                 options={$$.locationOption()}
                 showSearch
                 onChange={(value, option) => {
                   if (option) {
+                    console.log(option)
                     props.formRef.current.setFieldsValue({
-                      queProv: option[0].value,
-                      queProvName: option[0].label,
-                      queCity: option[1].value,
-                      queCityName: option[1].label,
-                      queArea: option[2].value,
-                      queAreaName: option[2].label,
-                      queRoad: option[3] && option[3].value || '',
-                      queRoadName: option[3] && option[3].label || '',
+                      // queProv: option[0].value,
+                      // queProvName: option[0].label,
+                      // queCity: option[1].value,
+                      // queCityName: option[1].label,
+                      queArea: option[0].value,
+                      queAreaName: option[0].label,
+                      queRoad: option[1] && option[1].value || '',
+                      queRoadName: option[1] && option[1].label || '',
                     })
                   } else {
                     //清除数据
@@ -331,7 +337,7 @@
                 </Tooltip>
                 <div className="must" style={{ marginLeft: '4px' }}>必填</div>
                 <img src={scan} alt="" style={{ marginRight: '-2px', marginLeft: '8px' }} />
-                <div style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px', cursor: 'pointer' }} onClick={() => { setScanFile(true); setOcrText('caseDes') }}>识别上传材料</div>
+                <div style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px', cursor: 'pointer' }} onClick={() => { setScanFile(true); setOcrText('caseDes') }}>识别材料</div>
               </div>
               }
               field='caseDes'
@@ -355,7 +361,7 @@
                 </Tooltip> */}
                 <div className="must">必填</div>
                 <img src={scan} alt="" style={{ marginRight: '-2px', marginLeft: '8px' }} />
-                <div style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px', cursor: 'pointer' }} onClick={() => { setScanFile(true); setOcrText('caseClaim') }}>识别上传材料</div>
+                <div style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px', cursor: 'pointer' }} onClick={() => { setScanFile(true); setOcrText('caseClaim') }}>识别材料</div>
               </div>
               }
               field='caseClaim'
@@ -391,8 +397,16 @@
           <div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>事件材料</h4>
         </Space>
       </Col>
-      <FileTable mainId={props.mainId} fileInfoList={props.fileInfoList} isReview={false} />
-
+      <div style={{ marginBottom: '65px' }}>
+        <FileTable
+          mainId={props.mainId}
+          fileInfoList={props.fileInfoList}
+          isReview={false}
+          handleSaveList={(list) => {
+            props.formRef.current.setFieldValue('fileInfoList', list)
+          }}
+        />
+      </div>
       <DocumentScanner
         visible={scanFile}
         onConfirm={handleConfirm}

--
Gitblit v1.8.0