From 307225c0944f97225ce839880da829924719bbbd Mon Sep 17 00:00:00 2001
From: wbc <942429426@qq.com>
Date: Wed, 7 May 2025 15:56:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E9=81=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IO/delayPatrol/waitAudit/faultModal.vue   |  1 -
 .../IO/delayPatrol/waitPatrol/faultModal.vue  |  1 -
 src/views/IO/patrolReport/reportModal.vue     |  2 -
 .../IO/workOrder/delayAudit/detailDrawer.vue  |  4 +
 src/views/IO/workOrder/orderAudit/api.ts      |  4 +
 src/views/IO/workOrder/orderAudit/data.ts     |  4 +
 .../IO/workOrder/orderAudit/detailDrawer.vue  | 36 +++++----
 .../IO/workOrder/orderHandle/backModal.vue    |  2 +-
 src/views/IO/workOrder/orderHandle/data.ts    |  4 +
 .../IO/workOrder/orderHandle/delayModal.vue   |  3 +-
 .../IO/workOrder/orderHandle/detailDrawer.vue | 36 +++++----
 .../orderHandle/{api.ts => handleApi.ts}      |  5 ++
 .../IO/workOrder/orderHandle/handleModal.vue  |  3 +-
 src/views/IO/workOrder/orderHandle/index.vue  |  2 +-
 src/views/IO/workOrder/orderSearch/api.ts     |  4 +
 src/views/IO/workOrder/orderSearch/data.ts    |  4 +
 .../IO/workOrder/orderSearch/detailDrawer.vue | 78 +++++++++++--------
 src/views/IO/workOrder/orderSend/api.ts       | 15 +++-
 src/views/IO/workOrder/orderSend/data.ts      |  4 +
 .../IO/workOrder/orderSend/detailDrawer.vue   | 36 +++++----
 src/views/IO/workOrder/orderSend/index.vue    |  2 +-
 .../IO/workOrder/orderSend/sendModal.vue      | 39 +++++++---
 src/views/document/addModal.vue               |  1 -
 23 files changed, 196 insertions(+), 94 deletions(-)
 rename src/views/IO/workOrder/orderHandle/{api.ts => handleApi.ts} (91%)

diff --git a/src/views/IO/delayPatrol/waitAudit/faultModal.vue b/src/views/IO/delayPatrol/waitAudit/faultModal.vue
index 7a2fda4..cde1818 100644
--- a/src/views/IO/delayPatrol/waitAudit/faultModal.vue
+++ b/src/views/IO/delayPatrol/waitAudit/faultModal.vue
@@ -351,7 +351,6 @@
         } else {
           form.attachments = null;
         }
-        console.log(fileLists);
       };
       return {
         visible,
diff --git a/src/views/IO/delayPatrol/waitPatrol/faultModal.vue b/src/views/IO/delayPatrol/waitPatrol/faultModal.vue
index 6cef4a8..aab6b05 100644
--- a/src/views/IO/delayPatrol/waitPatrol/faultModal.vue
+++ b/src/views/IO/delayPatrol/waitPatrol/faultModal.vue
@@ -351,7 +351,6 @@
         } else {
           form.attachments = null;
         }
-        console.log(fileLists);
       };
       return {
         visible,
diff --git a/src/views/IO/patrolReport/reportModal.vue b/src/views/IO/patrolReport/reportModal.vue
index e8737c9..ca359ff 100644
--- a/src/views/IO/patrolReport/reportModal.vue
+++ b/src/views/IO/patrolReport/reportModal.vue
@@ -260,7 +260,6 @@
         }else{
           form.attachments = null;
         }
-        console.log(fileLists)
       };
       const handlePhotoChange = (info) => {
         if (info.fileList.length > 0) {
@@ -276,7 +275,6 @@
         }else{
           form.inspectionPhotos = null;
         }
-        console.log(fileLists)
       };
       return {
         visible,
diff --git a/src/views/IO/workOrder/delayAudit/detailDrawer.vue b/src/views/IO/workOrder/delayAudit/detailDrawer.vue
index 45ed44e..41ddd87 100644
--- a/src/views/IO/workOrder/delayAudit/detailDrawer.vue
+++ b/src/views/IO/workOrder/delayAudit/detailDrawer.vue
@@ -168,6 +168,10 @@
           label: '处理中(已延期)',
           value: 7,
         },
