From 808701c525d3061581e1eff8eccba7f9fe571c60 Mon Sep 17 00:00:00 2001
From: wbc <942429426@qq.com>
Date: Thu, 12 Jun 2025 17:21:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IO/workOrder/orderAudit/auditModal.vue    |  2 +
 src/views/IO/workOrder/orderHandle/data.ts    |  6 +-
 src/views/IO/workOrder/orderHandle/index.vue  | 73 ++++++++++++-------
 .../IO/workOrder/orderSend/sendModal.vue      |  1 +
 src/views/project/contractManage/data.ts      |  1 +
 src/views/project/serviceManage/addModal.vue  |  2 +-
 src/views/property/point/addModal.vue         | 44 +++++++++--
 src/views/property/point/api.ts               | 12 ++-
 src/views/property/point/index.vue            | 31 ++++++--
 9 files changed, 130 insertions(+), 42 deletions(-)

diff --git a/src/views/IO/workOrder/orderAudit/auditModal.vue b/src/views/IO/workOrder/orderAudit/auditModal.vue
index 4d2482e..9f21552 100644
--- a/src/views/IO/workOrder/orderAudit/auditModal.vue
+++ b/src/views/IO/workOrder/orderAudit/auditModal.vue
@@ -133,6 +133,8 @@
         if (status.value == 5) {
           form.isCloseCase = '是';
         }
