Skip to content

T
template_vue
Commit 18a40791 authored by 高宇's avatar 高宇
Browse files
Options

1.提交

parent c4e5826f
Show whitespace changes
Inline Side-by-side
Showing with 190 additions and 49 deletions
src/views/template/templateFirst.vue
View file @ 18a40791
......@@ -686,7 +686,7 @@
/>
</div>
</div>
<div class="tableContainer" style="margin-bottom: 40px">
<div class="tableContainer">
<div class="tableTitle" style="margin-left: -12px">10</div>
<div class="tableInput">
<el-form-item
......@@ -714,7 +714,7 @@
/>
</div>
</div>
<div class="tableContainer" style="margin-bottom: 40px">
<div class="tableContainer" >
<div class="tableTitle" style="margin-left: -12px">11</div>
<div class="tableInput">
<el-form-item
......@@ -741,7 +741,7 @@
/>
</div>
</div>
<div class="tableContainer" style="margin-bottom: 40px">
<div class="tableContainer">
<div class="tableTitle" style="margin-left: -12px">12</div>
<div class="tableInput">
<el-form-item
......@@ -768,7 +768,7 @@
/>
</div>
</div>
<div class="tableContainer" style="margin-bottom: 40px">
<div class="tableContainer" >
<div class="tableTitle" style="margin-left: -12px">13</div>
<div class="tableInput">
<el-form-item
......@@ -795,7 +795,7 @@
/>
</div>
</div>
<div class="tableContainer" style="margin-bottom: 40px">
<div class="tableContainer" >
<div class="tableTitle" style="margin-left: -12px">14</div>
<div class="tableInput">
<el-form-item
......@@ -822,7 +822,7 @@
/>
</div>
</div>
<div class="tableContainer" style="margin-bottom: 40px">
<div class="tableContainer" >
<div class="tableTitle" style="margin-left: -12px">15</div>
<div class="tableInput">
<el-form-item
......@@ -3013,6 +3013,142 @@ export default {
this.handleCyPn()
},
methods: {
resetRecordOne() {
this.inspectJbAl2o3List.recode1 = [
{
// 记录数据
recordData: ''
},
{
// 记录数据
recordData: ''
},
{
// 记录数据
recordData: ''
},
{
// 记录数据
recordData: ''
},
{
// 记录数据
recordData: ''
},
{
// 记录数据
recordData: '',
},
{
// 记录数据
recordData: ''
},
{
// 记录数据
recordData: '',
},
{
// 记录数据
recordData: ''
},
{
// 记录数据
recordData: ''
},
{
// 记录数据
recordData: '',
},
{
// 记录数据
recordData: ''
},
{
// 记录数据
recordData: ''
},
{
// 记录数据
recordData: ''
},
{
// 记录数据
recordData: ''
}
]
// 标签一的检查一的差异
this.discrepancyRecordOneList = [
{
value: ''
},
{
value: ''
},
{
value: ''
},
{
value: ''
},
{
value: ''
}
]
// 标签一的检查一的第一个判断结果
this.oneRecordOneFirstResult = [
{
value: ''
},
{
value: ''
},
{
value: ''
},
{
value: ''
},
{
value: ''
}
],
// 标签一的检查一的平均
this.averageRecordOne = [
{
value: ''
},
{
value: ''
},
{
value: ''
},
{
value: ''
},
{
value: ''
}
],
// 标签一的检查一的第二个判断结果
this.oneRecordsecondResult = [
{
value: ''
},
{
value: ''
},
{
value: ''
},
{
value: ''
},
{
value: ''
}
]
},
clearRecord() {
this.discrepancyRecordTwoList = [
{
......@@ -3264,7 +3400,7 @@ export default {
}
},
numTypeTwo(rule, value, callback) {
if (!this.disableInput) {
if (this.disableInput) {
if (!value || value === '') {
callback(new Error('请输入该信息'))
} else {
......@@ -3423,7 +3559,7 @@ export default {
if (min !== null && max !== null) {
const floatMin = parseFloat(min);
const floatMax = parseFloat(max);
if (discrepancy > floatMin && discrepancy <floatMax) {
if (discrepancy >= floatMin && discrepancy <= floatMax) {
this.twoRecordOneFirstResult[0].value = '合格'
} else {
this.twoRecordOneFirstResult[0].value = '不合格'
......@@ -3440,7 +3576,7 @@ export default {
console.log('num',num)
if (num != null) {
const floatNum = parseFloat(num);
if (avge < floatNum) {
if (avge <= floatNum) {
this.twoRecordsecondResult[0].value = '合格'
} else {
this.twoRecordsecondResult[0].value = '不合格'
......@@ -3478,7 +3614,7 @@ export default {
if (min !== null && max !== null && discrepancy && discrepancy !== '') {
const floatMin = parseFloat(min);
const floatMax = parseFloat(max);
if (discrepancy > floatMin && discrepancy <floatMax) {
if (discrepancy >= floatMin && discrepancy <=floatMax) {
this.twoRecordOneFirstResult[1].value = '合格'
} else {
this.twoRecordOneFirstResult[1].value = '不合格'
......@@ -3495,7 +3631,7 @@ export default {
console.log('num',num)
if (num != null) {
const floatNum = parseFloat(num);
if (avge < floatNum ) {
if (avge <= floatNum ) {
this.twoRecordsecondResult[1].value = '合格'
} else {
this.twoRecordsecondResult[1].value = '不合格'
......@@ -3533,7 +3669,7 @@ export default {
if (min !== null && max !== null && discrepancy && discrepancy !== '' ) {
const floatMin = parseFloat(min);
const floatMax = parseFloat(max);
if (discrepancy > floatMin && discrepancy <floatMax) {
if (discrepancy >= floatMin && discrepancy <= floatMax) {
this.twoRecordOneFirstResult[2].value = '合格'
} else {
this.twoRecordOneFirstResult[2].value = '不合格'
......@@ -3550,7 +3686,7 @@ export default {
console.log('num',num)
if (num != null && avge && avge !== '') {
const floatNum = parseFloat(num);
if (avge < floatNum) {
if (avge <= floatNum) {
this.twoRecordsecondResult[2].value = '合格'
} else {
this.twoRecordsecondResult[2].value = '不合格'
......@@ -3588,7 +3724,7 @@ export default {
if (min !== null && max !== null && discrepancy && discrepancy !== '') {
const floatMin = parseFloat(min);
const floatMax = parseFloat(max);
if (discrepancy > floatMin && discrepancy <floatMax) {
if (discrepancy >= floatMin && discrepancy <= floatMax) {
this.twoRecordOneFirstResult[3].value = '合格'
} else {
this.twoRecordOneFirstResult[3].value = '不合格'
......@@ -3605,7 +3741,7 @@ export default {
console.log('num',num)
if (num != null && avge && avge !== '') {
const floatNum = parseFloat(num);
if (avge < floatNum) {
if (avge <= floatNum) {
this.twoRecordsecondResult[3].value = '合格'
} else {
this.twoRecordsecondResult[3].value = '不合格'
......@@ -3643,7 +3779,7 @@ export default {
if (min !== null && max !== null && discrepancy && discrepancy !== '' ) {
const floatMin = parseFloat(min);
const floatMax = parseFloat(max);
if (discrepancy > floatMin && discrepancy <floatMax) {
if (discrepancy >= floatMin && discrepancy <=floatMax) {
this.twoRecordOneFirstResult[4].value = '合格'
} else {
this.twoRecordOneFirstResult[4].value = '不合格'
......@@ -3660,7 +3796,7 @@ export default {
console.log('num',num)
if (num != null && avge && avge !== '') {
const floatNum = parseFloat(num);
if (avge < floatNum) {
if (avge <= floatNum) {
this.twoRecordsecondResult[4].value = '合格'
} else {
this.twoRecordsecondResult[4].value = '不合格'
......@@ -3705,7 +3841,7 @@ export default {
if (min !== null && max !== null && discrepancy && discrepancy !== '') {
const floatMin = parseFloat(min);
const floatMax = parseFloat(max);
if (discrepancy > floatMin && discrepancy <floatMax) {
if (discrepancy >= floatMin && discrepancy <=floatMax) {
this.oneRecordOneFirstResult[0].value = '合格'
} else {
this.oneRecordOneFirstResult[0].value = '不合格'
......@@ -3729,7 +3865,7 @@ export default {
const {num} =this.standardRecordRadius(this.inspectJbAl2o3List.standonePx)
if (num != null) {
const floatNum = parseFloat(num);
if (avge < floatNum) {
if (avge <= floatNum) {
this.oneRecordsecondResult[0].value = '合格'
} else {
this.oneRecordsecondResult[0].value = '不合格'
......@@ -3759,7 +3895,7 @@ export default {
if (min !== null && max !== null && discrepancy && discrepancy !== '') {
const floatMin = parseFloat(min);
const floatMax = parseFloat(max);
if (discrepancy > floatMin && discrepancy <floatMax) {
if (discrepancy >= floatMin && discrepancy <= floatMax) {
this.oneRecordOneFirstResult[1].value = '合格'
} else {
this.oneRecordOneFirstResult[1].value = '不合格'
......@@ -3783,7 +3919,7 @@ export default {
const {num} =this.standardRecordRadius(this.inspectJbAl2o3List.standonePx)
if (num != null) {
const floatNum = parseFloat(num);
if (avge < floatNum) {
if (avge <= floatNum) {
this.oneRecordsecondResult[1].value = '合格'
} else {
this.oneRecordsecondResult[1].value = '不合格'
......@@ -3813,7 +3949,7 @@ export default {
if (min !== null && max !== null && discrepancy && discrepancy !== '') {
const floatMin = parseFloat(min);
const floatMax = parseFloat(max);
if (discrepancy > floatMin && discrepancy <floatMax) {
if (discrepancy >= floatMin && discrepancy <=floatMax) {
this.oneRecordOneFirstResult[2].value = '合格'
} else {
this.oneRecordOneFirstResult[2].value = '不合格'
......@@ -3837,7 +3973,7 @@ export default {
const {num} =this.standardRecordRadius(this.inspectJbAl2o3List.standonePx)
if (num != null) {
const floatNum = parseFloat(num);
if (avge < floatNum) {
if (avge <= floatNum) {
this.oneRecordsecondResult[2].value = '合格'
} else {
this.oneRecordsecondResult[2].value = '不合格'
......@@ -3867,7 +4003,7 @@ export default {
if (min !== null && max !== null && discrepancy && discrepancy !== '') {
const floatMin = parseFloat(min);
const floatMax = parseFloat(max);
if (discrepancy > floatMin && discrepancy <floatMax) {
if (discrepancy >= floatMin && discrepancy <= floatMax) {
this.oneRecordOneFirstResult[3].value = '合格'
} else {
this.oneRecordOneFirstResult[3].value = '不合格'
......@@ -3891,7 +4027,7 @@ export default {
const {num} =this.standardRecordRadius(this.inspectJbAl2o3List.standonePx)
if (num != null) {
const floatNum = parseFloat(num);
if (avge < floatNum) {
if (avge <= floatNum) {
this.oneRecordsecondResult[3].value = '合格'
} else {
this.oneRecordsecondResult[3].value = '不合格'
......@@ -3921,7 +4057,7 @@ export default {
if (min !== null && max !== null && discrepancy && discrepancy !== '') {
const floatMin = parseFloat(min);
const floatMax = parseFloat(max);
if (discrepancy > floatMin && discrepancy <floatMax) {
if (discrepancy >= floatMin && discrepancy <= floatMax) {
this.oneRecordOneFirstResult[4].value = '合格'
} else {
this.oneRecordOneFirstResult[4].value = '不合格'
......@@ -3945,7 +4081,7 @@ export default {
const {num} =this.standardRecordRadius(this.inspectJbAl2o3List.standonePx)
if (num != null) {
const floatNum = parseFloat(num);
if (avge < floatNum) {
if (avge <= floatNum) {
this.oneRecordsecondResult[4].value = '合格'
} else {
this.oneRecordsecondResult[4].value = '不合格'
......@@ -3985,7 +4121,7 @@ export default {
if (min !== null && max !== null) {
const floatMin = parseFloat(min);
const floatMax = parseFloat(max);
if (discrepancy > floatMin && discrepancy <floatMax) {
if (discrepancy >= floatMin && discrepancy <= floatMax) {
this.oneRecordOneFirstResult[0].value = '合格'
} else {
this.oneRecordOneFirstResult[0].value = '不合格'
......@@ -4002,7 +4138,7 @@ export default {
console.log('num',num)
if (num != null) {
const floatNum = parseFloat(num);
if (avge < floatNum) {
if (avge <= floatNum) {
this.oneRecordsecondResult[0].value = '合格'
} else {
this.oneRecordsecondResult[0].value = '不合格'
......@@ -4040,7 +4176,7 @@ export default {
if (min !== null && max !== null && discrepancy && discrepancy !== '') {
const floatMin = parseFloat(min);
const floatMax = parseFloat(max);
if (discrepancy > floatMin && discrepancy <floatMax) {
if (discrepancy >= floatMin && discrepancy <= floatMax) {
this.oneRecordOneFirstResult[1].value = '合格'
} else {
this.oneRecordOneFirstResult[1].value = '不合格'
......@@ -4057,7 +4193,7 @@ export default {
console.log('num',num)
if (num != null) {
const floatNum = parseFloat(num);
if (avge < floatNum ) {
if (avge <= floatNum ) {
this.oneRecordsecondResult[1].value = '合格'
} else {
this.oneRecordsecondResult[1].value = '不合格'
......@@ -4095,7 +4231,7 @@ export default {
if (min !== null && max !== null && discrepancy && discrepancy !== '' ) {
const floatMin = parseFloat(min);
const floatMax = parseFloat(max);
if (discrepancy > floatMin && discrepancy <floatMax) {
if (discrepancy >= floatMin && discrepancy <= floatMax) {
this.oneRecordOneFirstResult[2].value = '合格'
} else {
this.oneRecordOneFirstResult[2].value = '不合格'
......@@ -4112,7 +4248,7 @@ export default {
console.log('num',num)
if (num != null && avge && avge !== '') {
const floatNum = parseFloat(num);
if (avge < floatNum) {
if (avge <=floatNum) {
this.oneRecordsecondResult[2].value = '合格'
} else {
this.oneRecordsecondResult[2].value = '不合格'
......@@ -4150,7 +4286,7 @@ export default {
if (min !== null && max !== null && discrepancy && discrepancy !== '') {
const floatMin = parseFloat(min);
const floatMax = parseFloat(max);
if (discrepancy > floatMin && discrepancy <floatMax) {
if (discrepancy >= floatMin && discrepancy <=floatMax) {
this.oneRecordOneFirstResult[3].value = '合格'
} else {
this.oneRecordOneFirstResult[3].value = '不合格'
......@@ -4167,7 +4303,7 @@ export default {
console.log('num',num)
if (num != null && avge && avge !== '') {
const floatNum = parseFloat(num);
if (avge < floatNum) {
if (avge <= floatNum) {
this.oneRecordsecondResult[3].value = '合格'
} else {
this.oneRecordsecondResult[3].value = '不合格'
......@@ -4205,7 +4341,7 @@ export default {
if (min !== null && max !== null && discrepancy && discrepancy !== '' ) {
const floatMin = parseFloat(min);
const floatMax = parseFloat(max);
if (discrepancy > floatMin && discrepancy <floatMax) {
if (discrepancy >= floatMin && discrepancy <= floatMax) {
this.oneRecordOneFirstResult[4].value = '合格'
} else {
this.oneRecordOneFirstResult[4].value = '不合格'
......@@ -4222,7 +4358,7 @@ export default {
console.log('num',num)
if (num != null && avge && avge !== '') {
const floatNum = parseFloat(num);
if (avge < floatNum) {
if (avge <= floatNum) {
this.oneRecordsecondResult[4].value = '合格'
} else {
this.oneRecordsecondResult[4].value = '不合格'
......@@ -4498,7 +4634,6 @@ export default {
if (response.data.transportOSSVoList && response.data.transportOSSVoList !== '' && response.data.transportOSSVoList.length > 0) {
response.data.transportOSSVoList.forEach(item => {
item.url = this.imageBaseUrl + item.url
console.log('url', item.url)
item.srcList = []
item.srcList.push(item.url)
})
......@@ -4587,11 +4722,17 @@ export default {
}
// this.handleJcCjChange(this.inspectInfoList.jcCj)
console.log('this.inspectInfoList.jcCj', this.inspectInfoList.jcCj)
if (this.inspectInfoList.jcCj === this.manufacturer[0].value) {
if (this.inspectInfoList.jcCj === this.manufacturer[2].value) {
this.disableInput = true
} else {
this.disableInput = false
}
for (let i=0;i<6; i++) {
this.handleRecordOneInput(i)
}
for (let i=0;i<6; i++) {
this.handleRecordTwoInput(i)
}
/** 审批信息**/
this.inspectInfoList.approveStatus = response.data.approveStatus
this.inspectsForm.approveUser = response.data.approveName
......@@ -4606,9 +4747,6 @@ export default {
getRecordList(list1) {
for (let i = 0; i < list1.length; i++) {
this.inspectJbAl2o3List.recode1[i].recordData = list1[i]
if (i < list1.length - 1) {
this.handleData1Input(i)
}
}
},
// 数组2
......@@ -4616,9 +4754,9 @@ export default {
console.log('list1', list1)
for (let i = 0; i < list1.length; i++) {
this.inspectJbAl2o3List.recode2[i].recordData = list1[i]
if (i < list1.length - 1) {
// this.handleData2Input(i)
}
// if (i < list1.length - 1) {
// // this.handleData2Input(i)
// }
}
},
// 数组3
......@@ -5322,9 +5460,12 @@ export default {
}
},
watch: {
'inspectInfoList.jc': {
handler(oldValue,newValue) {
console.log('oldValue',oldValue)
'inspectInfoList.jcCj': {
handler(newValue,oldValue) {
if (((oldValue === '1' || oldValue === '2') && newValue === '3') || oldValue === '3') {
// 切换类型需要清空检查一的列表数据
this.resetRecordOne()
}
},
}
}
......
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