From ea37bbdc18999d24fce4e3b55351dd2035c798b1 Mon Sep 17 00:00:00 2001
From: wbc <942429426@qq.com>
Date: Wed, 11 Jun 2025 17:02:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=B8=9A=E4=B8=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/IO/workOrder/delayAudit/index.vue   |  2 +-
 .../IO/workOrder/orderAudit/auditModal.vue    |  2 +-
 .../IO/workOrder/orderHandle/handleModal.vue  |  2 +-
 src/views/project/projectManage/addDept.vue   | 94 +++++++++++++++++++
 src/views/project/projectManage/api.ts        |  8 ++
 src/views/project/projectManage/index.vue     | 17 +++-
 src/views/property/meterial/addModal.vue      |  6 +-
 7 files changed, 120 insertions(+), 11 deletions(-)
 create mode 100644 src/views/project/projectManage/addDept.vue

diff --git a/src/views/IO/workOrder/delayAudit/index.vue b/src/views/IO/workOrder/delayAudit/index.vue
index 469b62f..076dbdd 100644
--- a/src/views/IO/workOrder/delayAudit/index.vue
+++ b/src/views/IO/workOrder/delayAudit/index.vue
@@ -4,7 +4,7 @@
 
       <template #bodyCell="{ column, record }">
         <template v-if="column && record && column.key === 'action'"> 
-          <a-button type="link" @click="showAuditModal(record.id)" v-if="record.handleResult=='待处理'&&roleList[0]!='yunwei'">审核</a-button>
+          <a-button type="link" @click="showAuditModal(record.id)" v-if="record.handleResult=='待处理'&&(roleList[0]!='yunwei'||roleList[0]!='yezhu')">审核</a-button>
           <a-button type="link" @click="showDrawer(record.id)">详情</a-button>
         </template>
       </template>
diff --git a/src/views/IO/workOrder/orderAudit/auditModal.vue b/src/views/IO/workOrder/orderAudit/auditModal.vue
index cb1719d..4d2482e 100644
--- a/src/views/IO/workOrder/orderAudit/auditModal.vue
+++ b/src/views/IO/workOrder/orderAudit/auditModal.vue
@@ -174,7 +174,7 @@
         orderTakingCost: [{ required: true, message: '请输入' }],
         isHandleOverTime: [{ required: true, message: '请选择' }],
         handleCost: [{ required: true, message: '请输入' }],
-        // otherCost: [{ required: true, message: '请输入' }],
+        otherCost: [{required: false,pattern:'^[0-9]+$', message: '请输入数字' }],
         // otherCostReason: [{ required: true, message: '请输入' }],
         auditOpinion: [{ required: true, message: '请输入' }],
         // isCloseCase: [{ required: true, message: '请选择' }],
diff --git a/src/views/IO/workOrder/orderHandle/handleModal.vue b/src/views/IO/workOrder/orderHandle/handleModal.vue
index b24e737..f36e8ab 100644
--- a/src/views/IO/workOrder/orderHandle/handleModal.vue
+++ b/src/views/IO/workOrder/orderHandle/handleModal.vue
@@ -135,7 +135,7 @@
         faultSubcategory: [{ required: true, message: '请选择' }],
         isAccident: [{ required: true, message: '请选择' }],
         fixResult: [{ required: true, message: '请输入' }],
-        cost: [{ required: true, message: '请输入' }],
+        cost: [{ required: true,pattern:'^[0-9]+$', message: '请输入' }],
         attachments: [{ required: true, message: '请上传' }],
       };
       //上传功能
diff --git a/src/views/project/projectManage/addDept.vue b/src/views/project/projectManage/addDept.vue
new file mode 100644
index 0000000..71ecfa0
--- /dev/null
+++ b/src/views/project/projectManage/addDept.vue
@@ -0,0 +1,94 @@
+<template>
+  <a-modal v-model:open="visible" :title="title" @ok="handleOk" @cancel="closeModal" width="50%">
+    <a-form :model="form" layout="vertical" ref="formRef" :rules="rules">
+      <a-row :gutter="[16, 16]">
+        <a-col :span="24">
+          <a-form-item label="业主选择" name="deptId">
+            <a-select
+              v-model:value="form.deptId"
+              :options="deptOptions"
+              placeholder="请选择"
+              :fieldNames="{
+                label: 'deptName',
+                value: 'deptId',
+                options: 'options',
+              }"
+            />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
+</template>
+
+<script>
+  import { reactive, ref } from 'vue';
+  import { getOwnerList,bindUnit } from './api';
+  import { message } from 'ant-design-vue';
+  import { getToken } from '@/utils/auth';
+  import { useGlobSetting } from '@/hooks/setting';
+  export default {
+    setup(props, { emit }) {
+      const title = ref('绑定业主');
+      const formRef = ref();
+      const visible = ref(false);
+      const form = reactive({
+        deptId: '',
+        projectId: null,
+      });
+      //下拉框
+      const deptOptions = ref([]);
+      const getOptions = async () => {
+        const res = await getOwnerList();
+        deptOptions.value = res;
+      };
+
+      const showModal = async (id) => {
+        visible.value = true;
+        form.projectId = id
+        getOptions();
+      };
+      const rules = {
+        deptId: [{ required: true, message: '请输入' }],
+      };
+      const handleOk = () => {
+        formRef.value.validate().then((valid) => {
+          if (valid) {
+            let params = {};
+            for (let i in form) {
+              params[i] = form[i];
+            }
+            bindUnit(params).then((_) => {
+              message.success('绑定成功');
+              emit('success');
+              closeModal();
+            });
+          }
+        });
+      };
+      const closeModal = () => {
+        formRef.value.resetFields();
+        visible.value = false;
+      };
+      return {
+        visible,
+        title,
+        form,
+        showModal,
+        handleOk,
+        formRef,
+        closeModal,
+        rules,
+        deptOptions
+      };
+    },
+  };
+</script>
+
+<style scoped>
+  /* 可选样式调整 */
+  .ant-modal-body {
+    max-width: 600px;
+    margin: 0 auto;
+  }
+</style>
diff --git a/src/views/project/projectManage/api.ts b/src/views/project/projectManage/api.ts
index 979f01d..39b0422 100644
--- a/src/views/project/projectManage/api.ts
+++ b/src/views/project/projectManage/api.ts
@@ -4,6 +4,8 @@ enum Api {
   root = '/platform/projectInfo',
   list = '/platform/projectInfo/list',
   getFaultCategoryType = '/platform/faultCategoryType/list',
+  getOwnerList = '/system/dept/getOwnerList',
+  bindUnit = '/platform/projectInfo/bindUnit',
 }
 
 export function list(params: any) {
@@ -27,3 +29,9 @@ export function getFaultCategoryType() {
 export function removeByIds(ids: any) {
   return defHttp.deleteWithMsg({ url: `${Api.root}/${ids.join(',')}` });
 }
+export function getOwnerList() {
+  return defHttp.get({ url: Api.getOwnerList });
+}
+export function bindUnit(params:any) {
+  return defHttp.get({ url: Api.bindUnit,params });
+}
\ No newline at end of file
diff --git a/src/views/project/projectManage/index.vue b/src/views/project/projectManage/index.vue
index 96edeed..4aed0a0 100644
--- a/src/views/project/projectManage/index.vue
+++ b/src/views/project/projectManage/index.vue
@@ -16,12 +16,14 @@
             <a-button type="link">删除</a-button>
           </a-popconfirm>
           <a-button type="link" @click="handleDetail(record.id)">详情</a-button>
+          <a-button type="link" @click="showDept(record.id)">绑定</a-button>
           <a-button type="link" @click="download(record)" v-if="record.attachment">下载</a-button>
         </template>
       </template>
     </BasicTable>
     <detailDrawer ref="detailDrawerRef" />
-    <addModal ref="addModalRef" @success="reload()"/>
+    <addModal ref="addModalRef" @success="reload()" />
+    <addDept ref="addDeptRef" @success="reload()" />
   </PageWrapper>
 </template>
 
@@ -33,6 +35,7 @@
   import detailDrawer from './detailDrawer.vue';
   import { ref } from 'vue';
   import addModal from './addModal.vue';
+  import addDept from './addDept.vue';
   import { commonDownload } from '@/api/common/index';
   import { downloadByData } from '@/utils/file/download';
   defineOptions({ name: 'ProjectManage' });
@@ -58,7 +61,7 @@
     },
     columns: columns,
     actionColumn: {
-      width: 270,
+      width: 320,
       title: '操作',
       key: 'action',
       fixed: 'right',
@@ -82,9 +85,13 @@
   const handleEdit = (id: any) => {
     addModalRef.value.showModal(2, id);
   };
-    //下载
-    const download = async (record:any) => {
-    const attachments = JSON.parse(record.attachment)
+  const addDeptRef = ref();
+  const showDept = (id:any) => {
+    addDeptRef.value.showModal(id);
+  };
+  //下载
+  const download = async (record: any) => {
+    const attachments = JSON.parse(record.attachment);
     if (attachments && attachments.length > 0) {
       attachments.forEach((i: any) => {
         commonDownload(i.url).then((res) => {
diff --git a/src/views/property/meterial/addModal.vue b/src/views/property/meterial/addModal.vue
index 88fc1e0..cb5a082 100644
--- a/src/views/property/meterial/addModal.vue
+++ b/src/views/property/meterial/addModal.vue
@@ -63,7 +63,7 @@
     update,
   } from './api';
   export default {
-    setup() {
+    setup(props,{emit}) {
       const title = ref('新增');
       const visible = ref(false);
       const form = reactive({
@@ -115,7 +115,7 @@
               add(params).then((_) => {
                 message.success('新增成功');
                 emit('success')
-                visible.value = false;
+                 closeModal()
               });
             } else {
               let params = {};
@@ -125,7 +125,7 @@
               update(params).then((_) => {
                 message.success('编辑成功');
                 emit('success')
-                visible.value = false;
+                closeModal()
               });
             }
           }