上报细节调整

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(conserveInfo).every(c => c.value === '')
-          || (Object.values(conserveContent).every(c => c.value.trim() === '') && !otherDescription)))
+          || (Object.values(conserveContent).every(c => c.value === '') && !otherDescription)))
     ) {
       Taro.showToast({ title: '请完善必填信息', icon: 'none' })
       return
@@ -921,8 +923,9 @@ const Index = () => {
             </RadioGroup>
             <Input
               type='text'
-              placeholder={isView ? '' : '请输入线路编号'}
+              placeholder={isView ? '' : '输入后9位线路编码'}
               value={roadCodeEnd}
+              maxlength={10}
               onInput={e => handleInput(e, 'roadCodeEnd')}
               disabled={isView}
             />
@@ -1277,26 +1280,27 @@ const Index = () => {
                 />
             }
 
-            {/* <View className='horizontal-line hl-two'>
-              <View className='circle c-two'></View>
-              <View className='text t-two'>养护中</View>
-            </View>
             {
-              isView ?
+              isView && isBeforeReport ? <>
+                <View className='horizontal-line hl-two'>
+                  <View className='circle c-two'></View>
+                  <View className='text t-two'>养护中</View>
+                </View>
                 <View className='img-box'>
                   {conserveUnderwayPic.map(item => (
                     <Image className='img' src={item.url} onClick={() => handleImgClick(undefined, item)} />
                   ))}
-                </View> :
+                </View>
-                <AtImagePicker
+              </> : null
-                  className='img-picker'
+              // <AtImagePicker
-                  count={3 - conserveUnderwayPic.length}
+              //   className='img-picker'
-                  showAddBtn={conserveUnderwayPic.length >= 3 ? false : true}
+              //   count={3 - conserveUnderwayPic.length}
-                  files={conserveUnderwayPic}
+              //   showAddBtn={conserveUnderwayPic.length >= 3 ? false : true}
-                  onChange={(files, operationType, index) => handleImgChange(files, operationType, index, 'conserveUnderwayPic')}
+              //   files={conserveUnderwayPic}
-                  onImageClick={handleImgClick}
+              //   onChange={(files, operationType, index) => handleImgChange(files, operationType, index, 'conserveUnderwayPic')}
-                />
+              //   onImageClick={handleImgClick}
-            } */}
+              // />
+            }
 
             <View className='horizontal-line hl-three'>
               <View className='circle c-three'></View>