fix: 大会员新增套餐添加业主监控选项

Signed-off-by: tangshizhe <48740614+tangshizhe@users.noreply.github.com>

src/views/bigMenber/bigCombo.vue

@@ -140,6 +140,8 @@ export default {
                                 this.resArr4.push(v)
                             } else if (v.id == 14 || v.id == 22) {
                                 this.resArr5.push(v)
+                            } else if (v.id == 24 || v.id == 25) {
+                                this.resArr6.push(v)
                             } else {
                                 resList.push(v)
                             }
@@ -165,6 +167,10 @@ export default {
                                 if (atrs.indexOf(String(v.id)) > -1) {
                                     resList.splice(15, 0, v)
                                 }
+                            } else if (v.id == 24 || v.id == 25) {
+                                if (atrs.indexOf(String(v.id)) > -1) {
+                                    resList.splice(16, 0, v)
+                                }
                             } else {
                                 resList.push(v)
                             }
@@ -243,12 +249,25 @@ export default {
                     s_pkcount: null,
                     _checked: false
                 }
+                let arr6 = {
+                    i_ispackage: 0,
+                    i_isserver: 1,
+                    i_pkprice: null,
+                    i_price_month: null,
+                    i_price_year: null,
+                    s_count_year: null,
+                    id: 9124,
+                    s_name: '',
+                    s_pkcount: null,
+                    _checked: false
+                }
                 if (bool == '1') {
                     resList.splice(1, 0, arr1)
                     resList.splice(3, 0, arr2)
                     resList.splice(13, 0, arr3)
                     resList.splice(14, 0, arr4)
                     resList.splice(15, 0, arr5)
+                    resList.splice(16, 0, arr6)
                 }
                 this.editData = {
                     lists: resList,
@@ -284,6 +303,7 @@ export default {
             this.strItems3 = []
             this.strItems4 = []
             this.strItems5 = []
+            this.strItems6 = []
             this.selData = []
             this.selData1 = []
             this.optionDis1 = false
@@ -307,7 +327,7 @@ export default {
             this.selData = selection
             selection.map(v => {
                 arrs1.push(v.id)
-                if (v.id !== 9119 && v.id !== 9120 && v.id !== 9121 && v.id !== 9122 && v.id !== 9123) {
+                if (v.id !== 9119 && v.id !== 9120 && v.id !== 9121 && v.id !== 9122 && v.id !== 9123 && v.id !== 9124) {
                     arrs.push(v)
                 }
                 if (v.id == 9119) {
@@ -320,10 +340,12 @@ export default {
                     strItems.splice(1,0,this.strItems4)
                 } else if (v.id == 9123) {
                     strItems.splice(1,0,this.strItems5)
+                } else if (v.id == 9124) {
+                    strItems.splice(1,0,this.strItems6)
                 }
             })
             
-            if (arrs1.indexOf(9119) > -1 || arrs1.indexOf(9120) > -1 || arrs1.indexOf(9121) > -1 || arrs1.indexOf(9122) > -1 || arrs1.indexOf(9123) > -1) {
+            if (arrs1.indexOf(9119) > -1 || arrs1.indexOf(9120) > -1 || arrs1.indexOf(9121) > -1 || arrs1.indexOf(9122) > -1 || arrs1.indexOf(9123) > -1 || arrs1.indexOf(9124) > -1) {
                 this.sumSel = arrs.concat(strItems)
             } else {
                 this.sumSel = arrs
@@ -415,6 +437,7 @@ export default {
             resArr3: [],
             resArr4: [],
             resArr5: [],
+            resArr6: [],
             selData: [],
             selData1: [],
             filter: {
@@ -466,6 +489,7 @@ export default {
             strItems3: [],
             strItems4: [],
             strItems5: [],
+            strItems6: [],
             value1: '',
             value2: '',
             optionDis1: false,
@@ -510,7 +534,7 @@ export default {
                                             })
                                             this.selData.map(v => {
                                                 arrs1.push(v.id)
-                                                if (v.id !== 9119 && v.id !== 9120 && v.id !== 9121 && v.id !== 9122 && v.id !== 9123) {
+                                                if (v.id !== 9119 && v.id !== 9120 && v.id !== 9121 && v.id !== 9122 && v.id !== 9123 && v.id !== 9124) {
                                                     arrs.push(v)
                                                 }
                                                 if (v.id == 9119) {
@@ -523,9 +547,11 @@ export default {
                                                     strItems.splice(1,0,this.strItems4)
                                                 } else if (v.id == 9123) {
                                                     strItems.splice(1,0,this.strItems5)
+                                                } else if (v.id == 9124) {
+                                                    strItems.splice(1,0,this.strItems6)
                                                 }
                                             })
-                                            if (arrs1.indexOf(9119) > -1 || arrs1.indexOf(9120) > -1 || arrs1.indexOf(9121) > -1 || arrs1.indexOf(9122) > -1 || arrs1.indexOf(9123) > -1) {
+                                            if (arrs1.indexOf(9119) > -1 || arrs1.indexOf(9120) > -1 || arrs1.indexOf(9121) > -1 || arrs1.indexOf(9122) > -1 || arrs1.indexOf(9123) > -1 || arrs1.indexOf(9124) > -1) {
                                                 this.sumSel = arrs.concat(strItems)
                                             } else {
                                                 this.sumSel = arrs
@@ -577,7 +603,7 @@ export default {
                                             })
                                             this.selData.map(v => {
                                                 arrs1.push(v.id)
-                                                if (v.id !== 9119 && v.id !== 9120 && v.id !== 9121 && v.id !== 9122 && v.id !== 9123) {
+                                                if (v.id !== 9119 && v.id !== 9120 && v.id !== 9121 && v.id !== 9122 && v.id !== 9123 && v.id !== 9124) {
                                                     arrs.push(v)
                                                 }
                                                 if (v.id == 9119) {
@@ -590,9 +616,11 @@ export default {
                                                     strItems.splice(1,0,this.strItems4)
                                                 } else if (v.id == 9123) {
                                                     strItems.splice(1,0,this.strItems5)
+                                                } else if (v.id == 9124) {
+                                                    strItems.splice(1,0,this.strItems6)
                                                 }
                                             })
-                                            if (arrs1.indexOf(9119) > -1 || arrs1.indexOf(9120) > -1 || arrs1.indexOf(9121) > -1 || arrs1.indexOf(9122) > -1 || arrs1.indexOf(9123) > -1) {
+                                            if (arrs1.indexOf(9119) > -1 || arrs1.indexOf(9120) > -1 || arrs1.indexOf(9121) > -1 || arrs1.indexOf(9122) > -1 || arrs1.indexOf(9123) > -1 || arrs1.indexOf(9124) > -1) {
                                                 this.sumSel = arrs.concat(strItems)
                                             } else {
                                                 this.sumSel = arrs
@@ -654,7 +682,7 @@ export default {
                                             })
                                             this.selData.map(v => {
                                                 arrs1.push(v.id)
-                                                if (v.id !== 9119 && v.id !== 9120 && v.id !== 9121 && v.id !== 9122 && v.id !== 9123) {
+                                                if (v.id !== 9119 && v.id !== 9120 && v.id !== 9121 && v.id !== 9122 && v.id !== 9123 && v.id !== 9124) {
                                                     arrs.push(v)
                                                 }
                                                 if (v.id == 9119) {
@@ -667,9 +695,11 @@ export default {
                                                     strItems.splice(1,0,this.strItems4)
                                                 } else if (v.id == 9123) {
                                                     strItems.splice(1,0,this.strItems5)
+                                                } else if (v.id == 9124) {
+                                                    strItems.splice(1,0,this.strItems6)
                                                 }
                                             })
-                                            if (arrs1.indexOf(9119) > -1 || arrs1.indexOf(9120) > -1 || arrs1.indexOf(9121) > -1 || arrs1.indexOf(9122) > -1 || arrs1.indexOf(9123) > -1) {
+                                            if (arrs1.indexOf(9119) > -1 || arrs1.indexOf(9120) > -1 || arrs1.indexOf(9121) > -1 || arrs1.indexOf(9122) > -1 || arrs1.indexOf(9123) > -1 || arrs1.indexOf(9124) > -1) {
                                                 this.sumSel = arrs.concat(strItems)
                                             } else {
                                                 this.sumSel = arrs
@@ -728,7 +758,7 @@ export default {
                                             })
                                             this.selData.map(v => {
                                                 arrs1.push(v.id)
-                                                if (v.id !== 9119 && v.id !== 9120 && v.id !== 9121 && v.id !== 9122 && v.id !== 9123) {
+                                                if (v.id !== 9119 && v.id !== 9120 && v.id !== 9121 && v.id !== 9122 && v.id !== 9123 && v.id !== 9124) {
                                                     arrs.push(v)
                                                 }
                                                 if (v.id == 9119) {
@@ -741,9 +771,11 @@ export default {
                                                     strItems.splice(1,0,this.strItems4)
                                                 } else if (v.id == 9123) {
                                                     strItems.splice(1,0,this.strItems5)
+                                                } else if (v.id == 9124) {
+                                                    strItems.splice(1,0,this.strItems6)
                                                 }
                                             })
-                                            if (arrs1.indexOf(9119) > -1 || arrs1.indexOf(9120) > -1 || arrs1.indexOf(9121) > -1 || arrs1.indexOf(9122) > -1 || arrs1.indexOf(9123) > -1) {
+                                            if (arrs1.indexOf(9119) > -1 || arrs1.indexOf(9120) > -1 || arrs1.indexOf(9121) > -1 || arrs1.indexOf(9122) > -1 || arrs1.indexOf(9123) > -1 || arrs1.indexOf(9124) > -1) {
                                                 this.sumSel = arrs.concat(strItems)
                                             } else {
                                                 this.sumSel = arrs
@@ -789,7 +821,7 @@ export default {
                                             })
                                             this.selData.map(v => {
                                                 arrs1.push(v.id)
-                                                if (v.id !== 9119 && v.id !== 9120 && v.id !== 9121 && v.id !== 9122 && v.id !== 9123) {
+                                                if (v.id !== 9119 && v.id !== 9120 && v.id !== 9121 && v.id !== 9122 && v.id !== 9123 && v.id !== 9124) {
                                                     arrs.push(v)
                                                 }
                                                 if (v.id == 9119) {
@@ -802,9 +834,11 @@ export default {
                                                     strItems.splice(1,0,this.strItems4)
                                                 } else if (v.id == 9123) {
                                                     strItems.splice(1,0,this.strItems5)
+                                                } else if (v.id == 9124) {
+                                                    strItems.splice(1,0,this.strItems6)
                                                 }
                                             })
-                                            if (arrs1.indexOf(9119) > -1 || arrs1.indexOf(9120) > -1 || arrs1.indexOf(9121) > -1 || arrs1.indexOf(9122) > -1 || arrs1.indexOf(9123) > -1) {
+                                            if (arrs1.indexOf(9119) > -1 || arrs1.indexOf(9120) > -1 || arrs1.indexOf(9121) > -1 || arrs1.indexOf(9122) > -1 || arrs1.indexOf(9123) > -1 || arrs1.indexOf(9124) > -1) {
                                                 this.sumSel = arrs.concat(strItems)
                                             } else {
                                                 this.sumSel = arrs
@@ -825,6 +859,67 @@ export default {
                                     }, this.resArr5[0].s_name)  
                                 ]
                                 )
+                            } else if (row.id == 9124) {
+                                return h('Select', {
+                                    props: {
+                                        placeholder: '请选择业主监控',
+                                        value: '',
+                                    },
+                                    on: {
+                                        'on-change': (val) => {
+                                            row.i_price_year = JSON.parse(val).i_price_year
+                                            row.i_price_month = JSON.parse(val).i_price_month
+                                        },
+                                        'on-select': val => {
+                                            this.strItems6 = JSON.parse(val.value)
+                                            const arrs = [], arrs1 = [], strItems = []
+                                            this.editData.lists.forEach(s => {
+                                                if (this.selData.length == 0) {
+                                                    if (s.id == 1) {
+                                                        this.selData.push(s)
+                                                    }
+                                                }
+                                            })
+                                            this.selData.map(v => {
+                                                arrs1.push(v.id)
+                                                if (v.id !== 9119 && v.id !== 9120 && v.id !== 9121 && v.id !== 9122 && v.id !== 9123 && v.id !== 9124) {
+                                                    arrs.push(v)
+                                                }
+                                                if (v.id == 9119) {
+                                                    strItems.splice(1,0,this.strItems1)
+                                                } else if (v.id == 9120) {
+                                                    strItems.splice(1,0,this.strItems2)
+                                                } else if (v.id == 9121) {
+                                                    strItems.splice(1,0,this.strItems3)
+                                                } else if (v.id == 9122) {
+                                                    strItems.splice(1,0,this.strItems4)
+                                                } else if (v.id == 9123) {
+                                                    strItems.splice(1,0,this.strItems5)
+                                                } else if (v.id == 9124) {
+                                                    strItems.splice(1,0,this.strItems6)
+                                                }
+                                            })
+                                            if (arrs1.indexOf(9119) > -1 || arrs1.indexOf(9120) > -1 || arrs1.indexOf(9121) > -1 || arrs1.indexOf(9122) > -1 || arrs1.indexOf(9123) > -1 || arrs1.indexOf(9124) > -1) {
+                                                this.sumSel = arrs.concat(strItems)
+                                            } else {
+                                                this.sumSel = arrs
+                                            }
+                                        }
+                                    }
+                                },
+                                [  
+                                    h('Option',{  
+                                        props: {  
+                                            value: JSON.stringify(this.resArr6[1])
+                                        }  
+                                    }, this.resArr6[1].s_name), 
+                                    h('Option',{  
+                                        props: {  
+                                            value: JSON.stringify(this.resArr6[0])
+                                        }  
+                                    }, this.resArr6[0].s_name)  
+                                ]
+                                )
                             } else {
                                 return h('span', row.s_name ? row.s_name : '-')
                             }
@@ -883,6 +978,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.sel-table{
+  overflow: visible;
+  ::v-deep{
+    .ivu-table{
+      overflow: auto;
+    }
+  }
+}
 .big-combo {
     :v-deep.ivu-form {
         width: 100%;