diff --git a/src/views/order/components/orderDia.vue b/src/views/order/components/orderDia.vue
index b75505d..c7eed38 100644
--- a/src/views/order/components/orderDia.vue
+++ b/src/views/order/components/orderDia.vue
@@ -194,7 +194,7 @@
                 <el-col :span="7">
                   <el-form-item label="受理时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择受理时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -220,7 +220,7 @@
                 <el-col :span="7">
                   <el-form-item label="提交时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择提交时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -258,7 +258,7 @@
                 <el-col :span="7">
                   <el-form-item label="分派时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择分派时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -296,7 +296,7 @@
                 <el-col :span="7">
                   <el-form-item label="响应时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择受理时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -313,7 +313,7 @@
                 <el-col :span="7">
                   <el-form-item label="处理时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择处理时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -359,7 +359,7 @@
                 <el-col :span="7">
                   <el-form-item label="核实时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择核实时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -385,7 +385,7 @@
                 <el-col :span="7">
                   <el-form-item label="结单时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择结单时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -498,7 +498,7 @@
     historyData: [],
   },
   confirmForm: {
-    time: proxy.moment().format('YYYY-MM-DD HH:mm:ss'),
+    customFinishTime: proxy.moment().format('YYYY-MM-DD HH:mm:ss'),
     message: '',
     type: '1',
     threeValue: '',

diff --git a/src/views/order/components/orderDia.vue b/src/views/order/components/orderDia.vue
index b75505d..c7eed38 100644
--- a/src/views/order/components/orderDia.vue
+++ b/src/views/order/components/orderDia.vue
@@ -194,7 +194,7 @@
                 <el-col :span="7">
                   <el-form-item label="受理时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择受理时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -220,7 +220,7 @@
                 <el-col :span="7">
                   <el-form-item label="提交时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择提交时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -258,7 +258,7 @@
                 <el-col :span="7">
                   <el-form-item label="分派时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择分派时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -296,7 +296,7 @@
                 <el-col :span="7">
                   <el-form-item label="响应时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择受理时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -313,7 +313,7 @@
                 <el-col :span="7">
                   <el-form-item label="处理时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择处理时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -359,7 +359,7 @@
                 <el-col :span="7">
                   <el-form-item label="核实时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择核实时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -385,7 +385,7 @@
                 <el-col :span="7">
                   <el-form-item label="结单时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择结单时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -498,7 +498,7 @@
     historyData: [],
   },
   confirmForm: {
-    time: proxy.moment().format('YYYY-MM-DD HH:mm:ss'),
+    customFinishTime: proxy.moment().format('YYYY-MM-DD HH:mm:ss'),
     message: '',
     type: '1',
     threeValue: '',
diff --git a/src/views/order/workOrderProcessing/components/checkOrder.vue b/src/views/order/workOrderProcessing/components/checkOrder.vue
index c5b1e6b..57129ab 100644
--- a/src/views/order/workOrderProcessing/components/checkOrder.vue
+++ b/src/views/order/workOrderProcessing/components/checkOrder.vue
@@ -40,7 +40,7 @@
           <div>{{ work_order_source.find(item => item.value == row.orderSource)?.label || row.orderSource }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="info" label="信息" />
+      <el-table-column prop="message" label="信息" />
       <el-table-column prop="status" label="工单状态">
         <template #default="{ row }">
           <div>{{ work_order_status.find(item => item.value == row.status)?.label || row.status }}</div>
@@ -75,7 +75,7 @@
       :append-to-body="true"
       :destroy-on-close="true"
     >
-      <orderDia :status="queryParams.status" @closeDialog="closeDialog"></orderDia>
+      <orderDia :status="queryParams.status" :orderId="orderId" @closeDialog="closeDialog"></orderDia>
     </el-dialog>
   </div>
 </template>
@@ -106,7 +106,7 @@
   // visible: true,
   title: '工单详情',
 });
-
+const orderId = ref('');
 const total = ref(0);
 const loading = ref(false);
 const queryParams = ref({
@@ -164,7 +164,8 @@
   },
 ]);
 
