diff --git a/weapp/src/packages/patrol/index.jsx b/weapp/src/packages/patrol/index.jsx
index 2916ca25..fa5b153e 100644
--- a/weapp/src/packages/patrol/index.jsx
+++ b/weapp/src/packages/patrol/index.jsx
@@ -11,6 +11,7 @@ import { getState } from '../../store/globalState';
import { postReport, getReportList, getReportDetail, delReport, getRoadSection, postImage, getProject, postHandle } from '@/services/api';
import './index.scss';
import arrowIcon from '../../static/img/patrol/arrow-down.svg';
+import dayjs from 'dayjs';
const { baseUrl, imgUrl } = environment;
@@ -197,6 +198,7 @@ const Index = () => {
unit: '块',
},
})
+ const [isBeforeReport, setIsBeforeReport] = useState(false) // V1.1.0上报内容修改,查看时根据时间判断展示逻辑)
const prjType =
isAnomaly ?
@@ -286,7 +288,7 @@ const Index = () => {
setConserveUnderwayPic(data.conserveUnderwayPic ? data.conserveUnderwayPic.map(item => ({ url: imgUrl + item })) : [])
setConserveAfterPic(data.conserveAfterPic ? data.conserveAfterPic.map(item => ({ url: imgUrl + item })) : [])
setHandleId(data.id)
- setVideo(data.videoUrl[0] ? imgUrl + data.videoUrl[0] : '')
+ setVideo((data.videoUrl && data.videoUrl[0]) ? imgUrl + data.videoUrl[0] : '')
setRoadCodeHead(data.codeRoad ? data.codeRoad.slice(0, 1) : '')
setRoadCodeEnd(data.codeRoad ? data.codeRoad.slice(1) : '')
if (data.reportType === 'patrol') {
@@ -314,6 +316,7 @@ const Index = () => {
if (data.handleContent) {
setHandleCenter(data.handleContent)
}
+ setIsBeforeReport(dayjs(data.time).diff('2023-08-02', 'd') < 0)
} else {
Taro.showToast({ title: res.data.message || '请求出错', icon: 'none' })
}
@@ -900,7 +903,7 @@ const Index = () => {
{
isPatrol ? <>
-
+ {!(isView && isBeforeReport) &&
* 线路编码:
{
setRoadCodeHead(e.detail.value[0]);
@@ -917,13 +920,19 @@ const Index = () => {
onInput={e => handleInput(e, 'roadCodeEnd')}
disabled={isView}
/>
-
+ }
* 道路类型:
{ }}
disabled={true}
/>
@@ -1004,7 +1013,7 @@ const Index = () => {
/> : ''
}
{
- isAnomaly ?
+ isAnomaly || (isView && isBeforeReport) ?
{
/>
{
- kind === 'patrol' &&
+ (kind === 'patrol' && !(isView && isBeforeReport)) &&
* 巡查内容
@@ -1160,7 +1169,7 @@ const Index = () => {
}
{
- !isPatrol ?