点位,材料

src/views/IO/delayPatrol/waitAudit/api.ts

@@ -6,6 +6,7 @@ enum Api {
   getSubcategoryType = '/platform/subcategoryType/list',
   workOrderAdd = '/platform/workOrder/add',
   getProjectInfo = '/platform/projectInfo/getNames',
+  getOrganizationType = '/platform/organizationType/list',
 }
 
 export function list(params:any) {
@@ -37,4 +38,8 @@ export function workOrderAdd(data: any) {
 }
 export function getProjectInfo() {
   return defHttp.get({ url: Api.getProjectInfo });
+}
+
+export function getOrganizationType() {
+  return defHttp.get({ url: Api.getOrganizationType });
 }

src/views/IO/delayPatrol/waitAudit/faultModal.vue

@@ -70,7 +70,15 @@
       <a-row :gutter="[16, 16]">
         <a-col :span="12">
           <a-form-item label="所属机构" name="organizationName">
-            <a-input v-model:value="form.organizationName"  />
+            <a-select
+              v-model:value="form.organizationName"
+              :options="organizationNameOptions"
+              :fieldNames="{
+                label: 'organizationName',
+                value: 'organizationName',
+                options: 'options',
+              }"
+            />
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -138,7 +146,7 @@
 
 <script>
   import { reactive, ref } from 'vue';
-  import { getInfo, getSubcategoryType, workOrderAdd,getProjectInfo } from './api';
+  import { getInfo, getSubcategoryType, workOrderAdd,getProjectInfo,getOrganizationType } from './api';
   import { message } from 'ant-design-vue';
   import AMapLoader from '@amap/amap-jsapi-loader';
   export default {
@@ -168,7 +176,11 @@
         const res = await getProjectInfo();
         projectNameOptions.value = res
       }
-      
+      const organizationNameOptions = ref([])
+      const getOrganizationNameOptions= async () =>{
+        const res = await getOrganizationType();
+        organizationNameOptions.value = res.rows
+      }
       const responseLevelOptions = [
         {
           value: 0,
@@ -226,6 +238,7 @@
         visible.value = true;
         getFaultSubcategoryOptions()
         getProjectNameOptions()
+        getOrganizationNameOptions()
       };
 
       const handleOk = () => {
@@ -276,6 +289,7 @@
         faultSubcategoryOptions,
         faultLocationOptions,
         projectNameOptions,
+        organizationNameOptions,
         faultLocationChange
       };
     },

src/views/IO/delayPatrol/waitPatrol/api.ts

