|
|
@@ -47,8 +47,8 @@
|
|
|
<div>{{ index2 + 1 }}/{{ item1.num }}支</div>
|
|
|
</div>
|
|
|
<div class="lh" >
|
|
|
- <div>收样时间:</div>
|
|
|
- <div></div>
|
|
|
+ <div>收样时间：</div>
|
|
|
+ <div>{{ item1.time }}</div>
|
|
|
</div>
|
|
|
<div class="lh">
|
|
|
<div>流转状态：</div>
|
|
|
@@ -114,11 +114,12 @@ export default {
|
|
|
value: '',
|
|
|
id: '',
|
|
|
list: [{
|
|
|
- name: 5,
|
|
|
- serial: 5,
|
|
|
- type: 5,
|
|
|
- num: 5,
|
|
|
- condition: 5
|
|
|
+ name: '测试名称',
|
|
|
+ serial: '测试编号',
|
|
|
+ type: '测试类型',
|
|
|
+ num: 1,
|
|
|
+ condition: '测试条件',
|
|
|
+ time:''
|
|
|
}],
|
|
|
visible: true
|
|
|
}
|
|
|
@@ -146,8 +147,8 @@ export default {
|
|
|
this.getLook(idStr)
|
|
|
},
|
|
|
getLook(id) {
|
|
|
- // console.log(id)
|
|
|
- let sql = `select * from t_lhypb where find_in_set(id_,'${id}')`
|
|
|
+ // let sql = `select * from t_lhypb where find_in_set(id_,'${id}')`
|
|
|
+ let sql = `select ypb.*, djb.shou_yang_ri_qi_ FROM t_lhypb ypb left outer JOIN t_lhypdjb djb ON djb.yang_ben_bian_hao = ypb.yang_pin_bian_hao where find_in_set( ypb.id_, '${id}' )`
|
|
|
// let sql = `select * from t_lhypdjb where find_in_set(id_,'${id}')`
|
|
|
// console.log(sql)
|
|
|
repostCurd("sql", sql).then(res => {
|
|
|
@@ -166,13 +167,15 @@ export default {
|
|
|
// }
|
|
|
// list.push(o)
|
|
|
// }
|
|
|
+ let shijian = item.shou_yang_ri_qi_ == null ? this.dateFormat():item.shou_yang_ri_qi_
|
|
|
if (item.yang_pin_lei_xing != '' && parseInt(item.shu_liang_) > 0) {
|
|
|
let o = {
|
|
|
name: item.yang_pin_ming_che,
|
|
|
serial: item.yang_pin_bian_hao,
|
|
|
type: item.yang_pin_lei_xing,
|
|
|
num: item.shu_liang_,
|
|
|
- condition: item.yang_ben_yun_shu_
|
|
|
+ condition: item.yang_ben_yun_shu_,
|
|
|
+ time : shijian
|
|
|
}
|
|
|
list.push(o)
|
|
|
}
|
|
|
@@ -182,7 +185,8 @@ export default {
|
|
|
serial: item.yang_pin_bian_hao,
|
|
|
type: item.yang_pin_lei_er_,
|
|
|
num: item.shu_liang_er_,
|
|
|
- condition: item.yang_pin_yun_shu_
|
|
|
+ condition: item.yang_pin_yun_shu_,
|
|
|
+ time : shijian
|
|
|
}
|
|
|
list.push(o)
|
|
|
}
|
|
|
@@ -192,7 +196,8 @@ export default {
|
|
|
serial: item.yang_pin_bian_hao,
|
|
|
type: item.yang_pin_lei_san_,
|
|
|
num: item.shu_liang_san_,
|
|
|
- condition: item.yang_pin_yun_san
|
|
|
+ condition: item.yang_pin_yun_san,
|
|
|
+ time : shijian
|
|
|
}
|
|
|
list.push(o)
|
|
|
}
|
|
|
@@ -202,16 +207,39 @@ export default {
|
|
|
serial: item.yang_pin_bian_hao,
|
|
|
type: item.yang_pin_lei_si_,
|
|
|
num: item.shu_liang_si_,
|
|
|
- condition: item.yang_pin_yun_si_
|
|
|
+ condition: item.yang_pin_yun_si_,
|
|
|
+ time : shijian
|
|
|
}
|
|
|
list.push(o)
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
})
|
|
|
+ if(list.length == 0){
|
|
|
+ this.$message({
|
|
|
+ message: '该样品信息有误，请联系开发人员！',
|
|
|
+ type: 'error'
|
|
|
+ })
|
|
|
+ this.remRedar();
|
|
|
+ }
|
|
|
this.list = list
|
|
|
// console.log(this.list)
|
|
|
}
|
|
|
})
|
|
|
+ },
|
|
|
+
|
|
|
+ /* 关闭*/
|
|
|
+ remRedar() {
|
|
|
+ this.visible = false // 列表隐藏
|
|
|
+ this.listData = [] // 清空列表数据
|
|
|
+ this.redar = false // 扫码图标隐藏
|
|
|
+ this.$emit('scanOff', false)
|
|
|
+ },
|
|
|
+ dateFormat() { // 获取当前时间
|
|
|
+ var date=new Date();
|
|
|
+ var year=date.getFullYear();
|
|
|
+ var month= date.getMonth()+1<10 ? "0"+(date.getMonth()+1) : date.getMonth()+1;
|
|
|
+ var day=date.getDate()<10 ? "0"+date.getDate() : date.getDate();
|
|
|
+ return year+"-"+month+"-"+day;
|
|
|
}
|
|
|
}
|
|
|
}
|
ZZJ