Skip to content

T
template_vue
Commit 94c266aa authored by 孙浩's avatar 孙浩
Browse files
Options

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

parents d9a1b80d 1de56a3c
Hide whitespace changes
Inline Side-by-side
Showing with 283 additions and 164 deletions
src/views/checkList.vue
View file @ 94c266aa
......@@ -120,13 +120,16 @@
<div v-for="(item,index) in recode1" :key="index" :class="index === 0? 'oneContent': 'Content'">
<div class="number">{{ index + 1 }}</div>
<div class="recordData">
<el-input
v-model="item.recordData"
: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 ref="recode1" :rules="rules">
<el-form-item prop="recordData">
<el-input
v-model="item.recordData"
: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
v-show="!(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'||
(controlsForm.controls == '3' && controlsForm.approveStatus === '1') ||
......@@ -136,6 +139,9 @@
@click="clearForm(index)"
/>
</div>
<div class="contentDiv">
</div>
<div class="Value">
<TextToolTip :text="item.differenceValue" :max-length="8" :disabled-show="false" /></div>
......@@ -147,12 +153,12 @@
</div>
</div>
</div>
<div class="recordOneBottom">
<div class="recordOneBottomMax">最大值 :
{{ calculationForm.Maximum }}</div>
<div class="recordoneBottomMini">最小值 : {{ calculationForm.Minimum }}</div>
<div class="recordOneBottomAverage">平均值: {{ calculationForm.Average }}</div>
</div>
<!-- <div class="recordOneBottom">-->
<!-- <div class="recordOneBottomMax">最大值 :-->
<!-- {{ calculationForm.Maximum }}</div>-->
<!-- <div class="recordoneBottomMini">最小值 : {{ calculationForm.Minimum }}</div>-->
<!-- <div class="recordOneBottomAverage">平均值: {{ calculationForm.Average }}</div>-->
<!-- </div>-->
</div>
</div>
</div>
......@@ -189,42 +195,43 @@
<!-- 下方列表-->
<div class="recordOneContent">
<div v-for="(item,index) in recode2" :key="index" :class="index === 0? 'oneContent': 'Content'">
<div class="number">{{ index + 11 }}</div>
<div class="recordData">
<el-input
v-model="item.recordData"
:maxlength="7"
:disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'
<div class="oneDiv">
<div class="number">{{ index + 11 }}</div>
<div class="recordData">
<el-input
v-model="item.recordData"
:maxlength="7"
:disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
@input="handleData2Input(index)"
/>
@input="handleData2Input(index)"
/>
<i
v-show="!(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'||
<i
v-show="!(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'||
(controlsForm.controls == '3' && controlsForm.approveStatus === '1') ||
(controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' ))"
class="el-icon-circle-close"
style="color: #5cbce5"
@click="clearInspectionFormTwo(index)"
/>
</div>
<div class="Value">
<TextToolTip :text="item.differenceValue" :max-length="8" :disabled-show="false" /></div>
<div class="averageValue">
<TextToolTip :text="item.differenceValue1" :max-length="8" :disabled-show="false" />
</div>
<div class="compareValue">
<TextToolTip :text="item.differenceValue2" :max-length="8" :disabled-show="false" />
class="el-icon-circle-close"
style="color: #5cbce5"
@click="clearInspectionFormTwo(index)"
/>
</div>
</div>
<div class="Value">
<TextToolTip :text="item.differenceValue" :max-length="8" :disabled-show="false" /></div>
<div class="averageValue">
<TextToolTip :text="item.differenceValue1" :max-length="8" :disabled-show="false" />
</div>
<div class="compareValue">
<TextToolTip :text="item.differenceValue2" :max-length="8" :disabled-show="false" />
</div>
</div>
</div>
<div class="recordTwoBottom">
<div class="recordTwoBottomMax">最大值 : {{ calculationFormSecond.Maximum }}</div>
<div class="recordTwoBottomMini">最小值 : {{ calculationFormSecond.Minimum }}</div>
<div class="recordTwoBottomAverage">平均值: {{ calculationFormSecond.Average }}</div>
</div>
<!-- <div class="recordTwoBottom">-->
<!-- <div class="recordTwoBottomMax">最大值 : {{ calculationFormSecond.Maximum }}</div>-->
<!-- <div class="recordTwoBottomMini">最小值 : {{ calculationFormSecond.Minimum }}</div>-->
<!-- <div class="recordTwoBottomAverage">平均值: {{ calculationFormSecond.Average }}</div>-->
<!-- </div>-->
</div>
</div>
</div>
......@@ -273,7 +280,19 @@
/>
</el-form-item>
</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 class="recordFourTitle">
<div class="input">输入</div>
......@@ -600,6 +619,16 @@
</div>
<div class="inspectionResults">
<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="检验结果:">
<div
v-if="((controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')
......@@ -683,8 +712,8 @@
v-if="(controlsForm.controls ==='2'&& controlsForm.approveStatus ==='0') || (controlsForm.controls ==='2'&& controlsForm.approveStatus ==='3')"
class="submitButton"
>
<el-button class="buttoon" type="primary" style="background-color: #5cbce5" @click="submitControl">保存</el-button>
<el-button class="buttoon" type="primary" @click="present">提交</el-button>
<el-button class="buttoonSave" type="primary" style="background-color: #5cbce5" @click="submitControl">保存</el-button>
<el-button class="buttoonCommit" type="primary" @click="present">提交</el-button>
</div>
<!-- <div-->
<!-- v-if="(controlsForm.controls ==='3'&& controlsForm.approveStatus ==='1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"-->
......@@ -766,6 +795,13 @@ export default {
limitTwo: [
{ required: true, message: '请输入检验标准', trigger: 'blur' },
{ 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' }
]
},
......@@ -891,8 +927,6 @@ export default {
limitData: undefined,
ossIdList: []
},
// 差异值
limitDifference: '',
// 检查记录1
recode1: [],
// 检查记录2
......@@ -2263,6 +2297,16 @@ export default {
display: flex;
margin-left: 12%;
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 {
......@@ -2280,12 +2324,21 @@ export default {
.inspectionStandardsInput {
width: 50%;
}
.inspectDifferent{
margin-left: 10px;
padding-bottom: 13px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-700;
.isDifferentContent {
::v-deep .el-form-item__label{
}
.inspectionDifferentInput {
width: 50%;
margin-left: 5%;
}
}
//.inspectDifferent{
// margin-left: 10px;
// padding-bottom: 13px;
// font-size: 14px;
// font-family: Microsoft YaHei, Microsoft YaHei-700;
//}
}
.recordOneTitle {
......@@ -2461,31 +2514,31 @@ export default {
}
}
.recordOneBottom{
display: flex;
padding-bottom: 2%;
padding-left: 1%;
justify-content: space-between;
width: 77%;
.recordOneBottomMax{
width: 130px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
}
.recordoneBottomMini{
width: 130px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
}
.recordOneBottomAverage{
width: 130px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
}
}
//.recordOneBottom{
// display: flex;
// padding-bottom: 2%;
// padding-left: 1%;
// justify-content: space-between;
// width: 77%;
// .recordOneBottomMax{
// width: 130px;
// font-size: 14px;
// font-family: Microsoft YaHei, Microsoft YaHei-400;
// font-weight: 400;
// }
// .recordoneBottomMini{
// width: 130px;
// font-size: 14px;
// font-family: Microsoft YaHei, Microsoft YaHei-400;
// font-weight: 400;
// }
// .recordOneBottomAverage{
// width: 130px;
// font-size: 14px;
// font-family: Microsoft YaHei, Microsoft YaHei-400;
// font-weight: 400;
// }
//}
.recordThreeContent {
width: 80%;
......@@ -2817,38 +2870,77 @@ export default {
display: flex;
margin-top: 16px;
padding-bottom: 16px;
.oneDiv{
width: 25%;
display: flex;
.number {
width: 9px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
color: #606266;
display: flex;
align-items: center;
}
.compareValue {
margin-left: 25%;
.recordData {
display: flex;
width: 80%;
margin-left:11%;
.el-icon-circle-close{
display: flex;
align-items: center;
margin-left: 10px;
cursor: pointer;
}
}
}
.Value {
//margin-left: 20px;
//margin-top: 8px;
width: 25%;
display: flex;
justify-content: center;
padding-right: 3%;
height: 18px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
color: #606266;
text-align: LEFT;
color: #0057ff;
//margin-left: 5%;
margin-top: -3%;
}
.averageValue {
//margin-left: 12%;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
display: flex;
align-items: center;
justify-content: center;
padding-right: 11%;
font-size: 14px;
text-align: LEFT;
color: #0057ff;
width: 25%;
margin-top: -3%;
}
.number {
width: 9px;
.compareValue {
width: 25%;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
padding-right: 19.2%;
color: #606266;
//margin-left: 11%;
display: flex;
justify-content: center;
align-items: center;
}
.recordData {
display: flex;
margin-left: 3%;
width: 25%;
.el-icon-circle-close{
display: flex;
align-items: center;
margin-left: 10px;
cursor: pointer;
}
}
}
.Content {
......@@ -2856,98 +2948,110 @@ export default {
margin-top: 16px;
padding-bottom: 16px;
//justify-content: center;
.number {
width: 9px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
color: #606266;
display: flex;
align-items: center;
}
.recordData {
//margin-left: 4%;
//margin-right: 2%;
.oneDiv{
width: 25%;
margin-left: 3%;
height: 32px;
border-radius: 4px;
display: flex;
.el-icon-circle-close{
.number {
width: 9px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
color: #606266;
display: flex;
align-items: center;
margin-left: 10px;
cursor: pointer;
}
.recordData {
//margin-left: 4%;
//margin-right: 2%;
width: 80%;
margin-left:11%;
height: 32px;
border-radius: 4px;
display: flex;
.el-icon-circle-close{
display: flex;
align-items: center;
margin-left: 10px;
cursor: pointer;
}
}
}
.Value {
//margin-left: 20px;
//margin-top: 8px;
width: 64px;
width: 25%;
display: flex;
justify-content: center;
padding-right: 3%;
height: 18px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
text-align: LEFT;
color: #0057ff;
margin-left: 5%;
//margin-left: 5%;
margin-top: -3%;
}
}
.averageValue {
margin-left: 12%;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
font-size: 14px;
text-align: LEFT;
color: #0057ff;
width: 64px;
margin-top: -3%;
.averageValue {
//margin-left: 12%;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
display: flex;
justify-content: center;
padding-right: 11%;
font-size: 14px;
text-align: LEFT;
color: #0057ff;
width: 25%;
margin-top: -3%;
}
}
.compareValue {
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
color: #606266;
margin-left: 11%;
display: flex;
align-items: center;
.compareValue {
width: 25%;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
padding-right: 19.2%;
color: #606266;
//margin-left: 11%;
display: flex;
justify-content: center;
align-items: center;
}
}
}
.recordTwoBottom{
display: flex;
padding-bottom: 2%;
padding-left: 1%;
justify-content: space-between;
width: 77%;
.recordTwoBottomMax{
width: 130px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
}
.recordTwoBottomMini{
width: 130px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
}
.recordTwoBottomAverage{
width: 130px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
}
}
//.recordTwoBottom{
// display: flex;
// padding-bottom: 2%;
// padding-left: 1%;
// justify-content: space-between;
// width: 77%;
// .recordTwoBottomMax{
// width: 130px;
// font-size: 14px;
// font-family: Microsoft YaHei, Microsoft YaHei-400;
// font-weight: 400;
// }
// .recordTwoBottomMini{
// width: 130px;
// font-size: 14px;
// font-family: Microsoft YaHei, Microsoft YaHei-400;
// font-weight: 400;
// }
// .recordTwoBottomAverage{
// width: 130px;
// font-size: 14px;
// font-family: Microsoft YaHei, Microsoft YaHei-400;
// font-weight: 400;
// }
//}
}
}
......@@ -3385,9 +3489,19 @@ export default {
margin-top: 40px;
margin-left: 10%;
padding-bottom: 10px;
.examineReason{
::v-deep .el-form-item__content{
display: flex;
}
}
.remarksDiv{
::v-deep .el-form-item__label{
padding-left: 3%;
}
::v-deep .el-form-item__content{
display: flex;
margin-left: 8%;
}
}
......@@ -3521,11 +3635,16 @@ export default {
.submitButton {
margin-top: 50px;
margin-left: 30%;
margin-left: 24%;
padding-bottom: 50px;
.buttoon {
width: 130px;
.buttoonSave{
width: 15%;
height: 32px;
border-radius: 4px;
}
.buttoonCommit{
margin-left: 16%;
width: 15%;
height: 32px;
background: #0057ff;
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