Merge branch 'online' into Nov16thResetMusic

dist/static/css/chunk-05ffe0fa.a335b8c3.css

@@ -0,0 +1 @@
+.lookTitle[data-v-744b5874]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.setWidth[data-v-744b5874]{display:inline-block}

dist/static/css/chunk-1ee4ba0a.1699de6a.css

@@ -0,0 +1 @@
+.newBand[data-v-0fafcc44]{display:inline-block}[data-v-0fafcc44] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-0fafcc44]{display:inline-block}.lookTitle[data-v-0fafcc44]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}

dist/static/css/chunk-2555435c.c941a5a0.css

@@ -1 +0,0 @@
-.m-container .m-core[data-v-1e79951a]{margin-top:20px}.m-container .m-core .m-wrap[data-v-1e79951a]{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;width:100%}.m-container .m-core .m-wrap .newBand[data-v-1e79951a]{margin:0 5px 0 10px}.m-container .m-core .m-wrap .title[data-v-1e79951a]{width:120px;height:40px;line-height:40px;text-align:right;color:#606266}.m-container .m-core .m-wrap .organSelect[data-v-1e79951a]{width:220px!important}.m-container .m-core .m-wrap .el-tooltip.micon[data-v-1e79951a]{width:20px;height:20px;position:relative;top:12px}[data-v-1e79951a] .el-input__icon.el-icon-date{height:40px!important}

dist/static/css/chunk-25ba470e.49594c0f.css

@@ -1 +0,0 @@
-.table[data-v-35abdaf4]{margin-top:20px}.table[data-v-35abdaf4] .el-table__header .has-gutter tr th{background-color:#edeef0;color:#444}

dist/static/css/chunk-3569217f.0dd3a490.css

@@ -0,0 +1 @@
+.table[data-v-25279d2a]{margin-top:20px}.table[data-v-25279d2a] .el-table__header .has-gutter tr th{background-color:#edeef0;color:#444}

dist/static/css/chunk-3f9f2c37.55163f6e.css

@@ -1 +0,0 @@
-.alert[data-v-2fbbfd00]{margin:10px 0}.dialog-footer[data-v-290cb116]{margin-top:20px;display:block;text-align:right}.el-button--primary[data-v-0ba5695e],.el-button--primary[data-v-0ba5695e]:active,.el-button--primary[data-v-0ba5695e]:focus,.el-button--primary[data-v-0ba5695e]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-0ba5695e] .el-date-editor.el-input,[data-v-0ba5695e] .el-select{width:100%!important}[data-v-0ba5695e] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-0ba5695e] .el-dialog__body{padding:10px 20px}.newBand[data-v-0ba5695e]{display:inline-block}

dist/static/css/chunk-5e8ea4b0.ed7c551b.css

@@ -0,0 +1 @@
+.alert[data-v-2fbbfd00]{margin:10px 0}.dialog-footer[data-v-290cb116]{margin-top:20px;display:block;text-align:right}.el-button--primary[data-v-defa033c],.el-button--primary[data-v-defa033c]:active,.el-button--primary[data-v-defa033c]:focus,.el-button--primary[data-v-defa033c]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-defa033c] .el-date-editor.el-input,[data-v-defa033c] .el-select{width:100%!important}[data-v-defa033c] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-defa033c] .el-dialog__body{padding:10px 20px}.newBand[data-v-defa033c]{display:inline-block}

dist/static/css/chunk-64749b76.6ba9876e.css

@@ -0,0 +1 @@
+.m-container .m-core[data-v-5af5aecc]{margin-top:20px}.m-container .m-core .m-wrap[data-v-5af5aecc]{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;width:100%}.m-container .m-core .m-wrap .newBand[data-v-5af5aecc]{margin:0 5px 0 10px}.m-container .m-core .m-wrap .title[data-v-5af5aecc]{width:120px;height:40px;line-height:40px;text-align:right;color:#606266}.m-container .m-core .m-wrap .organSelect[data-v-5af5aecc]{width:220px!important}.m-container .m-core .m-wrap .el-tooltip.micon[data-v-5af5aecc]{width:20px;height:20px;position:relative;top:12px}[data-v-5af5aecc] .el-input__icon.el-icon-date{height:40px!important}

dist/static/css/chunk-8b3c3af6.e805a68d.css → dist/static/css/chunk-65112b62.e5eed4f4.css

@@ -1 +1 @@
-.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-11567c78]{font-size:14px}.btnList[data-v-11567c78]{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;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-11567c78]{margin-right:15px}
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-c68c0924]{font-size:14px}.btnList[data-v-c68c0924]{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;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-c68c0924]{margin-right:15px}

dist/static/css/chunk-66e4738e.a1b1da5c.css

@@ -1 +0,0 @@
-.newBand[data-v-38eca668]{display:inline-block}[data-v-38eca668] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-38eca668]{display:inline-block}.lookTitle[data-v-38eca668]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}

dist/static/css/chunk-7413597c.3b7c0603.css

@@ -1 +0,0 @@
-.lookTitle[data-v-5961634b]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.setWidth[data-v-5961634b]{display:inline-block}

src/router/notKeepAliveList.js

@@ -4,6 +4,7 @@ export default [
   '/orderList/orderAudit',
   '/business/teamCourseList',
   '/business/auditList',
-  '/journal/payAppeal'
+  '/journal/payAppeal',
+  '/orderList/financeManager'
   // '/operateManager/HumanResources'
 ]

src/views/auditList/index.vue

@@ -7,7 +7,7 @@
     </h2>
     <div class="m-core">
       <!-- 搜索标题 -->
-      <save-form :inline="true"
+      <save-form :inline="true" 
                class="searchForm"
                ref="searchForm"
                :model.sync="searchForm">

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

@@ -5,7 +5,7 @@
       <div class="squrt"></div>订单审核
     </h2>
     <div class="m-core">
- 
+
       <saveform ref="searchForm" :model.sync="searchForm" inline style="margin-top: 20px" >
         <el-form-item>
           <el-input v-model.trim="searchForm.transNo"
@@ -119,15 +119,17 @@
             <template slot-scope="scope">
               <div>
                 <el-button type="text"
+                v-permission="'routeOrder/query'"
                            @click="lookDetail(scope.row)">查看</el-button>
                 <el-button type="text"
+                v-permission="'routeOrder/update'"
                            v-if="scope.row.auditStatus == 'REJECT'"
                            @click="resetDetail(scope.row)">修改</el-button>
               </div>
             </template>
           </el-table-column>
         </el-table>
-        <pagination 
+        <pagination
         sync
         :total.sync="rules.total"
                     :page.sync="rules.page"
