|
|
@@ -515,7 +515,11 @@ export default {
|
|
|
let ypggList = []
|
|
|
let liuYangList = []
|
|
|
lxList.push(ypInfoList[index].yang_pin_lei_xing, ypInfoList[index].yang_pin_lei_er_, ypInfoList[index].yang_pin_lei_san_, ypInfoList[index].yang_pin_lei_si_)
|
|
|
- ypggList.push(ypInfoList[index].yang_pin_gui_ge_, ypInfoList[index].yang_pin_gui_ge_e, ypInfoList[index].yang_pin_gui_ge_s, ypInfoList[index].yang_pin_gui_si_)
|
|
|
+ ypggList.push(
|
|
|
+ ypInfoList[index].yang_pin_gui_ge_?ypInfoList[index].yang_pin_gui_ge_ +'*'+ ypInfoList[index].shu_liang_:'',
|
|
|
+ ypInfoList[index].yang_pin_gui_ge_e? ypInfoList[index].yang_pin_gui_ge_e+'*'+ ypInfoList[index].shu_liang_er_:'',
|
|
|
+ ypInfoList[index].yang_pin_gui_ge_s?ypInfoList[index].yang_pin_gui_ge_s +'*'+ ypInfoList[index].shu_liang_san_:'',
|
|
|
+ ypInfoList[index].yang_pin_gui_si_?ypInfoList[index].yang_pin_gui_si_ +'*'+ ypInfoList[index].shu_liang_si_:'')
|
|
|
liuYangList.push(ypInfoList[index].liu_yang_shu_lian_yi, ypInfoList[index].liu_yang_shu_lian_er, ypInfoList[index].liu_yang_shu_lian_san, ypInfoList[index].liu_yang_shu_lian_si)
|
|
|
let yplxz = lxList.filter(i => i).join('；')
|
|
|
let ypggStr = ypggList.filter(i => i).join('；')
|
ZZJ