From e0a4b1e8faaaec08db8c15ff771ae8a42dc16a57 Mon Sep 17 00:00:00 2001 From: Teo <2642673902@qq.com> Date: Sat, 30 Aug 2025 03:48:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/out/constructionValue/index.vue | 24 +++++++++---------- src/views/progress/progressCategory/index.vue | 9 +++++-- .../progressCategoryTemplate/index.vue | 2 +- src/views/project/attendance/index.vue | 8 +++---- src/views/tender/supplierInput/indexEdit.vue | 21 +++++++++++++--- 5 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/views/out/constructionValue/index.vue b/src/views/out/constructionValue/index.vue index 947f094..b6d49e0 100644 --- a/src/views/out/constructionValue/index.vue +++ b/src/views/out/constructionValue/index.vue @@ -273,19 +273,19 @@ const handleSelectionChange = (selection: ConstructionValueVO[]) => { /** 新增按钮操作 */ const handleAdd = async () => { reset(); - const res = await getProjectSquare(currentProject.value?.id); - if (res.data.length === 0) return proxy?.$modal.msgWarning('当前项目下没有方阵，请先创建方阵'); - const isFangzhen = res.data.some((item) => item.children && item.children.length); - console.log('🚀 ~ handleAdd ~ isFangzhen:', isFangzhen); + // const res = await getProjectSquare(currentProject.value?.id); + // if (res.data.length === 0) return proxy?.$modal.msgWarning('当前项目下没有方阵，请先创建方阵'); + // const isFangzhen = res.data.some((item) => item.children && item.children.length); + // console.log('🚀 ~ handleAdd ~ isFangzhen:', isFangzhen); - if (!isFangzhen) return proxy?.$modal.msgWarning('当前项目下没有方阵，请先创建方阵'); - let matrixList = res.data.map((item) => { - return { - ...item, - matrixId: item?.projectId - }; - }); - matrixOptions.value = matrixList; + // if (!isFangzhen) return proxy?.$modal.msgWarning('当前项目下没有方阵，请先创建方阵'); + // let matrixList = res.data.map((item) => { + // return { + // ...item, + // matrixId: item?.projectId + // }; + // }); + // matrixOptions.value = matrixList; dialog.visible = true; dialog.title = '添加施工产值'; }; diff --git a/src/views/progress/progressCategory/index.vue b/src/views/progress/progressCategory/index.vue index f285399..deed949 100644 --- a/src/views/progress/progressCategory/index.vue +++ b/src/views/progress/progressCategory/index.vue @@ -34,7 +34,7 @@ :file-type="['xls', 'xlsx']" :on-upload-success="handleSuccess" > - 导入 + 导入 @@ -249,6 +249,7 @@ const initFormData: ProgressCategoryForm = { status: undefined, remark: undefined }; +const labelTitle = ref('测试方阵'); const data = reactive>({ form: { ...initFormData }, @@ -323,7 +324,8 @@ const getList = async () => { if (data) { progressCategoryList.value = data; progressCategoryOptions.value = []; - const datas: ProgressCategoryOption = { id: 0, name: '顶级节点', children: [...data] }; + const datas: ProgressCategoryOption = { id: 0, name: '顶级节点', children: [{ id: id, children: [...data], name: labelTitle.value }] }; + // form.value.parentId = id; progressCategoryOptions.value.push(datas); console.log('🚀 ~ getList ~ progressCategoryOptions.value:', progressCategoryOptions.value); loading.value = false; @@ -336,6 +338,7 @@ const getList = async () => { const handleSuccess = () => { console.log(111); proxy.$modal.msgSuccess('操作成功'); + getList(); }; /** 查询分项工程单价下拉树结构 */ @@ -355,6 +358,8 @@ const cancel = () => { }; const handleTabClick = (tab: any) => { + console.log(tab); + labelTitle.value = tab.props.label; const id = tab.props.name; // 实际上就是 item.id const current = tabList.value.find((item) => item.id === id); if (current.matrixStructureList && current.matrixStructureList.length > 0) { diff --git a/src/views/progress/progressCategoryTemplate/index.vue b/src/views/progress/progressCategoryTemplate/index.vue index 5d4257b..a4bc971 100644 --- a/src/views/progress/progressCategoryTemplate/index.vue +++ b/src/views/progress/progressCategoryTemplate/index.vue @@ -106,7 +106,7 @@ - + diff --git a/src/views/project/attendance/index.vue b/src/views/project/attendance/index.vue index 7634fdb..2f7c8bf 100644 --- a/src/views/project/attendance/index.vue +++ b/src/views/project/attendance/index.vue @@ -347,10 +347,10 @@ const getList = async () => { /** 查询近两周考勤列表 */ const getListTwoWeek = async () => { loading.value = true; - const res = await listAttendanceTwoWeek(queryParams.value); - attendanceTwoWeekList.value = res.data; - echartsOption.value = { ...option(attendanceTwoWeekList.value) }; - commandstatsIntance.value.setOption(echartsOption.value); + // const res = await listAttendanceTwoWeek(queryParams.value); + // attendanceTwoWeekList.value = res.data; + // echartsOption.value = { ...option(attendanceTwoWeekList.value) }; + // commandstatsIntance.value.setOption(echartsOption.value); }; /** 取消按钮 */ diff --git a/src/views/tender/supplierInput/indexEdit.vue b/src/views/tender/supplierInput/indexEdit.vue index fd495ff..b6f6677 100644 --- a/src/views/tender/supplierInput/indexEdit.vue +++ b/src/views/tender/supplierInput/indexEdit.vue @@ -16,7 +16,7 @@
-

专项方案信息

+

供应商入库

@@ -333,6 +333,17 @@ const getInfo = () => { nextTick(async () => { const res = await getSupplierInput(routeParams.value.id); Object.assign(form.value, res.data); + form.value.registeredNumber = form.value.registeredNumber?.split(','); + form.value.build1 = form.value.registeredNumber[0] || ''; + form.value.build2 = form.value.registeredNumber[1] || ''; + form.value.build3 = form.value.registeredNumber[2] || ''; + form.value.build4 = form.value.registeredNumber[3] || ''; + form.value.personnelNumber = form.value.personnelNumber?.split(','); + form.value.personnelNumber1 = form.value.personnelNumber[0] || ''; + form.value.personnelNumber2 = form.value.personnelNumber[1] || ''; + form.value.personnelNumber3 = form.value.personnelNumber[2] || ''; + form.value.personnelNumber4 = form.value.personnelNumber[3] || ''; + loading.value = false; buttonLoading.value = false; }); @@ -437,7 +448,9 @@ onMounted(() => { .el-input__inner, .el-select .el-input__inner { border-radius: 4px; - transition: border-color 0.2s, box-shadow 0.2s; + transition: + border-color 0.2s, + box-shadow 0.2s; &:focus { border-color: var(--primary-light); @@ -447,7 +460,9 @@ onMounted(() => { .el-textarea__inner { border-radius: 4px; - transition: border-color 0.2s, box-shadow 0.2s; + transition: + border-color 0.2s, + box-shadow 0.2s; &:focus { border-color: var(--primary-light);