Merge branch 'master' into wxl_01_15

dist/static/css/chunk-1c38f652.f4fc9570.css

@@ -0,0 +1 @@
+.m-container[data-v-0fd2d7bb]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-0fd2d7bb]{display:inline-block}

dist/static/css/chunk-2dd12788.32ecbfe0.css

@@ -1 +0,0 @@
-.m-container[data-v-5a5f8c6a]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-5a5f8c6a]{display:inline-block}

dist/static/css/chunk-b274c06c.15bfd6ff.css

@@ -0,0 +1 @@
+.right-code .title[data-v-1187a17f]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-1187a17f]{display:inline-block}.el-input[data-v-1187a17f]{width:180px!important}

dist/static/css/chunk-edd8a4ec.e1e76bcf.css

@@ -1 +0,0 @@
-.right-code .title[data-v-6bf2a88c]{font-size:18px;text-align:center;padding-bottom:8px}.newBand[data-v-6bf2a88c]{display:inline-block}.el-input[data-v-6bf2a88c]{width:180px!important}

src/views/sporadicManager/sporadicList.vue

@@ -294,7 +294,7 @@
             filterable
           >
             <el-option
-              v-for="(item, index) in organList"
+              v-for="(item, index) in selects.branchs"
               :key="index"
               :value="item.id"
               :label="item.name"
@@ -528,6 +528,7 @@ export default {
         { label: "上门费", value: 7 },
         { label: "账户充值", value: 9 },
         { label: "乐保服务", value: 10 },
+        { label: "网基课活动", value: 13 },
         { label: "其它", value: 11 },
       ],
       orderType1: [
@@ -539,6 +540,7 @@ export default {
         { label: "上门费", value: 7 },
         { label: "账户充值", value: 9 },
         { label: "乐保服务", value: 10 },
+        { label: "网基课活动", value: 13 }
       ],
       maskForm: {
         organId: "",
@@ -994,6 +996,7 @@ export default {
         10: "乐保服务",
         11: "其它",
         12: "双十一活动",
+        13: '网基课活动'
       };
       return template[val];
     },

src/views/vipClass/vipList.vue

@@ -197,7 +197,11 @@
             align="center"
             prop="vipGroupActivityName"
             label="活动方案"
-          ></el-table-column>
+          >
+            <template slot-scope="scope">
+               <overflow-text :text="scope.row.vipGroupActivityName" width="100%" />
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="当前课次">
             <template slot-scope="scope">
               <div>