Merge branch 'iteration_201207' into online

src/views/businessManager/shopManager/shopList.vue

@@ -72,6 +72,36 @@
                        value="0"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item>
+          <el-select v-model.trim="searchForm.clientShow"
+                     clearable
+                     placeholder="学生端是否是展示">
+            <el-option label="是"
+                       value="1"></el-option>
+            <el-option label="否"
+                       value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model.trim="searchForm.educationalShow"
+                     clearable
+                     placeholder="教务端是否是展示">
+            <el-option label="是"
+                       value="1"></el-option>
+            <el-option label="否"
+                       value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model.trim="searchForm.musicGroupShow"
+                     clearable
+                     placeholder="乐团是否是展示">
+            <el-option label="是"
+                       value="1"></el-option>
+            <el-option label="否"
+                       value="0"></el-option>
+          </el-select>
+        </el-form-item>
         <!-- <el-form-item>
           <el-date-picker v-model.trim="orderDate" style="width:410px;" type="daterange" value-format="yyyy-MM-dd"
             @change="searchOrderDate" range-separator="至" :picker-options="{ firstDayOfWeek: 1 }" start-placeholder="开始日期"
@@ -111,18 +141,24 @@
             </template>
           </el-table-column>
           <el-table-column align='center'
-                           label="是否APP展示">
+                           label="学员是否展示">
             <template slot-scope="scope">
               {{ scope.row.clientShow ? '是' : '否' }}
             </template>
           </el-table-column>
           <el-table-column align='center'
-                           label="是否教务端展示">
+                           label="教务端是否展示">
             <template slot-scope="scope">
               {{ scope.row.educationalShow ? '是' : '否' }}
             </template>
           </el-table-column>
           <el-table-column align='center'
+                           label="乐团是否展示">
+            <template slot-scope="scope">
+              {{ scope.row.musicGroupShow ? '是' : '否' }}
+            </template>
+          </el-table-column>
+          <el-table-column align='center'
                            label="是否库存预警">
             <template slot-scope="scope">
               <span v-if="!scope.row.complementGoodsIdList">
@@ -396,22 +432,33 @@
                     @mousewheel.native.prevent
                     v-model.trim="form.groupPurchasePrice"></el-input>
         </el-form-item>
-        <el-form-item label="是否APP展示"
+        <el-form-item label="学员是否展示"
                       prop="clientShow"
                       :label-width="formLabelWidth">
-          <el-select v-model="form.clientShow" :disabled="addDisabled"
-                     placeholder="请选择是否APP展示">
+          <el-select v-model="form.clientShow"
+                     placeholder="请选择学员是否展示">
             <el-option label="是"
                        :value="1"></el-option>
             <el-option label="否"
                        :value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="是否教务端展示"
+        <el-form-item label="教务端是否展示"
                       prop="educationalShow"
                       :label-width="formLabelWidth">
           <el-select v-model="form.educationalShow"
-                     placeholder="请选择是否APP展示">
+                     placeholder="请选择教务端是否展示">
+            <el-option label="是"
+                       :value="1"></el-option>
+            <el-option label="否"
+                       :value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="乐团是否展示"
+                      prop="musicGroupShow"
+                      :label-width="formLabelWidth">
+          <el-select v-model="form.musicGroupShow"
+                     placeholder="请选择乐团是否展示">
             <el-option label="是"
                        :value="1"></el-option>
             <el-option label="否"
@@ -521,7 +568,10 @@ export default {
         goodsCategoryId: null,
         startTime: null,
         endTime: null,
-        status: null
+        status: null,
+        clientShow: null,
+        educationalShow: null,
+        musicGroupShow: null
       },
       headers: {
         Authorization: getToken()
@@ -557,6 +607,7 @@ export default {
         groupPurchasePrice: null,
         clientShow: null,
         educationalShow: null,
+        musicGroupShow: null,
         stockWarning: null,
         image: null,
         complementGoodsIdList: null,
@@ -641,12 +692,17 @@ export default {
         }],
         clientShow: [{
           required: true,
-          message: '请选择是否APP展示',
+          message: '请选择学员是否展示',
           trigger: 'change'
         }],
         educationalShow: [{
           required: true,
-          message: '请选择是否教务端展示',
+          message: '请选择教务端是否展示',
+          trigger: 'change'
+        }],
+        musicGroupShow: [{
+          required: true,
+          message: '请选择乐团是否展示',
           trigger: 'change'
         }],
         stockWarning: [{
@@ -827,6 +883,7 @@ export default {
         groupPurchasePrice: null,
         clientShow: null,
         educationalShow: null,
+        musicGroupShow: null,
         stockWarning: null,
         image: null,
         complementGoodsIdList: null,

src/views/businessManager/shopManager/shopOperation.vue

@@ -112,11 +112,10 @@
                     v-model.trim="form.groupPurchasePrice"
                     style="width: 400px"></el-input>
         </el-form-item>
-        <el-form-item label="是否APP展示"
+        <el-form-item label="学员是否展示"
                       prop="clientShow">
           <el-select v-model="form.clientShow"
-                     placeholder="请选择是否APP展示"
-                     :disabled="pageDisabled"
+                     placeholder="请选择学员是否展示"
                      style="width: 400px !important;">
             <el-option label="是"
                        :value="1"></el-option>
@@ -124,10 +123,21 @@
                        :value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="是否教务端展示"
+        <el-form-item label="教务端是否展示"
                       prop="educationalShow">
           <el-select v-model="form.educationalShow"
-                     placeholder="请选择是否教务端展示"
+                     placeholder="请选择教务端是否展示"
+                     style="width: 400px !important;">
+            <el-option label="是"
+                       :value="1"></el-option>
+            <el-option label="否"
+                       :value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="乐团是否展示"
+                      prop="musicGroupShow">
+          <el-select v-model="form.musicGroupShow"
+                     placeholder="请选择乐团是否展示"
                      style="width: 400px !important;">
             <el-option label="是"
                        :value="1"></el-option>
@@ -251,6 +261,7 @@ export default {
         groupPurchasePrice: null,
         clientShow: null,
         educationalShow: null,
+        musicGroupShow: null,
         stockWarning: null,
         image: null,
         brief: null,
@@ -332,10 +343,13 @@ export default {
           trigger: 'blur'
         }],
         clientShow: [
-          { required: true, message: '请选择是否APP展示', trigger: 'change' }
+          { required: true, message: '请选择学员是否展示', trigger: 'change' }
         ],
         educationalShow: [
-          { required: true, message: '请选择是否教务端展示', trigger: 'change' }
+          { required: true, message: '请选择教务端是否展示', trigger: 'change' }
+        ],
+        musicGroupShow: [
+          { required: true, message: '请选择乐团是否展示', trigger: 'change' }
         ],
         stockWarning: [
           { required: true, message: '请选择是否库存预警', trigger: 'change' }
@@ -454,6 +468,7 @@ export default {
           groupPurchasePrice: null,
           clientShow: null,
           educationalShow: null,
+          musicGroupShow: null,
           stockWarning: null,
           image: null,
           brief: null,
@@ -484,6 +499,7 @@ export default {
               groupPurchasePrice: result.groupPurchasePrice,
               clientShow: result.clientShow,
               educationalShow: result.educationalShow,
+              musicGroupShow: result.musicGroupShow,
               stockWarning: result.stockWarning,
               image: result.image,
               brief: result.brief,