From 7d0b314950cb2aea770f52e21b15446906eabd15 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Tue, 12 Mar 2024 16:46:04 +0800 Subject: [PATCH] add --- src/components/createUserLable/index.vue | 43 +++++ src/views/consult_new_start_project/edit.vue | 6 +- src/views/supervision_accept/edit.vue | 5 +- .../supervision_commencement_report/edit.vue | 9 +- .../supervision_commencement_report/index.vue | 2 +- .../index.vue | 6 +- .../edit.vue | 4 + .../index.vue | 3 +- .../supervision_contract_disclosure/index.vue | 7 +- .../supervision_design_disclosure/index.vue | 3 +- src/views/supervision_device_entry/edit.vue | 6 +- .../edit.vue | 6 +- .../edit.vue | 5 +- src/views/supervision_first_meeting/edit.vue | 9 +- src/views/supervision_first_meeting/index.vue | 2 +- .../edit.vue | 5 +- src/views/supervision_inspection/edit.vue | 5 +- .../supervision_large_equipment/index.vue | 3 +- src/views/supervision_material_entry/edit.vue | 5 +- .../edit.vue | 167 +----------------- .../supervision_meeting_minutes/edit.vue | 5 +- src/views/supervision_notice/edit.vue | 4 + src/views/supervision_planning/edit.vue | 7 +- src/views/supervision_planning/index.vue | 2 +- src/views/supervision_project/edit.vue | 15 +- .../edit.vue | 4 + .../supervision_project_case_review/edit.vue | 4 +- .../supervision_project_milestones/edit.vue | 5 +- .../edit.vue | 5 +- .../edit.vue | 5 +- src/views/supervision_rules/edit.vue | 9 +- src/views/supervision_rules/index.vue | 11 +- .../supervision_rules_disclosure/edit.vue | 18 +- .../supervision_rules_disclosure/index.vue | 3 +- .../edit.vue | 12 +- .../index.vue | 2 +- src/views/supervision_side_station/edit.vue | 5 +- .../edit.vue | 7 +- .../index.vue | 3 +- .../edit.vue | 4 +- .../supervision_witness_sampling/edit.vue | 6 +- src/views/supplier/index.vue | 23 ++- 42 files changed, 193 insertions(+), 267 deletions(-) create mode 100644 src/components/createUserLable/index.vue diff --git a/src/components/createUserLable/index.vue b/src/components/createUserLable/index.vue new file mode 100644 index 0000000..085e3a1 --- /dev/null +++ b/src/components/createUserLable/index.vue @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/consult_new_start_project/edit.vue b/src/views/consult_new_start_project/edit.vue index a95cc73..8e9ae16 100644 --- a/src/views/consult_new_start_project/edit.vue +++ b/src/views/consult_new_start_project/edit.vue @@ -207,11 +207,15 @@ import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { apiConsultNewStartProjectAdd, apiConsultNewStartProjectEdit, apiConsultNewStartProjectDetail, apiconsult_project_evolve, apiconsult_project_evolve_delete, apiconsult_project_preparation, apiconsult_project_preparation_delete } from '@/api/consult_new_start_project' -import { timeFormat } from '@/utils/util' import type { PropType } from 'vue' import { consult_project } from "@/components/dialogTable/dialogTableConfig" + +import { timeFormat } from '@/utils/util' import useUserStore from "@/stores/modules/user"; const userStore = useUserStore().userInfo; + + + const showDialog = ref(false) diff --git a/src/views/supervision_accept/edit.vue b/src/views/supervision_accept/edit.vue index 3e3a255..9ebab32 100644 --- a/src/views/supervision_accept/edit.vue +++ b/src/views/supervision_accept/edit.vue @@ -82,6 +82,8 @@ @delFile="delFileFn" /> + + @@ -286,7 +288,8 @@ const formData = reactive({ accept_result: '', check_item_detail_ids: '', remark: '', - create_user: '', + create_user: "", + create_time: "", check_item_name: "", company_name: '', check_item_detail_name: '', diff --git a/src/views/supervision_commencement_report/edit.vue b/src/views/supervision_commencement_report/edit.vue index 513f301..8de0f8b 100644 --- a/src/views/supervision_commencement_report/edit.vue +++ b/src/views/supervision_commencement_report/edit.vue @@ -17,9 +17,7 @@ - - - + @@ -34,8 +32,6 @@ import Popup from '@/components/popup/index.vue' import { apiSupervisionCommencementReportAdd, apiSupervisionCommencementReportEdit } from '@/api/supervision_commencement_report' import { supervision_project } from "@/components/dialogTable/dialogTableConfig" import type { PropType } from 'vue' -import useUserStore from "@/stores/modules/user"; -const userStore = useUserStore().userInfo; defineProps({ dictData: { @@ -63,7 +59,8 @@ const formData = reactive({ doc_name: '', doc_desc: '', annex: [], - create_user_name: userStore.account, + create_user: "", + create_time: "", }) const customEvent = (e) => { diff --git a/src/views/supervision_commencement_report/index.vue b/src/views/supervision_commencement_report/index.vue index 76fb8d4..ee0c741 100644 --- a/src/views/supervision_commencement_report/index.vue +++ b/src/views/supervision_commencement_report/index.vue @@ -42,7 +42,7 @@ - + 新增 - 删除 @@ -52,7 +53,7 @@ - + { getLists() - diff --git a/src/views/supervision_construction_planning/edit.vue b/src/views/supervision_construction_planning/edit.vue index cfac70e..c9bb19a 100644 --- a/src/views/supervision_construction_planning/edit.vue +++ b/src/views/supervision_construction_planning/edit.vue @@ -17,6 +17,8 @@ + + @@ -65,6 +67,8 @@ const formData = reactive({ doc_name: '', doc_desc: '', annex: [], + create_user: "", + create_time: "", }) const customEvent = (e) => { diff --git a/src/views/supervision_construction_planning/index.vue b/src/views/supervision_construction_planning/index.vue index ab69e60..6c451c0 100644 --- a/src/views/supervision_construction_planning/index.vue +++ b/src/views/supervision_construction_planning/index.vue @@ -41,7 +41,7 @@ - + { getLists() - diff --git a/src/views/supervision_contract_disclosure/index.vue b/src/views/supervision_contract_disclosure/index.vue index ea6f2f3..c4ad979 100644 --- a/src/views/supervision_contract_disclosure/index.vue +++ b/src/views/supervision_contract_disclosure/index.vue @@ -29,11 +29,11 @@ - + - + 编辑 { getLists() - diff --git a/src/views/supervision_design_disclosure/index.vue b/src/views/supervision_design_disclosure/index.vue index 2048a6d..c6f9c57 100644 --- a/src/views/supervision_design_disclosure/index.vue +++ b/src/views/supervision_design_disclosure/index.vue @@ -41,7 +41,7 @@ - + { getLists() - diff --git a/src/views/supervision_device_entry/edit.vue b/src/views/supervision_device_entry/edit.vue index 842535c..2570281 100644 --- a/src/views/supervision_device_entry/edit.vue +++ b/src/views/supervision_device_entry/edit.vue @@ -42,6 +42,9 @@ + + + @@ -210,7 +213,8 @@ const formData = reactive({ enter_result: '', co_participant: '', remark: '', - create_user: '', + create_user: "", + create_time: "", entry_detail: [{ "name": "", "brand": "", diff --git a/src/views/supervision_entity_parallel_testing/edit.vue b/src/views/supervision_entity_parallel_testing/edit.vue index edebb66..fd9444a 100644 --- a/src/views/supervision_entity_parallel_testing/edit.vue +++ b/src/views/supervision_entity_parallel_testing/edit.vue @@ -58,6 +58,8 @@ + + + + @@ -214,7 +216,8 @@ const formData = reactive({ exceed_the_control_value: '', exceed_the_warning_value: '', control_measures: '', - create_user: '', + create_user: "", + create_time: "", }) const customEvent = (e) => { diff --git a/src/views/supervision_first_meeting/edit.vue b/src/views/supervision_first_meeting/edit.vue index 54590ae..4739b53 100644 --- a/src/views/supervision_first_meeting/edit.vue +++ b/src/views/supervision_first_meeting/edit.vue @@ -17,9 +17,7 @@ - - - + @@ -34,8 +32,6 @@ import Popup from '@/components/popup/index.vue' import { apiSupervisionFirstMeetingAdd, apiSupervisionFirstMeetingEdit, apiSupervisionFirstMeetingDetail } from '@/api/supervision_first_meeting' import { supervision_project } from "@/components/dialogTable/dialogTableConfig" import type { PropType } from 'vue' -import useUserStore from "@/stores/modules/user"; -const userStore = useUserStore().userInfo; defineProps({ dictData: { @@ -63,7 +59,8 @@ const formData = reactive({ doc_name: '', doc_desc: '', annex: [], - create_user_name: userStore.account, + create_user: "", + create_time: "", }) const customEvent = (e) => { formData.project_id = e.id diff --git a/src/views/supervision_first_meeting/index.vue b/src/views/supervision_first_meeting/index.vue index 13e8010..c19b4d9 100644 --- a/src/views/supervision_first_meeting/index.vue +++ b/src/views/supervision_first_meeting/index.vue @@ -41,7 +41,7 @@ - + + + @@ -199,7 +201,8 @@ const formData = reactive({ exceed_the_control_value: '', exceed_the_warning_value: '', control_measures: '', - create_user: '', + create_user: "", + create_time: "", }) const customEvent = (e) => { diff --git a/src/views/supervision_inspection/edit.vue b/src/views/supervision_inspection/edit.vue index 9e58099..3be77c6 100644 --- a/src/views/supervision_inspection/edit.vue +++ b/src/views/supervision_inspection/edit.vue @@ -110,6 +110,9 @@ @delFile="delFileFn" /> + + + @@ -317,7 +320,7 @@ const formData = reactive({ company_id: 0, company_name: '', inspection_content: '', - is_important: '', + create_time: "", follow_user: '', check_item_detail_ids: [], check_item_detail_name: '', diff --git a/src/views/supervision_large_equipment/index.vue b/src/views/supervision_large_equipment/index.vue index 72a52c2..fd6fe7d 100644 --- a/src/views/supervision_large_equipment/index.vue +++ b/src/views/supervision_large_equipment/index.vue @@ -50,7 +50,7 @@ - + { getLists() - diff --git a/src/views/supervision_material_entry/edit.vue b/src/views/supervision_material_entry/edit.vue index e32498e..fd335f4 100644 --- a/src/views/supervision_material_entry/edit.vue +++ b/src/views/supervision_material_entry/edit.vue @@ -55,6 +55,8 @@ + + @@ -173,7 +175,8 @@ const formData = reactive({ enter_result: '', parallel_test: '', remark: '', - create_user: '', + create_user: "", + create_time: "", entry_detail: [{ "name": "", "brand": "", diff --git a/src/views/supervision_material_parallel_testing/edit.vue b/src/views/supervision_material_parallel_testing/edit.vue index ea62949..47ae379 100644 --- a/src/views/supervision_material_parallel_testing/edit.vue +++ b/src/views/supervision_material_parallel_testing/edit.vue @@ -1,165 +1,3 @@ - - + + + + + @@ -84,7 +86,8 @@ const formData = reactive({ attendees: '', content: '', annex: [], - create_user: '', + create_user: "", + create_time: "", }) const handleAvatarSuccess_four = (response: any) => { Array.isArray(formData.annex) ? '' : formData.annex = [] diff --git a/src/views/supervision_notice/edit.vue b/src/views/supervision_notice/edit.vue index a16587f..c2a908c 100644 --- a/src/views/supervision_notice/edit.vue +++ b/src/views/supervision_notice/edit.vue @@ -40,6 +40,8 @@ + + + + + @@ -80,7 +83,9 @@ const formData = reactive({ approval_content: '', remark: '', annex: [], - create_user: '', + create_user: "", + create_time: "", + }) const customEvent = (e) => { diff --git a/src/views/supervision_planning/index.vue b/src/views/supervision_planning/index.vue index f1bc634..2d55b0e 100644 --- a/src/views/supervision_planning/index.vue +++ b/src/views/supervision_planning/index.vue @@ -43,7 +43,7 @@ - + diff --git a/src/views/supervision_project/edit.vue b/src/views/supervision_project/edit.vue index 64816ec..d022e94 100644 --- a/src/views/supervision_project/edit.vue +++ b/src/views/supervision_project/edit.vue @@ -94,7 +94,6 @@ - @@ -102,7 +101,6 @@ - @@ -110,7 +108,6 @@ - @@ -211,8 +208,13 @@ import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { apiSupervisionProjectAdd, apiSupervisionProjectEdit, apiSupervisionProjectDetail } from '@/api/supervision_project' -import { timeFormat } from '@/utils/util' import type { PropType } from 'vue' + +import { timeFormat } from '@/utils/util' +import useUserStore from "@/stores/modules/user"; +const userStore = useUserStore().userInfo; + + defineProps({ dictData: { type: Object as PropType>, @@ -266,9 +268,8 @@ const formData = reactive({ project_manager: '', part_a_unit: '', annex: [], - "planned_end_dat": "", - create_user: '', - create_time: '' + create_user: userStore.account, + create_time: timeFormat('', 'yyyy-mm-dd hh:MM:ss'), }) diff --git a/src/views/supervision_project_acceptance_report/edit.vue b/src/views/supervision_project_acceptance_report/edit.vue index b415653..34c7ce5 100644 --- a/src/views/supervision_project_acceptance_report/edit.vue +++ b/src/views/supervision_project_acceptance_report/edit.vue @@ -13,6 +13,8 @@ + + @@ -57,6 +59,8 @@ const formData = reactive({ project_name: "", title: '', content: '', + create_user: "", + create_time: "", annex: [], }) const customEvent = (e) => { diff --git a/src/views/supervision_project_case_review/edit.vue b/src/views/supervision_project_case_review/edit.vue index 538e66d..f3f0f2d 100644 --- a/src/views/supervision_project_case_review/edit.vue +++ b/src/views/supervision_project_case_review/edit.vue @@ -22,6 +22,7 @@ + @@ -69,7 +70,8 @@ const formData = reactive({ review_content: '', remark: '', annex: [], - create_user: '', + create_user: "", + create_time: "", }) const handleAvatarSuccess_four = (response: any) => { Array.isArray(formData.annex) ? '' : formData.annex = [] diff --git a/src/views/supervision_project_milestones/edit.vue b/src/views/supervision_project_milestones/edit.vue index e35454d..0954ab9 100644 --- a/src/views/supervision_project_milestones/edit.vue +++ b/src/views/supervision_project_milestones/edit.vue @@ -16,6 +16,8 @@ + + @@ -62,7 +64,8 @@ const formData = reactive({ content: '', remark: '', annex: [], - create_user: '', + create_user: "", + create_time: "", }) const handleAvatarSuccess_four = (response: any) => { Array.isArray(formData.annex) ? '' : formData.annex = [] diff --git a/src/views/supervision_project_monthly_report/edit.vue b/src/views/supervision_project_monthly_report/edit.vue index 942e109..7197f6a 100644 --- a/src/views/supervision_project_monthly_report/edit.vue +++ b/src/views/supervision_project_monthly_report/edit.vue @@ -112,6 +112,8 @@ + + { diff --git a/src/views/supervision_project_owner_evaluation/edit.vue b/src/views/supervision_project_owner_evaluation/edit.vue index caf2d5f..16bb2c2 100644 --- a/src/views/supervision_project_owner_evaluation/edit.vue +++ b/src/views/supervision_project_owner_evaluation/edit.vue @@ -13,6 +13,8 @@ + + @@ -59,7 +61,8 @@ const formData = reactive({ title: '', content: '', annex: [], - create_user: '', + create_user: "", + create_time: "", }) const handleAvatarSuccess_four = (response: any) => { Array.isArray(formData.annex) ? '' : formData.annex = [] diff --git a/src/views/supervision_rules/edit.vue b/src/views/supervision_rules/edit.vue index 0f93c1e..b42fc45 100644 --- a/src/views/supervision_rules/edit.vue +++ b/src/views/supervision_rules/edit.vue @@ -17,9 +17,7 @@ - - - + @@ -35,8 +33,6 @@ import Popup from '@/components/popup/index.vue' import { apiSupervisionRulesAdd, apiSupervisionRulesEdit } from '@/api/supervision_rules' import { supervision_project } from "@/components/dialogTable/dialogTableConfig" import type { PropType } from 'vue' -import useUserStore from "@/stores/modules/user"; -const userStore = useUserStore().userInfo; defineProps({ dictData: { @@ -64,7 +60,8 @@ const formData = reactive({ doc_name: '', doc_desc: '', annex: [], - create_user_name: userStore.account, + create_user: "", + create_time: "", }) const customEvent = (e) => { formData.project_id = e.id diff --git a/src/views/supervision_rules/index.vue b/src/views/supervision_rules/index.vue index 63a1176..4196491 100644 --- a/src/views/supervision_rules/index.vue +++ b/src/views/supervision_rules/index.vue @@ -40,15 +40,15 @@ - + - + 编辑 - + 删除 @@ -123,4 +123,3 @@ const handleDelete = async (id: number | any[]) => { getLists() - diff --git a/src/views/supervision_rules_disclosure/edit.vue b/src/views/supervision_rules_disclosure/edit.vue index 19dcc18..f424eb1 100644 --- a/src/views/supervision_rules_disclosure/edit.vue +++ b/src/views/supervision_rules_disclosure/edit.vue @@ -17,9 +17,7 @@ - - - + @@ -34,8 +32,7 @@ import Popup from '@/components/popup/index.vue' import { apiSupervisionRulesDisclosureAdd, apiSupervisionRulesDisclosureEdit, } from '@/api/supervision_rules_disclosure' import { supervision_project } from "@/components/dialogTable/dialogTableConfig" import type { PropType } from 'vue' -import useUserStore from "@/stores/modules/user"; -const userStore = useUserStore().userInfo; + defineProps({ dictData: { @@ -63,7 +60,8 @@ const formData = reactive({ doc_name: '', doc_desc: '', annex: [], - create_user_name: userStore.account, + create_user: "", + create_time: "", }) const customEvent = (e) => { formData.project_id = e.id @@ -120,12 +118,7 @@ const setFormData = async (data: Record) => { } -const getDetail = async (row: Record) => { - const data = await apiSupervisionFirstMeetingDetail({ - id: row.id - }) - setFormData(data) -} + // 提交按钮 @@ -155,6 +148,5 @@ const handleClose = () => { defineExpose({ open, setFormData, - getDetail }) diff --git a/src/views/supervision_rules_disclosure/index.vue b/src/views/supervision_rules_disclosure/index.vue index a957405..0eea89c 100644 --- a/src/views/supervision_rules_disclosure/index.vue +++ b/src/views/supervision_rules_disclosure/index.vue @@ -42,7 +42,7 @@ - + { getLists() - diff --git a/src/views/supervision_safety_management_personnel/edit.vue b/src/views/supervision_safety_management_personnel/edit.vue index 986d156..47d59f6 100644 --- a/src/views/supervision_safety_management_personnel/edit.vue +++ b/src/views/supervision_safety_management_personnel/edit.vue @@ -22,12 +22,7 @@ - - - - - - + @@ -156,8 +151,6 @@ import Popup from '@/components/popup/index.vue' import { apiSupervisionSafetyManagementPersonnelAdd, apiSupervisionSafetyManagementPersonnelEdit, } from '@/api/supervision_safety_management_personnel' import { supervision_participating_units_qualifications } from "@/components/dialogTable/dialogTableConfig" import type { PropType } from 'vue' -import useUserStore from "@/stores/modules/user"; -const userStore = useUserStore().userInfo; defineProps({ @@ -213,7 +206,8 @@ const formData = reactive({ qualification_two_status: '', remark: '', annex: [], - create_user_name: userStore.account, + create_user: "", + create_time: "", }) diff --git a/src/views/supervision_safety_management_personnel/index.vue b/src/views/supervision_safety_management_personnel/index.vue index 0439d85..27bf21f 100644 --- a/src/views/supervision_safety_management_personnel/index.vue +++ b/src/views/supervision_safety_management_personnel/index.vue @@ -52,7 +52,7 @@ - + + + @@ -311,7 +313,8 @@ const formData = reactive({ side_station_user: '', check_item_detail_ids: [], annex: [], - create_user: '', + create_user: "", + create_time: "", project_name: '', inspection_code: '', is_important: "", diff --git a/src/views/supervision_special_operation_personnel/edit.vue b/src/views/supervision_special_operation_personnel/edit.vue index 8b11056..c7a5f38 100644 --- a/src/views/supervision_special_operation_personnel/edit.vue +++ b/src/views/supervision_special_operation_personnel/edit.vue @@ -44,9 +44,7 @@ - - - + @@ -95,7 +93,8 @@ const formData = reactive({ status: '', remark: '', annex: '', - create_user_name: '', + create_user: "", + create_time: "", }) const handleAvatarSuccess_four = (response: any) => { if (!Array.isArray(formData.annex)) formData.annex = [] diff --git a/src/views/supervision_special_operation_personnel/index.vue b/src/views/supervision_special_operation_personnel/index.vue index 9b254d3..383d86d 100644 --- a/src/views/supervision_special_operation_personnel/index.vue +++ b/src/views/supervision_special_operation_personnel/index.vue @@ -41,7 +41,7 @@ - + { getLists() - diff --git a/src/views/supervision_test_blocks_specimens/edit.vue b/src/views/supervision_test_blocks_specimens/edit.vue index 4ece1ad..8303a6d 100644 --- a/src/views/supervision_test_blocks_specimens/edit.vue +++ b/src/views/supervision_test_blocks_specimens/edit.vue @@ -63,6 +63,7 @@ + + + @@ -161,7 +163,9 @@ const formData = reactive({ witness: '', sampler: '', annex: '', - create_user: '', + create_user: "", + create_time: "", + // 我说 sampling_detail: [ { "name": "", diff --git a/src/views/supplier/index.vue b/src/views/supplier/index.vue index bf52382..3661a93 100644 --- a/src/views/supplier/index.vue +++ b/src/views/supplier/index.vue @@ -5,7 +5,7 @@ - + @@ -16,17 +16,20 @@ - + - + - + @@ -42,7 +45,8 @@ 新增 - + 删除 @@ -50,7 +54,7 @@ - + @@ -65,10 +69,12 @@ - + 编辑 - + 删除 @@ -161,4 +167,3 @@ const handledetail = async (data: any) => { } getLists() -