@@ -148,15 +150,19 @@
                         v-if="orderVisible"
                         @getList="getList" />
       <span slot="footer"
-            class="dialog-footer">
+            class="dialog-footer" >
         <el-button v-if="activeRow&&activeRow.auditStatus == 'ING'"
+         v-permission="'routeOrder/auditOutOrder'"
                    @click="submit('REJECT')">驳回</el-button>
         <el-button v-if="activeRow&&activeRow.auditStatus == 'ING'"
+         v-permission="'routeOrder/auditOutOrder'"
                    @click="submit('PASS')"
                    type="primary">审核通过</el-button>
         <el-button @click="orderVisible = false"
+
                    v-if="activeRow&&activeRow.auditStatus == 'REJECT'&&!isLook">取 消</el-button>
         <el-button v-if="activeRow&&activeRow.auditStatus == 'REJECT'&&!isLook"
+         v-permission="'routeOrder/update'"
                    @click="submitReaet"
                    type="primary">确 定</el-button>
       </span>
@@ -295,4 +301,4 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-</style>
+</style>

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

@@ -1,215 +1,298 @@
 <template>
   <div>
-    <el-form :inline='true'
-             ref='ruleForm'>
+    <el-form :inline="true" ref="ruleForm">
       <div class="lookTitle">申请信息</div>
-      <el-form-item label="申请人"
-                    label-width="80px">
-        <div style="width:180px">
-          <p v-if="form.operator&&form.operator.username">{{form.operator.username}}</p>
+      <el-form-item label="申请人" label-width="80px">
+        <div style="width: 180px">
+          <p v-if="form.operator && form.operator.username">
+            {{ form.operator.username }}
+          </p>
         </div>
       </el-form-item>
-      <el-form-item label="申请时间"
-                    label-width="80px">
-        <div style="width:180px">{{form.createTime}}</div>
+      <el-form-item label="申请时间" label-width="80px">
+        <div style="width: 180px">{{ form.createTime }}</div>
       </el-form-item>
     </el-form>
-    <el-form :model="form"
-             ref="ruleForm">
+    <el-form :model="form" ref="ruleForm">
       <div class="lookTitle">基本信息</div>
-      <el-form-item label="所属分部"
-                    :rules="[{ required: true, message: '请选择分部', trigger: 'change' }]"
-                    prop="routeOrganId"
-                    :label-width="formLabelWidth">
+      <el-form-item
+        label="所属分部"
+        :rules="[{ required: true, message: '请选择分部', trigger: 'change' }]"
+        prop="routeOrganId"
+        :label-width="formLabelWidth"
+      >
         <!--    -->
-        <el-select v-model.trim="form.routeOrganId"
-                   :disabled="!isAdd"
-                   @change="changeOrgin"
-                   style="width: 100% !important;">
-          <el-option v-for="(item,index) in organList"
-                     :key="index"
-                     :label="item.name"
-                     :value="item.id"></el-option>
+        <el-select
+          v-model.trim="form.routeOrganId"
+          :disabled="!isAdd"
+          @change="changeOrgin"
+          style="width: 100% !important"
+        >
+          <el-option
+            v-for="(item, index) in organList"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="所属学校"                  
-                    prop="schoolId"
-                    :label-width="formLabelWidth">
+      <el-form-item
+        label="所属学校"
+        prop="schoolId"
+        :label-width="formLabelWidth"
+      >
         <!--    @change="checkSchool" -->
-        <el-select v-model="form.schoolId"
-                   :disabled="!isAdd"
-                   style="width: 100% !important;">
-          <el-option v-for="(item,index) in cooperationList"
-                     :key="index"
-                     :label="item.name"
-                     :value="item.id"></el-option>
+        <el-select
+          v-model="form.schoolId"
+          :disabled="!isAdd"
+          style="width: 100% !important"
+        >
+          <el-option
+            v-for="(item, index) in cooperationList"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="学员编号"
-                    prop="userId"
-                    :label-width="formLabelWidth">
-        <el-input v-model.trim="form.userId"
-                  :disabled="!isAdd"
-                  placeholder="请输入学员编号"></el-input>
+      <el-form-item
+        label="学员编号"
+        prop="userId"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          v-model.trim="form.userId"
+          :disabled="!isAdd"
+          placeholder="请输入学员编号"
+        ></el-input>
       </el-form-item>
       <div class="lookTitle">交易信息</div>
-      <el-form-item label="交易流水号"
-                    :rules="[{ required: true, message: '请输入流水号', trigger: 'change' }]"
-                    prop="transNo"
-                    :label-width="formLabelWidth">
-        <el-input placeholder="请输入交易流水号"
-                  type="text"
-                  :disabled="!isAdd"
-                  v-model.trim="form.transNo"></el-input>
+      <el-form-item
+        label="交易流水号"
+        :rules="[
+          { required: true, message: '请输入流水号', trigger: 'change' },
+        ]"
+        prop="transNo"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          placeholder="请输入交易流水号"
+          type="text"
+          :disabled="!isAdd"
+          v-model.trim="form.transNo"
+        ></el-input>
       </el-form-item>
-      <el-form-item label="收款账户"
-                    prop="merNo"
-                    :rules="[{ required: true, message: '请输入收款账户', trigger: 'change' }]"
-                    :label-width="formLabelWidth">
-        <el-input placeholder="请输入收款账户"
-                  type="text"
-                  :disabled="!isAdd"
-                  v-model.trim="form.merNo"></el-input>
+      <el-form-item
+        label="收款账户"
+        prop="merNo"
+        :rules="[
+          { required: true, message: '请输入收款账户', trigger: 'change' },
+        ]"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          placeholder="请输入收款账户"
+          type="text"
+          :disabled="!isAdd"
+          v-model.trim="form.merNo"
+        ></el-input>
       </el-form-item>
