Skip to content

T
template_vue
Commit daca314a authored by Hagsn3's avatar Hagsn3
Browse files
Options

111

parent 89ab0b57
Hide whitespace changes
Inline Side-by-side
Showing with 210 additions and 97 deletions
src/views/checkList.vue
View file @ daca314a
...@@ -73,8 +73,8 @@ ...@@ -73,8 +73,8 @@
<div class="recordOneContainer"> <div class="recordOneContainer">
<div class="inspectionStandards"> <div class="inspectionStandards">
<el-form :model="inspectJbAl2o3List"> <el-form :model="inspectJbAl2o3List">
<el-form-item label="检验标准1:" label-width="80"> <el-form-item label="检验标准1:" label-width="80" >
<el-input v-model="inspectJbAl2o3List.standardOne" class="inspectionStandardsInput" /> <el-input v-model="inspectJbAl2o3List.standardOne" @blur="getInspect" class="inspectionStandardsInput" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<div class="inspectionStandards"> <div class="inspectionStandards">
<el-form :model="inspectJbAl2o3List"> <el-form :model="inspectJbAl2o3List">
<el-form-item label="检验标准2:" label-width="80"> <el-form-item label="检验标准2:" label-width="80">
<el-input v-model="inspectJbAl2o3List.standardTwo" class="inspectionStandardsInput" /> <el-input v-model="inspectJbAl2o3List.standardTwo" @blur="getInspect" class="inspectionStandardsInput" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -162,8 +162,7 @@ ...@@ -162,8 +162,7 @@
</div> </div>
<div class="inspect"> <div class="inspect">
<div class="inspectDate">检验日期: {{ inspectJbAl2o3List.date }}</div> <div class="inspectDate">检验日期: {{ inspectJbAl2o3List.oneJcDate }}</div>
<div class="inspectTime">检验时间: {{ inspectJbAl2o3List.time }}</div>
<div class="inspectPerson">检验人: {{ inspectJbAl2o3List.inspector }}</div> <div class="inspectPerson">检验人: {{ inspectJbAl2o3List.inspector }}</div>
</div> </div>
<!-- 计算结果--> <!-- 计算结果-->
...@@ -183,19 +182,19 @@ ...@@ -183,19 +182,19 @@
<div class="recordOne"> <div class="recordOne">
<!-- 标题 --> <!-- 标题 -->
<div class="recordThreeTitle"> <div class="recordThreeTitle">
检查记录1 检查记录3
</div> </div>
<!-- 检查内容--> <!-- 检查内容-->
<div class="recordOneContainer"> <div class="recordOneContainer">
<div class="inspectionStandards"> <div class="inspectionStandards">
<el-form :model="inspectJbAl2o3List"> <el-form :model="inspectJbAl2o3List">
<el-form-item label="检验标准1:" label-width="80"> <el-form-item label="检验标准1:" label-width="80">
<el-input v-model="inspectJbAl2o3List.limitOne" class="inspectionStandardsInput" /> <el-input v-model="inspectJbAl2o3List.limitOne" class="inspectionStandardsInput" @blur="getInspectNext" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :model="inspectJbAl2o3List"> <el-form :model="inspectJbAl2o3List">
<el-form-item label="检验标准2:" label-width="80"> <el-form-item label="检验标准2:" label-width="80">
<el-input v-model="inspectJbAl2o3List.limitTwo" class="inspectionStandardsInput" /> <el-input v-model="inspectJbAl2o3List.limitTwo" class="inspectionStandardsInput" @blur="getInspectNext" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -213,10 +212,14 @@ ...@@ -213,10 +212,14 @@
<div class="Value">{{ item.differenceValue }}</div> <div class="Value">{{ item.differenceValue }}</div>
</div> </div>
</div> </div>
<div class="inspect">
<div class="inspectDate">检验日期: {{ inspectJbAl2o3List.twoJcDate }}</div>
<div class="inspectPerson">检验人: {{ inspectJbAl2o3List.inspector }}</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="标签三" name="third"> <el-tab-pane label="标签三" name="third">
...@@ -455,7 +458,7 @@ ...@@ -455,7 +458,7 @@
</div> </div>
<div v-if="showButton" class="submitButton"> <div v-if="showButton" class="submitButton">
<el-button class="buttoon" type="primary" @click="submitControl">保存</el-button> <el-button class="buttoon" type="primary" @click="submitControl">保存</el-button>
<el-button class="buttoon" type="primary" >保存</el-button> <el-button class="buttoon" type="primary" @click="present">提交</el-button>
</div> </div>
<div v-if="!showButton" class="submitButton"> <div v-if="!showButton" class="submitButton">
<el-button class="buttoon" type="primary">同意</el-button> <el-button class="buttoon" type="primary">同意</el-button>
...@@ -467,7 +470,9 @@ ...@@ -467,7 +470,9 @@
<script> <script>
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
import { addIncomeInspectInfo } from '@/api/oneTbale'
import { parseTime } from '@/utils'
import { getInfo } from '@/api/login'
export default { export default {
name: 'CheckList', name: 'CheckList',
data() { data() {
...@@ -510,18 +515,17 @@ export default { ...@@ -510,18 +515,17 @@ export default {
// 表单 // 表单
inspectInfoList:{ inspectInfoList:{
businessId: undefined, businessId: undefined,
jcPn: 'XXX', jcPn: '',
jcCj: 'XXX', jcCj: '',
jcCode: 'XXX', jcCode: '',
jcLot: 'XXX', jcLot: '',
jcNum: 'XXX', jcNum: '',
jcRank: 'XX', jcRank: '',
jcFacadeCy: 'XXX', jcFacadeCy: undefined,
jcFacadeBl: 'XXX', jcFacadeBl: undefined,
jcResult: '1', jcResult: '1',
remarks: '', remarks: '',
jcFacadeCy:'', approveStatus: '0'
jcFacadeBl:''
}, },
//审核部分 //审核部分
inspectsForm:{ inspectsForm:{
...@@ -532,17 +536,19 @@ export default { ...@@ -532,17 +536,19 @@ export default {
}, },
// 表单二 // 表单二
inspectJbAl2o3List:{ inspectJbAl2o3List:{
oneJcUser: undefined,
oneJcDate: undefined,
twoJcUser: undefined,
twoJcDate: undefined,
limitOne:undefined, limitOne:undefined,
limitTwo:undefined, limitTwo:undefined,
businessId: undefined, businessId: undefined,
standardOne: '合格', standardOne: undefined,
standardTwo: '不合格', standardTwo: undefined,
standardOneData:undefined, standardOneData:undefined,
standardTwoData:undefined, standardTwoData:undefined,
recordData:'', recordData:'',
date: '2023-02-15', inspector: undefined,
time: '12:30',
inspector: 'XX',
firstHdN: undefined, firstHdN: undefined,
firstHdPn: undefined, firstHdPn: undefined,
firstHdRes: undefined, firstHdRes: undefined,
...@@ -569,237 +575,344 @@ export default { ...@@ -569,237 +575,344 @@ export default {
limitData: undefined limitData: undefined
}, },
// 检查记录1 // 检查记录1
recode1: [ recode1: [],
// 检查记录2
recode2: [],
// 检查记录3
recode3: []
}
},
created() {
this.resetRecord()
},
methods: {
parseTime,
// 获取检验时间和检验人
getInspect() {
let time = parseTime(new Date(),'{y}-{m}-{d} {h}:{i}:{s}')
this.inspectJbAl2o3List.oneJcDate = time
getInfo().then(res => {
console.log('res',res)
this.inspectJbAl2o3List.oneJcUser = Number(res.data.user.businessId)
this.inspectJbAl2o3List.inspector = res.data.user.nickName
})
},
getInspectNext() {
let time = parseTime(new Date(),'{y}-{m}-{d} {h}:{i}:{s}')
this.inspectJbAl2o3List.twoJcDate = time
getInfo().then(res => {
console.log('res',res)
this.inspectJbAl2o3List.twoJcUser = Number(res.data.user.businessId)
this.inspectJbAl2o3List.inspector = res.data.user.nickName
})
},
// 重值
resetRecord(){
this.recode1 = [
{ {
// 记录数据 // 记录数据
recordData: '61.224', recordData: '',
differenceValue: '', differenceValue: '',
differenceValue1: '', differenceValue1: '',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.224', recordData: '',
differenceValue: '0.001', differenceValue: '0.001',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.226', recordData: '',
differenceValue: '0.001', differenceValue: '0.001',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.224', recordData: '',
differenceValue: '0.002', differenceValue: '0.002',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.225', recordData: '',
differenceValue: '0.001', differenceValue: '0.001',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.224', recordData: '',
differenceValue: '0.001', differenceValue: '0.001',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.224', recordData: '',
differenceValue: '0.002', differenceValue: '0.002',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.223', recordData: '',
differenceValue: '0.001', differenceValue: '0.001',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.224', recordData: '',
differenceValue: '0.001', differenceValue: '0.001',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.225', recordData: '',
differenceValue: '0.001', differenceValue: '0.001',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
} }
], ]
// 检查记录2 this.recode2 = [
recode2: [
{ {
// 记录数据 // 记录数据
recordData: '61.224', recordData: '',
differenceValue: '', differenceValue: '',
differenceValue1: '', differenceValue1: '',
differenceValue2: '71.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.225', recordData: '',
differenceValue: '0.02', differenceValue: '0.001',
differenceValue1: '0.02', differenceValue1: '0.001',
differenceValue2: '71.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.226', recordData: '',
differenceValue: '0.02', differenceValue: '0.001',
differenceValue1: '0.02', differenceValue1: '0.001',
differenceValue2: '71.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.224', recordData: '',
differenceValue: '0.02', differenceValue: '0.002',
differenceValue1: '0.02', differenceValue1: '0.001',
differenceValue2: '71.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.225', recordData: '',
differenceValue: '0.02', differenceValue: '0.001',
differenceValue1: '0.02', differenceValue1: '0.001',
differenceValue2: '71.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.224', recordData: '',
differenceValue: '0.02', differenceValue: '0.001',
differenceValue1: '0.02', differenceValue1: '0.001',
differenceValue2: '71.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.224', recordData: '',
differenceValue: '0.02', differenceValue: '0.002',
differenceValue1: '0.02', differenceValue1: '0.001',
differenceValue2: '71.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.223', recordData: '',
differenceValue: '0.02', differenceValue: '0.001',
differenceValue1: '0.02', differenceValue1: '0.001',
differenceValue2: '71.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.224', recordData: '',
differenceValue: '0.02', differenceValue: '0.001',
differenceValue1: '0.02', differenceValue1: '0.001',
differenceValue2: '71.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.225', recordData: '',
differenceValue: '0.02', differenceValue: '0.001',
differenceValue1: '0.02', differenceValue1: '0.001',
differenceValue2: '71.224' differenceValue2: '61.224'
} }
], ]
// 检查记录3 this.recode3 = [
recode3: [
{ {
// 记录数据 // 记录数据
recordData: '61.224', recordData: '',
differenceValue: '', differenceValue: '',
differenceValue1: '', differenceValue1: '',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.225', recordData: '',
differenceValue: '0.001', differenceValue: '0.001',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.226', recordData: '',
differenceValue: '0.001', differenceValue: '0.001',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.224', recordData: '',
differenceValue: '0.002', differenceValue: '0.002',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.225', recordData: '',
differenceValue: '0.001', differenceValue: '0.001',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.224', recordData: '',
differenceValue: '0.001', differenceValue: '0.001',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.224', recordData: '',
differenceValue: '0.002', differenceValue: '0.002',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.223', recordData: '',
differenceValue: '0.001', differenceValue: '0.001',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.224', recordData: '',
differenceValue: '0.001', differenceValue: '0.001',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
}, },
{ {
// 记录数据 // 记录数据
recordData: '61.225', recordData: '',
differenceValue: '0.001', differenceValue: '0.001',
differenceValue1: '0.001', differenceValue1: '0.001',
differenceValue2: '61.224' differenceValue2: '61.224'
} }
] ]
} },
}, resetInspectInfo() {
methods: { this.inspectInfoList = {
businessId: undefined,
jcPn: '',
jcCj: '',
jcCode: '',
jcLot: '',
jcNum: '',
jcRank: '',
jcFacadeCy: undefined,
jcFacadeBl: undefined,
jcResult: '1',
remarks: '',
approveStatus: '0'
}
},
reaetinspectJbAl2o3List() {
this.inspectJbAl2o3List={
limitOne:undefined,
limitTwo:undefined,
businessId: undefined,
standardOne: undefined,
standardTwo: undefined,
standardOneData:undefined,
standardTwoData:undefined,
recordData:undefined,
firstHdN: undefined,
firstHdPn: undefined,
firstHdRes: undefined,
wxN: undefined,
wxPn: undefined,
wxRes: undefined,
cyN: undefined,
cyPn: undefined,
cyRes: undefined,
finalRes: undefined,
noProject: undefined,
wgKx: undefined,
wgLlw: undefined,
wgWlw: undefined,
wgJbwq: undefined,
wgZk: undefined,
wgSh: undefined,
wgBm: undefined,
wgTc: undefined,
wgQg: undefined,
wgCq: undefined,
wgFf: undefined,
wgTf: undefined,
limitData: undefined
}
},
submitControl() { submitControl() {
this.inspectJbAl2o3List.standardOneData = this.getStringByArray(this.recode1) this.inspectJbAl2o3List.standardOneData = this.getStringByArray(this.recode1)
this.inspectJbAl2o3List.standardTwoData = this.getStringByArray(this.recode2) this.inspectJbAl2o3List.standardTwoData = this.getStringByArray(this.recode2)
this.inspectJbAl2o3List.limitData = this.getStringByArray(this.recode3) this.inspectJbAl2o3List.limitData = this.getStringByArray(this.recode3)
this.inspectInfoList.approveStatus = '0'
let obj = {
incomeInspectInfo: this.inspectInfoList,
incomeInspectJbAl2o3: this.inspectJbAl2o3List
}
console.log('obj',obj)
addIncomeInspectInfo(obj).then( response=> {
console.log('re',response)
if (response.code==200){
this.msgSuccess('保存成功')
}
});
},
present() {
this.inspectJbAl2o3List.standardOneData = this.getStringByArray(this.recode1)
this.inspectJbAl2o3List.standardTwoData = this.getStringByArray(this.recode2)
this.inspectJbAl2o3List.limitData = this.getStringByArray(this.recode3)
this.inspectInfoList.approveStatus = '1'
var obj = { var obj = {
inspectInfo: this.inspectInfoList, incomeInspectInfo: this.inspectInfoList,
inspectJbAl2o3: this.inspectJbAl2o3List incomeInspectJbAl2o3: this.inspectJbAl2o3List
} }
console.log('obj',obj) console.log('obj',obj)
addIncomeInspectInfo(obj).then( response=> {
console.log('re',response)
if (response.code==200){
this.msgSuccess('提交成功')
this.resetInspectInfo()
this.reaetinspectJbAl2o3List()
this.resetRecord()
}
});
}, },
// 根据数组得到字符串 // 根据数组得到字符串
getStringByArray: function(recodeList) { getStringByArray: function(recodeList) {
......
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