|
|
@@ -1,5 +1,5 @@
|
|
|
import repostCurd from '@/business/platform/form/utils/custom/joinCURD.js'
|
|
|
-import * as dayjs from 'dayjs'
|
|
|
+// import * as dayjs from 'dayjs'
|
|
|
|
|
|
export default {
|
|
|
props:{
|
|
|
@@ -31,8 +31,8 @@ export default {
|
|
|
temp[i].yan_shou_jie_guo_ = '完好'
|
|
|
temp[i].liu_yang_shu_lian = ' ml/支×1支'
|
|
|
temp[i].liu_yang_ri_qi_ = this.dateFormat()
|
|
|
- temp[i].liu_yang_qi_xian = dayjs(temp[i].song_jian_shi_jia).add(3,'month').format("YYYY-MM-DD")
|
|
|
- temp[i].xiao_hui_ri_qi_ = dayjs(temp[i].liu_yang_qi_xian).endOf('month').format("YYYY-MM-DD")
|
|
|
+ // temp[i].liu_yang_qi_xian = dayjs(temp[i].song_jian_shi_jia).add(3,'month').format("YYYY-MM-DD")
|
|
|
+ // temp[i].xiao_hui_ri_qi_ = dayjs(temp[i].liu_yang_qi_xian).endOf('month').format("YYYY-MM-DD")
|
|
|
this.listData.push(temp[i])
|
|
|
}
|
|
|
}else{
|
|
|
@@ -58,8 +58,8 @@ export default {
|
|
|
res.variables.data[i].yan_shou_jie_guo_ = '完好'
|
|
|
res.variables.data[i].liu_yang_shu_lian = ' ml/支×1支'
|
|
|
res.variables.data[i].liu_yang_ri_qi_ = this.dateFormat()
|
|
|
- res.variables.data[i].liu_yang_qi_xian = dayjs(res.variables.data[i].song_jian_shi_jia).add(3,'month').format("YYYY-MM-DD")
|
|
|
- res.variables.data[i].xiao_hui_ri_qi_ = dayjs(res.variables.data[i].liu_yang_qi_xian).endOf('month').format("YYYY-MM-DD")
|
|
|
+ // res.variables.data[i].liu_yang_qi_xian = dayjs(res.variables.data[i].song_jian_shi_jia).add(3,'month').format("YYYY-MM-DD")
|
|
|
+ // res.variables.data[i].xiao_hui_ri_qi_ = dayjs(res.variables.data[i].liu_yang_qi_xian).endOf('month').format("YYYY-MM-DD")
|
|
|
this.listData.push(res.variables.data[i])
|
|
|
}
|
|
|
}else{
|
|
|
@@ -202,14 +202,14 @@ export default {
|
|
|
// this_.$message.error('操作失败，[' + ypInfoList[yp].yang_pin_ming_che + '] 留样数量不得大于收样数量。')
|
|
|
// return;
|
|
|
// }
|
|
|
- if (ypInfoList[yp].liu_yang_qi_xian == null || ypInfoList[yp].liu_yang_qi_xian == '') {
|
|
|
- this_.$message.error("留样时必须填写留样期限!")
|
|
|
- return;
|
|
|
- }
|
|
|
- if (ypInfoList[yp].xiao_hui_ri_qi_ == null || ypInfoList[yp].xiao_hui_ri_qi_ == '') {
|
|
|
- this_.$message.error("留样时必须填写销毁日期!")
|
|
|
- return;
|
|
|
- }
|
|
|
+ // if (ypInfoList[yp].liu_yang_qi_xian == null || ypInfoList[yp].liu_yang_qi_xian == '') {
|
|
|
+ // this_.$message.error("留样时必须填写留样期限!")
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
+ // if (ypInfoList[yp].xiao_hui_ri_qi_ == null || ypInfoList[yp].xiao_hui_ri_qi_ == '') {
|
|
|
+ // this_.$message.error("留样时必须填写销毁日期!")
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
// cfwz = ypInfoList[yp].liu_yang_wei_zhi_
|
|
|
cfwzObj.push(ypInfoList[yp].liu_yang_wei_zhi_)
|
|
|
|
|
|
@@ -303,6 +303,7 @@ export default {
|
|
|
obj["yang_ben_ming_che"] = res[i].yang_pin_ming_che
|
|
|
obj["yang_ben_bian_hao"] = res[i].yang_pin_bian_hao
|
|
|
obj["pi_hao_bian_hao_"] = res[i].song_jian_pi_hao_
|
|
|
+ obj["song_jian_dan_wei"] = res[i].song_jian_dan_wei
|
|
|
obj["xing_ming_"] = res[i].xing_ming_
|
|
|
obj["xing_bie_"] = res[i].xing_bie_
|
|
|
obj["nian_ling_"] = res[i].nian_ling_
|
|
|
@@ -398,32 +399,17 @@ export default {
|
|
|
rw["yang_pin_ming_che"] = wtdAndYpb[i].yang_pin_ming_che//样品名称
|
|
|
rw["yang_pin_bian_hao"] = wtdAndYpb[i].yang_pin_bian_hao//样品编号
|
|
|
rw["wei_tuo_lei_xing_"] = wtdAndYpb[i].wei_tuo_lei_xing_ //委托类型
|
|
|
- let yplxz = ''
|
|
|
- if(wtdAndYpb[i].yang_pin_lei_xing != null && wtdAndYpb[i].yang_pin_lei_xing!=''){ //样品类型1
|
|
|
- yplxz = wtdAndYpb[i].yang_pin_lei_xing //样品类型
|
|
|
- }
|
|
|
- if(wtdAndYpb[i].yang_pin_lei_er_ != null && wtdAndYpb[i].yang_pin_lei_er_!=''){ //样品类型2
|
|
|
- if(yplxz==null || yplxz == ''){
|
|
|
- yplxz = wtdAndYpb[i].yang_pin_lei_er_ //样品类型
|
|
|
- }else{
|
|
|
- yplxz =yplxz+','+ wtdAndYpb[i].yang_pin_lei_er_ //样品类型
|
|
|
- }
|
|
|
- }
|
|
|
- if(wtdAndYpb[i].yang_pin_lei_san_ != null && wtdAndYpb[i].yang_pin_lei_san_!=''){ //样品类型3
|
|
|
- if(yplxz==null || yplxz == ''){
|
|
|
- yplxz = wtdAndYpb[i].yang_pin_lei_san_ //样品类型
|
|
|
- }else{
|
|
|
- yplxz =yplxz+','+ wtdAndYpb[i].yang_pin_lei_san_ //样品类型
|
|
|
- }
|
|
|
- }
|
|
|
- if(wtdAndYpb[i].yang_pin_lei_si_ != null && wtdAndYpb[i].yang_pin_lei_si_!=''){ //样品类型4
|
|
|
- if(yplxz==null || yplxz == ''){
|
|
|
- yplxz = wtdAndYpb[i].yang_pin_lei_si_ //样品类型
|
|
|
- }else{
|
|
|
- yplxz = yplxz+','+ wtdAndYpb[i].yang_pin_lei_si_ //样品类型
|
|
|
- }
|
|
|
- }
|
|
|
+ let yplxList = []
|
|
|
+ let ypggList = []
|
|
|
+ yplxList.push(
|
|
|
+ wtdAndYpb[i].yang_pin_lei_xing,wtdAndYpb[i].yang_pin_lei_er_,wtdAndYpb[i].yang_pin_lei_san_,wtdAndYpb[i].yang_pin_lei_si_);
|
|
|
+ ypggList.push(
|
|
|
+ wtdAndYpb[i].yang_pin_gui_ge_,wtdAndYpb[i].yang_pin_gui_ge_e,wtdAndYpb[i].yang_pin_gui_ge_s,wtdAndYpb[i].yang_pin_gui_si_
|
|
|
+ );
|
|
|
+ let yplxz = yplxList.filter(i => i).join(',');
|
|
|
+ let ypggStr = ypggList.filter(i => i).join(',');
|
|
|
rw["yang_pin_lei_xing"] = yplxz // 样品类型
|
|
|
+ rw["yang_pin_gui_ge_"] = ypggStr // 样品规格
|
|
|
rw["wei_tuo_id_"] = wtdAndYpb[i].wtID // 委托id
|
|
|
rw["he_tong_id_"] = wtdAndYpb[i].he_tong_id_ // 合同id
|
|
|
rw["zhuang_tai_"] = '待任务分配' // 状态
|
|
|
@@ -439,7 +425,7 @@ export default {
|
|
|
rws.push(rw)
|
|
|
// }
|
|
|
}
|
|
|
- // console.log("任务分配",rws)
|
|
|
+ // console.log("任务分配",rws)
|
|
|
repostCurd('add', '{"tableName":"t_lhrwfpb","paramWhere":'+JSON.stringify(rws)+',"defKey":"Process_04o0csc","formKey":"lhrwfp"}')
|
|
|
}
|
|
|
// 更新委托单 检测开始时间 问吴懿是否需要 不需要
|
ZZJ