|
|
@@ -735,8 +735,17 @@
|
|
|
this.form.weiTuoFangMingChe = data.ke_hu_dang_wei || ''
|
|
|
this.form.heTongBianHao = data.he_tong_bian_hao_ || ''
|
|
|
}
|
|
|
+ let tcbh = ''
|
|
|
+ if(data.xuan_ze_tao_can_=='' || data.xuan_ze_tao_can_ == null){
|
|
|
+ tcbh = data.xin_zeng_tao_can_
|
|
|
+ }
|
|
|
+ else if(data.xin_zeng_tao_can_=='' || data.xin_zeng_tao_can_ == null){
|
|
|
+ tcbh = data.xuan_ze_tao_can_
|
|
|
+ }else{
|
|
|
+ tcbh = data.xuan_ze_tao_can_+','+data.xin_zeng_tao_can_
|
|
|
+ }
|
|
|
this.getJiance(e, type, weiTouId)
|
|
|
- this.getTaoCanList(data.xuan_ze_tao_can_)
|
|
|
+ this.getTaoCanList(tcbh)
|
|
|
}
|
|
|
},
|
|
|
//根据合同id选择检测项目
|
|
|
@@ -805,7 +814,7 @@
|
|
|
//根据合同查询套餐 1根据合同人套餐id里面选择套餐 2.根据合同id选择套餐
|
|
|
getTaoCanList(id, type) {
|
|
|
let sql =
|
|
|
- `select * from t_jctc where FIND_IN_SET(id_,'${id}')`
|
|
|
+ `select * from t_jctc where FIND_IN_SET(id_,'${id}') and zhuang_tai_ = '有效'`
|
|
|
|
|
|
let requestData = this.$sig(sql)
|
|
|
this.$http.post("/ibps/business/v3/sys/universal/inputSqlSelectData", requestData).then(res => {
|
cyy