+        form.otherCost = 0
+        form.otherCostReason = '无'
       };
 
       const handleOk = () => {
diff --git a/src/views/IO/workOrder/orderHandle/data.ts b/src/views/IO/workOrder/orderHandle/data.ts
index 4ce9139..a76f02f 100644
--- a/src/views/IO/workOrder/orderHandle/data.ts
+++ b/src/views/IO/workOrder/orderHandle/data.ts
@@ -81,8 +81,12 @@ export const columns: BasicColumn[] = [
     dataIndex: 'faultLocation',
   },
   {
-    title: '剩余时间',
+    title: '剩余处理时间',
     dataIndex: 'restTime',
+  },
+    {
+    title: '剩余接单时间',
+    dataIndex: 'orderAcceptDeadline',
   },
   {
     title: '当前状态',
diff --git a/src/views/IO/workOrder/orderHandle/index.vue b/src/views/IO/workOrder/orderHandle/index.vue
index 42b4021..c47cd8f 100644
--- a/src/views/IO/workOrder/orderHandle/index.vue
+++ b/src/views/IO/workOrder/orderHandle/index.vue
@@ -10,33 +10,54 @@
             cancel-text="否"
             @confirm="receive(record.id)"
           >
-            <a-button type="link" v-if="record.status==1">接单</a-button>
+            <a-button type="link" v-if="record.status == 1">接单</a-button>
           </a-popconfirm>
-          <a-button type="link" @click="handle(record.id)" v-if="record.status==2||record.status==7">处理</a-button>
-          <a-button type="link" @click="back(record.id)" v-if="record.status==2||record.status==7">回退</a-button>
-          <a-button type="link" @click="delay(record.id)" v-if="record.status==2||record.status==7">延期</a-button>
+          <a-button
+            type="link"
+            @click="handle(record.id)"
+            v-if="record.status == 2 || record.status == 7"
+            >处理</a-button
+          >
+          <a-button
+            type="link"
+            @click="back(record.id)"
+            v-if="record.status == 2 || record.status == 7"
+            >回退</a-button
+          >
+          <a-button
+            type="link"
+            @click="delay(record.id)"
+            v-if="record.status == 2 || record.status == 7"
+            >延期</a-button
+          >
+        </template>
+        <template v-if="column && record && column.key === 'restTime'">
+          <span style="color: red">{{ record.restTime }}</span>
+        </template>
+        <template v-if="column && record && column.key === 'orderAcceptDeadline'">
+          <span style="color: red">{{ record.orderAcceptDeadline }}</span>
         </template>
       </template>
     </BasicTable>
     <detailDrawer ref="detailDrawerRef" />
-    <backModal ref="backModalRef" @success="reload()"/>
-    <delayModal ref="delayModalRef"  @success="reload()" />
-    <handleModal ref="handleModalRef"  @success="reload()" />
+    <backModal ref="backModalRef" @success="reload()" />
+    <delayModal ref="delayModalRef" @success="reload()" />
+    <handleModal ref="handleModalRef" @success="reload()" />
   </PageWrapper>
 </template>
 
 <script setup lang="ts">
   import { PageWrapper } from '@/components/Page';
   import { BasicTable, useTable } from '@/components/Table';
-  import { list, getProjectInfo,takeOrder } from './handleApi';
+  import { list, getProjectInfo, takeOrder } from './handleApi';
   import { formSchemas, columns } from './data';
   import detailDrawer from './detailDrawer.vue';
   import backModal from './backModal.vue';
   import handleModal from './handleModal.vue';
   import delayModal from './delayModal.vue';
-  import { ref,onActivated} from 'vue';
+  import { ref, onActivated } from 'vue';
 
-  const [registerTable,{reload}] = useTable({
+  const [registerTable, { reload }] = useTable({
     title: '工单处理',
     api: list,
     showIndexColumn: true,
@@ -67,21 +88,21 @@
     detailDrawerRef.value.showDrawer(id);
   };
   const receive = async (id: any) => {
-    await takeOrder(id)
+    await takeOrder(id);
     reload();
   };
-  const backModalRef = ref()
-  const back = (id:any) =>{
-    backModalRef.value.showModal(id)
-  }
-  const delayModalRef = ref()
-  const delay = (id:any) =>{
-    delayModalRef.value.showModal(id)
-  }
-  const handleModalRef = ref()
-  const handle = (id:any) =>{
-    handleModalRef.value.showModal(id)
-  }
+  const backModalRef = ref();
+  const back = (id: any) => {
+    backModalRef.value.showModal(id);
+  };
+  const delayModalRef = ref();
+  const delay = (id: any) => {
+    delayModalRef.value.showModal(id);
+  };
+  const handleModalRef = ref();
+  const handle = (id: any) => {
+    handleModalRef.value.showModal(id);
+  };
   const projectOptions = ref([]);
   const getProjectOptions = async () => {
     const res = await getProjectInfo();
@@ -96,9 +117,9 @@
     getProjectOptions();
   };
   getOptions();
-  onActivated(()=>{
-    reload()
-  })
+  onActivated(() => {
+    reload();
+  });
   // 前往审批记录页面
 </script>
 
diff --git a/src/views/IO/workOrder/orderSend/sendModal.vue b/src/views/IO/workOrder/orderSend/sendModal.vue
index 934fc12..c9bc1be 100644
--- a/src/views/IO/workOrder/orderSend/sendModal.vue
+++ b/src/views/IO/workOrder/orderSend/sendModal.vue
@@ -127,6 +127,7 @@
         for (let i in form) {
           form[i] = data[i];
         }
+        form.dispatchOpinion = ''
         const res = await getContractNamesByProjectName({ projectName: form.projectName });
         contractNameOptions.value = res;
       };
diff --git a/src/views/project/contractManage/data.ts b/src/views/project/contractManage/data.ts
index 6a31fbf..322263f 100644
--- a/src/views/project/contractManage/data.ts
+++ b/src/views/project/contractManage/data.ts
@@ -20,6 +20,7 @@ export const columns: BasicColumn[] = [
   {
     title: '合同名称',
     dataIndex: 'contractName',
+    width:300
   },
   {
     title: '合同金额(万元)',
diff --git a/src/views/project/serviceManage/addModal.vue b/src/views/project/serviceManage/addModal.vue
index e3b7c8c..743b237 100644
--- a/src/views/project/serviceManage/addModal.vue
+++ b/src/views/project/serviceManage/addModal.vue
@@ -47,7 +47,7 @@
           >
             <a-input
               v-model:value="form.frequency"
-              placeholder="例如1日1次，1月一次"
+              placeholder="例如1日1次，1周1次"
             />
           </a-form-item>
         </a-col>
diff --git a/src/views/property/point/addModal.vue b/src/views/property/point/addModal.vue
index 1f54fac..5c1c799 100644
--- a/src/views/property/point/addModal.vue
+++ b/src/views/property/point/addModal.vue
@@ -18,6 +18,24 @@
           </a-form-item>
         </a-col>
       </a-row>
+      <a-row :gutter="[16, 16]">
+        <a-col :span="24">
+          <a-form-item label="所属合同" name="contractName">
+            <a-select
+              v-model:value="form.contractName"
+              :options="contractNameOptions"
+              placeholder="请选择"
+              :disabled="!form.projectName"
+              :fieldNames="{
+                label: 'contractName',
+                value: 'contractName',
+                options: 'options',
+              }"
+              @change="contractNameChange"
+            />
+          </a-form-item>
+        </a-col>
+      </a-row>
       <a-row :gutter="[16, 16]">
         <a-col :span="24">
           <a-form-item label="所属机构" name="organizationName">
@@ -89,6 +107,8 @@
     getProjectInfo,
     getOrganizationType,
     getContractPartyBNameByProjectName,
+    getIoCompanyByName,
+    getContractNamesByProjectName,
   } from './api';
   export default {
     setup(props, { emit }) {
@@ -100,7 +120,7 @@
         remark: '',
         maintenanceUnit: '',
         // address: '',
-        linkUnit:'',
+        linkUnit: '',
         longitude: '',
         latitude: '',
         pointName: '',
@@ -117,6 +137,7 @@
         const res = await getOrganizationType();
         organizationNameOptions.value = res.rows;
       };
+      const contractNameOptions = ref([]);
       const showModal = async (type, id, projectId, selectInfo) => {
         console.log(selectInfo);
         visible.value = true;
@@ -125,10 +146,12 @@
           title.value = '新增';
           form.projectName = selectInfo.node.ownerName;
           form.organizationName = selectInfo.node.projectName;
-          const res = await getContractPartyBNameByProjectName({
-            projectName: selectInfo.node.ownerName,
-          });
-          form.maintenanceUnit = res;
+          const res = await getContractNamesByProjectName({ projectName: form.projectName });
+          contractNameOptions.value = res;
+          // const res = await getContractPartyBNameByProjectName({
+          //   projectName: selectInfo.node.ownerName,
+          // });
+          // form.maintenanceUnit = res;
           initMap();
         } else if (type == 2) {
           title.value = '编辑';
@@ -136,13 +159,18 @@
           for (let i in form) {
             form[i] = data[i];
           }
+          const res = await getContractNamesByProjectName({ projectName: form.projectName });
+          contractNameOptions.value = res;
           initMap();
         }
         form.projectId = projectId;
         getProjectNameOptions();
         getOrganizationNameOptions();
       };
-
+      const contractNameChange = async (val) => {
+        const res = await getIoCompanyByName(val);
+        form.maintenanceUnit = res;
+      };
       const handleOk = () => {
         formRef.value.validate().then((valid) => {
           if (valid) {
@@ -182,7 +210,7 @@
         remark: [{ required: true, message: '请输入' }],
         maintenanceUnit: [{ required: true, message: '请输入' }],
         // address: [{ required: true, message: '请输入' }],
-        linkUnit  : [{ required: true, message: '请输入' }],
+        linkUnit: [{ required: true, message: '请输入' }],
         pointName: [{ required: true, message: '请输入' }],
       };
       //地图
@@ -246,6 +274,8 @@
         closeModal,
         formRef,
         rules,
+        contractNameChange,
+        contractNameOptions,
       };
     },
   };
diff --git a/src/views/property/point/api.ts b/src/views/property/point/api.ts
index 5f43952..29b161d 100644
--- a/src/views/property/point/api.ts
+++ b/src/views/property/point/api.ts
@@ -13,7 +13,8 @@ enum Api {
   getContractNamesByProjectName = '/platform/contractInfo/getContractNamesByProjectName',
   getIoCompanyByName = '/platform/contractInfo/getIoCompany',
   getContractPartyBNameByProjectName = '/platform/projectInfo/getContractPartyBNameByProjectName',
-  upload = '/platform/excel/uploadPointInfo',
+  uploadPointInfo = '/platform/excel/uploadPointInfo',
+  uploadWorkOrderInfo = '/platform/excel/uploadWorkOrderInfo',
 }
 
 export function list(params: any) {
@@ -31,7 +32,14 @@ export function getInfo(id: ID) {
 }
 export function listUpload(params: any) {
   return defHttp.post({
-    url: Api.upload,
+    url: Api.uploadPointInfo,
+    headers: { 'Content-Type': 'multipart/form-data' },
+    params,
+  });
+}
+export function uploadWorkOrderInfo(params: any) {
+  return defHttp.post({
+    url: Api.uploadWorkOrderInfo,
     headers: { 'Content-Type': 'multipart/form-data' },
     params,
   });
diff --git a/src/views/property/point/index.vue b/src/views/property/point/index.vue
index 936ff37..9039fa4 100644
--- a/src/views/property/point/index.vue
+++ b/src/views/property/point/index.vue
@@ -28,9 +28,16 @@
             >
               <a-button type="primary"> 导入 </a-button>
             </a-upload>
-
-            <a-button
-              @click="downloadExcel(exportExcel, '点位信息', getForm().getFieldsValue())"
+            <a-upload
+              name="file"
+              :before-upload="reportUpload"
+              @change="reportChange"
+              :showUploadList="false"
+              v-if="checkedTree.length > 0"
+            >
+              <a-button type="primary"> 批量点位上报 </a-button>
+            </a-upload>
+            <a-button @click="downloadExcel(exportExcel, '点位信息', getForm().getFieldsValue())"
               >导出</a-button
             >
           </template>
@@ -61,16 +68,17 @@
 <script setup lang="ts">
   import { PageWrapper } from '@/components/Page';
   import { BasicTable, useTable } from '@/components/Table';
-  import { list, tree, removeByIds, listUpload ,exportExcel} from './api';
+  import { list, tree, removeByIds, listUpload, exportExcel,uploadWorkOrderInfo} from './api';
   import { formSchemas, columns } from './data';
   import detailDrawer from './detailDrawer.vue';
   import addModal from './addModal.vue';
   import { ref, onMounted } from 'vue';
   import pointModal from './pointModal.vue';
   import { downloadExcel } from '@/utils/file/download';
+  import { message } from 'ant-design-vue';
   defineOptions({ name: 'Point' });
 
-  const [registerTable, { getForm,reload }] = useTable({
+  const [registerTable, { getForm, reload }] = useTable({
     title: '点位信息',
     api: list,
     showIndexColumn: true,
@@ -148,6 +156,19 @@
     return false;
   };
   const importChange = () => {
+    message.success('导入成功');
+    reload();
+  };
+  const reportUpload = async (file: any) => {
+    console.log(file);
+    const params = {
+      file: file,
+    };
+    await uploadWorkOrderInfo(params);
+    return false;
+  };
+  const reportChange = () => {
+    message.success('导入成功');
     reload();
   };
   onMounted(() => {