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
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 81 deletions
src/views/checkList.vue
View file @ b9b92d6e
...@@ -253,8 +253,9 @@ ...@@ -253,8 +253,9 @@
<!-- 检查内容--> <!-- 检查内容-->
<div class="recordOneContainer"> <div class="recordOneContainer">
<div class="inspectionStandards"> <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 <el-input
v-model="inspectJbAl2o3List.limitOne" v-model="inspectJbAl2o3List.limitOne"
class="inspectionStandardsInput" class="inspectionStandardsInput"
...@@ -265,9 +266,7 @@ ...@@ -265,9 +266,7 @@
@input="CalculateDifference" @input="CalculateDifference"
/> />
</el-form-item> </el-form-item>
</el-form> <el-form-item label="检验标准2:" prop="limitTwo">
<el-form ref="inspectJbAl2o3List" :model="inspectJbAl2o3List" :rules="rules">
<el-form-item label="检验标准2:" label-width="80" prop="limitTwo">
<el-input <el-input
v-model="inspectJbAl2o3List.limitTwo" v-model="inspectJbAl2o3List.limitTwo"
class="inspectionStandardsInput" class="inspectionStandardsInput"
...@@ -278,12 +277,10 @@ ...@@ -278,12 +277,10 @@
@input="CalculateDifference" @input="CalculateDifference"
/> />
</el-form-item> </el-form-item>
</el-form> <el-form-item label="差异:" prop="limitThree">
<el-form ref="inspectJbAl2o3List" class="isDifferentContent" :model="inspectJbAl2o3List" :rules="rules">
<el-form-item label="差异:" label-width="80" prop="limitThree">
<el-input <el-input
v-model="inspectJbAl2o3List.limitThree" v-model="inspectJbAl2o3List.limitThree"
class="inspectionDifferentInput" class="inspectionStandardsInput"
:maxlength="7" :maxlength="7"
:disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1') :disabled="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')
|| (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )" || (controlsForm.controls == '3' && controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
...@@ -300,23 +297,25 @@ ...@@ -300,23 +297,25 @@
<!-- 下方列表--> <!-- 下方列表-->
<div class="recordThreeContent"> <div class="recordThreeContent">
<div v-for="(item,index) in recode3" :key="index" :class="index === 0? 'oneContent': 'Content'"> <div v-for="(item,index) in recode3" :key="index" :class="index === 0? 'oneContent': 'Content'">
<div class="number">{{ index + 1 }}</div> <div class="twoDiv">
<div class="recordData"> <div class="number">{{ index + 1 }}</div>
<el-input <div class="recordData">
v-model="item.recordData" <el-input
:maxlength="7" v-model="item.recordData"
:disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1' :maxlength="7"
:disabled="controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1'
|| (controlsForm.controls == '3' &&controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )" || (controlsForm.controls == '3' &&controlsForm.approveStatus === '1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"
@input="handleData3Input(index)" @input="handleData3Input(index)"
/> />
<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') ||
(controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' ))" (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' ))"
class="el-icon-circle-close" class="el-icon-circle-close"
style="color: #5cbce5" style="color: #5cbce5"
@click="clearInspectionFormThree(index)" @click="clearInspectionFormThree(index)"
/> />
</div>
</div> </div>
<div class="Value"> <div class="Value">
<TextToolTip :text="item.differenceValue" :max-length="8" :disabled-show="false" /></div> <TextToolTip :text="item.differenceValue" :max-length="8" :disabled-show="false" /></div>
...@@ -2593,8 +2592,9 @@ export default { ...@@ -2593,8 +2592,9 @@ export default {
//} //}
.recordThreeContent { .recordThreeContent {
width: 80%; width: 60%;
margin-left: 15%; margin-left: 20%;
//margin-left: 15%;
padding-bottom: 3%; padding-bottom: 3%;
//padding-top: 30px; //padding-top: 30px;
//padding-left: 90px; //padding-left: 90px;
...@@ -2602,48 +2602,46 @@ export default { ...@@ -2602,48 +2602,46 @@ export default {
display: flex; display: flex;
margin-top: 16px; margin-top: 16px;
padding-bottom: 16px; padding-bottom: 16px;
margin-left: 10%; //margin-left: 10%;
.twoDiv{
.compareValue {
margin-left: 29.7%;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
color: #606266;
display: flex;
align-items: center;
}
.number {
width: 9px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
color: #606266;
display: flex; display: flex;
align-items: center; width: 60%;
} .number {
.recordData { width: 9px;
width: 27.5%; font-size: 14px;
display: flex; font-family: Microsoft YaHei, Microsoft YaHei-400;
margin-left: 3%; font-weight: 400;
.el-icon-circle-close{ color: #606266;
cursor: pointer;
display: flex; display: flex;
align-items: center; align-items: center;
margin-left: 10px; }
.recordData {
width: 80%;
display: flex;
margin-left: 3%;
.el-icon-circle-close{
cursor: pointer;
display: flex;
align-items: center;
margin-left: 10px;
}
} }
} }
.Value { .Value {
//margin-left: 20px; //margin-left: 20px;
//margin-top: 8px; //margin-top: 8px;
width: 64px; width: 40%;
display: flex;
justify-content: center;
padding-right: 1%;
height: 18px; height: 18px;
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;
text-align: LEFT; text-align: LEFT;
color: #0057ff; color: #0057ff;
margin-left: 27%; //margin-left: 27%;
margin-top: 1%; margin-top: 1%;
} }
...@@ -2654,46 +2652,53 @@ export default { ...@@ -2654,46 +2652,53 @@ export default {
margin-top: 16px; margin-top: 16px;
padding-bottom: 16px; padding-bottom: 16px;
//justify-content: center; //justify-content: center;
margin-left: 10%; //margin-left: 10%;
.twoDiv{
.number {
width: 9px;
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
color: #606266;
display: flex; display: flex;
align-items: center; width: 60%;
} .number {
width: 9px;
.recordData { font-size: 14px;
//margin-left: 4%; font-family: Microsoft YaHei, Microsoft YaHei-400;
//margin-right: 2%; font-weight: 400;
width: 27.5%; color: #606266;
margin-left: 3%;
height: 32px;
border-radius: 4px;
display: flex;
.el-icon-circle-close{
cursor: pointer;
display: flex; display: flex;
align-items: center; align-items: center;
margin-left: 10px; }
.recordData {
//margin-left: 4%;
//margin-right: 2%;
width: 80%;
margin-left: 3%;
height: 32px;
border-radius: 4px;
display: flex;
.el-icon-circle-close{
cursor: pointer;
display: flex;
align-items: center;
margin-left: 10px;
}
} }
} }
.Value { .Value {
//margin-left: 20px; //margin-left: 20px;
//margin-top: 8px; //margin-top: 8px;
width: 64px; width: 40%;
display: flex;
justify-content: center;
height: 18px; height: 18px;
padding-right: 1%;
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;
text-align: LEFT; text-align: LEFT;
color: #0057ff; color: #0057ff;
margin-left: 27%; //margin-left: 27%;
margin-top: 1%; margin-top: 1%;
} }
} }
...@@ -3167,7 +3172,8 @@ export default { ...@@ -3167,7 +3172,8 @@ export default {
} }
.inspect { .inspect {
width: 58%; width: 80%;
margin-left: 13%;
height: auto; height: auto;
display: flex; display: flex;
margin-left: 13%; margin-left: 13%;
...@@ -3177,7 +3183,7 @@ export default { ...@@ -3177,7 +3183,7 @@ export default {
.inspectDate { .inspectDate {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
width: 30%; width: 50%;
font-family: Microsoft YaHei, Microsoft YaHei-400; font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400; font-weight: 400;
} }
...@@ -3193,7 +3199,7 @@ export default { ...@@ -3193,7 +3199,7 @@ export default {
.inspectPerson { .inspectPerson {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
width: 19%; width: 50%;
font-family: Microsoft YaHei, Microsoft YaHei-400; font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 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