From 6a19cfd8851df8cf33fb37182fd712c8006f282c Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Mon, 1 Apr 2024 11:12:57 +0800 Subject: [PATCH] add --- src/components/detailPage/index.vue | 1 - src/views/cost_approved_projects/edit.vue | 35 +++- src/views/financial_budget_doc/edit.vue | 2 +- .../financial_expense_reimbursement/edit.vue | 2 +- src/views/financial_invoice/edit.vue | 2 +- src/views/financial_refund/edit.vue | 2 +- src/views/financial_settlement/edit.vue | 2 +- src/views/financial_using_funds/edit.vue | 2 +- src/views/quality_accident/detail.js | 67 +++++++ src/views/quality_accident/detail.vue | 168 ------------------ src/views/quality_accident/edit.vue | 62 +------ src/views/quality_accident/index.vue | 37 ++-- src/views/quality_check/detail.js | 57 ++++++ src/views/quality_check/detail.vue | 165 ----------------- src/views/quality_check/edit.vue | 29 +-- src/views/quality_check/index.vue | 23 +-- src/views/quality_event/detail.js | 47 +++++ src/views/quality_event/detail.vue | 168 ------------------ src/views/quality_event/edit.vue | 82 +-------- src/views/quality_event/index.vue | 42 ++--- src/views/quality_mbo/detail.js | 45 +++++ src/views/quality_mbo/detail.vue | 168 ------------------ src/views/quality_mbo/edit.vue | 70 +------- src/views/quality_mbo/index.vue | 41 ++--- src/views/quality_modify/detail.js | 65 +++++++ src/views/quality_modify/detail.vue | 168 ------------------ src/views/quality_modify/edit.vue | 29 +-- src/views/quality_modify/index.vue | 28 ++- src/views/quality_specification/detail.js | 38 ++++ src/views/quality_specification/detail.vue | 168 ------------------ src/views/quality_specification/edit.vue | 77 +------- src/views/quality_specification/index.vue | 43 ++--- src/views/safety_evaluate/edit.vue | 38 ---- src/views/safety_hazard/detail.vue | 5 +- src/views/safety_hazard/edit.vue | 65 +------ src/views/safety_hazard/index.vue | 2 +- src/views/safety_product_month/detail.vue | 3 +- src/views/safety_product_month/edit.vue | 69 +------ src/views/safety_product_month/index.vue | 2 +- 39 files changed, 461 insertions(+), 1658 deletions(-) create mode 100644 src/views/quality_accident/detail.js delete mode 100644 src/views/quality_accident/detail.vue create mode 100644 src/views/quality_check/detail.js delete mode 100644 src/views/quality_check/detail.vue create mode 100644 src/views/quality_event/detail.js delete mode 100644 src/views/quality_event/detail.vue create mode 100644 src/views/quality_mbo/detail.js delete mode 100644 src/views/quality_mbo/detail.vue create mode 100644 src/views/quality_modify/detail.js delete mode 100644 src/views/quality_modify/detail.vue create mode 100644 src/views/quality_specification/detail.js delete mode 100644 src/views/quality_specification/detail.vue diff --git a/src/components/detailPage/index.vue b/src/components/detailPage/index.vue index b705cd0..f50f188 100644 --- a/src/components/detailPage/index.vue +++ b/src/components/detailPage/index.vue @@ -117,7 +117,6 @@ const open = () => { // 关闭回调 const handleClose = () => { emit('close') - console.log("gianni1") } diff --git a/src/views/cost_approved_projects/edit.vue b/src/views/cost_approved_projects/edit.vue index 6174b7d..7acbdfb 100644 --- a/src/views/cost_approved_projects/edit.vue +++ b/src/views/cost_approved_projects/edit.vue @@ -352,14 +352,19 @@ const formData = reactive({ "annex": [] }) -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 chekcDate = (rule: any, value: any, callback: any) => { + if (new Date(formData.end_date) < new Date(formData.start_date)) { + callback(new Error('合同计划结束日期不能早合同计划开始日期')) + } else { + callback() + } +} + + + // 表单验证 const formRules = reactive({ contract_name: [{ @@ -386,7 +391,21 @@ const formRules = reactive({ required: true, message: '请输入签订金额(元)', trigger: ['blur'] - }] + }], + start_date: [{ + required: true, + message: '请输入合同计划开始日期', + trigger: ['blur'] + }], + end_date: [{ + required: true, + message: '请输入合同计划结束日期', + trigger: ['blur'] + }, + { + validator: chekcDate, + trigger: ['blur'] + }], }) diff --git a/src/views/financial_budget_doc/edit.vue b/src/views/financial_budget_doc/edit.vue index 71e0a9a..7610cb6 100644 --- a/src/views/financial_budget_doc/edit.vue +++ b/src/views/financial_budget_doc/edit.vue @@ -103,7 +103,7 @@ - + diff --git a/src/views/financial_expense_reimbursement/edit.vue b/src/views/financial_expense_reimbursement/edit.vue index 269efc9..8663092 100644 --- a/src/views/financial_expense_reimbursement/edit.vue +++ b/src/views/financial_expense_reimbursement/edit.vue @@ -78,7 +78,7 @@ - + diff --git a/src/views/financial_invoice/edit.vue b/src/views/financial_invoice/edit.vue index 1aaeb6d..b09b60b 100644 --- a/src/views/financial_invoice/edit.vue +++ b/src/views/financial_invoice/edit.vue @@ -119,7 +119,7 @@ - + diff --git a/src/views/financial_refund/edit.vue b/src/views/financial_refund/edit.vue index 6d40dbe..32bfb41 100644 --- a/src/views/financial_refund/edit.vue +++ b/src/views/financial_refund/edit.vue @@ -46,7 +46,7 @@ - +
diff --git a/src/views/financial_settlement/edit.vue b/src/views/financial_settlement/edit.vue index dbb4a88..8a430db 100644 --- a/src/views/financial_settlement/edit.vue +++ b/src/views/financial_settlement/edit.vue @@ -40,7 +40,7 @@ - + diff --git a/src/views/financial_using_funds/edit.vue b/src/views/financial_using_funds/edit.vue index f1ecc9e..7f03d98 100644 --- a/src/views/financial_using_funds/edit.vue +++ b/src/views/financial_using_funds/edit.vue @@ -123,7 +123,7 @@ - + diff --git a/src/views/quality_accident/detail.js b/src/views/quality_accident/detail.js new file mode 100644 index 0000000..b62fc85 --- /dev/null +++ b/src/views/quality_accident/detail.js @@ -0,0 +1,67 @@ +const detailConfig = { + title: "质量事件表", + config: [ + { + label: "组织名称", + value: "org_name" + }, + { + label: "部门名称", + value: "dept_name" + }, + { + label: "项目名称", + value: "project_name" + }, + { + label: "项目编码", + value: "project_code" + }, + { + label: "事故类型", + value: "type" + }, + { + label: "发生日期", + value: "happen_date" + }, + { + label: "设备事故", + value: "device_accident" + }, + { + label: "承包商人员", + value: "contractor_user" + }, + { + label: "非本企业人员", + value: "not_our_company_user" + }, + { + label: "本企业人员", + value: "our_company_user" + }, + { + label: "内容", + value: "content" + }, + { + label: "承包商人员", + value: "contractor_user" + }, + { + label: "备注", + value: "remark", + column: 1 + + }, + { + label: "附件", + value: "file", + column: 1 + }, + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/quality_accident/detail.vue b/src/views/quality_accident/detail.vue deleted file mode 100644 index 38dc9ae..0000000 --- a/src/views/quality_accident/detail.vue +++ /dev/null @@ -1,168 +0,0 @@ - - - - - diff --git a/src/views/quality_accident/edit.vue b/src/views/quality_accident/edit.vue index dfaa460..9e6796b 100644 --- a/src/views/quality_accident/edit.vue +++ b/src/views/quality_accident/edit.vue @@ -1,8 +1,7 @@ @@ -101,12 +90,13 @@ import { getAllProjectTypes } from '@/api/projecttype' const protype = reactive([]) import feedback from '@/utils/feedback' import EditPopup from './edit.vue' -import DetailPopup from './detail.vue' -const detailRef = shallowRef>() +import detailConfig from './detail' + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) -const showDtail = ref(false) +const showDetail = ref(false) // 查询条件 const queryParams = reactive({ @@ -157,9 +147,10 @@ const handleDelete = async (id: number | any[]) => { await qualityaccidentDelete({ id }) getLists() } -const handledetail = async (data: any) => { - let res = await qualityaccidentDetail({ id: data.id }) - showDtail.value = true +// 详情 +const handleDetail = async (id: any) => { + let res = await qualityaccidentDetail({ id }) + showDetail.value = true await nextTick() detailRef.value?.open() detailRef.value?.setFormData(res) diff --git a/src/views/quality_check/detail.js b/src/views/quality_check/detail.js new file mode 100644 index 0000000..e81f26c --- /dev/null +++ b/src/views/quality_check/detail.js @@ -0,0 +1,57 @@ +const detailConfig = { + title: "质量检查表", + config: [ + { + label: "组织名称", + value: "org_name" + }, + { + label: "部门名称", + value: "dept_name" + }, + { + label: "项目名称", + value: "project_name" + }, + { + label: "项目编码", + value: "project_code" + }, + { + label: "检查性质", + value: "check_nature" + }, + { + label: "整改期限", + value: "modify_term" + }, + { + label: "检查人", + value: "check_user" + }, + { + label: "检查单位", + value: "check_unit" + }, + { + label: "责任人", + value: "resp_user" + }, + { + label: "检查项", + value: "check_item" + }, + { + label: "质量隐患", + value: "quality_hazards" + }, + + { + label: "检查结果", + value: "check_result" + }, + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/quality_check/detail.vue b/src/views/quality_check/detail.vue deleted file mode 100644 index 8f5b52d..0000000 --- a/src/views/quality_check/detail.vue +++ /dev/null @@ -1,165 +0,0 @@ - - - - - diff --git a/src/views/quality_check/edit.vue b/src/views/quality_check/edit.vue index d433bff..eb5dc09 100644 --- a/src/views/quality_check/edit.vue +++ b/src/views/quality_check/edit.vue @@ -119,17 +119,10 @@ import porjectDialog from '@/components/project/index.vue' import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { qualitycheckAdd, qualitycheckEdit, qualitycheckDetail } from '@/api/quality_check' -import { toChinesNum } from "@/utils/util"; -import { getAllProjectTypes } from '@/api/projecttype' -import { timeFormat } from '@/utils/util' -import { isEmail, isIdCard, isPhone } from '@/utils/validate' import type { PropType } from 'vue' -import configs from "@/config" import useUserStore from "@/stores/modules/user"; -const protype = reactive([]) -const base_url = configs.baseUrl + configs.urlPrefix + const userStore = useUserStore(); -const active = ref(0) const formDataannex = reactive([]) const list1 = reactive([]) const list2 = reactive([]) @@ -138,27 +131,7 @@ const project_name = ref('') const project_code = ref('') import { deptAll } from '@/api/org/department' import { getAll } from '@/api/org/organization' -const userInfo = userStore.userInfo -// 上传文件 -const handleAvatarSuccess_four = ( - response, - uploadFile -) => { - if (response.code == 0) { - ElMessage.error(response.msg); - return; - } - formDataannex.push( - { uri: response.data.uri, name: response.data.name } - - ); -}; - -// 删除上传的文件 -const delFileFn = (index: number) => { - formDataannex.splice(index, 1) -} defineProps({ dictData: { type: Object as PropType>, diff --git a/src/views/quality_check/index.vue b/src/views/quality_check/index.vue index d3ea5ec..d51bb2a 100644 --- a/src/views/quality_check/index.vue +++ b/src/views/quality_check/index.vue @@ -51,7 +51,7 @@ - + @@ -75,7 +75,8 @@
- + @@ -88,12 +89,13 @@ import { getAllProjectTypes } from '@/api/projecttype' const protype = reactive([]) import feedback from '@/utils/feedback' import EditPopup from './edit.vue' -import DetailPopup from './detail.vue' -const detailRef = shallowRef>() +import detailConfig from './detail' + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) -const showDtail = ref(false) +const showDetail = ref(false) // 查询条件 const queryParams = reactive({ @@ -146,9 +148,10 @@ const handleDelete = async (id: number | any[]) => { await qualitycheckDelete({ id }) getLists() } -const handledetail = async (data: any) => { - let res = await qualitycheckDetail({ id: data.id }) - showDtail.value = true +// 详情 +const handleDetail = async (id: any) => { + let res = await qualitycheckDetail({ id }) + showDetail.value = true await nextTick() detailRef.value?.open() detailRef.value?.setFormData(res) diff --git a/src/views/quality_event/detail.js b/src/views/quality_event/detail.js new file mode 100644 index 0000000..9181d1f --- /dev/null +++ b/src/views/quality_event/detail.js @@ -0,0 +1,47 @@ +const detailConfig = { + title: "质量事件表", + config: [ + { + label: "组织名称", + value: "org_name" + }, + { + label: "部门名称", + value: "dept_name" + }, + { + label: "项目名称", + value: "project_name" + }, + { + label: "事件名称", + value: "name" + }, + { + label: "事件类型", + value: "type" + }, + { + label: "发生时间", + value: "happen_date" + }, + { + label: "内容", + value: "content" + }, + { + label: "备注", + value: "remark", + column: 1 + + }, + { + label: "附件", + value: "file", + column: 1 + }, + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/quality_event/detail.vue b/src/views/quality_event/detail.vue deleted file mode 100644 index 38dc9ae..0000000 --- a/src/views/quality_event/detail.vue +++ /dev/null @@ -1,168 +0,0 @@ - - - - - diff --git a/src/views/quality_event/edit.vue b/src/views/quality_event/edit.vue index 46936a8..a50e191 100644 --- a/src/views/quality_event/edit.vue +++ b/src/views/quality_event/edit.vue @@ -1,8 +1,7 @@ @@ -90,17 +77,16 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { qualityeventLists, qualityeventDelete, qualityeventDetail } from '@/api/quality_event' -import { timeFormat } from '@/utils/util' -import { getAllProjectTypes } from '@/api/projecttype' -const protype = reactive([]) + import feedback from '@/utils/feedback' import EditPopup from './edit.vue' -import DetailPopup from './detail.vue' -const detailRef = shallowRef>() +import detailConfig from './detail' + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) -const showDtail = ref(false) +const showDetail = ref(false) // 查询条件 const queryParams = reactive({ @@ -151,14 +137,14 @@ const handleDelete = async (id: number | any[]) => { await qualityeventDelete({ id }) getLists() } -const handledetail = async (data: any) => { - let res = await qualityeventDetail({ id: data.id }) - showDtail.value = true +// 详情 +const handleDetail = async (id: any) => { + let res = await qualityeventDetail({ id }) + showDetail.value = true await nextTick() detailRef.value?.open() detailRef.value?.setFormData(res) } - getLists() diff --git a/src/views/quality_mbo/detail.js b/src/views/quality_mbo/detail.js new file mode 100644 index 0000000..bcb6bdf --- /dev/null +++ b/src/views/quality_mbo/detail.js @@ -0,0 +1,45 @@ +const detailConfig = { + title: "质量目标表", + config: [ + { + label: "组织名称", + value: "org_name" + }, + { + label: "部门名称", + value: "dept_name" + }, + { + label: "项目名称", + value: "project_name" + }, + { + label: "目标", + value: "target" + }, + { + label: "基本要求", + value: "basic_requirements" + }, + { + label: "目标规范", + value: "target_specification" + }, + { + label: "合格率", + value: "pass_rate" + }, + { + label: "允许偏差", + value: "allowable_deviation" + }, + { + label: "附件", + value: "file", + column: 1 + }, + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/quality_mbo/detail.vue b/src/views/quality_mbo/detail.vue deleted file mode 100644 index 38dc9ae..0000000 --- a/src/views/quality_mbo/detail.vue +++ /dev/null @@ -1,168 +0,0 @@ - - - - - diff --git a/src/views/quality_mbo/edit.vue b/src/views/quality_mbo/edit.vue index 7271e59..b896c76 100644 --- a/src/views/quality_mbo/edit.vue +++ b/src/views/quality_mbo/edit.vue @@ -1,8 +1,7 @@ @@ -81,17 +68,17 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { qualitymboLists, qualitymboDelete, qualitymboDetail } from '@/api/quality_mbo' -import { timeFormat } from '@/utils/util' -import { getAllProjectTypes } from '@/api/projecttype' + const protype = reactive([]) import feedback from '@/utils/feedback' import EditPopup from './edit.vue' -import DetailPopup from './detail.vue' -const detailRef = shallowRef>() +import detailConfig from './detail' + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) -const showDtail = ref(false) +const showDetail = ref(false) // 查询条件 const queryParams = reactive({ @@ -139,14 +126,14 @@ const handleDelete = async (id: number | any[]) => { await qualitymboDelete({ id }) getLists() } -const handledetail = async (data: any) => { - let res = await qualitymboDetail({ id: data.id }) - showDtail.value = true +// 详情 +const handleDetail = async (id: any) => { + let res = await qualitymboDetail({ id }) + showDetail.value = true await nextTick() detailRef.value?.open() detailRef.value?.setFormData(res) } - getLists() diff --git a/src/views/quality_modify/detail.js b/src/views/quality_modify/detail.js new file mode 100644 index 0000000..110d531 --- /dev/null +++ b/src/views/quality_modify/detail.js @@ -0,0 +1,65 @@ +const detailConfig = { + title: "质量整改表", + config: [ + { + label: "组织名称", + value: "org_name" + }, + { + label: "部门名称", + value: "dept_name" + }, + { + label: "项目名称", + value: "project_name" + }, + { + label: "项目编码", + value: "project_code" + }, + { + label: "检查性质", + value: "check_nature" + }, + { + label: "整改期限", + value: "modify_term" + }, + { + label: "检查人", + value: "check_user" + }, + { + label: "检查单位", + value: "check_unit" + }, + { + label: "整改单位", + value: "modify_unit" + }, + { + label: "责任人", + value: "resp_user" + }, + { + label: "抄送人", + value: "copy_user" + }, + { + label: "检查项", + value: "check_item" + }, + { + label: "质量隐患", + value: "quality_hazards" + }, + { + label: "检查结果", + value: "check_result" + }, + + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/quality_modify/detail.vue b/src/views/quality_modify/detail.vue deleted file mode 100644 index 38dc9ae..0000000 --- a/src/views/quality_modify/detail.vue +++ /dev/null @@ -1,168 +0,0 @@ - - - - - diff --git a/src/views/quality_modify/edit.vue b/src/views/quality_modify/edit.vue index af5baf8..681915f 100644 --- a/src/views/quality_modify/edit.vue +++ b/src/views/quality_modify/edit.vue @@ -123,18 +123,11 @@ import porjectDialog from '@/components/project/index.vue' import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { qualitymodifyAdd, qualitymodifyEdit, qualitymodifyDetail } from '@/api/quality_modify' -import { toChinesNum } from "@/utils/util"; -import { getAllProjectTypes } from '@/api/projecttype' -import { timeFormat } from '@/utils/util' -import { isEmail, isIdCard, isPhone } from '@/utils/validate' import type { PropType } from 'vue' import configs from "@/config" import useUserStore from "@/stores/modules/user"; -const protype = reactive([]) -const base_url = configs.baseUrl + configs.urlPrefix + const userStore = useUserStore(); -const active = ref(0) -const formDataannex = reactive([]) const list1 = reactive([]) const list2 = reactive([]) const showDialog = ref(false) @@ -142,27 +135,7 @@ const project_name = ref('') const project_code = ref('') import { deptAll } from '@/api/org/department' import { getAll } from '@/api/org/organization' -const userInfo = userStore.userInfo -// 上传文件 -const handleAvatarSuccess_four = ( - response, - uploadFile -) => { - if (response.code == 0) { - ElMessage.error(response.msg); - return; - } - formDataannex.push( - { uri: response.data.uri, name: response.data.name } - - ); -}; - -// 删除上传的文件 -const delFileFn = (index: number) => { - formDataannex.splice(index, 1) -} defineProps({ dictData: { type: Object as PropType>, diff --git a/src/views/quality_modify/index.vue b/src/views/quality_modify/index.vue index 47dc4e8..2224e22 100644 --- a/src/views/quality_modify/index.vue +++ b/src/views/quality_modify/index.vue @@ -55,7 +55,7 @@ - + @@ -79,7 +79,8 @@ - + @@ -87,18 +88,15 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { qualitymodifyLists, qualitymodifyDelete, qualitymodifyDetail } from '@/api/quality_modify' -import { timeFormat } from '@/utils/util' -import { getAllProjectTypes } from '@/api/projecttype' -const protype = reactive([]) import feedback from '@/utils/feedback' import EditPopup from './edit.vue' -import DetailPopup from './detail.vue' -const detailRef = shallowRef>() +import detailConfig from './detail' + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) -const showDtail = ref(false) - +const showDetail = ref(false) // 查询条件 const queryParams = reactive({ check_nature: '', @@ -150,14 +148,14 @@ const handleDelete = async (id: number | any[]) => { await qualitymodifyDelete({ id }) getLists() } -const handledetail = async (data: any) => { - let res = await qualitymodifyDetail({ id: data.id }) - showDtail.value = true +// 详情 +const handleDetail = async (id: any) => { + let res = await qualitymodifyDetail({ id }) + showDetail.value = true await nextTick() detailRef.value?.open() detailRef.value?.setFormData(res) } - getLists() diff --git a/src/views/quality_specification/detail.js b/src/views/quality_specification/detail.js new file mode 100644 index 0000000..ebb74d8 --- /dev/null +++ b/src/views/quality_specification/detail.js @@ -0,0 +1,38 @@ +const detailConfig = { + title: "质量规范表", + config: [ + { + label: "组织名称", + value: "org_name" + }, + { + label: "部门名称", + value: "dept_name" + }, + { + label: "规范名称", + value: "name" + }, + { + label: "规范类别", + value: "type" + }, + { + label: "发布时间", + value: "release_date" + }, + { + label: "内容", + value: "content" + }, + { + label: "附件", + value: "file", + column: 1 + }, + + ], + + +} +export default detailConfig; \ No newline at end of file diff --git a/src/views/quality_specification/detail.vue b/src/views/quality_specification/detail.vue deleted file mode 100644 index 38dc9ae..0000000 --- a/src/views/quality_specification/detail.vue +++ /dev/null @@ -1,168 +0,0 @@ - - - - - diff --git a/src/views/quality_specification/edit.vue b/src/views/quality_specification/edit.vue index 08d1a71..e083773 100644 --- a/src/views/quality_specification/edit.vue +++ b/src/views/quality_specification/edit.vue @@ -1,8 +1,7 @@ @@ -87,17 +75,16 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { qualityspecificationLists, qualityspecificationDelete, qualityspecificationDetail } from '@/api/quality_specification' -import { timeFormat } from '@/utils/util' -import { getAllProjectTypes } from '@/api/projecttype' -const protype = reactive([]) import feedback from '@/utils/feedback' import EditPopup from './edit.vue' -import DetailPopup from './detail.vue' -const detailRef = shallowRef>() +import detailConfig from './detail' + const editRef = shallowRef>() +const detailRef = ref('') // 是否显示编辑框 const showEdit = ref(false) -const showDtail = ref(false) +const showDetail = ref(false) + // 查询条件 const queryParams = reactive({ @@ -148,14 +135,14 @@ const handleDelete = async (id: number | any[]) => { await qualityspecificationDelete({ id }) getLists() } -const handledetail = async (data: any) => { - let res = await qualityspecificationDetail({ id: data.id }) - showDtail.value = true +// 详情 +const handleDetail = async (id: any) => { + let res = await qualityspecificationDetail({ id }) + showDetail.value = true await nextTick() detailRef.value?.open() detailRef.value?.setFormData(res) } - getLists() diff --git a/src/views/safety_evaluate/edit.vue b/src/views/safety_evaluate/edit.vue index 469c311..b28ecc0 100644 --- a/src/views/safety_evaluate/edit.vue +++ b/src/views/safety_evaluate/edit.vue @@ -74,18 +74,7 @@ import porjectDialog from '@/components/project/index.vue' import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { safetyevaluateAdd, safetyevaluateEdit, safetyevaluateDetail } from '@/api/safety_evaluate' -import { toChinesNum } from "@/utils/util"; -import { getAllProjectTypes } from '@/api/projecttype' -import { timeFormat } from '@/utils/util' -import { isEmail, isIdCard, isPhone } from '@/utils/validate' import type { PropType } from 'vue' -import configs from "@/config" -import useUserStore from "@/stores/modules/user"; -const protype = reactive([]) -const base_url = configs.baseUrl + configs.urlPrefix -const userStore = useUserStore(); -const active = ref(0) -const formDataannex = reactive([]) const list1 = reactive([]) const list2 = reactive([]) const showDialog = ref(false) @@ -93,27 +82,7 @@ const project_name = ref('') const project_code = ref('') import { deptAll } from '@/api/org/department' import { getAll } from '@/api/org/organization' -const userInfo = userStore.userInfo -// 上传文件 -const handleAvatarSuccess_four = ( - response, - uploadFile -) => { - if (response.code == 0) { - ElMessage.error(response.msg); - return; - } - formDataannex.push( - { uri: response.data.uri, name: response.data.name } - - ); -}; - -// 删除上传的文件 -const delFileFn = (index: number) => { - formDataannex.splice(index, 1) -} defineProps({ dictData: { type: Object as PropType>, @@ -180,13 +149,6 @@ const formRules = reactive({ // 获取详情 const setFormData = async (data: Record) => { - - for (const key in formData) { - if (data[key] != null && data[key] != undefined) { - //@ts-ignore - formData[key] = data[key] - } - } project_name.value = data.project_name project_code.value = data.project_code getlist1(formData.org_id) diff --git a/src/views/safety_hazard/detail.vue b/src/views/safety_hazard/detail.vue index 4254c1a..7315cfd 100644 --- a/src/views/safety_hazard/detail.vue +++ b/src/views/safety_hazard/detail.vue @@ -51,12 +51,13 @@ {{ formData.emergency_measure }} + + {{ formData.remark }} - 文件{{ index + 1 }} + diff --git a/src/views/safety_hazard/edit.vue b/src/views/safety_hazard/edit.vue index 187d55a..d4aa916 100644 --- a/src/views/safety_hazard/edit.vue +++ b/src/views/safety_hazard/edit.vue @@ -113,24 +113,7 @@ - - -
-
- {{ item.name }} - x -
-
- + @@ -152,17 +135,10 @@ import porjectDialog from '@/components/project/index.vue' import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { safetyhazardAdd, safetyhazardEdit, safetyhazardDetail } from '@/api/safety_hazard' -import { toChinesNum } from "@/utils/util"; -import { getAllProjectTypes } from '@/api/projecttype' -import { timeFormat } from '@/utils/util' -import { isEmail, isIdCard, isPhone } from '@/utils/validate' import type { PropType } from 'vue' -import configs from "@/config" import useUserStore from "@/stores/modules/user"; -const protype = reactive([]) -const base_url = configs.baseUrl + configs.urlPrefix + const userStore = useUserStore(); -const active = ref(0) const formDataannex = reactive([]) const list1 = reactive([]) const list2 = reactive([]) @@ -171,27 +147,7 @@ const project_name = ref('') const project_code = ref('') import { deptAll } from '@/api/org/department' import { getAll } from '@/api/org/organization' -const userInfo = userStore.userInfo -// 上传文件 -const handleAvatarSuccess_four = ( - response, - uploadFile -) => { - if (response.code == 0) { - ElMessage.error(response.msg); - return; - } - formDataannex.push( - { uri: response.data.uri, name: response.data.name } - - ); -}; - -// 删除上传的文件 -const delFileFn = (index: number) => { - formDataannex.splice(index, 1) -} defineProps({ dictData: { type: Object as PropType>, @@ -249,12 +205,9 @@ const formData = reactive({ control_level: '', risk_level: '', accident: '', - source: '', - build_company_user: '', supervision_company_user: '', - construction_company_user: '', fill_company: '', project_id: '', @@ -272,19 +225,6 @@ const formRules = reactive({ // 获取详情 const setFormData = async (data: Record) => { - if (data.file && data.file.length > 0) { - - const arry1 = data.file.map((item: any, index: any) => { - return { - name: `文件${index + 1}`, - uri: item - }; - }); - Object.assign(formDataannex, arry1) - - - } - for (const key in formData) { if (data[key] != null && data[key] != undefined) { @@ -307,7 +247,6 @@ const getDetail = async (row: Record) => { // 提交按钮 const handleSubmit = async () => { - formData.file = formDataannex.map((item) => item.uri) await formRef.value?.validate() const data = { ...formData } mode.value == 'edit' diff --git a/src/views/safety_hazard/index.vue b/src/views/safety_hazard/index.vue index 812e676..98bbce4 100644 --- a/src/views/safety_hazard/index.vue +++ b/src/views/safety_hazard/index.vue @@ -65,7 +65,7 @@ - +