Merge branch 'master' into wxl_01_15

dist/static/css/chunk-57f555ca.8e8406dd.css → dist/static/css/chunk-09cd8292.03d1d739.css

@@ -1 +1 @@
-.newBand[data-v-0b6f32fc]{display:inline-block}[data-v-0b6f32fc] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-0b6f32fc]{display:inline-block}.lookTitle[data-v-0b6f32fc]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-0b6f32fc]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-0b6f32fc]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}
+.newBand[data-v-a81eeb0e]{display:inline-block}[data-v-a81eeb0e] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-a81eeb0e]{display:inline-block}.lookTitle[data-v-a81eeb0e]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-a81eeb0e]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-a81eeb0e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}

src/views/businessManager/orderManager/financeManager.vue

@@ -207,6 +207,13 @@
           :data="tableList"
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
         >
+          <!-- <el-table-column align="center" prop="transNo" label="所属分部">
+            <template slot-scope="scope">
+              <div>
+                <copy-text>{{ scope.row.routeOrganName }}</copy-text>
+              </div>
+            </template>
+          </el-table-column> -->
           <el-table-column align="center" prop="transNo" label="交易流水号">
             <template slot-scope="scope">
               <div>
@@ -284,8 +291,9 @@
               <div>
                 <!-- v-if="scope.row.type !== 'OUTORDER'" -->
                 <div>
-
-                  <p><copy-text> {{ scope.row.user.username }}</copy-text></p>
+                  <p>
+                    <copy-text> {{ scope.row.user.username }}</copy-text>
+                  </p>
                   <copy-text>{{ scope.row.user.phone }}</copy-text>
                 </div>
               </div>
@@ -480,7 +488,11 @@
             </el-select>
           </el-form-item>
           <div v-if="form.applyType == 'SELL'">
-            <div v-for="(goodsList, index) in form.goodsList" :key="index"  class="shopListWrap">
+            <div
+              v-for="(goodsList, index) in form.goodsList"
+              :key="index"
+              class="shopListWrap"
+            >
               <el-form-item
                 :label="'商品名称' + (index + 1)"
                 :label-width="formLabelWidth"
@@ -491,7 +503,7 @@
                 ]"
               >
                 <el-select
-                 v-if="isAdd"
+                  v-if="isAdd"
                   v-model.trim="goodsList.id"
                   filterable
                   :disabled="!isAdd"
@@ -505,13 +517,13 @@
                     :value="item.id"
                   ></el-option>
                 </el-select>
-                  <p class="showShop" v-else>
-              <Tooltip :content="goodsList.id | filterShopId" />
-            </p>
+                <p class="showShop" v-else>
+                  <Tooltip :content="goodsList.id | filterShopId" />
+                </p>
               </el-form-item>
               <el-form-item
                 class="setWidth"
-                style="margin:0 10px"
+                style="margin: 0 10px"
                 :prop="'goodsList.' + index + '.number'"
                 :rules="validAmount"
               >
@@ -531,16 +543,15 @@
                 :disabled="!isAdd"
                 v-if="form.goodsList.length > 1"
                 circle
-                 style="height:40px;"
+                style="height: 40px"
                 @click.prevent="removeGoodsList(goodsList)"
               ></el-button>
               <el-button
                 icon="el-icon-plus"
-
                 :disabled="!isAdd"
                 @click.prevent="addGoodsList"
                 circle
-                style="margin-left: 5px; height:40px;"
+                style="margin-left: 5px; height: 40px"
               ></el-button>
             </div>
           </div>