-      <el-form-item label="交易日期"
-                    :rules="[{ required: true, message: '请选择交易日期', trigger: 'change' }]"
-                    prop="payTime"
-                    :label-width="formLabelWidth">
-        <el-date-picker style="width: 100%;"
-                        :disabled="!isAdd"
-                        v-model="form.payTime"
-                        type="datetime"
-                        format="yyyy-MM-dd HH:mm:ss"
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="选择交易日期">
+      <el-form-item
+        label="交易日期"
+        :rules="[
+          { required: true, message: '请选择交易日期', trigger: 'change' },
+        ]"
+        prop="payTime"
+        :label-width="formLabelWidth"
+      >
+        <el-date-picker
+          style="width: 100%"
+          :disabled="!isAdd"
+          v-model="form.payTime"
+          type="datetime"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择交易日期"
+        >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="收入类型"
-                    :label-width="formLabelWidth"
-                    :rules="[{ required: true, message: '请选收入类型', trigger: 'change' }]"
-                    prop="applyType">
-        <el-select class="multiple"
-                   style="width: 100% !important;"
-                   v-model.trim="form.applyType"
-                   filterable
-                   clearable
-                   :disabled="!isAdd"
-                   placeholder="请选择收入类型">
-          <el-option v-for="(item,index) in orderServerList"
-                     :key="index"
-                     :label="item.label"
-                     :value="item.value"></el-option>
+      <el-form-item
+        label="收入类型"
+        :label-width="formLabelWidth"
+        :rules="[
+          { required: true, message: '请选收入类型', trigger: 'change' },
+        ]"
+        prop="applyType"
+      >
+        <el-select
+          class="multiple"
+          style="width: 100% !important"
+          v-model.trim="form.applyType"
+          filterable
+          clearable
+          :disabled="!isAdd"
+          placeholder="请选择收入类型"
+        >
+          <el-option
+            v-for="(item, index) in orderServerList"
+            :key="index"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
         </el-select>
       </el-form-item>
-      <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
+        label="销售金额"
+        prop="saleAmount"
+        :rules="[
+          { required: true, message: '请输入销售金额', trigger: 'change' },
+        ]"
+        v-if="form.applyType == 'SELL'"
+        :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
+        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"
-                        class="setWidth"
-                        :prop="'goodsList.' + index + '.id'"
-                        :rules="[{ required: true, message: '请选择商品', trigger: 'change' }]">
-            <el-select v-model.trim="goodsList.id"
-                       filterable
-                       :disabled="!isAdd"
-                       placeholder="请选择商品">
-              <el-option v-for="(item,index) in shopList"
-                         :key="index"
-                         :label="item.name"
-                         :value="item.id"></el-option>
+      <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"
+            class="setWidth"
+            :prop="'goodsList.' + index + '.id'"
+            :rules="[
+              { required: true, message: '请选择商品', trigger: 'change' },
+            ]"
+          >
+            <el-select
+              v-model.trim="goodsList.id"
+              filterable
+              :disabled="!isAdd"
+              placeholder="请选择商品"
+            >
+              <el-option
+                v-for="(item, index) in shopList"
+                :key="index"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item class="setWidth"
-                        style="margin-right: 10px"
-                        :prop="'goodsList.' + index + '.number'">
+          <el-form-item
+            class="setWidth"
+            style="margin-right: 10px"
+            :prop="'goodsList.' + index + '.number'"
+          >
             <!--  :rules="validAmount" <el-input-number style="width: 160px;" v-model="goodsList.number" placeholder="商品数量"></el-input-number> -->
-            <el-input type="age"
-                      style="width: 160px;"
-                      :disabled="!isAdd"
-                      clearable
-                      placeholder="请输入商品数量"
-                      @mousewheel.native.prevent
-                      v-model.number="goodsList.number"></el-input>
+            <el-input
+              type="age"
+              style="width: 160px"
+              :disabled="!isAdd"
+              clearable
+              placeholder="请输入商品数量"
+              @mousewheel.native.prevent
+              v-model.number="goodsList.number"
+            ></el-input>
           </el-form-item>
-          <el-button icon="el-icon-minus"
-                     :disabled="!isAdd"
-                     v-if="form.goodsList.length > 1&&auditStatus == 'REJECT'"
-                     circle
-                     @click.prevent="removeGoodsList(goodsList)"></el-button>
-          <el-button icon="el-icon-plus"
-                     :disabled="!isAdd"
-                     v-if="auditStatus == 'REJECT'"
-                     @click.prevent="addGoodsList"
-                     circle
-                     style="margin-left: 5px;"></el-button>
+          <el-button
+            icon="el-icon-minus"
+            :disabled="!isAdd"
+            v-if="form.goodsList.length > 1 && auditStatus == 'REJECT'"
+            circle
+            @click.prevent="removeGoodsList(goodsList)"
+          ></el-button>
+          <el-button
+            icon="el-icon-plus"
+            :disabled="!isAdd"
+            v-if="auditStatus == 'REJECT'"
+            @click.prevent="addGoodsList"
+            circle
+            style="margin-left: 5px"
+          ></el-button>
         </div>
       </div>
       <div class="lookTitle">其它</div>
-      <el-form-item label="提交备注"
-                    :label-width="formLabelWidth"
-                    :rules="[{ required: true, message: '请输入提交备注', trigger: 'change' }]">
-        <el-input placeholder="请输入备注"
-                  :disabled="!isAdd"
-                  v-model.trim="form.memo"
-                  type="textarea"
-                  :rows="3"></el-input>
+      <el-form-item
+        label="提交备注"
+        :label-width="formLabelWidth"
+        :rules="[
+          { required: true, message: '请输入提交备注', trigger: 'change' },
+        ]"
+      >
+        <el-input
+          placeholder="请输入备注"
+          :disabled="!isAdd"
+          v-model.trim="form.memo"
+          type="textarea"
+          :rows="3"
+        ></el-input>
       </el-form-item>
-      <el-form-item label="审核备注"
-                    v-if="auditStatus != 'ING'&&auditStatus != 'REJECT'"
-                    :label-width="formLabelWidth">
-        <el-input placeholder="请输入备注"
-                  :disabled="!isAdd"
-                  v-model.trim="form.auditComment"
-                  type="textarea"
-                  :rows="3"></el-input>
+      <!-- &&auditStatus != 'REJECT' -->
+      <el-form-item
+        label="审核备注"
+        v-if="auditStatus != 'ING'"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          placeholder="请输入备注"
+          :disabled="true"
+          v-model.trim="form.auditComment"
+          type="textarea"
+          :rows="3"
+        ></el-input>
       </el-form-item>
-
     </el-form>
-    <div class="lookTitle"
-         v-if="auditStatus == 'ING'">审核意见</div>
-    <el-form :model="submitForm"
-             v-if="auditStatus == 'ING'"
-             ref="submitForm">
-      <el-form-item prop="memo"
-                    :rules=" [{ required: true, message:'请输入审核意见',trigger: 'blur'}]">
-        <el-input type='textarea'
-                  :rows="4"
-                  v-model="submitForm.memo"></el-input>
+    <div class="lookTitle" v-if="auditStatus == 'ING'" v-permission="'routeOrder/auditOutOrder'">审核意见</div>
+    <el-form :model="submitForm" v-if="auditStatus == 'ING'" ref="submitForm" v-permission="'routeOrder/auditOutOrder'">
+      <el-form-item
+        prop="memo"
+        :rules="[
+          { required: true, message: '请输入审核意见', trigger: 'blur' },
+        ]"
+      >
+        <el-input
+          type="textarea"
+          :rows="4"
+          v-model="submitForm.memo"
+        ></el-input>
       </el-form-item>
     </el-form>
   </div>
 </template>
 <script>
