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/views/supervision_accept/index.vue b/src/views/supervision_accept/index.vue
index a6685b0..9bca7a3 100644
--- a/src/views/supervision_accept/index.vue
+++ b/src/views/supervision_accept/index.vue
@@ -2,6 +2,9 @@
+
+
+
@@ -103,7 +106,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionAcceptLists, apiSupervisionAcceptDelete, apiSupervisionAcceptDetail, apisupervision_accept } from '@/api/supervision_accept'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
diff --git a/src/views/supervision_check_item/index.vue b/src/views/supervision_check_item/index.vue
index 62f5fd0..bc9411d 100644
--- a/src/views/supervision_check_item/index.vue
+++ b/src/views/supervision_check_item/index.vue
@@ -2,6 +2,9 @@
+
+
+
@@ -79,7 +82,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionCheckItemLists, apiSupervisionCheckItemDelete, apiSupervisionCheckItemDetail } from '@/api/supervision_check_item'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
diff --git a/src/views/supervision_device_entry/index.vue b/src/views/supervision_device_entry/index.vue
index 828ea27..7a57224 100644
--- a/src/views/supervision_device_entry/index.vue
+++ b/src/views/supervision_device_entry/index.vue
@@ -2,6 +2,9 @@
+
+
+
@@ -64,7 +67,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionDeviceEntryLists, apiSupervisionDeviceEntryDelete, apiSupervisionDeviceEntryDetail } from '@/api/supervision_device_entry'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
diff --git a/src/views/supervision_diary/index.vue b/src/views/supervision_diary/index.vue
index 5ff8dfc..5c3e00b 100644
--- a/src/views/supervision_diary/index.vue
+++ b/src/views/supervision_diary/index.vue
@@ -2,6 +2,9 @@
+
+
+
@@ -65,7 +68,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionDiaryLists, apiSupervisionDiaryDelete, apiSupervisionDiaryDetail } from '@/api/supervision_diary'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
diff --git a/src/views/supervision_entity_parallel_testing/index.vue b/src/views/supervision_entity_parallel_testing/index.vue
index f42e1cf..5c00eac 100644
--- a/src/views/supervision_entity_parallel_testing/index.vue
+++ b/src/views/supervision_entity_parallel_testing/index.vue
@@ -2,6 +2,9 @@
+
+
+
@@ -73,7 +76,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionEntityParallelTestingLists, apiSupervisionEntityParallelTestingDelete } from '@/api/supervision_entity_parallel_testing'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
diff --git a/src/views/supervision_inspection/index.vue b/src/views/supervision_inspection/index.vue
index 0adf8c2..6f59693 100644
--- a/src/views/supervision_inspection/index.vue
+++ b/src/views/supervision_inspection/index.vue
@@ -2,7 +2,10 @@
-
+
+
+
+
@@ -73,7 +76,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionInspectionLists, apiSupervisionInspectionDelete, apiSupervisionInspectionDetail } from '@/api/supervision_inspection'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
diff --git a/src/views/supervision_material_entry/index.vue b/src/views/supervision_material_entry/index.vue
index d1c7f43..14b60a6 100644
--- a/src/views/supervision_material_entry/index.vue
+++ b/src/views/supervision_material_entry/index.vue
@@ -2,6 +2,9 @@
+
+
+
@@ -31,24 +34,18 @@
-
-
-
-
+
编辑
-
+
删除
@@ -67,7 +64,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'
diff --git a/src/views/supervision_material_equipment_info/index.vue b/src/views/supervision_material_equipment_info/index.vue
index 2b29686..8c6b02f 100644
--- a/src/views/supervision_material_equipment_info/index.vue
+++ b/src/views/supervision_material_equipment_info/index.vue
@@ -3,6 +3,12 @@
+
+
+
+
+
@@ -94,7 +100,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionMaterialEquipmentInfoLists, apiSupervisionMaterialEquipmentInfoDelete } from '@/api/supervision_material_equipment_info'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@@ -105,6 +111,7 @@ const showEdit = ref(false)
// 查询条件
const queryParams = reactive({
+ project_id: '',
name: '',
brand: '',
model: '',
diff --git a/src/views/supervision_material_parallel_testing/index.vue b/src/views/supervision_material_parallel_testing/index.vue
index e9f56bf..2e356ef 100644
--- a/src/views/supervision_material_parallel_testing/index.vue
+++ b/src/views/supervision_material_parallel_testing/index.vue
@@ -2,8 +2,15 @@
-
-
+
+
+
+
+
+
+
+
@@ -30,13 +37,13 @@
-
-
+
+
+
-
@@ -69,6 +76,8 @@
-
diff --git a/src/views/supervision_notice/index.vue b/src/views/supervision_notice/index.vue
index 1e5a748..93bfb99 100644
--- a/src/views/supervision_notice/index.vue
+++ b/src/views/supervision_notice/index.vue
@@ -2,6 +2,9 @@
+
+
+
@@ -66,7 +69,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionNoticeLists, apiSupervisionNoticeDelete } from '@/api/supervision_notice'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import replyForm from './replyForm.vue'
diff --git a/src/views/supervision_side_station/index.vue b/src/views/supervision_side_station/index.vue
index 80fe266..c9a0a5f 100644
--- a/src/views/supervision_side_station/index.vue
+++ b/src/views/supervision_side_station/index.vue
@@ -2,6 +2,9 @@
+
+
+
@@ -72,7 +75,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionSideStationLists, apiSupervisionSideStationDelete, apiSupervisionSideStationDetail } from '@/api/supervision_side_station'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
diff --git a/src/views/supervision_test_blocks_specimens/index.vue b/src/views/supervision_test_blocks_specimens/index.vue
index b5d2c61..3b635ae 100644
--- a/src/views/supervision_test_blocks_specimens/index.vue
+++ b/src/views/supervision_test_blocks_specimens/index.vue
@@ -3,6 +3,12 @@
+
+
+
+
+
@@ -92,7 +98,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionTestBlocksSpecimensLists, apiSupervisionTestBlocksSpecimensDelete } from '@/api/supervision_test_blocks_specimens'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
diff --git a/src/views/supervision_witness_sampling/index.vue b/src/views/supervision_witness_sampling/index.vue
index e4d6251..3ea2903 100644
--- a/src/views/supervision_witness_sampling/index.vue
+++ b/src/views/supervision_witness_sampling/index.vue
@@ -4,14 +4,19 @@
-
-
-
+
+
-
+
+
+
+
+
+
@@ -50,10 +55,9 @@
-
+
-
-
+
@@ -93,7 +97,8 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionWitnessSamplingLists, apiSupervisionWitnessSamplingDelete, apiSupervisionWitnessSamplingDetail } from '@/api/supervision_witness_sampling'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
+import { apiSupervisionMaterialEntrySearch } from '@/api/supervision_material_entry'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import { useRouter } from 'vue-router'
diff --git a/src/views/supervision_work_contact/index.vue b/src/views/supervision_work_contact/index.vue
index dcd8d55..2b43367 100644
--- a/src/views/supervision_work_contact/index.vue
+++ b/src/views/supervision_work_contact/index.vue
@@ -2,6 +2,9 @@
+
+
+
@@ -66,7 +69,7 @@
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiSupervisionWorkContactLists, apiSupervisionWorkContactDelete, apiSupervisionWorkContactDetail } from '@/api/supervision_work_contact'
-import { timeFormat } from '@/utils/util'
+import { apiSupervisionProjectSearch } from '@/api/supervision_project'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
@@ -126,4 +129,3 @@ const handleDelete = async (id: number | any[]) => {
getLists()
-