Merge branch 'Nov16thResetMusic' into online

src/api/buildTeam.js

@@ -1377,3 +1377,21 @@ export function queryCourseAdjustDetail (data) {
     data: qs.stringify(data)
   })
 }
+
+// 获取合课学生
+export function getCourseStudents (data) {
+  return request({
+    url: api + '/courseScheduleStudentPayment/getCourseStudents',
+    method: 'get',
+    params: data
+  })
+}
+
+// 课程合并
+export function courseMerge (data) {
+  return request({
+    url: api + '/courseSchedule/courseMerge',
+    method: 'post',
+    data: qs.stringify(data)
+  })
+}

src/components/save-form/index.vue

@@ -30,6 +30,9 @@ export default {
     }
   },
   methods: {
+    save(search = null, type = 'form') {
+      this.searchs.update(search, undefined, type)
+    },
     validate(FC) {
       this.$refs.form.validate(valid => {
         FC(valid)

src/router/notKeepAliveList.js

@@ -1,5 +1,6 @@
 export default [
   '/setSilder/save-form',
   '/contentManager/accompaniment',
+  '/orderList/orderAudit'
   // '/operateManager/HumanResources'
 ]

src/views/businessManager/orderManager/financeManager.vue

@@ -271,6 +271,7 @@
           <div class="lookTitle">基本信息</div>
           <el-form-item label="所属分部"
                         prop="routeOrganId"
+                        :rules="[{ required: true, message: '请选择分部', trigger: 'change' }]"
                         :label-width="formLabelWidth">
             <el-select v-model.trim="form.routeOrganId"
                        :disabled="!isAdd"

src/views/businessManager/orderManager/orderAudit/index.vue

@@ -5,8 +5,8 @@
       <div class="squrt"></div>订单审核
     </h2>
     <div class="m-core">
-      <el-form :inline="true"
-               :model="searchForm">
+ 
+      <saveform ref="searchForm" :model.sync="searchForm" inline style="margin-top: 20px" >
         <el-form-item>
           <el-input v-model.trim="searchForm.transNo"
                     @keyup.enter.native="transNo"
@@ -55,7 +55,7 @@
           <el-button @click="onReSet"
                      type="primary">重置</el-button>
         </el-form-item>
-      </el-form>
+      </saveform>
       <div class="tableWrap">
         <el-table style="width: 100%"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}"
@@ -129,7 +129,9 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="rules.total"
+        <pagination 
+        sync
+        :total.sync="rules.total"
                     :page.sync="rules.page"
                     :limit.sync="rules.limit"
                     :page-sizes="rules.page_size"
@@ -170,21 +172,22 @@ import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
 import { getEmployeeOrgan, getAddress, getCooperation } from "@/api/buildTeam";
-import { orderServerList, orderAuditTypeList } from "@/utils/searchArray"
-import orderAuditDetail from './orderAuditDetail'
-import { getRouteOrderList } from '@/api/orderManager'
-import { goodsQuery } from '@/api/businessManager'
-import { formatData } from '@/utils/utils';
-import Tooltip from '@/components/Tooltip/index'
+import { orderServerList, orderAuditTypeList } from "@/utils/searchArray";
+import orderAuditDetail from "./orderAuditDetail";
+import { getRouteOrderList } from "@/api/orderManager";
+import { goodsQuery } from "@/api/businessManager";
+import { formatData } from "@/utils/utils";
+import Tooltip from "@/components/Tooltip/index";
+import saveform from '@/components/save-form'
 export default {
-  components: { pagination, orderAuditDetail, Tooltip },
-  data () {
+  components: { pagination, orderAuditDetail, Tooltip,saveform },
+  data() {
     return {
       searchForm: {
         transNo: null,
         organId: null,
         auditStatus: null,
-        type: null
+        type: null,
       },
       tableList: [],
       organList: [],
@@ -195,104 +198,102 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50] // 选择限制显示条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
       },
       orderVisible: false,
       activceId: null,
       activeRow: null,
-      isLook: null
+      isLook: null,
     };
   },
   //生命周期 - 创建完成（可以访问当前this实例）
-  created () { },
+  created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted () {
-    getEmployeeOrgan().then(res => {
+  mounted() {
+    getEmployeeOrgan().then((res) => {
       if (res.code == 200) {
         this.organList = res.data;
       }
     });
     // 获取分部
-    goodsQuery({ status: 1, rows: 99999 }).then(res => {
+    goodsQuery({ status: 1, rows: 99999 }).then((res) => {
       if (res.code === 200) {
-
-        this.shopList = res.data.rows
+        this.shopList = res.data.rows;
       }
-    })
+    });
 
     this.init();
   },
-  activated () {
+  activated() {
     this.init();
   },
   methods: {
-    init () {
-      this.getList()
+    init() {
+      this.getList();
     },
-    search () {
+    search() {
+      this.$refs.searchForm.save( this.searchForm)
       this.rules.page = 1;
-      this.getList()
+      this.getList();
     },
-    onReSet () {
+    onReSet() {
       this.searchForm = {
         transNo: null,
         organId: null,
         auditStatus: null,
-        type: null
-      }
-      this.search()
+        type: null,
+      };
+      this.search();
     },
-    getList () {
-      let params = this.searchForm
-      params.rows = this.rules.limit
-      params.page = this.rules.page
-      getRouteOrderList(params).then(res => {
+    getList() {
+      let params = this.searchForm;
+      params.rows = this.rules.limit;
+      params.page = this.rules.page;
+      getRouteOrderList(params).then((res) => {
         if (res.code == 200) {
-          this.tableList = res.data.rows
-          this.rules.total = res.data.total
-          this.orderVisible = false
+          this.tableList = res.data.rows;
+          this.rules.total = res.data.total;
+          this.orderVisible = false;
         }
-
-      })
+      });
     },
-    lookDetail (row) {
-      this.activceId = row.id
-      this.activeRow = row
-      this.isLook = true
-      this.orderVisible = true
+    lookDetail(row) {
+      this.activceId = row.id;
+      this.activeRow = row;
+      this.isLook = true;
+      this.orderVisible = true;
     },
-    resetDetail (row) {
-      this.activceId = row.id
-      this.activeRow = row
-      this.isLook = false
-      this.orderVisible = true
+    resetDetail(row) {
+      this.activceId = row.id;
+      this.activeRow = row;
+      this.isLook = false;
+      this.orderVisible = true;
     },
-    submit (str) {
+    submit(str) {
       let message;
-      str == 'REJECT' ? message = '驳回' : message = '同意'
+      str == "REJECT" ? (message = "驳回") : (message = "同意");
       this.$confirm(`是否${message}审核`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
-          this.$refs.orderAuditDetail.auditOutOrder(str)
+          this.$refs.orderAuditDetail.auditOutOrder(str);
         })
-        .catch(() => { });
-
+        .catch(() => {});
     },
-    submitReaet () {
+    submitReaet() {
       this.$confirm(`是否提交修改`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning"
+        type: "warning",
       })
         .then(() => {
-          this.$refs.orderAuditDetail.submitReaet()
+          this.$refs.orderAuditDetail.submitReaet();
         })
-        .catch(() => { });
-    }
-  }
+        .catch(() => {});
+    },
+  },
 };
 </script>
 <style lang='scss' scoped>

src/views/businessManager/orderManager/orderAudit/orderAuditDetail.vue

@@ -19,10 +19,10 @@
       <div class="lookTitle">基本信息</div>
       <el-form-item label="所属分部"
                     :rules="[{ required: true, message: '请选择分部', trigger: 'change' }]"
-                    prop="organId"
+                    prop="routeOrganId"
                     :label-width="formLabelWidth">
         <!--    -->
-        <el-select v-model.trim="form.organId"
+        <el-select v-model.trim="form.routeOrganId"
                    :disabled="!isAdd"
                    @change="changeOrgin"
                    style="width: 100% !important;">
@@ -32,8 +32,7 @@
                      :value="item.id"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="所属学校"
-                    :rules="[{ required: true, message: '请选择学校', trigger: 'change' }]"
+      <el-form-item label="所属学校"                  
                     prop="schoolId"
                     :label-width="formLabelWidth">
         <!--    @change="checkSchool" -->
@@ -102,8 +101,32 @@
                      :value="item.value"></el-option>
         </el-select>
       </el-form-item>
-      <div v-if="form.applyType == 'SELL'">
-        <div v-for="(goodsList, index) in form.goodsList"
+      <el-form-item label="销售金额"
+                    :rules="[{ required: true, message: '请输入销售金额', trigger: 'change' }]"
+                    v-if="form.applyType == 'SELL'"
+                    prop="
+                    saleAmount"
+                    :label-width="formLabelWidth">
+        <el-input v-model="form.saleAmount"
+                  @mousewheel.native.prevent
+                  type="number"
+                  :disabled="!isAdd"
+                  placeholder="请输入销售金额" />
+      </el-form-item>
+      <el-form-item label="服务金额"
+                    v-if="form.applyType == 'SERVICE'"
+                    :rules="[{ required: true, message: '请输入服务金额', trigger: 'change' }]"
+                    prop="serviceAmount"
+                    :label-width="formLabelWidth">
+        <el-input type="number"
+                  @mousewheel.native.prevent
+                  :disabled="!isAdd"
+                  v-model="form.serviceAmount"
+                  placeholder="请输入收入金额" />
+      </el-form-item>
+
+      <div  v-if="form.applyType == 'SELL'">
+        <div v-for="(goodsList, index) in form.goodsList" 
              :key="index">
           <el-form-item :label="'商品名称' + (index + 1)"
                         :label-width="formLabelWidth"
@@ -213,7 +236,7 @@ export default {
     return {
       formLabelWidth: "100px",
       form: {
-        organId: null,
+        routeOrganId: null,
         transNo: null,
         type: "OTHER",
         merNo: null,
@@ -249,7 +272,7 @@ export default {
           this.form = {
             createTime: orderInfo.createTime,
             operator: orderInfo.operator,
-            organId: orderInfo.routeOrganId,
+            routeOrganId: orderInfo.routeOrganId,
             transNo: orderInfo.transNo,
             type: "OTHER",
             merNo: orderInfo.merNo,
@@ -299,7 +322,10 @@ export default {
       } catch {
       }
       console.log(arr)
-      return arr
+      return arr.length>0? arr:[{
+          id: null,
+          number: null
+        }]
     },
     auditOutOrder (status) {
       const that = this;

src/views/teamDetail/componentCourse/addCompound.vue

@@ -83,6 +83,7 @@
                      @closeReset='closeReset'
                      :isDisabled='true'
                      @getList='getList'
+                     :idList='idList'
                      :id='radio' />
     </el-dialog>
   </div>
@@ -98,12 +99,11 @@ export default {
       dataList: this.compoundList,
       isLook: false,
       show: false,
-
+      idList:''
     }
   },
   methods: {
     cancleCom (row) {
-      console.log('来了')
       this.$emit('cancleCompound', row)
     },
     clearCom () {
@@ -115,8 +115,10 @@ export default {
         return
       }
       let arr = []
+      let idList = []
       this.dataList.forEach(com => {
         arr.push(com.type)
+        idList.push(com.id)
       })
       arr = [... new Set(arr)]
       if (arr.length != 1) {
@@ -128,12 +130,17 @@ export default {
         return
       }
       // 做判断 
+      this.idList = idList.join(',')
       this.show = true;
       this.isLook = false
 
     },
     getList () { },
-    closeReset () { }
+    closeReset () {
+      this.clearCom()
+      this.show = false
+      this.$emit('getList')
+     }
   },
   watch: {
     compoundList (val) {

src/views/teamDetail/componentCourse/compoundClass.vue

@@ -21,7 +21,7 @@
             <div style="width:220px!important">
               <a href="#"
                  class="studentTitle"
-                 @click="studentListModalVisible=true"> 学生列表>></a>
+                 @click="lookStudentList"> 学生列表>></a>
             </div>
           </el-form-item>
         </el-col>
@@ -165,13 +165,13 @@
 </template>
 <script>
 import { diffTimerFormMinute, addTimerFormMinute } from '@/utils/date'
-import { getTeacher, resetCourse, getCourseScheduleDetail } from "@/api/buildTeam";
+import { getTeacher, courseMerge, getCourseScheduleDetail,getCourseStudents } from "@/api/buildTeam";
 import viewStudentList from '../components/modals/view-student-list'
 import { getTeachSchool } from "@/api/teacherManager";
 import cleanDeep from 'clean-deep'
 import dayjs from 'dayjs';
 export default {
-  props: ["show", "id", "isDisabled"],
+  props: ["show", "id", "isDisabled","idList"],
   components: { viewStudentList },
   data () {
     return {
@@ -238,8 +238,9 @@ export default {
             groupType: maskForm.groupType,
             schoolId: this.maskForm.address,
             teachMode: this.maskForm.teachMode,
+            mergeCourseIds:this.idList
           };
-          resetCourse(cleanDeep(obj)).then(res => {
+          courseMerge(obj).then(res => {
             if (res.code == 200) {
               this.$message.success("修改成功");
               this.$emit('getList')
@@ -313,6 +314,14 @@ export default {
           }
         }
       })
+    },
+    lookStudentList(){
+      getCourseStudents({courseIds:this.idList}).then(res=>{
+        if(res.code == 200){
+          this.studentListModal = res.data;
+          this.studentListModalVisible = true;
+        }
+      })
     }
   },
 

src/views/teamDetail/componentCourse/studentWork.vue

@@ -87,8 +87,7 @@
             <div>
               <!--   -->
               <el-button type="text"
-                         v-if="scope.row.urlList"
-                         :disabled='!scope.row.createTime'
+                         v-if="scope.row.urlList&&scope.row.createTime"
                          @click="lookWork(scope.row)">查看作业</el-button>
             </div>
           </template>

src/views/teamDetail/components/modals/classList-group.vue

@@ -4,18 +4,24 @@
       <classListItem v-for="(item,index) in form.classList"
                      :key="index"
                      :index='index'
-                     :item='item' />
+                     :item='item'
+                     @deteleClass="deteleClass"
+                     :form="form"
+                     :classList="classList" />
     </el-form>
     <el-button icon="el-icon-circle-plus-outline"
                plain
                type="info"
                size="small"
-               style="width: 100%;margin: 20px 0;">添加班级</el-button>
+               style="width: 100%;margin: 20px 0;"
+               @click="addClass"
+               :disabled="form.classList.length >= classList.length">添加班级</el-button>
   </div>
 </template>
 <script>
 import classListItem from './classList-item'
 export default {
+  props: ['classList'],
   components: { classListItem },
   data () {
     return {
@@ -23,6 +29,14 @@ export default {
         classList: [{ classId: '', studentList: [], courseList: [], index: '', classList: [] }]
       },
     }
+  }, methods: {
+    addClass () {
+
+      this.form.classList.push({ classId: '', studentList: [], courseList: [], index: '', classList: [] })
+    },
+    deteleClass (index) {
+      this.form.classList.splice(index, 1)
+    }
   }
 }
 </script>

src/views/teamDetail/components/modals/classList-item.vue

@@ -1,8 +1,9 @@
 <template>
   <div>
-    <el-alert title="班级1"
+    <!--     :closable="false" -->
+    <el-alert :title="'班级'+(index+1)"
               type="info"
-              :closable="false"
+              @close="deteleClass"
               class='alert'>
     </el-alert>
     <el-form-item label="选择班级"
@@ -11,22 +12,43 @@
       <el-select v-model="item.classId"
                  style="margin-right:20px;"
                  @change="changeValue">
-        <el-option label="1"
-                   value="2"></el-option>
+        <el-option :label="item.name"
+                   :value="item.id"
+                   v-for="(item,index) in classList"
+                   :key='index'
+                   :disabled="isDisabled(item)"></el-option>
       </el-select>
       <a>学员列表>></a>
     </el-form-item>
+    <div class="infomsg">
+      <div class="left">剩余课时:<p>合奏课:<span>1</span>节</p>
+      </div>
+      <div class="right">已选学员:<p><span>2</span>人</p>
+      </div>
+    </div>
   </div>
 </template>
 <script>
 export default {
-  props: ['item', 'index'],
+  props: ['item', 'index', 'classList', 'form'],
   data () {
     return {}
   },
   methods: {
     changeValue (val) {
       console.log(val)
+    },
+    deteleClass () {
+      this.$emit('deteleClass', this.index)
+    },
+    isDisabled (item) {
+      let flag = false;
+      this.form?.classList?.forEach(some => {
+        if (item.id == some.classId) {
+          flag = true
+        }
+      })
+      return flag
     }
   }
 }
@@ -35,4 +57,26 @@ export default {
 .alert {
   margin-bottom: 10px;
 }
+.infomsg {
+  background-color: #f5faf9;
+  height: 34px;
+  line-height: 34px;
+  padding: 0 25px;
+  color: #333;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  margin-bottom: 20px;
+  div {
+    display: flex;
+    flex-direction: row;
+    p {
+      color: #1a1a1a;
+      font-weight: bold;
+      span {
+        color: #3b7f7a;
+      }
+    }
+  }
+}
 </style>

src/views/teamDetail/components/modals/student-reset-view.vue

@@ -6,12 +6,13 @@
               class="alert"
               show-icon>
     </el-alert>
-    <classListGroup />
+    <classListGroup :classList="classList" />
   </div>
 </template>
 <script>
 import classListGroup from './classList-group'
 export default {
+  props: ['classList'],
   components: {
     classListGroup
   },

src/views/teamDetail/components/modals/view-student-list.vue

@@ -7,13 +7,13 @@
       tooltip-effect="dark"
     >
       <el-table-column
-        prop="name"
+        prop="userId"
         align="center"
         width="120"
         label="学员编号"
       ></el-table-column>
       <el-table-column
-        prop="name"
+        prop="nickName"
         align="center"
         width="120"
         label="学员姓名"
@@ -23,15 +23,21 @@
         align="center"
         width="120"
         label="性别"
-      ></el-table-column>
+      >
+      <template slot-scope="scope">
+        <div>
+          {{scope.row.gender| sex}}
+        </div>
+      </template>
+      </el-table-column>
       <el-table-column
-        prop="name"
+        prop="phone"
         align="center"
         width="120"
         label="联系电话"
       ></el-table-column>
       <el-table-column
-        prop="name"
+        prop="subjectNames"
         align="center"
         width="120"
         label="专业"
@@ -47,3 +53,9 @@ export default {
   props: ['list'],
 };
 </script>
+<style lang="scss" scoped>
+/deep/.dialog-footer{
+  margin-top: 10px;
+}
+  
+</style>

src/views/teamDetail/components/resetClass.vue

@@ -363,7 +363,7 @@
     <el-dialog title='学员班级调整'
                width="700px"
                :visible.sync="studentResetVisiable">
-      <studentResetView />
+      <studentResetView :classList='activeSingleList' />
     </el-dialog>
   </div>
 </template>

src/views/teamDetail/teamCourseList.vue

@@ -52,7 +52,7 @@
           <el-select v-model.trim="searchForm.groupType"
                      clearable
                      filterable
-                     placeholder="课程租类型">
+                     placeholder="课程组类型">
             <el-option v-for="(item, index) in courseListType"
                        :key="index"
                        :value="item.value"
@@ -207,6 +207,19 @@
             </template>
           </el-table-column>
           <el-table-column align="center"
+                           label="考勤申诉">
+            <template slot-scope="scope">
+              <div>{{ scope.row.isComplaints==1?'是':'否'}}</div>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column align="center"
+                           label="是否签退"
+                           fixed="right">
+            <template slot-scope="scope">
+              <div>{{ scope.row.isSignOut | attendanceOutType}}</div>
+            </template>
+          </el-table-column> -->
+          <el-table-column align="center"
                            prop="isCallNames"
                            label="是否点名"
                            fixed="right">
@@ -727,7 +740,6 @@ export default {
     }
   },
   watch: {
-
     classVisible (val) {
       if (!val) {
         this.activeName = null;