Skip to content

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

111

parent 09efbd85
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 101 deletions
src/views/checkList.vue
View file @ 0599079f
......@@ -11,25 +11,25 @@
</div>
<!-- 中间文本-->
<div class="textDiv">
<span class="fontSp">{{oneForm.jcCode}}</span>
<span class="fontSp">{{ inspectInfoList.jcCode }}</span>
</div>
<!-- 下方表格-->
<div class="oneForm">
<el-form :model="oneForm" label-width="21">
<el-form :model="inspectInfoList" label-width="21">
<div class="formLabel">
<div class="left">
<el-form-item label="LOT:">
<el-input v-model="oneForm.jcLot" class="normalInput" />
<el-input v-model="inspectInfoList.jcLot" class="normalInput" />
</el-form-item>
<el-form-item label="厂家:">
<el-input v-model="oneForm.jcCj" class="scanInput" />
<el-input v-model="inspectInfoList.jcCj" class="scanInput" />
<el-button class="scanCode" type="primary" @click="scanCodes">扫码</el-button>
</el-form-item>
<el-form-item label="PN:">
<el-input v-model="oneForm.jcPn" class="normalInput" />
<el-input v-model="inspectInfoList.jcPn" class="normalInput" />
</el-form-item>
<el-form-item label="数量:">
<el-input v-model="oneForm.jcNum" class="normalInput" />
<el-input v-model="inspectInfoList.jcNum" class="normalInput" />
</el-form-item>
</div>
<div class="right">
......@@ -38,7 +38,7 @@
<!--&lt;!&ndash; <el-input type="text" v-model="oneForm.rank" class="topInput" />&ndash;&gt;-->
<!-- </el-form-item>-->
<el-form-item label="rank:">
<el-input v-model="oneForm.rank" class="normalInput" />
<el-input v-model="inspectInfoList.jcRank" class="normalInput" />
</el-form-item>
<!-- 外观-->
<div class="appearanceDiv">
......@@ -46,10 +46,10 @@
<div class="appearance">
<div class="appearanceForm">
<el-form-item label="抽样:" class="sample">
<el-input v-model="oneForm.jcFacadeCy" class="smallInput" />
<el-input v-model="inspectInfoList.jcFacadeCy" class="smallInput" />
</el-form-item>
<el-form-item label="不良:" class="badness">
<el-input v-model="oneForm.jcFacadeBl" class="smallInput" />
<el-input v-model="inspectInfoList.jcFacadeBl" class="smallInput" />
</el-form-item>
</div>
</div>
......@@ -72,9 +72,9 @@
<!-- 检查内容-->
<div class="recordOneContainer">
<div class="inspectionStandards">
<el-form :model="thirdForm">
<el-form :model="inspectJbAl2o3List">
<el-form-item label="检验标准1:" label-width="80">
<el-input v-model="thirdForm.standardOne" class="inspectionStandardsInput" />
<el-input v-model="inspectJbAl2o3List.standardOne" class="inspectionStandardsInput" />
</el-form-item>
</el-form>
</div>
......@@ -132,9 +132,9 @@
<!-- 检查内容-->
<div class="recordOneContainer">
<div class="inspectionStandards">
<el-form :model="thirdForm">
<el-form :model="inspectJbAl2o3List">
<el-form-item label="检验标准2:" label-width="80">
<el-input v-model="thirdForm.standardTwo" class="inspectionStandardsInput" />
<el-input v-model="inspectJbAl2o3List.standardTwo" class="inspectionStandardsInput" />
</el-form-item>
</el-form>
</div>
......@@ -162,9 +162,9 @@
</div>
<div class="inspect">
<div class="inspectDate">检验日期: {{ fourForm.date }}</div>
<div class="inspectTime">检验时间: {{ fourForm.time }}</div>
<div class="inspectPerson">检验人: {{ fourForm.inspector }}</div>
<div class="inspectDate">检验日期: {{ inspectJbAl2o3List.date }}</div>
<div class="inspectTime">检验时间: {{ inspectJbAl2o3List.time }}</div>
<div class="inspectPerson">检验人: {{ inspectJbAl2o3List.inspector }}</div>
</div>
<!-- 计算结果-->
<!-- <div class="result">-->
......@@ -188,14 +188,14 @@
<!-- 检查内容-->
<div class="recordOneContainer">
<div class="inspectionStandards">
<el-form :model="thirdForm">
<el-form :model="inspectJbAl2o3List">
<el-form-item label="检验标准1:" label-width="80">
<el-input v-model="thirdForm.standardOne" class="inspectionStandardsInput" />
<el-input v-model="inspectJbAl2o3List.limitOne" class="inspectionStandardsInput" />
</el-form-item>
</el-form>
<el-form :model="thirdForm">
<el-form :model="inspectJbAl2o3List">
<el-form-item label="检验标准2:" label-width="80">
<el-input v-model="thirdForm.standardTwo" class="inspectionStandardsInput" />
<el-input v-model="inspectJbAl2o3List.limitTwo" class="inspectionStandardsInput" />
</el-form-item>
</el-form>
</div>
......@@ -205,7 +205,7 @@
</div>
<!-- 下方列表-->
<div class="recordThreeContent">
<div v-for="(item,index) in recode1" :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="recordData">
<el-input v-model="item.recordData" />
......@@ -221,79 +221,79 @@
</el-tab-pane>
<el-tab-pane label="标签三" name="third">
<div class="twoTable">
<el-form :model="twoForm">
<el-form :model="inspectJbAl2o3List">
<div class="oneRegion">
<div class="leftRegion">
<el-form-item label="firstHdN:">
<el-input v-model="twoForm.firstHdN" />
<el-input v-model="inspectJbAl2o3List.firstHdN" />
</el-form-item>
<el-form-item label="firstHdPn:">
<el-input v-model="twoForm.firstHdPn" />
<el-input v-model="inspectJbAl2o3List.firstHdPn" />
</el-form-item>
<el-form-item label="firstHdRes:">
<el-input v-model="twoForm.firstHdRes" />
<el-input v-model="inspectJbAl2o3List.firstHdRes" />
</el-form-item>
<el-form-item label="wxN:">
<el-input v-model="twoForm.wxN" />
<el-input v-model="inspectJbAl2o3List.wxN" />
</el-form-item>
<el-form-item label="wxPn:">
<el-input v-model="twoForm.wxPn" />
<el-input v-model="inspectJbAl2o3List.wxPn" />
</el-form-item>
<el-form-item label="wxRes:">
<el-input v-model="twoForm.wxRes" />
<el-input v-model="inspectJbAl2o3List.wxRes" />
</el-form-item>
<el-form-item label="cyN:">
<el-input v-model="twoForm.cyN" />
<el-input v-model="inspectJbAl2o3List.cyN" />
</el-form-item>
<el-form-item label="cyPn:">
<el-input v-model="twoForm.cyPn" />
<el-input v-model="inspectJbAl2o3List.cyPn" />
</el-form-item>
<el-form-item label="cyRes:">
<el-input v-model="twoForm.cyRes" />
<el-input v-model="inspectJbAl2o3List.cyRes" />
</el-form-item>
<el-form-item label="finalRes:">
<el-input v-model="twoForm.finalRes" />
<el-input v-model="inspectJbAl2o3List.finalRes" />
</el-form-item>
<el-form-item label="noProject:">
<el-input v-model="twoForm.noProject" />
<el-input v-model="inspectJbAl2o3List.noProject" />
</el-form-item>
<el-form-item label="wgKx:">
<el-input v-model="twoForm.wgKx" />
<el-input v-model="inspectJbAl2o3List.wgKx" />
</el-form-item>
</div>
<div class="rightRegion">
<el-form-item label="wgLlw:">
<el-input v-model="twoForm.wgLlw" class="tableInput" />
<el-input v-model="inspectJbAl2o3List.wgLlw" class="tableInput" />
</el-form-item>
<el-form-item label="wgWlw:">
<el-input v-model="twoForm.wgWlw" class="tableInput" />
<el-input v-model="inspectJbAl2o3List.wgWlw" class="tableInput" />
</el-form-item>
<el-form-item label="wgJbwq:">
<el-input v-model="twoForm.wgJbwq" class="tableInput" />
<el-input v-model="inspectJbAl2o3List.wgJbwq" class="tableInput" />
</el-form-item>
<el-form-item label="wgZk:">
<el-input v-model="twoForm.wgZk" class="tableInput" />
<el-input v-model="inspectJbAl2o3List.wgZk" class="tableInput" />
</el-form-item>
<el-form-item label="wgSh:">
<el-input v-model="twoForm.wgSh" class="tableInput" />
<el-input v-model="inspectJbAl2o3List.wgSh" class="tableInput" />
</el-form-item>
<el-form-item label="wgBm:">
<el-input v-model="twoForm.wgBm" class="tableInput" />
<el-input v-model="inspectJbAl2o3List.wgBm" class="tableInput" />
</el-form-item>
<el-form-item label="wgTc:">
<el-input v-model="twoForm.wgTc" class="tableInput" />
<el-input v-model="inspectJbAl2o3List.wgTc" class="tableInput" />
</el-form-item>
<el-form-item label="wgQg:">
<el-input v-model="twoForm.wgQg" class="tableInput" />
<el-input v-model="inspectJbAl2o3List.wgQg" class="tableInput" />
</el-form-item>
<el-form-item label="wgCq:">
<el-input v-model="twoForm.wgCq" class="tableInput" />
<el-input v-model="inspectJbAl2o3List.wgCq" class="tableInput" />
</el-form-item>
<el-form-item label="wgFf:">
<el-input v-model="twoForm.wgFf" class="tableInput" />
<el-input v-model="inspectJbAl2o3List.wgFf" class="tableInput" />
</el-form-item>
<el-form-item label="wgTf:">
<el-input v-model="twoForm.wgTf" class="tableInput" />
<el-input v-model="inspectJbAl2o3List.wgTf" class="tableInput" />
</el-form-item>
<!-- <el-input class="tableInput" />-->
</div>
......@@ -417,16 +417,16 @@
<!-- />-->
<!-- &lt;!&ndash; 提交按钮 &ndash;&gt;-->
<div class="inspectionResults">
<el-form :model="fiveForm" label-width="42">
<el-form :model="inspectInfoList" label-width="42">
<el-form-item label="检验结果:">
<el-radio-group v-model="fiveForm.jcResult">
<el-radio-group v-model="inspectInfoList.jcResult">
<el-radio label="1">合格</el-radio>
<el-radio label="2">不合格</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注:">
<el-input
v-model="fiveForm.remarks"
v-model="inspectInfoList.remarks"
type="textarea"
:rows="4"
placeholder="请输入备注"
......@@ -436,16 +436,16 @@
</div>
<hr class="twoHr">
<div v-if="showPartIv" class="partIv">
<div class="auditor">审核人: {{ sixForm.approveUser }}</div>
<div class="auditTime">审核时间: {{ sixForm.approveDate }}</div>
<div class="auditStatus">审核状态: {{ sixForm.approveStatus }}</div>
<div class="auditor">审核人: {{ inspectsForm.approveUser }}</div>
<div class="auditTime">审核时间: {{ inspectsForm.approveDate }}</div>
<div class="auditStatus">审核状态: {{ inspectsForm.approveStatus }}</div>
</div>
<div v-show="!showAuditOpinion" class="auditOpinion">
<el-form :model="sixForm">
<div v-show="showAuditOpinion" class="auditOpinion">
<el-form :model="inspectsForm">
<el-form-item label="审核意见:" label-width="42" class="myForm">
<el-input
v-model="sixForm.approveNote"
v-model="inspectsForm.approveNote"
type="textarea"
:rows="4"
placeholder="请输入审核意见"
......@@ -454,7 +454,8 @@
</el-form>
</div>
<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>
</div>
<div v-if="!showButton" class="submitButton">
<el-button class="buttoon" type="primary">同意</el-button>
......@@ -471,21 +472,6 @@ export default {
name: 'CheckList',
data() {
return {
fiveForm: {
jcResult: '1',
remarks: ''
},
fourForm: {
date: '2023-02-15',
time: '12:30',
inspector: 'XX'
},
sixForm: {
approveUser: 'XXX',
approveNote: 'XXXXX',
approveDate: '2024-05-08',
approveStatus: '已审核'
},
activeName: 'first',
initialImgPreviewIndex: 0, // 预览打开看到的图片下标
showImgViewer: false,
......@@ -522,32 +508,41 @@ export default {
require('@/assets/image/cadTwo.png')
],
// 表单
oneForm: {
jcPn:'XXX',
inspectInfoList:{
businessId: undefined,
jcPn: 'XXX',
jcCj: 'XXX',
jcCode: 'XXX',
jcLot: 'XXX',
jcNum: 'XXX',
rank: 'XX',
jcRank: 'XX',
jcFacadeCy: 'XXX',
jcFacadeBl: 'XXX',
result: '0.175'
jcResult: '1',
remarks: '',
jcFacadeCy:'',
jcFacadeBl:''
},
// 表达二
twoForm: {
//审核部分
inspectsForm:{
approveUser: 'XXX',
approveNote: 'XXXXX',
approveDate: '2024-05-08',
approveStatus: '已审核'
},
// 表单二
inspectJbAl2o3List:{
limitOne:undefined,
limitTwo:undefined,
businessId: undefined,
iiiId: undefined,
standardOne: undefined,
standardTwo: undefined,
limitOne: undefined,
limitTwo: undefined,
oneJcUser: undefined,
oneJcDate: undefined,
twoJcUser: undefined,
twoJcDate: undefined,
standardOneData: undefined,
standardTwoData: undefined,
limitData: undefined,
standardOne: '合格',
standardTwo: '不合格',
standardOneData:undefined,
standardTwoData:undefined,
recordData:'',
date: '2023-02-15',
time: '12:30',
inspector: 'XX',
firstHdN: undefined,
firstHdPn: undefined,
firstHdRes: undefined,
......@@ -571,13 +566,7 @@ export default {
wgCq: undefined,
wgFf: undefined,
wgTf: undefined,
flag: '1'
},
// 表单三
thirdForm: {
standardOne: '合格',
standardTwo: '不合格'
limitData: undefined
},
// 检查记录1
recode1: [
......@@ -590,7 +579,7 @@ export default {
},
{
// 记录数据
recordData: '61.225',
recordData: '61.224',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
......@@ -725,17 +714,109 @@ export default {
differenceValue1: '0.02',
differenceValue2: '71.224'
}
],
// 检查记录3
recode3: [
{
// 记录数据
recordData: '61.224',
differenceValue: '',
differenceValue1: '',
differenceValue2: '61.224'
},
{
// 记录数据
recordData: '61.225',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
},
{
// 记录数据
recordData: '61.226',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
},
{
// 记录数据
recordData: '61.224',
differenceValue: '0.002',
differenceValue1: '0.001',
differenceValue2: '61.224'
},
{
// 记录数据
recordData: '61.225',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
},
{
// 记录数据
recordData: '61.224',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
},
{
// 记录数据
recordData: '61.224',
differenceValue: '0.002',
differenceValue1: '0.001',
differenceValue2: '61.224'
},
{
// 记录数据
recordData: '61.223',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
},
{
// 记录数据
recordData: '61.224',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
},
{
// 记录数据
recordData: '61.225',
differenceValue: '0.001',
differenceValue1: '0.001',
differenceValue2: '61.224'
}
]
}
},
methods: {
submitControl() {
const inputList =[]
for (let i = 0; i <this.recode1.length; i++) {
inputList[i] = this.recode1[i].recordData
this.inspectJbAl2o3List.standardOneData = this.getStringByArray(this.recode1)
this.inspectJbAl2o3List.standardTwoData = this.getStringByArray(this.recode2)
this.inspectJbAl2o3List.limitData = this.getStringByArray(this.recode3)
var obj = {
inspectInfo: this.inspectInfoList,
inspectJbAl2o3: this.inspectJbAl2o3List
}
console.log('obj',obj)
},
// 根据数组得到字符串
getStringByArray: function(recodeList) {
const inputList = []
if (recodeList.length > 0) {
for (let i = 0; i < recodeList.length; i++) {
inputList[i] = recodeList[i].recordData
}
}
if (inputList.length > 0)
{
return inputList.join(',')
} else
{
return ''
}
console.log(inputList.join(','))
return inputList.join(',')
},
/**
* @description: 处理从二维码得到的数据
......
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