Merge branch '0601Action' into test

src/views/businessManager/orderManager/financeManager-taoqi.vue

@@ -515,7 +515,7 @@
                   v-if="isAdd"
                   v-model.trim="goodsList.id"
                   filterable
-                  :disabled="!isAdd"
+                  :disabled="!isAdd || !form.routeOrganId"
                   @change="checkgoods"
                   placeholder="请选择商品"
                 >
@@ -540,7 +540,7 @@
                 <el-input
                   type="age"
                   style="width: 160px"
-                  :disabled="!isAdd"
+                  :disabled="!isAdd || !form.routeOrganId"
                   clearable
                   placeholder="请输入商品数量"
                   @mousewheel.native.prevent
@@ -549,7 +549,7 @@
               </el-form-item>
               <el-button
                 icon="el-icon-minus"
-                :disabled="!isAdd"
+                :disabled="!isAdd || !form.routeOrganId"
                 v-if="form.goodsList.length > 1"
                 circle
                 style="height: 40px"
@@ -557,7 +557,7 @@
               ></el-button>
               <el-button
                 icon="el-icon-plus"
-                :disabled="!isAdd"
+                :disabled="!isAdd || !form.routeOrganId"
                 @click.prevent="addGoodsList"
                 circle
                 style="margin-left: 5px; height: 40px"
@@ -769,11 +769,6 @@ export default {
     //   }
     // });
     this.$store.dispatch("setBranchs");
-    goodsQuery({ status: 1, rows: 99999 }).then((res) => {
-      if (res.code === 200) {
-        this.shopList = res.data.rows;
-      }
-    });
     this.getList();
   },
   methods: {
@@ -1074,6 +1069,17 @@ export default {
             this.cooperationList = res.data.rows;
           }
         });
+        this.form.goodsList = [
+          {
+            id: null,
+            number: null,
+          }
+        ]
+        goodsQuery({ rows: 99999, organId: val }).then((res) => {
+          if (res.code === 200) {
+            this.shopList = res.data.rows;
+          }
+        });
       }
     },
     async checkSchool(val) {

src/views/businessManager/orderManager/financeManager.vue

@@ -517,7 +517,7 @@
                   v-if="isAdd"
                   v-model.trim="goodsList.id"
                   filterable
-                  :disabled="!isAdd"
+                  :disabled="!isAdd || !form.routeOrganId"
                   @change="checkgoods"
                   placeholder="请选择商品"
                 >
@@ -542,7 +542,7 @@
                 <el-input
                   type="age"
                   style="width: 160px"
-                  :disabled="!isAdd"
+                  :disabled="!isAdd || !form.routeOrganId"
                   clearable
                   placeholder="请输入商品数量"
                   @mousewheel.native.prevent
@@ -551,7 +551,7 @@
               </el-form-item>
               <el-button
                 icon="el-icon-minus"
-                :disabled="!isAdd"
+                :disabled="!isAdd || !form.routeOrganId"
                 v-if="form.goodsList.length > 1"
                 circle
                 style="height: 40px"
@@ -559,7 +559,7 @@
               ></el-button>
               <el-button
                 icon="el-icon-plus"
-                :disabled="!isAdd"
+                :disabled="!isAdd || !form.routeOrganId"
                 @click.prevent="addGoodsList"
                 circle
                 style="margin-left: 5px; height: 40px"
@@ -771,11 +771,6 @@ export default {
     //   }
     // });
     this.$store.dispatch("setBranchs");
-    goodsQuery({ rows: 99999 }).then((res) => {
-      if (res.code === 200) {
-        this.shopList = res.data.rows;
-      }
-    });
     this.getList();
   },
   methods: {
@@ -1083,6 +1078,17 @@ export default {
             this.cooperationList = res.data.rows;
           }
         });
