Merge branch 'online' into LAO_MO

dist/static/css/chunk-134901f8.3e452825.css

@@ -0,0 +1 @@
+.vip-base[data-v-43411f50]{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}.vip-base[data-v-43411f50] .el-date-editor.el-input,.vip-base[data-v-43411f50] .el-date-editor.el-input__inner,.vip-base[data-v-43411f50] .el-input,.vip-base[data-v-43411f50] .el-select{width:180px!important}.vip-base .left[data-v-43411f50]{width:400px}.vip-base .tableWrap[data-v-43411f50]{margin-top:40px}.vip-base .tableWrap h4[data-v-43411f50]{font-size:16px;font-weight:400;margin-bottom:20px}.vip-base .right[data-v-43411f50]{clear:both}.vip-base .right .resetBtn[data-v-43411f50]{margin-top:30px;float:right}.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}

dist/static/css/chunk-725e233e.81454d5d.css

@@ -1 +0,0 @@
-.vip-base[data-v-63aa78f5]{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}.vip-base[data-v-63aa78f5] .el-date-editor.el-input,.vip-base[data-v-63aa78f5] .el-date-editor.el-input__inner,.vip-base[data-v-63aa78f5] .el-input,.vip-base[data-v-63aa78f5] .el-select{width:180px!important}.vip-base .left[data-v-63aa78f5]{width:400px}.vip-base .tableWrap[data-v-63aa78f5]{margin-top:40px}.vip-base .tableWrap h4[data-v-63aa78f5]{font-size:16px;font-weight:400;margin-bottom:20px}.vip-base .right[data-v-63aa78f5]{clear:both}.vip-base .right .resetBtn[data-v-63aa78f5]{margin-top:30px;float:right}.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}

dist/static/css/chunk-8035a444.1bb40ef8.css → dist/static/css/chunk-a946f15a.be8f39cb.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.newBand[data-v-43e614f8]{display:inline-block;margin-right:10px}.right-code .title[data-v-43e614f8]{font-size:18px;text-align:center;padding-bottom:8px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;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:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.newBand[data-v-cd042206]{display:inline-block;margin-right:10px}.right-code .title[data-v-cd042206]{font-size:18px;text-align:center;padding-bottom:8px}

src/views/businessManager/orderManager/income.vue

@@ -145,7 +145,7 @@ export default {
       searchForm: {
         orderStartDate: null,
         orderEndDate: null,
-        paymentStatus: null,
+        paymentStatus: 'SUCCESS',
         paymentType: null,
         organId: null
       },

src/views/businessManager/orderManager/incomeOne.vue

@@ -162,7 +162,7 @@
             let ymd = nowTime.getFullYear() + '' + (nowTime.getMonth() + 1) + '' + nowTime.getDate() + '' +
               nowTime.getHours() +
               '' + nowTime.getMinutes()
-            let fname = this.$route.query.id + '-' + ymd + '发放清单' //下载文件的名字
+            let fname = '报表导出' + new Date().getTime() //下载文件的名字
             link.href = objectUrl
             link.setAttribute("download", fname)
             document.body.appendChild(link)
@@ -210,5 +210,5 @@
     }
   }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 </style>

src/views/businessManager/orderManager/incomeTwo.vue

@@ -151,7 +151,7 @@ export default {
       searchForm: {
         orderStartDate: null,
         orderEndDate: null,
-        paymentStatus: null,
+        paymentStatus: 'SUCCESS',
         paymentType: null,
         organId: null
       },
@@ -206,7 +206,7 @@ export default {
           let ymd = nowTime.getFullYear() + '' + (nowTime.getMonth() + 1) + '' + nowTime.getDate() + '' +
             nowTime.getHours() +
             '' + nowTime.getMinutes()
-          let fname = this.$route.query.id + '-' + ymd + '发放清单' //下载文件的名字
+          let fname = '报表导出' + new Date().getTime() //下载文件的名字
           link.href = objectUrl
           link.setAttribute("download", fname)
           document.body.appendChild(link)

src/views/studentManager/studentList.vue

@@ -175,10 +175,6 @@
                        label="男"></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="名族"
-                      prop="nation">
-          <el-input v-model="studentForm.nation"></el-input>
-        </el-form-item> -->
         <el-form-item label="家长姓名">
           <el-input v-model="studentForm.parseName"></el-input>
         </el-form-item>

src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -89,7 +89,10 @@
             {{ scope.row.signOutStatus | attendanceOutType }}
           </template>
         </el-table-column>
-        <el-table-column label="老师课酬"
+        <el-table-column label="预计发放"
+                         prop="expectSalary">
+        </el-table-column>
+        <el-table-column label="实际发放"
                          prop="actualSalary">
         </el-table-column>
         <el-table-column label="课时补贴"
@@ -123,6 +126,12 @@
       <el-form :model="form"
                :rules="rules"
                ref="ruleForm">
+        <el-form-item label="预计发放" :label-width="formLabelWidth">
+          <el-input v-model="form.expectSalary" disabled type="number" ></el-input>
+        </el-form-item>
+        <el-form-item label="补贴" :label-width="formLabelWidth">
+          <el-input v-model="form.subsidys" disabled type="number" ></el-input>
+        </el-form-item>
         <el-form-item label="课酬调整为"
                       prop="salary"
                       :label-width="formLabelWidth">
@@ -193,6 +202,8 @@ export default {
         salary: null,
         subsidy: null,
         scope: 'one',
+        expectSalary: null,
+        subsidys: null
       },
       rules: {
         salary: [{ required: true, message: '请输入课酬', trigger: 'blur' }],
@@ -226,7 +237,7 @@ export default {
     messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success(title + '成功')
-        this.branchStatus = false
+        this.settlementStatus = false
         this.getList()
       } else {
         this.$message.error(res.msg)
@@ -259,6 +270,8 @@ export default {
     onUpdate (row) {
       this.form.courseScheduleId = row.courseScheduleId
       this.settlementStatus = true
+      this.form.expectSalary = row.expectSalary
+      this.form.subsidys = row.subsidy
     },
     onReSet () {
       this.courseDate = null

src/views/vipClass/vipDetail/components/vipBaseInfo.vue

@@ -77,7 +77,7 @@
                     disabled></el-input>
         </el-form-item>
       </el-form>
-      <el-button v-if="!isreset"
+      <!-- <el-button v-if="!isreset"
                  v-permission="'vipGroupManage/updateVipBaseInfo'"
                  class="resetBtn"
                  type="primary"
@@ -86,7 +86,7 @@
                  v-permission="'vipGroupManage/updateVipBaseInfo'"
                  v-if="isreset"
                  type="primary"
-                 @click="submitBtn">确定</el-button>
+                 @click="submitBtn">确定</el-button> -->
     </div>
   </div>
 </template>