-const handleDetail = () => {
+const handleDetail = row => {
+  orderId.value = row.id;
   dialogConfig.value.visible = true;
 };
 

diff --git a/src/views/order/components/orderDia.vue b/src/views/order/components/orderDia.vue
index b75505d..c7eed38 100644
--- a/src/views/order/components/orderDia.vue
+++ b/src/views/order/components/orderDia.vue
@@ -194,7 +194,7 @@
                 <el-col :span="7">
                   <el-form-item label="受理时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择受理时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -220,7 +220,7 @@
                 <el-col :span="7">
                   <el-form-item label="提交时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择提交时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -258,7 +258,7 @@
                 <el-col :span="7">
                   <el-form-item label="分派时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择分派时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -296,7 +296,7 @@
                 <el-col :span="7">
                   <el-form-item label="响应时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择受理时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -313,7 +313,7 @@
                 <el-col :span="7">
                   <el-form-item label="处理时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择处理时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -359,7 +359,7 @@
                 <el-col :span="7">
                   <el-form-item label="核实时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择核实时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -385,7 +385,7 @@
                 <el-col :span="7">
                   <el-form-item label="结单时间" prop="">
                     <el-date-picker
-                      v-model="confirmForm.time"
+                      v-model="confirmForm.customFinishTime"
                       type="datetime"
                       placeholder="请选择结单时间"
                       format="YYYY-MM-DD HH:mm:ss"
@@ -498,7 +498,7 @@
     historyData: [],
   },
   confirmForm: {
-    time: proxy.moment().format('YYYY-MM-DD HH:mm:ss'),
+    customFinishTime: proxy.moment().format('YYYY-MM-DD HH:mm:ss'),
     message: '',
     type: '1',
     threeValue: '',
diff --git a/src/views/order/workOrderProcessing/components/checkOrder.vue b/src/views/order/workOrderProcessing/components/checkOrder.vue
index c5b1e6b..57129ab 100644
--- a/src/views/order/workOrderProcessing/components/checkOrder.vue
+++ b/src/views/order/workOrderProcessing/components/checkOrder.vue
@@ -40,7 +40,7 @@
           <div>{{ work_order_source.find(item => item.value == row.orderSource)?.label || row.orderSource }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="info" label="信息" />
+      <el-table-column prop="message" label="信息" />
       <el-table-column prop="status" label="工单状态">
         <template #default="{ row }">
           <div>{{ work_order_status.find(item => item.value == row.status)?.label || row.status }}</div>
@@ -75,7 +75,7 @@
       :append-to-body="true"
       :destroy-on-close="true"
     >
-      <orderDia :status="queryParams.status" @closeDialog="closeDialog"></orderDia>
+      <orderDia :status="queryParams.status" :orderId="orderId" @closeDialog="closeDialog"></orderDia>
     </el-dialog>
   </div>
 </template>
@@ -106,7 +106,7 @@
   // visible: true,
   title: '工单详情',
 });
-
+const orderId = ref('');
 const total = ref(0);
 const loading = ref(false);
 const queryParams = ref({
@@ -164,7 +164,8 @@
   },
 ]);
 
-const handleDetail = () => {
+const handleDetail = row => {
+  orderId.value = row.id;
   dialogConfig.value.visible = true;
 };
 
diff --git a/src/views/order/workOrderProcessing/components/registerOrder.vue b/src/views/order/workOrderProcessing/components/registerOrder.vue
index d005f3a..2bb4f7a 100644
--- a/src/views/order/workOrderProcessing/components/registerOrder.vue
+++ b/src/views/order/workOrderProcessing/components/registerOrder.vue
@@ -4,7 +4,7 @@
     <el-divider />
     <div class="orderBox">
       <div class="boxTitle">基本情况</div>
-      <div class="boxContent">
+      <div class="boxContent" v-loading="uploading">
         <el-form ref="orderFormRef" :rules="rules" label-width="auto" :model="orderForm" class="formBox">
           <el-row justify="space-between">
             <el-col :span="7">
@@ -128,7 +128,7 @@
 
 const orderFormRef = ref();
 const value = ref('');
-
+const uploading = ref(false);
 const orderData = reactive({
   rules: {
     name: [
@@ -157,7 +157,8 @@
     reportPerson: '',
     reportPersonPhone: '',
     alarmTime: '',
-    registerTime: '',
+    registerTime: proxy.moment().format('YYYY-MM-DD HH:mm:ss'),
+    customFinishTime: '',
     reportLocation: '',
     requireFinishTime: '',
     message: '',
@@ -172,24 +173,33 @@
   if (!formEl) return;
   formEl.validate(valid => {
     if (valid) {
-      addWorkOrder(orderForm.value).then(response => {
-        proxy.$modal.msgSuccess('提交成功');
+      uploading.value = true;
+      orderForm.value.customFinishTime = orderForm.value.registerTime;
+      addWorkOrder(orderForm.value)
+        .then(response => {
+          proxy.$modal.msgSuccess('提交成功');
 
-        // open.value = false;
-        // queryParams.value.areaId = '';
-        // getList();
-        orderForm.value = {
-          ...orderForm.value,
-          orderNumber: '',
-          reportPerson: '',
-          reportPersonPhone: '',
-          alarmTime: '',
-          registerTime: '',
-          reportLocation: '',
-          requireFinishTime: '',
-          message: '',
-        };
-      });
+          // open.value = false;
+          // queryParams.value.areaId = '';
+          // getList();
+          orderForm.value = {
+            ...orderForm.value,
+            orderNumber: '',
+            reportPerson: '',
+            reportPersonPhone: '',
+            alarmTime: '',
+            registerTime: '',
+            customFinishTime: '',
+            reportLocation: '',
+            requireFinishTime: '',
+            message: '',
+          };
+          uploading.value = false;
+        })
+        .catch(() => {
+          uploading.value = false;
+          // proxy.$modal.msgError('提交失败');
+        });
       // if (addForm.value.id != undefined) {
       //   editPatrolPoint(addForm.value).then(response => {
       //     proxy.$modal.msgSuccess('修改成功');