From 6e48606ee4721482f2f754b21f462704fff7ccbc Mon Sep 17 00:00:00 2001
From: pyt <626651354@qq.com>
Date: 星期二, 13 五月 2025 16:44:57 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
laboratory/src/views/reportLibrary/feasibilityStudy/add.vue | 76 ++++++++++++++++++++++++++-----------
1 files changed, 53 insertions(+), 23 deletions(-)
diff --git a/laboratory/src/views/reportLibrary/feasibilityStudy/add.vue b/laboratory/src/views/reportLibrary/feasibilityStudy/add.vue
index b33a9ad..bb973f8 100644
--- a/laboratory/src/views/reportLibrary/feasibilityStudy/add.vue
+++ b/laboratory/src/views/reportLibrary/feasibilityStudy/add.vue
@@ -12,12 +12,12 @@
</div>
</div>
- <Table :height="null" :queryForm="queryForm" :total="0">
+ <Table :height="null" :data="tableData" :queryForm="queryForm" :total="0">
<template>
- <el-table-column prop="name" label="项目组名称" />
- <el-table-column prop="age" label="项目负责人" />
- <el-table-column prop="age" label="项目组成员" />
- <el-table-column prop="age" label="创建时间" />
+ <el-table-column prop="teamName" label="项目组名称" />
+ <el-table-column prop="personCharge" label="项目负责人" />
+ <el-table-column prop="staffName" label="项目组成员" />
+ <el-table-column prop="createTime" label="创建时间" />
</template>
</Table>
<el-form ref="form" :model="form" :rules="rules" inline label-position="top" style="margin-top: 38px">
@@ -27,9 +27,9 @@
<div>报告编号</div>
</div>
</div>
- <form-item prop="name" style="margin-top: 38px">
- <el-input v-model="form.name" style="width: 100%;" placeholder="请输入报告编号" />
- </form-item>
+ <el-form-item prop="reportCode" style="margin-top: 38px">
+ <el-input v-model="form.reportCode" style="width: 100%;" placeholder="请输入报告编号" />
+ </el-form-item>
<div class="header-title" style="width: 100%;">
<div class="header-title-left">
@@ -37,9 +37,9 @@
<div>报告名称</div>
</div>
</div>
- <form-item prop="name" style="margin-top: 38px">
- <el-input v-model="form.name" style="width: 100%;" placeholder="请输入报告编号" />
- </form-item>
+ <el-form-item prop="reportName" style="margin-top: 38px">
+ <el-input v-model="form.reportName" style="width: 100%;" placeholder="请输入报告编号" />
+ </el-form-item>
<div class="header-title" style="width: 100%;">
<div class="header-title-left">
@@ -47,35 +47,40 @@
<div>报告正文</div>
</div>
</div>
- <form-item prop="name" style="margin-top: 38px">
- <ai-editor v-model="form.name" style="width: 100%;" placeholder="请输入报告编号" />
- </form-item>
+ <el-form-item prop="reportText" style="margin-top: 38px">
+ <ai-editor v-model="form.reportText" style="width: 100%;" placeholder="请输入报告编号" />
+ </el-form-item>
<div class="header-title" style="width: 100%;">
<div class="header-title-left">
<img src="@/assets/public/headercard.png" />
- <div>附件</div>
+ <div class="noRequire">附件</div>
</div>
</div>
- <form-item prop="name" style="margin-top: 38px">
+ <el-form-item prop="name" style="margin-top: 38px">
<el-upload action="https://jsonplaceholder.typicode.com/posts/" :file-list="fileList">
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
- </form-item>
+ </el-form-item>
<div class="end-btn" style="margin-top: 38px">
- <el-button type="primary">发送</el-button>
- <el-button type="default">存草稿</el-button>
+ <el-button type="primary" @click="submit">发送</el-button>
+ <el-button type="default" @clice="save">存草稿</el-button>
</div>
</el-form>
</Card>
+ <chooseProject @submit="getProjectData" :show="showChoose" @close="showChoose = false"></chooseProject>
</div>
</template>
<script>
import { Card } from 'element-ui';
import AiEditor from '@/components/AiEditor'
+import chooseProject from '@/components/chooseProject'
export default {
- components: { AiEditor },
+ components: {
+ AiEditor,
+ chooseProject
+ },
data() {
return {
form: {
@@ -89,6 +94,7 @@
approver: "",
approveTime: ""
},
+ tableData: [],
fileList: [], // 附件列表
showChoose: false,
radio1: 1,
@@ -99,7 +105,24 @@
}
}
- }
+ },
+ methods: {
+ //获取选择项目组数据
+ getProjectData(data) {
+ console.log('4458454', data);
+ this.tableData = [data]
+ this.$forceUpdate()
+ console.log('dsadasdsad', this.tableData);
+
+ this.showChoose = false
+ },
+ submit(){
+
+ },
+ save(){
+
+ },
+ },
}
</script>
@@ -138,6 +161,13 @@
}
}
+ .noRequire:before {
+ content: unset;
+ // color: #f56c6c;
+ // margin-right: 4px;
+
+ }
+
span {
flex-shrink: 0;
font-weight: bold;
@@ -159,12 +189,12 @@
}
}
-.end-btn{
+.end-btn {
display: flex;
align-items: center;
gap: 10px;
- button{
+ button {
width: 180px;
height: 36px;
// background: #409EFF;
--
Gitblit v1.7.1