+        this.form.goodsList = [
+          {
+            id: null,
+            number: null,
+          }
+        ]
+        goodsQuery({ rows: 99999, organId: val }).then((res) => {
+          if (res.code === 200) {
+            this.shopList = res.data.rows;
+          }
+        });
       }
     },
     async checkSchool(val) {

src/views/categroyManager/vipActiveList.vue

@@ -71,10 +71,11 @@
             style="width: 180px !important"
             v-model="searchForm.applyToStudentType"
             clearable
-            placeholder="是否新生专享"
+            placeholder="使用学员"
           >
-            <el-option label="是" :value="1"></el-option>
-            <el-option label="否" :value="-1"></el-option>
+            <el-option label="新用户" :value="1"></el-option>
+            <el-option label="老用户" :value="0"></el-option>
+            <el-option label="所有用户" :value="-1"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -259,14 +260,16 @@
               ></el-option>
             </select-all>
           </el-form-item>
-          <el-form-item label="是否新生专享" label-width="120px" prop="applyToStudentType">
+          <el-form-item label="使用学员" label-width="120px" prop="applyToStudentType">
             <el-select
               v-model.trim="resetForm.applyToStudentType"
               style="width: 100% !important"
+              placeholder="请选择使用学员"
               clearable
             >
-              <el-option label="是" :value="1"></el-option>
-              <el-option label="否" :value="-1"></el-option>
+              <el-option label="新用户" :value="1"></el-option>
+              <el-option label="老用户" :value="0"></el-option>
+              <el-option label="所有用户" :value="-1"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="活动描述" label-width="120px" prop="desc">
@@ -899,10 +902,13 @@ export default {
     formatStudentType(row) {
       let str = null
       if(row.applyToStudentType == -1) {
-        str = '否'
+        str = '所有用户'
+      }
+      if(row.applyToStudentType == 0) {
+        str = '老用户'
       }
       if(row.applyToStudentType == 1) {
-        str = '是'
+        str = '新用户'
       }
       return str
     },

src/views/categroyManager/vipNewActive.vue

@@ -56,13 +56,15 @@
             ></el-option>
           </select-all>
         </el-form-item>
-        <el-form-item label="是否新生专享" prop="applyToStudentType">
+        <el-form-item label="使用学员" prop="applyToStudentType">
           <el-select
             v-model.trim="vipform.applyToStudentType"
+            placeholder="请选择使用学员"
             clearable
           >
-            <el-option label="是" value="1"></el-option>
-            <el-option label="否" value="-1"></el-option>
+            <el-option label="新用户" :value="1"></el-option>
+            <el-option label="老用户" :value="0"></el-option>
+            <el-option label="所有用户" :value="-1"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="活动描述" prop="desc">

src/views/studentManager/studentList.vue

@@ -123,6 +123,17 @@
             <el-option label="已使用" :value="2"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="isNewUser">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.isNewUser"
+            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-button native-type="submit" type="danger">搜索</el-button>
           <el-button native-type="reset" type="primary">重置</el-button>
@@ -702,6 +713,7 @@ export default {
         teacherId: null,
         carePackage: null,
         comeOnPackage: null,
+        isNewUser: null,
       },
       searchList: [],
       tableList: [],

src/views/teamBuild/signupList.vue

@@ -231,6 +231,28 @@
             <el-option label="是" value="true"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model.trim="searchFrom.hasCloudTeacher"
+            clearable
+            filterable
+            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="searchFrom.payingStatus"
+            clearable
+            filterable
+            placeholder="交易状态"
+          >
+            <el-option label="审核中" :value="2"></el-option>
+            <el-option label="缴费中" :value="1"></el-option>
+          </el-select>
+        </el-form-item> -->
         <!-- 专业actualSubjectId 调剂isAllowAdjust 手机号name -->
         <el-form-item>
           <el-button type="danger" native-type="search">搜索</el-button>
@@ -267,6 +289,10 @@
           </el-table-column>
           <el-table-column label="已缴费" prop="payNum" align="center">
           </el-table-column>
+          <el-table-column label="缴费中" prop="payingNum" align="center">
+          </el-table-column>
+          <el-table-column label="预约中" prop="checkNum" align="center">
+          </el-table-column>
         </el-table>
         <div
           class="btnWrap"
@@ -364,6 +390,18 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column
+            label="是否购买云教练"
+            fixed="right"
+            prop="hasCloudTeacher"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.hasCloudTeacher == 1 ? '是' : '否' }}
+              </div>
+            </template>
+          </el-table-column>
 
           <el-table-column
             label="操作"
@@ -859,6 +897,8 @@ export default {
         currentGrade: null, // 入学年级
         paymentStatus: "",
         visited: "",
+        hasCloudTeacher: null, // 是否购买云教练
+        payingStatus: null,
       },
       quitForm: {
         // 退团信息确认
@@ -1048,6 +1088,8 @@ export default {
         currentGrade: null,
         paymentStatus: null,
         visited: null,
+        hasCloudTeacher: null,
+        payingStatus: null,
       };
       this.getList();
     },
@@ -1073,6 +1115,8 @@ export default {
         currentGrade: this.searchFrom.currentGrade || null,
         paymentStatus: this.searchFrom.paymentStatus || null,
         visited: this.searchFrom.visited || null,
+        hasCloudTeacher: this.searchFrom.hasCloudTeacher,
+        payingStatus: this.searchFrom.payingStatus,
         page: this.rules.page,
         rows: this.rules.limit,
       };
@@ -1803,13 +1847,13 @@ export default {
     flex-direction: row;
     justify-content: flex-start;
     .left {
-      width: 340px;
+      width: 400px;
       background-color: #fff;
       height: 80vh;
       overflow: auto;
     }
     .right {
-      width: calc(100% - 340px);
+      width: calc(100% - 400px);
       margin-left: 12px;
       flex-grow: 1;
     }