From e0b90ae4eaf38f4a871bd10467bbd1db5921aee3 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Mon, 18 Mar 2024 15:30:19 +0800
Subject: [PATCH] update

---
 src/api/project_change_visa.ts                | 37 +++++++++++++++----
 src/api/project_progress_payment.ts           | 37 +++++++++++++++----
 .../project_change_visa_content/index.vue     |  9 ++++-
 .../project_progress_payment_detail/index.vue | 14 ++++---
 4 files changed, 76 insertions(+), 21 deletions(-)

diff --git a/src/api/project_change_visa.ts b/src/api/project_change_visa.ts
index 88f55ea..a994c5b 100644
--- a/src/api/project_change_visa.ts
+++ b/src/api/project_change_visa.ts
@@ -1,26 +1,49 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 项目变更签证列表
 export function apiProjectChangeVisaLists(params: any) {
-    return request.get({ url: '/project_process_management.project_change_visa/lists', params })
+  return request.get({
+    url: "/project_process_management.project_change_visa/lists",
+    params,
+  });
 }
 
 // 添加项目变更签证
 export function apiProjectChangeVisaAdd(params: any) {
-    return request.post({ url: '/project_process_management.project_change_visa/add', params })
+  return request.post({
+    url: "/project_process_management.project_change_visa/add",
+    params,
+  });
 }
 
 // 编辑项目变更签证
 export function apiProjectChangeVisaEdit(params: any) {
-    return request.post({ url: '/project_process_management.project_change_visa/edit', params })
+  return request.post({
+    url: "/project_process_management.project_change_visa/edit",
+    params,
+  });
 }
 
 // 删除项目变更签证
 export function apiProjectChangeVisaDelete(params: any) {
-    return request.post({ url: '/project_process_management.project_change_visa/delete', params })
+  return request.post({
+    url: "/project_process_management.project_change_visa/delete",
+    params,
+  });
 }
 
 // 项目变更签证详情
 export function apiProjectChangeVisaDetail(params: any) {
-    return request.get({ url: '/project_process_management.project_change_visa/detail', params })
-}
\ No newline at end of file
+  return request.get({
+    url: "/project_process_management.project_change_visa/detail",
+    params,
+  });
+}
+
+//apiProjectChangeVisaSearch
+export function apiProjectChangeVisaSearch(params: any) {
+  return request.get({
+    url: "/project_process_management.project_change_visa/datas",
+    params,
+  });
+}
diff --git a/src/api/project_progress_payment.ts b/src/api/project_progress_payment.ts
index f8d0fa9..80d8edb 100644
--- a/src/api/project_progress_payment.ts
+++ b/src/api/project_progress_payment.ts
@@ -1,26 +1,49 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 项目进度款列表
 export function apiProjectProgressPaymentLists(params: any) {
-    return request.get({ url: '/project_process_management.project_progress_payment/lists', params })
+  return request.get({
+    url: "/project_process_management.project_progress_payment/lists",
+    params,
+  });
 }
 
 // 添加项目进度款
 export function apiProjectProgressPaymentAdd(params: any) {
-    return request.post({ url: '/project_process_management.project_progress_payment/add', params })
+  return request.post({
+    url: "/project_process_management.project_progress_payment/add",
+    params,
+  });
 }
 
 // 编辑项目进度款
 export function apiProjectProgressPaymentEdit(params: any) {
-    return request.post({ url: '/project_process_management.project_progress_payment/edit', params })
+  return request.post({
+    url: "/project_process_management.project_progress_payment/edit",
+    params,
+  });
 }
 
 // 删除项目进度款
 export function apiProjectProgressPaymentDelete(params: any) {
-    return request.post({ url: '/project_process_management.project_progress_payment/delete', params })
+  return request.post({
+    url: "/project_process_management.project_progress_payment/delete",
+    params,
+  });
 }
 
 // 项目进度款详情
 export function apiProjectProgressPaymentDetail(params: any) {
-    return request.get({ url: '/project_process_management.project_progress_payment/detail', params })
-}
\ No newline at end of file
+  return request.get({
+    url: "/project_process_management.project_progress_payment/detail",
+    params,
+  });
+}
+
+//apiProjectProgressPaymentSearch
+export function apiProjectProgressPaymentSearch(params: any) {
+  return request.get({
+    url: "/project_process_management.project_progress_payment/datas",
+    params,
+  });
+}
diff --git a/src/views/project_change_visa_content/index.vue b/src/views/project_change_visa_content/index.vue
index 29e225e..d81b6bb 100644
--- a/src/views/project_change_visa_content/index.vue
+++ b/src/views/project_change_visa_content/index.vue
@@ -2,6 +2,10 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="变更单号" prop="project_change_visa_id">
+                    <selectRemote :formData="queryParams" model="project_change_visa_id"
+                        :api="apiProjectChangeVisaSearch" />
+                </el-form-item>
                 <el-form-item label="所在目录" prop="directory">
                     <el-input class="w-[280px]" v-model="queryParams.directory" clearable placeholder="请输入所在目录" />
                 </el-form-item>
