diff --git a/weapp/src/packages/patrol/index.jsx b/weapp/src/packages/patrol/index.jsx index fa5b153e..08fc96bc 100644 --- a/weapp/src/packages/patrol/index.jsx +++ b/weapp/src/packages/patrol/index.jsx @@ -198,6 +198,7 @@ const Index = () => { unit: '块', }, }) + const [otherDescription, setOtherDescription] = useState('') // 其他养护内容 const [isBeforeReport, setIsBeforeReport] = useState(false) // V1.1.0上报内容修改,查看时根据时间判断展示逻辑) const prjType = @@ -312,6 +313,7 @@ const Index = () => { if (data[key]) nextContent[key].value = data[key] }) setConserveContent(nextContent) + setOtherDescription(data.otherDescription) } if (data.handleContent) { setHandleCenter(data.handleContent) @@ -425,7 +427,7 @@ const Index = () => { || (kind === 'patrol' && Object.values(patrolContent).every(c => c.value.trim() === '') && !patrolContent.巡查结果无异常.selected) || (kind === 'conserve' && (Object.values(conserveInfo).every(c => c.value.trim() === '') - || Object.values(conserveContent).every(c => c.value.trim() === ''))) + || (Object.values(conserveContent).every(c => c.value.trim() === '') && !otherDescription))) ) { Taro.showToast({ title: '请完善必填信息', icon: 'none' }) return @@ -482,6 +484,7 @@ const Index = () => { Object.keys(conserveContent).forEach(key => { data[key] = Number(conserveContent[key].value) }) + data.otherDescription = otherDescription } } @@ -627,6 +630,9 @@ const Index = () => { nextContent[key].value = value setConserveContent(nextContent) break; + case "otherDescription": + setOtherDescription(value) + break; case "contentCheck": let nextCheck = { ...patrolContent } Object.keys(patrolContent).forEach(key => { @@ -1164,6 +1170,17 @@ const Index = () => { {conserveContent[key].unit} ) } + + 其他: + handleInput(e, 'otherDescription')} + disabled={isView} + /> +