-import { getRouteOrderInfo, auditOutOrder, updateRouteOrder } from '@/api/orderManager'
-import { orderServerList } from "@/utils/searchArray"
+import {
+  getRouteOrderInfo,
+  auditOutOrder,
+  updateRouteOrder,
+} from "@/api/orderManager";
+import { orderServerList } from "@/utils/searchArray";
 import { getCooperation } from "@/api/buildTeam";
 export default {
-  props: ['orderId', 'shopList', 'organList', 'isLook'],
-  data () {
+  props: ["orderId", "shopList", "organList", "isLook"],
+  data() {
     return {
       formLabelWidth: "100px",
       form: {
@@ -223,29 +306,31 @@ export default {
         serviceAmount: null,
         goodsAmount: null,
         schoolId: null,
-        goodsList: [{
-          id: null,
-          number: null
-        }],
+        goodsList: [
+          {
+            id: null,
+            number: null,
+          },
+        ],
         applyType: null,
-        userId: '',
-        auditComment: ''
+        userId: "",
+        auditComment: "",
       },
       isAdd: !this.isLook,
       cooperationList: [],
       submitForm: {
-        memo: ''
+        memo: "",
       },
-      auditStatus: '',
+      auditStatus: "",
       orderServerList: orderServerList,
-      clearSchool: false
-    }
+      clearSchool: false,
+    };
   },
-  mounted () {
+  mounted() {
     if (this.orderId) {
-      getRouteOrderInfo({ id: this.orderId }).then(res => {
+      getRouteOrderInfo({ id: this.orderId }).then((res) => {
         if (res.code == 200) {
-          let orderInfo = res.data
+          let orderInfo = res.data;
           this.form = {
             createTime: orderInfo.createTime,
             operator: orderInfo.operator,
@@ -259,113 +344,120 @@ export default {
             serviceAmount: orderInfo.serviceAmount,
             saleAmount: orderInfo.saleAmount,
             schoolId: orderInfo.schoolId,
-            userId: orderInfo.userId ? orderInfo.userId : '',
+            userId: orderInfo.userId ? orderInfo.userId : "",
             auditComment: orderInfo.auditComment,
-            applyType: orderInfo.saleAmount ? 'SELL' : 'SERVICE'
-          }
-          this.auditStatus = orderInfo.auditStatus
-          this.$set(this.form, 'goodsList', this.getShopList(orderInfo.goodsJson))
-          this.changeOrgin(orderInfo.routeOrganId)
+            applyType: orderInfo.saleAmount ? "SELL" : "SERVICE",
+          };
+          this.auditStatus = orderInfo.auditStatus;
+          this.$set(
+            this.form,
+            "goodsList",
+            this.getShopList(orderInfo.goodsJson)
+          );
+          this.changeOrgin(orderInfo.routeOrganId);
           this.clearSchool = true;
         }
-      })
+      });
     }
-
   },
   methods: {
-    changeOrgin (val) {
+    changeOrgin(val) {
       if (val) {
         if (this.clearSchool) {
-          this.$set(this.form, 'schoolId', null)
+          this.$set(this.form, "schoolId", null);
         }
-        getCooperation({ rows: 9999, organId: val }).then(res => {
+        getCooperation({ rows: 9999, organId: val }).then((res) => {
           if (res.code === 200) {
-            this.cooperationList = res.data.rows
+            this.cooperationList = res.data.rows;
           }
-        })
+        });
       }
     },
-    getShopList (str) {
-      let arr = []
+    getShopList(str) {
+      let arr = [];
       try {
-        const obj = JSON.parse(str)
+        const obj = JSON.parse(str);
 
         // id: item.goodsId, number: item.num
         for (let i in obj) {
-
-          arr.push({ id: parseInt(i), number: obj[i] })
+          arr.push({ id: parseInt(i), number: obj[i] });
         }
-
-      } catch {
-      }
-      console.log(arr)
-      return arr.length>0? arr:[{
-          id: null,
-          number: null
-        }]
+      } catch {}
+      return arr.length > 0
+        ? arr
+        : [
+            {
+              id: null,
+              number: null,
+            },
+          ];
     },
-    auditOutOrder (status) {
+    auditOutOrder(status) {
       const that = this;
-      this.$refs.submitForm.validate(res => {
+      this.$refs.submitForm.validate((res) => {
         if (res) {
-          auditOutOrder({ auditStatus: status, memo: this.submitForm.memo, studentPaymentRouteOrderId: this.orderId }).then(res => {
+          auditOutOrder({
+            auditStatus: status,
+            memo: this.submitForm.memo,
+            studentPaymentRouteOrderId: this.orderId,
+          }).then((res) => {
             if (res.code == 200) {
-              this.$message.success('审核成功')
-              that.$emit('getList')
-              return
+              this.$message.success("审核成功");
+              that.$emit("getList");
+              return;
             }
-          })
+          });
         }
-      })
-
+      });
     },
-    removeGoodsList (item) {
-      const index = this.form.goodsList.indexOf(item)
+    removeGoodsList(item) {
+      const index = this.form.goodsList.indexOf(item);
       if (index !== -1) {
-        this.form.goodsList.splice(index, 1)
+        this.form.goodsList.splice(index, 1);
       }
     },
-    addGoodsList () {
+    addGoodsList() {
       this.form.goodsList.push({
         id: null,
-        number: null
-      })
+        number: null,
+      });
     },
-    submitReaet () {
-      this.$refs.ruleForm.validate(valid => {
+    submitReaet() {
+      this.$refs.ruleForm.validate((valid) => {
         if (valid) {
-          let form = this.form
+          let form = this.form;
           if (!form.saleAmount && !form.serviceAmount) {
-            this.$message.error('请输入销售收入或服务收入')
-            return
+            this.$message.error("请输入销售收入或服务收入");
+            return;
           }
-          form.applyType == 'SELL' ? form.serviceAmount = 0 : form.saleAmount = 0
+          form.applyType == "SELL"
+            ? (form.serviceAmount = 0)
+            : (form.saleAmount = 0);
           if (!form.saleAmount) {
-            form.goodsList = null
+            form.goodsList = null;
           }
-          let goodsJson = {}
+          let goodsJson = {};
           for (let i in form.goodsList) {
-            goodsJson[form.goodsList[i]['id']] = form.goodsList[i]['number']
+            goodsJson[form.goodsList[i]["id"]] = form.goodsList[i]["number"];
           }
-          form.goodsJson = form.applyType == "SERVICE" ? null : JSON.stringify(goodsJson)
-          form.id = this.orderId
-          form.auditStatus = 'ING'
-          updateRouteOrder(form).then(res => {
+          form.goodsJson =
+            form.applyType == "SERVICE" ? null : JSON.stringify(goodsJson);
+          form.id = this.orderId;
+          form.auditStatus = "ING";
+          updateRouteOrder(form).then((res) => {
             if (res.code == 200) {
               this.$message.success("修改成功");
-              this.$emit('getList')
-              return
+              this.$emit("getList");
+              return;
             } else {
               this.$message.error(res.msg);
             }
-          })
-
-
+          });
         }
-      })
-    }
-  }
-}
+      });
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 .lookTitle {

src/views/categroyManager/specialSetup/courseTimerSetting.vue

@@ -82,11 +82,11 @@
               type="text"
               >修改</el-button
             >
-            <el-button
+            <!-- <el-button
               @click="delCourseTime(scope.row)"
               v-permission="'courseHomeworkTemplate/del'"
               type="text"
-              >删除</el-button>
+              >删除</el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -209,4 +209,4 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-</style>
+</style>

src/views/teamBuild/components/teamBaseInfo.vue

@@ -3,56 +3,87 @@
     <div class="banseLeft">
       <div class="head">乐团基本信息：</div>
       <!-- <div class="num">乐团编号：dywh01</div> -->
-      <el-form :model="topFrom"
-               :inline="true"
-               ref="topinfo"
-               label-width="120px"
-               style="margin-left: 11px">
-        <el-form-item label="所属分部"
-                      prop="section"
-                      :rules="[{ required: true, message: '所属分部不能为空' }]">
-          <el-select v-model.trim="topFrom.section"
-                     filterable
-                     :disabled="basdisabled"
-                     @change="changeSection"
-                     clearable>
-            <el-option v-for="(item, index) in sectionList"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"></el-option>
+      <el-form
+        :model="topFrom"
+        :inline="true"
+        ref="topinfo"
+        label-width="120px"
+        style="margin-left: 11px"
+      >
+        <el-form-item
+          label="所属分部"
+          prop="section"
+          :rules="[{ required: true, message: '所属分部不能为空' }]"
+        >
+          <el-select
+            v-model.trim="topFrom.section"
+            filterable
+            :disabled="basdisabled"
+            @change="changeSection"
+            clearable
+          >
+            <el-option
+              v-for="(item, index) in sectionList"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="收费类型"
-                      prop="type"
-                      :rules="[{ required: true, message: '收费类型不能为空' }]">
-          <el-select v-model.trim="topFrom.type"
-                     filterable
-                     :disabled="basdisabled"
-                     clearable>
-            <el-option v-for="(item, index) in typeList"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"></el-option>
+        <el-form-item
+          label="收费类型"
+          prop="type"
+          :rules="[{ required: true, message: '收费类型不能为空' }]"
+        >
+          <el-select
+            v-model.trim="topFrom.type"
+            filterable
+            :disabled="basdisabled"
+            clearable
+          >
+            <el-option
+              v-for="(item, index) in typeList"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item label="合作单位"
-                      prop="school"
-                      :rules="[{ required: true, message: '合作单位不能为空' }]">
-          <el-select v-model.trim="topFrom.school"
-                     :disabled="!topFrom.section || basdisabled"
-                     @change="chioseSchool"
-                     filterable
-                     clearable>
-            <el-option v-for="(item, index) in cooperationList"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"></el-option>
+        <el-form-item
+          label="合作单位"
+          prop="school"
+          :rules="[{ required: true, message: '合作单位不能为空' }]"
+        >
+          <el-select
+            v-model.trim="topFrom.school"
+            :disabled="!topFrom.section || basdisabled"
+            @change="chioseSchool"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="(item, index) in cooperationList"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="教学地点"
                       prop="address"
                       :rules="[{ required: true, message: '教学地点不能为空' }]">
+          <template #label>
+            <p style="position: relative; display: inline-block;"> 教学地点
+              <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">
+                    如果已生成课表，则会修改未上课时的教学点
+                  </div>
+                  <i class="el-icon-question"
+                     style="font-size: 18px; color: #F56C6C"></i>
+                </el-tooltip>
+            </p>
+          </template>
           <el-select v-model.trim="topFrom.address"
                      filterable
                      clearable
@@ -63,70 +94,97 @@
                        :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="乐团名称"
-                      prop="name"
-                      :rules="[{ required: true, message: '乐团名称不能为空' }]">
-          <el-input placeholder="请输入乐团名称"
-                    v-model.trim="topFrom.name"
-                    :disabled="basdisabled"></el-input>
+        <el-form-item
+          label="乐团名称"
+          prop="name"
+          :rules="[{ required: true, message: '乐团名称不能为空' }]"
+        >
+          <el-input
+            placeholder="请输入乐团名称"
+            v-model.trim="topFrom.name"
+            :disabled="basdisabled"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="运营主管"
-                      prop="boss"
-                      :rules="[{ required: true, message: '运营主管不能为空' }]">
-          <el-select v-model.trim="topFrom.boss"
-                     :disabled="!topFrom.section || basdisabled"
-                     filterable
-                     clearable>
-            <el-option v-for="(item, index) in orgianList"
-                       :key="index"
-                       :label="item.realName"
-                       :value="item.id"></el-option>
+        <el-form-item
+          label="运营主管"
+          prop="boss"
+          :rules="[{ required: true, message: '运营主管不能为空' }]"
+        >
+          <el-select
+            v-model.trim="topFrom.boss"
+            :disabled="!topFrom.section || basdisabled"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="(item, index) in orgianList"
+              :key="index"
+              :label="item.realName"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="教务老师"
-                      prop="teacher"
-                      :rules="[{ required: true, message: '教务老师不能为空' }]">
-          <el-select v-model.trim="topFrom.teacher"
-                     :disabled="!topFrom.section || basdisabled"
-                     filterable
-                     clearable>
-            <el-option v-for="(item, index) in orgianList"
-                       :key="index"
-                       :label="item.realName"
-                       :value="item.id"></el-option>
+        <el-form-item
+          label="教务老师"
+          prop="teacher"
+          :rules="[{ required: true, message: '教务老师不能为空' }]"
+        >
+          <el-select
+            v-model.trim="topFrom.teacher"
+            :disabled="!topFrom.section || basdisabled"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="(item, index) in orgianList"
+              :key="index"
+              :label="item.realName"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="维修技师"
-                      prop="repairUserId">
-          <el-select v-model.trim="topFrom.repairUserId"
-                     :disabled="!topFrom.section || basdisabled"
-                     filterable
-                     clearable>
-            <el-option v-for="(item, index) in technician"
-                       :key="index"
-                       :label="item.userName"
-                       :value="item.userId"></el-option>
+        <el-form-item label="维修技师" prop="repairUserId">
+          <el-select
+            v-model.trim="topFrom.repairUserId"
+            :disabled="!topFrom.section || basdisabled"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="(item, index) in technician"
+              :key="index"
+              :label="item.userName"
+              :value="item.userId"
+            ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="报名截止时间"
-                      prop="time"
-                      :rules="[{ required: true, message: '请输入报名截止时间' }]">
-          <el-date-picker v-model.trim="topFrom.time"
-                          :disabled="basdisabled"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          :picker-options="beginDate()"
-                          placeholder="选择日期"></el-date-picker>
+        <el-form-item
+          label="报名截止时间"
+          prop="time"
+          :rules="[{ required: true, message: '请输入报名截止时间' }]"
+        >
+          <el-date-picker
+            v-model.trim="topFrom.time"
+            :disabled="basdisabled"
+            type="date"
+            value-format="yyyy-MM-dd"
+            :picker-options="beginDate()"
+            placeholder="选择日期"
+          ></el-date-picker>
         </el-form-item>
-        <el-form-item label="预计开团时间"
-                      prop="startTime"
-                      :rules="[{ required: true, message: '请输入预计开团时间' }]">
-          <el-date-picker v-model.trim="topFrom.startTime"
-                          :disabled="basdisabled"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          :picker-options="beginDate()"
-                          placeholder="选择日期"></el-date-picker>
+        <el-form-item
+          label="预计开团时间"
+          prop="startTime"
+          :rules="[{ required: true, message: '请输入预计开团时间' }]"
+        >
+          <el-date-picker
+            v-model.trim="topFrom.startTime"
+            :disabled="basdisabled"
+            type="date"
+            value-format="yyyy-MM-dd"
+            :picker-options="beginDate()"
+            placeholder="选择日期"
+          ></el-date-picker>
         </el-form-item>
         <!-- <el-form-item label="缴费方式"
                       prop="paymentPattern"
@@ -173,71 +231,81 @@
                           placeholder="结束日期">
           </el-date-picker>
         </el-form-item> -->
-        <el-form-item label="招生年级"
-                      v-if="basdisabled">
-          <el-tooltip class="item"
-                      effect="dark"
-                      :content="startClassString"
-                      placement="top-start">
+        <el-form-item label="招生年级" v-if="basdisabled">
+          <el-tooltip
+            class="item"
+            effect="dark"
+            :content="startClassString"
+            placement="top-start"
+          >
             <div style="width: 180px; overflow: hidden">
               {{ startClassString }}
             </div>
           </el-tooltip>
         </el-form-item>
-        <el-form-item label="招生年级"
-                      v-else
-                      prop="startClass"
-                      :rules="[{ required: true, message: '请选择招生年纪' }]">
-          <el-select placeholder="起始年级"
-                     clearable
-                     multiple
-                     collapse-tags
-                     filterable
-                     v-model.trim="topFrom.startClass">
-            <el-option v-for="item in classStatus"
-                       :value="item.value"
-                       :label="item.label"
-                       :key="item.value"></el-option>
+        <el-form-item
+          label="招生年级"
+          v-else
+          prop="startClass"
+          :rules="[{ required: true, message: '请选择招生年纪' }]"
+        >
+          <el-select
+            placeholder="起始年级"
+            clearable
+            multiple
+            collapse-tags
+            filterable
+            v-model.trim="topFrom.startClass"
+          >
+            <el-option
+              v-for="item in classStatus"
+              :value="item.value"
+              :label="item.label"
+              :key="item.value"
+            ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="课酬结算标准"
-                      :rules="[{ required: true, message: '请选择课酬结算标准' }]"
-                      prop="salary">
-          <el-select v-model.trim="topFrom.salary"
-                     clearable
-                     :disabled="basdisabled"
-                     filterable>
-            <el-option label="默认课酬"
-                       value="TEACHER_DEFAULT"></el-option>
-            <el-option label="3.0课酬"
-                       value="GRADIENT_SALARY"></el-option>
-            <el-option label="课堂课酬"
-                       value="CLASSROOM_SALARY"></el-option>
+        <el-form-item
+          label="课酬结算标准"
+          :rules="[{ required: true, message: '请选择课酬结算标准' }]"
+          prop="salary"
+        >
+          <el-select
+            v-model.trim="topFrom.salary"
+            clearable
+            :disabled="basdisabled"
+            filterable
+          >
+            <el-option label="默认课酬" value="TEACHER_DEFAULT"></el-option>
+            <el-option label="3.0课酬" value="GRADIENT_SALARY"></el-option>
+            <el-option label="课堂课酬" value="CLASSROOM_SALARY"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="机构类型"
-                      prop="ownershipType">
-          <el-select v-model.trim="topFrom.ownershipType"
-                     :disabled="basdisabled">
-            <el-option label="自有"
-                       value="OWN"></el-option>
-            <el-option label="三方"
-                       value="COOPERATION"></el-option>
+        <el-form-item label="机构类型" prop="ownershipType">
+          <el-select
+            v-model.trim="topFrom.ownershipType"
+            :disabled="basdisabled"
+          >
+            <el-option label="自有" value="OWN"></el-option>
+            <el-option label="三方" value="COOPERATION"></el-option>
             <!-- <el-option label="租赁"
             value="LEASE"></el-option>-->
           </el-select>
         </el-form-item>
         <!-- v-if="teamStatus == 'resetTeam' || teamStatus == 'teamList'" -->
-        <el-form-item label="乐队指导"
-                      prop="head">
-          <el-select v-model.trim="topFrom.head"
-                     filterable
-                     :disabled="basdisabled"
-                     clearable>
-            <el-option v-for="(item, index) in orgianList"
-                       :key="index"
-                       :label="item.realName"
-                       :value="item.id"></el-option>
+        <el-form-item label="乐队指导" prop="head">
+          <el-select
+            v-model.trim="topFrom.head"
+            filterable
+            :disabled="basdisabled"
+            clearable
+          >
+            <el-option
+              v-for="(item, index) in orgianList"
+              :key="index"
+              :label="item.realName"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="乐团网管课"
@@ -253,15 +321,16 @@
                        value="OFFLINE"></el-option>
           </el-select>
         </el-form-item> -->
-        <el-form-item label
-                      prop="isClass">
-          <el-checkbox v-model.trim="topFrom.isClass"
-                       :disabled="basdisabled">课堂课乐团</el-checkbox>
+        <el-form-item label prop="isClass">
+          <el-checkbox v-model.trim="topFrom.isClass" :disabled="basdisabled"
+            >课堂课乐团</el-checkbox
+          >
         </el-form-item>
-        <br>
-        <el-form-item label=""
-                      v-if=" teamStatus == 'teamDraft'">
-          <p style="color:red; padding-left:50px">修改【收费类型】会重置乐团声部与缴费信息</p>
+        <br />
+        <el-form-item label="" v-if="teamStatus == 'teamDraft'">
+          <p style="color: red; padding-left: 50px">
+            修改【收费类型】会重置乐团声部与缴费信息
+          </p>
         </el-form-item>
       </el-form>
 
@@ -439,29 +508,36 @@
         </div>
       </div> -->
       <div class="btnWrap">
-        <div class="nextBtn"
-             v-if="teamStatus == 'resetTeam'"
-             v-permission="{
+        <div
+          class="nextBtn"
+          v-if="teamStatus == 'resetTeam'"
+          v-permission="{
             child: 'musicGroup/update',
             parent: '/resetTeaming/teamBaseInfo',
           }"
-             @click="resetSubmit">
+          @click="resetSubmit"
+        >
           修改
         </div>
         <!-- 审批或者草稿的下一步 -->
-        <div class="nextBtn"
-             @click="gotoNext(1)"
-             v-if="
+        <div
+          class="nextBtn"
+          @click="gotoNext(1)"
+          v-if="
             teamStatus == 'newTeam' ||
             teamStatus == 'teamDraft' ||
-            teamStatus == 'teamAudit' ||  teamStatus =='feeAudit'
-          ">
+            teamStatus == 'teamAudit' ||
+            teamStatus == 'feeAudit'
+          "
+        >
           下一步
         </div>
         <!-- 跨团调整的下一步 -->
-        <div class="nextBtn"
-             v-if="teamStatus == 'teamList'"
-             @click="gotoNext(2)">
+        <div
+          class="nextBtn"
+          v-if="teamStatus == 'teamList'"
+          @click="gotoNext(2)"
+        >
           下一步
         </div>
       </div>
@@ -482,24 +558,22 @@ import {
   getEmployeeOrgan,
 } from "@/api/buildTeam";
 import { findTechnician } from "@/api/repairManager";
-import dayjs from 'dayjs'
+import dayjs from "dayjs";
 import {
   queryEmployByOrganId,
   queryByOrganId,
   getSchool,
 } from "@/api/systemManage";
 import { classStatus } from "@/utils/searchArray";
-import { scrollTo } from "@/utils/scroll-to";
-import axios from "axios";
 import store from "@/store";
 import numeral from "numeral";
 import { formatData } from "@/utils/utils";
 import qs from "qs";
-import MusicStore from '@/views/resetTeaming/store'
+import MusicStore from "@/views/resetTeaming/store";
 export default {
   name: "teamBaseInfo",
   props: ["getTeamList"],
-  data () {
+  data() {
     return {
       classStatus,
       organId: null,
@@ -620,8 +694,8 @@ export default {
       basdisabled: false,
     };
   },
-  created () { },
-  activated () {
+  created() {},
+  activated() {
     this.payList = {
       school: {
         ischeck: false,
@@ -642,37 +716,41 @@ export default {
       chioseMonth: [], // 选中的月份
     };
     this.init();
-    this.$forceUpdate()
+    this.$forceUpdate();
   },
-  mounted () {
+  mounted() {
     this.init();
-    this.$forceUpdate()
+    this.$forceUpdate();
     // 获取分部下的员工
   },
-  beforeDestroy () { },
+  beforeDestroy() {},
   methods: {
     //|| this.teamStatus === 'teamAudit'
     isNotEditing: function () {
-      return !(this.teamStatus === 'teamDraft' || this.teamStatus === 'newTeam' || this.teamStatus === 'teamList')
+      return !(
+        this.teamStatus === "teamDraft" ||
+        this.teamStatus === "newTeam" ||
+        this.teamStatus === "teamList"
+      );
     },
-    changeFeeType (val) {
+    changeFeeType(val) {
       // console.log(val == "ONLINE");
     },
-    changePaymentValidStartDate (val) {
+    changePaymentValidStartDate(val) {
       if (val) {
         this.$set(this.topFrom, "paymentValidEndDate", "");
       }
     },
-    changePaymentPattern (val) {
+    changePaymentPattern(val) {
       // if (val === 2) {
       //   // this.topFrom.paymentValidStartDate = null
       //   this.$set(this.topFrom, 'paymentValidEndDate', '')
       // }
     },
-    beginDate (end) {
+    beginDate(end) {
       return {
         firstDayOfWeek: 1,
-        disabledDate (time) {
+        disabledDate(time) {
           if (end) {
             return new Date(end).getTime() - 86400000 >= time.getTime();
           } else {
@@ -682,8 +760,7 @@ export default {
         },
       };
     },
-    init () {
-
+  init() {
       this.isInit = true;
       // 分为3种  this.teamStatus
       //          1.resetTeam 乐团修改
@@ -691,10 +768,14 @@ export default {
       //          3.teamList  跨团修改
       //          4.teamDraft 乐团草稿
       this.teamStatus = this.$route.query.type;
-      console.log(this.teamStatus)
+      console.log(this.teamStatus);
       // 传过来的乐团信息
       this.activeTeam = this.getTeamList;
-      if (this.teamStatus == "look" || this.teamStatus == "teamAudit" || this.teamStatus == "feeAudit") {
+      if (
+        this.teamStatus == "look" ||
+        this.teamStatus == "teamAudit" ||
+        this.teamStatus == "feeAudit"
+      ) {
         this.basdisabled = true;
       } else {
         this.basdisabled = false;
@@ -708,13 +789,12 @@ export default {
       ) {
         // 单团修改
         this.teamid = this.$route.query.id;
-        MusicStore.dispatch('getBaseInfo', {
-          data: { musicGroupId: this.teamid }
-        }).then((res) => {
+        getTeamBaseInfo({ musicGroupId: this.teamid }).then((res) => {
           if (res.code == 200) {
-            if (this.$listeners.getBaseInfo) {
-              this.$listeners.getBaseInfo(res.data)
-            }
+            console.log({...res.data.musicGroup})
+            // if (this.$listeners.getBaseInfo) {
+            //   this.$listeners.getBaseInfo(res.data);
+            // }
 
             // 头部
             this.topFrom.name = res.data.musicGroup.name;
@@ -735,7 +815,9 @@ export default {
             this.topFrom.boss = res.data.musicGroup.teamTeacherId;
             this.topFrom.address = res.data.musicGroup.schoolId;
             this.topFrom.salary = res.data.musicGroup.settlementType;
-            this.topFrom.head = res.data.musicGroup.directorUserId ? res.data.musicGroup.directorUserId : null;
+            this.topFrom.head = res.data.musicGroup.directorUserId
+              ? res.data.musicGroup.directorUserId
+              : null;
             this.topFrom.isClass = res.data.musicGroup.isClassroomLessons;
             this.topFrom.startTime = res.data.musicGroup.expectStartGroupDate;
             this.topFrom.ownershipType = res.data.musicGroup.ownershipType;
@@ -748,7 +830,9 @@ export default {
             // 课程组成形式
             this.checkList;
             // 判断课程是否为空
-            let list = res.data.musicGroup.courseForm ? JSON.parse(res.data.musicGroup.courseForm) : {};
+            let list = res.data.musicGroup.courseForm
+              ? JSON.parse(res.data.musicGroup.courseForm)
+              : {};
             for (let i in this.checkList) {
               if (list[i] && !list[i].isNew) {
                 this.checkList[i] = list[i];
@@ -825,7 +909,7 @@ export default {
                 }
               });
             }
-            this.$emit('getBaseInfo', res.data)
+            this.$emit("getBaseInfo", res.data);
           }
         });
       } else {
@@ -847,7 +931,7 @@ export default {
           startTime: "",
           ownershipType: "OWN", // 合作机构类型
           feeType: null,
-        }
+        };
         this.$refs["topinfo"].resetFields();
       }
       // 1.获取各个选项卡的数据内容
@@ -898,7 +982,7 @@ export default {
       // 缓存设置时的状态
       sessionStorage.setItem("resetCode", "1");
     },
-    changeSection (val) {
+    changeSection(val) {
       // 修改分部的时候 重置运营主管 重置教务老师 重置乐队指导 合作单位  教学点
       this.topFrom.teacher = "";
       this.topFrom.boss = "";
@@ -930,8 +1014,8 @@ export default {
         }
       });
     },
-    chioseSchool (val) { },
-    gotoNext (num) {
+    chioseSchool(val) {},
+     gotoNext(num) {
       // 1.效验数据    判断是否数据正常=> 正常放入store存储
       // 不正常=>  进行效验提示
       let check = [];
@@ -987,7 +1071,6 @@ export default {
           // this.$store.dispatch("checkinfo", this.checkList);
           // this.$store.dispatch("getpayInfo", this.payList);
           // this.$store.dispatch("newStudentinfo", this.newStudentList);
-          console.log(this.teamStatus)
           if (this.teamStatus == "teamDraft") {
             // 获取数据提交
 
@@ -996,11 +1079,10 @@ export default {
             // this.resetSubmit();
             this.$emit("chiosetab", num);
           }
-
         }
       });
     },
-    resetSubmit () {
+    resetSubmit() {
       let check = [];
       for (let i in this.checkList) {
         if (this.checkList[i] && i != "submit") {
@@ -1088,7 +1170,9 @@ export default {
             : (obj.months = []);
           obj.musicGroup = {
             settlementType: this.topFrom.salary,
-            applyExpireDate: dayjs(this.topFrom.time).format('YYYY-MM-DD HH:mm:ss'),
+            applyExpireDate: dayjs(this.topFrom.time).format(
+              "YYYY-MM-DD HH:mm:ss"
+            ),
             chargeTypeId: this.topFrom.type,
             cooperationOrganId: this.topFrom.school,
             teamTeacherId: this.topFrom.boss,
@@ -1152,21 +1236,21 @@ export default {
                 this.$message.success("修改乐团成功");
                 // this.$router.push({ path: '/business/teamDetails', query: { id: this.teamid, name: this.topFrom.name } })
               }
-              this.init()
+              this.init();
             }
           });
         }
       });
     },
-    changeApplyTime (val) {
+    changeApplyTime(val) {
       this.$set(this.topFrom, "paymentValidStartDate", "");
       this.$set(this.topFrom, "paymentValidEndDate", "");
       // this.topFrom.paymentValidStartDate = ''
       // this.topFrom.paymentValidEndDate = ''
-    }
+    },
   },
   computed: {
-    startClassString () {
+    startClassString() {
       return this.topFrom.startClass
         .map((item) => {
           for (let i in this.classStatus) {

src/views/teamDetail/componentCourse/message-box.vue

@@ -45,7 +45,8 @@ export default {
               margin-top: 10px;
           color: #fff;
           background-color: #13817a;
-          text-align: right;
+          text-align: left;
+          line-height: 24px;
           &::before{
             border: 10px solid #13817a;
             border-top-color: transparent;
@@ -66,7 +67,7 @@ export default {
         &:hover{
             .time{
               visibility: visible!important;
-          } 
+          }
          }
       .time{
         display: block;
@@ -80,6 +81,7 @@ export default {
         background-color: #fff;
         padding: 10px;
         border-radius: 5px;
+        line-height: 24px;
         &::before{
           width: 0;
           height: 0;
@@ -92,7 +94,7 @@ export default {
           top: 8px;
           position: absolute;
         }
-        
+
       }
     }
   }

src/views/teamDetail/componentCourse/studentRollCall.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <el-form :inline="true">
-      <el-form-item label="学生总数">
+    <el-form :inline="true" class="workForm" style="padding: 0 25px">
+      <el-form-item label="学生总数" >
         <!-- <el-input disabled
                   :value="studentNum"></el-input> -->
         <div class="inputStyle">{{studentNum}}</div>
@@ -136,4 +136,9 @@ export default {
   width: 100px;
   text-align: center;
 }
-</style>
+.workForm {
+    /deep/.el-form-item {
+    margin-bottom: 10px !important;
+  }
+}
+</style>

src/views/teamDetail/components/courseList.vue

@@ -809,7 +809,8 @@ export default {
         date: "",
         id: "",
         startTime: "",
-        endTime: ""
+        endTime: "",
+        schoolId: null
       }),
         this.$refs["maskForm"].resetFields();
     },

src/views/teamDetail/teamCourseList.vue

@@ -257,8 +257,7 @@
                            &&
                            !scope.row.isSettlement
                            &&permission('courseSchedule/cleanAttendance')"
-                           @click="clearAttend(scope.row)"
-                           size="small">清除考勤</el-button>
+                           @click="clearAttend(scope.row)">清除考勤</el-button>
               </div>
             </template>
           </el-table-column>

vue.config.js

@@ -19,9 +19,9 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://dyme.utools.club' //test环境
 // let target = 'http://192.168.3.139:8000' // 箭河
-let target = 'http://192.168.3.38:8000' //邹璇
+// let target = 'http://192.168.3.38:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-// let target = 'http://dev.dayaedu.com' // 测试服
+let target = 'http://dev.dayaedu.com' // 测试服
 // let target = 'http://192.168.3.196' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {