Skip to content

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

样式

parent 15db1654
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 82 deletions
src/views/checkList.vue
View file @ 754dd14b
...@@ -120,13 +120,16 @@ ...@@ -120,13 +120,16 @@
<div v-for="(item,index) in recode1" :key="index" :class="index === 0? 'oneContent': 'Content'"> <div v-for="(item,index) in recode1" :key="index" :class="index === 0? 'oneContent': 'Content'">
<div class="number">{{ index + 1 }}</div> <div class="number">{{ index + 1 }}</div>
<div class="recordData"> <div class="recordData">
<el-input <el-form ref="recode1" :rules="rules">
v-model="item.recordData" <el-form-item prop="recordData">
:maxlength="7" <el-input
:disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )" v-model="item.recordData"
@input="handleData1Input(index)" :maxlength="7"
/> :disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
@input="handleData1Input(index)"
/>
</el-form-item>
</el-form>
<i <i
v-show="!(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'|| v-show="!(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'||
(controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls == '3' && controlsForm.approveStatus === '1') ||
...@@ -150,12 +153,12 @@ ...@@ -150,12 +153,12 @@
</div> </div>
</div> </div>
</div> </div>
<div class="recordOneBottom"> <!-- <div class="recordOneBottom">-->
<div class="recordOneBottomMax">最大值 : <!-- <div class="recordOneBottomMax">最大值 :-->
{{ calculationForm.Maximum }}</div> <!-- {{ calculationForm.Maximum }}</div>-->
<div class="recordoneBottomMini">最小值 : {{ calculationForm.Minimum }}</div> <!-- <div class="recordoneBottomMini">最小值 : {{ calculationForm.Minimum }}</div>-->
<div class="recordOneBottomAverage">平均值: {{ calculationForm.Average }}</div> <!-- <div class="recordOneBottomAverage">平均值: {{ calculationForm.Average }}</div>-->
</div> <!-- </div>-->
</div> </div>
</div> </div>
</div> </div>
...@@ -224,11 +227,11 @@ ...@@ -224,11 +227,11 @@
</div> </div>
</div> </div>
<div class="recordTwoBottom"> <!-- <div class="recordTwoBottom">-->
<div class="recordTwoBottomMax">最大值 : {{ calculationFormSecond.Maximum }}</div> <!-- <div class="recordTwoBottomMax">最大值 : {{ calculationFormSecond.Maximum }}</div>-->
<div class="recordTwoBottomMini">最小值 : {{ calculationFormSecond.Minimum }}</div> <!-- <div class="recordTwoBottomMini">最小值 : {{ calculationFormSecond.Minimum }}</div>-->
<div class="recordTwoBottomAverage">平均值: {{ calculationFormSecond.Average }}</div> <!-- <div class="recordTwoBottomAverage">平均值: {{ calculationFormSecond.Average }}</div>-->
</div> <!-- </div>-->
</div> </div>
</div> </div>
</div> </div>
...@@ -277,7 +280,19 @@ ...@@ -277,7 +280,19 @@
/> />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="inspectDifferent">差异 : {{ limitDifference }}</div> <el-form class="isDifferentContent" ref="inspectJbAl2o3List" :model="inspectJbAl2o3List" :rules="rules">
<el-form-item label="差异:" label-width="80" prop="limitThree">
<el-input
v-model="inspectJbAl2o3List.limitThree"
class="inspectionDifferentInput"
:maxlength="7"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
@input="CalculateDifference"
/>
</el-form-item>
</el-form>
<!-- <div class="inspectDifferent">差异 : {{ }}</div>-->
</div> </div>
<div class="recordFourTitle"> <div class="recordFourTitle">
<div class="input">输入</div> <div class="input">输入</div>
...@@ -604,6 +619,16 @@ ...@@ -604,6 +619,16 @@
</div> </div>
<div class="inspectionResults"> <div class="inspectionResults">
<el-form :model="inspectInfoList" label-width="42"> <el-form :model="inspectInfoList" label-width="42">
<el-form-item label="检验原因:" class="examineReason">
<el-input
v-model="inspectInfoList.jcCause"
type="textarea"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
:rows="6"
placeholder="请输入检验原因"
/>
</el-form-item>
<el-form-item label="检验结果:"> <el-form-item label="检验结果:">
<div <div
v-if="((controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1') v-if="((controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')
...@@ -687,8 +712,8 @@ ...@@ -687,8 +712,8 @@
v-if="(controlsForm.controls ==='2'&& controlsForm.approveStatus ==='0') || (controlsForm.controls ==='2'&& controlsForm.approveStatus ==='3')" v-if="(controlsForm.controls ==='2'&& controlsForm.approveStatus ==='0') || (controlsForm.controls ==='2'&& controlsForm.approveStatus ==='3')"
class="submitButton" class="submitButton"
> >
<el-button class="buttoon" type="primary" style="background-color: #5cbce5" @click="submitControl">保存</el-button> <el-button class="buttoonSave" type="primary" style="background-color: #5cbce5" @click="submitControl">保存</el-button>
<el-button class="buttoon" type="primary" @click="present">提交</el-button> <el-button class="buttoonCommit" type="primary" @click="present">提交</el-button>
</div> </div>
<!-- <div--> <!-- <div-->
<!-- v-if="(controlsForm.controls ==='3'&& controlsForm.approveStatus ==='1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"--> <!-- v-if="(controlsForm.controls ==='3'&& controlsForm.approveStatus ==='1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"-->
...@@ -770,6 +795,13 @@ export default { ...@@ -770,6 +795,13 @@ export default {
limitTwo: [ limitTwo: [
{ required: true, message: '请输入检验标准', trigger: 'blur' }, { required: true, message: '请输入检验标准', trigger: 'blur' },
{ pattern: /^(0|[1-9]\d*)(\.\d+)?$/, message: '请输入有效的数字', trigger: 'change' } { pattern: /^(0|[1-9]\d*)(\.\d+)?$/, message: '请输入有效的数字', trigger: 'change' }
],
limitThree: [
{ required: true, message: '请输入检验标准', trigger: 'blur' },
{ pattern: /^(0|[1-9]\d*)(\.\d+)?$/, message: '请输入有效的数字', trigger: 'change' }
],
recordData: [
{ required: true, message: '请输入检验数据', trigger: 'blur' }
] ]
}, },
...@@ -895,8 +927,6 @@ export default { ...@@ -895,8 +927,6 @@ export default {
limitData: undefined, limitData: undefined,
ossIdList: [] ossIdList: []
}, },
// 差异值
limitDifference: '',
// 检查记录1 // 检查记录1
recode1: [], recode1: [],
// 检查记录2 // 检查记录2
...@@ -2267,6 +2297,16 @@ export default { ...@@ -2267,6 +2297,16 @@ export default {
display: flex; display: flex;
margin-left: 12%; margin-left: 12%;
justify-content: space-around; justify-content: space-around;
.input{
font-family: Microsoft YaHei, Microsoft YaHei-700;
font-weight: 700;
color: #606266;
}
.different{
font-family: Microsoft YaHei, Microsoft YaHei-700;
font-weight: 700;
color: #606266;
}
} }
.recordOneContainer { .recordOneContainer {
...@@ -2284,12 +2324,21 @@ export default { ...@@ -2284,12 +2324,21 @@ export default {
.inspectionStandardsInput { .inspectionStandardsInput {
width: 50%; width: 50%;
} }
.inspectDifferent{ .isDifferentContent {
margin-left: 10px; ::v-deep .el-form-item__label{
padding-bottom: 13px;
font-size: 14px; }
font-family: Microsoft YaHei, Microsoft YaHei-700; .inspectionDifferentInput {
width: 50%;
margin-left: 5%;
}
} }
//.inspectDifferent{
// margin-left: 10px;
// padding-bottom: 13px;
// font-size: 14px;
// font-family: Microsoft YaHei, Microsoft YaHei-700;
//}
} }
.recordOneTitle { .recordOneTitle {
...@@ -2465,31 +2514,31 @@ export default { ...@@ -2465,31 +2514,31 @@ export default {
} }
} }
.recordOneBottom{ //.recordOneBottom{
display: flex; // display: flex;
padding-bottom: 2%; // padding-bottom: 2%;
padding-left: 1%; // padding-left: 1%;
justify-content: space-between; // justify-content: space-between;
width: 77%; // width: 77%;
.recordOneBottomMax{ // .recordOneBottomMax{
width: 130px; // width: 130px;
font-size: 14px; // font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400; // font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400; // font-weight: 400;
} // }
.recordoneBottomMini{ // .recordoneBottomMini{
width: 130px; // width: 130px;
font-size: 14px; // font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400; // font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400; // font-weight: 400;
} // }
.recordOneBottomAverage{ // .recordOneBottomAverage{
width: 130px; // width: 130px;
font-size: 14px; // font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400; // font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400; // font-weight: 400;
} // }
} //}
.recordThreeContent { .recordThreeContent {
width: 80%; width: 80%;
...@@ -2977,31 +3026,31 @@ export default { ...@@ -2977,31 +3026,31 @@ export default {
} }
.recordTwoBottom{ //.recordTwoBottom{
display: flex; // display: flex;
padding-bottom: 2%; // padding-bottom: 2%;
padding-left: 1%; // padding-left: 1%;
justify-content: space-between; // justify-content: space-between;
width: 77%; // width: 77%;
.recordTwoBottomMax{ // .recordTwoBottomMax{
width: 130px; // width: 130px;
font-size: 14px; // font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400; // font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400; // font-weight: 400;
} // }
.recordTwoBottomMini{ // .recordTwoBottomMini{
width: 130px; // width: 130px;
font-size: 14px; // font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400; // font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400; // font-weight: 400;
} // }
.recordTwoBottomAverage{ // .recordTwoBottomAverage{
width: 130px; // width: 130px;
font-size: 14px; // font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400; // font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400; // font-weight: 400;
} // }
} //}
} }
} }
...@@ -3439,9 +3488,19 @@ export default { ...@@ -3439,9 +3488,19 @@ export default {
margin-top: 40px; margin-top: 40px;
margin-left: 10%; margin-left: 10%;
padding-bottom: 10px; padding-bottom: 10px;
.examineReason{
::v-deep .el-form-item__content{
display: flex;
}
}
.remarksDiv{ .remarksDiv{
::v-deep .el-form-item__label{
padding-left: 3%;
}
::v-deep .el-form-item__content{ ::v-deep .el-form-item__content{
display: flex; display: flex;
margin-left: 8%;
} }
} }
...@@ -3575,11 +3634,16 @@ export default { ...@@ -3575,11 +3634,16 @@ export default {
.submitButton { .submitButton {
margin-top: 50px; margin-top: 50px;
margin-left: 30%; margin-left: 24%;
padding-bottom: 50px; padding-bottom: 50px;
.buttoonSave{
.buttoon { width: 15%;
width: 130px; height: 32px;
border-radius: 4px;
}
.buttoonCommit{
margin-left: 16%;
width: 15%;
height: 32px; height: 32px;
background: #0057ff; background: #0057ff;
border-radius: 4px; border-radius: 4px;
......
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