@@ -6,6 +6,7 @@ enum Api {
   getSubcategoryType = '/platform/subcategoryType/list',
   workOrderAdd = '/platform/workOrder/add',
   getProjectInfo = '/platform/projectInfo/getNames',
+  getOrganizationType = '/platform/organizationType/list',
 }
 
 export function list(params:any) {
@@ -36,4 +37,7 @@ export function workOrderAdd(data: any) {
 }
 export function getProjectInfo() {
   return defHttp.get({ url: Api.getProjectInfo });
+}
+export function getOrganizationType() {
+  return defHttp.get({ url: Api.getOrganizationType });
 }

src/views/IO/delayPatrol/waitPatrol/data.ts

@@ -45,9 +45,34 @@ export const formSchemas: FormSchema[] = [
   //   },
   // },
   {
-    field: 'plaDate',
+    field: '[scheduleStartDate, scheduleEndDate]',
     label: '计划日期',
     component: 'RangePicker',
+    componentProps: {
+      format: 'YYYY-MM-DD',
+      valueFormat:'YYYY-MM-DD'
+    },
+  },
+  {
+    field: 'status',
+    label: '状态',
+    component: 'Select',
+    componentProps: {
+      options:[
+        {
+          value: 0,
+          label:'未开始'
+        },
+        {
+          value: 1,
+          label:'进行中'
+        },
+        {
+          value: 2,
+          label:'已完成'
+        },
+      ]
+    }
   },
   {
     field: 'deliverContent',
@@ -129,7 +154,13 @@ export const columns: BasicColumn[] = [
     title: '状态',
     dataIndex: 'status',
     customRender: ({ value }) => {
-      return value == 0 ? '启用' : '禁用';
+      if (value == 0) {
+        return '未开始';
+      } else if (value == 1) {
+        return '进行中';
+      } else if (value == 2) {
+        return '已完成';
+      }
     },
   },
 ];

src/views/IO/delayPatrol/waitPatrol/faultModal.vue

@@ -70,7 +70,15 @@
       <a-row :gutter="[16, 16]">
         <a-col :span="12">
           <a-form-item label="所属机构" name="organizationName">
-            <a-input v-model:value="form.organizationName"  />
+            <a-select
+              v-model:value="form.organizationName"
+              :options="organizationNameOptions"
+              :fieldNames="{
+                label: 'organizationName',
+                value: 'organizationName',
+                options: 'options',
+              }"
+            />
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -138,7 +146,7 @@
 
 <script>
   import { reactive, ref } from 'vue';
-  import { getInfo, getSubcategoryType, workOrderAdd,getProjectInfo } from './api';
+  import { getInfo, getSubcategoryType, workOrderAdd,getProjectInfo,getOrganizationType } from './api';
   import { message } from 'ant-design-vue';
   import AMapLoader from '@amap/amap-jsapi-loader';
   export default {
@@ -168,7 +176,11 @@
         const res = await getProjectInfo();
         projectNameOptions.value = res
       }
-      
+      const organizationNameOptions = ref([])
+      const getOrganizationNameOptions= async () =>{
+        const res = await getOrganizationType();
+        organizationNameOptions.value = res.rows
+      }
       const responseLevelOptions = [
         {
           value: 0,
@@ -226,6 +238,7 @@
         visible.value = true;
         getFaultSubcategoryOptions()
         getProjectNameOptions()
+        getOrganizationNameOptions()
       };
 
       const handleOk = () => {
@@ -276,6 +289,7 @@
         faultSubcategoryOptions,
         faultLocationOptions,
         projectNameOptions,
+        organizationNameOptions,
         faultLocationChange
       };
     },

src/views/IO/delayPatrol/waitPatrol/index.vue

@@ -2,7 +2,10 @@
   <PageWrapper dense>
     <BasicTable @register="registerTable">
       <template #toolbar>
-        <a-button type="primary" @click="handleReport">上报</a-button>
+        <a-button type="primary" @click="changeDate(3)">近三天</a-button>
+        <a-button type="primary" @click="changeDate(7)">近七天</a-button>
+        <a-button type="primary" @click="changeDate(30)">近一月</a-button>
+        <a-button type="primary" danger @click="handleReport">上报</a-button>
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column && record && column.key === 'action'">
@@ -21,11 +24,11 @@
   import { list } from './api';
   import { formSchemas, columns } from './data';
   import detailDrawer from './detailDrawer.vue';
-  import { ref } from 'vue';
-  import faultModal from './faultModal.vue'
+  import { ref, onMounted } from 'vue';
+  import faultModal from './faultModal.vue';
+  import dayjs from 'dayjs';
   defineOptions({ name: 'WaitPatrol' });
-
-  const [registerTable] = useTable({
+  const [registerTable, { reload, getForm }] = useTable({
     rowSelection: {
       type: 'checkbox',
     },
@@ -59,9 +62,39 @@
     detailDrawerRef.value.showDrawer();
   };
   const faultModalRef = ref();
-  const handleReport = () =>{
-    faultModalRef.value.showModal()
-  }
+  const handleReport = () => {
+    faultModalRef.value.showModal();
+  };
+  let selectDateRange = ref<any>([]);
+  const changeDate = async (type: any) => {
+    const today = dayjs().format('YYYY-MM-DD');
+    const selectDay = dayjs().add(type, 'day').format('YYYY-MM-DD');
+    selectDateRange.value = [today, selectDay];
+    await getForm().setFieldsValue({
+      scheduleStartDate: today,
+      scheduleEndDate: selectDay,
+    });
+    reload();
+    localStorage.setItem(
+      'currentDate',
+      JSON.stringify({ scheduleStartDate: today, scheduleEndDate: selectDay }),
+    );
+  };
+  const beforDateSearch = async (date: any) => {
+    await getForm().setFieldsValue({
+      scheduleStartDate: date[0],
+      scheduleEndDate: date[1],
+    });
+    reload();
+  };
+  onMounted(async () => {
+    const currentDate = JSON.parse(localStorage.getItem('currentDate'));
+    console.log(currentDate)
+    await getForm().setFieldsValue({
+      scheduleStartDate: currentDate[0],
+      scheduleEndDate: currentDate[1],
+    });
+  });
 </script>
 
 <style scoped></style>

src/views/project/IOCheck/checkManage/data.ts

@@ -48,6 +48,6 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '创建日期',
-    dataIndex: 'createDate',
+    dataIndex: 'createTime',
   },
 ];

src/views/project/contractManage/index.vue

@@ -26,9 +26,9 @@
       title="服务目录配置"
       @ok="serviceSubmit"
       @cancel="closeService"
-      width="30%"
+      width="80%"
     >
-      <a-form :model="serviceForm" layout="vertical" :rules="serviceRules" ref="serviceRef">
+      <a-form :model="serviceForm" layout="vertical" :rules="serviceRules" ref="serviceRef"  >
         <a-row :gutter="[16, 16]">
           <a-col :span="24">
             <a-form-item label="合同名称" name="contractId">
@@ -64,26 +64,18 @@
         </a-row>
         <a-row>
           <a-col :span="24">
-            <a-form-item label="目录名称" name="serviceProjectList">
-              <a-select
-                v-model:value="serviceForm.serviceProjectList"
-                mode="multiple"
-                :options="serviceProjectOptions"
-                placeholder="请选择"
-                :fieldNames="{
-                  value: 'id',
-                  label: 'serviceProject',
-                  options: 'options',
-                }"
-              />
+            <a-form-item label="自动生成" name="auto">
+              <a-switch v-model:checked="serviceForm.auto" />
             </a-form-item>
           </a-col>
         </a-row>
         <a-row>
           <a-col :span="24">
-            <a-form-item label="自动生成" name="auto">
-              <a-switch v-model:checked="serviceForm.auto" />
-            </a-form-item>
+            <a-table :columns="serviceColumns"
+             :data-source="serviceProjectOptions" 
+             :row-selection="serviceRowSelection" 
+             rowKey="id"
+             />
           </a-col>
         </a-row>
       </a-form>
@@ -163,7 +155,8 @@
   const serviceSubmit = () => {
     serviceRef.value.validate().then((valid: any) => {
       if (valid) {
-        let params = {
+        if(serviceForm.serviceProjectList&&serviceForm.serviceProjectList.length>0){
+          let params = {
           contractId: serviceForm.contractId,
           categoryId: serviceForm.categoryId,
           serviceProjectList:serviceForm.serviceProjectList
@@ -179,13 +172,16 @@
           closeService();
         });  
         }
+        }else{
+          message.warning('请选择服务协议')
+        }
+
       }
     });
   };
   const serviceRules = {
     contractId: [{ required: true, message: '请选择' }],
     categoryId: [{ required: true, message: '请选择' }],
-    serviceProjectList:[{ required: true, message: '请选择' }]
   };
   const addService = () => {
     serviceVisible.value = true;
@@ -194,6 +190,7 @@
   const closeService = () => {
     serviceVisible.value = false;
     serviceRef.value.resetFields()
+    serviceForm.serviceProjectList = []
   };
   const contractOptions = ref([]);
   const getContractOptions = () => {
@@ -217,6 +214,61 @@
     getCategoryOptions();
     getContractOptions();
   };
+  //列表
+  const serviceColumns = [
+  {
+    title: '交付内容',
+    dataIndex: 'deliverContent',
+    key: 'deliverContent',
+  },
+  {
+    title: '服务项目',
+    dataIndex: 'serviceProject',
+    key: 'serviceProject',
+  },
+  {
+    title: '代码',
+    dataIndex: 'code',
+    key: 'code',
+  },
+  {
+    title: '服务内容',
+    dataIndex: 'serviceContent',
+    key: 'serviceContent',
+  },
+  {
+    title: '相应级别',
+    dataIndex: 'responseLevel',
+    key: 'responseLevel',
+  },
+  {
+    title: '服务频率',
+    dataIndex: 'frequency',
+    key: 'frequency',
+  },
+  {
+    title: '请求类型',
+    dataIndex: 'responseType',
+    key: 'responseType',
+  },
+  {
+    title: '交付方式',
+    dataIndex: 'deliverType',
+    key: 'deliverType',
+  },
+  {
+    title: '交付成果',
+    dataIndex: 'deliverResult',
+    key: 'deliverResult',
+  },
+  ]
+  const serviceRowSelection = ref(
+    {
+      onChange:(selectedRowKeys:any,selectedRows:any)=>{
+        serviceForm.serviceProjectList = selectedRowKeys
+      }
+    }
+  )
 </script>
 
 <style scoped></style>

src/views/property/meterial/addModal.vue

@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:open="visible" :title="title" @ok="handleOk" width="50%">
-    <a-form :model="form" layout="vertical">
+    <a-form :model="form" layout="vertical" ref="formRef" :rules="rules">
       <a-row :gutter="[16, 16]">
         <a-col :span="24">
           <a-form-item label="名称" name="name">
@@ -56,7 +56,12 @@
 
 <script>
   import { reactive, ref } from 'vue';
-
+  import { message } from 'ant-design-vue';
+  import {
+    getInfo,
+    add,
+    update,
+  } from './api';
   export default {
     setup() {
       const title = ref('新增');
@@ -69,34 +74,74 @@
         price: '',
         amount: '',
         standards: '',
+        projectId:null,
+        id:null
       });
       //下拉框
       const statusOptions = [
         {
           value: 0,
-          label: '禁用',
+          label: '启用',
         },
         {
           value: 1,
-          label: '启用',
+          label: '禁用',
         },
       ];
-      const showModal = (type, id) => {
+      const showModal = async(type, id,projectId) => {
+        console.log(projectId)
+        visible.value = true;
         if (type == 1) {
           title.value = '新增';
         } else if (type == 2) {
           title.value = '编辑';
-          console.log(id);
+          const data = await getInfo(id);
+          for (let i in form) {
+            form[i] = data[i];
+          }
         }
-        visible.value = true;
+        form.projectId = projectId
       };
 
       const handleOk = () => {
-        console.log('Form Data:', form);
-        // 在此处可以添加表单验证逻辑
+        formRef.value.validate().then((valid) => {
+          if (valid) {
+            if (title.value == '新增') {
+              let params = {};
+              for (let i in form) {
+                params[i] = form[i];
+              }
+              add(params).then((_) => {
+                message.success('新增成功');
+                visible.value = false;
+              });
+            } else {
+              let params = {};
+              for (let i in form) {
+                params[i] = form[i];
+              }
+              update(params).then((_) => {
+                message.success('编辑成功');
+                visible.value = false;
+              });
+            }
+          }
+        });
+      };
+      const closeModal = () => {
+        formRef.value.resetFields();
         visible.value = false;
       };
-
+      const formRef = ref()
+      const rules = {        
+        name: [{ required: true, message: '请输入' }],
+        status: [{ required: true, message: '请选择' }],
+        remark: [{ required: true, message: '请输入' }],
+        unit: [{ required: true, message: '请输入' }],
+        price: [{ required: true, message: '请输入' }],
+        amount: [{ required: true, message: '请输入' }],
+        standards: [{ required: true, message: '请输入' }],
+      };
       return {
         visible,
         title,
@@ -104,6 +149,9 @@
         showModal,
         handleOk,
         statusOptions,
+        closeModal,
+        formRef,
+        rules
       };
     },
   };

