diff --git a/weapp/src/packages/patrol/index.jsx b/weapp/src/packages/patrol/index.jsx index 08fc96bc..d93ecb44 100644 --- a/weapp/src/packages/patrol/index.jsx +++ b/weapp/src/packages/patrol/index.jsx @@ -424,10 +424,12 @@ const Index = () => { if ( (isPatrol && (!projectType || !road || !roadCodeEnd)) || (isAnomaly && !road) - || (kind === 'patrol' && Object.values(patrolContent).every(c => c.value.trim() === '') && !patrolContent.巡查结果无异常.selected) + || (kind === 'patrol' + && (Object.values(patrolContent).every(c => c.value === '') && !patrolContent.inspectionNoException.selected + || Object.values(patrolContent).some(c => c.selected && c.value === ''))) || (kind === 'conserve' - && (Object.values(conserveInfo).every(c => c.value.trim() === '') - || (Object.values(conserveContent).every(c => c.value.trim() === '') && !otherDescription))) + && (Object.values(conserveInfo).every(c => c.value === '') + || (Object.values(conserveContent).every(c => c.value === '') && !otherDescription))) ) { Taro.showToast({ title: '请完善必填信息', icon: 'none' }) return @@ -921,8 +923,9 @@ const Index = () => { handleInput(e, 'roadCodeEnd')} disabled={isView} /> @@ -1277,26 +1280,27 @@ const Index = () => { /> } - {/* - - 养护中 - { - isView ? + isView && isBeforeReport ? <> + + + 养护中 + {conserveUnderwayPic.map(item => ( handleImgClick(undefined, item)} /> ))} - : - = 3 ? false : true} - files={conserveUnderwayPic} - onChange={(files, operationType, index) => handleImgChange(files, operationType, index, 'conserveUnderwayPic')} - onImageClick={handleImgClick} - /> - } */} + + : null + // = 3 ? false : true} + // files={conserveUnderwayPic} + // onChange={(files, operationType, index) => handleImgChange(files, operationType, index, 'conserveUnderwayPic')} + // onImageClick={handleImgClick} + // /> + }