@@ -47,6 +51,7 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
+                    <el-table-column label="变更单号" prop="project_change_visa_num" show-overflow-tooltip />
                     <el-table-column label="所在目录" prop="directory" show-overflow-tooltip />
                     <el-table-column label="单位名称" prop="unit_name" show-overflow-tooltip />
                     <el-table-column label="所属专业" prop="major" show-overflow-tooltip />
@@ -83,7 +88,7 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiProjectChangeVisaContentLists, apiProjectChangeVisaContentDelete } from '@/api/project_change_visa_content'
-import { timeFormat } from '@/utils/util'
+import { apiProjectChangeVisaSearch } from '@/api/project_change_visa'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 
@@ -94,7 +99,7 @@ const showEdit = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-    project_change_visa_dataid: '',
+    project_change_visa_id: '',
     directory: '',
     unit_name: '',
     time: '',
diff --git a/src/views/project_progress_payment_detail/index.vue b/src/views/project_progress_payment_detail/index.vue
index 5f74971..b1aa723 100644
--- a/src/views/project_progress_payment_detail/index.vue
+++ b/src/views/project_progress_payment_detail/index.vue
@@ -1,8 +1,11 @@
 <template>
     <div>
-        <!-- <el-card class="!border-none mb-4" shadow="never">
+        <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-
+                <el-form-item label="项目进度款单据编号" prop="project_progress_payment_id">
+                    <selectRemote :formData="queryParams" model="project_progress_payment_id"
+                        :api="apiProjectProgressPaymentSearch" />
+                </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -10,7 +13,7 @@
                         :page-size="pager.size" />
                 </el-form-item>
             </el-form>
-        </el-card> -->
+        </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
             <!-- <el-button v-perms="['project_process_management.project_progress_payment_detail/add']" type="primary"
                 @click="handleAdd">
@@ -26,6 +29,7 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
+                    <el-table-column label="项目进度款单据编号" prop="project_progress_payment_num" show-overflow-tooltip />
                     <el-table-column label="所在目录" prop="directory" show-overflow-tooltip />
                     <el-table-column label="单位工程名称" prop="unit_project_name" show-overflow-tooltip />
                     <el-table-column label="时间" prop="time" show-overflow-tooltip />
@@ -73,7 +77,7 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiProjectProgressPaymentDetailLists, apiProjectProgressPaymentDetailDelete } from '@/api/project_progress_payment_detail'
-import { timeFormat } from '@/utils/util'
+import { apiProjectProgressPaymentSearch } from '@/api/project_progress_payment'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 
@@ -84,7 +88,7 @@ const showEdit = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-
+    project_progress_payment_id:''
 })
 
 // 选中数据