Commit f5055d6b authored by Hagsn3's avatar Hagsn3

修改标签二

parent f4f7a075
......@@ -1219,17 +1219,21 @@
@input="CalculateDifference"
/>
</el-form-item>
<el-form-item label="差异:" prop="limitThree">
<el-input
v-model="inspectJbAl2o3List.limitThree"
class="inspectionStandardsInput"
:maxlength="7"
:disabled="(firstFromDisabled)"
@input="CalculateDifference"
/>
</el-form-item>
<!-- <el-form-item label="差异:" prop="limitThree">-->
<!-- <el-input-->
<!-- v-model="inspectJbAl2o3List.limitThree"-->
<!-- class="inspectionStandardsInput"-->
<!-- :maxlength="7"-->
<!-- :disabled="(firstFromDisabled)"-->
<!-- @input="CalculateDifference"-->
<!-- />-->
<!-- </el-form-item>-->
</el-form>
<!-- <div class="inspectDifferent">差异 : {{ }}</div>-->
<div
class="inspectDifferent"
:disabled="(firstFromDisabled)"
@input="CalculateDifference"
>差异 : {{ inspectJbAl2o3List.limitThree }}</div>
</div>
<div class="recordFourTitle">
<div class="input">输入</div>
......@@ -1248,12 +1252,12 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]"
>
<el-input
ref="input21"
ref="inspectInput1"
v-model="inspectJbAl2o3List.recode3[0].recordData"
:maxlength="IRMAXLENGTHTHREE"
:disabled="firstFromDisabled"
@input="handleData3Input(0)"
@keyup.enter.native="handelTab(21,$event)"
@keyup.enter.native="tagTwohandelTab(1,$event)"
/>
</el-form-item>
<i
......@@ -1282,12 +1286,12 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]"
>
<el-input
ref="input22"
ref="inspectInput2"
v-model="inspectJbAl2o3List.recode3[1].recordData"
:maxlength="IRMAXLENGTHTHREE"
:disabled="firstFromDisabled"
@input="handleData3Input(1)"
@keyup.enter.native="handelTab(22,$event)"
@keyup.enter.native="tagTwohandelTab(2,$event)"
/>
</el-form-item>
<i
......@@ -1316,12 +1320,12 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]"
>
<el-input
ref="input23"
ref="inspectInput3"
v-model="inspectJbAl2o3List.recode3[2].recordData"
:maxlength="IRMAXLENGTHTHREE"
:disabled="firstFromDisabled"
@input="handleData3Input(2)"
@keyup.enter.native="handelTab(23,$event)"
@keyup.enter.native="tagTwohandelTab(3,$event)"
/>
</el-form-item>
<i
......@@ -1350,12 +1354,12 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]"
>
<el-input
ref="input24"
ref="inspectInput4"
v-model="inspectJbAl2o3List.recode3[3].recordData"
:maxlength="IRMAXLENGTHTHREE"
:disabled="firstFromDisabled"
@input="handleData3Input(3)"
@keyup.enter.native="handelTab(24,$event)"
@keyup.enter.native="tagTwohandelTab(4,$event)"
/>
</el-form-item>
<i
......@@ -1384,12 +1388,12 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]"
>
<el-input
ref="input25"
ref="inspectInput5"
v-model="inspectJbAl2o3List.recode3[4].recordData"
:maxlength="IRMAXLENGTHTHREE"
:disabled="firstFromDisabled"
@input="handleData3Input(4)"
@keyup.enter.native="handelTab(25,$event)"
@keyup.enter.native="tagTwohandelTab(5,$event)"
/>
</el-form-item>
<i
......@@ -1418,12 +1422,12 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]"
>
<el-input
ref="input26"
ref="inspectInput6"
v-model="inspectJbAl2o3List.recode3[5].recordData"
:maxlength="IRMAXLENGTHTHREE"
:disabled="firstFromDisabled"
@input="handleData3Input(5)"
@keyup.enter.native="handelTab(26,$event)"
@keyup.enter.native="tagTwohandelTab(6,$event)"
/>
</el-form-item>
<i
......@@ -1452,12 +1456,12 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]"
>
<el-input
ref="input27"
ref="inspectInput7"
v-model="inspectJbAl2o3List.recode3[6].recordData"
:maxlength="IRMAXLENGTHTHREE"
:disabled="firstFromDisabled"
@input="handleData3Input(6)"
@keyup.enter.native="handelTab(27,$event)"
@keyup.enter.native="tagTwohandelTab(7,$event)"
/>
</el-form-item>
<i
......@@ -1486,12 +1490,12 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]"
>
<el-input
ref="input28"
ref="inspectInput8"
v-model="inspectJbAl2o3List.recode3[7].recordData"
:maxlength="IRMAXLENGTHTHREE"
:disabled="firstFromDisabled"
@input="handleData3Input(7)"
@keyup.enter.native="handelTab(28,$event)"
@keyup.enter.native="tagTwohandelTab(8,$event)"
/>
</el-form-item>
<i
......@@ -1520,12 +1524,12 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]"
>
<el-input
ref="input29"
ref="inspectInput9"
v-model="inspectJbAl2o3List.recode3[8].recordData"
:maxlength="IRMAXLENGTHTHREE"
:disabled="firstFromDisabled"
@input="handleData3Input(8)"
@keyup.enter.native="handelTab(29,$event)"
@keyup.enter.native="tagTwohandelTab(9,$event)"
/>
</el-form-item>
<i
......@@ -1554,12 +1558,12 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]"
>
<el-input
ref="input30"
ref="inspectInput10"
v-model="inspectJbAl2o3List.recode3[9].recordData"
:maxlength="IRMAXLENGTHTHREE"
:disabled="firstFromDisabled"
@input="handleData3Input(9)"
@keyup.enter.native="handelTab(30,$event)"
@keyup.enter.native="tagTwohandelTab(10,$event)"
/>
</el-form-item>
<i
......@@ -1588,12 +1592,12 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]"
>
<el-input
ref="input31"
ref="inspectInput11"
v-model="inspectJbAl2o3List.recode3[10].recordData"
:maxlength="IRMAXLENGTHTHREE"
:disabled="firstFromDisabled"
@input="handleData3Input(10)"
@keyup.enter.native="handelTab(31,$event)"
@keyup.enter.native="tagTwohandelTab(11,$event)"
/>
</el-form-item>
<i
......@@ -1622,12 +1626,12 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]"
>
<el-input
ref="input32"
ref="inspectInput12"
v-model="inspectJbAl2o3List.recode3[11].recordData"
:maxlength="IRMAXLENGTHTHREE"
:disabled="firstFromDisabled"
@input="handleData3Input(11)"
@keyup.enter.native="handelTab(32,$event)"
@keyup.enter.native="tagTwohandelTab(12,$event)"
/>
</el-form-item>
<i
......@@ -1640,7 +1644,7 @@
</div>
<div :class="inspectJbAl2o3List.recode3[11].differenceValue === '合格'? 'Value': 'errValue'">
<TextToolTip
:text="inspectJbAl2o3List.recode3[11].differenceValue"
:text="inspectJbAl2o3List.recode3[13].differenceValue"
:max-length="8"
:disabled-show="false"
/>
......@@ -1656,12 +1660,12 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]"
>
<el-input
ref="input33"
ref="inspectInput13"
v-model="inspectJbAl2o3List.recode3[12].recordData"
:maxlength="IRMAXLENGTHTHREE"
:disabled="firstFromDisabled"
@input="handleData3Input(12)"
@keyup.enter.native="handelTab(33,$event)"
@keyup.enter.native="tagTwohandelTab(13,$event)"
/>
</el-form-item>
<i
......@@ -1690,12 +1694,12 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]"
>
<el-input
ref="input34"
ref="inspectInput14"
v-model="inspectJbAl2o3List.recode3[13].recordData"
:maxlength="IRMAXLENGTHTHREE"
:disabled="firstFromDisabled"
@input="handleData3Input(13)"
@keyup.enter.native="handelTab(34,$event)"
@keyup.enter.native="tagTwohandelTab(14,$event)"
/>
</el-form-item>
<i
......@@ -1724,11 +1728,12 @@
:rules="[{required: true, validator: numType, trigger: 'blur'}]"
>
<el-input
ref="input35"
ref="inspectInput15"
v-model="inspectJbAl2o3List.recode3[14].recordData"
:maxlength="IRMAXLENGTHTHREE"
:disabled="firstFromDisabled"
@input="handleData3Input(14)"
@keyup.enter.native="tagTwohandelTab(15,$event)"
/>
</el-form-item>
<i
......@@ -1940,7 +1945,7 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col v-show="false" :span="12">
<el-form-item label="noProject:" class="wgLlwinspectJbAlInputBody1">
<el-input
v-model="inspectJbAl2o3List.noProject"
......@@ -2150,11 +2155,13 @@
<el-form :model="inspectInfoList" label-width="42" label-position="right">
<el-form-item label="检验原因:" class="examineReason">
<el-input
ref="inspect1"
v-model="inspectInfoList.jcCause"
type="textarea"
:disabled="firstFromDisabled"
:rows="6"
placeholder="请输入检验原因"
@keyup.enter.native="remarksSkip($event)"
/>
</el-form-item>
<el-form-item label="检验结果:" class="groupDiv">
......@@ -2174,6 +2181,7 @@
</el-form-item>
<el-form-item label="备注:" class="remarksDiv">
<el-input
ref="inspect2"
v-model="inspectInfoList.remarks"
type="textarea"
:disabled="firstFromDisabled "
......@@ -2465,7 +2473,7 @@ export default {
cyPn: '',
cyRes: undefined,
finalRes: undefined,
noProject: '5',
noProject: undefined,
wgKx: '',
wgLlw: '',
wgWlw: '',
......@@ -2640,16 +2648,42 @@ export default {
if (!that.$refs['input' + i]) {
return
}
console.log('i', i)
if (i < 20) {
that.activeName = 'first'
that.$nextTick(() => {
e.target.blur()
const index = i + 1
that.$refs['input' + index].focus()
})
} else {
that.activeName = 'second'
that.$nextTick(() => {
e.target.blur()
that.$refs['inspect1'].focus()
})
}
},
tagTwohandelTab(i, e) {
const that = this
if (!that.$refs['inspectInput' + i]) {
return
}
if (i < 15) {
that.$nextTick(() => {
e.target.blur()
const index = i + 1
that.$refs['inspectInput' + index].focus()
})
} else {
that.$nextTick(() => {
e.target.blur()
that.$refs['inspect1'].focus()
})
}
},
remarksSkip(e) {
const that = this
that.$nextTick(() => {
e.target.blur()
const index = i + 1
that.$refs['input' + index].focus()
that.$refs['inspect2'].focus()
})
},
// 给输入绑定动态id
......@@ -2896,7 +2930,6 @@ export default {
if (index >= 9 && this.inspectJbAl2o3List.recode2[index].recordData === '') {
this.inspectJbAl2o3List.recode2[index].differenceValue2 = ''
}
if (index < this.inspectJbAl2o3List.recode2.length) {
if (this.inspectJbAl2o3List.recode2[index].recordData === '') {
this.SumList1[index] = null
......@@ -2911,18 +2944,22 @@ export default {
/* 表单3的计算方法*/
handleData3Input(index) {
if (this.inspectJbAl2o3List.limitOne !== '' && this.inspectJbAl2o3List.limitTwo !== '') {
const limitOne = parseFloat(this.inspectJbAl2o3List.limitOne) - parseFloat(this.inspectJbAl2o3List.limitThree)
const limitTwo = parseFloat(this.inspectJbAl2o3List.limitTwo) + parseFloat(this.inspectJbAl2o3List.limitThree)
const limitOne = parseFloat(this.inspectJbAl2o3List.limitOne)
const limitTwo = parseFloat(this.inspectJbAl2o3List.limitTwo)
const recordData3 = this.inspectJbAl2o3List.recode3[index].recordData
this.inspectJbAl2o3List.limitThree = Math.abs(limitOne - limitTwo)
if (recordData3 !== '') {
const num = parseFloat(recordData3)
if (num >= limitOne && num <= limitTwo || num <= limitOne && num >= limitTwo) {
if (num >= limitOne && num <= limitTwo) {
this.inspectJbAl2o3List.recode3[index].differenceValue = '合格'
} else {
this.inspectJbAl2o3List.recode3[index].differenceValue = '不合格'
}
}
}
if (this.inspectJbAl2o3List.limitOne === '' || this.inspectJbAl2o3List.limitTwo === '') {
this.inspectJbAl2o3List.limitThree = ''
}
if (this.inspectJbAl2o3List.recode3[index].recordData === '' || this.inspectJbAl2o3List.limitOne === '' || this.inspectJbAl2o3List.limitTwo === '') {
this.inspectJbAl2o3List.recode3[index].differenceValue = ''
}
......@@ -2935,8 +2972,7 @@ export default {
this.calculate(this.removeEmptyValues(this.SumList2), 3)
}
},
// 计算limitOne和limitTwo的差异
// 计算limitOne和limitTwo的·
CalculateDifference() {
for (let i = 0; i < 15; i++) {
this.handleData3Input(i)
......@@ -3219,7 +3255,7 @@ export default {
console.log('params')
this.$WebView.openCamera(params).then(res => {
console.log('res', res)
this.imgUrlForm = JSON.parse(res)
this.imgUrlForm = JSON.parse(res)
console.log('imgUrlForm', this.imgUrlForm)
const obj = {
......@@ -4113,6 +4149,12 @@ export default {
width: 88%;
margin-left: 6%;
padding-top: 20px;
.inspectDifferent{
font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-400;
font-weight: 400;
margin-left: 6%;
}
.inspectionStandardsInput {
width: 50%;
......
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