Commit 56ac29dd by zhuxiaomei

样品名称和日期

parent 40adf466
......@@ -751,7 +751,7 @@
:safe-area-inset-bottom="true"
:close-on-popstate="true">
<van-datetime-picker
:type="type"
type="date"
v-model="currentDate"
@confirm="_dateOnConfirm"
@cancel="showPicker = false"
......@@ -775,9 +775,9 @@
},
data() {
return {
showPicker:false,
currentDate:new Date(),
selectDateType:'',
showPicker: false,
currentDate: new Date(),
selectDateType: '',
formObj: {
samplingNum: '',
taskNum: '',
......@@ -820,7 +820,7 @@
placeRemark: '' //保存时单独赋值 根据环节取对应的placeRemarkN
},
sample: {
name:'',
name: '',
trademark: '',
qrcode: '',
firstClass: '',
......@@ -999,12 +999,12 @@
this.$router.go(-1)
}
},
_selectDate(type){
_selectDate(type) {
this.selectDateType = type
this.showPicker = true
},
_dateOnConfirm(date) {
this.sample.sampleDate = this.$dateformat(date, this.format)
this.sample.sampleDate = this.$dateformat(date, 'yyyy-mm-dd')
this.showPicker = false
}
}
......
......@@ -748,7 +748,7 @@
:safe-area-inset-bottom="true"
:close-on-popstate="true">
<van-datetime-picker
:type="type"
type="date"
v-model="currentDate"
@confirm="_dateOnConfirm"
@cancel="showPicker = false"
......@@ -773,9 +773,9 @@
},
data() {
return {
showPicker:false,
currentDate:new Date(),
selectDateType:'',
showPicker: false,
currentDate: new Date(),
selectDateType: '',
formObj: {
samplingNum: '',
taskNum: '',
......@@ -822,7 +822,7 @@
place: '', //保存时单独赋值 从place字段分离出
},
sample: {
name:'',
name: '',
trademark: '',
num: '',
batchNo: '',
......@@ -967,12 +967,17 @@
this.$router.go(-1)
}
},
_selectDate(type){
_selectDate(type) {
console.log(type, 'type')
this.selectDateType = type
this.showPicker = true
},
_dateOnConfirm(date) {
this.sample.sampleDate = this.$dateformat(date, this.format)
switch (this.selectDateType) {
case 'sample.sampleDate':
this.sample.sampleDate = this.$dateformat(date, 'yyyy-mm-dd')
break
}
this.showPicker = false
}
}
......
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