Merge branch 'master' into 03/08netWorkReset

src/components/Pagination/index.vue

@@ -62,6 +62,11 @@ export default {
       default: ''
     }
   },
+  data() {
+    return {
+      pageInformation: null
+    }
+  },
   computed: {
     currentPage: {
       get () {
@@ -92,6 +97,7 @@ export default {
     if (this.sync) {
       const searchs = new Searchs(this.saveKey || this.$route.path)
       const active = searchs.get()
+      this.pageInformation = active
       if (active && active.page) {
         for (const key in active.page) {
           if (active.page.hasOwnProperty(key)) {
@@ -100,9 +106,19 @@ export default {
           }
         }
       }
+
+      if (this.saveKey) {
+        searchs.update(this.$route.path, undefined, 'bind')
+      }
     }
+    window.addEventListener('watchStorage', this.watchStorage)
   },
   methods: {
+    watchStorage() {
+      let page = this.pageInformation && this.pageInformation.page ? this.pageInformation.page : null
+      this.currentPage = page && page.page ? page.page : 1
+
+    },
     syncStore() {
       if (this.sync) {
         const searchs = new Searchs(this.saveKey || this.$route.path)
@@ -123,6 +139,9 @@ export default {
       }
       this.syncStore()
     }
+  },
+  destroyed() {
+    window.removeEventListener('watchStorage', this.watchStorage)
   }
 }
 </script>

src/components/remote-search/index.vue

@@ -31,13 +31,13 @@
 <script>
 const placeholder = {
   setTeachers: "请选择老师",
-  setEducations: "请选乐团主管",
+  setEducations: "请选乐团主管"
 };
 import { throttle, slice, uniqBy } from "lodash";
 import selects from "@/store/modules/selects";
 export default {
   name: "remote-search",
-  props: ["commit", "number", "value", "width", "multiple"],
+  props: ["commit", "number", "value", "width", "multiple", "ariaPlaceholder"],
   data() {
     return {
       options: [],
@@ -45,7 +45,7 @@ export default {
       listById: {},
       loading: false,
       constant: this.number || 50,
-      placeholder: placeholder[this.commit],
+      placeholder: this.ariaPlaceholder || placeholder[this.commit],
       selectWidt: this.width || 180,
       isFirst: true,
     };

src/components/save-form/index.vue

@@ -53,15 +53,19 @@ export default {
       evt.stopPropagation()
       evt.stopImmediatePropagation()
       evt.preventDefault()
+      let setItemEvent = new Event('watchStorage')
+      window.dispatchEvent(setItemEvent)
+
       if (this.$listeners.reset) {
-        this.$listeners.reset()
         if (this.noclear == undefined) {
           this.$nextTick(() => {
             this.resetFields()
             // this.setFormValue()
           })
+        } else {
+          this.resetFields()
         }
-
+        this.$listeners.reset()
       } else {
         this.resetFields()
       }

src/router/notKeepAliveList.js

@@ -33,6 +33,8 @@ export default [
   '/luckyDraw/trophyManager', // 奖品设置
   '/luckyDraw/lotteryRecord', // 抽奖记录
   '/specialSetup/globalConfig', // 全局配置
+  '/specialSetup/globalMusicGroup',
+  '/specialSetup/globalSubjects',
   '/specialSetup/adminManager', // 系统角色权限管理
   '/specialSetup/adminoperation',
   '/reportForm/index', // 报表中心

src/views/accompanyManager/accompanyList.vue

@@ -10,7 +10,7 @@
         @click="onStudentExport"
         style="width: 150px; max-width:150px"
       >
-        网管课续费提醒导出
+        续费提醒导出
       </div>
       <div
         class="newBand"

src/views/accompanyManager/accompanys.vue

@@ -220,7 +220,7 @@
         ref="expireForm"
         :rules="expireRules"
         label-position="right"
-        label-width="80px;"
+        label-width="120px"
         :inline="true"
       >
         <el-form-item label="有效期开始时间" prop="coursesStartDate">
@@ -384,7 +384,7 @@
         ref="teacherForm"
         :rules="teacherRules"
         label-position="right"
-        label-width="80px;"
+        label-width="100px"
         :inline="true"
       >
         <el-form-item label="课程班名称" v-show="isMultiple">

src/views/afterSchoolManager/afterSchoolDetail.vue

@@ -6,7 +6,7 @@
       <el-page-header @back="goBack"
                       :content="title"></el-page-header>
     </h2>
-    <afterWorkList />
+    <afterWorkList saveKey="afterSchoolDetail" />
   </div>
 </template>
 

src/views/afterSchoolManager/afterWorkList.vue

@@ -8,7 +8,7 @@
       <save-form :inline="true"
                :model="searchForm"
                @submit="search"
-               :saveKey="'afterWorkList'"
+               :saveKey="formSaveKey"
                @reset="onReSet"
                v-if="show">
         <el-form-item>
@@ -201,8 +201,9 @@
           </el-table-column>
         </el-table>
         <pagination
-         :saveKey="'afterWorkList'"
-        :total="rules.total"
+         :saveKey="formSaveKey"
+         sync
+        :total.sync="rules.total"
                     :page.sync="rules.page"
                     :limit.sync="rules.limit"
                     :page-sizes="rules.page_size"
@@ -263,10 +264,12 @@ import { Export } from '@/utils/downLoadFile'
 import axios from "axios";
 import { getToken } from "@/utils/auth";
 export default {
-  props: ["id"],
+  props: ["id", "saveKey"],
   components: { pagination },
   data () {
+    const that = this
     return {
+      formSaveKey: that.saveKey || 'afterWorkList',
       searchForm: {
         search: null,
         timer: [],

src/views/businessManager/orderManager/businessStatement.vue

@@ -374,7 +374,7 @@ export default {
       this.searchForm = {
         startTime: null,
         endTime: null,
-        month: "",
+        month: dayjs().format("YYYY-MM"),
         cooperationOrganId: "",
         organIdList: [],
       };

src/views/businessManager/orderManager/financeManager.vue

@@ -44,7 +44,7 @@
       </div>
       <el-upload
         v-permission="'import/routeOrder'"
-        style="display: inline-block; margin: 0 10px"
+        style="display: inline-block;"
         action="/api-web/import/routeOrder"
         :show-file-list="false"
         :before-upload="beforeUpload"
@@ -105,20 +105,20 @@
         </el-form-item>
         <el-form-item>
           <el-input
-            placeholder="现金支付大于等于"
+            placeholder="余额支付小于等于"
             clearable
             type="number"
             @mousewheel.native.prevent
-            v-model.trim="searchForm.actualAmount"
+            v-model.trim="searchForm.lessBalancePaymentAmount"
           ></el-input>
         </el-form-item>
         <el-form-item>
           <el-input
-            placeholder="余额支付小于等于"
+            placeholder="现金支付大于等于"
             clearable
             type="number"
             @mousewheel.native.prevent
-            v-model.trim="searchForm.lessBalancePaymentAmount"
+            v-model.trim="searchForm.actualAmount"
           ></el-input>
         </el-form-item>
         <el-form-item>

src/views/businessManager/orderManager/income.vue

@@ -63,20 +63,20 @@
         </el-form-item>
         <el-form-item>
           <el-input
-            placeholder="现金支付大于等于"
+            placeholder="余额支付小于等于"
             clearable
             type="number"
             @mousewheel.native.prevent
-            v-model.trim="searchForm.actualAmount"
+            v-model.trim="searchForm.lessBalancePaymentAmount"
           ></el-input>
         </el-form-item>
         <el-form-item>
           <el-input
-            placeholder="余额支付小于等于"
+            placeholder="现金支付大于等于"
             clearable
             type="number"
             @mousewheel.native.prevent
-            v-model.trim="searchForm.lessBalancePaymentAmount"
+            v-model.trim="searchForm.actualAmount"
           ></el-input>
         </el-form-item>
         <el-form-item>
@@ -373,6 +373,18 @@ export default {
   },
   created(){
     if (this.searchForm.orderDate?.length < 1) {
+      this.getNow()
+    }
+  },
+  mounted() {
+
+
+
+    this.$store.dispatch("setBranchs");
+    this.getList();
+  },
+  methods: {
+    getNow() {
       var now = new Date();
       var startDate = new Date(
         Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
@@ -388,16 +400,7 @@ export default {
       this.searchForm.orderDate = [];
       this.searchForm.orderDate.push(startDate);
       this.searchForm.orderDate.push(endDate);
-    }
-  },
-  mounted() {
-
-
-
-    this.$store.dispatch("setBranchs");
-    this.getList();
-  },
-  methods: {
+    },
     onClear(type) {
       if (type == "paymentType") {
         this.searchForm.paymentType = null;
@@ -561,7 +564,7 @@ export default {
         search: null,
         orderStartDate: null,
         orderEndDate: null,
-        paymentStatus: null,
+        paymentStatus: 'SUCCESS',
         paymentType: null,
         organId: null,
         actualAmount: null,
@@ -573,6 +576,8 @@ export default {
         lessActualAmount: null,
         orderDate:[]
       };
+      // this.pageInfo.page = 1;
+      this.getNow()
       this.getList();
     },
   },

src/views/businessManager/orderManager/incomeOut.vue

@@ -231,6 +231,13 @@ export default {
     //   }
     // });
     if (this.searchForm.orderDate?.length < 1) {
+      this.getNow()
+    }
+
+    this.getList();
+  },
+  methods: {
+    getNow() {
       var now = new Date();
 
       var startDate = new Date(
@@ -247,11 +254,7 @@ export default {
       this.searchForm.orderDate = [];
       this.searchForm.orderDate.push(startDate);
       this.searchForm.orderDate.push(endDate);
-    }
-
-    this.getList();
-  },
-  methods: {
+    },
     onClear(type) {
       if (type == "paymentType") {
         this.searchForm.paymentType = null;
@@ -378,6 +381,7 @@ export default {
         status: "SUCCESS",
         orderDate: [],
       };
+      this.getNow()
       this.getList();
     },
   },

src/views/businessManager/orderManager/salesList.vue

@@ -516,7 +516,7 @@ export default {
         search: "",
         goodsName: [],
         cooperationOrganId: "",
-        orderDate:[]
+        orderDate:[dayjs().format("YYYY-MM-DD"), dayjs().format("YYYY-MM-DD")]
       };
       this.getList();
     },

src/views/businessManager/shopManager/purchase-llist.vue

@@ -94,6 +94,11 @@
             </template>
           </el-table-column> -->
         </el-table>
+        <pagination sync :total.sync="pageInfo.total"
+                    :page.sync="pageInfo.page"
+                    :limit.sync="pageInfo.limit"
+                    :page-sizes="pageInfo.page_size"
+                    @pagination="getList" />
       </div>
     </div>
     <el-dialog title="新增进货清单"
@@ -108,6 +113,7 @@
   </div>
 </template>
 <script>
+import pagination from '@/components/Pagination/index'
 import dayjs from 'dayjs'
 import purchaseForm from './purchase-form'
 import { getGoodsProcurements } from '@/api/businessManager'
@@ -119,7 +125,8 @@ const initSearchForm = {
 
 export default {
   components: {
-    purchaseForm
+    purchaseForm,
+    pagination
   },
   data () {
     let query = this.$route.query
@@ -147,6 +154,14 @@ export default {
   },
   methods: {
     init () {
+      this.getNow()
+
+      let query = this.$route.query
+      this.goodsId = query.goodsId
+      this.goodsName = query.name
+      this.getList()
+    },
+    getNow() {
       const searchForm = this.searchForm
       // 判断是否在默认值
       if(!searchForm.enterStorageStartTime) {
@@ -162,10 +177,6 @@ export default {
           searchForm.enterStorageEndTime
         ]
       }
-      let query = this.$route.query
-      this.goodsId = query.goodsId
-      this.goodsName = query.name
-      this.getList()
     },
     searchOrderDate (val) {
       this.searchForm.enterStorageStartTime = (val ? val[0] : '')
@@ -199,6 +210,7 @@ export default {
       this.searchForm = {
         ...initSearchForm,
       }
+      this.getNow()
       this.getList()
     },
     edit (row) {

src/views/categroyManager/generalSettings/errorManager.vue

@@ -118,8 +118,15 @@ export default {
       })
     },
     onTypesDel (row) {
-      hotWordLabelManageDel(row.id).then(res => {
-        this.messageTips('删除', res)
+      this.$confirm("是否确认删除热词标签", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+      .then(() => {
+        hotWordLabelManageDel(row.id).then(res => {
+          this.messageTips('删除', res)
+        })
       })
     },
     messageTips (title, res) {

src/views/categroyManager/insideSetting/addressManager.vue

@@ -67,7 +67,7 @@
               {{ scope.row.cooperationOrganId ? scope.row.cooperationOrganId : '租赁' }}
             </template>  -->
           </el-table-column>
-          <el-table-column align="center" width="120px" label="费用">
+          <el-table-column align="center" width="120px" label="租赁费用">
             <template slot-scope="scope">
               {{ scope.row.cooperationOrganId ? "免费" : scope.row.remark }}
             </template>
@@ -197,10 +197,10 @@
         <el-form-item
           v-if="form.source == 2"
           prop="remark"
-          label="费用"
+          label="租赁费用"
           :label-width="formLabelWidth"
         >
-          <el-input v-model.trim="form.remark" autocomplete="off"></el-input>
+          <el-input v-model.trim="form.remark" type="number" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item
           v-if="form.source == 2"
@@ -270,8 +270,9 @@
     >
       <div style="padding: 0 20px">
         <el-alert
-          style="margin-bottom: 10px"
+          style="margin: 10px 0"
           title="选中地点:"
+          :closable="false"
           type="info"
           :description="addressDetail.address"
         >
@@ -388,7 +389,7 @@ export default {
         source: [
           { required: true, message: "请选择教学点来源", trigger: "change" },
         ],
-        remark: [{ required: true, message: "请输入费用", trigger: "blur" }],
+        remark: [{ required: true, message: "请输入租赁费用", trigger: "blur" }],
         address: [
           { required: true, message: "请选择上课地点", trigger: "blur" },
         ],

src/views/categroyManager/insideSetting/adminOperation.vue

@@ -148,7 +148,7 @@ export default {
         tempData = this.setTableData(silderList.data)
 
         this.data = tempData
-        console.log(this.data)
+        // console.log(this.data)
       }
       // console.log(this.pageType)
       if (this.pageType == 'update') {

src/views/categroyManager/specialSetup/branchSetting.vue

@@ -42,7 +42,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination :total="pageInfo.total"
+        <pagination sync :total.sync="pageInfo.total"
                     :page.sync="pageInfo.page"
                     :limit.sync="pageInfo.limit"
                     :page-sizes="pageInfo.page_size"

src/views/categroyManager/specialSetup/chargesList.vue

@@ -100,7 +100,8 @@
         </el-table>
         <pagination
         :saveKey="'chargesList'"
-        :total="pageInfo.total"
+        sync
+        :total.sync="pageInfo.total"
                     :page.sync="pageInfo.page"
                     :limit.sync="pageInfo.limit"
                     :page-sizes="pageInfo.page_size"

src/views/categroyManager/specialSetup/jobTemplateSetting.vue

@@ -185,9 +185,16 @@ export default {
       }
     },
     onJobDel (row) {
-      homeWorkDel(row.id).then(res => {
-        this.messageTips('删除', res)
+      this.$confirm("是否确认删除作业模板", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          homeWorkDel(row.id).then(res => {
+            this.messageTips('删除', res)
+          })
+        })
     },
     messageTips (title, res) {
       if (res.code == 200) {

src/views/categroyManager/specialSetup/musicalManager.vue

@@ -125,12 +125,19 @@ export default {
       })
     },
     subjectDelete (item) { // 删除分类
-      subjectUpset({
-        delFlag: 'YES',
-        id: item.id
-      }).then(res => {
-        this.messageTips('删除', res)
+      this.$confirm("是否确认删除分类", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          subjectUpset({
+            delFlag: 'YES',
+            id: item.id
+          }).then(res => {
+            this.messageTips('删除', res)
+          })
+        })
     },
     messageTips (title, res) {
       if (res.code == 200) {

src/views/categroyManager/specialSetup/musicalManagerOut.vue

@@ -123,12 +123,19 @@ export default {
       })
     },
     subjectDelete (item) { // 删除分类
-      subjectUpset({
-        delFlag: 'YES',
-        id: item.id
-      }).then(res => {
-        this.messageTips('删除', res)
+      this.$confirm("是否确认删除该分类", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          subjectUpset({
+            delFlag: 'YES',
+            id: item.id
+          }).then(res => {
+            this.messageTips('删除', res)
+          })
+        })
     },
     messageTips (title, res) {
       if (res.code == 200) {

src/views/categroyManager/specialSetup/typesManager.vue

@@ -28,7 +28,7 @@
           </el-table-column>
         </el-table>
         <pagination
-        save-key='typesManager'
+        saveKey='typesManager'
         sync
         :total.sync="pageInfo.total"
                     :page.sync="pageInfo.page"

src/views/chargeManager/one.vue

@@ -611,7 +611,7 @@ export default {
   }
 }
 /deep/.el-dialog__body {
-  padding: 0 20px;
+  // padding: 0 20px;
 }
 /deep/.el-select,
 /deep/.el-date-editor.el-input {

src/views/chargeManager/two.vue

@@ -325,7 +325,7 @@ export default {
   }
 }
 /deep/.el-dialog__body {
-  padding: 0 20px;
+  // padding: 0 20px;
 }
 /deep/.el-select,
 /deep/.el-date-editor.el-input {

src/views/contentManager/index.vue

@@ -11,49 +11,49 @@
                      v-if="permissionList.activity"
                      lazy
                      name="0">
-          <activity />
+          <activity v-if="activeName == 0" />
         </el-tab-pane>
         <el-tab-pane label="热门资讯"
                      v-if="permissionList.information"
                      lazy
                      name="1">
-          <information  />
+          <information v-if="activeName == 1" />
         </el-tab-pane>
         <el-tab-pane label="专项训练"
                      v-if="permissionList.training"
                      lazy
                      name="2">
-          <training  />
+          <training v-if="activeName == 2" />
         </el-tab-pane>
         <el-tab-pane label="闪页管理"
                      v-if="permissionList.flashPage"
                      lazy
                      name="3">
-          <flashPage />
+          <flashPage v-if="activeName == 3" />
         </el-tab-pane>
         <el-tab-pane label="BANNER管理"
                      v-if="permissionList.banner"
                      lazy
                      name="4">
-          <banner  />
+          <banner  v-if="activeName == 4" />
         </el-tab-pane>
         <el-tab-pane label="APP按钮管理"
                      v-if="permissionList.appPage"
                      lazy
                      name="5">
-          <appPage  />
+          <appPage v-if="activeName == 5" />
         </el-tab-pane>
         <el-tab-pane label="知识库管理"
                      v-if="permissionList.knowledge"
                      lazy
                      name="6">
-          <knowledge  />
+          <knowledge  v-if="activeName == 6" />
         </el-tab-pane>
         <el-tab-pane label="广告管理"
                      v-if="permissionList.advert"
                      lazy
                      name="7">
-          <advert  />
+          <advert v-if="activeName == 7" />
         </el-tab-pane>
       </tab-router>
     </div>
@@ -104,7 +104,7 @@ export default {
   },
   methods: {
     handleClick (val, event) {
-      console.log(val.name)
+      // console.log(val.name)
       this.activeName = val.name
       // this.activeStatus[val.name] = true
     }

src/views/evaluateManager/evaluateList.vue

@@ -44,7 +44,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <remote-search :commit="'setTeachers'" v-model="searchForm.teacherId" />
+        <remote-search :commit="'setTeachers'" aria-placeholder="请选择指导老师" v-model="searchForm.teacherId" />
       </el-form-item>
       <el-form-item>
         <el-select

src/views/evaluateManager/networkList.vue

@@ -14,6 +14,7 @@
         <el-input
           v-model.trim="searchForm.search"
           @keyup.enter.native="search"
+          clearable
           placeholder="请输入课程组名称 ID"
         ></el-input>
       </el-form-item>
@@ -33,7 +34,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <remote-search :commit="'setTeachers'" v-model.trim="searchForm.teacherId" />
+        <remote-search :commit="'setTeachers'" aria-placeholder="请选择指导老师" v-model.trim="searchForm.teacherId" />
       </el-form-item>
       <el-form-item>
         <remote-search
@@ -191,9 +192,7 @@
           label="指导老师"
         >
             <template slot-scope="scope">
-            <copy-text>
-              {{ scope.row.teacherName }}
-            </copy-text>
+            <copy-text>{{ scope.row.teacherName }}</copy-text>
           </template>
         </el-table-column>
         <el-table-column
@@ -202,9 +201,7 @@
           label="乐团主管"
         >
               <template slot-scope="scope">
-            <copy-text>
-              {{ scope.row.eduTeacherName }}
-            </copy-text>
+            <copy-text>{{ scope.row.eduTeacherName }}</copy-text>
           </template>
         </el-table-column>
         <el-table-column

src/views/evaluateManager/vipEvaluateList.vue

@@ -46,7 +46,7 @@
             :key="index"
           ></el-option>
         </el-select> -->
-           <remote-search :commit='"setTeachers"' v-model='searchForm.teacherId' />
+           <remote-search :commit='"setTeachers"' aria-placeholder="请选择指导老师" v-model='searchForm.teacherId' />
       </el-form-item>
       <el-form-item>
         <el-select
@@ -158,9 +158,7 @@
           label="指导老师"
         >
              <template slot-scope="scope">
-            <copy-text>
-              {{ scope.row.teacherName }}
-            </copy-text>
+            <copy-text>{{ scope.row.teacherName }}</copy-text>
           </template>
         </el-table-column>
         <el-table-column
@@ -169,9 +167,7 @@
           label="乐团主管"
         >
               <template slot-scope="scope">
-            <copy-text>
-              {{ scope.row.eduTeacherName }}
-            </copy-text>
+            <copy-text>{{ scope.row.eduTeacherName }}</copy-text>
           </template>
 
         </el-table-column>

src/views/levelManager/levelManager.vue

@@ -293,7 +293,7 @@ export default {
       // };
       this.$refs.searchForm.resetFields();
       //  this.$set(this.searchForm,'status','pay')
-      // this.searchForm.status = 'pay'
+      this.searchForm.status = 'pay'
       this.onSearch();
     },
     getList() {

src/views/login/index.vue

@@ -51,11 +51,11 @@
            :class="!loginForm.username || !loginForm.password?'disabled':''"
            style="width:100%;margin-bottom:30px;"
            @click="handleLogin">登录</div>
-      <div class='remberBox'
-           @click='saveUserInfo'>
-        <div class="dotWrap">
+      <div class='remberBox'>
+        <!-- <div class="dotWrap">
           <div :class="isSaveUserInfo?'active':''"></div>
-        </div>记住密码
+        </div> -->
+        <el-checkbox v-model="isSaveUserInfo">记住密码</el-checkbox>
       </div>
     </el-form>
   </div>

src/views/main/schedule-branch/index.vue

@@ -66,7 +66,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <pagination :total.sync="rules.total"
+    <pagination sync :total.sync="rules.total"
       :page.sync="rules.page"
       save-key="/main/main/schedule-branch"
       :limit.sync="rules.limit"

src/views/main/teamSchedule/scheduleDetail.vue

@@ -78,7 +78,7 @@
         >
       </div>
     </el-dialog>
-    <taskList ref="taskList" @resetSchedule="resetSchedule" @getTotal='getTotal'/>
+    <taskList style="margin-top: 15px;" ref="taskList" @resetSchedule="resetSchedule" @getTotal='getTotal'/>
   </div>
 </template>
 <script>

src/views/musicInspection/index.vue

@@ -369,7 +369,7 @@ export default {
 </script>
 <style lang='scss' scoped>
 /deep/.el-dialog__body {
-    padding: 10px 20px;
+    // padding: 10px 20px;
 }
 /deep/.description-title {
     margin: 0 !important;

src/views/operateManager/serverIndexList.vue

@@ -487,7 +487,7 @@ export default {
         obj.monday = this.searchForm.timer[0];
         obj.sunday = this.searchForm.timer[1];
       } else {
-        this.$message.error("请选择时间段");
+        this.$message.error("请选择周次");
         return false;
       }
       if (this.searchForm.workTimer && this.searchForm.workTimer.length > 0) {

src/views/operationalEarly/operationalList.vue

@@ -234,7 +234,7 @@ export default {
     onReSet() {
       this.searchForm = {
         organId: null,
-        monthStr: null,
+        monthStr: nowMonth,
         userId: null,
         maxSalary: null,
         lowSalary: null,

src/views/returnVisitManager/returnVisitList.vue

@@ -306,4 +306,7 @@ export default {
 .label {
   width: 520px;
 }
+/deep/.description-title {
+  margin-bottom: 0;
+}
 </style>

src/views/sporadicManager/sporadicList.vue

@@ -121,8 +121,7 @@
           </el-table-column>
                <el-table-column align="center" label="学生姓名" prop="userName">
             <template slot-scope="scope">
-               <copy-text>  {{ scope.row.userName || "-" }}</copy-text>
-
+               <copy-text>{{ scope.row.userName }}</copy-text>
             </template>
           </el-table-column>
           <el-table-column align="center" label="收费状态">

src/views/studentManager/components/studentCashout.vue

@@ -48,6 +48,7 @@
       </el-table>
       <pagination
       save-key='studentDetail-studentCashout'
+      sync
       :total.sync="pageInfo.total"
                   :page.sync="pageInfo.page"
                   :limit.sync="pageInfo.limit"

src/views/studentManager/components/studentOrder.vue

@@ -654,6 +654,7 @@ export default {
         paymentType: null,
         remark: null,
       };
+      this.getList()
     },
     submitRecharge() {
       let money = parseFloat(

src/views/studentManager/components/studentPayList.vue

@@ -26,7 +26,7 @@
       </el-form-item>
       <el-form-item>
         <el-button native-type="submit" type="danger">搜索</el-button>
-        <el-button native-type="reset" type="primary">重置</el-button>
+        <!-- <el-button native-type="reset" type="primary">重置</el-button> -->
       </el-form-item>
     </save-form>
     <!-- 列表 -->

src/views/studentManager/studentList.vue

@@ -783,6 +783,7 @@ export default {
         serviceTag: null,
         teacherId: null,
       };
+      this.getList()
     },
     downLoadStudent() {
       let url = "/api-web/export/studentHasCourse";

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

@@ -16,13 +16,7 @@
         <el-button type="danger" native-type="submit">搜索</el-button>
       </el-form-item>
       <el-form-item>
-        <div
-          class="newBand"
-          @click="resetCourses"
-          v-permission="'courseSchedule/classGroupTeacherAdjust'"
-        >
-          课程移交
-        </div>
+        <el-button type="primary" @click="resetCourses" v-permission="'courseSchedule/classGroupTeacherAdjust'">课程移交</el-button>
       </el-form-item>
     </save-form>
     <div class="tableWrap">
@@ -265,12 +259,12 @@ export default {
 };
 </script>
 <style lang="scss" scope>
-.courseInfo {
-  h4 {
-    margin-bottom: 20px;
-  }
-  .tableMargin {
-    margin-top: 20px;
-  }
-}
+// .courseInfo {
+//   h4 {
+//     margin-bottom: 20px;
+//   }
+//   .tableMargin {
+//     margin-top: 20px;
+//   }
+// }
 </style>

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

@@ -23,7 +23,7 @@
         <el-button type="danger" native-type="search">搜索</el-button>
       </el-form-item>
     </save-form>
-    <div class="tableWrap tableMargin">
+    <div class="tableWrap">
       <el-table
         :data="teamList"
         :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
@@ -184,12 +184,12 @@ export default {
 };
 </script>
 <style lang="scss" scope>
-.courseInfo {
-  h4 {
-    margin-bottom: 20px;
-  }
-  .tableMargin {
-    margin-top: 20px;
-  }
-}
+// .courseInfo {
+//   h4 {
+//     margin-bottom: 20px;
+//   }
+//   .tableMargin {
+//     margin-top: 20px;
+//   }
+// }
 </style>

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

@@ -82,12 +82,12 @@ export default {
 }
 </script>
 <style lang="scss" scope>
-.courseInfo {
-  h4 {
-    margin-bottom: 20px;
-  }
-  .tableMargin {
-    margin-top: 20px;
-  }
-}
+// .courseInfo {
+//   h4 {
+//     margin-bottom: 20px;
+//   }
+//   .tableMargin {
+//     margin-top: 20px;
+//   }
+// }
 </style>

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

@@ -154,6 +154,7 @@ export default {
         startTime: null,
         endTime: null,
       };
+      this.getList()
     },
   },
 };

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

@@ -23,7 +23,7 @@
         <el-button type="danger" native-type="submit">搜索</el-button>
       </el-form-item>
     </save-form>
-    <div class="tableWrap tableMargin">
+    <div class="tableWrap">
       <el-table
         :data="teamList"
         :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
@@ -182,12 +182,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.courseInfo {
-  h4 {
-    margin-bottom: 20px;
-  }
-  .tableMargin {
-    margin-top: 20px;
-  }
-}
+// .courseInfo {
+//   h4 {
+//     margin-bottom: 20px;
+//   }
+//   .tableMargin {
+//     margin-top: 20px;
+//   }
+// }
 </style>

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

@@ -223,12 +223,13 @@ export default {
         courseScheduleType: null,
         signInStatus: null,
       };
+      this.getList()
     },
   },
 };
 </script>
 <style lang="scss" scope>
 .tr-cotainer {
-  margin-top: 20px;
+  // margin-top: 20px;
 }
 </style>

src/views/teacherManager/teacherList.vue

@@ -27,6 +27,7 @@
         <el-form-item>
           <el-input
             v-model.trim="searchForm.search"
+            clearable
             @keyup.enter.native="getList"
             placeholder="老师姓名或电话"
           ></el-input>

src/views/teamDetail/teamDetailedList.vue

@@ -25,18 +25,15 @@
                   :data='tableList'>
           <el-table-column label="商品编号"
                            prop='sn'
-                           align="center"
-                           width="160px">
+                           align="center">
           </el-table-column>
           <el-table-column label="商品名称"
                            align="center"
-                           prop='name'
-                           width="160px">
+                           prop='name'>
           </el-table-column>
           <el-table-column label="商品类型"
                            align="center"
-                           prop='type'
-                           width="160px">
+                           prop='type'>
             <template slot-scope="scope">
               <div>
                 {{ scope.row.type | shopType }}
@@ -45,8 +42,7 @@
           </el-table-column>
           <el-table-column label="具体型号"
                            align="center"
-                           prop='specification'
-                           width="160px">
+                           prop='specification'>
           </el-table-column>
           <el-table-column label="数量统计"
                            align="center"

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

@@ -66,7 +66,7 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button native-type="submit" type="primary">搜索</el-button>
+        <el-button native-type="submit" type="danger">搜索</el-button>
       </el-form-item>
     </save-form>
     <!-- 列表 -->

src/views/vipClass/vipReset.vue

@@ -115,7 +115,7 @@
           </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"

src/views/withdrawal-application/modals/record.vue

@@ -154,6 +154,7 @@ export default {
     },
     onReSet() {
       this.$refs["searchForm"].resetFields();
+      this.searchForm.dates = [new Date().setDate(1), new Date()];
       this.search();
     },
     getList() {

src/views/workBenchManager/classFeesIsOk.vue

@@ -388,6 +388,7 @@ import remoteSearch from '@/components/remote-search/index'
 import load from "@/utils/loading";
 import { belongDaya } from '@/constant'
 import { objectToOptions } from '@/utils'
+import dayjs from 'dayjs'
 import {
   findIsSettlementCourseSalarys,
   openSalaryConfirm,
@@ -478,7 +479,7 @@ export default {
         teacherId: null,
         signInStatus: null,
         signOutStatus: null,
-        month: null,
+        month: dayjs().format('YYYY-MM'),
         confirmStatus: null,
       };
       this.search();

src/views/workBenchManager/journal/index.vue

@@ -6,19 +6,19 @@
     <div class="m-core">
         <tab-router v-model="activeIndex" type="card" >
           <el-tab-pane label="系统通知" lazy v-if="permissionList.journalItem" name="SYSTEM">
-            <list :type="activeIndex" />
+            <list :type="activeIndex" v-if="activeIndex == 'SYSTEM'" saveKey="journal-system" />
           </el-tab-pane>
           <el-tab-pane label="学生申诉" lazy v-if="permissionList.studentComplain" name="STUDENT">
-            <list :type="activeIndex" />
+            <list :type="activeIndex" v-if="activeIndex == 'STUDENT'" saveKey="journal-student" />
           </el-tab-pane>
           <el-tab-pane label="退团退课" lazy v-if="permissionList.musicGroupCourse" name="MUSICGROUP">
-            <list :type="activeIndex" />
+            <list :type="activeIndex" v-if="activeIndex == 'MUSICGROUP'" saveKey="journal-musicGroup" />
           </el-tab-pane>
           <el-tab-pane label="请假处理" lazy v-if="permissionList.leaveOperation" name="LEAVE">
-            <list :type="activeIndex" />
+            <list :type="activeIndex" v-if="activeIndex == 'LEAVE'" saveKey="journal-leave" />
           </el-tab-pane>
           <el-tab-pane label="VIP申请审核" lazy v-if="permissionList.vipApply" name="VIPAPPLY">
-            <list :type="activeIndex" />
+            <list :type="activeIndex" v-if="activeIndex == 'VIPAPPLY'" saveKey="journal-vipApply" />
           </el-tab-pane>
         </tab-router>
     </div>

src/views/workBenchManager/journal/model/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <save-form :inline="true" ref="searchForm" :model="searchForm">
+    <save-form :inline="true" ref="searchForm" :model="searchForm" @submit="onSearch" :saveKey="saveKey">
       <el-form-item prop="readStatus">
         <el-select
           v-model.trim="searchForm.readStatus"
@@ -12,7 +12,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="danger" @click="onSearch">搜索</el-button>
+        <el-button type="danger" native-type="submit">搜索</el-button>
       </el-form-item>
     </save-form>
     <div class="tableWrap">
@@ -55,7 +55,9 @@
         </el-table-column>
       </el-table>
       <pagination
-        :total="pageInfo.total"
+        sync
+        :saveKey="saveKey"
+        :total.sync="pageInfo.total"
         :page.sync="pageInfo.page"
         :limit.sync="pageInfo.limit"
         :page-sizes="pageInfo.page_size"
@@ -127,7 +129,7 @@ import vipApplyModel from "./vipApply";
 import musicGroupModel from "./musicGroup"
 export default {
   components: { pagination, StudentModel, LeaveModel, vipApplyModel, musicGroupModel },
-  props: ["type"],
+  props: ["type", 'saveKey'],
   data() {
     return {
       dialogSystem: false,

src/views/workBenchManager/payAppeal.vue

@@ -146,7 +146,7 @@
                   type="text"
                   v-if="permission('teacherAttendance/operation')&&scope.row.complaintsStatusEnum == 2"
                   @click="lookDetail(scope.row)"
-                  >操作</el-button
+                  >处理申诉</el-button
                 >
                  <el-button
                   type="text"

src/views/workBenchManager/requestProcessing.vue

@@ -142,7 +142,7 @@
                   type="text"
                   @click="lookDetail(scope.row)"
                   v-permission="'teacherSalaryComplaints/complaintsDispose'"
-                  >操作</el-button
+                  >课酬申诉</el-button
                 >
               </div>
             </template>

vue.config.js

@@ -17,7 +17,7 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // http://47.99.212.176:8000
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
-// let target = 'http://dyme.utools.club' //test环境
+let target = 'http://47.114.176.40:8000' //test环境
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.38:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