wangxiaogang 3 years ago
parent
commit
ec47559d26
2 changed files with 27 additions and 14 deletions
  1. 6 6
      src/views/bigMenber/bigCombo.vue
  2. 21 8
      src/views/order/components/bigOrder.vue

+ 6 - 6
src/views/bigMenber/bigCombo.vue

@@ -245,7 +245,7 @@ export default {
                 }
                 if (bool == '1') {
                     resList.splice(1, 0, arr1)
-                    resList.splice(12, 0, arr2)
+                    resList.splice(3, 0, arr2)
                     resList.splice(13, 0, arr3)
                     resList.splice(14, 0, arr4)
                     resList.splice(15, 0, arr5)
@@ -395,11 +395,11 @@ export default {
                 serverids: String(serverId)
             }
             console.log(str)
-            // this.$request('/order/updateCombo').data(str).showSuccessTip().success(() => {
-            //     this.cShow = false
-            //     this.initialized()
-            //     this.reload()
-            // }).post()
+            this.$request('/order/updateCombo').data(str).showSuccessTip().success(() => {
+                this.cShow = false
+                this.initialized()
+                this.reload()
+            }).post()
         },
         comCancel() {
             this.cShow = false

+ 21 - 8
src/views/order/components/bigOrder.vue

@@ -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">
@@ -731,7 +731,6 @@ export default {
             this.combo_id = val
             this.nums = val.i_ispreinstall
             if (val.i_ispreinstall == 0) {
-                
                 if (this.bigStas == 1) {
                     if (this.subStas == 1) {
                         this.radioDis1 = false
@@ -1166,16 +1165,30 @@ export default {
         curChange(selection, row) {// 选择单个
             let arr1 = []
             this.pacData.forEach((t,i) => {
-                if (row.id == t.id) {
-                    document.getElementById('counts' + i).disabled = false
-                }
+                // if (row.id == t.id) {
+                //     document.getElementById('counts' + i).disabled = false
+                // }
             })
             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
+            }
             if (arr1.indexOf(12) > -1 && arr1.indexOf(13) > -1) {
                 document.getElementById('counts3').disabled = false
             }
+            if (arr1.indexOf(9123) > -1 && this.strItems5.id == 22) {
+                document.getElementById('counts4').disabled = false
+            }
+            if (arr1.indexOf(9123) > -1 && this.strItems5.id == 14) {
+                document.getElementById('counts1').disabled = false
+            }
         },
         canChange(selection, row) {// 取消单个
             let arr2 = []
@@ -1334,7 +1347,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,
@@ -1589,7 +1602,7 @@ export default {
             ],
             datas1: [],
             datas2: [],
-            selStr: [],
+            selStr: '',
             strItems1: [],
             strItems2: [],
             strItems3: [],