Commit e1ff7fd53b8e3756c34a32d5fee86b648579c8d4
1 parent
d2d23eef
完成状态。查看详细
Showing
3 changed files
with
11 additions
and
6 deletions
pages-sub/daily/maintain-manage/finish-plan-detail.vue
| @@ -87,7 +87,7 @@ | @@ -87,7 +87,7 @@ | ||
| 87 | 87 | ||
| 88 | <up-cell | 88 | <up-cell |
| 89 | title="提交时间" | 89 | title="提交时间" |
| 90 | - :value="i.finishTime==null?'--':timeFormat(i.finishTime,'yyyy-mm-dd hh:MM:ss')" | 90 | + :value="i.createTime==null?'--':timeFormat(i.createTime,'yyyy-mm-dd hh:MM:ss')" |
| 91 | align="middle" | 91 | align="middle" |
| 92 | ></up-cell> | 92 | ></up-cell> |
| 93 | 93 |
pages-sub/daily/maintain-manage/now-list-page.vue
| 1 | <template> | 1 | <template> |
| 2 | <view class="page-wrap"> | 2 | <view class="page-wrap"> |
| 3 | <!-- 顶部提示栏 --> | 3 | <!-- 顶部提示栏 --> |
| 4 | - <view class="tip-bar"> | 4 | + <view class="tip-bar" v-if="isView!==2" > |
| 5 | 一个任务可提交多次上报记录,每一次作业需如实上报。 | 5 | 一个任务可提交多次上报记录,每一次作业需如实上报。 |
| 6 | </view> | 6 | </view> |
| 7 | <!-- 上报记录列表 --> | 7 | <!-- 上报记录列表 --> |
| @@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
| 19 | <empty-view text="暂无数据"></empty-view> | 19 | <empty-view text="暂无数据"></empty-view> |
| 20 | </view> | 20 | </view> |
| 21 | <!-- 底部固定按钮 --> | 21 | <!-- 底部固定按钮 --> |
| 22 | - <view class="fixed-bottom-btn-wrap"> | 22 | + <view class="fixed-bottom-btn-wrap" v-if="isView!==2"> |
| 23 | <up-button type="primary" size="large" block @click="handleAddReport">上报本次记录</up-button> | 23 | <up-button type="primary" size="large" block @click="handleAddReport">上报本次记录</up-button> |
| 24 | </view> | 24 | </view> |
| 25 | </view> | 25 | </view> |
| @@ -34,12 +34,14 @@ const reportList = ref<any[]>([]) | @@ -34,12 +34,14 @@ const reportList = ref<any[]>([]) | ||
| 34 | let planNo = ref('') | 34 | let planNo = ref('') |
| 35 | let planTypeId = ref('') | 35 | let planTypeId = ref('') |
| 36 | let businessType = ref('') | 36 | let businessType = ref('') |
| 37 | +let isView = ref(true) | ||
| 37 | // onLoad接收url传过来的planNo | 38 | // onLoad接收url传过来的planNo |
| 38 | onLoad((options) => { | 39 | onLoad((options) => { |
| 39 | if (options.planNo) { | 40 | if (options.planNo) { |
| 40 | planNo.value = options.planNo | 41 | planNo.value = options.planNo |
| 41 | planTypeId.value = options.planTypeId | 42 | planTypeId.value = options.planTypeId |
| 42 | businessType.value = options.businessType | 43 | businessType.value = options.businessType |
| 44 | + isView.value = options.isView | ||
| 43 | // planTypeId=${item.planTypeId}&businessType=${item.busiLine} | 45 | // planTypeId=${item.planTypeId}&businessType=${item.busiLine} |
| 44 | getReportList() | 46 | getReportList() |
| 45 | } else { | 47 | } else { |
pages-sub/daily/maintain-manage/type-list-page.vue
| @@ -25,7 +25,10 @@ | @@ -25,7 +25,10 @@ | ||
| 25 | <view class="row row-2"> | 25 | <view class="row row-2"> |
| 26 | <view class="info-text">任务次数:第{{ item.planNum || 1 }}次</view> | 26 | <view class="info-text">任务次数:第{{ item.planNum || 1 }}次</view> |
| 27 | <!-- 仅待完成才显示去作业 --> | 27 | <!-- 仅待完成才显示去作业 --> |
| 28 | - <view v-if="activeStatus === '1'" class="mini-btn" @click.stop="handleGoWork(item)">去作业</view> | 28 | + <!-- 待完成:去作业;已完成:去查看 --> |
| 29 | +<view v-if="activeStatus === '1'" class="mini-btn" @click.stop="handleGoWork(item)">去作业</view> | ||
| 30 | +<view v-else-if="activeStatus === '2'" class="mini-btn" @click.stop="handleGoWork(item)">去查看</view> | ||
| 31 | + | ||
| 29 | </view> | 32 | </view> |
| 30 | <!-- 第三行:有效期 + 结束任务按钮 --> | 33 | <!-- 第三行:有效期 + 结束任务按钮 --> |
| 31 | <view class="row row-3"> | 34 | <view class="row row-3"> |
| @@ -236,9 +239,9 @@ const confirmSetInvalid = async () => { | @@ -236,9 +239,9 @@ const confirmSetInvalid = async () => { | ||
| 236 | } | 239 | } |
| 237 | 240 | ||
| 238 | const handleGoWork = (item) => { | 241 | const handleGoWork = (item) => { |
| 242 | + const isView = activeStatus.value | ||
| 239 | uni.navigateTo({ | 243 | uni.navigateTo({ |
| 240 | - // 重点:把planNo传过去 | ||
| 241 | - url: `/pages-sub/daily/maintain-manage/now-list-page?planNo=${item.planNo}&planTypeId=${planTypeId.value}&businessType=${item.busiLine}` | 244 | + url: `/pages-sub/daily/maintain-manage/now-list-page?planNo=${item.planNo}&planTypeId=${planTypeId.value}&businessType=${item.busiLine}&isView=${isView}` |
| 242 | }) | 245 | }) |
| 243 | } | 246 | } |
| 244 | const handleEndTask = async (item) => { | 247 | const handleEndTask = async (item) => { |