Commit 7adb99f038115ca82fab7013f71aa19bc5205e76
1 parent
3ddb854c
全域督察员
Showing
5 changed files
with
39 additions
and
12 deletions
pages-sub/problem/regional-order-manage/add-order.vue
| ... | ... | @@ -383,7 +383,7 @@ const echoOrderData = (orderItem) => { |
| 383 | 383 | workOrderForm.problemDesc = orderItem.remark || ''; |
| 384 | 384 | workOrderForm.lat = orderItem.lat || 0; |
| 385 | 385 | workOrderForm.lon = orderItem.lon || 0; |
| 386 | - workOrderForm.expectedFinishDate = timeFormat(orderItem.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss') || timeFormat(new Date(), 'yyyy-mm-dd hh:MM:ss'); | |
| 386 | + workOrderForm.expectedFinishDate = timeFormat(orderItem.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss') || ''; | |
| 387 | 387 | |
| 388 | 388 | // 回显图片 |
| 389 | 389 | if (orderItem.problemsImgs && Array.isArray(orderItem.problemsImgs) && orderItem.problemsImgs.length > 0) { |
| ... | ... | @@ -566,14 +566,14 @@ const submitWorkOrder = async () => { |
| 566 | 566 | } |
| 567 | 567 | |
| 568 | 568 | const commonSubmitData = { |
| 569 | - roadId: workOrderForm.roadId, | |
| 570 | - roadName: workOrderForm.roadName, | |
| 569 | + // roadId: workOrderForm.roadId, | |
| 570 | + // roadName: workOrderForm.roadName, | |
| 571 | 571 | |
| 572 | 572 | // roadId: 550, |
| 573 | 573 | // roadName:'东明胡同(三海)', |
| 574 | 574 | |
| 575 | - // roadId: 551, | |
| 576 | - // roadName:'地安门西大街51号', | |
| 575 | + roadId: 551, | |
| 576 | + roadName:'地安门西大街51号', | |
| 577 | 577 | // |
| 578 | 578 | // roadId: 553, |
| 579 | 579 | // roadName:'什刹海前海南沿', |
| ... | ... | @@ -602,7 +602,7 @@ const submitWorkOrder = async () => { |
| 602 | 602 | taskId: renewOrderData.value.taskId, |
| 603 | 603 | operateType: nextStepMap[renewOrderData.value.taskKey]?.operateTypeRenew || '', |
| 604 | 604 | agree: 0, |
| 605 | - reason: '重新提交工单', | |
| 605 | + reason: workOrderForm.problemDesc.trim(), | |
| 606 | 606 | ...commonSubmitData |
| 607 | 607 | } |
| 608 | 608 | ... | ... |
pages-sub/problem/regional-order-manage/add-patrol-order.vue
| ... | ... | @@ -349,7 +349,7 @@ const submitWorkOrder = async () => { |
| 349 | 349 | taskId: renewOrderData.value.taskId, |
| 350 | 350 | operateType: nextStepMap[renewOrderData.value.taskKey]?.operateTypeRenew || '', |
| 351 | 351 | agree: 0, |
| 352 | - reason: '重新提交工单', | |
| 352 | + reason: workOrderForm.problemDesc.trim(), | |
| 353 | 353 | ...commonSubmitData |
| 354 | 354 | } |
| 355 | 355 | if (userStore.userInfo?.roles.includes('patrol_global')) { // 全域巡查员 | ... | ... |
pages-sub/problem/regional-order-manage/distribution-order.vue
| ... | ... | @@ -374,7 +374,7 @@ const echoOrderData = (orderItem) => { |
| 374 | 374 | workOrderForm.problemDesc = orderItem.remark || ''; |
| 375 | 375 | workOrderForm.lat = orderItem.lat || 0; |
| 376 | 376 | workOrderForm.lon = orderItem.lon || 0; |
| 377 | - workOrderForm.expectedFinishDate = orderItem.expectedFinishDate ?timeFormat(orderItem.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss') : ''; | |
| 377 | + workOrderForm.expectedFinishDate = orderItem.expectedFinishDate=='' ? '':timeFormat(orderItem.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss') ; | |
| 378 | 378 | |
| 379 | 379 | // 回显图片【核心：问题照片赋值】 |
| 380 | 380 | if (orderItem.problemsImgs && Array.isArray(orderItem.problemsImgs) && orderItem.problemsImgs.length > 0) { | ... | ... |
pages-sub/problem/regional-order-manage/order-detail.vue
| ... | ... | @@ -52,6 +52,19 @@ |
| 52 | 52 | </template> |
| 53 | 53 | </up-cell> |
| 54 | 54 | |
| 55 | + <!-- 街道名称 --> | |
| 56 | + <up-cell title="街道名称" :value="orderDetail.streetName || '--'" align="middle"></up-cell> | |
| 57 | + | |
| 58 | + <up-cell v-if="orderDetail.roadName"> | |
| 59 | + <template #title> | |
| 60 | + <view style="min-width: 200rpx">道路名称</view> | |
| 61 | + </template> | |
| 62 | + <template #value> | |
| 63 | + <view class="common-text-color up-line-1">{{ orderDetail.roadName || '--' }}</view> | |
| 64 | + </template> | |
| 65 | + </up-cell> | |
| 66 | + | |
| 67 | + | |
| 55 | 68 | <!-- 情况描述 --> |
| 56 | 69 | <up-cell> |
| 57 | 70 | <template #title> |
| ... | ... | @@ -69,6 +82,7 @@ |
| 69 | 82 | align="middle" |
| 70 | 83 | ></up-cell> |
| 71 | 84 | |
| 85 | + | |
| 72 | 86 | <!-- 提交人 --> |
| 73 | 87 | <up-cell title="提交人" :value="orderDetail.userName || '--'" align="middle"></up-cell> |
| 74 | 88 | |
| ... | ... | @@ -89,8 +103,8 @@ |
| 89 | 103 | </template> |
| 90 | 104 | </up-cell> |
| 91 | 105 | |
| 92 | - <!-- 街道名称 --> | |
| 93 | - <up-cell title="街道名称" :value="orderDetail.streetName || '--'" align="middle"></up-cell> | |
| 106 | + | |
| 107 | + | |
| 94 | 108 | |
| 95 | 109 | <!-- 问题照片 --> |
| 96 | 110 | <up-cell title="问题照片"> | ... | ... |
pages-sub/problem/work-order-manage/order-detail.vue
| ... | ... | @@ -51,6 +51,18 @@ |
| 51 | 51 | <view class="common-text-color up-line-1">{{ orderDetail.orderName || '--' }}</view> |
| 52 | 52 | </template> |
| 53 | 53 | </up-cell> |
| 54 | + <!-- 街道名称 --> | |
| 55 | + <up-cell title="街道名称" :value="orderDetail.streetName || '--'" align="middle"></up-cell> | |
| 56 | + | |
| 57 | + <up-cell v-if="orderDetail.roadName"> | |
| 58 | + <template #title> | |
| 59 | + <view style="min-width: 200rpx">道路名称</view> | |
| 60 | + </template> | |
| 61 | + <template #value> | |
| 62 | + <view class="common-text-color up-line-1">{{ orderDetail.roadName || '--' }}</view> | |
| 63 | + </template> | |
| 64 | + </up-cell> | |
| 65 | + | |
| 54 | 66 | |
| 55 | 67 | <!-- 情况描述 --> |
| 56 | 68 | <up-cell> |
| ... | ... | @@ -89,8 +101,9 @@ |
| 89 | 101 | </template> |
| 90 | 102 | </up-cell> |
| 91 | 103 | |
| 92 | - <!-- 街道名称 --> | |
| 93 | - <up-cell title="街道名称" :value="orderDetail.streetName || '--'" align="middle"></up-cell> | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 94 | 107 | |
| 95 | 108 | <!-- 问题照片 --> |
| 96 | 109 | <up-cell title="问题照片"> | ... | ... |