@@ -632,16 +643,16 @@ let validAmount = (rule, value, callback) => {
 };
 let that;
 export default {
-  components: { pagination,Tooltip },
+  components: { pagination, Tooltip },
   name: "incomeTwo",
   computed: {
     extraQuery() {
-      const data = {}
-      if (this.$route.path === '/orderList/financeManager') {
-        data.noneTqType = '1'
+      const data = {};
+      if (this.$route.path === "/orderList/financeManager") {
+        data.noneTqType = "1";
       }
-      return data
-    }
+      return data;
+    },
   },
   data() {
     return {
@@ -734,8 +745,8 @@ export default {
       },
     };
   },
-  created(){
-    that = this
+  created() {
+    that = this;
   },
   mounted() {
     // getEmployeeOrgan().then((res) => {
@@ -846,7 +857,7 @@ export default {
         organId: searchForm.organId,
         lessBalancePaymentAmount: searchForm.lessBalancePaymentAmount,
         lessActualAmount: searchForm.lessActualAmount,
-        ...this.extraQuery
+        ...this.extraQuery,
       };
 
       if (this.searchForm.orderDate && this.searchForm.orderDate.length > 0) {
@@ -891,7 +902,7 @@ export default {
               nowTime.getHours() +
               "" +
               nowTime.getMinutes();
-            let fname = "报表导出" + new Date().getTime()+'.xls'; //下载文件的名字
+            let fname = "报表导出" + new Date().getTime() + ".xls"; //下载文件的名字
             link.href = objectUrl;
             link.setAttribute("download", fname);
             document.body.appendChild(link);
@@ -905,7 +916,7 @@ export default {
       // 报表导出
       let url = "/api-web/adapay/exportBill";
       let data = {
-        ...this.extraQuery
+        ...this.extraQuery,
       };
       if (this.searchForm.orderDate && this.searchForm.orderDate.length > 0) {
         data.startTime = this.searchForm.orderDate[0];
@@ -938,7 +949,7 @@ export default {
             });
             let objectUrl = URL.createObjectURL(blob);
             let link = document.createElement("a");
-            let fname = "汇付订单" + new Date().getTime()+'.xls'; //下载文件的名字
+            let fname = "汇付订单" + new Date().getTime() + ".xls"; //下载文件的名字
             link.href = objectUrl;
             link.setAttribute("download", fname);
             document.body.appendChild(link);
@@ -956,9 +967,12 @@ export default {
     },
     getList() {
       // let params = JSON.parse(JSON.stringify(this.searchForm));
-      let params = Object.assign({
-        ...this.extraQuery
-      }, this.searchForm);
+      let params = Object.assign(
+        {
+          ...this.extraQuery,
+        },
+        this.searchForm
+      );
       // let params = {...this.searchForm}
       params.rows = this.pageInfo.limit;
       params.page = this.pageInfo.page;
@@ -1207,7 +1221,7 @@ export default {
       }
     },
   },
-    filters: {
+  filters: {
     filterShopId(val) {
       let str = "";
       that.shopList.forEach((shop) => {
@@ -1253,5 +1267,9 @@ export default {
   padding: 0 15px;
   margin-right: 10px;
 }
-.shopListWrap { display: flex; flex-direction: row; justify-content: flex-start;}
+.shopListWrap {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+}
 </style>

src/views/businessManager/orderManager/income.vue

@@ -186,6 +186,17 @@
           :data="tableList"
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
         >
+               <!-- <el-table-column
+            align="center"
+            prop="transNo"
+            label="所属分部"
+          >
+            <template slot-scope="scope">
+              <div>
+                <copy-text>{{ scope.row.organName }}</copy-text>
+              </div>
+            </template>
+          </el-table-column> -->
           <el-table-column
             align="center"
             width="180px"

src/views/teamBuild/teamSeting/components/setClassV2.vue

@@ -1434,17 +1434,19 @@ export default {
           });
         }
       });
-      if (this.activeType == "HIGH" || this.activeType == "HIGH_ONLINE") {
-        this.getNoClassStudent(row.type, row.memo);
-        let arr = row.memo.split(",");
-
-        this.activeSoundList = this.soundList.filter((sound) => {
-          return arr.indexOf(sound.id + "") != -1;
-        });
-      } else {
-        this.activeSoundList = this.soundList;
+         this.activeSoundList = this.soundList;
         this.getNoClassStudent(row.type);
-      }
+      // if (this.activeType == "HIGH" || this.activeType == "HIGH_ONLINE") {
+      //   this.getNoClassStudent(row.type, row.memo);
+      //   let arr = row.memo.split(",");
+
+      //   this.activeSoundList = this.soundList.filter((sound) => {
+      //     return arr.indexOf(sound.id + "") != -1;
+      //   });
+      // } else {
+      //   this.activeSoundList = this.soundList;
+      //   this.getNoClassStudent(row.type);
+      // }
     },
     // 排课开始
     arrangeStart() {

src/views/teamDetail/components/modals/classroom-setting.vue

@@ -37,7 +37,7 @@
         </el-select>
          <!-- <remote-search :commit="'setTeachers'" v-model="form.coreTeacher"  /> -->
       </el-form-item>
-      <el-form-item label="助教老师" prop="assistant">
+      <el-form-item label="助教老师" prop="assistant" v-if="activeType!='HIGH'&&activeType!='HIGH_ONLINE'">
          <!-- <remote-search :commit="'setTeachers'" v-model="form.assistant"  :multiple='true'/> -->
         <el-select
           v-model.trim="form.assistant"
@@ -54,7 +54,7 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="排课类型" label-width="88px">
+      <el-form-item v-if="!!Object.keys(allClasss).length" style="display: block;" label="排课类型" label-width="88px">
         <el-tag
           class="tag"
           :effect="form.classs[key] ? 'dark' : 'plain'"
@@ -159,7 +159,7 @@ export default {
         assistant: "",
         classs: {},
       },
-      allClasss: [],
+      allClasss: {},
       prices: {},
       collapses: [0],
       courseTimes: {},
@@ -281,6 +281,15 @@ export default {
         // this.courseTimes = courseTimes
 
     },
+    changeTag(key) {
+      const clas = {...this.form.classs}
+      if (clas[key]) {
+        delete clas[key]
+      } else {
+        clas[key] = this.allClasss[key]
+      }
+      this.$set(this.form, 'classs', clas)
+    },
     submit() {
       this.$refs.form.validate(async (valid) => {
         if (valid) {

src/views/teamDetail/components/resetClass.vue

@@ -945,18 +945,20 @@ export default {
           });
         }
       });
-      if (this.activeType == "HIGH" || this.activeType == "HIGH_ONLINE") {
-        this.getNoClassStudent(row.type, row.memo);
-        let arr = row.memo.split(",");
-        console.log(arr);
-        this.activeSoundList = this.soundList.filter((sound) => {
-          return arr.indexOf(sound.id + "") != -1;
-        });
-      } else {
-        this.activeSoundList = this.soundList;
-        this.getNoClassStudent(row.type);
-        console.log(this.activeSoundList);
-      }
+      this.activeSoundList = this.soundList;
+      this.getNoClassStudent(row.type);// 基础技能班能获取所有
+      // if (this.activeType == "HIGH" || this.activeType == "HIGH_ONLINE") {
+      //   this.getNoClassStudent(row.type, row.memo);
+      //   let arr = row.memo.split(",");
+      //   console.log(arr);
+      //   this.activeSoundList = this.soundList.filter((sound) => {
+      //     return arr.indexOf(sound.id + "") != -1;
+      //   });
+      // } else {
+      //   this.activeSoundList = this.soundList;
+      //   this.getNoClassStudent(row.type);
+      //   console.log(this.activeSoundList);
+      // }
     },
     // 班级调整
     classAdjustment(row) {