src/views/property/meterial/api.ts

@@ -1,58 +1,36 @@
-import { ID, IDS, PageQuery, commonExport } from '@/api/base';
+import { ID, IDS, commonExport } from '@/api/base';
 import { defHttp } from '@/utils/http/axios';
-import { Dayjs } from 'dayjs';
 
 enum Api {
-  root = '/workflow/leave',
-  list = '/workflow/leave/list',
+  root = '/platform/matrialInfo',
+  list = '/platform/matrialInfo/list',
+  tree = '/platform/projectCategoryPoint/queryAll',
   export = '/workflow/leave/export',
 }
 
-export interface Leave {
-  id: string;
-  leaveType: string;
-  startDate: string;
-  endDate: string;
-  leaveDays: number;
-  remark: string;
-  processInstanceVo?: any;
-  dateTime?: [string, string] | [Dayjs, Dayjs];
+export function list(params: any) {
+  return defHttp.get({ url: Api.list, params });
 }
-
-export interface Resp {
-  createDept: number;
-  createBy: number;
-  createTime: string;
-  updateBy: number;
-  updateTime: string;
-  id: string;
-  leaveType: string;
-  startDate: string;
-  endDate: string;
-  leaveDays: number;
-  remark?: any;
-}
-
-export function list(params?: PageQuery) {
-  return defHttp.get<Leave[]>({ url: Api.list, params });
+export function tree() {
+  return defHttp.get({ url: Api.tree });
 }
-
 export function exportExcel(data: any) {
   return commonExport(Api.export, data);
 }
 
 export function getInfo(id: ID) {
-  return defHttp.get<Leave>({ url: `${Api.root}/${id}` });
+  return defHttp.get({ url: `${Api.root}/${id}` });
 }
 
 export function add(data: any) {
-  return defHttp.post<Resp>({ url: Api.root, data });
+  return defHttp.post({ url: Api.root, data });
 }
 
 export function update(data: any) {
-  return defHttp.put<Resp>({ url: Api.root, data });
+  return defHttp.put({ url: Api.root, data });
 }
 
 export function removeByIds(ids: IDS) {
-  return defHttp.deleteWithMsg<void>({ url: `${Api.root}/${ids.join(',')}` });
+  return defHttp.deleteWithMsg({ url: `${Api.root}/${ids.join(',')}` });
 }
+

src/views/property/meterial/data.ts

@@ -39,7 +39,7 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '创建日期',
-    dataIndex: 'createDate',
+    dataIndex: 'createTime',
   },
   {
     title: '备注',

src/views/property/meterial/index.vue

@@ -2,28 +2,37 @@
   <PageWrapper dense>
     <a-row>
       <a-col :span="4" style="margin-top: 1%">
-        <a-tree :show-line="true" :show-icon="true" :tree-data="treeData" @select="onSelect">
-          <template #title="{ dataRef }">
-            <template v-if="dataRef.key === '0-0-0-1'">
-              <div>multiple line title</div>
-              <div>multiple line title</div>
-            </template>
-            <template v-else>{{ dataRef.title }}</template>
-          </template>
-        </a-tree>
+        <a-tree
+          :show-icon="true"
+          :tree-data="treeData"
+          v-model:selectedKeys="checkedTree"
+          @select="onSelect"
+          :fieldNames="{
+            children: 'children',
+            title: 'projectName',
+            key: 'projectId',
+            disabled: 'disabled',
+          }"
+        />
       </a-col>
       <a-col :span="20">
         <BasicTable @register="registerTable">
           <template #toolbar>
-            <a-button type="primary" @click="handleAdd">新增</a-button>
-            <a-button type="primary" @click="handleAdd">导入</a-button>
-            <a-button type="primary" @click="handleAdd">导出</a-button>
+            <a-button type="primary" @click="handleAdd" v-if="checkedTree[0]">新增</a-button>
+            <a-button type="primary">导入</a-button>
+            <a-button type="primary">导出</a-button>
           </template>
           <template #bodyCell="{ column, record }">
             <template v-if="column && record && column.key === 'action'">
               <a-button type="link" @click="handleEdit(record.id)">编辑</a-button>
-              <a-button type="link" @click="handleDelete(record.id)">删除</a-button>
-              <a-button type="link" @click="handleEdit(record.id)">禁用/启用</a-button>
+              <a-popconfirm
+                title="确定要删除吗?"
+                ok-text="是"
+                cancel-text="否"
+                @confirm="handleDelete(record.id)"
+              >
+                <a-button type="link">删除</a-button>
+              </a-popconfirm>
             </template>
           </template>
         </BasicTable>
@@ -36,12 +45,12 @@
 <script setup lang="ts">
   import { PageWrapper } from '@/components/Page';
   import { BasicTable, useTable } from '@/components/Table';
-  import { list } from './api';
+  import { list, tree,removeByIds } from './api';
   import { formSchemas, columns } from './data';
   import addModal from './addModal.vue';
-  import { ref } from 'vue';
+  import { ref, onMounted } from 'vue';
 
-  defineOptions({ name: 'Meterial' });
+  defineOptions({ name: 'meterial' });
 
   const [registerTable, { reload }] = useTable({
     rowSelection: {
@@ -62,9 +71,16 @@
         lg: 6,
       },
     },
+    beforeFetch(params: any) {
+      if (checkedTree.value.length === 1) {
+        params.projectId = checkedTree.value[0];
+      }
+      return params;
+    },
+    immediate: false,
     columns: columns,
     actionColumn: {
-      width: 200,
+      width: 300,
       title: '操作',
       key: 'action',
       fixed: 'right',
@@ -73,88 +89,36 @@
   //新增编辑弹窗
   const addModalRef = ref();
   const handleAdd = () => {
-    addModalRef.value.showModal(1);
+    addModalRef.value.showModal(1, null, checkedTree.value[0]);
   };
   const handleEdit = (id: any) => {
-    addModalRef.value.showModal(2, id);
+    addModalRef.value.showModal(2, id, checkedTree.value[0]);
   };
-  const handleDelete = (id: any) => {
-    addModalRef.value.showModal(2, id);
+  const handleDelete = async (id: any) => {
+    await removeByIds([id]);
+    reload();
   };
+
   //tree
-  const treeData = ref([
-    {
-      title: 'parent 1',
-      key: '0-0',
-      children: [
-        {
-          title: 'parent 1-0',
-          key: '0-0-0',
-          children: [
-            {
-              title: 'leaf',
-              key: '0-0-0-0',
-            },
-            {
-              key: '0-0-0-1',
-            },
-            {
-              title: 'leaf',
-              key: '0-0-0-2',
-            },
-          ],
-        },
-        {
-          title: 'parent 1-1',
-          key: '0-0-1',
-          children: [
-            {
-              title: 'leaf',
-              key: '0-0-1-0',
-            },
-          ],
-        },
-        {
-          title: 'parent 1-2',
-          key: '0-0-2',
-          children: [
-            {
-              title: 'leaf 1',
-              key: '0-0-2-0',
-            },
-            {
-              title: 'leaf 2',
-              key: '0-0-2-1',
-            },
-          ],
-        },
-      ],
-    },
-    {
-      title: 'parent 2',
-      key: '0-1',
-      children: [
-        {
-          title: 'parent 2-0',
-          key: '0-1-0',
-          children: [
-            {
-              title: 'leaf',
-              key: '0-1-0-0',
-            },
-            {
-              title: 'leaf',
-              key: '0-1-0-1',
-            },
-          ],
-        },
-      ],
-    },
-  ]);
+  const checkedTree = ref([]);
+  const treeData = ref([]);
+  const getTree = async () => {
+    const res = await tree();
+    treeData.value = res;
+    treeData.value.forEach((i: any) => {
+      i.disabled = true;
+    });
+    console.log(res);
+  };
   const onSelect = (selectedKeys: any, info: any) => {
     console.log('selected', selectedKeys, info);
+    console.log(checkedTree.value);
     reload();
   };
+  onMounted(() => {
+    getTree();
+  });
+  //抽屉
 </script>
 
 <style scoped></style>

src/views/property/point/addModal.vue

@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:open="visible" :title="title" @ok="handleOk" width="50%">
-    <a-form :model="form" layout="vertical">
+    <a-form :model="form" layout="vertical" ref="formRef" :rules="rules">
       <a-row :gutter="[16, 16]">
         <a-col :span="24">
           <a-form-item label="项目名称" name="projectName">
@@ -8,6 +8,11 @@
               v-model:value="form.projectName"
               :options="projectNameOptions"
               placeholder="请选择"
+              :fieldNames="{
+                label: 'projectName',
+                value: 'projectName',
+                options: 'options',
+              }"
             />
           </a-form-item>
         </a-col>
@@ -17,8 +22,12 @@
           <a-form-item label="所属机构" name="organizationName">
             <a-select
               v-model:value="form.organizationName"
-              :options="projectNameOptions"
-              placeholder="请选择"
+              :options="organizationNameOptions"
+              :fieldNames="{
+                label: 'organizationName',
+                value: 'organizationName',
+                options: 'options',
+              }"
             />
           </a-form-item>
         </a-col>
@@ -57,7 +66,14 @@
 
 <script>
   import { reactive, ref } from 'vue';
-
+  import { message } from 'ant-design-vue';
+  import {
+    getInfo,
+    add,
+    update,
+    getProjectInfo,
+    getOrganizationType
+  } from './api';
   export default {
     setup() {
       const title = ref('新增');
@@ -69,38 +85,75 @@
         maintenanceUnit: '',
         address: '',
         pointName: '',
+        id:null
       });
       //下拉框
-      const projectNameOptions = [
-        {
-          value: '1',
-          label: 'a',
-        },
-        {
-          value: '2',
-          label: 'b',
-        },
-        {
-          value: '3',
-          label: 'c',
-        },
-      ];
-      const showModal = (type, id) => {
+      //下拉框
+      const projectNameOptions = ref([])
+      const getProjectNameOptions= async () =>{
+        const res = await getProjectInfo();
+        projectNameOptions.value = res
+      }
+      const organizationNameOptions = ref([])
+      const getOrganizationNameOptions= async () =>{
+        const res = await getOrganizationType();
+        organizationNameOptions.value = res.rows
+      }
+      const showModal = async(type, id,projectId) => {
+        console.log(projectId)
+        visible.value = true;
         if (type == 1) {
           title.value = '新增';
         } else if (type == 2) {
           title.value = '编辑';
-          console.log(id);
+          const data = await getInfo(id);
+          for (let i in form) {
+            form[i] = data[i];
+          }
         }
-        visible.value = true;
+        form.projectId = projectId
+        getProjectNameOptions()
+        getOrganizationNameOptions()
       };
 
       const handleOk = () => {
-        console.log('Form Data:', form);
-        // 在此处可以添加表单验证逻辑
+        formRef.value.validate().then((valid) => {
+          if (valid) {
+            if (title.value == '新增') {
+              let params = {};
+              for (let i in form) {
+                params[i] = form[i];
+              }
+              add(params).then((_) => {
+                message.success('新增成功');
+                visible.value = false;
+              });
+            } else {
+              let params = {};
+              for (let i in form) {
+                params[i] = form[i];
+              }
+              update(params).then((_) => {
+                message.success('编辑成功');
+                visible.value = false;
+              });
+            }
+          }
+        });
+      };
+      const closeModal = () => {
+        formRef.value.resetFields();
         visible.value = false;
       };
-
+      const formRef = ref()
+      const rules = {        
+        projectName: [{ required: true, message: '请选择' }],
+        organizationName: [{ required: true, message: '请选择' }],
+        remark: [{ required: true, message: '请输入' }],
+        maintenanceUnit: [{ required: true, message: '请输入' }],
+        address: [{ required: true, message: '请输入' }],
+        pointName: [{ required: true, message: '请输入' }],
+      };
       return {
         visible,
         title,
@@ -108,6 +161,10 @@
         showModal,
         handleOk,
         projectNameOptions,
+        organizationNameOptions,
+        closeModal,
+        formRef,
+        rules
       };
     },
   };

src/views/property/point/api.ts

@@ -8,6 +8,8 @@ enum Api {
   export = '/workflow/leave/export',
   getSubcategoryType = '/platform/subcategoryType/list',
   workOrderAdd = '/platform/workOrder/add',
+  getProjectInfo = '/platform/projectInfo/getNames',
+  getOrganizationType = '/platform/organizationType/list',
 }
 
 export function list(params: any) {
@@ -42,3 +44,10 @@ export function getSubcategoryType() {
 export function workOrderAdd(data: any) {
   return defHttp.post({ url: Api.workOrderAdd, data });
 }
+
+export function getProjectInfo() {
+  return defHttp.get({ url: Api.getProjectInfo });
+}
+export function getOrganizationType() {
+  return defHttp.get({ url: Api.getOrganizationType });
+}

src/views/property/point/index.vue

@@ -18,7 +18,7 @@
       <a-col :span="20">
         <BasicTable @register="registerTable">
           <template #toolbar>
-            <a-button type="primary" @click="handleAdd">新增</a-button>
+            <a-button type="primary" @click="handleAdd" v-if="checkedTree[0]">新增</a-button>
             <a-button type="primary">导入</a-button>
 
             <a-button type="primary">点位导出</a-button>
@@ -27,7 +27,14 @@
             <template v-if="column && record && column.key === 'action'">
               <a-button type="link" @click="showpointModal(record.id)">点位上报</a-button>
               <a-button type="link" @click="handleEdit(record.id)">编辑</a-button>
-              <a-button type="link" @click="handleDelete(record.id)">删除</a-button>
+              <a-popconfirm
+                title="确定要删除吗?"
+                ok-text="是"
+                cancel-text="否"
+                @confirm="handleDelete(record.id)"
+              >
+                <a-button type="link">删除</a-button>
+              </a-popconfirm>
               <a-button type="link" @click="handleDetail(record.id)">详情</a-button>
             </template>
           </template>
@@ -43,7 +50,7 @@
 <script setup lang="ts">
   import { PageWrapper } from '@/components/Page';
   import { BasicTable, useTable } from '@/components/Table';
-  import { list, tree } from './api';
+  import { list, tree,removeByIds} from './api';
   import { formSchemas, columns } from './data';
   import detailDrawer from './detailDrawer.vue';
   import addModal from './addModal.vue';
@@ -94,8 +101,9 @@
   const handleEdit = (id: any) => {
     addModalRef.value.showModal(2, id);
   };
-  const handleDelete = (id: any) => {
-    addModalRef.value.showModal(2, id);
+  const handleDelete = async (id: any) => {
+    await removeByIds([id]);
+    reload();
   };
   //点位上报
   //弹窗内容