Commit e11a38ae by liangzhen

暂存

1 parent cd8d414c
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
class="demo-ruleForm" class="demo-ruleForm"
> >
<el-form-item label="批次年度:" prop="batchYear" class="fromItem"> <el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-select v-model="ruleForm.batchYear" placeholder="请选择"> <el-select v-model="ruleForm.batchYear" placeholder="请选择" clearable>
<el-option label="2024年" value="2024"></el-option> <el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option> <el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option> <el-option label="2022年" value="2022"></el-option>
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="后评估名称:" prop="batchName" class="fromItem"> <el-form-item label="后评估名称:" prop="batchName" class="fromItem">
<el-input v-model="ruleForm.batchName" placeholder="请输入" ></el-input> <el-input v-model="ruleForm.batchName" placeholder="请输入" clearable ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="后评估状态:" prop="postEvalState" class="fromItem"> <el-form-item label="后评估状态:" prop="postEvalState" class="fromItem">
<el-select v-model="ruleForm.postEvalState" placeholder="请选择"> <el-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable>
<el-option label="未下发" value="0"></el-option> <el-option label="未下发" value="0"></el-option>
<el-option label="已下发" value="1"></el-option> <el-option label="已下发" value="1"></el-option>
<el-option label="已撤回" value="2"></el-option> <el-option label="已撤回" value="2"></el-option>
...@@ -30,10 +30,11 @@ ...@@ -30,10 +30,11 @@
<el-input <el-input
v-model="ruleForm.projectName" v-model="ruleForm.projectName"
placeholder="请输入" placeholder="请输入"
clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目ID:" prop="projectId" class="fromItem"> <el-form-item label="项目ID:" prop="projectId" class="fromItem">
<el-input v-model="ruleForm.projectId" placeholder="请输入"></el-input> <el-input v-model="ruleForm.projectId" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
...@@ -310,7 +311,7 @@ export default { ...@@ -310,7 +311,7 @@ export default {
padding: 20px 10px; padding: 20px 10px;
margin-bottom: 20px; margin-bottom: 20px;
.fromItem { .fromItem {
width: 24%; min-width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
margin-bottom: 20px; margin-bottom: 20px;
.el-input { .el-input {
...@@ -322,6 +323,8 @@ export default { ...@@ -322,6 +323,8 @@ export default {
} }
/deep/ .el-form-item__content { /deep/ .el-form-item__content {
text-align: left; text-align: left;
display: inline-block;
margin-left: 10px !important;
} }
/deep/ .el-form-item__label { /deep/ .el-form-item__label {
font-weight: bold; font-weight: bold;
...@@ -363,6 +366,8 @@ export default { ...@@ -363,6 +366,8 @@ export default {
} }
/deep/ .el-dialog { /deep/ .el-dialog {
border-radius: 10px; border-radius: 10px;
margin-top: 3vh !important;
margin-left: 3vw !important;
} }
/deep/ .el-dialog__wrapper { /deep/ .el-dialog__wrapper {
position: absolute; position: absolute;
......
...@@ -175,15 +175,14 @@ export default { ...@@ -175,15 +175,14 @@ export default {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
.Btn { .Btn {
width: 98%; width:calc(100% - 246px);
position: absolute; position:fixed;
height: 80px; height: 80px;
bottom: 120px; bottom: -10px;
left: 50%; right: 0;
z-index: 100; z-index: 100;
transform: translate(-50%);
background-color: #f5f5f6; background-color: #f5f5f6;
line-height: 62px; line-height: 80px;
span { span {
display: inline-block; display: inline-block;
width: 89px; width: 89px;
...@@ -232,7 +231,7 @@ export default { ...@@ -232,7 +231,7 @@ export default {
padding-top: 0; padding-top: 0;
// display: flex; // display: flex;
// padding: 0 20px; // padding: 0 20px;
padding-bottom: 200px; padding-bottom: 20px;
position: relative; position: relative;
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
class="demo-ruleForm" class="demo-ruleForm"
> >
<el-form-item label="批次年度:" prop="batchYear" class="fromItem"> <el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-select v-model="ruleForm.batchYear" placeholder="请选择"> <el-select v-model="ruleForm.batchYear" placeholder="请选择" clearable>
<el-option label="2024年" value="2024"></el-option> <el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option> <el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option> <el-option label="2022年" value="2022"></el-option>
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="后评估名称:" prop="batchName" class="fromItem"> <el-form-item label="后评估名称:" prop="batchName" class="fromItem">
<el-input v-model="ruleForm.batchName" placeholder="请输入"></el-input> <el-input v-model="ruleForm.batchName" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="后评估状态:" prop="postEvalState" class="fromItem"> <el-form-item label="后评估状态:" prop="postEvalState" class="fromItem">
<el-select v-model="ruleForm.postEvalState" placeholder="请选择"> <el-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable>
<el-option label="未下发" value="0"></el-option> <el-option label="未下发" value="0"></el-option>
<el-option label="已下发" value="1"></el-option> <el-option label="已下发" value="1"></el-option>
<el-option label="已撤回" value="2"></el-option> <el-option label="已撤回" value="2"></el-option>
...@@ -30,9 +30,10 @@ ...@@ -30,9 +30,10 @@
<el-input <el-input
v-model="ruleForm.projectName" v-model="ruleForm.projectName"
placeholder="请输入" placeholder="请输入"
clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目ID:" prop="projectId" class="fromItem"> <el-form-item label="项目ID:" prop="projectId" class="fromItem" clearable>
<el-input v-model="ruleForm.projectId" placeholder="请输入"></el-input> <el-input v-model="ruleForm.projectId" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
...@@ -368,6 +369,8 @@ ...@@ -368,6 +369,8 @@
} }
/deep/ .el-form-item__content { /deep/ .el-form-item__content {
text-align: left; text-align: left;
display: inline-block;
margin-left: 10px !important;
} }
/deep/ .el-form-item__label { /deep/ .el-form-item__label {
font-weight: bold; font-weight: bold;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="main"> <div class="main">
<el-form :model="ruleForm" label-width="100px" class="demo-ruleForm" ref="formName"> <el-form :model="ruleForm" label-width="100px" class="demo-ruleForm" ref="formName">
<el-form-item label="批次年度:" prop="batchYear" class="fromItem"> <el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-select v-model="ruleForm.batchYear" placeholder="请选择"> <el-select v-model="ruleForm.batchYear" placeholder="请选择" clearable>
<el-option label="2024年" value="2024"></el-option> <el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option> <el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option> <el-option label="2022年" value="2022"></el-option>
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="后评估批次名称:" prop="batchName" class="fromItem"> <el-form-item label="后评估批次名称:" prop="batchName" class="fromItem">
<el-input v-model="ruleForm.batchName" placeholder="请输入"></el-input> <el-input v-model="ruleForm.batchName" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="后评估状态:" prop="postEvalState" class="fromItem"> <el-form-item label="后评估状态:" prop="postEvalState" class="fromItem">
<el-select v-model="ruleForm.postEvalState" placeholder="请选择"> <el-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable>
<el-option label="已确认" value="3"></el-option> <el-option label="已确认" value="3"></el-option>
<el-option label="未确认" value="1"></el-option> <el-option label="未确认" value="1"></el-option>
<el-option label="已撤回" value="4"></el-option> <el-option label="已撤回" value="4"></el-option>
...@@ -217,6 +217,7 @@ ...@@ -217,6 +217,7 @@
<el-select <el-select
v-model="ruleFormdialogBJ.prjsOfExpert" v-model="ruleFormdialogBJ.prjsOfExpert"
placeholder="请选择" placeholder="请选择"
clearable
> >
<el-option label="100" value="100"></el-option> <el-option label="100" value="100"></el-option>
<el-option label="200" value="200"></el-option> <el-option label="200" value="200"></el-option>
...@@ -304,7 +305,7 @@ ...@@ -304,7 +305,7 @@
<el-form :model="ruleFormZJ" label-width="100px" class="demo-ruleForm"> <el-form :model="ruleFormZJ" label-width="100px" class="demo-ruleForm">
<el-form-item label="项目下达年度:" prop="projectYear" class="fromItem"> <el-form-item label="项目下达年度:" prop="projectYear" class="fromItem">
<el-select v-model="ruleFormZJ.projectYear" placeholder="请选择"> <el-select v-model="ruleFormZJ.projectYear" placeholder="请选择" clearable>
<el-option label="2024年" value="2024"></el-option> <el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option> <el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option> <el-option label="2022年" value="2022"></el-option>
...@@ -315,18 +316,21 @@ ...@@ -315,18 +316,21 @@
<el-input <el-input
v-model="ruleFormZJ.projectId" v-model="ruleFormZJ.projectId"
placeholder="请输入" placeholder="请输入"
clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目名称:" prop="projectName" class="fromItem"> <el-form-item label="项目名称:" prop="projectName" class="fromItem">
<el-input <el-input
v-model="ruleFormZJ.projectName" v-model="ruleFormZJ.projectName"
placeholder="请输入" placeholder="请输入"
clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目内容:" prop="projectInfo" class="fromItem"> <el-form-item label="项目内容:" prop="projectInfo" class="fromItem">
<el-input <el-input
v-model="ruleFormZJ.projectInfo" v-model="ruleFormZJ.projectInfo"
placeholder="请输入" placeholder="请输入"
clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="省公司计划文件号:" prop="字段待确认" class="fromItem"> <!-- <el-form-item label="省公司计划文件号:" prop="字段待确认" class="fromItem">
...@@ -342,7 +346,7 @@ ...@@ -342,7 +346,7 @@
></el-input> ></el-input>
</el-form-item> --> </el-form-item> -->
<el-form-item label="建设形式:" prop="projectCategory" class="fromItem"> <el-form-item label="建设形式:" prop="projectCategory" class="fromItem">
<el-select v-model="ruleFormZJ.projectCategory" placeholder="请选择"> <el-select v-model="ruleFormZJ.projectCategory" placeholder="请选择" clearable>
<el-option label="2024年" value="2024"></el-option> <el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option> <el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option> <el-option label="2022年" value="2022"></el-option>
...@@ -350,7 +354,7 @@ ...@@ -350,7 +354,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="部门:" prop="department" class="fromItem"> <el-form-item label="部门:" prop="department" class="fromItem">
<el-select v-model="ruleFormZJ.department" placeholder="请选择"> <el-select v-model="ruleFormZJ.department" placeholder="请选择" clearable>
<el-option label="2024年" value="2024"></el-option> <el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option> <el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option> <el-option label="2022年" value="2022"></el-option>
...@@ -787,6 +791,7 @@ export default { ...@@ -787,6 +791,7 @@ export default {
height: 100%; height: 100%;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
overflow-x: hidden;
} }
.el-form { .el-form {
display: flex; display: flex;
...@@ -799,7 +804,7 @@ export default { ...@@ -799,7 +804,7 @@ export default {
padding: 20px 10px; padding: 20px 10px;
margin: 20px 0; margin: 20px 0;
.fromItem { .fromItem {
width: 24%; min-width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
margin-bottom: 20px; margin-bottom: 20px;
.el-input { .el-input {
...@@ -811,6 +816,8 @@ export default { ...@@ -811,6 +816,8 @@ export default {
} }
/deep/ .el-form-item__content { /deep/ .el-form-item__content {
text-align: left; text-align: left;
display: inline-block;
margin-left: 10px !important;
} }
/deep/ .el-form-item__label { /deep/ .el-form-item__label {
font-weight: bold; font-weight: bold;
...@@ -913,6 +920,9 @@ text-align: center; ...@@ -913,6 +920,9 @@ text-align: center;
} }
.textarea { .textarea {
width: 100%; width: 100%;
/deep/ .el-form-item__content{
display: flex;
}
.el-textarea { .el-textarea {
width: 60%; width: 60%;
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
class="demo-ruleForm" class="demo-ruleForm"
> >
<el-form-item label="批次年度:" prop="batchYear" class="fromItem"> <el-form-item label="批次年度:" prop="batchYear" class="fromItem">
<el-select v-model="ruleForm.batchYear" placeholder="请选择"> <el-select v-model="ruleForm.batchYear" placeholder="请选择" clearable>
<el-option label="2024年" value="2024"></el-option> <el-option label="2024年" value="2024"></el-option>
<el-option label="2023年" value="2023"></el-option> <el-option label="2023年" value="2023"></el-option>
<el-option label="2022年" value="2022"></el-option> <el-option label="2022年" value="2022"></el-option>
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="后评估名称:" prop="batchName" class="fromItem"> <el-form-item label="后评估名称:" prop="batchName" class="fromItem">
<el-input v-model="ruleForm.batchName" placeholder="请输入"></el-input> <el-input v-model="ruleForm.batchName" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="后评估状态:" prop="postEvalState" class="fromItem"> <el-form-item label="后评估状态:" prop="postEvalState" class="fromItem">
<el-select v-model="ruleForm.postEvalState" placeholder="请选择"> <el-select v-model="ruleForm.postEvalState" placeholder="请选择" clearable>
<el-option label="未下发" value="0"></el-option> <el-option label="未下发" value="0"></el-option>
<el-option label="已下发" value="1"></el-option> <el-option label="已下发" value="1"></el-option>
<el-option label="已撤回" value="2"></el-option> <el-option label="已撤回" value="2"></el-option>
...@@ -30,10 +30,11 @@ ...@@ -30,10 +30,11 @@
<el-input <el-input
v-model="ruleForm.projectName" v-model="ruleForm.projectName"
placeholder="请输入" placeholder="请输入"
clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目ID:" prop="projectId" class="fromItem"> <el-form-item label="项目ID:" prop="projectId" class="fromItem">
<el-input v-model="ruleForm.projectId" placeholder="请输入"></el-input> <el-input v-model="ruleForm.projectId" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item class="button"> <el-form-item class="button">
...@@ -525,7 +526,7 @@ export default { ...@@ -525,7 +526,7 @@ export default {
padding: 20px 10px; padding: 20px 10px;
margin-bottom: 20px; margin-bottom: 20px;
.fromItem { .fromItem {
width: 24%; min-width: 24%;
margin: 0 0.5%; margin: 0 0.5%;
margin-bottom: 20px; margin-bottom: 20px;
.el-input { .el-input {
...@@ -537,6 +538,8 @@ export default { ...@@ -537,6 +538,8 @@ export default {
} }
/deep/ .el-form-item__content { /deep/ .el-form-item__content {
text-align: left; text-align: left;
display: inline-block;
margin-left: 10px !important;
} }
/deep/ .el-form-item__label { /deep/ .el-form-item__label {
font-weight: bold; font-weight: bold;
...@@ -578,6 +581,8 @@ export default { ...@@ -578,6 +581,8 @@ export default {
} }
/deep/ .el-dialog { /deep/ .el-dialog {
border-radius: 10px; border-radius: 10px;
margin-top: 3vh !important;
margin-left: 3vw !important;
} }
/deep/ .el-dialog__wrapper { /deep/ .el-dialog__wrapper {
position: absolute; position: absolute;
...@@ -631,6 +636,9 @@ export default { ...@@ -631,6 +636,9 @@ export default {
} }
.textarea { .textarea {
width: 100%; width: 100%;
/deep/ .el-form-item__content{
display: flex;
}
.el-textarea { .el-textarea {
width: 60%; width: 60%;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!