Skip to content

P
patzn-cloud-web-h5app-drs
Commit 52c4d8af by zhuxiaomei
Options

抽样单和历史抽样数据

parent 36ff3e3b
Showing with 232 additions and 4 deletions
src/page/sampling-list/SamplingListAdd.vue
...@@ -263,6 +263,46 @@ ...@@ -263,6 +263,46 @@
</table-col> </table-col>
</table-row> </table-row>
<table-row> <table-row>
<table-col>
<van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.firstClass"
label="大类"
></van-field>
</table-col>
<table-col>
<van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.secondClass"
label="亚类"
></van-field>
</table-col>
</table-row>
<table-row>
<table-col>
<van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.thirdClass"
label="次亚类"
></van-field>
</table-col>
<table-col>
<van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.fourthClass"
label="细类"
></van-field>
</table-col>
</table-row>
<table-row>
<van-field <van-field
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
...@@ -761,6 +801,10 @@ ...@@ -761,6 +801,10 @@
sample: { sample: {
trademark: '', trademark: '',
qrcode: '', qrcode: '',
firstClass:'',
secondClass:'',
thirdClass:'',
fourthClass:'',
type: '', type: '',
typeRemark: '', typeRemark: '',
source: '', source: '',
...@@ -861,7 +905,33 @@ ...@@ -861,7 +905,33 @@
this.shelfId = result.shelfId this.shelfId = result.shelfId
} }
}, },
_valParams(){
if(this.formObj.samplingNum===''){
this.$toast('请输入抽样单编号')
return true
}
if(this.sample.firstClass===''){
this.$toast('请输入大类')
return true
}
if(this.sample.secondClass===''){
this.$toast('请输入大亚类')
return true
}
if(this.sample.thirdClass===''){
this.$toast('请输入次亚类')
return true
}
if(this.sample.fourthClass===''){
this.$toast('请输入细类')
return true
}
return false
},
_ok() { _ok() {
if(this._valParams()){
return
}
let data = Object.assign({}, this.formObj, {nonNetTested: this.nonNetTested}, {sample: this.sample}) let data = Object.assign({}, this.formObj, {nonNetTested: this.nonNetTested}, {sample: this.sample})
data.sample.storageCondition = this.storageCondition.join(',') data.sample.storageCondition = this.storageCondition.join(',')
if (this.place) { if (this.place) {
......
src/page/sampling-list/SamplingListAddNet.vue
...@@ -258,6 +258,46 @@ ...@@ -258,6 +258,46 @@
</table-col> </table-col>
</table-row> </table-row>
<table-row> <table-row>
<table-col>
<van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.firstClass"
label="大类"
></van-field>
</table-col>
<table-col>
<van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.secondClass"
label="亚类"
></van-field>
</table-col>
</table-row>
<table-row>
<table-col>
<van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.thirdClass"
label="次亚类"
></van-field>
</table-col>
<table-col>
<van-field
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.fourthClass"
label="细类"
></van-field>
</table-col>
</table-row>
<table-row>
<van-field <van-field
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
...@@ -761,6 +801,10 @@ ...@@ -761,6 +801,10 @@
sample: { sample: {
trademark: '', trademark: '',
num: '', num: '',
firstClass: '',
secondClass: '',
thirdClass: '',
fourthClass: '',
type: '', type: '',
typeRemak: '', typeRemak: '',
source: '', source: '',
...@@ -823,13 +867,13 @@ ...@@ -823,13 +867,13 @@
this.formObj[key] = result[key] this.formObj[key] = result[key]
} }
} }
for(let key in this.netTested){ for (let key in this.netTested) {
if(result.netTested[key]){ if (result.netTested[key]) {
this.netTested = result.netTested[key] this.netTested = result.netTested[key]
} }
} }
for(let key in this.sample){ for (let key in this.sample) {
if(result.sample[key]){ if (result.sample[key]) {
this.sample = result.sample[key] this.sample = result.sample[key]
} }
} }
...@@ -837,7 +881,33 @@ ...@@ -837,7 +881,33 @@
this.shelfId = result.shelfId this.shelfId = result.shelfId
} }
}, },
_valParams() {
if (this.formObj.samplingNum === '') {
this.$toast('请输入抽样单编号')
return true
}
if (this.sample.firstClass === '') {
this.$toast('请输入大类')
return true
}
if (this.sample.secondClass === '') {
this.$toast('请输入大亚类')
return true
}
if (this.sample.thirdClass === '') {
this.$toast('请输入次亚类')
return true
}
if (this.sample.fourthClass === '') {
this.$toast('请输入细类')
return true
}
return false
},
_ok() { _ok() {
if (this._valParams()) {
return
}
let data = Object.assign({}, this.formObj, {netTested: this.netTested}, {sample: this.sample}) let data = Object.assign({}, this.formObj, {netTested: this.netTested}, {sample: this.sample})
data.sample.storageCondition = this.storageCondition.join(',') data.sample.storageCondition = this.storageCondition.join(',')
if (this.place) { if (this.place) {
......
src/page/sampling-list/SamplingListDetail.vue
...@@ -263,6 +263,46 @@ ...@@ -263,6 +263,46 @@
</table-col> </table-col>
</table-row> </table-row>
<table-row> <table-row>
<table-col>
<van-field readonly
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.firstClass"
label="大类"
></van-field>
</table-col>
<table-col>
<van-field readonly
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.secondClass"
label="亚类"
></van-field>
</table-col>
</table-row>
<table-row>
<table-col>
<van-field readonly
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.thirdClass"
label="次亚类"
></van-field>
</table-col>
<table-col>
<van-field readonly
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.fourthClass"
label="细类"
></van-field>
</table-col>
</table-row>
<table-row>
<van-field readonly <van-field readonly
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
...@@ -761,6 +801,10 @@ ...@@ -761,6 +801,10 @@
sample: { sample: {
trademark: '', trademark: '',
qrcode: '', qrcode: '',
firstClass:'',
secondClass:'',
thirdClass:'',
fourthClass:'',
type: '', type: '',
typeRemark: '', typeRemark: '',
source: '', source: '',
......
src/page/sampling-list/SamplingListDetailNet.vue
...@@ -258,6 +258,46 @@ ...@@ -258,6 +258,46 @@
</table-col> </table-col>
</table-row> </table-row>
<table-row> <table-row>
<table-col>
<van-field readonly
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.firstClass"
label="大类"
></van-field>
</table-col>
<table-col>
<van-field readonly
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.secondClass"
label="亚类"
></van-field>
</table-col>
</table-row>
<table-row>
<table-col>
<van-field readonly
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.thirdClass"
label="次亚类"
></van-field>
</table-col>
<table-col>
<van-field readonly
label-class="cus-field-class"
label-width="50%"
label-align="center"
v-model="sample.fourthClass"
label="细类"
></van-field>
</table-col>
</table-row>
<table-row>
<van-field readonly <van-field readonly
label-class="cus-field-class" label-class="cus-field-class"
label-width="25%" label-width="25%"
...@@ -761,6 +801,10 @@ ...@@ -761,6 +801,10 @@
sample: { sample: {
trademark: '', trademark: '',
num: '', num: '',
firstClass:'',
secondClass:'',
thirdClass:'',
fourthClass:'',
type: '', type: '',
typeRemak: '', typeRemak: '',
source: '', source: '',
......
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