|
@@ -536,8 +536,11 @@ export default {
|
|
|
// let count = 1
|
|
// let count = 1
|
|
|
// size == null ? count = 1 : count = size.length + 1
|
|
// size == null ? count = 1 : count = size.length + 1
|
|
|
const xmmc = []
|
|
const xmmc = []
|
|
|
|
|
+ const xmid = []
|
|
|
xmmc.push(item.chang_gui_xiang_m, item.tao_can_ming_chen)
|
|
xmmc.push(item.chang_gui_xiang_m, item.tao_can_ming_chen)
|
|
|
|
|
+ xmid.push(item.jian_ce_xiang_mu_, item.tao_can_xiang_mu_)
|
|
|
let xiangMuZh = xiangMuZh = xmmc.filter(i => i).join(',')
|
|
let xiangMuZh = xiangMuZh = xmmc.filter(i => i).join(',')
|
|
|
|
|
+ let xiangMuId = xiangMuId = xmid.filter(i => i).join(',')
|
|
|
for (let c = 0; c < 4; c++) {
|
|
for (let c = 0; c < 4; c++) {
|
|
|
const yblx = c == 0 ? ypInfoList[index].yang_pin_lei_xing
|
|
const yblx = c == 0 ? ypInfoList[index].yang_pin_lei_xing
|
|
|
: c == 1 ? ypInfoList[index].yang_pin_lei_er_
|
|
: c == 1 ? ypInfoList[index].yang_pin_lei_er_
|
|
@@ -615,7 +618,7 @@ export default {
|
|
|
jian_ce_xiang_mu_: xiangMuZh,
|
|
jian_ce_xiang_mu_: xiangMuZh,
|
|
|
shou_yang_ren_: this.$store.getters.userInfo.user.name,
|
|
shou_yang_ren_: this.$store.getters.userInfo.user.name,
|
|
|
wei_tuo_lei_xing_: item.wei_tuo_lei_xing_,
|
|
wei_tuo_lei_xing_: item.wei_tuo_lei_xing_,
|
|
|
- jian_ce_xiang_mu_id: item.jian_ce_xiang_mu_
|
|
|
|
|
|
|
+ jian_ce_xiang_mu_id: xiangMuId
|
|
|
}
|
|
}
|
|
|
// console.log(obj)
|
|
// console.log(obj)
|
|
|
ypdjb.push(obj)
|
|
ypdjb.push(obj)
|
|
@@ -738,8 +741,11 @@ export default {
|
|
|
// let count = 1
|
|
// let count = 1
|
|
|
// size == null ? count = 1 : count = size.length + 1
|
|
// size == null ? count = 1 : count = size.length + 1
|
|
|
const xmmc = []
|
|
const xmmc = []
|
|
|
|
|
+ const xmid = []
|
|
|
xmmc.push(item.chang_gui_xiang_m, item.tao_can_ming_chen)
|
|
xmmc.push(item.chang_gui_xiang_m, item.tao_can_ming_chen)
|
|
|
|
|
+ xmid.push(item.jian_ce_xiang_mu_, item.tao_can_xiang_mu_)
|
|
|
let xiangMuZh = xiangMuZh = xmmc.filter(i => i).join(',')
|
|
let xiangMuZh = xiangMuZh = xmmc.filter(i => i).join(',')
|
|
|
|
|
+ let xiangMuId = xiangMuId = xmid.filter(i => i).join(',')
|
|
|
for (let c = 0; c < 4; c++) {
|
|
for (let c = 0; c < 4; c++) {
|
|
|
const yblx = c == 0 ? ypInfoList[index].yang_pin_lei_xing
|
|
const yblx = c == 0 ? ypInfoList[index].yang_pin_lei_xing
|
|
|
: c == 1 ? ypInfoList[index].yang_pin_lei_er_
|
|
: c == 1 ? ypInfoList[index].yang_pin_lei_er_
|
|
@@ -817,7 +823,7 @@ export default {
|
|
|
jian_ce_xiang_mu_: xiangMuZh,
|
|
jian_ce_xiang_mu_: xiangMuZh,
|
|
|
shou_yang_ren_: this.$store.getters.userInfo.user.name,
|
|
shou_yang_ren_: this.$store.getters.userInfo.user.name,
|
|
|
wei_tuo_lei_xing_: item.wei_tuo_lei_xing_,
|
|
wei_tuo_lei_xing_: item.wei_tuo_lei_xing_,
|
|
|
- jian_ce_xiang_mu_id: item.jian_ce_xiang_mu_
|
|
|
|
|
|
|
+ jian_ce_xiang_mu_id: xiangMuId
|
|
|
}
|
|
}
|
|
|
// console.log(obj)
|
|
// console.log(obj)
|
|
|
ypdjb.push(obj)
|
|
ypdjb.push(obj)
|
shenqilong