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_commission.ts b/src/api/project_commission.ts
index edc418a..5c97567 100644
--- a/src/api/project_commission.ts
+++ b/src/api/project_commission.ts
@@ -1,26 +1,30 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
// 项目提成列表
export function apiProjectCommissionLists(params: any) {
- return request.get({ url: '/project_commission/lists', params })
+ return request.get({ url: "/project_commission/lists", params });
}
// 添加项目提成
export function apiProjectCommissionAdd(params: any) {
- return request.post({ url: '/project_commission/add', params })
+ return request.post({ url: "/project_commission/add", params });
}
// 编辑项目提成
export function apiProjectCommissionEdit(params: any) {
- return request.post({ url: '/project_commission/edit', params })
+ return request.post({ url: "/project_commission/edit", params });
}
// 删除项目提成
export function apiProjectCommissionDelete(params: any) {
- return request.post({ url: '/project_commission/delete', params })
+ return request.post({ url: "/project_commission/delete", params });
}
// 项目提成详情
export function apiProjectCommissionDetail(params: any) {
- return request.get({ url: '/project_commission/detail', params })
-}
\ No newline at end of file
+ return request.get({ url: "/project_commission/detail", params });
+}
+
+export function apiProjectCommissionSearch(params: any) {
+ return request.get({ url: "/project_commission/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/api/supervision_material_entry.ts b/src/api/supervision_material_entry.ts
index cdac2f5..7ae45f1 100644
--- a/src/api/supervision_material_entry.ts
+++ b/src/api/supervision_material_entry.ts
@@ -1,36 +1,63 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
// 工程监理--材料进场列表
export function apiSupervisionMaterialEntryLists(params: any) {
- return request.get({ url: '/supervision_work.supervision_material_entry/lists', params })
+ return request.get({
+ url: "/supervision_work.supervision_material_entry/lists",
+ params,
+ });
}
// 添加工程监理--材料进场
export function apiSupervisionMaterialEntryAdd(params: any) {
- return request.post({ url: '/supervision_work.supervision_material_entry/add', params })
+ return request.post({
+ url: "/supervision_work.supervision_material_entry/add",
+ params,
+ });
}
// 编辑工程监理--材料进场
export function apiSupervisionMaterialEntryEdit(params: any) {
- return request.post({ url: '/supervision_work.supervision_material_entry/edit', params })
+ return request.post({
+ url: "/supervision_work.supervision_material_entry/edit",
+ params,
+ });
}
// 删除工程监理--材料进场
export function apiSupervisionMaterialEntryDelete(params: any) {
- return request.post({ url: '/supervision_work.supervision_material_entry/delete', params })
+ return request.post({
+ url: "/supervision_work.supervision_material_entry/delete",
+ params,
+ });
}
// 工程监理--材料进场详情
export function apiSupervisionMaterialEntryDetail(params: any) {
- return request.get({ url: '/supervision_work.supervision_material_entry/detail', params })
+ return request.get({
+ url: "/supervision_work.supervision_material_entry/detail",
+ params,
+ });
}
// 工程监理--材料进场详情
export function apisupervision_material_entry_detail(params: any) {
- return request.get({ url: '/supervision_work.supervision_material_entry_detail/lists', params })
+ return request.get({
+ url: "/supervision_work.supervision_material_entry_detail/lists",
+ params,
+ });
}
export function apisupervision_material_entry_detail_delete(params: any) {
- return request.post({ url: '/supervision_work.supervision_material_entry_detail/delete', params })
+ return request.post({
+ url: "/supervision_work.supervision_material_entry_detail/delete",
+ params,
+ });
}
+export function apiSupervisionMaterialEntrySearch(params: any) {
+ return request.post({
+ url: "/supervision_work.supervision_material_entry/datas",
+ params,
+ });
+}
diff --git a/src/api/supervision_participating_units.ts b/src/api/supervision_participating_units.ts
index 0725be3..47770ae 100644
--- a/src/api/supervision_participating_units.ts
+++ b/src/api/supervision_participating_units.ts
@@ -1,32 +1,57 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
// 工程监理--参建单位列表
export function apiSupervisionParticipatingUnitsLists(params: any) {
- return request.get({ url: '/supervision_project.supervision_participating_units/lists', params })
+ return request.get({
+ url: "/supervision_project.supervision_participating_units/lists",
+ params,
+ });
}
// 添加工程监理--参建单位
export function apiSupervisionParticipatingUnitsAdd(params: any) {
- return request.post({ url: '/supervision_project.supervision_participating_units/add', params })
+ return request.post({
+ url: "/supervision_project.supervision_participating_units/add",
+ params,
+ });
}
// 编辑工程监理--参建单位
export function apiSupervisionParticipatingUnitsEdit(params: any) {
- return request.post({ url: '/supervision_project.supervision_participating_units/edit', params })
+ return request.post({
+ url: "/supervision_project.supervision_participating_units/edit",
+ params,
+ });
}
// 删除工程监理--参建单位
export function apiSupervisionParticipatingUnitsDelete(params: any) {
- return request.post({ url: '/supervision_project.supervision_participating_units/delete', params })
+ return request.post({
+ url: "/supervision_project.supervision_participating_units/delete",
+ params,
+ });
}
// 工程监理--参建单位详情
export function apiSupervisionParticipatingUnitsDetail(params: any) {
- return request.get({ url: '/supervision_project.supervision_participating_units/detail', params })
+ return request.get({
+ url: "/supervision_project.supervision_participating_units/detail",
+ params,
+ });
}
// 工程监理--参建单位列表
export function supervision_participating_units_contactsapi(params: any) {
- return request.get({ url: '/supervision_project.supervision_participating_units_contacts/lists', params })
+ return request.get({
+ url: "/supervision_project.supervision_participating_units_contacts/lists",
+ params,
+ });
}
+//apiSupervisionParticipatingUnitsSearch
+export function apiSupervisionParticipatingUnitsSearch(params: any) {
+ return request.get({
+ url: "/supervision_project.supervision_participating_units/datas",
+ params,
+ });
+}
diff --git a/src/api/supervision_project.ts b/src/api/supervision_project.ts
index cbead12..38593ff 100644
--- a/src/api/supervision_project.ts
+++ b/src/api/supervision_project.ts
@@ -1,26 +1,48 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
// 工程监理--监理项目信息列表
export function apiSupervisionProjectLists(params: any) {
- return request.get({ url: '/supervision_project.supervision_project/lists', params })
+ return request.get({
+ url: "/supervision_project.supervision_project/lists",
+ params,
+ });
}
// 添加工程监理--监理项目信息
export function apiSupervisionProjectAdd(params: any) {
- return request.post({ url: '/supervision_project.supervision_project/add', params })
+ return request.post({
+ url: "/supervision_project.supervision_project/add",
+ params,
+ });
}
// 编辑工程监理--监理项目信息
export function apiSupervisionProjectEdit(params: any) {
- return request.post({ url: '/supervision_project.supervision_project/edit', params })
+ return request.post({
+ url: "/supervision_project.supervision_project/edit",
+ params,
+ });
}
// 删除工程监理--监理项目信息
export function apiSupervisionProjectDelete(params: any) {
- return request.post({ url: '/supervision_project.supervision_project/delete', params })
+ return request.post({
+ url: "/supervision_project.supervision_project/delete",
+ params,
+ });
}
// 工程监理--监理项目信息详情
export function apiSupervisionProjectDetail(params: any) {
- return request.get({ url: '/supervision_project.supervision_project/detail', params })
-}
\ No newline at end of file
+ return request.get({
+ url: "/supervision_project.supervision_project/detail",
+ params,
+ });
+}
+
+export function apiSupervisionProjectSearch(params: any) {
+ return request.get({
+ url: "/supervision_project.supervision_project/datas",
+ params,
+ });
+}
diff --git a/src/views/apply_with_seal/edit.vue b/src/views/apply_with_seal/edit.vue
index 2c3d713..8bcce22 100644
--- a/src/views/apply_with_seal/edit.vue
+++ b/src/views/apply_with_seal/edit.vue
@@ -80,8 +80,8 @@
-
-
+
+
@@ -231,7 +231,7 @@ const formData = reactive({
stampman: '',
project_id: '',
project_name: '',
- principal: '',
+ project_director: '',
content: '',
loan: '',
borrow: '',
@@ -250,7 +250,7 @@ const formData = reactive({
const customEvent = (e: any) => {
formData.project_id = e.id
formData.project_name = e.project_name
- formData.principal = e.principal
+ formData.principal = e.contract.project_director
showDialog.value = false
}
diff --git a/src/views/apply_with_seal/index.vue b/src/views/apply_with_seal/index.vue
index 4fc05f6..7e9220e 100644
--- a/src/views/apply_with_seal/index.vue
+++ b/src/views/apply_with_seal/index.vue
@@ -58,7 +58,7 @@
-
+
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 @@
+
+
+
@@ -47,6 +51,7 @@
+
@@ -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_commission_detail/index.vue b/src/views/project_commission_detail/index.vue
index 97c6915..d230b8c 100644
--- a/src/views/project_commission_detail/index.vue
+++ b/src/views/project_commission_detail/index.vue
@@ -2,6 +2,10 @@
+
+
+
@@ -25,6 +29,7 @@
+
@@ -69,7 +74,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiProjectCommissionDetailLists, apiProjectCommissionDetailDelete, apiProjectCommissionDetailDetail } from '@/api/project_commission_detail'
-import { timeFormat } from '@/utils/util'
+import { apiProjectCommissionSearch } from '@/api/project_commission'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@@ -80,6 +85,7 @@ const showEdit = ref(false)
// 查询条件
const queryParams = reactive({
+ project_commission_id: '',
engineer: '',
task_name: '',
})
@@ -126,4 +132,3 @@ const handleDelete = async (id: number | any[]) => {
getLists()
-
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 @@
-
+
-
-
@@ -72,7 +69,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionMaterialEntryLists, apiSupervisionMaterialEntryDelete, apiSupervisionMaterialEntryDetail } from '@/api/supervision_material_entry'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import detailConfig from './detail'
diff --git a/src/views/supervision_material_equipment_info/index.vue b/src/views/supervision_material_equipment_info/index.vue
index e693cd0..53407ae 100644
--- a/src/views/supervision_material_equipment_info/index.vue
+++ b/src/views/supervision_material_equipment_info/index.vue
@@ -3,6 +3,12 @@
+
+
+
+
+
@@ -99,7 +105,12 @@
-
diff --git a/src/views/supervision_monitoring_equipment/index.vue b/src/views/supervision_monitoring_equipment/index.vue
index ba975ac..345ee18 100644
--- a/src/views/supervision_monitoring_equipment/index.vue
+++ b/src/views/supervision_monitoring_equipment/index.vue
@@ -3,6 +3,9 @@
+
+
+
+
@@ -93,6 +97,7 @@
-
diff --git a/src/views/task_allocation/edit.vue b/src/views/task_allocation/edit.vue
index b63bfd2..f8cd704 100644
--- a/src/views/task_allocation/edit.vue
+++ b/src/views/task_allocation/edit.vue
@@ -21,8 +21,8 @@
-
-
+
+
@@ -210,10 +210,6 @@ import { apiTaskAllocationAdd, apiTaskAllocationEdit, } from '@/api/task_allocat
import { cost_project, task_type } from "@/components/dialogTable/dialogTableConfig"
import type { PropType } from 'vue'
import { timeFormat } from '@/utils/util'
-import useUserStore from "@/stores/modules/user";
-const userStore = useUserStore().userInfo;
-
-
defineProps({
dictData: {
@@ -231,15 +227,6 @@ const showDialog1 = ref(false)
const showDialog3 = ref(false)
const personnel = ref()
-const handleAvatarSuccess_four = (response: any) => {
- formData.annex ||= []
- // @ts-ignore
- response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
-};
-
-// 删除上传的文件
-const delFileFn = (index: number) => { formData.annex.splice(index, 1) }
-
// 弹窗标题
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑任务分配' : '新增任务分配'
@@ -253,7 +240,7 @@ const formData = reactive({
project_id: '',
project_name: "",
project_num: '',
- head: userStore.account,
+ project_director: '',
apptime: timeFormat('', 'yyyy-mm-dd'),
annex: [],
task_detail: [],
@@ -302,6 +289,7 @@ const customEvent = (e) => {
formData.project_id = e.id
formData.project_name = e.project_name
formData.project_num = e.project_num
+ formData.project_director = e.contract.project_director
showDialog.value = false
}
diff --git a/src/views/task_allocation/index.vue b/src/views/task_allocation/index.vue
index aff2565..169288c 100644
--- a/src/views/task_allocation/index.vue
+++ b/src/views/task_allocation/index.vue
@@ -31,47 +31,10 @@
-
-
-
+