Skip to content

T
template_vue
Commit b9b92d6e authored by Hagsn3's avatar Hagsn3
Browse files
Options

Merge remote-tracking branch 'origin/project9-8' into project9-8

parents e3bfa6b3 2e50e297
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 81 deletions
src/views/checkList.vue
View file @ b9b92d6e
......@@ -253,8 +253,9 @@
<!-- 检查内容-->
<div class="recordOneContainer">
<div class="inspectionStandards">
<el-form ref="inspectJbAl2o3List" :model="inspectJbAl2o3List" :rules="rules">
<el-form-item label="检验标准1:" label-width="80" prop="limitOne">
<!-- 表达右对齐 -->
<el-form :label-position="right" label-width="120px" ref="inspectJbAl2o3List" :model="inspectJbAl2o3List" :rules="rules">
<el-form-item label="检验标准1:" prop="limitOne">
<el-input
v-model="inspectJbAl2o3List.limitOne"
class="inspectionStandardsInput"
......@@ -265,9 +266,7 @@
@input="CalculateDifference"
/>
</el-form-item>
</el-form>
<el-form ref="inspectJbAl2o3List" :model="inspectJbAl2o3List" :rules="rules">
<el-form-item label="检验标准2:" label-width="80" prop="limitTwo">
<el-form-item label="检验标准2:" prop="limitTwo">
<el-input
v-model="inspectJbAl2o3List.limitTwo"
class="inspectionStandardsInput"
......@@ -278,12 +277,10 @@
@input="CalculateDifference"
/>
</el-form-item>
</el-form>
<el-form ref="inspectJbAl2o3List" class="isDifferentContent" :model="inspectJbAl2o3List" :rules="rules">
<el-form-item label="差异:" label-width="80" prop="limitThree">
<el-form-item label="差异:" prop="limitThree">
<el-input
v-model="inspectJbAl2o3List.limitThree"
class="inspectionDifferentInput"
class="inspectionStandardsInput"
:maxlength="7"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
......@@ -300,6 +297,7 @@
<!-- 下方列表-->
<div class="recordThreeContent">
<div v-for="(item,index) in recode3" :key="index" :class="index === 0? 'oneContent': 'Content'">
<div class="twoDiv">
<div class="number">{{ index + 1 }}</div>
<div class="recordData">
<el-input
......@@ -318,6 +316,7 @@
@click="clearInspectionFormThree(index)"
/>
</div>
</div>
<div class="Value">
<TextToolTip :text="item.differenceValue" :max-length="8" :disabled-show="false" /></div>
</div>
......@@ -2593,8 +2592,9 @@ export default {
//}
.recordThreeContent {
width: 80%;
margin-left: 15%;
width: 60%;
margin-left: 20%;
//margin-left: 15%;
padding-bottom: 3%;
//padding-top: 30px;
//padding-left: 90px;
......@@ -2602,17 +2602,10 @@ export default {
display: flex;
margin-top: 16px;
padding-bottom: 16px;
margin-left: 10%;
.compareValue {
margin-left: 29.7%;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
color: #606266;
//margin-left: 10%;
.twoDiv{
display: flex;
align-items: center;
}
width: 60%;
.number {
width: 9px;
font-size: 14px;
......@@ -2623,7 +2616,7 @@ export default {
align-items: center;
}
.recordData {
width: 27.5%;
width: 80%;
display: flex;
margin-left: 3%;
.el-icon-circle-close{
......@@ -2633,17 +2626,22 @@ export default {
margin-left: 10px;
}
}
}
.Value {
//margin-left: 20px;
//margin-top: 8px;
width: 64px;
width: 40%;
display: flex;
justify-content: center;
padding-right: 1%;
height: 18px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
text-align: LEFT;
color: #0057ff;
margin-left: 27%;
//margin-left: 27%;
margin-top: 1%;
}
......@@ -2654,8 +2652,10 @@ export default {
margin-top: 16px;
padding-bottom: 16px;
//justify-content: center;
margin-left: 10%;
//margin-left: 10%;
.twoDiv{
display: flex;
width: 60%;
.number {
width: 9px;
font-size: 14px;
......@@ -2669,7 +2669,7 @@ export default {
.recordData {
//margin-left: 4%;
//margin-right: 2%;
width: 27.5%;
width: 80%;
margin-left: 3%;
height: 32px;
border-radius: 4px;
......@@ -2682,18 +2682,23 @@ export default {
margin-left: 10px;
}
}
}
.Value {
//margin-left: 20px;
//margin-top: 8px;
width: 64px;
width: 40%;
display: flex;
justify-content: center;
height: 18px;
padding-right: 1%;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
text-align: LEFT;
color: #0057ff;
margin-left: 27%;
//margin-left: 27%;
margin-top: 1%;
}
}
......@@ -3167,7 +3172,8 @@ export default {
}
.inspect {
width: 58%;
width: 80%;
margin-left: 13%;
height: auto;
display: flex;
margin-left: 13%;
......@@ -3177,7 +3183,7 @@ export default {
.inspectDate {
display: flex;
justify-content: space-between;
width: 30%;
width: 50%;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
}
......@@ -3193,7 +3199,7 @@ export default {
.inspectPerson {
display: flex;
justify-content: space-between;
width: 19%;
width: 50%;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment