From 5470804aad80b2a7f8bb49358a8c136cd1ff1dd8 Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Fri, 22 Dec 2023 10:58:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E6=9F=A5=E7=9C=8B=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E6=96=BD=E5=B7=A5=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/build/build_division.ts | 27 ++ src/api/build/build_process_settings.ts | 27 ++ src/api/procurement_changes.ts | 2 +- src/components/build_division/index.vue | 60 ++++ src/views/build/build_division/detail.vue | 119 ++++++ src/views/build/build_division/edit.vue | 156 ++++++++ src/views/build/build_division/index.vue | 162 +++++++++ src/views/build/build_plan/detail.vue | 123 +++++++ src/views/build/build_plan/edit.vue | 338 ++++++++++++++++++ src/views/build/build_plan/index.vue | 180 ++++++++++ .../build/build_process_settings/detail.vue | 119 ++++++ .../build/build_process_settings/edit.vue | 241 +++++++++++++ .../build/build_process_settings/index.vue | 161 +++++++++ src/views/build/build_report/detail.vue | 123 +++++++ src/views/build/build_report/edit.vue | 338 ++++++++++++++++++ src/views/build/build_report/index.vue | 180 ++++++++++ src/views/business/cilentNeed.vue | 24 +- src/views/contract/detail.vue | 28 +- src/views/contract/edit.vue | 62 +++- src/views/contract/index.vue | 2 +- .../Management/budgetadjustment.vue | 2 - src/views/procurement_contract/detail.vue | 35 +- .../project_manager_appointment/edit.vue | 2 +- src/views/project_member/detail.vue | 2 +- src/views/project_member/edit.vue | 2 +- src/views/project_plan/edit.vue | 2 +- src/views/project_stakeholder/detail.vue | 2 +- src/views/project_stakeholder/edit.vue | 2 +- src/views/purchaseContracts/detail.vue | 112 +++--- src/views/purchaseContracts/edit.vue | 8 +- .../qualitycontrol/quality_accept/index.vue | 10 +- .../qualitycontrol/quality_accident/index.vue | 14 +- .../qualitycontrol/quality_event/index.vue | 14 +- .../qualitycontrol/quality_mbo/index.vue | 14 +- .../quality_supervise/index.vue | 14 +- src/views/safety/safety_accident/index.vue | 14 +- src/views/safety/safety_check/index.vue | 14 +- .../safety/safety_emergency_plan/index.vue | 14 +- src/views/safety/safety_evaluate/index.vue | 14 +- src/views/safety/safety_event/index.vue | 14 +- src/views/safety/safety_modify/index.vue | 14 +- .../safety/safety_product_month/index.vue | 14 +- src/views/safety/safety_rehearsal/index.vue | 14 +- src/views/safety/safety_standard/index.vue | 14 +- src/views/safety/safety_supervise/index.vue | 14 +- src/views/safety/safety_target/index.vue | 11 +- 46 files changed, 2752 insertions(+), 106 deletions(-) create mode 100644 src/api/build/build_division.ts create mode 100644 src/api/build/build_process_settings.ts create mode 100644 src/components/build_division/index.vue create mode 100644 src/views/build/build_division/detail.vue create mode 100644 src/views/build/build_division/edit.vue create mode 100644 src/views/build/build_division/index.vue create mode 100644 src/views/build/build_plan/detail.vue create mode 100644 src/views/build/build_plan/edit.vue create mode 100644 src/views/build/build_plan/index.vue create mode 100644 src/views/build/build_process_settings/detail.vue create mode 100644 src/views/build/build_process_settings/edit.vue create mode 100644 src/views/build/build_process_settings/index.vue create mode 100644 src/views/build/build_report/detail.vue create mode 100644 src/views/build/build_report/edit.vue create mode 100644 src/views/build/build_report/index.vue diff --git a/src/api/build/build_division.ts b/src/api/build/build_division.ts new file mode 100644 index 0000000..42e4c6c --- /dev/null +++ b/src/api/build/build_division.ts @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +// 分部分项划分表列表 +export function builddivisionLists(params: any) { + return request.get({ url: '/build.build_division/lists', params }) +} + +// 添加分部分项划分 +export function builddivisionAdd(params: any) { + return request.post({ url: '/build.build_division/add', params }) +} + +// 编辑分部分项划分 +export function builddivisionEdit(params: any) { + return request.post({ url: '/build.build_division/edit', params }) +} + +// 删除分部分项划分 +export function builddivisionDelete(params: any) { + return request.post({ url: '/build.build_division/delete', params }) +} + + +// 分部分项划分详情 +export function builddivisionDetail(params: any) { + return request.get({ url: '/build.build_division/detail', params }) +} \ No newline at end of file diff --git a/src/api/build/build_process_settings.ts b/src/api/build/build_process_settings.ts new file mode 100644 index 0000000..d2517e6 --- /dev/null +++ b/src/api/build/build_process_settings.ts @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +// 施工工序表列表 +export function buildprocesssettingsLists(params: any) { + return request.get({ url: '/build.build_process_settings/lists', params }) +} + +// 添加施工工序 +export function buildprocesssettingsAdd(params: any) { + return request.post({ url: '/build.build_process_settings/add', params }) +} + +// 编辑施工工序 +export function buildprocesssettingsEdit(params: any) { + return request.post({ url: '/build.build_process_settings/edit', params }) +} + +// 删除施工工序 +export function buildprocesssettingsDelete(params: any) { + return request.post({ url: '/build.build_process_settings/delete', params }) +} + + +// 施工工序详情 +export function buildprocesssettingsDetail(params: any) { + return request.get({ url: '/build.build_process_settings/detail', params }) +} \ No newline at end of file diff --git a/src/api/procurement_changes.ts b/src/api/procurement_changes.ts index 7cebf39..086d50d 100644 --- a/src/api/procurement_changes.ts +++ b/src/api/procurement_changes.ts @@ -2,7 +2,7 @@ import request from '@/utils/request' // 采购变更表列表 export function apiProcurementLists(params: any) { - return request.get({ url: '/contract.procurement_contract/lists', params }) + return request.get({ url: '/contract.procurement_contract_change/lists', params }) } // 添加采购变更 diff --git a/src/components/build_division/index.vue b/src/components/build_division/index.vue new file mode 100644 index 0000000..dec1e35 --- /dev/null +++ b/src/components/build_division/index.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/src/views/build/build_division/detail.vue b/src/views/build/build_division/detail.vue new file mode 100644 index 0000000..1d0a307 --- /dev/null +++ b/src/views/build/build_division/detail.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/build/build_division/edit.vue b/src/views/build/build_division/edit.vue new file mode 100644 index 0000000..6dad823 --- /dev/null +++ b/src/views/build/build_division/edit.vue @@ -0,0 +1,156 @@ + + + diff --git a/src/views/build/build_division/index.vue b/src/views/build/build_division/index.vue new file mode 100644 index 0000000..63ae4ab --- /dev/null +++ b/src/views/build/build_division/index.vue @@ -0,0 +1,162 @@ + + + + diff --git a/src/views/build/build_plan/detail.vue b/src/views/build/build_plan/detail.vue new file mode 100644 index 0000000..cb15d2f --- /dev/null +++ b/src/views/build/build_plan/detail.vue @@ -0,0 +1,123 @@ + + + + + diff --git a/src/views/build/build_plan/edit.vue b/src/views/build/build_plan/edit.vue new file mode 100644 index 0000000..e94c70a --- /dev/null +++ b/src/views/build/build_plan/edit.vue @@ -0,0 +1,338 @@ + + + diff --git a/src/views/build/build_plan/index.vue b/src/views/build/build_plan/index.vue new file mode 100644 index 0000000..5e94341 --- /dev/null +++ b/src/views/build/build_plan/index.vue @@ -0,0 +1,180 @@ + + + + diff --git a/src/views/build/build_process_settings/detail.vue b/src/views/build/build_process_settings/detail.vue new file mode 100644 index 0000000..1d0a307 --- /dev/null +++ b/src/views/build/build_process_settings/detail.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/build/build_process_settings/edit.vue b/src/views/build/build_process_settings/edit.vue new file mode 100644 index 0000000..1663a5e --- /dev/null +++ b/src/views/build/build_process_settings/edit.vue @@ -0,0 +1,241 @@ + + + diff --git a/src/views/build/build_process_settings/index.vue b/src/views/build/build_process_settings/index.vue new file mode 100644 index 0000000..af008a9 --- /dev/null +++ b/src/views/build/build_process_settings/index.vue @@ -0,0 +1,161 @@ + + + + diff --git a/src/views/build/build_report/detail.vue b/src/views/build/build_report/detail.vue new file mode 100644 index 0000000..cb15d2f --- /dev/null +++ b/src/views/build/build_report/detail.vue @@ -0,0 +1,123 @@ + + + + + diff --git a/src/views/build/build_report/edit.vue b/src/views/build/build_report/edit.vue new file mode 100644 index 0000000..e94c70a --- /dev/null +++ b/src/views/build/build_report/edit.vue @@ -0,0 +1,338 @@ + + + diff --git a/src/views/build/build_report/index.vue b/src/views/build/build_report/index.vue new file mode 100644 index 0000000..5e94341 --- /dev/null +++ b/src/views/build/build_report/index.vue @@ -0,0 +1,180 @@ + + + + diff --git a/src/views/business/cilentNeed.vue b/src/views/business/cilentNeed.vue index fbf0a94..5661eba 100644 --- a/src/views/business/cilentNeed.vue +++ b/src/views/business/cilentNeed.vue @@ -8,21 +8,17 @@ - + - + - + - + @@ -38,21 +34,17 @@ - {{ item.label }} + {{ item.label }} - + - + - + 点击上传 diff --git a/src/views/contract/detail.vue b/src/views/contract/detail.vue index 27301d1..3eabb5d 100644 --- a/src/views/contract/detail.vue +++ b/src/views/contract/detail.vue @@ -102,6 +102,17 @@ {{ formData.remark }} + + + +
+
+ {{ item.name }} + +
+
+ + @@ -125,7 +136,7 @@ defineProps({ const emit = defineEmits(['success', 'close']) const formRef = shallowRef() const popupRef = shallowRef>() - +const formDataannex = reactive([]) const datas = reactive({ provinceOptions: [], cityOptions: [], @@ -144,6 +155,21 @@ const formData = reactive({ const setFormData = async (data: Record) => { Object.assign(formData, data) + if (data.annex.length > 0) { + if (data.annex.includes(",")) { + const arry1 = data.annex.split(',').map((item: any, index: any) => { + return { + name: `文件${index + 1}`, + uri: item + }; + }); + Object.assign(formDataannex, arry1) + } else { + const arry1 = [{ name: `文件1`, uri: data.annex }] + Object.assign(formDataannex, arry1) + + } + } } diff --git a/src/views/contract/edit.vue b/src/views/contract/edit.vue index 4c15dc0..fe0fd1a 100644 --- a/src/views/contract/edit.vue +++ b/src/views/contract/edit.vue @@ -41,13 +41,13 @@ - + - + @@ -59,13 +59,13 @@ - + - + @@ -113,6 +113,7 @@ + @@ -123,7 +124,6 @@ - @@ -132,6 +132,8 @@ import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import biddocumentTable from "@/components/biddocument/index.vue" +import reviewprocess from '@/components/reviewprocess/index.vue' + import { apiContractAdd, apiContractEdit, apiContractDetail } from '@/api/contract' import { timeFormat } from '@/utils/util' import type { PropType } from 'vue' @@ -156,6 +158,31 @@ const document_name = ref('') const document_code = ref('') const bidding_code = ref('') const userStore = useUserStore(); +//验证 +const checkPhone = (rule: any, value: any, callback: (arg0: Error) => any) => { + + if (value && !/^1\d{10}$/.test(value)) { + callback(new Error('请输入正确的手机号码')); + } else { + callback() + } + +} +const userEmail = (rule: any, value: string, callback: (arg0: Error | undefined) => void) => { + + const mailReg = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/ + // // if (!value) { + // // return callback(new Error('邮箱不能为空')) + // // } + + + if (value && !mailReg.test(value)) { + callback(new Error('请输入正确的邮箱格式')) + } else { + callback() + } + +}; // 上传文件 const handleAvatarSuccess_four = ( response, @@ -184,9 +211,9 @@ const customEvent = (e: any) => { }; const customEvent1 = (e: any) => { formData.buy_bidding_document_id = e.id; - document_name.value = e.name; - document_code.value = e.project.project_code - bidding_code.value = e.document.bid_document_no + document_name.value = e.project_name; + document_code.value = e.project_code + bidding_code.value = e.bid_document_no showDialog1.value = false; }; @@ -237,6 +264,22 @@ const formRules = reactive({ // 获取详情 const setFormData = async (data: Record) => { + if (data.annex.length > 0) { + if (data.annex.includes(",")) { + const arry1 = data.annex.split(',').map((item: any, index: any) => { + return { + name: `文件${index + 1}`, + uri: item + }; + }); + Object.assign(formDataannex, arry1) + } else { + const arry1 = [{ name: `文件1`, uri: data.annex }] + Object.assign(formDataannex, arry1) + + } + } + for (const key in formData) { if (data[key] != null && data[key] != undefined) { @@ -261,6 +304,9 @@ const getDetail = async (row: Record) => { // 提交按钮 const handleSubmit = async () => { + if (formDataannex.length > 0) { + formData.annex = formDataannex.map((item) => item.uri).toString() + } await formRef.value?.validate() const data = { ...formData, } mode.value == 'edit' diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue index b2e3b80..dad95a2 100644 --- a/src/views/contract/index.vue +++ b/src/views/contract/index.vue @@ -52,7 +52,7 @@ - +