diff --git a/src/api/supervision_company_check.ts b/src/api/supervision_company_check.ts
new file mode 100644
index 0000000..9fb3584
--- /dev/null
+++ b/src/api/supervision_company_check.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 工程监理--公司检查列表
+export function apiSupervisionCompanyCheckLists(params: any) {
+ return request.get({ url: '/supervision_connect.supervision_company_check/lists', params })
+}
+
+// 添加工程监理--公司检查
+export function apiSupervisionCompanyCheckAdd(params: any) {
+ return request.post({ url: '/supervision_connect.supervision_company_check/add', params })
+}
+
+// 编辑工程监理--公司检查
+export function apiSupervisionCompanyCheckEdit(params: any) {
+ return request.post({ url: '/supervision_connect.supervision_company_check/edit', params })
+}
+
+// 删除工程监理--公司检查
+export function apiSupervisionCompanyCheckDelete(params: any) {
+ return request.post({ url: '/supervision_connect.supervision_company_check/delete', params })
+}
+
+// 工程监理--公司检查详情
+export function apiSupervisionCompanyCheckDetail(params: any) {
+ return request.get({ url: '/supervision_connect.supervision_company_check/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/supervision_notice.ts b/src/api/supervision_notice.ts
index 93528f5..2a17d9b 100644
--- a/src/api/supervision_notice.ts
+++ b/src/api/supervision_notice.ts
@@ -34,3 +34,8 @@ export function apisupervision_notice_problem(params: any) {
export function apisupervision_notice_problem_delete(params: any) {
return request.post({ url: '/supervision_work.supervision_notice_problem/delete', params })
}
+
+// 工程监理--监理通知单详情
+export function apisupervision_notice_problem_reply(params: any) {
+ return request.post({ url: '/supervision_work.supervision_notice/reply', params })
+}
diff --git a/src/api/supervision_project_case_review.ts b/src/api/supervision_project_case_review.ts
new file mode 100644
index 0000000..06ab583
--- /dev/null
+++ b/src/api/supervision_project_case_review.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 工程监理--项目方案评审列表
+export function apiSupervisionProjectCaseReviewLists(params: any) {
+ return request.get({ url: '/supervision_connect.supervision_project_case_review/lists', params })
+}
+
+// 添加工程监理--项目方案评审
+export function apiSupervisionProjectCaseReviewAdd(params: any) {
+ return request.post({ url: '/supervision_connect.supervision_project_case_review/add', params })
+}
+
+// 编辑工程监理--项目方案评审
+export function apiSupervisionProjectCaseReviewEdit(params: any) {
+ return request.post({ url: '/supervision_connect.supervision_project_case_review/edit', params })
+}
+
+// 删除工程监理--项目方案评审
+export function apiSupervisionProjectCaseReviewDelete(params: any) {
+ return request.post({ url: '/supervision_connect.supervision_project_case_review/delete', params })
+}
+
+// 工程监理--项目方案评审详情
+export function apiSupervisionProjectCaseReviewDetail(params: any) {
+ return request.get({ url: '/supervision_connect.supervision_project_case_review/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/supervision_project_info_report.ts b/src/api/supervision_project_info_report.ts
new file mode 100644
index 0000000..f5e67c5
--- /dev/null
+++ b/src/api/supervision_project_info_report.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 工程监理--项目重大信息上报列表
+export function apiSupervisionProjectInfoReportLists(params: any) {
+ return request.get({ url: '/supervision_connect.supervision_project_info_report/lists', params })
+}
+
+// 添加工程监理--项目重大信息上报
+export function apiSupervisionProjectInfoReportAdd(params: any) {
+ return request.post({ url: '/supervision_connect.supervision_project_info_report/add', params })
+}
+
+// 编辑工程监理--项目重大信息上报
+export function apiSupervisionProjectInfoReportEdit(params: any) {
+ return request.post({ url: '/supervision_connect.supervision_project_info_report/edit', params })
+}
+
+// 删除工程监理--项目重大信息上报
+export function apiSupervisionProjectInfoReportDelete(params: any) {
+ return request.post({ url: '/supervision_connect.supervision_project_info_report/delete', params })
+}
+
+// 工程监理--项目重大信息上报详情
+export function apiSupervisionProjectInfoReportDetail(params: any) {
+ return request.get({ url: '/supervision_connect.supervision_project_info_report/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/supervision_project_milestones.ts b/src/api/supervision_project_milestones.ts
new file mode 100644
index 0000000..0fd6fc7
--- /dev/null
+++ b/src/api/supervision_project_milestones.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 工程监理--项目大事记列表
+export function apiSupervisionProjectMilestonesLists(params: any) {
+ return request.get({ url: '/supervision_connect.supervision_project_milestones/lists', params })
+}
+
+// 添加工程监理--项目大事记
+export function apiSupervisionProjectMilestonesAdd(params: any) {
+ return request.post({ url: '/supervision_connect.supervision_project_milestones/add', params })
+}
+
+// 编辑工程监理--项目大事记
+export function apiSupervisionProjectMilestonesEdit(params: any) {
+ return request.post({ url: '/supervision_connect.supervision_project_milestones/edit', params })
+}
+
+// 删除工程监理--项目大事记
+export function apiSupervisionProjectMilestonesDelete(params: any) {
+ return request.post({ url: '/supervision_connect.supervision_project_milestones/delete', params })
+}
+
+// 工程监理--项目大事记详情
+export function apiSupervisionProjectMilestonesDetail(params: any) {
+ return request.get({ url: '/supervision_connect.supervision_project_milestones/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/supervision_project_monthly_report.ts b/src/api/supervision_project_monthly_report.ts
new file mode 100644
index 0000000..2ff8c66
--- /dev/null
+++ b/src/api/supervision_project_monthly_report.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 工程监理--项目月报列表
+export function apiSupervisionProjectMonthlyReportLists(params: any) {
+ return request.get({ url: '/supervision_connect.supervision_project_monthly_report/lists', params })
+}
+
+// 添加工程监理--项目月报
+export function apiSupervisionProjectMonthlyReportAdd(params: any) {
+ return request.post({ url: '/supervision_connect.supervision_project_monthly_report/add', params })
+}
+
+// 编辑工程监理--项目月报
+export function apiSupervisionProjectMonthlyReportEdit(params: any) {
+ return request.post({ url: '/supervision_connect.supervision_project_monthly_report/edit', params })
+}
+
+// 删除工程监理--项目月报
+export function apiSupervisionProjectMonthlyReportDelete(params: any) {
+ return request.post({ url: '/supervision_connect.supervision_project_monthly_report/delete', params })
+}
+
+// 工程监理--项目月报详情
+export function apiSupervisionProjectMonthlyReportDetail(params: any) {
+ return request.get({ url: '/supervision_connect.supervision_project_monthly_report/detail', params })
+}
\ No newline at end of file
diff --git a/src/components/personnelselector/index.vue b/src/components/personnelselector/index.vue
index 30050d1..801abb6 100644
--- a/src/components/personnelselector/index.vue
+++ b/src/components/personnelselector/index.vue
@@ -13,7 +13,8 @@
-
+
![]()
diff --git a/src/components/supervision_dangerous_engineering_monitoring/index.vue b/src/components/supervision_dangerous_engineering_monitoring/index.vue
new file mode 100644
index 0000000..21cb590
--- /dev/null
+++ b/src/components/supervision_dangerous_engineering_monitoring/index.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/supervision_company_check/edit.vue b/src/views/supervision_company_check/edit.vue
new file mode 100644
index 0000000..0177b95
--- /dev/null
+++ b/src/views/supervision_company_check/edit.vue
@@ -0,0 +1,221 @@
+
+
+
+
+
diff --git a/src/views/supervision_company_check/index.vue b/src/views/supervision_company_check/index.vue
new file mode 100644
index 0000000..eb8a7af
--- /dev/null
+++ b/src/views/supervision_company_check/index.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+ 新增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/supervision_dangerous_engineering_case/edit.vue b/src/views/supervision_dangerous_engineering_case/edit.vue
index 318cf86..f24efd3 100644
--- a/src/views/supervision_dangerous_engineering_case/edit.vue
+++ b/src/views/supervision_dangerous_engineering_case/edit.vue
@@ -1,16 +1,11 @@
@@ -51,6 +50,7 @@ const emit = defineEmits(['success', 'close'])
const formRef = shallowRef
()
const popupRef = shallowRef>()
const mode = ref('add')
+const showDialog = ref(false)
// 弹窗标题
@@ -58,24 +58,40 @@ const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑工程监理--危大方案提交列表' : '新增工程监理--危大方案提交列表'
})
+const handleAvatarSuccess_four = (response: any) => {
+ Array.isArray(formData.annex) ? '' : 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 formData = reactive({
id: '',
dangerous_engineering_monitoring_id: '',
+ dangerous_engineering_monitoring_title: "",
case_name: '',
assessor: '',
review_content: '',
remark: '',
- annex: '',
+ annex: [],
create_user: '',
})
+const customEvent = (e: any) => {
+ formData.dangerous_engineering_monitoring_id = e.id
+ formData.dangerous_engineering_monitoring_title = e.project_name
+ showDialog.value = false
+
+}
// 表单验证
const formRules = reactive({
dangerous_engineering_monitoring_id: [{
required: true,
- message: '请输入危大工程监控id',
+ message: '请输入危大工程监控',
trigger: ['blur']
}],
case_name: [{
@@ -98,11 +114,6 @@ const formRules = reactive({
message: '请输入备注',
trigger: ['blur']
}],
- create_user: [{
- required: true,
- message: '请输入提交人',
- trigger: ['blur']
- }]
})
@@ -114,8 +125,8 @@ const setFormData = async (data: Record) => {
formData[key] = data[key]
}
}
-
-
+
+
}
const getDetail = async (row: Record) => {
@@ -129,9 +140,9 @@ const getDetail = async (row: Record) => {
// 提交按钮
const handleSubmit = async () => {
await formRef.value?.validate()
- const data = { ...formData, }
- mode.value == 'edit'
- ? await apiSupervisionDangerousEngineeringCaseEdit(data)
+ const data = { ...formData, }
+ mode.value == 'edit'
+ ? await apiSupervisionDangerousEngineeringCaseEdit(data)
: await apiSupervisionDangerousEngineeringCaseAdd(data)
popupRef.value?.close()
emit('success')
@@ -153,6 +164,7 @@ const handleClose = () => {
defineExpose({
open,
setFormData,
- getDetail
+ getDetail,
+ customEvent
})
diff --git a/src/views/supervision_dangerous_engineering_case/index.vue b/src/views/supervision_dangerous_engineering_case/index.vue
index 8fc7027..ea51617 100644
--- a/src/views/supervision_dangerous_engineering_case/index.vue
+++ b/src/views/supervision_dangerous_engineering_case/index.vue
@@ -1,14 +1,7 @@
-
-
-
-
+
@@ -22,45 +15,34 @@
-
+
新增
-
+
删除
-
+
-
-
-
-
+
+
-
+
编辑
-
+
删除
@@ -82,6 +64,9 @@ import { apiSupervisionDangerousEngineeringCaseLists, apiSupervisionDangerousEng
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
+import { useRoute } from "vue-router"
+import { onMounted } from 'vue'
+const route = useRoute()
const editRef = shallowRef>()
// 是否显示编辑框
@@ -133,7 +118,17 @@ const handleDelete = async (id: number | any[]) => {
await apiSupervisionDangerousEngineeringCaseDelete({ id })
getLists()
}
-
getLists()
-
+onMounted(async () => {
+ if (route.query?.id) {
+ showEdit.value = true
+ await nextTick()
+ editRef.value?.open('add')
+ editRef.value?.customEvent(route.query)
+
+ }
+})
+
+
+
diff --git a/src/views/supervision_dangerous_engineering_construction/edit.vue b/src/views/supervision_dangerous_engineering_construction/edit.vue
index 5de53da..df3e28f 100644
--- a/src/views/supervision_dangerous_engineering_construction/edit.vue
+++ b/src/views/supervision_dangerous_engineering_construction/edit.vue
@@ -1,27 +1,31 @@
@@ -42,6 +46,7 @@ const emit = defineEmits(['success', 'close'])
const formRef = shallowRef()
const popupRef = shallowRef>()
const mode = ref('add')
+const showDialog = ref(false)
// 弹窗标题
@@ -53,11 +58,17 @@ const popupTitle = computed(() => {
const formData = reactive({
id: '',
dangerous_engineering_monitoring_id: '',
+ dangerous_engineering_monitoring_title: "",
actual_construction_date: '',
is_notice: '',
notice_user: '',
})
+const customEvent = (e: any) => {
+ formData.dangerous_engineering_monitoring_id = e.id
+ formData.dangerous_engineering_monitoring_title = e.project_name
+ showDialog.value = false
+}
// 表单验证
const formRules = reactive({
@@ -92,8 +103,8 @@ const setFormData = async (data: Record) => {
formData[key] = data[key]
}
}
-
-
+
+
}
const getDetail = async (row: Record) => {
@@ -107,9 +118,9 @@ const getDetail = async (row: Record) => {
// 提交按钮
const handleSubmit = async () => {
await formRef.value?.validate()
- const data = { ...formData, }
- mode.value == 'edit'
- ? await apiSupervisionDangerousEngineeringConstructionEdit(data)
+ const data = { ...formData, }
+ mode.value == 'edit'
+ ? await apiSupervisionDangerousEngineeringConstructionEdit(data)
: await apiSupervisionDangerousEngineeringConstructionAdd(data)
popupRef.value?.close()
emit('success')
@@ -131,6 +142,7 @@ const handleClose = () => {
defineExpose({
open,
setFormData,
- getDetail
+ getDetail,
+ customEvent
})
diff --git a/src/views/supervision_dangerous_engineering_construction/index.vue b/src/views/supervision_dangerous_engineering_construction/index.vue
index 42f5ce4..4f7a54a 100644
--- a/src/views/supervision_dangerous_engineering_construction/index.vue
+++ b/src/views/supervision_dangerous_engineering_construction/index.vue
@@ -1,16 +1,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -22,42 +18,38 @@
-
+
新增
-
+
删除
-
+
-
+
+
+
+
-
+ type="primary" link @click="handleEdit(row)">
编辑
+ type="danger" link @click="handleDelete(row.id)">
删除
@@ -79,7 +71,9 @@ import { apiSupervisionDangerousEngineeringConstructionLists, apiSupervisionDang
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
-
+import { useRoute } from "vue-router"
+import { onMounted } from 'vue'
+const route = useRoute()
const editRef = shallowRef>()
// 是否显示编辑框
const showEdit = ref(false)
@@ -131,6 +125,14 @@ const handleDelete = async (id: number | any[]) => {
getLists()
}
+onMounted(async () => {
+ if (route.query?.id) {
+ showEdit.value = true
+ await nextTick()
+ editRef.value?.open('add')
+ editRef.value?.customEvent(route.query)
+
+ }
+})
getLists()
-
diff --git a/src/views/supervision_dangerous_engineering_eliminate/edit.vue b/src/views/supervision_dangerous_engineering_eliminate/edit.vue
index e1ee79b..639e415 100644
--- a/src/views/supervision_dangerous_engineering_eliminate/edit.vue
+++ b/src/views/supervision_dangerous_engineering_eliminate/edit.vue
@@ -2,24 +2,33 @@
@@ -40,6 +49,7 @@ const emit = defineEmits(['success', 'close'])
const formRef = shallowRef()
const popupRef = shallowRef>()
const mode = ref('add')
+const showDialog = ref(false)
// 弹窗标题
@@ -51,13 +61,19 @@ const popupTitle = computed(() => {
const formData = reactive({
id: '',
dangerous_engineering_monitoring_id: '',
+ dangerous_engineering_monitoring_title: "",
eliminate_date: '',
eliminate_user: '',
is_notice: '',
notice_user: '',
})
+const customEvent = (e: any) => {
+ formData.dangerous_engineering_monitoring_id = e.id
+ formData.dangerous_engineering_monitoring_title = e.project_name
+ showDialog.value = false
+}
// 表单验证
const formRules = reactive({
dangerous_engineering_monitoring_id: [{
@@ -135,6 +151,7 @@ const handleClose = () => {
defineExpose({
open,
setFormData,
- getDetail
+ getDetail,
+ customEvent
})
diff --git a/src/views/supervision_dangerous_engineering_eliminate/index.vue b/src/views/supervision_dangerous_engineering_eliminate/index.vue
index 1e9b0ab..a6450b6 100644
--- a/src/views/supervision_dangerous_engineering_eliminate/index.vue
+++ b/src/views/supervision_dangerous_engineering_eliminate/index.vue
@@ -29,12 +29,12 @@
-
-
-
+
+
@@ -67,7 +67,9 @@ import { apiSupervisionDangerousEngineeringEliminateLists, apiSupervisionDangero
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
-
+import { useRoute } from "vue-router"
+import { onMounted } from 'vue'
+const route = useRoute()
const editRef = shallowRef>()
// 是否显示编辑框
const showEdit = ref(false)
@@ -120,4 +122,13 @@ const handleDelete = async (id: number | any[]) => {
}
getLists()
+onMounted(async () => {
+ if (route.query?.id) {
+ showEdit.value = true
+ await nextTick()
+ editRef.value?.open('add')
+ editRef.value?.customEvent(route.query)
+
+ }
+})
diff --git a/src/views/supervision_dangerous_engineering_monitoring/edit.vue b/src/views/supervision_dangerous_engineering_monitoring/edit.vue
index d70ecde..7a34411 100644
--- a/src/views/supervision_dangerous_engineering_monitoring/edit.vue
+++ b/src/views/supervision_dangerous_engineering_monitoring/edit.vue
@@ -62,6 +62,8 @@ import Popup from '@/components/popup/index.vue'
import { apiSupervisionDangerousEngineeringMonitoringAdd, apiSupervisionDangerousEngineeringMonitoringEdit, apiSupervisionDangerousEngineeringMonitoringDetail } from '@/api/supervision_dangerous_engineering_monitoring'
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
+
+
defineProps({
dictData: {
type: Object as PropType>,
diff --git a/src/views/supervision_dangerous_engineering_monitoring/index.vue b/src/views/supervision_dangerous_engineering_monitoring/index.vue
index f075b58..2546346 100644
--- a/src/views/supervision_dangerous_engineering_monitoring/index.vue
+++ b/src/views/supervision_dangerous_engineering_monitoring/index.vue
@@ -41,7 +41,7 @@
-
+
删除
+
+
+ 危大方案提交
+
+
+
+
+ 危大工程消除
+
+
+
+
+ 危大工程施工
+
+
diff --git a/src/views/supervision_material_entry/edit.vue b/src/views/supervision_material_entry/edit.vue
index 2355500..0294229 100644
--- a/src/views/supervision_material_entry/edit.vue
+++ b/src/views/supervision_material_entry/edit.vue
@@ -1,6 +1,7 @@
-
+
+
材料信息
+
+
+
+
@@ -104,11 +110,13 @@
+
+
diff --git a/src/views/supervision_notice/edit.vue b/src/views/supervision_notice/edit.vue
index 1d75137..4cf3450 100644
--- a/src/views/supervision_notice/edit.vue
+++ b/src/views/supervision_notice/edit.vue
@@ -1,6 +1,7 @@
+
@@ -63,10 +69,13 @@ import { apiSupervisionNoticeLists, apiSupervisionNoticeDelete } from '@/api/sup
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
+import replyForm from './replyForm.vue'
const editRef = shallowRef
>()
+const replyRef = shallowRef>()
// 是否显示编辑框
const showEdit = ref(false)
+const showEdit1 = ref(false)
// 查询条件
@@ -115,6 +124,13 @@ const handleDelete = async (id: number | any[]) => {
getLists()
}
+// 回复
+const handleReply = async (data: any) => {
+ showEdit1.value = true
+ await nextTick()
+ replyRef.value?.open('edit')
+ replyRef.value?.setFormData(data)
+}
+
getLists()
-
diff --git a/src/views/supervision_notice/replyForm.vue b/src/views/supervision_notice/replyForm.vue
new file mode 100644
index 0000000..1335528
--- /dev/null
+++ b/src/views/supervision_notice/replyForm.vue
@@ -0,0 +1,131 @@
+
+
+
+
+
diff --git a/src/views/supervision_planning/edit.vue b/src/views/supervision_planning/edit.vue
index f668845..683d3fb 100644
--- a/src/views/supervision_planning/edit.vue
+++ b/src/views/supervision_planning/edit.vue
@@ -1,6 +1,7 @@