Skip to content

T
template_vue
Commit 416303e4 authored by hubaoshan's avatar hubaoshan
Browse files
Options

1

parent a2f38d94
Hide whitespace changes
Inline Side-by-side
Showing with 214 additions and 77 deletions
src/views/template/incomeWmsBox.vue
View file @ 416303e4
...@@ -316,7 +316,8 @@ export default { ...@@ -316,7 +316,8 @@ export default {
rules: { rules: {
}, },
typeList: [], typeList: [],
typelistTemp: [] typelistTemp: [],
temp: []
} }
}, },
computed: { computed: {
...@@ -438,19 +439,15 @@ export default { ...@@ -438,19 +439,15 @@ export default {
submitForm: function() { submitForm: function() {
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
if (this.form.businessId !== undefined) { const data = {
updateIncomeWmsBox(this.form).then(response => { labelId: this.form.businessId
this.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
addIncomeWmsBox(this.form).then(response => {
this.msgSuccess('新增成功')
this.open = false
this.getList()
})
} }
console.log(this.form)
updateIncomeWmsBox(data).then(response => {
this.msgSuccess('修改成功')
this.open = false
this.getList()
})
} }
}) })
}, },
...@@ -477,11 +474,19 @@ export default { ...@@ -477,11 +474,19 @@ export default {
listIncomeWmsLabel().then(response => { listIncomeWmsLabel().then(response => {
this.typelistTemp = response.rows this.typelistTemp = response.rows
this.typeList = [] this.typeList = []
console.log(row.pn)
this.typelistTemp.forEach(item => { this.typelistTemp.forEach(item => {
const type = item.mac + ' ' + item.location if (item.pn === row.pn) {
this.typeList.push(type) this.form = item
const type = item.mac + ' ' + item.location
const abc = {
businessId: item.businessId,
location: item.location
}
this.typeList.push(type)
this.temp.push(abc)
}
}) })
console.log('typeList' + this.typeList)
this.open = true this.open = true
this.title = '修改库存管理' this.title = '修改库存管理'
}) })
......
src/views/template/templateFirst.vue
View file @ 416303e4
...@@ -52,8 +52,12 @@ ...@@ -52,8 +52,12 @@
<div class="right"> <div class="right">
<el-form-item> <el-form-item>
<div class="scanAndPrint"> <div class="scanAndPrint">
<el-button class="scanCodeTop" type="primary" @click="scanCodes"><div class="scanTest">扫码</div></el-button> <el-button class="scanCodeTop" type="primary" @click="scanCodes">
<el-button v-print="printOption" class="printCodeTop" type="primary"><div class="printTest">打印</div></el-button> <div class="scanTest">扫码</div>
</el-button>
<el-button v-print="printOption" class="printCodeTop" type="primary">
<div class="printTest">打印</div>
</el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="rank:" prop="jcRank"> <el-form-item label="rank:" prop="jcRank">
...@@ -103,7 +107,13 @@ ...@@ -103,7 +107,13 @@
<!-- 检查内容--> <!-- 检查内容-->
<div class="recordOneContainer"> <div class="recordOneContainer">
<div class="inspectionStandards"> <div class="inspectionStandards">
<el-form ref="inspectJbAl2o3List" label-width="80" label-position="right" :model="inspectJbAl2o3List" :rules="rules"> <el-form
ref="inspectJbAl2o3List"
label-width="80"
label-position="right"
:model="inspectJbAl2o3List"
:rules="rules"
>
<el-form-item label="检验标准1:" prop="standardOne"> <el-form-item label="检验标准1:" prop="standardOne">
<el-input <el-input
v-model="inspectJbAl2o3List.standardOne" v-model="inspectJbAl2o3List.standardOne"
...@@ -892,11 +902,31 @@ ...@@ -892,11 +902,31 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<div class="tableHear"><span class="textStyle">判定结果</span></div> <div class="tableHear"><span class="textStyle">判定结果</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordOneFirstResult[0].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordOneFirstResult[0].value }}</span></div> <div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordOneFirstResult[1].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordOneFirstResult[1].value }}</span></div> :class="oneRecordOneFirstResult[0].value === '合格'? 'passJudgment': 'rejectJudgment'"
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordOneFirstResult[2].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordOneFirstResult[2].value }}</span></div> >{{
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordOneFirstResult[3].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordOneFirstResult[3].value }}</span></div> oneRecordOneFirstResult[0].value
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordOneFirstResult[4].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordOneFirstResult[4].value }}</span></div> }}</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span
:class="oneRecordOneFirstResult[1].value === '合格'? 'passJudgment': 'rejectJudgment'"
>{{
oneRecordOneFirstResult[1].value
}}</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span
:class="oneRecordOneFirstResult[2].value === '合格'? 'passJudgment': 'rejectJudgment'"
>{{
oneRecordOneFirstResult[2].value
}}</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span
:class="oneRecordOneFirstResult[3].value === '合格'? 'passJudgment': 'rejectJudgment'"
>{{
oneRecordOneFirstResult[3].value
}}</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span
:class="oneRecordOneFirstResult[4].value === '合格'? 'passJudgment': 'rejectJudgment'"
>{{
oneRecordOneFirstResult[4].value
}}</span></div>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<div class="tableHear"><span class="textStyle">平均</span></div> <div class="tableHear"><span class="textStyle">平均</span></div>
...@@ -938,11 +968,31 @@ ...@@ -938,11 +968,31 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<div class="tableHear"><span class="textStyle">判定结果</span></div> <div class="tableHear"><span class="textStyle">判定结果</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordsecondResult[0].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordsecondResult[0].value }}</span></div> <div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordsecondResult[1].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordsecondResult[1].value }}</span></div> :class="oneRecordsecondResult[0].value === '合格'? 'passJudgment': 'rejectJudgment'"
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordsecondResult[2].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordsecondResult[2].value }}</span></div> >{{
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordsecondResult[3].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordsecondResult[3].value }}</span></div> oneRecordsecondResult[0].value
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span :class="oneRecordsecondResult[4].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ oneRecordsecondResult[4].value }}</span></div> }}</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span
:class="oneRecordsecondResult[1].value === '合格'? 'passJudgment': 'rejectJudgment'"
>{{
oneRecordsecondResult[1].value
}}</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span
:class="oneRecordsecondResult[2].value === '合格'? 'passJudgment': 'rejectJudgment'"
>{{
oneRecordsecondResult[2].value
}}</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span
:class="oneRecordsecondResult[3].value === '合格'? 'passJudgment': 'rejectJudgment'"
>{{
oneRecordsecondResult[3].value
}}</span></div>
<div :class="disableInput? 'fifteenOtherTableContainer' : 'otherTableContainer'"><span
:class="oneRecordsecondResult[4].value === '合格'? 'passJudgment': 'rejectJudgment'"
>{{
oneRecordsecondResult[4].value
}}</span></div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
...@@ -1014,7 +1064,7 @@ ...@@ -1014,7 +1064,7 @@
<el-col :span="10"> <el-col :span="10">
<div class="tableHear"><span class="textStyle">输入</span></div> <div class="tableHear"><span class="textStyle">输入</span></div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{ disableInput? 16:11 }}</div> <div class="tableTitle">{{ disableInput ? 16 : 11 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+0+'.recordData'" :ref="'recode2.'+0+'.recordData'"
...@@ -1041,7 +1091,7 @@ ...@@ -1041,7 +1091,7 @@
</div> </div>
</div> </div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{ disableInput? 17:12 }}</div> <div class="tableTitle">{{ disableInput ? 17 : 12 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+1+'.recordData'" :ref="'recode2.'+1+'.recordData'"
...@@ -1068,7 +1118,7 @@ ...@@ -1068,7 +1118,7 @@
</div> </div>
</div> </div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{ disableInput? 18:13 }}</div> <div class="tableTitle">{{ disableInput ? 18 : 13 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+2+'.recordData'" :ref="'recode2.'+2+'.recordData'"
...@@ -1095,7 +1145,7 @@ ...@@ -1095,7 +1145,7 @@
</div> </div>
</div> </div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{ disableInput? 19:14 }}</div> <div class="tableTitle">{{ disableInput ? 19 : 14 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+3+'.recordData'" :ref="'recode2.'+3+'.recordData'"
...@@ -1122,7 +1172,7 @@ ...@@ -1122,7 +1172,7 @@
</div> </div>
</div> </div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{ disableInput? 20:15 }}</div> <div class="tableTitle">{{ disableInput ? 20 : 15 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+4+'.recordData'" :ref="'recode2.'+4+'.recordData'"
...@@ -1149,7 +1199,7 @@ ...@@ -1149,7 +1199,7 @@
</div> </div>
</div> </div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{ disableInput? 21:16 }}</div> <div class="tableTitle">{{ disableInput ? 21 : 16 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+5+'.recordData'" :ref="'recode2.'+5+'.recordData'"
...@@ -1176,7 +1226,7 @@ ...@@ -1176,7 +1226,7 @@
</div> </div>
</div> </div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{ disableInput? 22:17 }}</div> <div class="tableTitle">{{ disableInput ? 22 : 17 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+6+'.recordData'" :ref="'recode2.'+6+'.recordData'"
...@@ -1203,7 +1253,7 @@ ...@@ -1203,7 +1253,7 @@
</div> </div>
</div> </div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{ disableInput? 23:18 }}</div> <div class="tableTitle">{{ disableInput ? 23 : 18 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+7+'.recordData'" :ref="'recode2.'+7+'.recordData'"
...@@ -1230,7 +1280,7 @@ ...@@ -1230,7 +1280,7 @@
</div> </div>
</div> </div>
<div class="tableContainer"> <div class="tableContainer">
<div class="tableTitle">{{ disableInput? 24:19 }}</div> <div class="tableTitle">{{ disableInput ? 24 : 19 }}</div>
<div class="tableInput"> <div class="tableInput">
<el-form-item <el-form-item
:ref="'recode2.'+8+'.recordData'" :ref="'recode2.'+8+'.recordData'"
...@@ -1257,7 +1307,7 @@ ...@@ -1257,7 +1307,7 @@
</div> </div>
</div> </div>
<div class="tableContainer" style="margin-bottom: 40px"> <div class="tableContainer" style="margin-bottom: 40px">
<div class="tableTitle">{{ disableInput? 25:20 }}</div> <div class="tableTitle">{{ disableInput ? 25 : 20 }}</div>
<div class="tableInput"> <div class="tableInput">
<div class="recordData"> <div class="recordData">
<el-form-item <el-form-item
...@@ -1326,11 +1376,31 @@ ...@@ -1326,11 +1376,31 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<div class="tableHear"><span class="textStyle">判定结果</span></div> <div class="tableHear"><span class="textStyle">判定结果</span></div>
<div class="otherTableContainer"><span :class="twoRecordOneFirstResult[0].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordOneFirstResult[0].value }}</span></div> <div class="otherTableContainer"><span
<div class="otherTableContainer"><span :class="twoRecordOneFirstResult[1].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordOneFirstResult[1].value }}</span></div> :class="twoRecordOneFirstResult[0].value === '合格'? 'passJudgment': 'rejectJudgment'"
<div class="otherTableContainer"><span :class="twoRecordOneFirstResult[2].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordOneFirstResult[2].value }}</span></div> >{{
<div class="otherTableContainer"><span :class="twoRecordOneFirstResult[3].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordOneFirstResult[3].value }}</span></div> twoRecordOneFirstResult[0].value
<div class="otherTableContainer"><span :class="twoRecordOneFirstResult[4].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordOneFirstResult[4].value }}</span></div> }}</span></div>
<div class="otherTableContainer"><span
:class="twoRecordOneFirstResult[1].value === '合格'? 'passJudgment': 'rejectJudgment'"
>{{
twoRecordOneFirstResult[1].value
}}</span></div>
<div class="otherTableContainer"><span
:class="twoRecordOneFirstResult[2].value === '合格'? 'passJudgment': 'rejectJudgment'"
>{{
twoRecordOneFirstResult[2].value
}}</span></div>
<div class="otherTableContainer"><span
:class="twoRecordOneFirstResult[3].value === '合格'? 'passJudgment': 'rejectJudgment'"
>{{
twoRecordOneFirstResult[3].value
}}</span></div>
<div class="otherTableContainer"><span
:class="twoRecordOneFirstResult[4].value === '合格'? 'passJudgment': 'rejectJudgment'"
>{{
twoRecordOneFirstResult[4].value
}}</span></div>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<div class="tableHear"><span class="textStyle">平均</span></div> <div class="tableHear"><span class="textStyle">平均</span></div>
...@@ -1372,11 +1442,31 @@ ...@@ -1372,11 +1442,31 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<div class="tableHear"><span class="textStyle">判定结果</span></div> <div class="tableHear"><span class="textStyle">判定结果</span></div>
<div class="otherTableContainer"><span :class="twoRecordsecondResult[0].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordsecondResult[0].value }}</span></div> <div class="otherTableContainer"><span
<div class="otherTableContainer"><span :class="twoRecordsecondResult[1].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordsecondResult[1].value }}</span></div> :class="twoRecordsecondResult[0].value === '合格'? 'passJudgment': 'rejectJudgment'"
<div class="otherTableContainer"><span :class="twoRecordsecondResult[2].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordsecondResult[2].value }}</span></div> >{{
<div class="otherTableContainer"><span :class="twoRecordsecondResult[3].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordsecondResult[3].value }}</span></div> twoRecordsecondResult[0].value
<div class="otherTableContainer"><span :class="twoRecordsecondResult[4].value === '合格'? 'passJudgment': 'rejectJudgment'">{{ twoRecordsecondResult[4].value }}</span></div> }}</span></div>
<div class="otherTableContainer"><span
:class="twoRecordsecondResult[1].value === '合格'? 'passJudgment': 'rejectJudgment'"
>{{
twoRecordsecondResult[1].value
}}</span></div>
<div class="otherTableContainer"><span
:class="twoRecordsecondResult[2].value === '合格'? 'passJudgment': 'rejectJudgment'"
>{{
twoRecordsecondResult[2].value
}}</span></div>
<div class="otherTableContainer"><span
:class="twoRecordsecondResult[3].value === '合格'? 'passJudgment': 'rejectJudgment'"
>{{
twoRecordsecondResult[3].value
}}</span></div>
<div class="otherTableContainer"><span
:class="twoRecordsecondResult[4].value === '合格'? 'passJudgment': 'rejectJudgment'"
>{{
twoRecordsecondResult[4].value
}}</span></div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
...@@ -2322,7 +2412,14 @@ ...@@ -2322,7 +2412,14 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="标签四" name="fourthly"> <el-tab-pane label="标签四" name="fourthly">
<div class="fourTarContainer" style="height: 1100px"> <div class="fourTarContainer" style="height: 1100px">
<tagfour :default-index="inspectJbAl2o3List.sheetIndex" :default-controls="controlsForm.approveStatus" :default-object="tabfourForm" @ShowTabel="getIsShowTabel" @sheetIndex="handleSheetIndex" @tarFrom="handleTarForm" /> <tagfour
:default-index="inspectJbAl2o3List.sheetIndex"
:default-controls="controlsForm.approveStatus"
:default-object="tabfourForm"
@ShowTabel="getIsShowTabel"
@sheetIndex="handleSheetIndex"
@tarFrom="handleTarForm"
/>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
...@@ -3752,7 +3849,10 @@ export default { ...@@ -3752,7 +3849,10 @@ export default {
this.averageRecordTwo[number - 1].value = avge this.averageRecordTwo[number - 1].value = avge
// 计算第一个判定结果 // 计算第一个判定结果
if (this.inspectJbAl2o3List.standardTwo && this.inspectJbAl2o3List.standardTwo !== '' && this.inspectJbAl2o3List.standtwoPlus && this.inspectJbAl2o3List.standtwoPlus !== '' && this.inspectJbAl2o3List.standtwoCy && this.inspectJbAl2o3List.standtwoCy !== '') { if (this.inspectJbAl2o3List.standardTwo && this.inspectJbAl2o3List.standardTwo !== '' && this.inspectJbAl2o3List.standtwoPlus && this.inspectJbAl2o3List.standtwoPlus !== '' && this.inspectJbAl2o3List.standtwoCy && this.inspectJbAl2o3List.standtwoCy !== '') {
const { min, max } = this.standardRadius(this.inspectJbAl2o3List.standardTwo, this.inspectJbAl2o3List.standtwoPlus, this.inspectJbAl2o3List.standtwoCy) const {
min,
max
} = this.standardRadius(this.inspectJbAl2o3List.standardTwo, this.inspectJbAl2o3List.standtwoPlus, this.inspectJbAl2o3List.standtwoCy)
if (min !== null && max !== null && discrepancy && discrepancy !== '') { if (min !== null && max !== null && discrepancy && discrepancy !== '') {
const floatMin = parseFloat(min) const floatMin = parseFloat(min)
const floatMax = parseFloat(max) const floatMax = parseFloat(max)
...@@ -3815,7 +3915,10 @@ export default { ...@@ -3815,7 +3915,10 @@ export default {
this.discrepancyRecordOneList[number - 1].value = discrepancy this.discrepancyRecordOneList[number - 1].value = discrepancy
if (this.inspectJbAl2o3List.standardOne && this.inspectJbAl2o3List.standardOne !== '' && this.inspectJbAl2o3List.standonePlus && this.inspectJbAl2o3List.standonePlus && this.inspectJbAl2o3List.standoneCy && this.inspectJbAl2o3List.standoneCy !== '') { if (this.inspectJbAl2o3List.standardOne && this.inspectJbAl2o3List.standardOne !== '' && this.inspectJbAl2o3List.standonePlus && this.inspectJbAl2o3List.standonePlus && this.inspectJbAl2o3List.standoneCy && this.inspectJbAl2o3List.standoneCy !== '') {
// 获取两个最值 // 获取两个最值
const { min, max } = this.standardRadius(this.inspectJbAl2o3List.standardOne, this.inspectJbAl2o3List.standonePlus, this.inspectJbAl2o3List.standoneCy) const {
min,
max
} = this.standardRadius(this.inspectJbAl2o3List.standardOne, this.inspectJbAl2o3List.standonePlus, this.inspectJbAl2o3List.standoneCy)
if (min !== null && max !== null && discrepancy && discrepancy !== '') { if (min !== null && max !== null && discrepancy && discrepancy !== '') {
const floatMin = parseFloat(min) const floatMin = parseFloat(min)
const floatMax = parseFloat(max) const floatMax = parseFloat(max)
...@@ -3879,7 +3982,10 @@ export default { ...@@ -3879,7 +3982,10 @@ export default {
this.averageRecordOne[number - 1].value = avge this.averageRecordOne[number - 1].value = avge
// 计算第一个判定结果 // 计算第一个判定结果
if (this.inspectJbAl2o3List.standardOne && this.inspectJbAl2o3List.standardOne !== '' && this.inspectJbAl2o3List.standonePlus && this.inspectJbAl2o3List.standonePlus !== '' && this.inspectJbAl2o3List.standoneCy && this.inspectJbAl2o3List.standoneCy !== '') { if (this.inspectJbAl2o3List.standardOne && this.inspectJbAl2o3List.standardOne !== '' && this.inspectJbAl2o3List.standonePlus && this.inspectJbAl2o3List.standonePlus !== '' && this.inspectJbAl2o3List.standoneCy && this.inspectJbAl2o3List.standoneCy !== '') {
const { min, max } = this.standardRadius(this.inspectJbAl2o3List.standardOne, this.inspectJbAl2o3List.standonePlus, this.inspectJbAl2o3List.standoneCy) const {
min,
max
} = this.standardRadius(this.inspectJbAl2o3List.standardOne, this.inspectJbAl2o3List.standonePlus, this.inspectJbAl2o3List.standoneCy)
if (min !== null && max !== null && discrepancy && discrepancy !== '') { if (min !== null && max !== null && discrepancy && discrepancy !== '') {
const floatMin = parseFloat(min) const floatMin = parseFloat(min)
const floatMax = parseFloat(max) const floatMax = parseFloat(max)
...@@ -5196,6 +5302,7 @@ export default { ...@@ -5196,6 +5302,7 @@ export default {
::v-deep .el-input__inner { ::v-deep .el-input__inner {
padding-right: 13px; padding-right: 13px;
} }
::v-deep .el-upload-list { ::v-deep .el-upload-list {
display: flex; display: flex;
margin-top: 1px; margin-top: 1px;
...@@ -5323,30 +5430,36 @@ export default { ...@@ -5323,30 +5430,36 @@ export default {
.right { .right {
margin-left: 6%; margin-left: 6%;
width: 45%; width: 45%;
.scanAndPrint{
.scanAndPrint {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.scanCodeTop { .scanCodeTop {
width: 30%; width: 30%;
background: #0057ff; background: #0057ff;
border-radius: 4px; border-radius: 4px;
.scanTest{
.scanTest {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
} }
} }
.printCodeTop{
.printCodeTop {
width: 30%; width: 30%;
border-radius: 4px; border-radius: 4px;
.printTest{
.printTest {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
} }
} }
} }
::v-deep .el-form-item__label { ::v-deep .el-form-item__label {
width: 100px; width: 100px;
height: 18px; height: 18px;
...@@ -5403,11 +5516,12 @@ export default { ...@@ -5403,11 +5516,12 @@ export default {
margin-top: 12px; margin-top: 12px;
} }
.fourTarContainer{ .fourTarContainer {
width: 74%; width: 74%;
margin-left: 13%; margin-left: 13%;
//height: 600px; //height: 600px;
} }
.OneTable { .OneTable {
.checkTicketOne { .checkTicketOne {
width: 74%; width: 74%;
...@@ -5436,6 +5550,7 @@ export default { ...@@ -5436,6 +5550,7 @@ export default {
.recordOne { .recordOne {
margin-left: 13%; margin-left: 13%;
width: 74%; width: 74%;
.recordOneTitle { .recordOneTitle {
width: 84px; width: 84px;
height: 22px; height: 22px;
...@@ -5484,17 +5599,19 @@ export default { ...@@ -5484,17 +5599,19 @@ export default {
height: auto; height: auto;
background: rgba(0, 87, 255, 0.05); background: rgba(0, 87, 255, 0.05);
border-radius: 4px; border-radius: 4px;
.inspectionStandardLabel{
::v-deep .el-form-item__label{ .inspectionStandardLabel {
width: 86px; ::v-deep .el-form-item__label {
} width: 86px;
} }
}
.inspectionStandards { .inspectionStandards {
width: 88%; width: 88%;
margin-left: 6%; margin-left: 6%;
padding-top: 20px; padding-top: 20px;
.inspectDifferent{ .inspectDifferent {
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;
...@@ -5520,9 +5637,11 @@ export default { ...@@ -5520,9 +5637,11 @@ export default {
width: 79%; width: 79%;
margin-left: 16%; margin-left: 16%;
padding-bottom: 3%; padding-bottom: 3%;
.oneContent { .oneContent {
display: flex; display: flex;
margin-top: 16px; margin-top: 16px;
.twoDiv { .twoDiv {
display: flex; display: flex;
width: 60%; width: 60%;
...@@ -5587,6 +5706,7 @@ export default { ...@@ -5587,6 +5706,7 @@ export default {
display: flex; display: flex;
margin-top: 16px; margin-top: 16px;
padding-bottom: 16px; padding-bottom: 16px;
.twoDiv { .twoDiv {
display: flex; display: flex;
width: 60%; width: 60%;
...@@ -5769,6 +5889,7 @@ export default { ...@@ -5769,6 +5889,7 @@ export default {
.recordOne { .recordOne {
margin-left: 13%; margin-left: 13%;
width: 74%; width: 74%;
.recordOneTitle { .recordOneTitle {
width: 84px; width: 84px;
height: 22px; height: 22px;
...@@ -5813,8 +5934,9 @@ export default { ...@@ -5813,8 +5934,9 @@ export default {
width: 88%; width: 88%;
margin-left: 6%; margin-left: 6%;
padding-top: 20px; padding-top: 20px;
.inspectionStandardLabel{
::v-deep .el-form-item__label{ .inspectionStandardLabel {
::v-deep .el-form-item__label {
width: 86px; width: 86px;
} }
} }
...@@ -6182,6 +6304,7 @@ export default { ...@@ -6182,6 +6304,7 @@ export default {
} }
} }
} }
.twoImg { .twoImg {
margin-left: 16px; margin-left: 16px;
} }
...@@ -6384,39 +6507,45 @@ export default { ...@@ -6384,39 +6507,45 @@ export default {
} }
} }
} }
// 标签1的检查列表 // 标签1的检查列表
.CheckFormTableOne{ .CheckFormTableOne {
margin-left: 6%; margin-left: 6%;
// 表头的样式 // 表头的样式
.tableHear{ .tableHear {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-bottom: 40px margin-bottom: 40px
} }
// 第一个输入的内容 // 第一个输入的内容
.tableContainer{ .tableContainer {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
margin-bottom: 20px; margin-bottom: 20px;
.tableTitle{
.tableTitle {
display: flex; display: flex;
height: 32px; height: 32px;
align-items: center; align-items: center;
} }
// 输入框样式 // 输入框样式
.tableInput{ .tableInput {
width: 80%; width: 80%;
} }
.TableRemove{
.TableRemove {
display: flex; display: flex;
height: 32px; height: 32px;
align-items: center; align-items: center;
} }
} }
// 其他的内容 // 其他的内容
.otherTableContainer{ .otherTableContainer {
display: flex; display: flex;
justify-content: center; justify-content: center;
//height: 171px; //height: 171px;
...@@ -6424,8 +6553,9 @@ export default { ...@@ -6424,8 +6553,9 @@ export default {
margin-bottom: 48px; margin-bottom: 48px;
align-items: center; align-items: center;
} }
// 其他的内容 // 其他的内容
.fifteenOtherTableContainer{ .fifteenOtherTableContainer {
display: flex; display: flex;
justify-content: center; justify-content: center;
height: 171px; height: 171px;
...@@ -6435,13 +6565,14 @@ export default { ...@@ -6435,13 +6565,14 @@ export default {
} }
// 字体的样式 // 字体的样式
.textStyle{ .textStyle {
font-family: Microsoft YaHei, Microsoft YaHei-700; font-family: Microsoft YaHei, Microsoft YaHei-700;
font-weight: 700; font-weight: 700;
color: #606266; color: #606266;
} }
// 判定合格的样式 // 判定合格的样式
.passJudgment{ .passJudgment {
display: flex; display: flex;
justify-content: center; justify-content: center;
height: 18px; height: 18px;
...@@ -6450,8 +6581,9 @@ export default { ...@@ -6450,8 +6581,9 @@ export default {
font-weight: 400; font-weight: 400;
color: #0057ff; color: #0057ff;
} }
// 判定不合格的样式 // 判定不合格的样式
.rejectJudgment{ .rejectJudgment {
display: flex; display: flex;
justify-content: center; justify-content: center;
height: 18px; height: 18px;
......
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