+        {
+          label: '作废',
+          value: 8,
+        },
         {
           label: '运维单位处理时回退至派遣',
           value: 3,
diff --git a/src/views/IO/workOrder/orderAudit/api.ts b/src/views/IO/workOrder/orderAudit/api.ts
index 5a0a1c5..d3c5dc1 100644
--- a/src/views/IO/workOrder/orderAudit/api.ts
+++ b/src/views/IO/workOrder/orderAudit/api.ts
@@ -14,6 +14,7 @@ enum Api {
   dealInfo = '/platform/dealInfo/getInfoByOrderId',
   initReviewOrder = '/platform/workOrder/initReviewOrder',
   lastReviewOrder = '/platform/workOrder/lastReviewOrder',
+  getOrderDelayHistory = '/platform/orderDelayHistory/queryByWorkOrderId',
   
 }
 
@@ -71,3 +72,6 @@ export function initReviewOrder(data:any) {
 export function lastReviewOrder(data:any) {
   return defHttp.post({ url: Api.lastReviewOrder,data });
 }
+export function getOrderDelayHistory(id: any) {
+  return defHttp.get({ url: `${Api.getOrderDelayHistory}?workOrderId=${id}` });
+}
\ No newline at end of file
diff --git a/src/views/IO/workOrder/orderAudit/data.ts b/src/views/IO/workOrder/orderAudit/data.ts
index 8751570..1b9d7e7 100644
--- a/src/views/IO/workOrder/orderAudit/data.ts
+++ b/src/views/IO/workOrder/orderAudit/data.ts
@@ -17,6 +17,10 @@ const statusOptions = [
     label: '处理中(已延期)',
     value: 7,
   },
+  {
+    label: '作废',
+    value: 8,
+  },
   {
     label:'运维单位处理时回退至派遣',
     value:3,
diff --git a/src/views/IO/workOrder/orderAudit/detailDrawer.vue b/src/views/IO/workOrder/orderAudit/detailDrawer.vue
index 4ed56c7..2fe74a8 100644
--- a/src/views/IO/workOrder/orderAudit/detailDrawer.vue
+++ b/src/views/IO/workOrder/orderAudit/detailDrawer.vue
@@ -151,11 +151,11 @@
         </a-tab-pane>
         <a-tab-pane key="5" tab="延期信息">
           <a-table :dataSource="delayInfo" :columns="delayColumns" bordered>
-            <template #bodyCell="{ column }">
+            <!-- <template #bodyCell="{ column }">
               <template v-if="column.key === 'action'">
                 <a-button type="link">查看</a-button>
               </template>
-            </template>
+            </template> -->
           </a-table>
         </a-tab-pane>
       </a-tabs>
@@ -165,7 +165,7 @@
 
 <script>
   import { reactive, ref,defineComponent } from 'vue';
-  import { getInfo,dealInfo, queryProcess } from './api';
+  import { getInfo,dealInfo, queryProcess,getOrderDelayHistory } from './api';
   import AMapLoader from '@amap/amap-jsapi-loader';
   import Icon from '@/components/Icon/Icon.vue';
   export default defineComponent({
@@ -217,6 +217,10 @@
           label: '处理中(已延期)',
           value: 7,
         },
+        {
+          label: '作废',
+          value: 8,
+        },
         {
           label: '运维单位处理时回退至派遣',
           value: 3,
@@ -263,25 +267,25 @@
       ];
       const delayInfo = ref([]);
       const delayColumns = [
-        {
+      {
           title: '申请时间',
-          dataIndex: 'applyTime',
-          key: 'applyTime',
+          dataIndex: 'createTime',
+          key: 'createTime',
         },
         {
           title: '申请原因',
-          dataIndex: 'applyReason',
-          key: 'applyReason',
+          dataIndex: 'delayReason',
+          key: 'delayReason',
         },
         {
           title: '延期时间',
-          dataIndex: 'delayTime',
-          key: 'delayTime',
+          dataIndex: 'afterDelayTime',
+          key: 'afterDelayTime',
         },
         {
           title: '详细信息',
-          dataIndex: 'action',
-          key: 'action  ',
+          dataIndex: 'handleResult',
+          key: 'handleResult  ',
         },
       ];
 
@@ -297,9 +301,15 @@
         progress.value = progressLine;
         console.log(progress.value);
         const data1 = await dealInfo(id);
-        for (let i in dealDetail) {
+        if(data1){
+          for (let i in dealDetail) {
           dealDetail[i] = data1[i];
         }
+        }
+        const data2 = await getOrderDelayHistory(id);
+        if (data2) {
+          delayInfo.value = data2;
+        }
         initMap(detail.longitude, detail.latitude, detail.faultLocation);
       };
 
diff --git a/src/views/IO/workOrder/orderHandle/backModal.vue b/src/views/IO/workOrder/orderHandle/backModal.vue
index 835f8d4..c4947e8 100644
--- a/src/views/IO/workOrder/orderHandle/backModal.vue
+++ b/src/views/IO/workOrder/orderHandle/backModal.vue
@@ -43,7 +43,7 @@
 <script>
   import { reactive, ref } from 'vue';
   import { message } from 'ant-design-vue';
-  import { getInfo,rollBackOrder } from './api';
+  import { getInfo,rollBackOrder } from './handleApi';
   import { getToken } from '@/utils/auth';
   import { useGlobSetting } from '@/hooks/setting';
   export default {
diff --git a/src/views/IO/workOrder/orderHandle/data.ts b/src/views/IO/workOrder/orderHandle/data.ts
index 4b3ad88..4ce9139 100644
--- a/src/views/IO/workOrder/orderHandle/data.ts
+++ b/src/views/IO/workOrder/orderHandle/data.ts
@@ -18,6 +18,10 @@ const statusOptions = [
     label: '处理中(已延期)',
     value: 7,
   },
+  {
+    label: '作废',
+    value: 8,
+  },
   {
     label: '运维单位处理时回退至派遣',
     value: 3,
diff --git a/src/views/IO/workOrder/orderHandle/delayModal.vue b/src/views/IO/workOrder/orderHandle/delayModal.vue
index 3669a0c..5f72b1a 100644
--- a/src/views/IO/workOrder/orderHandle/delayModal.vue
+++ b/src/views/IO/workOrder/orderHandle/delayModal.vue
@@ -89,7 +89,7 @@
 <script>
   import { reactive, ref } from 'vue';
   import { message } from 'ant-design-vue';
-  import { getInfo,getSubcategoryType,delayOrder} from './api';
+  import { getInfo,getSubcategoryType,delayOrder} from './handleApi';
   import { getToken } from '@/utils/auth';
   import { useGlobSetting } from '@/hooks/setting';
   export default {
@@ -173,7 +173,6 @@
         } else {
           form.attachments = null;
         }
-        console.log(fileLists);
       };
       return {
         visible,
diff --git a/src/views/IO/workOrder/orderHandle/detailDrawer.vue b/src/views/IO/workOrder/orderHandle/detailDrawer.vue
index 386d739..f2c4767 100644
--- a/src/views/IO/workOrder/orderHandle/detailDrawer.vue
+++ b/src/views/IO/workOrder/orderHandle/detailDrawer.vue
@@ -153,11 +153,11 @@
         </a-tab-pane>
         <a-tab-pane key="5" tab="延期信息">
           <a-table :dataSource="delayInfo" :columns="delayColumns" bordered>
-            <template #bodyCell="{ column }">
+            <!-- <template #bodyCell="{ column }">
               <template v-if="column.key === 'action'">
                 <a-button type="link">查看</a-button>
               </template>
-            </template>
+            </template> -->
           </a-table>
         </a-tab-pane>
       </a-tabs>
@@ -167,7 +167,7 @@
 
 <script>
   import { reactive, ref, defineComponent } from 'vue';
-  import { getInfo, getDealInfo, queryProcess } from './api';
+  import { getInfo, getDealInfo, queryProcess,getOrderDelayHistory } from './handleApi';
   import AMapLoader from '@amap/amap-jsapi-loader';
   import Icon from '@/components/Icon/Icon.vue';
   export default defineComponent({
@@ -219,6 +219,10 @@
           label: '处理中(已延期)',
           value: 7,
         },
+        {
+          label: '作废',
+          value: 8,
+        },
         {
           label: '运维单位处理时回退至派遣',
           value: 3,
@@ -265,25 +269,25 @@
       ];
       const delayInfo = ref([]);
       const delayColumns = [
-        {
+      {
           title: '申请时间',
-          dataIndex: 'applyTime',
-          key: 'applyTime',
+          dataIndex: 'createTime',
+          key: 'createTime',
         },
         {
           title: '申请原因',
-          dataIndex: 'applyReason',
-          key: 'applyReason',
+          dataIndex: 'delayReason',
+          key: 'delayReason',
         },
         {
           title: '延期时间',
-          dataIndex: 'delayTime',
-          key: 'delayTime',
+          dataIndex: 'afterDelayTime',
+          key: 'afterDelayTime',
         },
         {
           title: '详细信息',
-          dataIndex: 'action',
-          key: 'action  ',
+          dataIndex: 'handleResult',
+          key: 'handleResult  ',
         },
       ];
 
@@ -299,9 +303,15 @@
         progress.value = progressLine;
         console.log(progress.value);
         const data1 = await getDealInfo(id);
-        for (let i in dealDetail) {
+        if(data1){
+          for (let i in dealDetail) {
           dealDetail[i] = data1[i];
         }
+        }
+        const data2 = await getOrderDelayHistory(id);
+        if (data2) {
+          delayInfo.value = data2;
+        }
         initMap(detail.longitude, detail.latitude, detail.faultLocation);
       };
 
diff --git a/src/views/IO/workOrder/orderHandle/api.ts b/src/views/IO/workOrder/orderHandle/handleApi.ts
similarity index 91%
rename from src/views/IO/workOrder/orderHandle/api.ts
rename to src/views/IO/workOrder/orderHandle/handleApi.ts
index 1b1d588..048b4b4 100644
--- a/src/views/IO/workOrder/orderHandle/api.ts
+++ b/src/views/IO/workOrder/orderHandle/handleApi.ts
@@ -14,6 +14,7 @@ enum Api {
   takeOrder = '/platform/workOrder/takeOrder',
   rollBackOrder = '/platform/workOrder/rollBackOrder',
   delayOrder = '/platform/workOrder/delayOrder',
+  getOrderDelayHistory = '/platform/orderDelayHistory/queryByWorkOrderId',
 }
 
 export function list(params?: any) {
@@ -57,6 +58,7 @@ export function queryProcess(id: any) {
 export function dealOrder(data:any) {
   return defHttp.post({ url: Api.dealOrder,data });
 }
+
 export function getDealInfo(id: any) {
   return defHttp.get({ url: `${Api.dealInfo}?workOrderId=${id}` });
 }
@@ -68,4 +70,7 @@ export function rollBackOrder(data:any) {
 }
 export function delayOrder(data:any) {
   return defHttp.post({ url: Api.delayOrder,data });
+}
+export function getOrderDelayHistory(id: any) {
+  return defHttp.get({ url: `${Api.getOrderDelayHistory}?workOrderId=${id}` });
 }
\ No newline at end of file
diff --git a/src/views/IO/workOrder/orderHandle/handleModal.vue b/src/views/IO/workOrder/orderHandle/handleModal.vue
index 1cd7f95..b24e737 100644
--- a/src/views/IO/workOrder/orderHandle/handleModal.vue
+++ b/src/views/IO/workOrder/orderHandle/handleModal.vue
@@ -77,7 +77,7 @@
 <script>
   import { reactive, ref } from 'vue';
   import { message } from 'ant-design-vue';
-  import { getInfo,getSubcategoryType,dealOrder } from './api';
+  import { getInfo,getSubcategoryType,dealOrder } from './handleApi';
   import { getToken } from '@/utils/auth';
   import { useGlobSetting } from '@/hooks/setting';
   export default {
@@ -156,7 +156,6 @@
         } else {
           form.attachments = null;
         }
-        console.log(fileLists);
       };
       return {
         visible,
diff --git a/src/views/IO/workOrder/orderHandle/index.vue b/src/views/IO/workOrder/orderHandle/index.vue
index ecb3a06..a3839c9 100644
--- a/src/views/IO/workOrder/orderHandle/index.vue
+++ b/src/views/IO/workOrder/orderHandle/index.vue
@@ -28,7 +28,7 @@
 <script setup lang="ts">
   import { PageWrapper } from '@/components/Page';
   import { BasicTable, useTable } from '@/components/Table';
-  import { list, getProjectInfo,takeOrder } from './api';
+  import { list, getProjectInfo,takeOrder } from './handleApi';
   import { formSchemas, columns } from './data';
   import detailDrawer from './detailDrawer.vue';
   import backModal from './backModal.vue';
diff --git a/src/views/IO/workOrder/orderSearch/api.ts b/src/views/IO/workOrder/orderSearch/api.ts
index 0959216..c20f3ae 100644
--- a/src/views/IO/workOrder/orderSearch/api.ts
+++ b/src/views/IO/workOrder/orderSearch/api.ts
@@ -12,6 +12,7 @@ enum Api {
   getContractNamesByProjectName = '/platform/contractInfo/getContractNamesByProjectName',
   queryProcess = '/platform/orderProcess/queryProcess',
   dealInfo = '/platform/dealInfo/getInfoByOrderId',
+  getOrderDelayHistory = '/platform/orderDelayHistory/queryByWorkOrderId',
 }
 
 export function list(params?: PageQuery) {
@@ -58,4 +59,7 @@ export function queryProcess(id: any) {
 }
 export function dealInfo(id: any) {
   return defHttp.get({ url: `${Api.dealInfo}?workOrderId=${id}` });
+}
+export function getOrderDelayHistory(id: any) {
+  return defHttp.get({ url: `${Api.getOrderDelayHistory}?workOrderId=${id}` });
 }
\ No newline at end of file
diff --git a/src/views/IO/workOrder/orderSearch/data.ts b/src/views/IO/workOrder/orderSearch/data.ts
index 2065578..0d6fda9 100644
--- a/src/views/IO/workOrder/orderSearch/data.ts
+++ b/src/views/IO/workOrder/orderSearch/data.ts
@@ -29,6 +29,10 @@ const statusOptions = [
     label: '处理中(已延期)',
     value: 7,
   },
+  {
+    label: '作废',
+    value: 8,
+  },
   {
     label: '运维单位处理时回退至派遣',
     value: 3,
diff --git a/src/views/IO/workOrder/orderSearch/detailDrawer.vue b/src/views/IO/workOrder/orderSearch/detailDrawer.vue
index 9303174..db39540 100644
--- a/src/views/IO/workOrder/orderSearch/detailDrawer.vue
+++ b/src/views/IO/workOrder/orderSearch/detailDrawer.vue
@@ -130,32 +130,34 @@
         <a-tab-pane key="3" tab="流程信息">
           <div style="margin-left: 20px">
             <a-timeline>
-              <a-timeline-item v-for="(item, index) in progress" :key="index" >
-                <template #dot><span class="stage">{{ item.stage }}</span></template>
+              <a-timeline-item v-for="(item, index) in progress" :key="index">
+                <template #dot
+                  ><span class="stage">{{ item.stage }}</span></template
+                >
                 <div class="timeText"
                   ><span class="person">{{ item.operator }}</span
-                  >{{item.description}}</div
+                  >{{ item.description }}</div
                 >
                 <div class="timeText">{{ item.feedback }}</div>
                 <div class="operationTime">{{ item.operationTime }}</div>
-                <div class="duration" v-if="item.duration"> <Icon icon="ant-design:dashboard-outlined" />用时{{item.duration}}</div>
+                <div class="duration" v-if="item.duration">
+                  <Icon icon="ant-design:dashboard-outlined" />用时{{ item.duration }}</div
+                >
                 <a-divider></a-divider>
               </a-timeline-item>
-                    
             </a-timeline>
           </div>
         </a-tab-pane>
         <a-tab-pane key="4" tab="历史信息">
-          <a-table :dataSource="progress" :columns="historyColumns" bordered>
-          </a-table>
+          <a-table :dataSource="progress" :columns="historyColumns" bordered> </a-table>
         </a-tab-pane>
         <a-tab-pane key="5" tab="延期信息">
           <a-table :dataSource="delayInfo" :columns="delayColumns" bordered>
-            <template #bodyCell="{ column }">
+            <!-- <template #bodyCell="{ column }">
               <template v-if="column.key === 'action'">
                 <a-button type="link">查看</a-button>
               </template>
-            </template>
+            </template> -->
           </a-table>
         </a-tab-pane>
       </a-tabs>
@@ -164,12 +166,12 @@
 </template>
 
 <script>
-  import { reactive, ref,defineComponent } from 'vue';
-  import { getInfo,dealInfo, queryProcess } from './api';
+  import { reactive, ref, defineComponent } from 'vue';
+  import { getInfo, dealInfo, queryProcess, getOrderDelayHistory } from './api';
   import AMapLoader from '@amap/amap-jsapi-loader';
   import Icon from '@/components/Icon/Icon.vue';
   export default defineComponent({
-    components:{Icon},
+    components: { Icon },
     setup(props, { emit }) {
       //抽屉详情
       let detail = reactive({
@@ -217,6 +219,10 @@
           label: '处理中(已延期)',
           value: 7,
         },
+        {
+          label: '作废',
+          value: 8,
+        },
         {
           label: '运维单位处理时回退至派遣',
           value: 3,
@@ -240,7 +246,7 @@
         })?.label;
       };
       const historyColumns = [
-      {
+        {
           title: '环节',
           dataIndex: 'stage',
           key: 'stage',
@@ -263,25 +269,25 @@
       ];
       const delayInfo = ref([]);
       const delayColumns = [
-      {
-          title: '环节',
-          dataIndex: 'stage',
-          key: 'stage',
+        {
+          title: '申请时间',
+          dataIndex: 'createTime',
+          key: 'createTime',
         },
         {
-          title: '操作',
-          dataIndex: 'operationName',
-          key: 'operationName',
+          title: '申请原因',
+          dataIndex: 'delayReason',
+          key: 'delayReason',
         },
         {
-          title: '操作人',
-          dataIndex: 'operator',
-          key: 'operator',
+          title: '延期时间',
+          dataIndex: 'afterDelayTime',
+          key: 'afterDelayTime',
         },
         {
-          title: '操作时间',
-          dataIndex: 'operationTime',
-          key: 'operationTime  ',
+          title: '详细信息',
+          dataIndex: 'handleResult',
+          key: 'handleResult  ',
         },
       ];
 
@@ -297,8 +303,14 @@
         progress.value = progressLine;
         console.log(progress.value);
         const data1 = await dealInfo(id);
-        for (let i in dealDetail) {
-          dealDetail[i] = data1[i];
+        if (data1) {
+          for (let i in dealDetail) {
+            dealDetail[i] = data1[i];
+          }
+        }
+        const data2 = await getOrderDelayHistory(id);
+        if (data2) {
+          delayInfo.value = data2;
         }
         initMap(detail.longitude, detail.latitude, detail.faultLocation);
       };
@@ -306,8 +318,8 @@
       // 关闭抽屉的方法
       const onClose = () => {
         visible.value = false;
-        for(let i in dealDetail){
-          dealDetail[i] = ''
+        for (let i in dealDetail) {
+          dealDetail[i] = '';
         }
         map.value?.destroy();
       };
@@ -370,7 +382,7 @@
   div {
     margin-bottom: 1%;
   }
-  .stage{
+  .stage {
     font-weight: 600;
   }
   .timeText {
@@ -383,13 +395,13 @@
   .operationTime {
     color: gray;
     font-weight: 550;
-    margin-left:80%
+    margin-left: 80%;
   }
   .duration {
     color: #00bbff;
     position: absolute;
     font-weight: 550;
-    margin-left:80%;
+    margin-left: 80%;
     top: 0.1%;
   }
   .titleLabel {
diff --git a/src/views/IO/workOrder/orderSend/api.ts b/src/views/IO/workOrder/orderSend/api.ts
index 0959216..af8f52a 100644
--- a/src/views/IO/workOrder/orderSend/api.ts
+++ b/src/views/IO/workOrder/orderSend/api.ts
@@ -3,7 +3,7 @@ import { defHttp } from '@/utils/http/axios';
 
 enum Api {
   root = '/platform/workOrder',
-  list = '/platform/workOrder/list',
+  list = '/platform/workOrder/dispatchList',
   export = '/workflow/leave/export',
   getSubcategoryType = '/platform/subcategoryType/list',
   workOrderAdd = '/platform/workOrder/add',
@@ -12,6 +12,9 @@ enum Api {
   getContractNamesByProjectName = '/platform/contractInfo/getContractNamesByProjectName',
   queryProcess = '/platform/orderProcess/queryProcess',
   dealInfo = '/platform/dealInfo/getInfoByOrderId',
+  getOrderDelayHistory = '/platform/orderDelayHistory/queryByWorkOrderId',
+  dispatchOrder = '/platform/workOrder/dispatchOrder',
+  getIoCompanyNames = '/platform/inspectPlanInfo/getIoCompanyNames',
 }
 
 export function list(params?: PageQuery) {
@@ -58,4 +61,14 @@ export function queryProcess(id: any) {
 }
 export function dealInfo(id: any) {
   return defHttp.get({ url: `${Api.dealInfo}?workOrderId=${id}` });
+}
+export function getOrderDelayHistory(id: any) {
+  return defHttp.get({ url: `${Api.getOrderDelayHistory}?workOrderId=${id}` });
+}
+export function dispatchOrder(data:any) {
+  return defHttp.post({ url: Api.dispatchOrder,data });
+}
+
+export function getIoCompanyNames() {
+  return defHttp.get({ url: Api.getIoCompanyNames });
 }
\ No newline at end of file
diff --git a/src/views/IO/workOrder/orderSend/data.ts b/src/views/IO/workOrder/orderSend/data.ts
index e609565..ca00f30 100644
--- a/src/views/IO/workOrder/orderSend/data.ts
+++ b/src/views/IO/workOrder/orderSend/data.ts
@@ -17,6 +17,10 @@ const statusOptions = [
     label: '处理中(已延期)',
     value: 7,
   },
+  {
+    label: '作废',
+    value: 8,
+  },
   {
     label: '运维单位处理时回退至派遣',
     value: 3,
diff --git a/src/views/IO/workOrder/orderSend/detailDrawer.vue b/src/views/IO/workOrder/orderSend/detailDrawer.vue
index 215afb2..1968856 100644
--- a/src/views/IO/workOrder/orderSend/detailDrawer.vue
+++ b/src/views/IO/workOrder/orderSend/detailDrawer.vue
@@ -151,11 +151,11 @@
         </a-tab-pane>
         <a-tab-pane key="5" tab="延期信息">
           <a-table :dataSource="delayInfo" :columns="delayColumns" bordered>
-            <template #bodyCell="{ column }">
+            <!-- <template #bodyCell="{ column }">
               <template v-if="column.key === 'action'">
                 <a-button type="link">查看</a-button>
               </template>
-            </template>
+            </template> -->
           </a-table>
         </a-tab-pane>
       </a-tabs>
@@ -165,7 +165,7 @@
 
 <script>
   import { reactive, ref,defineComponent } from 'vue';
-  import { getInfo, dealInfo,queryProcess } from './api';
+  import { getInfo, dealInfo,queryProcess,getOrderDelayHistory } from './api';
   import AMapLoader from '@amap/amap-jsapi-loader';
   import Icon from '@/components/Icon/Icon.vue';
   export default defineComponent({
@@ -217,6 +217,10 @@
           label: '处理中(已延期)',
           value: 7,
         },
+        {
+          label: '作废',
+          value: 8,
+        },
         {
           label: '运维单位处理时回退至派遣',
           value: 3,
@@ -263,25 +267,25 @@
       ];
       const delayInfo = ref([]);
       const delayColumns = [
-        {
+      {
           title: '申请时间',
-          dataIndex: 'applyTime',
-          key: 'applyTime',
+          dataIndex: 'createTime',
+          key: 'createTime',
         },
         {
           title: '申请原因',
-          dataIndex: 'applyReason',
-          key: 'applyReason',
+          dataIndex: 'delayReason',
+          key: 'delayReason',
         },
         {
           title: '延期时间',
-          dataIndex: 'delayTime',
-          key: 'delayTime',
+          dataIndex: 'afterDelayTime',
+          key: 'afterDelayTime',
         },
         {
           title: '详细信息',
-          dataIndex: 'action',
-          key: 'action  ',
+          dataIndex: 'handleResult',
+          key: 'handleResult  ',
         },
       ];
 
@@ -297,9 +301,15 @@
         progress.value = progressLine;
         console.log(progress.value);
         const data1 = await dealInfo(id);
-        for (let i in dealDetail) {
+        if(data1){
+          for (let i in dealDetail) {
           dealDetail[i] = data1[i];
         }
+        }
+        const data2 = await getOrderDelayHistory(id);
+        if (data2) {
+          delayInfo.value = data2;
+        }
         initMap(detail.longitude, detail.latitude, detail.faultLocation);
       };
 
diff --git a/src/views/IO/workOrder/orderSend/index.vue b/src/views/IO/workOrder/orderSend/index.vue
index cbc4b12..1318fa3 100644
--- a/src/views/IO/workOrder/orderSend/index.vue
+++ b/src/views/IO/workOrder/orderSend/index.vue
@@ -2,7 +2,7 @@
   <PageWrapper dense>
     <BasicTable @register="registerTable">
       <template #toolbar>
-        <a-button type="primary" @click="showFaultModal">故障上报</a-button>
+        <!-- <a-button type="primary" @click="showFaultModal">故障上报</a-button> -->
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column && record && column.key === 'action'">
diff --git a/src/views/IO/workOrder/orderSend/sendModal.vue b/src/views/IO/workOrder/orderSend/sendModal.vue
index 45f3398..dd7b993 100644
--- a/src/views/IO/workOrder/orderSend/sendModal.vue
+++ b/src/views/IO/workOrder/orderSend/sendModal.vue
@@ -18,7 +18,7 @@
       <a-row :gutter="[16, 16]">
         <a-col :span="24">
           <a-form-item label="操作处理" name="handle">
-            <a-select v-model:value="form.handle" :options="handleOptions" placeholder="请选择" />
+            <a-select v-model:value="form.handle" :options="handleOptions"  placeholder="请选择" />
           </a-form-item>
         </a-col>
       </a-row>
@@ -29,20 +29,25 @@
               v-model:value="form.maintenanceRequirement"
               :options="maintenanceRequirementOptions"
               placeholder="请选择"
+              
             />
           </a-form-item>
         </a-col>
       </a-row>
-      <a-row :gutter="[16, 16]">
+      <a-row :gutter="[16, 16]" v-if="form.handle=='事件派遣'">
         <a-col :span="24">
-          <a-form-item label="维护单位" name="maintenanceUnit">
-            <a-input v-model:value="form.maintenanceUnit" placeholder="请输入" disbaled />
+          <a-form-item label="维护单位" name="maintenanceUnit" >
+            <a-select
+              v-model:value="form.maintenanceUnit"
+              :options="maintenanceUnitOptions"
+              placeholder="请选择"
+            />
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="[16, 16]">
         <a-col :span="24">
-          <a-form-item label="派遣意见" name="dispatchOpinion">
+          <a-form-item :label="form.handle=='事件作废'?'作废原因':'派遣意见'" name="dispatchOpinion">
             <a-textarea v-model:value="form.dispatchOpinion" :rows="4" placeholder="请输入" />
           </a-form-item>
         </a-col>
@@ -54,7 +59,7 @@
 <script>
   import { reactive, ref } from 'vue';
   import { message } from 'ant-design-vue';
-  import { getInfo } from './api';
+  import { getInfo,dispatchOrder,getIoCompanyNames} from './api';
   export default {
     setup(props,{emit}) {
       const title = ref('派遣');
@@ -90,25 +95,40 @@
         {
           value: '事件派遣',
         },
-        {
-          value: '事件转派',
-        },
         {
           value: '事件作废',
         },
       ];
+      const maintenanceUnitOptions = ref([])
+      const getMaintenanceUnitOptions = async() =>{
+       const res = await getIoCompanyNames();
+       maintenanceUnitOptions.value = res.map((i) => {
+          return {
+            value: i,
+          };
+        });
+      }
       const showModal = async (id) => {
         visible.value = true;
         const data = await getInfo(id);
         for (let i in form) {
           form[i] = data[i];
         }
+        getMaintenanceUnitOptions()
       };
 
       const handleOk = () => {
         formRef.value.validate().then((valid) => {
           if (valid) {
+           const params = {} 
+           for(let i in form){
+            params[i] = form[i]
+           }
+           dispatchOrder(params).then(_=>{
+            message.success('操作成功')
+            closeModal()
             emit('success')
+           })
           }
         });
       };
@@ -128,6 +148,7 @@
         title,
         form,
         maintenanceRequirementOptions,
+        maintenanceUnitOptions,
         handleOptions,
         showModal,
         handleOk,
diff --git a/src/views/document/addModal.vue b/src/views/document/addModal.vue
index 6c8e313..89a171b 100644
--- a/src/views/document/addModal.vue
+++ b/src/views/document/addModal.vue
@@ -152,7 +152,6 @@
         } else {
           form.attachments = null;
         }
-        console.log(fileLists);
       };
       return {
         visible,