|
|
@@ -113,7 +113,7 @@
|
|
|
:data="pacData"
|
|
|
></Table>
|
|
|
</FormItem>
|
|
|
- <!-- <FormItem class="table-order1">
|
|
|
+ <FormItem class="table-order1">
|
|
|
<Table
|
|
|
class="prei-table"
|
|
|
border
|
|
|
@@ -121,7 +121,7 @@
|
|
|
:columns="columns2"
|
|
|
:data="datas2"
|
|
|
></Table>
|
|
|
- </FormItem> -->
|
|
|
+ </FormItem>
|
|
|
</div>
|
|
|
<div v-if="creAuth == '1'">
|
|
|
<FormItem label="大会员订单金额" :label-width="194">
|
|
|
@@ -1172,15 +1172,16 @@ export default {
|
|
|
selection.forEach(l => {
|
|
|
arr1.push(l.id)
|
|
|
})
|
|
|
- // console.log(arr1)
|
|
|
- // console.log(this.strItems5)
|
|
|
if (arr1.indexOf(11) > -1) {
|
|
|
document.getElementById('counts0').disabled = false
|
|
|
}
|
|
|
if (arr1.indexOf(15) > -1) {
|
|
|
- document.getElementById('counts0').disabled = false
|
|
|
+ document.getElementById('counts2').disabled = false
|
|
|
}
|
|
|
- if (arr1.indexOf(12) > -1 && arr1.indexOf(13) > -1) {
|
|
|
+ if (arr1.indexOf(9121) > -1 && this.strItems3.id == 20 && arr1.indexOf(9122) > -1 && this.strItems4.id == 21) {
|
|
|
+ document.getElementById('counts3').disabled = false
|
|
|
+ }
|
|
|
+ if (arr1.indexOf(9121) > -1 && this.strItems3.id == 23 && arr1.indexOf(9122) > -1 && this.strItems4.id == 13) {
|
|
|
document.getElementById('counts3').disabled = false
|
|
|
}
|
|
|
if (arr1.indexOf(9123) > -1 && this.strItems5.id == 22) {
|
|
|
@@ -1335,7 +1336,7 @@ export default {
|
|
|
bigPayMoney: this.member.billingMode == 0?0:parseInt(this.member.bigPayMoney * 1000 / 10),
|
|
|
subPayMoney: this.member.billingMode == 0?0:parseInt(this.member.subPayMoney * 1000 / 10),
|
|
|
supplyPayMoney: this.member.billingMode == 0?0:parseInt(this.member.supplyPayMoney * 1000 / 10),
|
|
|
- createType: this.nums == 0?this.member.cycleType:'1',
|
|
|
+ createType: this.nums == 0?this.member.createType:'1',
|
|
|
comboId: this.combo_id.id,
|
|
|
serversId: this.nums == 0?String(serId):'',
|
|
|
serversName: this.nums == 0?String(serName):'',
|
|
|
@@ -1347,7 +1348,7 @@ export default {
|
|
|
remark: this.member.remark
|
|
|
}
|
|
|
console.log(obj)
|
|
|
- // this.urlReq('/order/createBigOrder', obj)
|
|
|
+ this.urlReq('/order/createBigOrder', obj)
|
|
|
} else if (this.proNums == 2) {// 子账号
|
|
|
let obj = {
|
|
|
createTime: this.member.createTime,
|
|
|
@@ -1893,7 +1894,7 @@ export default {
|
|
|
this.optionDis2 = true
|
|
|
this.optionDis3 = false
|
|
|
this.optionDis4 = true
|
|
|
- } else if (ids == 20) {
|
|
|
+ } else if (ids == 13) {
|
|
|
this.optionDis1 = true
|
|
|
this.optionDis2 = false
|
|
|
this.optionDis3 = true
|
|
|
@@ -1958,7 +1959,7 @@ export default {
|
|
|
}, this.resArr4[1].s_name),
|
|
|
h('Option',{
|
|
|
props: {
|
|
|
- value: JSON.stringify(this.resArr3[0]),
|
|
|
+ value: JSON.stringify(this.resArr4[0]),
|
|
|
disabled: this.optionDis6
|
|
|
}
|
|
|
}, this.resArr4[0].s_name)
|
wangxiaogang