diff --git a/pages-sub/problem/regional-order-manage/add-order.vue b/pages-sub/problem/regional-order-manage/add-order.vue
index 9bc22a2..494d88d 100644
--- a/pages-sub/problem/regional-order-manage/add-order.vue
+++ b/pages-sub/problem/regional-order-manage/add-order.vue
@@ -383,7 +383,7 @@ const echoOrderData = (orderItem) => {
workOrderForm.problemDesc = orderItem.remark || '';
workOrderForm.lat = orderItem.lat || 0;
workOrderForm.lon = orderItem.lon || 0;
- workOrderForm.expectedFinishDate = timeFormat(orderItem.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss') || timeFormat(new Date(), 'yyyy-mm-dd hh:MM:ss');
+ workOrderForm.expectedFinishDate = timeFormat(orderItem.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss') || '';
// 回显图片
if (orderItem.problemsImgs && Array.isArray(orderItem.problemsImgs) && orderItem.problemsImgs.length > 0) {
@@ -566,14 +566,14 @@ const submitWorkOrder = async () => {
}
const commonSubmitData = {
- roadId: workOrderForm.roadId,
- roadName: workOrderForm.roadName,
+ // roadId: workOrderForm.roadId,
+ // roadName: workOrderForm.roadName,
// roadId: 550,
// roadName:'东明胡同(三海)',
- // roadId: 551,
- // roadName:'地安门西大街51号',
+ roadId: 551,
+ roadName:'地安门西大街51号',
//
// roadId: 553,
// roadName:'什刹海前海南沿',
@@ -602,7 +602,7 @@ const submitWorkOrder = async () => {
taskId: renewOrderData.value.taskId,
operateType: nextStepMap[renewOrderData.value.taskKey]?.operateTypeRenew || '',
agree: 0,
- reason: '重新提交工单',
+ reason: workOrderForm.problemDesc.trim(),
...commonSubmitData
}
diff --git a/pages-sub/problem/regional-order-manage/add-patrol-order.vue b/pages-sub/problem/regional-order-manage/add-patrol-order.vue
index 599654c..f64763b 100644
--- a/pages-sub/problem/regional-order-manage/add-patrol-order.vue
+++ b/pages-sub/problem/regional-order-manage/add-patrol-order.vue
@@ -349,7 +349,7 @@ const submitWorkOrder = async () => {
taskId: renewOrderData.value.taskId,
operateType: nextStepMap[renewOrderData.value.taskKey]?.operateTypeRenew || '',
agree: 0,
- reason: '重新提交工单',
+ reason: workOrderForm.problemDesc.trim(),
...commonSubmitData
}
if (userStore.userInfo?.roles.includes('patrol_global')) { // 全域巡查员
diff --git a/pages-sub/problem/regional-order-manage/distribution-order.vue b/pages-sub/problem/regional-order-manage/distribution-order.vue
index 355d039..e83e011 100644
--- a/pages-sub/problem/regional-order-manage/distribution-order.vue
+++ b/pages-sub/problem/regional-order-manage/distribution-order.vue
@@ -374,7 +374,7 @@ const echoOrderData = (orderItem) => {
workOrderForm.problemDesc = orderItem.remark || '';
workOrderForm.lat = orderItem.lat || 0;
workOrderForm.lon = orderItem.lon || 0;
- workOrderForm.expectedFinishDate = orderItem.expectedFinishDate ?timeFormat(orderItem.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss') : '';
+ workOrderForm.expectedFinishDate = orderItem.expectedFinishDate=='' ? '':timeFormat(orderItem.expectedFinishDate, 'yyyy-mm-dd hh:MM:ss') ;
// 回显图片【核心:问题照片赋值】
if (orderItem.problemsImgs && Array.isArray(orderItem.problemsImgs) && orderItem.problemsImgs.length > 0) {
diff --git a/pages-sub/problem/regional-order-manage/order-detail.vue b/pages-sub/problem/regional-order-manage/order-detail.vue
index 2c8912a..2dfd502 100644
--- a/pages-sub/problem/regional-order-manage/order-detail.vue
+++ b/pages-sub/problem/regional-order-manage/order-detail.vue
@@ -52,6 +52,19 @@
+
+
+
+
+
+ 道路名称
+
+
+ {{ orderDetail.roadName || '--' }}
+
+
+
+
@@ -69,6 +82,7 @@
align="middle"
>
+
@@ -89,8 +103,8 @@
-
-
+
+
diff --git a/pages-sub/problem/work-order-manage/order-detail.vue b/pages-sub/problem/work-order-manage/order-detail.vue
index 6554027..0efeea8 100644
--- a/pages-sub/problem/work-order-manage/order-detail.vue
+++ b/pages-sub/problem/work-order-manage/order-detail.vue
@@ -51,6 +51,18 @@
{{ orderDetail.orderName || '--' }}
+
+
+
+
+
+ 道路名称
+
+
+ {{ orderDetail.roadName || '--' }}
+
+
+
@@ -89,8 +101,9 @@
-
-
+
+
+