From ccfd5dc264d07471d831d2287ff03f293c295981 Mon Sep 17 00:00:00 2001
From: Goldennfish <1981343953@qq.com>
Date: 星期二, 25 七月 2023 14:22:44 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/yuanchu_code/lims-front-end
---
src/views/rawMaterials/reportForInspection/forInspectionDetail.vue | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 169 insertions(+), 5 deletions(-)
diff --git a/src/views/rawMaterials/reportForInspection/forInspectionDetail.vue b/src/views/rawMaterials/reportForInspection/forInspectionDetail.vue
index e369155..6e833d1 100644
--- a/src/views/rawMaterials/reportForInspection/forInspectionDetail.vue
+++ b/src/views/rawMaterials/reportForInspection/forInspectionDetail.vue
@@ -127,13 +127,114 @@
size="50%"
>
<div class="demo-drawer__content">
- <el-form :model="addSampleFrom">
+ <el-form label-position="top" label-width="120px" :model="addSampleFrom">
<el-form-item>
- <el-button>閫夋嫨鐗╂枡</el-button>
+ <el-button type="primary">閫夋嫨鐗╂枡</el-button>
</el-form-item>
- <el-row>
- <el-col />
+ <div class="materialParams-card">
+ <el-row class="materialParams-top">
+ <el-col :span="12">
+ <el-form-item>
+ <el-input placeholder="--">
+ <template slot="prepend">鐗╂枡缂栧彿</template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item>
+ <el-input placeholder="--">
+ <template slot="prepend">鐗╂枡鍚嶇О</template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row class="materialParams-bottom">
+ <el-col :span="12">
+ <el-form-item>
+ <el-input placeholder="--">
+ <template slot="prepend">鐗╂枡瑙勬牸</template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item>
+ <el-input placeholder="--">
+ <template slot="prepend">渚涘簲鍟� </template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </div>
+ <el-row gutter="100" :style="{marginTop:'24px'}">
+ <el-col :span="12">
+ <el-form-item label="鎵规">
+ <el-input placeholder="" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鏁伴噺">
+ <el-input placeholder="" />
+ </el-form-item>
+ </el-col>
</el-row>
+ <el-row gutter="100">
+ <el-col :span="12">
+ <el-form-item label="鐩樺彿">
+ <el-input placeholder="" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="瀛樻斁鍦�">
+ <el-input placeholder="" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row gutter="100">
+ <el-col :span="12">
+ <el-form-item label="瑙勬牸/鍨嬪彿鍚嶇О">
+ <el-input placeholder="" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="涓荤嚎蹇冩埅闈�">
+ <el-input placeholder="" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row gutter="100">
+ <el-col :span="12">
+ <el-form-item label="鐢熶骇鎸囦护鍙�">
+ <el-input placeholder="" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="涓荤嚎鑺姱鏁�">
+ <el-input placeholder="" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row gutter="100">
+ <el-col :span="12">
+ <el-form-item label="鐢靛帇绛夌骇">
+ <el-input placeholder="" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row gutter="100" :style="{flex:'1'}">
+ <el-col :span="24">
+ <el-form-item label="澶囨敞">
+ <el-input
+ type="textarea"
+ rows="2"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-form-item>
+ <el-button type="primary" @click="onSubmit">绔嬪嵆鍒涘缓</el-button>
+ <el-button>鍙栨秷</el-button>
+ </el-form-item>
</el-form>
</div>
</el-drawer>
@@ -307,7 +408,70 @@
}
.demo-drawer__content{
- padding: 20px;
+ padding: 24px;
+ height: 100%;
+ .el-form{
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ }
+ ::v-deep .el-textarea__inner{
+ max-height: 100px !important;
+ }
+ ::v-deep .el-form--label-top .el-form-item__label{
+ padding: 0px !important;
+ }
+ .materialParams-card{
+ box-shadow: rgba(100, 100, 111, 0.2) 0px 5px 15px;
+ // box-shadow: rgba(0, 0, 0, 0.35) 0px 5px 15px;
+ // box-shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;
+ ::v-deep .el-form-item{
+ .el-form-item__content{
+ margin-left:0px !important;
+ }
+ }
+ ::v-deep .el-input{
+ >div{
+ width: 120px;
+ text-align: center;
+ }
+ }
+ }
+ .materialParams-bottom{
+ .el-form-item{
+ margin-bottom: 0px !important;
+ ::v-deep .el-input{
+ >div,>input{
+ border-bottom: 0px !important;
+ border-left: 0px !important;
+ border-right: 0px !important;
+ // border-top: 1px solid #DCDFE6;
+ border-radius: 0px !important;
+ }
+ }
+ }
+ }
+ .materialParams-top{
+ .el-form-item{
+ margin-bottom: 0px !important;
+ ::v-deep .el-input{
+ >div,>input{
+ border: 0px !important;
+ border-radius: 0px !important;
+ }
+ }
+ }
+ .el-col:nth-child(1){
+ //
+ ::v-deep .el-input{
+ >div,>input{
+ border-bottom: 0px !important;
+ border-right: 0px !important;
+ border-radius: 0px !important;
+ }
+ }
+ }
+ }
}
</style>
--
Gitblit v1.9.3