瀏覽代碼

10/23 修改缓存记录

mo 4 年之前
父節點
當前提交
72e980ec15
共有 100 個文件被更改,包括 2602 次插入2070 次删除
  1. 3 3
      src/layout/components/AppMain.vue
  2. 2 2
      src/views/HumanResources/index.vue
  3. 3 3
      src/views/accompanyManager/accompanyBuys.vue
  4. 16 4
      src/views/accompanyManager/accompanyList.vue
  5. 1 1
      src/views/accompanyManager/accompanys.vue
  6. 373 326
      src/views/adapayAccount/form.vue
  7. 214 192
      src/views/adapayAccount/index.vue
  8. 18 17
      src/views/afterSchoolManager/afterSchoolDetail.vue
  9. 1 1
      src/views/afterSchoolManager/afterSchoolList.vue
  10. 122 100
      src/views/afterSchoolManager/afterSchoolTeach.vue
  11. 1 1
      src/views/afterSchoolManager/afterWorkList.vue
  12. 2 2
      src/views/afterSchoolManager/index.vue
  13. 40 22
      src/views/app/entryActivities.vue
  14. 1 1
      src/views/app/entryOperation.vue
  15. 34 23
      src/views/app/suggestion.vue
  16. 2 1
      src/views/buildVip/index.vue
  17. 1 1
      src/views/businessManager/orderManager/businessStatementDetail.vue
  18. 1 1
      src/views/businessManager/resetList/index.vue
  19. 1 1
      src/views/businessManager/shopManager/purchase-llist.vue
  20. 1 1
      src/views/businessManager/shopManager/shopList.vue
  21. 459 389
      src/views/businessManager/shopManager/shopOperation.vue
  22. 1 1
      src/views/categroyManager/insideSetting/adminManager.vue
  23. 3 3
      src/views/categroyManager/insideSetting/adminOperation.vue
  24. 4 3
      src/views/categroyManager/insideSetting/branchActive.vue
  25. 5 5
      src/views/categroyManager/insideSetting/branchActiveOperation.vue
  26. 2 2
      src/views/categroyManager/insideSetting/staffManager.vue
  27. 1 1
      src/views/categroyManager/vipActiveList.vue
  28. 63 40
      src/views/contentManager/components/activity.vue
  29. 64 41
      src/views/contentManager/components/advert.vue
  30. 19 13
      src/views/contentManager/components/appPage.vue
  31. 31 24
      src/views/contentManager/components/banner.vue
  32. 16 10
      src/views/contentManager/components/flashPage.vue
  33. 16 10
      src/views/contentManager/components/information.vue
  34. 15 9
      src/views/contentManager/components/knowledge.vue
  35. 61 38
      src/views/contentManager/components/training.vue
  36. 61 37
      src/views/contentManager/contentOperation.vue
  37. 173 122
      src/views/editionManager/editionList.vue
  38. 61 53
      src/views/evaluateManager/evaluateDetail.vue
  39. 152 127
      src/views/evaluateManager/evaluateList.vue
  40. 1 1
      src/views/evaluateManager/index.vue
  41. 1 1
      src/views/evaluateManager/networkList.vue
  42. 1 1
      src/views/evaluateManager/vipEvaluateList.vue
  43. 59 39
      src/views/helpCenter/helpCategory.vue
  44. 124 96
      src/views/helpCenter/helpContent.vue
  45. 2 2
      src/views/levelManager/levelManager.vue
  46. 1 1
      src/views/operateManager/operateStudent.vue
  47. 1 1
      src/views/operateManager/serverIndexDetail.vue
  48. 1 1
      src/views/operateManager/serverIndexList.vue
  49. 1 1
      src/views/recodeManager/recodeList.vue
  50. 3 3
      src/views/repairManager/repairList.vue
  51. 25 26
      src/views/resetTeaming/components/resetPayList.vue
  52. 1 1
      src/views/resetTeaming/components/resetSound.vue
  53. 4 2
      src/views/resetTeaming/components/strudentPayInfo.vue
  54. 1 1
      src/views/resetTeaming/components/studentPayBase.vue
  55. 1 1
      src/views/resetTeaming/index.vue
  56. 1 1
      src/views/returnVisitManager/returnVisitList.vue
  57. 1 1
      src/views/settlementManager/settlementList.vue
  58. 1 1
      src/views/studentManager/components/studentCashout.vue
  59. 2 2
      src/views/studentManager/components/studentInfo.vue
  60. 1 1
      src/views/studentManager/components/studentNetwork.vue
  61. 3 3
      src/views/studentManager/components/studentOrder.vue
  62. 12 13
      src/views/studentManager/components/studentOutList.vue
  63. 2 2
      src/views/studentManager/components/studentPayList.vue
  64. 2 2
      src/views/studentManager/components/studentRecord.vue
  65. 2 2
      src/views/studentManager/components/studentVip.vue
  66. 97 72
      src/views/studentManager/components/teamAndcourse.vue
  67. 1 1
      src/views/teacherManager/teacherDetail/components/courseInfo.vue
  68. 3 3
      src/views/teacherManager/teacherDetail/components/courseInfo1.vue
  69. 1 1
      src/views/teacherManager/teacherDetail/components/courseInfo2.vue
  70. 1 1
      src/views/teacherManager/teacherDetail/components/leaveRecord.vue
  71. 52 36
      src/views/teacherManager/teacherDetail/components/outCourseList.vue
  72. 1 1
      src/views/teacherManager/teacherDetail/components/serveStudentList.vue
  73. 7 7
      src/views/teacherManager/teacherDetail/components/settlement.vue
  74. 15 11
      src/views/teacherManager/teacherDetail/components/teacherInfo.vue
  75. 1 1
      src/views/teacherManager/teacherDetail/components/teacherNetwork.vue
  76. 1 1
      src/views/teacherManager/teacherDetail/components/teacherRecord.vue
  77. 1 1
      src/views/teacherManager/teacherDetail/components/timerList.vue
  78. 2 2
      src/views/teacherManager/teacherList.vue
  79. 1 1
      src/views/teacherManager/teacherOperation/components/accompanySet.vue
  80. 1 1
      src/views/teacherManager/teacherOperation/components/salarySet.vue
  81. 3 3
      src/views/teacherManager/teacherOperation/components/teacherOperation.vue
  82. 4 4
      src/views/teacherManager/teacherOperation/index.vue
  83. 1 1
      src/views/teamBuild/components/teamBaseInfo.vue
  84. 3 3
      src/views/teamBuild/components/teamResetSound.vue
  85. 5 5
      src/views/teamBuild/components/teamSoundMoney.vue
  86. 1 1
      src/views/teamBuild/index.vue
  87. 1 1
      src/views/teamBuild/signupList.vue
  88. 1 1
      src/views/teamBuild/teamSeting/components/coursePlan.vue
  89. 1 1
      src/views/teamBuild/teamSeting/components/lookCourse.vue
  90. 1 1
      src/views/teamBuild/teamSeting/components/setClassV2.vue
  91. 1 1
      src/views/teamBuild/teamSeting/components/setImprovement.vue
  92. 1 1
      src/views/teamDetail/componentCourse/classList.vue
  93. 30 22
      src/views/teamDetail/componentCourse/courseEvaluate.vue
  94. 1 1
      src/views/teamDetail/componentCourse/courseList.vue
  95. 11 1
      src/views/teamDetail/componentCourse/gpsLocation.vue
  96. 1 1
      src/views/teamDetail/componentCourse/studentRollCall.vue
  97. 50 42
      src/views/teamDetail/componentCourse/studentWork.vue
  98. 1 1
      src/views/teamDetail/components/baseInfo.vue
  99. 1 1
      src/views/teamDetail/components/classList.vue
  100. 1 1
      src/views/teamDetail/components/courseList.vue

+ 3 - 3
src/layout/components/AppMain.vue

@@ -3,9 +3,9 @@
     <!--   -->
     <transition name="fade-transform"
                 mode="out-in">
-      <!-- <keep-alive> -->
-      <router-view :key="key" />
-      <!-- </keep-alive> -->
+      <keep-alive>
+        <router-view :key="key" />
+      </keep-alive>
     </transition>
   </section>
 </template>

+ 2 - 2
src/views/HumanResources/index.vue

@@ -389,8 +389,8 @@ export default {
     // this.getTreeList()
   },
   mounted () {
-    this.getList();
-    this.getSubjectList()
+    // this.getList();
+    // this.getSubjectList()
   },
   computed: {
     subjectListObj () {

+ 3 - 3
src/views/accompanyManager/accompanyBuys.vue

@@ -192,9 +192,9 @@ export default {
   //生命周期 - 创建完成(可以访问当前this实例)
   created () { },
   //生命周期 - 挂载完成(可以访问DOM元素)
-  mounted () {
-    this.init();
-  },
+  // mounted () {
+  //   this.init();
+  // },
   activated () {
     this.init();
   },

+ 16 - 4
src/views/accompanyManager/accompanyList.vue

@@ -327,6 +327,22 @@ export default {
     };
   },
   created () {
+    // if (this.$route.query.searchForm) {
+    //   this.$route.query.searchForm instanceof Object
+    //     ? (this.searchForm = this.$route.query.searchForm)
+    //     : (this.searchForm = JSON.parse(this.$route.query.searchForm));
+    // }
+    // if (this.$route.query.rules) {
+    //   this.$route.query.rules instanceof Object
+    //     ? (this.rules = this.$route.query.rules)
+    //     : (this.rules = JSON.parse(this.$route.query.rules));
+    // }
+    // this.init();
+  },
+  mounted () {
+
+  },
+  activated () {
     if (this.$route.query.searchForm) {
       this.$route.query.searchForm instanceof Object
         ? (this.searchForm = this.$route.query.searchForm)
@@ -339,10 +355,6 @@ export default {
     }
     this.init();
   },
-  mounted () { },
-  activated () {
-    this.init();
-  },
   methods: {
     init () {
       getEmployeeOrgan().then(res => {

+ 1 - 1
src/views/accompanyManager/accompanys.vue

@@ -626,7 +626,7 @@ export default {
     };
   },
   mounted () {
-    this.init();
+    // this.init();
   },
   activated () {
     this.init();

+ 373 - 326
src/views/adapayAccount/form.vue

@@ -1,104 +1,146 @@
 <!--  -->
 <template>
-    <div class="m-container">
-        <h2>
-            <el-page-header @back="onCancel"
-                :content="(payType == 'create' ? '创建账号' : '修改账号')"></el-page-header>
-        </h2>
-        <div class="m-core" style="overflow: hidden">
-            <el-col :span="10">
-                <el-form :model="form" :rules="rules" ref="accountForm" label-position="right" label-width="180px">
-                    <el-form-item label="商户号" prop="memberId">
-                        <el-input v-model="form.memberId" :disabled="payType == 'update' ? true : false" placeholder="请输入商户号"></el-input>
-                    </el-form-item>
-                    <el-form-item label="公司名称" prop="name">
-                        <el-input v-model="form.name" placeholder="请输入公司名称"></el-input>
-                    </el-form-item>
-                    <el-form-item label="公司法人" prop="legalPerson">
-                        <el-input v-model="form.legalPerson" placeholder="请输入公司法人"></el-input>
-                    </el-form-item>
-                    <el-form-item label="公司法人手机号" prop="legalMp">
-                        <el-input v-model="form.legalMp" placeholder="请输入公司法人手机号"></el-input>
-                    </el-form-item>
-                    <el-form-item label="法人身份证号" prop="legalCertId">
-                        <el-input v-model="form.legalCertId" placeholder="请输入法人身份证号"></el-input>
-                    </el-form-item>
-                    <el-form-item label="身份证有效期" prop="legalCertIdExpires">
-                        <el-date-picker
-                            v-model="form.legalCertIdExpires"
+  <div class="m-container">
+    <h2>
+      <el-page-header @back="onCancel"
+                      :content="(payType == 'create' ? '创建账号' : '修改账号')"></el-page-header>
+    </h2>
+    <div class="m-core"
+         style="overflow: hidden">
+      <el-col :span="10">
+        <el-form :model="form"
+                 :rules="rules"
+                 ref="accountForm"
+                 label-position="right"
+                 label-width="180px">
+          <el-form-item label="商户号"
+                        prop="memberId">
+            <el-input v-model="form.memberId"
+                      :disabled="payType == 'update' ? true : false"
+                      placeholder="请输入商户号"></el-input>
+          </el-form-item>
+          <el-form-item label="公司名称"
+                        prop="name">
+            <el-input v-model="form.name"
+                      placeholder="请输入公司名称"></el-input>
+          </el-form-item>
+          <el-form-item label="公司法人"
+                        prop="legalPerson">
+            <el-input v-model="form.legalPerson"
+                      placeholder="请输入公司法人"></el-input>
+          </el-form-item>
+          <el-form-item label="公司法人手机号"
+                        prop="legalMp">
+            <el-input v-model="form.legalMp"
+                      placeholder="请输入公司法人手机号"></el-input>
+          </el-form-item>
+          <el-form-item label="法人身份证号"
+                        prop="legalCertId">
+            <el-input v-model="form.legalCertId"
+                      placeholder="请输入法人身份证号"></el-input>
+          </el-form-item>
+          <el-form-item label="身份证有效期"
+                        prop="legalCertIdExpires">
+            <el-date-picker v-model="form.legalCertIdExpires"
                             :picker-options="{ firstDayOfWeek:1 }"
                             value-format="yyyyMMdd"
                             type="date"
                             placeholder="请选择身份证有效期">
-                        </el-date-picker>
-                    </el-form-item>
-                    <el-form-item label="银行卡号" prop="cardNo">
-                        <el-input v-model="form.cardNo" placeholder="请输入银行卡号"></el-input>
-                    </el-form-item>
-                    <el-form-item label="所属银行" prop="bankCode">
-                        <el-select v-model="form.bankCode"
-                            placeholder="请选择所属银行">
-                            <el-option v-for="(item, index) in backList" :key="index" :label="item.title"
-                                    :value="item.value"></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="省市" required>
-                        <el-row>
-                            <el-col :span="12">
-                                <el-form-item prop="provCode">
-                                    <el-select v-model="form.provCode" style="width: 98% !important" @change="onProvChange" placeholder="请选择省份">
-                                        <el-option v-for="(item, index) in cityList" :key="index" :label="item.title"
-                                                :value="item.value"></el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item prop="areaCode">
-                                    <el-select v-model="form.areaCode" style="width: 100% !important" placeholder="请选择城市">
-                                        <el-option v-for="(item, index) in selectListCity" :key="index" :label="item.title"
-                                                :value="item.value"></el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                    </el-form-item>
-                    <el-form-item label="统一社会信用码" prop="socialCreditCode">
-                        <el-input v-model="form.socialCreditCode" placeholder="请输入统一社会信用码"></el-input>
-                    </el-form-item>
-                    <el-form-item label="统一社会信用码有效期" prop="socialCreditCodeExpires">
-                        <el-date-picker
-                            v-model="form.socialCreditCodeExpires"
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="银行卡号"
+                        prop="cardNo">
+            <el-input v-model="form.cardNo"
+                      placeholder="请输入银行卡号"></el-input>
+          </el-form-item>
+          <el-form-item label="所属银行"
+                        prop="bankCode">
+            <el-select v-model="form.bankCode"
+                       placeholder="请选择所属银行">
+              <el-option v-for="(item, index) in backList"
+                         :key="index"
+                         :label="item.title"
+                         :value="item.value"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="省市"
+                        required>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item prop="provCode">
+                  <el-select v-model="form.provCode"
+                             style="width: 98% !important"
+                             @change="onProvChange"
+                             placeholder="请选择省份">
+                    <el-option v-for="(item, index) in cityList"
+                               :key="index"
+                               :label="item.title"
+                               :value="item.value"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item prop="areaCode">
+                  <el-select v-model="form.areaCode"
+                             style="width: 100% !important"
+                             placeholder="请选择城市">
+                    <el-option v-for="(item, index) in selectListCity"
+                               :key="index"
+                               :label="item.title"
+                               :value="item.value"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form-item>
+          <el-form-item label="统一社会信用码"
+                        prop="socialCreditCode">
+            <el-input v-model="form.socialCreditCode"
+                      placeholder="请输入统一社会信用码"></el-input>
+          </el-form-item>
+          <el-form-item label="统一社会信用码有效期"
+                        prop="socialCreditCodeExpires">
+            <el-date-picker v-model="form.socialCreditCodeExpires"
                             :picker-options="{ firstDayOfWeek:1 }"
                             value-format="yyyyMMdd"
                             type="date"
                             placeholder="请选择统一社会信用码有效期">
-                        </el-date-picker>
-                    </el-form-item>
-                    <el-form-item label="经营范围" prop="businessScope">
-                        <!-- <el-input v-model="form.businessScope" placeholder="请输入经营范围"></el-input> -->
-                        <el-input type="textarea" :rows="3" v-model="form.businessScope" placeholder="请输入经营范围"></el-input>
-                    </el-form-item>
-                    <el-form-item label="公司地址" prop="address">
-                        <el-input v-model="form.address" placeholder="请输入公司地址"></el-input>
-                    </el-form-item>
-                    <el-form-item label="证照文件" prop="multipartFile">
-                        <!-- <el-input type="file" class="uploadFile" v-model="form.multipartFile"></el-input> -->
-                        <el-upload
-                            class="avatar-upload"
-                            ref="upload"
-                            action="/api-web/uploadFile"
-                            :on-preview="handlePreview"
-                            :on-remove="handleRemove"
-                            :on-change="handleChange"
-                            :file-list="fileList"
-                            :multiple="false"
-                            :limit="1"
-                            :auto-upload="false">
-                            <el-button slot="trigger" type="primary">选取文件</el-button>
-                            <!-- ,且不超过500kb -->
-                            <div slot="tip" style="display: inline; padding-left: 20px;" class="el-upload__tip">只能上传一个文件</div>
-                        </el-upload>
-                        <!-- <el-upload class="avatar-uploader"
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="经营范围"
+                        prop="businessScope">
+            <!-- <el-input v-model="form.businessScope" placeholder="请输入经营范围"></el-input> -->
+            <el-input type="textarea"
+                      :rows="3"
+                      v-model="form.businessScope"
+                      placeholder="请输入经营范围"></el-input>
+          </el-form-item>
+          <el-form-item label="公司地址"
+                        prop="address">
+            <el-input v-model="form.address"
+                      placeholder="请输入公司地址"></el-input>
+          </el-form-item>
+          <el-form-item label="证照文件"
+                        prop="multipartFile">
+            <!-- <el-input type="file" class="uploadFile" v-model="form.multipartFile"></el-input> -->
+            <el-upload class="avatar-upload"
+                       ref="upload"
+                       action="/api-web/uploadFile"
+                       :on-preview="handlePreview"
+                       :on-remove="handleRemove"
+                       :on-change="handleChange"
+                       :file-list="fileList"
+                       :multiple="false"
+                       :limit="1"
+                       :auto-upload="false">
+              <el-button slot="trigger"
+                         type="primary">选取文件</el-button>
+              <!-- ,且不超过500kb -->
+              <div slot="tip"
+                   style="display: inline; padding-left: 20px;"
+                   class="el-upload__tip">只能上传一个文件</div>
+            </el-upload>
+            <!-- <el-upload class="avatar-uploader"
                             action="/api-web/uploadFile"
                             :headers="headers"
                             :show-file-list="false"
@@ -110,18 +152,21 @@
                             <i v-else
                             class="el-icon-plus avatar-uploader-icon"></i>
                         </el-upload> -->
-                    </el-form-item>
-                    <el-form-item label="邮编" prop="zipCode">
-                        <el-input v-model="form.zipCode" placeholder="请输入邮编"></el-input>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button @click="onCancel">取 消</el-button>
-                        <el-button type="primary" @click="onSubmit('accountForm')">确 定</el-button>
-                    </el-form-item>
-                </el-form>
-            </el-col>
-        </div>
+          </el-form-item>
+          <el-form-item label="邮编"
+                        prop="zipCode">
+            <el-input v-model="form.zipCode"
+                      placeholder="请输入邮编"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button @click="onCancel">取 消</el-button>
+            <el-button type="primary"
+                       @click="onSubmit('accountForm')">确 定</el-button>
+          </el-form-item>
+        </el-form>
+      </el-col>
     </div>
+  </div>
 </template>
 
 <script>
@@ -132,253 +177,255 @@ import load from '@/utils/loading'
 import { createMember, updateMember } from './api.js'
 import { isvalidPhone } from '@/utils/validate'
 let validPhone = (rule, value, callback) => {
-    if (!value) {
-        callback(new Error('请输入公司法人手机号'))
-    } else if (!isvalidPhone(value)) {
-        callback(new Error('请输入正确的11位手机号码'))
-    } else {
-        callback()
-    }
+  if (!value) {
+    callback(new Error('请输入公司法人手机号'))
+  } else if (!isvalidPhone(value)) {
+    callback(new Error('请输入正确的11位手机号码'))
+  } else {
+    callback()
+  }
 }
 export default {
-    name: 'ADaPayAccount',
-    data() {
-        const query = this.$route.query
-        return {
-            payType: query.type,
-            row: query.row ? JSON.parse(query.row) : {},
-            backList: bankJson,
-            cityList: cityJson,
-            selectListCity: [],
-            headers: {
-                Authorization: getToken()
-            },
-            fileList: [],
-            files: null, // 上传对象
-            id: null, // 编号
-            form: {
-                memberId: null,
-                name: null,
-                legalPerson: null,
-                legalMp: null,
-                legalCertId: null,
-                legalCertIdExpires: null,
-                cardNo: null,
-                bankCode: null,
-                provCode: null,
-                areaCode: null,
-                socialCreditCode: null,
-                socialCreditCodeExpires: null,
-                businessScope: null,
-                address: null,
-                multipartFile: null,
-                zipCode: null
-            },
-            rules: {
-                memberId: [{required: true, message:'请输入商户号', trigger: 'blur'}],
-                name: [{required: true, message:'请输入公司名称', trigger: 'blur'}],
-                legalPerson: [{required: true, message:'请输入公司法人', trigger: 'blur'}],
-                legalMp: [{ type: 'number', required: true, validator: validPhone, trigger: 'blur' }],
-                legalCertId: [{required: true, message:'请输入法人身份证号', trigger: 'blur'}],
-                legalCertIdExpires: [{required: true, message:'请选择身份证有效期', trigger: 'change'}],
-                cardNo: [{required: true, message:'请输入银行卡号', trigger: 'blur'}],
-                bankCode: [{required: true, message:'请选择所属银行', trigger: 'change'}],
-                provCode: [{required: true, message:'请选择省份', trigger: 'change'}],
-                areaCode: [{required: true, message:'请选择城市', trigger: 'change'}],
-                socialCreditCode: [{required: true, message:'请输入统一社会信用码', trigger: 'blur'}],
-                socialCreditCodeExpires: [{required: true, message:'请选择统一社会信用码有效期', trigger: 'change'}],
-                businessScope: [{required: true, message:'请输入经营范围', trigger: 'blur'}],
-                address: [{required: true, message:'请输入公司地址', trigger: 'blur'}],
-                multipartFile: [{required: true, message:'请上传证照文件', trigger: 'change'}],
-                zipCode: [{required: true, message:'请输入邮编', trigger: 'blur'}]
-            }
-        };
+  name: 'ADaPayAccount',
+  data () {
+    const query = this.$route.query
+    return {
+      payType: query.type,
+      row: query.row ? JSON.parse(query.row) : {},
+      backList: bankJson,
+      cityList: cityJson,
+      selectListCity: [],
+      headers: {
+        Authorization: getToken()
+      },
+      fileList: [],
+      files: null, // 上传对象
+      id: null, // 编号
+      form: {
+        memberId: null,
+        name: null,
+        legalPerson: null,
+        legalMp: null,
+        legalCertId: null,
+        legalCertIdExpires: null,
+        cardNo: null,
+        bankCode: null,
+        provCode: null,
+        areaCode: null,
+        socialCreditCode: null,
+        socialCreditCodeExpires: null,
+        businessScope: null,
+        address: null,
+        multipartFile: null,
+        zipCode: null
+      },
+      rules: {
+        memberId: [{ required: true, message: '请输入商户号', trigger: 'blur' }],
+        name: [{ required: true, message: '请输入公司名称', trigger: 'blur' }],
+        legalPerson: [{ required: true, message: '请输入公司法人', trigger: 'blur' }],
+        legalMp: [{ type: 'number', required: true, validator: validPhone, trigger: 'blur' }],
+        legalCertId: [{ required: true, message: '请输入法人身份证号', trigger: 'blur' }],
+        legalCertIdExpires: [{ required: true, message: '请选择身份证有效期', trigger: 'change' }],
+        cardNo: [{ required: true, message: '请输入银行卡号', trigger: 'blur' }],
+        bankCode: [{ required: true, message: '请选择所属银行', trigger: 'change' }],
+        provCode: [{ required: true, message: '请选择省份', trigger: 'change' }],
+        areaCode: [{ required: true, message: '请选择城市', trigger: 'change' }],
+        socialCreditCode: [{ required: true, message: '请输入统一社会信用码', trigger: 'blur' }],
+        socialCreditCodeExpires: [{ required: true, message: '请选择统一社会信用码有效期', trigger: 'change' }],
+        businessScope: [{ required: true, message: '请输入经营范围', trigger: 'blur' }],
+        address: [{ required: true, message: '请输入公司地址', trigger: 'blur' }],
+        multipartFile: [{ required: true, message: '请上传证照文件', trigger: 'change' }],
+        zipCode: [{ required: true, message: '请输入邮编', trigger: 'blur' }]
+      }
+    };
+  },
+  // mounted () {
+  //   this.__init()
+  // },
+  activated () {
+    this.__init()
+  },
+  methods: {
+    __init () {
+      const query = this.$route.query
+      this.payType = query.type
+      this.row = query.row ? JSON.parse(query.row) : {}
+      this.files = null
+      this.fileList = []
+      this.form.multipartFile = null
+      if (this.payType == 'update') {
+        const row = this.row
+        this.id = row.id
+        this.form = {
+          memberId: row.memberId,
+          name: row.name,
+          legalPerson: row.legalPerson,
+          legalMp: row.legalMp,
+          legalCertId: row.legalCertId,
+          legalCertIdExpires: row.legalCertIdExpires,
+          cardNo: row.cardNo,
+          bankCode: row.bankCode,
+          provCode: row.provCode,
+          areaCode: row.areaCode,
+          socialCreditCode: row.socialCreditCode,
+          socialCreditCodeExpires: row.socialCreditCodeExpires,
+          businessScope: row.businessScope,
+          address: row.address,
+          multipartFile: row.multipartFile,
+          zipCode: row.zipCode
+        }
+        this.cityList.forEach(item => {
+          if (item.value == row.provCode) {
+            this.selectListCity = item.cities
+          }
+        })
+      } else if (this.payType == 'create') {
+        // this.form = {
+        //     memberId: null,
+        //     name: null,
+        //     legalPerson: null,
+        //     legalMp: null,
+        //     legalCertId: null,
+        //     legalCertIdExpires: null,
+        //     cardNo: null,
+        //     bankCode: null,
+        //     provCode: null,
+        //     areaCode: null,
+        //     socialCreditCode: null,
+        //     socialCreditCodeExpires: null,
+        //     businessScope: null,
+        //     address: null,
+        //     multipartFile: null,
+        //     zipCode: null
+        // }
+        this.$refs["accountForm"].resetFields()
+      }
     },
-    mounted() {
-        this.__init()
+    async onSubmit (formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          const form = this.form
+          let formData = new FormData()
+          formData.append("memberId", form.memberId)
+          formData.append("name", form.name)
+          formData.append("legalPerson", form.legalPerson)
+          formData.append("legalMp", form.legalMp)
+          formData.append("legalCertId", form.legalCertId)
+          formData.append("legalCertIdExpires", form.legalCertIdExpires)
+          formData.append("cardNo", form.cardNo)
+          formData.append("bankCode", form.bankCode)
+          formData.append("provCode", form.provCode)
+          formData.append("areaCode", form.areaCode)
+          formData.append("socialCreditCode", form.socialCreditCode)
+          formData.append("socialCreditCodeExpires", form.socialCreditCodeExpires)
+          formData.append("businessScope", form.businessScope)
+          formData.append("address", form.address)
+          formData.append("multipartFile", form.multipartFile)
+          formData.append("zipCode", form.zipCode)
+          if (this.payType == 'create') {
+            createMember(formData).then(res => {
+              if (res.code == 200) {
+                this.$message.success('保存成功')
+                this.onCancel()
+              } else {
+                this.$message.error(res.msg)
+              }
+            })
+          } else if (this.payType == 'update') {
+            formData.append('id', this.id)
+            updateMember(formData).then(res => {
+              if (res.code == 200) {
+                this.$message.success('保存成功')
+                this.onCancel()
+              } else {
+                this.$message.error(res.msg)
+              }
+            })
+          }
+        } else {
+          return false;
+        }
+      });
     },
-    activated() {
-        this.__init()
+    handleChange (file) {
+      this.files = file
+      this.form.multipartFile = file.raw
+      this.$refs["accountForm"].validateField('multipartFile')
     },
-    methods: {
-        __init() {
-            const query = this.$route.query
-            this.payType = query.type
-            this.row = query.row ? JSON.parse(query.row) : {}
-            this.files = null
-            this.fileList = []
-            this.form.multipartFile = null
-            if(this.payType == 'update') {
-                const row = this.row
-                this.id = row.id
-                this.form = {
-                    memberId: row.memberId,
-                    name: row.name,
-                    legalPerson: row.legalPerson,
-                    legalMp: row.legalMp,
-                    legalCertId: row.legalCertId,
-                    legalCertIdExpires: row.legalCertIdExpires,
-                    cardNo: row.cardNo,
-                    bankCode: row.bankCode,
-                    provCode: row.provCode,
-                    areaCode: row.areaCode,
-                    socialCreditCode: row.socialCreditCode,
-                    socialCreditCodeExpires: row.socialCreditCodeExpires,
-                    businessScope: row.businessScope,
-                    address: row.address,
-                    multipartFile: row.multipartFile,
-                    zipCode: row.zipCode
-                }
-                this.cityList.forEach(item => {
-                    if(item.value == row.provCode) {
-                        this.selectListCity = item.cities
-                    }
-                })
-            } else if(this.payType == 'create') {
-                // this.form = {
-                //     memberId: null,
-                //     name: null,
-                //     legalPerson: null,
-                //     legalMp: null,
-                //     legalCertId: null,
-                //     legalCertIdExpires: null,
-                //     cardNo: null,
-                //     bankCode: null,
-                //     provCode: null,
-                //     areaCode: null,
-                //     socialCreditCode: null,
-                //     socialCreditCodeExpires: null,
-                //     businessScope: null,
-                //     address: null,
-                //     multipartFile: null,
-                //     zipCode: null
-                // }
-                this.$refs["accountForm"].resetFields()
-            }
-        },
-        async onSubmit (formName) {
-            this.$refs[formName].validate(valid => {
-                if (valid) {
-                    const form = this.form
-                    let formData = new FormData()
-                        formData.append("memberId", form.memberId)
-                        formData.append("name", form.name)
-                        formData.append("legalPerson", form.legalPerson)
-                        formData.append("legalMp", form.legalMp)
-                        formData.append("legalCertId", form.legalCertId)
-                        formData.append("legalCertIdExpires", form.legalCertIdExpires)
-                        formData.append("cardNo", form.cardNo)
-                        formData.append("bankCode", form.bankCode)
-                        formData.append("provCode", form.provCode)
-                        formData.append("areaCode", form.areaCode)
-                        formData.append("socialCreditCode", form.socialCreditCode)
-                        formData.append("socialCreditCodeExpires", form.socialCreditCodeExpires)
-                        formData.append("businessScope", form.businessScope)
-                        formData.append("address", form.address)
-                        formData.append("multipartFile", form.multipartFile)
-                        formData.append("zipCode", form.zipCode)
-                    if(this.payType == 'create') {
-                        createMember(formData).then(res => {
-                            if(res.code == 200) {
-                                this.$message.success('保存成功')
-                                this.onCancel()
-                            } else {
-                                this.$message.error(res.msg)
-                            }
-                        })
-                    } else if(this.payType == 'update') {
-                        formData.append('id', this.id)
-                        updateMember(formData).then(res => {
-                            if(res.code == 200) {
-                                this.$message.success('保存成功')
-                                this.onCancel()
-                            } else {
-                                this.$message.error(res.msg)
-                            }
-                        })
-                    }
-                } else {
-                    return false;
-                }
-            });
-        },
-        handleChange(file) {
-            this.files = file
-            this.form.multipartFile = file.raw
-            this.$refs["accountForm"].validateField('multipartFile')
-        },
-        handleRemove(file, fileList) {
-            this.files = null
-            this.form.multipartFile = null
-        },
-        handlePreview(file) {
-            // console.log(file);
-        },
-        onProvChange(value) {
-            this.form.areaCode = null
-            this.cityList.forEach(item => {
-                if(item.value == value) {
-                    this.selectListCity = item.cities
-                }
-            })
-        },
-        onCancel () {
-            this.files = null
-            this.fileList = []
-            this.form.multipartFile = null
-            this.$router.push({
-                path: "/insideSetting/adapayManager"
-            });
+    handleRemove (file, fileList) {
+      this.files = null
+      this.form.multipartFile = null
+    },
+    handlePreview (file) {
+      // console.log(file);
+    },
+    onProvChange (value) {
+      this.form.areaCode = null
+      this.cityList.forEach(item => {
+        if (item.value == value) {
+          this.selectListCity = item.cities
         }
+      })
     },
+    onCancel () {
+      this.files = null
+      this.fileList = []
+      this.form.multipartFile = null
+      this.$router.push({
+        path: "/insideSetting/adapayManager"
+      });
+    }
+  },
 };
 </script>
 <style lang='scss' scoped>
-.el-input, .el-textarea, .el-select {
-    width: 100% !important;
+.el-input,
+.el-textarea,
+.el-select {
+  width: 100% !important;
 }
 .el-button--primary {
+  background: #14928a;
+  border-color: #14928a;
+  color: #fff;
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
     color: #fff;
-    &:hover,
-    &:active,
-    &:focus {
-        background: #14928a;
-        border-color: #14928a;
-        color: #fff;
-    }
+  }
 }
 /deep/.avatar-uploader {
-    .el-upload {
-        border: 1px dashed #d9d9d9;
-        border-radius: 6px;
-        cursor: pointer;
-        position: relative;
-        overflow: hidden;
-        &:hover {
-            border-color: #409EFF;
-        }
+  .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+    &:hover {
+      border-color: #409eff;
     }
+  }
 }
 .uploadFile {
-    /deep/.el-input__inner {
-        padding: 0;
-        height: 40px;
-        line-height: 32px;
-    }
+  /deep/.el-input__inner {
+    padding: 0;
+    height: 40px;
+    line-height: 32px;
+  }
 }
 .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 178px;
-    height: 178px;
-    line-height: 178px;
-    text-align: center;
+  font-size: 28px;
+  color: #8c939d;
+  width: 178px;
+  height: 178px;
+  line-height: 178px;
+  text-align: center;
 }
 .avatar {
-    width: 178px;
-    height: 178px;
-    display: block;
+  width: 178px;
+  height: 178px;
+  display: block;
 }
 </style>

+ 214 - 192
src/views/adapayAccount/index.vue

@@ -1,113 +1,136 @@
 <!--  -->
 <template>
-    <div class="m-container">
-        <h2>
-            <div class="squrt"></div>汇付账号管理
-        </h2>
-        <div class="topWrap">
-            <div class="newBand" v-permission="'adapay/createMember'" @click="onOperationAccount('create')" >创建账号</div>
-        </div>
-        <div class="m-core">
-            <el-form :inline="true"
+  <div class="m-container">
+    <h2>
+      <div class="squrt"></div>汇付账号管理
+    </h2>
+    <div class="topWrap">
+      <div class="newBand"
+           v-permission="'adapay/createMember'"
+           @click="onOperationAccount('create')">创建账号</div>
+    </div>
+    <div class="m-core">
+      <el-form :inline="true"
                class="searchForm"
                v-model.trim="searchForm">
-                <el-form-item>
-                <el-input v-model.trim="searchForm.memberId"
-                            placeholder="请输入商户号"></el-input>
-                </el-form-item>
-                <el-form-item>
-                <el-input v-model.trim="searchForm.name"
-                            placeholder="请输入公司名称"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-select v-model.trim="searchForm.status"
-                                filterable
-                                clearable
-                                placeholder="请选择审核状态">
-                        <el-option label="处理中" value="pending"></el-option>
-                        <el-option label="成功" value="succeeded"></el-option>
-                        <el-option label="失败" value="failed"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button @click="getList" type="danger">搜索</el-button>
-                </el-form-item>
-            </el-form>
-            <div class="tableWrap">
-                <el-table :data="tableList"
-                            :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-                    <el-table-column label="商户号"
-                                    align="center"
-                                    prop="memberId"></el-table-column>
-                    <el-table-column label="法人"
-                                    align="center"
-                                    prop="legalPerson"></el-table-column>
-                    <el-table-column label="法人手机号"
-                                    align="center"
-                                    prop="legalMp"></el-table-column>
-                    <el-table-column label="法人身份证号"
-                                    align="center"
-                                    prop="legalCertId"></el-table-column>
-                    <el-table-column label="公司名称"
-                                    align="center"
-                                    prop="name"></el-table-column>
-                    <el-table-column label="统一社会信用码"
-                                    align="center"
-                                    prop="socialCreditCode"></el-table-column>
-                    <el-table-column label="银行卡号"
-                                    align="center"
-                                    prop="cardNo"></el-table-column>
-                    <el-table-column label="审核状态"
-                                    align="center"
-                                    prop="status">
-                        <template slot-scope="scope">
-                            {{ scope.row.status | formatStatus }}
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="备注"
-                                    align="center"
-                                    prop="memo"></el-table-column>
-                    <el-table-column label="操作"
-                                    width="250px"
-                                    align="center"
-                                    fixed="right">
-                        <template slot-scope="scope">
-                            <el-button v-if="scope.row.status === 'failed'"  v-permission="'adapay/updateMember'" @click="onOperationAccount('update', scope.row)" type="text">修改</el-button>
-                            <el-button v-if="scope.row.status === 'succeeded'"  v-permission="'adapay/createSettleAccount'" @click="onUpdateAccount(scope.row)" type="text">修改结算账户</el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <pagination :total="rules.total"
-                            :page.sync="rules.page"
-                            :limit.sync="rules.limit"
-                            :page-sizes="rules.page_size"
-                            @pagination="getList" />
-            </div>
-        </div>
+        <el-form-item>
+          <el-input v-model.trim="searchForm.memberId"
+                    placeholder="请输入商户号"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model.trim="searchForm.name"
+                    placeholder="请输入公司名称"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-select v-model.trim="searchForm.status"
+                     filterable
+                     clearable
+                     placeholder="请选择审核状态">
+            <el-option label="处理中"
+                       value="pending"></el-option>
+            <el-option label="成功"
+                       value="succeeded"></el-option>
+            <el-option label="失败"
+                       value="failed"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getList"
+                     type="danger">搜索</el-button>
+        </el-form-item>
+      </el-form>
+      <div class="tableWrap">
+        <el-table :data="tableList"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column label="商户号"
+                           align="center"
+                           prop="memberId"></el-table-column>
+          <el-table-column label="法人"
+                           align="center"
+                           prop="legalPerson"></el-table-column>
+          <el-table-column label="法人手机号"
+                           align="center"
+                           prop="legalMp"></el-table-column>
+          <el-table-column label="法人身份证号"
+                           align="center"
+                           prop="legalCertId"></el-table-column>
+          <el-table-column label="公司名称"
+                           align="center"
+                           prop="name"></el-table-column>
+          <el-table-column label="统一社会信用码"
+                           align="center"
+                           prop="socialCreditCode"></el-table-column>
+          <el-table-column label="银行卡号"
+                           align="center"
+                           prop="cardNo"></el-table-column>
+          <el-table-column label="审核状态"
+                           align="center"
+                           prop="status">
+            <template slot-scope="scope">
+              {{ scope.row.status | formatStatus }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注"
+                           align="center"
+                           prop="memo"></el-table-column>
+          <el-table-column label="操作"
+                           width="250px"
+                           align="center"
+                           fixed="right">
+            <template slot-scope="scope">
+              <el-button v-if="scope.row.status === 'failed'"
+                         v-permission="'adapay/updateMember'"
+                         @click="onOperationAccount('update', scope.row)"
+                         type="text">修改</el-button>
+              <el-button v-if="scope.row.status === 'succeeded'"
+                         v-permission="'adapay/createSettleAccount'"
+                         @click="onUpdateAccount(scope.row)"
+                         type="text">修改结算账户</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :total="rules.total"
+                    :page.sync="rules.page"
+                    :limit.sync="rules.limit"
+                    :page-sizes="rules.page_size"
+                    @pagination="getList" />
+      </div>
+    </div>
 
-        <el-dialog title="绑定结算账户" :visible.sync="zeroVisible" width="400px" @close="onFormClose('maskForm')">
-            <el-form :model='maskForm'
+    <el-dialog title="绑定结算账户"
+               :visible.sync="zeroVisible"
+               width="400px"
+               @close="onFormClose('maskForm')">
+      <el-form :model='maskForm'
                :rules="maskRules"
                label-width="100px"
                label-position="right"
                ref="maskForm">
-                <el-form-item label="银行卡号" prop="cardNo">
-                    <el-input v-model="maskForm.cardNo" placeholder="请输入银行卡号"></el-input>
-                </el-form-item>
-                <el-form-item label="所属银行" prop="bankCode">
-                    <el-select v-model="maskForm.bankCode" style="width: 100% !important" placeholder="请选择所属银行">
-                        <el-option v-for="(item, index) in backList" :key="index" :label="item.title"
-                                :value="item.value"></el-option>
-                    </el-select>
-                </el-form-item>
-            </el-form>
-            <span slot="footer"
-                    class="dialog-footer">
-                <el-button @click="zeroVisible = false">取 消</el-button>
-                <el-button type="primary" @click="addZero('maskForm')">确 定</el-button>
-            </span>
-        </el-dialog>
-    </div>
+        <el-form-item label="银行卡号"
+                      prop="cardNo">
+          <el-input v-model="maskForm.cardNo"
+                    placeholder="请输入银行卡号"></el-input>
+        </el-form-item>
+        <el-form-item label="所属银行"
+                      prop="bankCode">
+          <el-select v-model="maskForm.bankCode"
+                     style="width: 100% !important"
+                     placeholder="请选择所属银行">
+            <el-option v-for="(item, index) in backList"
+                       :key="index"
+                       :label="item.title"
+                       :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="zeroVisible = false">取 消</el-button>
+        <el-button type="primary"
+                   @click="addZero('maskForm')">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -118,105 +141,104 @@ import { cityJson } from './cityJson'
 import { bankJson } from './bankJson'
 import cleanDeep from 'clean-deep'
 export default {
-    components: {
-        pagination,
-        AccountForm
-    },
-    data () {
-        return {
-            zeroVisible: false,
-            backList: bankJson,
-            rules: {
-                // 分页规则
-                limit: 20, // 限制显示条数
-                page: 1, // 当前页
-                total: 0, // 总条数
-                page_size: [10, 20, 50, 100] // 选择限制显示条数
-            },
-            tableList: [],
-            searchForm: { },
-            maskRules: {
-                cardNo: [{required: true, message:'请输入银行卡号', trigger: 'blur'}],
-                bankCode: [{required: true, message:'请选择所属银行', trigger: 'change'}]
-            },
-            maskForm: {
-                memberId: null,
-                cardNo: null,
-                bankCode: null
-            }
-        };
-    },
-    mounted () {
-        this.getList()
+  components: {
+    pagination,
+    AccountForm
+  },
+  data () {
+    return {
+      zeroVisible: false,
+      backList: bankJson,
+      rules: {
+        // 分页规则
+        limit: 20, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 50, 100] // 选择限制显示条数
+      },
+      tableList: [],
+      searchForm: {},
+      maskRules: {
+        cardNo: [{ required: true, message: '请输入银行卡号', trigger: 'blur' }],
+        bankCode: [{ required: true, message: '请选择所属银行', trigger: 'change' }]
+      },
+      maskForm: {
+        memberId: null,
+        cardNo: null,
+        bankCode: null
+      }
+    };
+  },
+  // mounted () {
+  //   this.getList()
+  // },
+  activated () {
+    this.getList()
+  },
+  methods: {
+    getList () {
+      try {
+        let obj = this.searchForm
+        obj.page = this.rules.page
+        obj.rows = this.rules.limit
+        queryPageList(cleanDeep(obj)).then(res => {
+          if (res.code == 200) {
+            this.tableList = res.data.rows
+            this.rules.total = res.data.total
+          }
+        })
+      } catch {
+        //
+      }
     },
-    activated () {
-        this.getList()
+    onFormClose (formName) {
+      this.$refs[formName].resetFields()
     },
-    methods: {
-        getList() {
-            try {
-                let obj = this.searchForm
-                obj.page= this.rules.page
-                obj.rows= this.rules.limit
-                queryPageList(cleanDeep(obj)).then(res => {
-                    if(res.code == 200) {
-                        this.tableList = res.data.rows
-                        this.rules.total = res.data.total
-                    }
-                })
-            } catch {
-                //
-            }
-        },
-        onFormClose(formName) {
-            this.$refs[formName].resetFields()
-        },
-        onOperationAccount(type, row) {
-            this.$router.push({
-                path: '/insideSetting/adapayOperation',
-                query: {
-                    type: type,
-                    row: JSON.stringify(row)
-                }
-            })
-        },
-        onUpdateAccount(row) {
-            this.zeroVisible = true
-            this.maskForm = {
-                memberId: row.memberId,
-                cardNo: row.cardNo,
-                bankCode: row.bankCode
-            }
-        },
-        addZero(formName) {
-             this.$refs[formName].validate(valid => {
-                if (valid) {
-                    createSettleAccount(cleanDeep(this.maskForm)).then(res => {
-                        if(res.code == 200) {
-                            this.$message.success('修改结算账户成功')
-                            this.zeroVisible = false
-                        } else {
-                            this.$message.error(res.msg)
-                        }
-                    })
-                } else {
-                    return false;
-                }
-            });
+    onOperationAccount (type, row) {
+      this.$router.push({
+        path: '/insideSetting/adapayOperation',
+        query: {
+          type: type,
+          row: JSON.stringify(row)
         }
+      })
+    },
+    onUpdateAccount (row) {
+      this.zeroVisible = true
+      this.maskForm = {
+        memberId: row.memberId,
+        cardNo: row.cardNo,
+        bankCode: row.bankCode
+      }
     },
-    filters: {
-        formatStatus(val) {
-            const templateList = {
-                pending:"处理中",
-                succeeded:"成功",
-                failed: "失败"
+    addZero (formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          createSettleAccount(cleanDeep(this.maskForm)).then(res => {
+            if (res.code == 200) {
+              this.$message.success('修改结算账户成功')
+              this.zeroVisible = false
+            } else {
+              this.$message.error(res.msg)
             }
-            return templateList[val]
+          })
+        } else {
+          return false;
         }
+      });
     }
+  },
+  filters: {
+    formatStatus (val) {
+      const templateList = {
+        pending: "处理中",
+        succeeded: "成功",
+        failed: "失败"
+      }
+      return templateList[val]
+    }
+  }
 };
 </script>
 <style lang='scss' scoped>
-
 </style>

+ 18 - 17
src/views/afterSchoolManager/afterSchoolDetail.vue

@@ -3,9 +3,10 @@
   <div class="m-container">
     <h2>
       <!-- <div class='squrt'></div> {{ pageName }} -->
-      <el-page-header @back="goBack" :content="title"></el-page-header>
+      <el-page-header @back="goBack"
+                      :content="title"></el-page-header>
     </h2>
-    <afterWorkList/>
+    <afterWorkList />
   </div>
 </template>
 
@@ -13,39 +14,39 @@
 import afterWorkList from "@/views/afterSchoolManager/afterWorkList";
 export default {
   components: { afterWorkList },
-  data() {
+  data () {
     return {
       FsearchForm: null,
       Frules: null,
-      title:'',
-      id:null
+      title: '',
+      id: null
     };
   },
   //生命周期 - 创建完成(可以访问当前this实例)
-  created() {
-    this.init();
-  },
+  // created() {
+  //   this.init();
+  // },
   //生命周期 - 挂载完成(可以访问DOM元素)
-  mounted() {
-    
+  mounted () {
+
   },
-  activated() {
+  activated () {
     this.init();
   },
   methods: {
-    init() {
+    init () {
       if (this.$route.query.searchForm) {
         this.FsearchForm = this.$route.query.searchForm;
       }
       if (this.$route.query.rules) {
         this.Frules = this.$route.query.rules;
       }
-          this.title = this.$route.query.title
-          this.id = this.$route.query.extracurricularExercisesId
-          // console.log(this.id)
-        //   console.log(this.$router.query)
+      this.title = this.$route.query.title
+      this.id = this.$route.query.extracurricularExercisesId
+      // console.log(this.id)
+      //   console.log(this.$router.query)
     },
-    goBack() {
+    goBack () {
       this.$router.push({ path: "/business/afterSchoolManager", query: { rules: this.Frules, searchForm: this.FsearchForm } });
     }
   }

+ 1 - 1
src/views/afterSchoolManager/afterSchoolList.vue

@@ -194,7 +194,7 @@ export default {
       }
     });
     // 获取分部
-    this.init();
+    // this.init();
   },
   activated () {
     this.init();

+ 122 - 100
src/views/afterSchoolManager/afterSchoolTeach.vue

@@ -2,38 +2,34 @@
 <template>
   <div class="m-core">
     <div class="m-core">
-      <el-form :inline="true" :model="searchForm">
+      <el-form :inline="true"
+               :model="searchForm">
         <el-form-item>
-          <el-input
-            v-model.trim="searchForm.search"
-            @keyup.enter.native="search"
-            placeholder="学生姓名"
-          ></el-input>
+          <el-input v-model.trim="searchForm.search"
+                    @keyup.enter.native="search"
+                    placeholder="学生姓名"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="指导老师" v-model="searchForm.teacherId" clearable filterable>
-            <el-option
-              v-for="(item,index) in teacherList"
-              :label="item.realName"
-              :value="item.id"
-              :key="index"
-            ></el-option>
+          <el-select placeholder="指导老师"
+                     v-model="searchForm.teacherId"
+                     clearable
+                     filterable>
+            <el-option v-for="(item,index) in teacherList"
+                       :label="item.realName"
+                       :value="item.id"
+                       :key="index"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item prop="organId">
-          <el-select
-            class="multiple"
-            v-model.trim="searchForm.organIdList"
-            filterable
-            clearable
-            placeholder="请选择分部"
-          >
-            <el-option
-              v-for="(item,index) in organList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+          <el-select class="multiple"
+                     v-model.trim="searchForm.organIdList"
+                     filterable
+                     clearable
+                     placeholder="请选择分部">
+            <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>
@@ -43,95 +39,121 @@
           </el-select>
         </el-form-item> -->
         <el-form-item>
-          <el-select placeholder="实际安排" v-model="searchForm.actualExercisesNumIsAchieve" clearable>
-            <el-option label="符合预期" value="1"></el-option>
-            <el-option label="不符合预期" value="0"></el-option>
+          <el-select placeholder="实际安排"
+                     v-model="searchForm.actualExercisesNumIsAchieve"
+                     clearable>
+            <el-option label="符合预期"
+                       value="1"></el-option>
+            <el-option label="不符合预期"
+                       value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="提交次数" v-model="searchForm.exercisesReplyNumIsAchieve" clearable>
-            <el-option label="符合预期" value="1"></el-option>
-            <el-option label="不符合预期" value="0"></el-option>
+          <el-select placeholder="提交次数"
+                     v-model="searchForm.exercisesReplyNumIsAchieve"
+                     clearable>
+            <el-option label="符合预期"
+                       value="1"></el-option>
+            <el-option label="不符合预期"
+                       value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select placeholder="评价次数" v-model="searchForm.exercisesMessageNumIsAchieve" clearable>
-            <el-option label="符合预期" value="1"></el-option>
-            <el-option label="不符合预期" value="0"></el-option>
+          <el-select placeholder="评价次数"
+                     v-model="searchForm.exercisesMessageNumIsAchieve"
+                     clearable>
+            <el-option label="符合预期"
+                       value="1"></el-option>
+            <el-option label="不符合预期"
+                       value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-select
-            placeholder="及时评价"
-            v-model="searchForm.exercisesMessageTimelyNumIsAchieve"
-            clearable
-          >
-            <el-option label="符合预期" value="1"></el-option>
-            <el-option label="不符合预期" value="0"></el-option>
+          <el-select placeholder="及时评价"
+                     v-model="searchForm.exercisesMessageTimelyNumIsAchieve"
+                     clearable>
+            <el-option label="符合预期"
+                       value="1"></el-option>
+            <el-option label="符合预期"
+                       value="0"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="周次选择">
-          <el-date-picker
-            v-model.trim="searchForm.timer"
-            style="width:400px;"
-            type="daterange"
-            :picker-options="{
+          <el-date-picker v-model.trim="searchForm.timer"
+                          style="width:400px;"
+                          type="daterange"
+                          :picker-options="{
         firstDayOfWeek: 1
     }"
-            value-format="yyyy-MM-dd"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            @change="getWeekTime"
-          ></el-date-picker>
+                          value-format="yyyy-MM-dd"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          @change="getWeekTime"></el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="search">搜索</el-button>
-          <el-button @click="onReSet" type="primary">重置</el-button>
-          <el-button
-            @click="onExport"
-            type="primary"
-            v-permission="'export/exercisesSituations'"
-            style=" background: #14928a; border:1px solid #14928a;"
-          >导出</el-button>
+          <el-button type="danger"
+                     @click="search">搜索</el-button>
+          <el-button @click="onReSet"
+                     type="primary">重置</el-button>
+          <el-button @click="onExport"
+                     type="primary"
+                     v-permission="'export/exercisesSituations'"
+                     style=" background: #14928a; border:1px solid #14928a;">导出</el-button>
         </el-form-item>
       </el-form>
       <div class="tableWrap">
-        <el-table
-          style="width: 100%"
-          :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-          :data="tableList"
-        >
-          <el-table-column align="center" prop="studentId" label="学员编号"></el-table-column>
-          <el-table-column align="center" prop="studentName" label="学生姓名"></el-table-column>
-          <el-table-column align="center" prop="organName" label="所属分部"></el-table-column>
-          <el-table-column align="center" prop="teacherName" label="指导老师"></el-table-column>
+        <el-table style="width: 100%"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                  :data="tableList">
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="学员编号"></el-table-column>
+          <el-table-column align="center"
+                           prop="studentName"
+                           label="学生姓名"></el-table-column>
+          <el-table-column align="center"
+                           prop="organName"
+                           label="所属分部"></el-table-column>
+          <el-table-column align="center"
+                           prop="teacherName"
+                           label="指导老师"></el-table-column>
           <!-- <el-table-column align="center" label="当前有VIP课" width="100" >
             <template slot-scope="scope">
               <div>{{scope.row.existVipCourse?'是':'否'}}</div>
             </template>
           </el-table-column> -->
-          <el-table-column align="center" prop label="预期安排">
+          <el-table-column align="center"
+                           prop
+                           label="预期安排">
             <template slot-scope="scope">
               <div>{{scope.row.expectExercisesNum+'次'}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop label="实际安排">
+          <el-table-column align="center"
+                           prop
+                           label="实际安排">
             <template slot-scope="scope">
               <div>{{scope.row.actualExercisesNum+'次'}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop label="提交次数">
+          <el-table-column align="center"
+                           prop
+                           label="提交次数">
             <template slot-scope="scope">
               <div>{{scope.row.exercisesReplyNum+'次'}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop label="评价次数">
+          <el-table-column align="center"
+                           prop
+                           label="评价次数">
             <template slot-scope="scope">
               <div>{{scope.row.exercisesMessageNum+'次'}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop label="及时评价次数">
+          <el-table-column align="center"
+                           prop
+                           label="及时评价次数">
             <template slot-scope="scope">
               <div>{{scope.row.exercisesMessageTimelyNum+'次'}}</div>
             </template>
@@ -141,21 +163,21 @@
               <div v-if="scope.row.extracurricularExercises&&scope.row.extracurricularExercises.teacher">{{scope.row.extracurricularExercises.teacher.username}}</div>
             </template>
           </el-table-column>-->
-          <el-table-column align="center" label="操作">
+          <el-table-column align="center"
+                           label="操作">
             <template slot-scope="scope">
               <div v-if="scope.row.actualExercisesNum >0">
-                <el-button type="text" @click="lookDetail(scope.row)">查看</el-button>
+                <el-button type="text"
+                           @click="lookDetail(scope.row)">查看</el-button>
               </div>
             </template>
           </el-table-column>
         </el-table>
-        <pagination
-          :total="rules.total"
-          :page.sync="rules.page"
-          :limit.sync="rules.limit"
-          :page-sizes="rules.page_size"
-          @pagination="getList"
-        />
+        <pagination :total="rules.total"
+                    :page.sync="rules.page"
+                    :limit.sync="rules.limit"
+                    :page-sizes="rules.page_size"
+                    @pagination="getList" />
       </div>
     </div>
   </div>
@@ -179,7 +201,7 @@ nowTime =
   nowTime.getDate();
 export default {
   components: { pagination },
-  data() {
+  data () {
     return {
       tableList: [],
       searchForm: {
@@ -205,11 +227,11 @@ export default {
     };
   },
   //生命周期 - 创建完成(可以访问当前this实例)
-  created() {
+  created () {
     // 设置默认为当前周
   },
   //生命周期 - 挂载完成(可以访问DOM元素)
-  mounted() {
+  mounted () {
     this.searchForm.timer = [];
     this.searchForm.timer.push(this.getNowDateAndMonday(nowTime));
     this.searchForm.timer.push(this.getNowDateAndSunday(nowTime));
@@ -225,19 +247,19 @@ export default {
       }
     });
     // 获取分部  老师
-    this.init();
+    // this.init();
   },
-  activated() {
+  activated () {
     this.init();
   },
   methods: {
-    init() {
+    init () {
       if (this.$route.query.teacherId) {
         this.searchForm.teacherId = this.$route.query.teacherId * 1;
       }
       this.getList();
     },
-    getDate() {
+    getDate () {
       let obj = {
         search: this.searchForm.search || null,
         actualExercisesNumIsAchieve:
@@ -263,7 +285,7 @@ export default {
       }
       return obj;
     },
-    getList() {
+    getList () {
       let obj = this.getDate();
       if (!obj) return;
       findStudentExtracurricularExercisesSituations(obj).then(res => {
@@ -274,7 +296,7 @@ export default {
       });
     },
 
-    onReSet() {
+    onReSet () {
       this.searchForm = {
         timer: [],
         search: null,
@@ -288,7 +310,7 @@ export default {
       this.search();
     },
 
-    onExport() {
+    onExport () {
       let url = "/api-web/export/exercisesSituations";
       let obj = this.getDate();
       const options = {
@@ -350,13 +372,13 @@ export default {
               load.endLoading();
             });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    search() {
+    search () {
       this.rules.page = 1;
       this.getList();
     },
-    getNowDateAndMonday(time) {
+    getNowDateAndMonday (time) {
       let timestamp = new Date(time.replace(/-/g, "/")).getTime();
       let serverDate = new Date(time);
       if (serverDate.getDay() == 0) {
@@ -382,7 +404,7 @@ export default {
       let str = mondayY + "-" + mondayM + "-" + mondayD;
       return str;
     },
-    getNowDateAndSunday(time) {
+    getNowDateAndSunday (time) {
       let timestamp = new Date(time.replace(/-/g, "/")).getTime();
       let serverDate = new Date(time);
 
@@ -406,7 +428,7 @@ export default {
       let str = tomorrowY + "-" + tomorrowM + "-" + tomorrowD;
       return str;
     },
-    getWeekTime(val) {
+    getWeekTime (val) {
       if (val && val.length > 0) {
         let start = this.getNowDateAndMonday(val[0]);
         let end = this.getNowDateAndSunday(val[1]);
@@ -414,7 +436,7 @@ export default {
         this.searchForm.timer.splice(1, 1, end);
       }
     },
-    lookDetail(row) {
+    lookDetail (row) {
       // this.afterSchoolVisible = true;
 
       let rules = JSON.stringify(this.rules);

+ 1 - 1
src/views/afterSchoolManager/afterWorkList.vue

@@ -320,7 +320,7 @@ export default {
         this.organList = res.data;
       }
     });
-    this.init();
+    // this.init();
   },
   activated () {
     this.init();

+ 2 - 2
src/views/afterSchoolManager/index.vue

@@ -43,7 +43,7 @@ export default {
   created () { },
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted () {
-    this.init();
+    // this.init();
   },
   activated () {
     this.init()
@@ -55,7 +55,7 @@ export default {
         : this.activeIndex;
 
     },
-    handleClick (val, event) { 
+    handleClick (val, event) {
       this.activeIndex = val.name
       this.activeStatus[val.name - 1] = true
     }

+ 40 - 22
src/views/app/entryActivities.vue

@@ -1,11 +1,14 @@
 <template>
   <div class='m-container'>
-    <h2><div class="squrt"></div>时间充值活动</h2>
+    <h2>
+      <div class="squrt"></div>时间充值活动
+    </h2>
     <div class="m-core">
       <div @click="onChargeOperation('create')"
            v-permission="'/entryOperation'"
            class='newBand'>添加</div>
-      <el-form :inline="true" :model="searchForm">
+      <el-form :inline="true"
+               :model="searchForm">
         <!-- <el-form-item>
           <el-select placeholder="请选择适用范围">
             <el-option value="NEW" label="新用户"></el-option>
@@ -13,26 +16,34 @@
           </el-select>
         </el-form-item> -->
         <el-form-item>
-          <el-select v-model="searchForm.delFlag" clearable placeholder="请选择活动状态">
-            <el-option value="false" label="启用"></el-option>
-            <el-option value="true" label="停止"></el-option>
+          <el-select v-model="searchForm.delFlag"
+                     clearable
+                     placeholder="请选择活动状态">
+            <el-option value="false"
+                       label="启用"></el-option>
+            <el-option value="true"
+                       label="停止"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item >
-          <el-button type="danger" @click="getList">搜索</el-button>
+        <el-form-item>
+          <el-button type="danger"
+                     @click="getList">搜索</el-button>
         </el-form-item>
       </el-form>
       <div class="tableWrap">
         <el-table :data="dataList"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column  align="center" prop="id"
+          <el-table-column align="center"
+                           prop="id"
                            label="活动编号">
           </el-table-column>
-          <el-table-column  align="center" prop="name"
+          <el-table-column align="center"
+                           prop="name"
                            label="活动名称">
           </el-table-column>
-          <el-table-column  align="center" label="适用范围">
-                           <!-- NEW("NEW", "新手"), ALL("ALL", "全部"); -->
+          <el-table-column align="center"
+                           label="适用范围">
+            <!-- NEW("NEW", "新手"), ALL("ALL", "全部"); -->
             <template slot-scope="scope">
               {{ scope.row.suitableUser == 'NEW' ? '新用户' : ''  }}
               {{ scope.row.suitableUser == 'ALL' ? '全部' : ''  }}
@@ -41,32 +52,39 @@
           <!-- <el-table-column  align="center" prop="tag"
                            label="活动类型">
           </el-table-column> -->
-          <el-table-column  align="center" label="有效期" width="225px">
+          <el-table-column align="center"
+                           label="有效期"
+                           width="225px">
             <template slot-scope="scope">
               开始时间:{{ scope.row.startDate }} <br /> 结束时间:{{ scope.row.endDate }}
             </template>
           </el-table-column>
-          <el-table-column  align="center" label="价格/元">
+          <el-table-column align="center"
+                           label="价格/元">
             <template slot-scope="scope">
               原价:{{ scope.row.totalPrice }}元 <br /> 折扣价:{{ scope.row.discountPrice ? scope.row.discountPrice : 0 }}元
             </template>
           </el-table-column>
-          <el-table-column  align="center" label="时间/分钟">
+          <el-table-column align="center"
+                           label="时间/分钟">
             <template slot-scope="scope">
               购买:{{ scope.row.purchaseMinutes }}分钟 <br /> 赠送:{{ scope.row.giveMinutes ? scope.row.giveMinutes : 0 }}分钟
             </template>
           </el-table-column>
-          <el-table-column  align="center"
+          <el-table-column align="center"
                            label="活动状态">
             <template slot-scope="scope">
               {{ scope.row.delFlag ? '停用' : '启用' }}
             </template>
           </el-table-column>
-          <el-table-column  align="center"
+          <el-table-column align="center"
                            label="操作">
             <template slot-scope="scope">
-              <el-button type="text" v-permission="'/entryOperationLook'" @click="onChargeOperation('look', scope.row)">查看</el-button>
-              <el-button v-permission="'tenantEntryActivities/updateDelFlag'" @click="onChargeOperation('update', scope.row)"
+              <el-button type="text"
+                         v-permission="'/entryOperationLook'"
+                         @click="onChargeOperation('look', scope.row)">查看</el-button>
+              <el-button v-permission="'tenantEntryActivities/updateDelFlag'"
+                         @click="onChargeOperation('update', scope.row)"
                          type="text">{{ scope.row.delFlag ? '启用' : '停用' }}</el-button>
             </template>
           </el-table-column>
@@ -107,7 +125,7 @@ export default {
     this.getList()
   },
   mounted () {
-    this.getList()
+    // this.getList()
   },
   methods: {
     messageTips (title, res) {
@@ -131,16 +149,16 @@ export default {
             this.messageTips(tempString, res)
           })
         }).catch(() => {
-               
+
         })
-      } else if(type == 'create') {
+      } else if (type == 'create') {
         this.$router.push({
           path: '/insideSetting/entryOperation',
           query: {
             type: 'create'
           }
         })
-      } else if(type == 'look') {
+      } else if (type == 'look') {
         this.$router.push({
           path: '/insideSetting/entryOperation',
           query: {

+ 1 - 1
src/views/app/entryOperation.vue

@@ -275,7 +275,7 @@ export default {
   },
   created () { },
   mounted () {
-    this.init();
+    // this.init();
   },
   activated () {
     if (this.$route.query.type == "create") {

+ 34 - 23
src/views/app/suggestion.vue

@@ -1,34 +1,45 @@
 <template>
   <div class='m-container'>
-    <h2><div class="squrt"></div>意见反馈管理</h2>
+    <h2>
+      <div class="squrt"></div>意见反馈管理
+    </h2>
     <div class="m-core">
       <div class="tableWrap">
         <el-table :data="dataList"
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          
-          <el-table-column align="center" label="反馈时间" prop="createTime">
+
+          <el-table-column align="center"
+                           label="反馈时间"
+                           prop="createTime">
             <template slot-scope="scope">
               {{scope.row.createTime | dateForMinFormat}}
             </template>
           </el-table-column>
           <!-- <el-table-column align="center" prop="name" label="标题"> -->
           <!-- </el-table-column> -->
-          <el-table-column align="center" label="内容" prop="content">
-              <template slot-scope="scope">
-                <el-popover
-                    placement="top-start"
-                    width="300"
-                    trigger="hover"
-                    :content="scope.row.content">
-                    <span slot="reference">{{ scope.row.content }}</span>
-                </el-popover>
-                  <!-- <div :title="scope.row.content">{{ scope.row.content }}</div> -->
-              </template>
+          <el-table-column align="center"
+                           label="内容"
+                           prop="content">
+            <template slot-scope="scope">
+              <el-popover placement="top-start"
+                          width="300"
+                          trigger="hover"
+                          :content="scope.row.content">
+                <span slot="reference">{{ scope.row.content }}</span>
+              </el-popover>
+              <!-- <div :title="scope.row.content">{{ scope.row.content }}</div> -->
+            </template>
           </el-table-column>
-          <el-table-column align="center" label="用户" prop="username"></el-table-column>
-          <el-table-column align="center" prop="mobileNo" label="邮箱或手机号">
+          <el-table-column align="center"
+                           label="用户"
+                           prop="username"></el-table-column>
+          <el-table-column align="center"
+                           prop="mobileNo"
+                           label="邮箱或手机号">
           </el-table-column>
-          <el-table-column align="center" label="客户端" prop="clientType"></el-table-column>
+          <el-table-column align="center"
+                           label="客户端"
+                           prop="clientType"></el-table-column>
           <!-- <el-table-column align="center"
                            label="操作">
             <template slot-scope="scope">
@@ -69,7 +80,7 @@ export default {
     this.getList()
   },
   mounted () {
-    this.getList()
+    // this.getList()
   },
   methods: {
     getList () {
@@ -101,11 +112,11 @@ export default {
   }
 }
 /deep/.el-table .cell {
-    display: -webkit-box;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    -webkit-line-clamp: 3;
-    -webkit-box-orient: vertical;
+  display: -webkit-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
 }
 /deep/.el-date-editor.el-input {
   width: 100% !important;

+ 2 - 1
src/views/buildVip/index.vue

@@ -604,7 +604,7 @@ export default {
     //     }
     //   });
     // }
-    this.init();
+    // this.init();
   },
   mounted () {
     // 获取所有老师的接口  根据声部id获取老师
@@ -615,6 +615,7 @@ export default {
     //     this.studentList = res.data.rows
     //   }
     // })
+
   },
   activated () {
     Object.assign(this.$data, this.$options.data());

+ 1 - 1
src/views/businessManager/orderManager/businessStatementDetail.vue

@@ -235,7 +235,7 @@ export default {
     }
   },
   mounted () {
-    this.init()
+    // this.init()
   },
   activated () {
     this.init()

+ 1 - 1
src/views/businessManager/resetList/index.vue

@@ -256,7 +256,7 @@ export default {
     });
     // 获取分部
 
-    this.init();
+    // this.init();
 
 
   },

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

@@ -146,7 +146,7 @@ export default {
     this.init()
   },
   mounted () {
-    this.init()
+    // this.init()
   },
   methods: {
     init () {

+ 1 - 1
src/views/businessManager/shopManager/shopList.vue

@@ -607,7 +607,7 @@ export default {
     }
   },
   created () {
-    this.init()
+    // this.init()
   },
   activated () {
     this.init()

+ 459 - 389
src/views/businessManager/shopManager/shopOperation.vue

@@ -1,39 +1,65 @@
 <template>
   <div class="m-container">
     <h2>
-      <el-page-header @back="onCancel" :content="(pageType == 'create' ? '添加' : '修改') + '商品'"></el-page-header>
+      <el-page-header @back="onCancel"
+                      :content="(pageType == 'create' ? '添加' : '修改') + '商品'"></el-page-header>
     </h2>
 
     <div class="m-core">
-      <el-form :model="form" :rules="rules" ref="form" label-width="120px">
-        <el-form-item label="货号" prop="sn">
-          <el-input v-model.trim="form.sn" placeholder="请输入货号" style="width: 400px"></el-input>
+      <el-form :model="form"
+               :rules="rules"
+               ref="form"
+               label-width="120px">
+        <el-form-item label="货号"
+                      prop="sn">
+          <el-input v-model.trim="form.sn"
+                    placeholder="请输入货号"
+                    style="width: 400px"></el-input>
         </el-form-item>
-        <el-form-item label="品牌" prop="brand">
-          <el-input v-model.trim="form.brand" placeholder="请输入品牌" style="width: 400px"></el-input>
+        <el-form-item label="品牌"
+                      prop="brand">
+          <el-input v-model.trim="form.brand"
+                    placeholder="请输入品牌"
+                    style="width: 400px"></el-input>
         </el-form-item>
         <!-- <el-form-item label="备查货号" prop="supplyChannel" v-if="pageType == 'create'">
           <el-input v-model.trim="form.supplyChannel" placeholder="请输入备查货号" style="width: 400px"></el-input>
         </el-form-item> -->
-        <el-form-item label="商品名称" prop="name">
-          <el-input v-model.trim="form.name" placeholder="请输入商品名称" style="width: 400px"></el-input>
+        <el-form-item label="商品名称"
+                      prop="name">
+          <el-input v-model.trim="form.name"
+                    placeholder="请输入商品名称"
+                    style="width: 400px"></el-input>
         </el-form-item>
-        <el-form-item label="商品类型" prop="type">
-          <el-select v-model.trim="form.type" placeholder="请选择商品类型" style="width: 400px !important;">
+        <el-form-item label="商品类型"
+                      prop="type">
+          <el-select v-model.trim="form.type"
+                     placeholder="请选择商品类型"
+                     style="width: 400px !important;">
             <el-option v-for="(item, index) in goodsType"
                        :key="index"
                        :label="item.label"
                        :value="item.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品分类" prop="goodsCategoryId">
-          <el-select v-model.trim="form.goodsCategoryId" placeholder="请选择商品分类" style="width: 400px !important;" filterable>
-            <el-option v-for="item in categoryList" :key="item.value" :label="item.label" :value="item.value">
+        <el-form-item label="商品分类"
+                      prop="goodsCategoryId">
+          <el-select v-model.trim="form.goodsCategoryId"
+                     placeholder="请选择商品分类"
+                     style="width: 400px !important;"
+                     filterable>
+            <el-option v-for="item in categoryList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品型号" prop="specification">
-          <el-input v-model.trim="form.specification" placeholder="请输入商品型号" style="width: 400px"></el-input>
+        <el-form-item label="商品型号"
+                      prop="specification">
+          <el-input v-model.trim="form.specification"
+                    placeholder="请输入商品型号"
+                    style="width: 400px"></el-input>
         </el-form-item>
         <!-- <el-form-item label="内部库存" prop="stockCount">
           <el-input type="number" :disabled="pageType != 'create'" v-model.trim="form.stockCount" placeholder="请输入内部库存" style="width: 400px"></el-input>
@@ -41,50 +67,94 @@
         <el-form-item label="税务库存" prop="taxStockCount">
           <el-input type="number" :disabled="pageType != 'create'" v-model.trim="form.taxStockCount" placeholder="请输入税务库存" style="width: 400px"></el-input>
         </el-form-item> -->
-        <el-form-item label="库存类型" prop="stockType">
-          <el-select v-model="form.stockType" placeholder="请选择库存类型" style="width: 400px !important;">
+        <el-form-item label="库存类型"
+                      prop="stockType">
+          <el-select v-model="form.stockType"
+                     placeholder="请选择库存类型"
+                     style="width: 400px !important;">
             <el-option v-for="(item, index) in stockType"
                        :key="index"
                        :label="item.label"
                        :value="item.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="市场价" prop="marketPrice">
-          <el-input type="number" placeholder="请输入市场价" @mousewheel.native.prevent v-model.trim="form.marketPrice" style="width: 400px"></el-input>
+        <el-form-item label="市场价"
+                      prop="marketPrice">
+          <el-input type="number"
+                    placeholder="请输入市场价"
+                    @mousewheel.native.prevent
+                    v-model.trim="form.marketPrice"
+                    style="width: 400px"></el-input>
         </el-form-item>
-        <el-form-item label="零售价" prop="discountPrice">
-          <el-input type="number" placeholder="请输入零售价" @mousewheel.native.prevent v-model.trim="form.discountPrice" style="width: 400px"></el-input>
+        <el-form-item label="零售价"
+                      prop="discountPrice">
+          <el-input type="number"
+                    placeholder="请输入零售价"
+                    @mousewheel.native.prevent
+                    v-model.trim="form.discountPrice"
+                    style="width: 400px"></el-input>
         </el-form-item>
-        <el-form-item label="商品团购价" prop="groupPurchasePrice">
-          <el-input type="number" placeholder="请输入商品团购价" @mousewheel.native.prevent v-model.trim="form.groupPurchasePrice" style="width: 400px"></el-input>
+        <el-form-item label="商品团购价"
+                      prop="groupPurchasePrice">
+          <el-input type="number"
+                    placeholder="请输入商品团购价"
+                    @mousewheel.native.prevent
+                    v-model.trim="form.groupPurchasePrice"
+                    style="width: 400px"></el-input>
         </el-form-item>
-        <el-form-item label="是否APP展示" prop="clientShow">
-          <el-select v-model="form.clientShow" placeholder="请选择是否APP展示" style="width: 400px !important;">
-            <el-option label="是" :value="1"></el-option>
-            <el-option label="否" :value="0"></el-option>
+        <el-form-item label="是否APP展示"
+                      prop="clientShow">
+          <el-select v-model="form.clientShow"
+                     placeholder="请选择是否APP展示"
+                     style="width: 400px !important;">
+            <el-option label="是"
+                       :value="1"></el-option>
+            <el-option label="否"
+                       :value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="是否库存预警" prop="stockWarning">
-          <el-select v-model="form.stockWarning" placeholder="请选择库存预警" style="width: 400px !important;">
-            <el-option label="是" :value="1"></el-option>
-            <el-option label="否" :value="0"></el-option>
+        <el-form-item label="是否库存预警"
+                      prop="stockWarning">
+          <el-select v-model="form.stockWarning"
+                     placeholder="请选择库存预警"
+                     style="width: 400px !important;">
+            <el-option label="是"
+                       :value="1"></el-option>
+            <el-option label="否"
+                       :value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品图片" prop="image">
-          <el-upload class="avatar-uploader" action="/api-web/uploadFile" accept=".jpg, .jpeg, .png" :headers="headers"
-            :show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
-            <img v-if="form.image" :src="form.image" class="avatar">
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        <el-form-item label="商品图片"
+                      prop="image">
+          <el-upload class="avatar-uploader"
+                     action="/api-web/uploadFile"
+                     accept=".jpg, .jpeg, .png"
+                     :headers="headers"
+                     :show-file-list="false"
+                     :on-success="handleAvatarSuccess"
+                     :before-upload="beforeAvatarUpload">
+            <img v-if="form.image"
+                 :src="form.image"
+                 class="avatar">
+            <i v-else
+               class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>
-        <el-form-item label="商品描述" prop="brief">
-          <el-input type="textarea" v-model.trim="form.brief" style="width: 400px"></el-input>
+        <el-form-item label="商品描述"
+                      prop="brief">
+          <el-input type="textarea"
+                    v-model.trim="form.brief"
+                    style="width: 400px"></el-input>
         </el-form-item>
-        <el-form-item label="商品详情" prop="desc">
-		      <el-input type="textarea" v-model.trim="form.desc" style="width: 400px"></el-input>
+        <el-form-item label="商品详情"
+                      prop="desc">
+          <el-input type="textarea"
+                    v-model.trim="form.desc"
+                    style="width: 400px"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="onSubmit('form')" type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
+          <el-button @click="onSubmit('form')"
+                     type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
           <el-button @click="onReSet('form')">重置</el-button>
         </el-form-item>
       </el-form>
@@ -92,48 +162,244 @@
   </div>
 </template>
 <script>
-  import {
-    categoryListTree,
-    goodsAdd,
-    goodsUpdate,
-    goodsSingleQuery
-  } from '@/api/businessManager'
-  import {
-    getToken
-  } from '@/utils/auth'
-  import { goodsType, stockType } from '@/utils/searchArray'
-  let validPrice = (rule, value, callback) => {
-    if (value == '' && typeof value == 'string' || value == null) {
-      callback(new Error('请输入金额'))
-    } else if (value < 0) {
-      callback(new Error('输入金额必须大于或等于0'))
-    } else if (value >= 100000) {
-      callback(new Error('输入金额必须小于100000'))
-    } else {
-      callback()
-    }
+import {
+  categoryListTree,
+  goodsAdd,
+  goodsUpdate,
+  goodsSingleQuery
+} from '@/api/businessManager'
+import {
+  getToken
+} from '@/utils/auth'
+import { goodsType, stockType } from '@/utils/searchArray'
+let validPrice = (rule, value, callback) => {
+  if (value == '' && typeof value == 'string' || value == null) {
+    callback(new Error('请输入金额'))
+  } else if (value < 0) {
+    callback(new Error('输入金额必须大于或等于0'))
+  } else if (value >= 100000) {
+    callback(new Error('输入金额必须小于100000'))
+  } else {
+    callback()
   }
-  let validStock = (rule, value, callback) => {
-    if(value == '' && typeof value == 'string' || value == null) {
-      callback(new Error('请输入库存'))
-    } else if(value < 0) {
-      callback(new Error('库存数量必须大于或等于0'))
-    } else {
-      callback()
-    }
+}
+let validStock = (rule, value, callback) => {
+  if (value == '' && typeof value == 'string' || value == null) {
+    callback(new Error('请输入库存'))
+  } else if (value < 0) {
+    callback(new Error('库存数量必须大于或等于0'))
+  } else {
+    callback()
   }
-  export default {
-    name: 'shopOperation',
-    data() {
-      return {
-        goodsType: goodsType,
-        stockType: stockType,
-        categoryList: [],
-        pageType: null,
-        headers: {
-          Authorization: getToken()
+}
+export default {
+  name: 'shopOperation',
+  data () {
+    return {
+      goodsType: goodsType,
+      stockType: stockType,
+      categoryList: [],
+      pageType: null,
+      headers: {
+        Authorization: getToken()
+      },
+      form: {
+        sn: null,
+        brand: null,
+        supplyChannel: null,
+        name: null,
+        type: null,
+        goodsCategoryId: null,
+        specification: null,
+        stockCount: null,
+        taxStockCount: null,
+        stockType: null,
+        marketPrice: null,
+        discountPrice: null,
+        groupPurchasePrice: null,
+        clientShow: null,
+        stockWarning: null,
+        image: null,
+        brief: null,
+        desc: null
+      },
+      rules: {
+        sn: [{ required: true, message: '请输入商品货号', trigger: 'blur' }],
+        brand: [{
+          required: true,
+          message: '请输入品牌',
+          trigger: 'blur'
+        },
+        {
+          min: 2,
+          max: 30,
+          message: '长度在 2 到 30 个字符',
+          trigger: 'blur'
+        }
+        ],
+        supplyChannel: [
+          { required: true, message: '请输入备查货号', trigger: 'blur' }
+        ],
+        name: [{
+          required: true,
+          message: '请输入商品名称',
+          trigger: 'blur'
         },
-        form: {
+        {
+          min: 2,
+          max: 30,
+          message: '长度在 2 到 30 个字符',
+          trigger: 'blur'
+        }
+        ],
+        type: [{
+          required: true,
+          message: '请选择商品分类',
+          trigger: 'change'
+        }],
+        goodsCategoryId: [{
+          required: true,
+          message: '请选择商品类型',
+          trigger: 'change'
+        }],
+        specification: [{
+          required: true,
+          message: '请输入商品型号',
+          trigger: 'blur'
+        },
+        {
+          min: 2,
+          max: 30,
+          message: '长度在 2 到 30 个字符',
+          trigger: 'blur'
+        }
+        ],
+        stockCount: [
+          { required: true, validator: validStock, trigger: 'blur' }
+        ],
+        taxStockCount: [
+          { required: true, validator: validStock, trigger: 'blur' }
+        ],
+        stockType: [
+          { required: true, message: '请选择库存类型', trigger: 'change' }
+        ],
+        marketPrice: [{
+          required: true,
+          validator: validPrice,
+          trigger: 'blur'
+        }],
+        discountPrice: [{
+          required: true,
+          validator: validPrice,
+          trigger: 'blur'
+        }],
+        groupPurchasePrice: [{
+          required: true,
+          validator: validPrice,
+          trigger: 'blur'
+        }],
+        clientShow: [
+          { required: true, message: '请选择是否APP展示', trigger: 'change' }
+        ],
+        stockWarning: [
+          { required: true, message: '请选择是否库存预警', trigger: 'change' }
+        ],
+        image: [{
+          required: true,
+          message: '请选择图片',
+          trigger: 'blur'
+        }],
+        brief: [{
+          required: true,
+          message: '请输入商品描述',
+          trigger: 'blur'
+        }],
+        desc: [{
+          required: true,
+          message: '请输入商品详情',
+          trigger: 'blur'
+        }]
+      },
+      Fsearch: null,
+      Frules: null
+    }
+  },
+  created () {
+    // this.init()
+  },
+  activated () {
+    this.init()
+  },
+  mounted () {
+
+  },
+  methods: {
+    init () {
+      let query = this.$route.query
+      if (query.paramInfo) {
+        let paramInfo = JSON.parse(query.paramInfo)
+        this.pageType = paramInfo.type
+        this.id = paramInfo.id
+      }
+      if (query.search) {
+        this.Fsearch = query.search;
+      }
+      if (query.pageInfo) {
+        this.Frules = query.pageInfo
+      }
+      this.getList()
+      this.getCatagory()
+    },
+    onSubmit (formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          if (this.pageType == 'create') {
+            if (this.form.id) { // 判断有没有Id,如果有则删除
+              delete this.form.id
+            }
+            this.form.status = 'NO' // 默认上架
+            goodsAdd(this.form).then(res => {
+              this.messageTips('添加', res)
+            })
+          } else if (this.pageType == 'update') {
+            goodsUpdate(this.form).then(res => {
+              this.messageTips('修改', res)
+            })
+          }
+        } else {
+          return false
+        }
+      })
+    },
+    messageTips (title, res) {
+      if (res.code == 200) {
+        this.$message.success(title + '成功')
+        this.$router.push({
+          path: '/shopManager/shopManager',
+          query: {
+            pageInfo: this.Frules,
+            searchForm: this.Fsearch
+          }
+        })
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    onCancel () {
+      this.$router.push({
+        path: '/shopManager/shopManager',
+        query: {
+          pageInfo: this.Frules,
+          searchForm: this.Fsearch
+        }
+      })
+    },
+    onReSet (formName) {
+      this.$refs[formName].resetFields()
+    },
+    getList () {
+      if (this.pageType == 'create') {
+        this.form = {
           sn: null,
           brand: null,
           supplyChannel: null,
@@ -152,338 +418,142 @@
           image: null,
           brief: null,
           desc: null
-        },
-        rules: {
-          sn: [{ required: true, message: '请输入商品货号', trigger: 'blur' }],
-          brand: [{
-              required: true,
-              message: '请输入品牌',
-              trigger: 'blur'
-            },
-            {
-              min: 2,
-              max: 30,
-              message: '长度在 2 到 30 个字符',
-              trigger: 'blur'
-            }
-          ],
-          supplyChannel: [
-            {required: true, message:'请输入备查货号', trigger: 'blur'}
-          ],
-          name: [{
-              required: true,
-              message: '请输入商品名称',
-              trigger: 'blur'
-            },
-            {
-              min: 2,
-              max: 30,
-              message: '长度在 2 到 30 个字符',
-              trigger: 'blur'
-            }
-          ],
-          type: [{
-            required: true,
-            message: '请选择商品分类',
-            trigger: 'change'
-          }],
-          goodsCategoryId: [{
-            required: true,
-            message: '请选择商品类型',
-            trigger: 'change'
-          }],
-          specification: [{
-              required: true,
-              message: '请输入商品型号',
-              trigger: 'blur'
-            },
-            {
-              min: 2,
-              max: 30,
-              message: '长度在 2 到 30 个字符',
-              trigger: 'blur'
-            }
-          ],
-          stockCount: [
-            {required: true, validator: validStock, trigger: 'blur'}
-          ],
-          taxStockCount: [
-            {required: true, validator: validStock, trigger: 'blur'}
-          ],
-          stockType: [
-            {required: true, message: '请选择库存类型', trigger: 'change' }
-          ],
-          marketPrice: [{
-            required: true,
-            validator: validPrice,
-            trigger: 'blur'
-          }],
-          discountPrice: [{
-            required: true,
-            validator: validPrice,
-            trigger: 'blur'
-          }],
-          groupPurchasePrice: [{
-            required: true,
-            validator: validPrice,
-            trigger: 'blur'
-          }],
-          clientShow: [
-            {required: true, message: '请选择是否APP展示', trigger: 'change' }
-          ],
-          stockWarning: [
-            {required: true, message: '请选择是否库存预警', trigger: 'change' }
-          ],
-          image: [{
-            required: true,
-            message: '请选择图片',
-            trigger: 'blur'
-          }],
-          brief: [{
-            required: true,
-            message: '请输入商品描述',
-            trigger: 'blur'
-          }],
-          desc: [{
-            required: true,
-            message: '请输入商品详情',
-            trigger: 'blur'
-          }]
-        },
-        Fsearch: null,
-        Frules: null
-      }
-    },
-    created() {
-      this.init()
-    },
-    activated() {
-      this.init()
-    },
-    mounted() {
-
-    },
-    methods: {
-      init() {
-        let query = this.$route.query
-        if (query.paramInfo) {
-          let paramInfo = JSON.parse(query.paramInfo)
-          this.pageType = paramInfo.type
-          this.id = paramInfo.id
         }
-        if (query.search) {
-          this.Fsearch = query.search;
+        if (this.$refs['form']) {
+          this.$refs['form'].resetFields();
         }
-        if (query.pageInfo) {
-          this.Frules = query.pageInfo
-        }
-        this.getList()
-        this.getCatagory()
-      },
-      onSubmit(formName) {
-        this.$refs[formName].validate((valid) => {
-          if (valid) {
-            if (this.pageType == 'create') {
-              if (this.form.id) { // 判断有没有Id,如果有则删除
-                delete this.form.id
-              }
-              this.form.status = 'NO' // 默认上架
-              goodsAdd(this.form).then(res => {
-                this.messageTips('添加', res)
-              })
-            } else if (this.pageType == 'update') {
-              goodsUpdate(this.form).then(res => {
-                this.messageTips('修改', res)
-              })
-            }
-          } else {
-            return false
-          }
-        })
-      },
-      messageTips(title, res) {
-        if (res.code == 200) {
-          this.$message.success(title + '成功')
-          this.$router.push({
-            path: '/shopManager/shopManager',
-            query: {
-              pageInfo: this.Frules,
-              searchForm: this.Fsearch
+
+      } else {
+        goodsSingleQuery(this.id).then(res => {
+          if (res.code == 200) {
+            let result = res.data
+            this.form = {
+              id: result.id,
+              sn: result.sn,
+              brand: result.brand,
+              supplyChannel: result.supplyChannel,
+              name: result.name,
+              type: result.type,
+              goodsCategoryId: result.goodsCategoryId,
+              specification: result.specification,
+              stockCount: result.stockCount,
+              taxStockCount: result.taxStockCount,
+              stockType: result.stockType,
+              marketPrice: result.marketPrice,
+              discountPrice: result.discountPrice,
+              groupPurchasePrice: result.groupPurchasePrice,
+              clientShow: result.clientShow,
+              stockWarning: result.stockWarning,
+              image: result.image,
+              brief: result.brief,
+              desc: result.desc
             }
-          })
-        } else {
-          this.$message.error(res.msg)
-        }
-      },
-      onCancel() {
-        this.$router.push({
-          path: '/shopManager/shopManager',
-          query: {
-            pageInfo: this.Frules,
-            searchForm: this.Fsearch
           }
         })
-      },
-      onReSet(formName) {
-        this.$refs[formName].resetFields()
-      },
-      getList() {
-        if (this.pageType == 'create') {
-          this.form = {
-            sn: null,
-            brand: null,
-            supplyChannel: null,
-            name: null,
-            type: null,
-            goodsCategoryId: null,
-            specification: null,
-            stockCount: null,
-            taxStockCount: null,
-            stockType: null,
-            marketPrice: null,
-            discountPrice: null,
-            groupPurchasePrice: null,
-            clientShow: null,
-            stockWarning: null,
-            image: null,
-            brief: null,
-            desc: null
-          }
-          if (this.$refs['form']) {
-            this.$refs['form'].resetFields();
-          }
+      }
 
-        } else {
-          goodsSingleQuery(this.id).then(res => {
-            if (res.code == 200) {
-              let result = res.data
-              this.form = {
-                id: result.id,
-                sn: result.sn,
-                brand: result.brand,
-                supplyChannel: result.supplyChannel,
-                name: result.name,
-                type: result.type,
-                goodsCategoryId: result.goodsCategoryId,
-                specification: result.specification,
-                stockCount: result.stockCount,
-                taxStockCount: result.taxStockCount,
-                stockType: result.stockType,
-                marketPrice: result.marketPrice,
-                discountPrice: result.discountPrice,
-                groupPurchasePrice: result.groupPurchasePrice,
-                clientShow: result.clientShow,
-                stockWarning: result.stockWarning,
-                image: result.image,
-                brief: result.brief,
-                desc: result.desc
-              }
-            }
+    },
+    getCatagory () {
+      categoryListTree({
+        delFlag: 0,
+        rows: 9999
+      }).then(res => {
+        let result = res.data
+        if (res.code == 200) {
+          let tempArray = []
+          result.rows.forEach(row => {
+            tempArray.push({
+              label: row.name,
+              value: row.id
+            })
           })
+          this.categoryList = tempArray
         }
+      })
+    },
+    handleAvatarSuccess (res, file) {
+      this.form.image = res.data.url
 
-      },
-      getCatagory() {
-        categoryListTree({
-          delFlag: 0,
-          rows: 9999
-        }).then(res => {
-          let result = res.data
-          if (res.code == 200) {
-            let tempArray = []
-            result.rows.forEach(row => {
-              tempArray.push({
-                label: row.name,
-                value: row.id
-              })
-            })
-            this.categoryList = tempArray
-          }
-        })
-      },
-      handleAvatarSuccess(res, file) {
-        this.form.image = res.data.url
-
-      },
-      beforeAvatarUpload(file) {
-        const imageType = {
-          'image/png': true,
-          'image/jpeg': true
-        }
-        const isImage = imageType[file.type]
-        const isLt2M = file.size / 1024 / 1024 < 2
+    },
+    beforeAvatarUpload (file) {
+      const imageType = {
+        'image/png': true,
+        'image/jpeg': true
+      }
+      const isImage = imageType[file.type]
+      const isLt2M = file.size / 1024 / 1024 < 2
 
-        if (!isImage) {
-          this.$message.error('只能上传图片格式!')
-        }
-        if (!isLt2M) {
-          this.$message.error('上传头像图片大小不能超过 2MB!')
-        }
-        return isImage && isLt2M;
-      },
-    }
+      if (!isImage) {
+        this.$message.error('只能上传图片格式!')
+      }
+      if (!isLt2M) {
+        this.$message.error('上传头像图片大小不能超过 2MB!')
+      }
+      return isImage && isLt2M;
+    },
   }
+}
 </script>
 <style lang="scss" scoped>
-  .el-button--primary {
+.el-button--primary {
+  background: #14928a;
+  border-color: #14928a;
+  color: #fff;
+
+  &:hover,
+  &:active,
+  &:focus {
     background: #14928a;
     border-color: #14928a;
     color: #fff;
-
-    &:hover,
-    &:active,
-    &:focus {
-      background: #14928a;
-      border-color: #14928a;
-      color: #fff;
-    }
   }
+}
 
-  .el-row {
-    margin-top: 40px;
-  }
+.el-row {
+  margin-top: 40px;
+}
 
-  .el-col {
-    display: flex;
-    align-items: center;
-    margin-bottom: 20px;
-    justify-content: flex-end;
-    margin-right: 50%;
-  }
+.el-col {
+  display: flex;
+  align-items: center;
+  margin-bottom: 20px;
+  justify-content: flex-end;
+  margin-right: 50%;
+}
 
-  .el-input-group {
-    width: 200px;
-    margin: 0 20px;
-  }
+.el-input-group {
+  width: 200px;
+  margin: 0 20px;
+}
 
-  /deep/.el-tree-node__content {
-    height: 40px !important;
-  }
+/deep/.el-tree-node__content {
+  height: 40px !important;
+}
 
-  /deep/.avatar-uploader .el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
+/deep/.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
 
-  .avatar-uploader .el-upload:hover {
-    border-color: #409eff;
-  }
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
 
-  .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 120px;
-    height: 120px;
-    line-height: 120px;
-    text-align: center;
-  }
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 120px;
+  height: 120px;
+  line-height: 120px;
+  text-align: center;
+}
 
-  .avatar {
-    width: 120px;
-    height: 120px;
-    display: block;
-  }
+.avatar {
+  width: 120px;
+  height: 120px;
+  display: block;
+}
 </style>

+ 1 - 1
src/views/categroyManager/insideSetting/adminManager.vue

@@ -56,7 +56,7 @@ export default {
     }
   },
   created () {
-    this.init()
+    // this.init()
   },
   activated () {
     this.init()

+ 3 - 3
src/views/categroyManager/insideSetting/adminOperation.vue

@@ -76,8 +76,8 @@ export default {
     }
   },
   mounted () {
-      this.onReSet()
-    this.init()
+    //   this.onReSet()
+    // this.init()
   },
   activated () {
     this.onReSet()
@@ -131,7 +131,7 @@ export default {
       let tempData = []
       if (silderList.code == 200) {
         tempData = this.setTableData(silderList.data)
-        
+
         this.data = tempData
       }
       // console.log(this.pageType)

+ 4 - 3
src/views/categroyManager/insideSetting/branchActive.vue

@@ -142,12 +142,13 @@ export default {
       this.$route.query.rules instanceof Object ? this.pageInfo = this.$route.query.rules : this.pageInfo = JSON.parse(this.$route.query.rules);
     }
   },
-  activated() {
+  activated () {
     this.getList()
+    this.__init()
   },
   mounted () {
-    this.getList() // 获取列表数据
-    this.__init()
+    // this.getList() // 获取列表数据
+
   },
   methods: {
     async __init () {

+ 5 - 5
src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -189,11 +189,11 @@ export default {
     }
   },
   mounted () {
-    this.pageType = this.$route.query.type
-    this.id = this.$route.query.id
-    this.pageInfo = this.$route.query.pageInfo
-    this.searchForm = this.$route.query.searchForm
-    this.__init()
+    // this.pageType = this.$route.query.type
+    // this.id = this.$route.query.id
+    // this.pageInfo = this.$route.query.pageInfo
+    // this.searchForm = this.$route.query.searchForm
+    // this.__init()
   },
   activated () {
     this.pageType = this.$route.query.type

+ 2 - 2
src/views/categroyManager/insideSetting/staffManager.vue

@@ -364,8 +364,8 @@ export default {
     }
   },
   mounted () {
-    this.getList()
-    this.getRoleList()
+    // this.getList()
+    // this.getRoleList()
   },
   activated () {
     this.getList()

+ 1 - 1
src/views/categroyManager/vipActiveList.vue

@@ -455,7 +455,7 @@ export default {
     };
   },
   created () {
-    this.init();
+    // this.init();
   },
   activated () {
     this.init();

+ 63 - 40
src/views/contentManager/components/activity.vue

@@ -1,61 +1,84 @@
 <template>
   <div>
     <!-- 搜索标题 -->
-    <div @click="openTeaching('create')" class="newBand">新建</div>
+    <div @click="openTeaching('create')"
+         class="newBand">新建</div>
     <!-- 搜索标题 -->
-    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item prop="hasPracticeCourse">
-        <el-select
-          class="multiple"
-          v-model.trim="searchForm.tenantId"
-          placeholder="请选择对内或对外">
-          <el-option label="对内" value="1"></el-option>
-          <el-option label="对外" value="2"></el-option>
+        <el-select class="multiple"
+                   v-model.trim="searchForm.tenantId"
+                   placeholder="请选择对内或对外">
+          <el-option label="对内"
+                     value="1"></el-option>
+          <el-option label="对外"
+                     value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList" type="danger">搜索</el-button>
+        <el-button @click="getList"
+                   type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column align="center" label="轮播图">
+      <el-table :data="tableList"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align="center"
+                         label="轮播图">
           <template slot-scope="scope">
-            <img class="bannerImg" :src="scope.row.coverImage" alt />
+            <img class="bannerImg"
+                 :src="scope.row.coverImage"
+                 alt />
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="title" label="标题"></el-table-column>
-        <el-table-column align="center" label="跳转连接">
+        <el-table-column align="center"
+                         prop="title"
+                         label="标题"></el-table-column>
+        <el-table-column align="center"
+                         label="跳转连接">
           <template slot-scope="scope">{{ scope.row.linkUrl + '/' + scope.row.id }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="remark" label="是否使用">
+        <el-table-column align="center"
+                         prop="remark"
+                         label="是否使用">
           <template slot-scope="scope">{{ scope.row.status == 1 ? '是' : '否' }}</template>
         </el-table-column>
-        
-        <el-table-column align="center" prop="order" label="排序"></el-table-column>
-        <el-table-column align="center" prop="remark" label="适用范围">
+
+        <el-table-column align="center"
+                         prop="order"
+                         label="排序"></el-table-column>
+        <el-table-column align="center"
+                         prop="remark"
+                         label="适用范围">
           <template slot-scope="scope">
             <p v-if=" scope.row.tenantId == 1">对内</p>
-            <p v-if=" scope.row.tenantId == 2">对外</p> 
+            <p v-if=" scope.row.tenantId == 2">对外</p>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="操作">
+        <el-table-column align="center"
+                         label="操作">
           <template slot-scope="scope">
-            <el-button @click="openTeaching('update', scope.row)" type="text">修改</el-button>
-            <el-button v-if="scope.row.status == 1" @click="onStop(scope.row, 0)" type="text">停用</el-button>
-            <el-button v-else @click="onStop(scope.row, 1)" type="text">启用</el-button>
-            <el-button @click="onDel(scope.row)" type="text">删除</el-button>
+            <el-button @click="openTeaching('update', scope.row)"
+                       type="text">修改</el-button>
+            <el-button v-if="scope.row.status == 1"
+                       @click="onStop(scope.row, 0)"
+                       type="text">停用</el-button>
+            <el-button v-else
+                       @click="onStop(scope.row, 1)"
+                       type="text">启用</el-button>
+            <el-button @click="onDel(scope.row)"
+                       type="text">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        :total="pageInfo.total"
-        :page.sync="pageInfo.page"
-        :limit.sync="pageInfo.limit"
-        :page-sizes="pageInfo.page_size"
-        @pagination="getList"
-      />
+      <pagination :total="pageInfo.total"
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
   </div>
 </template>
@@ -68,7 +91,7 @@ export default {
   components: {
     pagination
   },
-  data() {
+  data () {
     return {
       searchForm: {
         tenantId: '1'
@@ -85,14 +108,14 @@ export default {
       }
     };
   },
-  activated() {
+  activated () {
     this.getList();
   },
-  mounted() {
-    this.getList();
+  mounted () {
+    // this.getList();
   },
   methods: {
-    getList() {
+    getList () {
       let params = {
         clientName: 'manage',
         tenantId: this.searchForm.tenantId,
@@ -107,7 +130,7 @@ export default {
         }
       });
     },
-    openTeaching(type, rows) {
+    openTeaching (type, rows) {
       let params = {};
       if (type == "update") {
         params.id = rows.id;
@@ -119,7 +142,7 @@ export default {
         query: params
       });
     },
-    onDel(row) {
+    onDel (row) {
       // 删除
       this.$confirm("确定是否删除?", "提示", {
         confirmButtonText: "确定",
@@ -136,9 +159,9 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    onStop(row, status) {
+    onStop (row, status) {
       // 停止
       // newsUpdate
       let tempStr = ["停用", "启用"];

+ 64 - 41
src/views/contentManager/components/advert.vue

@@ -1,67 +1,90 @@
 <template>
   <div>
     <!-- 搜索标题 -->
-    <div @click="openTeaching('create')" class="newBand">新建</div>
+    <div @click="openTeaching('create')"
+         class="newBand">新建</div>
     <!-- 搜索标题 -->
-    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item prop="hasPracticeCourse">
-        <el-select
-          class="multiple"
-          v-model.trim="searchForm.tenantId"
-          placeholder="请选择对内或对外">
-          <el-option label="对内" value="1"></el-option>
-          <el-option label="对外" value="2"></el-option>
+        <el-select class="multiple"
+                   v-model.trim="searchForm.tenantId"
+                   placeholder="请选择对内或对外">
+          <el-option label="对内"
+                     value="1"></el-option>
+          <el-option label="对外"
+                     value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList" type="danger">搜索</el-button>
+        <el-button @click="getList"
+                   type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column align="center" label="广告图">
+      <el-table :data="tableList"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align="center"
+                         label="广告图">
           <template slot-scope="scope">
-            <img class="bannerImg" :src="scope.row.videoCoverImage || scope.row.coverImage" alt />
+            <img class="bannerImg"
+                 :src="scope.row.videoCoverImage || scope.row.coverImage"
+                 alt />
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="title" label="标题"></el-table-column>
-        <el-table-column align="center" label="跳转连接">
+        <el-table-column align="center"
+                         prop="title"
+                         label="标题"></el-table-column>
+        <el-table-column align="center"
+                         label="跳转连接">
           <template slot-scope="scope">{{ scope.row.linkUrl }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="remark" label="是否使用">
+        <el-table-column align="center"
+                         prop="remark"
+                         label="是否使用">
           <template slot-scope="scope">{{ scope.row.status == 1 ? '是' : '否' }}</template>
         </el-table-column>
         <el-table-column align='center'
                          prop="memo"
                          label="版本号">
-            <template slot-scope="scope">
-              {{ scope.row.memo ? scope.row.memo : '--' }}
-            </template>
+          <template slot-scope="scope">
+            {{ scope.row.memo ? scope.row.memo : '--' }}
+          </template>
         </el-table-column>
-        <el-table-column align="center" prop="order" label="排序"></el-table-column>
-        <el-table-column align="center" prop="remark" label="适用范围">
+        <el-table-column align="center"
+                         prop="order"
+                         label="排序"></el-table-column>
+        <el-table-column align="center"
+                         prop="remark"
+                         label="适用范围">
           <template slot-scope="scope">
             <p v-if=" scope.row.tenantId == 1">对内</p>
             <p v-if=" scope.row.tenantId == 2">对外</p>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="操作">
+        <el-table-column align="center"
+                         label="操作">
           <template slot-scope="scope">
-            <el-button @click="openTeaching('update', scope.row)" type="text">修改</el-button>
-            <el-button v-if="scope.row.status == 1" @click="onStop(scope.row, 0)" type="text">停用</el-button>
-            <el-button v-else @click="onStop(scope.row, 1)" type="text">启用</el-button>
-            <el-button @click="onDel(scope.row)" type="text">删除</el-button>
+            <el-button @click="openTeaching('update', scope.row)"
+                       type="text">修改</el-button>
+            <el-button v-if="scope.row.status == 1"
+                       @click="onStop(scope.row, 0)"
+                       type="text">停用</el-button>
+            <el-button v-else
+                       @click="onStop(scope.row, 1)"
+                       type="text">启用</el-button>
+            <el-button @click="onDel(scope.row)"
+                       type="text">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        :total="pageInfo.total"
-        :page.sync="pageInfo.page"
-        :limit.sync="pageInfo.limit"
-        :page-sizes="pageInfo.page_size"
-        @pagination="getList"
-      />
+      <pagination :total="pageInfo.total"
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
   </div>
 </template>
@@ -74,7 +97,7 @@ export default {
   components: {
     pagination
   },
-  data() {
+  data () {
     return {
       searchForm: {
         tenantId: '1'
@@ -91,14 +114,14 @@ export default {
       }
     };
   },
-  activated() {
+  activated () {
     this.getList();
   },
-  mounted() {
-    this.getList();
+  mounted () {
+    // this.getList();
   },
   methods: {
-    getList() {
+    getList () {
       let params = {
         clientName: 'manage',
         tenantId: this.searchForm.tenantId,
@@ -113,7 +136,7 @@ export default {
         }
       });
     },
-    openTeaching(type, rows) {
+    openTeaching (type, rows) {
       let params = {};
       if (type == "update") {
         params.id = rows.id;
@@ -125,7 +148,7 @@ export default {
         query: params
       });
     },
-    onDel(row) {
+    onDel (row) {
       // 删除
       this.$confirm("确定是否删除?", "提示", {
         confirmButtonText: "确定",
@@ -142,9 +165,9 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    onStop(row, status) {
+    onStop (row, status) {
       // 停止
       // newsUpdate
       let tempStr = ["停用", "启用"];

+ 19 - 13
src/views/contentManager/components/appPage.vue

@@ -4,18 +4,22 @@
     <div @click="openTeaching('create')"
          class='newBand'>新建</div>
     <!-- 搜索标题 -->
-    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item prop="hasPracticeCourse">
-        <el-select
-          class="multiple"
-          v-model.trim="searchForm.tenantId"
-          placeholder="请选择对内或对外">
-          <el-option label="对内" value="1"></el-option>
-          <el-option label="对外" value="2"></el-option>
+        <el-select class="multiple"
+                   v-model.trim="searchForm.tenantId"
+                   placeholder="请选择对内或对外">
+          <el-option label="对内"
+                     value="1"></el-option>
+          <el-option label="对外"
+                     value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList" type="danger">搜索</el-button>
+        <el-button @click="getList"
+                   type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
@@ -50,15 +54,17 @@
         <el-table-column align='center'
                          prop="memo"
                          label="版本号">
-            <template slot-scope="scope">
-              {{ scope.row.memo ? scope.row.memo : '--' }}
-            </template>
+          <template slot-scope="scope">
+            {{ scope.row.memo ? scope.row.memo : '--' }}
+          </template>
         </el-table-column>
         <el-table-column align='center'
                          prop="order"
                          label="排序">
         </el-table-column>
-             <el-table-column align="center" prop="remark" label="适用范围">
+        <el-table-column align="center"
+                         prop="remark"
+                         label="适用范围">
           <template slot-scope="scope">
             <p v-if=" scope.row.tenantId == 1">对内</p>
             <p v-if=" scope.row.tenantId == 2">对外</p>
@@ -118,7 +124,7 @@ export default {
     this.getList()
   },
   mounted () {
-    this.getList()
+    // this.getList()
   },
   methods: {
     getList () {

+ 31 - 24
src/views/contentManager/components/banner.vue

@@ -4,18 +4,22 @@
     <div @click="openTeaching('create')"
          class='newBand'>新建</div>
     <!-- 搜索标题 -->
-    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item prop="hasPracticeCourse">
-        <el-select
-          class="multiple"
-          v-model.trim="searchForm.tenantId"
-          placeholder="请选择对内或对外">
-          <el-option label="对内" value="1"></el-option>
-          <el-option label="对外" value="2"></el-option>
+        <el-select class="multiple"
+                   v-model.trim="searchForm.tenantId"
+                   placeholder="请选择对内或对外">
+          <el-option label="对内"
+                     value="1"></el-option>
+          <el-option label="对外"
+                     value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList" type="danger">搜索</el-button>
+        <el-button @click="getList"
+                   type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
@@ -50,15 +54,17 @@
         <el-table-column align='center'
                          prop="memo"
                          label="版本号">
-            <template slot-scope="scope">
-              {{ scope.row.memo ? scope.row.memo : '--' }}
-            </template>
+          <template slot-scope="scope">
+            {{ scope.row.memo ? scope.row.memo : '--' }}
+          </template>
         </el-table-column>
         <el-table-column align='center'
                          prop="order"
                          label="排序">
         </el-table-column>
-             <el-table-column align="center" prop="remark" label="适用范围">
+        <el-table-column align="center"
+                         prop="remark"
+                         label="适用范围">
           <template slot-scope="scope">
             <p v-if=" scope.row.tenantId == 1">对内</p>
             <p v-if=" scope.row.tenantId == 2">对外</p>
@@ -68,19 +74,20 @@
                          label="操作">
           <template slot-scope="scope">
             <el-button @click="openTeaching('update', scope.row)"
-                      v-if="!scope.row.memo || permission('banner/copyrightbtn')"
+                       v-if="!scope.row.memo || permission('banner/copyrightbtn')"
                        type="text">修改</el-button>
-                       <div style="display: inline-block" v-if="!scope.row.memo || permission('banner/copyrightbtn')">
-                      <el-button v-if="scope.row.status == 1"
-                       @click="onStop(scope.row, 0)"
-                       type="text">停用</el-button>
-                        <el-button v-else
-                       @click="onStop(scope.row, 1)"
-                       type="text">启用</el-button>
-                       </div>
-            
+            <div style="display: inline-block"
+                 v-if="!scope.row.memo || permission('banner/copyrightbtn')">
+              <el-button v-if="scope.row.status == 1"
+                         @click="onStop(scope.row, 0)"
+                         type="text">停用</el-button>
+              <el-button v-else
+                         @click="onStop(scope.row, 1)"
+                         type="text">启用</el-button>
+            </div>
+
             <el-button @click="onDel(scope.row)"
-                  v-if="!scope.row.memo || permission('banner/copyrightbtn')"
+                       v-if="!scope.row.memo || permission('banner/copyrightbtn')"
                        type="text">删除</el-button>
           </template>
         </el-table-column>
@@ -124,7 +131,7 @@ export default {
     this.getList()
   },
   mounted () {
-    this.getList()
+    // this.getList()
   },
   methods: {
     permission (str) {

+ 16 - 10
src/views/contentManager/components/flashPage.vue

@@ -4,18 +4,22 @@
     <div @click="openTeaching('create')"
          class='newBand'>新建</div>
     <!-- 搜索标题 -->
-    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item prop="hasPracticeCourse">
-        <el-select
-          class="multiple"
-          v-model.trim="searchForm.tenantId"
-          placeholder="请选择对内或对外">
-          <el-option label="对内" value="1"></el-option>
-          <el-option label="对外" value="2"></el-option>
+        <el-select class="multiple"
+                   v-model.trim="searchForm.tenantId"
+                   placeholder="请选择对内或对外">
+          <el-option label="对内"
+                     value="1"></el-option>
+          <el-option label="对外"
+                     value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList" type="danger">搜索</el-button>
+        <el-button @click="getList"
+                   type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
@@ -51,7 +55,9 @@
                          prop="order"
                          label="排序">
         </el-table-column>
-             <el-table-column align="center" prop="remark" label="适用范围">
+        <el-table-column align="center"
+                         prop="remark"
+                         label="适用范围">
           <template slot-scope="scope">
             <p v-if=" scope.row.tenantId == 1">对内</p>
             <p v-if=" scope.row.tenantId == 2">对外</p>
@@ -111,7 +117,7 @@ export default {
     this.getList()
   },
   mounted () {
-    this.getList()
+    // this.getList()
   },
   methods: {
     getList () {

+ 16 - 10
src/views/contentManager/components/information.vue

@@ -4,18 +4,22 @@
     <div @click="openTeaching('create')"
          class='newBand'>新建</div>
     <!-- 搜索标题 -->
-    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item prop="hasPracticeCourse">
-        <el-select
-          class="multiple"
-          v-model.trim="searchForm.tenantId"
-          placeholder="请选择对内或对外">
-          <el-option label="对内" value="1"></el-option>
-          <el-option label="对外" value="2"></el-option>
+        <el-select class="multiple"
+                   v-model.trim="searchForm.tenantId"
+                   placeholder="请选择对内或对外">
+          <el-option label="对内"
+                     value="1"></el-option>
+          <el-option label="对外"
+                     value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList" type="danger">搜索</el-button>
+        <el-button @click="getList"
+                   type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
@@ -51,7 +55,9 @@
                          prop="order"
                          label="排序">
         </el-table-column>
-             <el-table-column align="center" prop="remark" label="适用范围">
+        <el-table-column align="center"
+                         prop="remark"
+                         label="适用范围">
           <template slot-scope="scope">
             <p v-if=" scope.row.tenantId == 1">对内</p>
             <p v-if=" scope.row.tenantId == 2">对外</p>
@@ -111,7 +117,7 @@ export default {
     this.getList()
   },
   mounted () {
-    this.getList()
+    // this.getList()
   },
   methods: {
     getList () {

+ 15 - 9
src/views/contentManager/components/knowledge.vue

@@ -18,13 +18,19 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-          <el-select v-model="searchForm.subType" clearable placeholder="请选择知识类别">
-            <el-option label="演奏小技巧" :value="1"></el-option>
-            <el-option label="乐理基础" :value="2"></el-option>
-            <el-option label="乐器保养" :value="3"></el-option>
-            <el-option label="乐曲演奏展示" :value="4"></el-option>
-          </el-select>
-        </el-form-item>
+        <el-select v-model="searchForm.subType"
+                   clearable
+                   placeholder="请选择知识类别">
+          <el-option label="演奏小技巧"
+                     :value="1"></el-option>
+          <el-option label="乐理基础"
+                     :value="2"></el-option>
+          <el-option label="乐器保养"
+                     :value="3"></el-option>
+          <el-option label="乐曲演奏展示"
+                     :value="4"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button @click="getList"
                    type="danger">搜索</el-button>
@@ -147,7 +153,7 @@ export default {
     this.getList()
   },
   mounted () {
-    this.getList()
+    // this.getList()
   },
   methods: {
     permission (str) {
@@ -216,7 +222,7 @@ export default {
     }
   },
   filters: {
-    formatSubType(val) {
+    formatSubType (val) {
       const template = {
         1: '演奏小技巧',
         2: '乐理基础',

+ 61 - 38
src/views/contentManager/components/training.vue

@@ -1,60 +1,83 @@
 <template>
   <div>
     <!-- 搜索标题 -->
-    <div @click="openTeaching('create')" class="newBand">新建</div>
+    <div @click="openTeaching('create')"
+         class="newBand">新建</div>
     <!-- 搜索标题 -->
-    <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item prop="hasPracticeCourse">
-        <el-select
-          class="multiple"
-          v-model.trim="searchForm.tenantId"
-          placeholder="请选择对内或对外">
-          <el-option label="对内" value="1"></el-option>
-          <el-option label="对外" value="2"></el-option>
+        <el-select class="multiple"
+                   v-model.trim="searchForm.tenantId"
+                   placeholder="请选择对内或对外">
+          <el-option label="对内"
+                     value="1"></el-option>
+          <el-option label="对外"
+                     value="2"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getList" type="danger">搜索</el-button>
+        <el-button @click="getList"
+                   type="danger">搜索</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
     <div class="tableWrap">
-      <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column align="center" label="轮播图">
+      <el-table :data="tableList"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align="center"
+                         label="轮播图">
           <template slot-scope="scope">
-            <img class="bannerImg" :src="scope.row.coverImage" alt />
+            <img class="bannerImg"
+                 :src="scope.row.coverImage"
+                 alt />
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="title" label="标题"></el-table-column>
-        <el-table-column align="center" label="跳转连接">
+        <el-table-column align="center"
+                         prop="title"
+                         label="标题"></el-table-column>
+        <el-table-column align="center"
+                         label="跳转连接">
           <template slot-scope="scope">{{ scope.row.linkUrl + '/' + scope.row.id }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="remark" label="是否使用">
+        <el-table-column align="center"
+                         prop="remark"
+                         label="是否使用">
           <template slot-scope="scope">{{ scope.row.status == 1 ? '是' : '否' }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="order" label="排序"></el-table-column>
-        <el-table-column align="center" prop="remark" label="适用范围">
+        <el-table-column align="center"
+                         prop="order"
+                         label="排序"></el-table-column>
+        <el-table-column align="center"
+                         prop="remark"
+                         label="适用范围">
           <template slot-scope="scope">
             <p v-if=" scope.row.tenantId == 1">对内</p>
             <p v-if=" scope.row.tenantId == 2">对外</p>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="操作">
+        <el-table-column align="center"
+                         label="操作">
           <template slot-scope="scope">
-            <el-button @click="openTeaching('update', scope.row)" type="text">修改</el-button>
-            <el-button v-if="scope.row.status == 1" @click="onStop(scope.row, 0)" type="text">停用</el-button>
-            <el-button v-else @click="onStop(scope.row, 1)" type="text">启用</el-button>
-            <el-button @click="onDel(scope.row)" type="text">删除</el-button>
+            <el-button @click="openTeaching('update', scope.row)"
+                       type="text">修改</el-button>
+            <el-button v-if="scope.row.status == 1"
+                       @click="onStop(scope.row, 0)"
+                       type="text">停用</el-button>
+            <el-button v-else
+                       @click="onStop(scope.row, 1)"
+                       type="text">启用</el-button>
+            <el-button @click="onDel(scope.row)"
+                       type="text">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        :total="pageInfo.total"
-        :page.sync="pageInfo.page"
-        :limit.sync="pageInfo.limit"
-        :page-sizes="pageInfo.page_size"
-        @pagination="getList"
-      />
+      <pagination :total="pageInfo.total"
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
   </div>
 </template>
@@ -67,7 +90,7 @@ export default {
   components: {
     pagination
   },
-  data() {
+  data () {
     return {
       searchForm: {
         tenantId: '1'
@@ -84,14 +107,14 @@ export default {
       }
     };
   },
-  activated() {
+  activated () {
     this.getList();
   },
-  mounted() {
-    this.getList();
+  mounted () {
+    // this.getList();
   },
   methods: {
-    getList() {
+    getList () {
       let params = {
         clientName: 'manage',
         tenantId: this.searchForm.tenantId,
@@ -106,7 +129,7 @@ export default {
         }
       });
     },
-    openTeaching(type, rows) {
+    openTeaching (type, rows) {
       let params = {};
       if (type == "update") {
         params.id = rows.id;
@@ -118,7 +141,7 @@ export default {
         query: params
       });
     },
-    onDel(row) {
+    onDel (row) {
       // 删除
       this.$confirm("确定是否删除?", "提示", {
         confirmButtonText: "确定",
@@ -135,9 +158,9 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
-    onStop(row, status) {
+    onStop (row, status) {
       // 停止
       // newsUpdate
       let tempStr = ["停用", "启用"];

+ 61 - 37
src/views/contentManager/contentOperation.vue

@@ -11,50 +11,68 @@
                ref="form"
                label-width="120px"
                style="width: 100%">
-        <el-form-item label="标题" prop="title">
+        <el-form-item label="标题"
+                      prop="title">
           <el-input v-model.trim="form.title"></el-input>
         </el-form-item>
         <el-form-item label="排序值">
           <el-input v-model.trim="form.order"></el-input>
         </el-form-item>
-        <el-form-item label="适用范围" prop="tenantId">
+        <el-form-item label="适用范围"
+                      prop="tenantId">
           <el-select v-model="form.tenantId">
-            <el-option label="对内" value="1"></el-option>
-            <el-option label="对外" value="2"></el-option>
+            <el-option label="对内"
+                       value="1"></el-option>
+            <el-option label="对外"
+                       value="2"></el-option>
           </el-select>
         </el-form-item>
         <!-- banner图 && app按钮管理,才需要添加版本号 -->
-        <el-form-item label="版本号" v-if="type == 3 || type == 6 || type == 8">
+        <el-form-item label="版本号"
+                      v-if="type == 3 || type == 6 || type == 8">
           <el-input v-model="form.memo"></el-input>
         </el-form-item>
         <!--  -->
         <!-- <el-form-item v-if="type == 3 || type == 6 || type == 5 || type == 8" label="链接地址">
           <el-input v-model.trim="form.linkUrl"></el-input>
         </el-form-item> -->
-        <el-form-item label="链接地址" prop="linkUrl" :rules='[{ required: type == 3 || type == 6 || type == 5 || type == 8 ? false : true, message: "请输入连接地址", trigger: "blur" }]'>
+        <el-form-item label="链接地址"
+                      prop="linkUrl"
+                      :rules='[{ required: type == 3 || type == 6 || type == 5 || type == 8 ? false : true, message: "请输入连接地址", trigger: "blur" }]'>
           <el-input v-model.trim="form.linkUrl"></el-input>
         </el-form-item>
         <!-- 广告管理才有类型 -->
-        <el-form-item label="广告类型" v-if="type == 8">
-          <el-select v-model="uploadType" :disabled="pageType != 'create'">
-            <el-option label="图片" :value="1"></el-option>
-            <el-option label="视频" :value="2"></el-option>
+        <el-form-item label="广告类型"
+                      v-if="type == 8">
+          <el-select v-model="uploadType"
+                     :disabled="pageType != 'create'">
+            <el-option label="图片"
+                       :value="1"></el-option>
+            <el-option label="视频"
+                       :value="2"></el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item v-if="uploadType == 2 && type == 8" key="coverImage" label="广告视频" prop="coverImage">
-          <div @click="addAdvVideo" style="display: inline-block;">
+        <el-form-item v-if="uploadType == 2 && type == 8"
+                      key="coverImage"
+                      label="广告视频"
+                      prop="coverImage">
+          <div @click="addAdvVideo"
+               style="display: inline-block;">
             <video class="avatar"
                    v-if="form.coverImage"
                    type="video/mp4"
                    preload="auto"
                    :poster="form.videoCoverImage"
                    :src="form.coverImage"></video>
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            <i v-else
+               class="el-icon-plus avatar-uploader-icon"></i>
           </div>
           <p style="color: red">上传视频尺寸建议:1242px * 2208px;</p>
         </el-form-item>
-        <el-form-item v-else key="coverImage" :label="type == 8 ? '广告图' : '封面图'"
+        <el-form-item v-else
+                      key="coverImage"
+                      :label="type == 8 ? '广告图' : '封面图'"
                       prop="coverImage">
           <el-upload class="avatar-uploader"
                      action="/api-web/uploadFile"
@@ -65,8 +83,8 @@
                      :before-upload="beforeAvatarUpload">
             <!-- 判断是图片还是视频 -->
             <img v-if="form.coverImage"
-                :src="form.coverImage"
-                class="avatar" />
+                 :src="form.coverImage"
+                 class="avatar" />
             <i v-else
                class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
@@ -74,8 +92,12 @@
              v-if="imageSize">上传图片尺寸为:{{ imageSize }}</p>
         </el-form-item>
         <!-- 广告管理才有时长 -->
-        <el-form-item label="显示时长(秒)" prop="attribute1" :rules="[{required: true, validator: validNum, trigger: 'blur'}]" v-if="type == 8">
-          <el-input type="number" v-model.number="form.attribute1"></el-input>
+        <el-form-item label="显示时长(秒)"
+                      prop="attribute1"
+                      :rules="[{required: true, validator: validNum, trigger: 'blur'}]"
+                      v-if="type == 8">
+          <el-input type="number"
+                    v-model.number="form.attribute1"></el-input>
           <p style="color: red">建议时长不超过5秒</p>
         </el-form-item>
 
@@ -96,7 +118,8 @@
           </el-select>
         </el-form-item>
         <!-- 闪页管理 BANNER管理 APP按钮管理 广告管理 -->
-        <el-form-item label="内容" v-show="type != 8 && type != 5 && type != 3 && type != 6"
+        <el-form-item label="内容"
+                      v-show="type != 8 && type != 5 && type != 3 && type != 6"
                       prop="content"
                       :rules="[{ required: type != 8 && type != 5 && type != 3 && type != 6 ? true : false, message: '请编辑内容', trigger: 'blur' }]">
           <quill-editor class="ql-editor"
@@ -120,7 +143,8 @@
           <el-button @click="onSubmit('form')"
                      type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
           <el-button @click="onReSet('form')">重置</el-button>
-          <el-button @click="onLook" v-if="type != 8 && type != 5 && type != 3 && type != 6">预览</el-button>
+          <el-button @click="onLook"
+                     v-if="type != 8 && type != 5 && type != 3 && type != 6">预览</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -302,9 +326,9 @@ export default {
     let url = ''
     // let url = query.type == 7 ? vaildStudentUrl() + "/#/knowledge" : vaildStudentUrl() + "/#/specialdetail"
     console.log(query.type)
-    if(query.type == 7) {
+    if (query.type == 7) {
       url = vaildStudentUrl() + "/#/knowledge"
-    } else if(query.type == 8 || query.type == 5) {
+    } else if (query.type == 8 || query.type == 5) {
       url = ''
     } else {
       url = vaildStudentUrl() + "/#/specialdetail"
@@ -399,15 +423,15 @@ export default {
   },
   created () { },
   mounted () {
-    this.init();
+
   },
   activated () {
     const query = this.$route.query
     if (query.pageType == "create") {
       let url = ''
-      if(query.type == 7) {
+      if (query.type == 7) {
         url = vaildStudentUrl() + "/#/knowledge"
-      } else if(query.type == 8 || query.type == 5) {
+      } else if (query.type == 8 || query.type == 5) {
         url = ''
       } else {
         url = vaildStudentUrl() + "/#/specialdetail"
@@ -461,11 +485,11 @@ export default {
 
       this.$refs["form"].clearValidate();
     },
-    addAdvVideo() {
+    addAdvVideo () {
       this.dialogFormVisible = true
       let dialogForm = this.dialogForm
       dialogForm.poster = this.form.videoCoverImage
-      if(this.formRadio == 1) {
+      if (this.formRadio == 1) {
         dialogForm.url = this.form.coverImage
       } else {
         dialogForm.videoUrl = this.form.coverImage
@@ -477,7 +501,7 @@ export default {
       this.$refs[formName].validate(valid => {
         if (valid) {
           let dialogForm = this.dialogForm;
-          if(this.uploadStatus) {
+          if (this.uploadStatus) {
             // 添加视频类型
             let form = this.form
             form.coverImage = this.formRadio == 1 ? dialogForm.url : dialogForm.videoUrl
@@ -509,7 +533,7 @@ export default {
         }
       });
     },
-    onDialogClose(diologForm) {
+    onDialogClose (diologForm) {
       this.dialogForm = {
         poster: null,
         url: null,
@@ -598,9 +622,9 @@ export default {
     onReSet (formName) {
       const query = this.$route.query
       let url = ''
-      if(query.type == 7) {
+      if (query.type == 7) {
         url = vaildStudentUrl() + "/#/knowledge"
-      } else if(query.type == 8 || query.type == 5) {
+      } else if (query.type == 8 || query.type == 5) {
         url = ''
       } else {
         url = vaildStudentUrl() + "/#/specialdetail"
@@ -652,7 +676,7 @@ export default {
           if (res.code == 200) {
             let result = res.data;
             let form = this.form;
-            if(result.videoCoverImage) {
+            if (result.videoCoverImage) {
               this.uploadType = 2
             } else {
               this.uploadType = 1
@@ -683,7 +707,7 @@ export default {
     },
     handleImgSuccess (res, file) {
       this.uploadImgLoading = false
-      if(res.code == 200) {
+      if (res.code == 200) {
         this.dialogForm.poster = res.data.url
       } else {
         this.$message.error('上传失败')
@@ -710,7 +734,7 @@ export default {
       return isImage && isLt2M;
     },
     handleAvatarSuccess (res, file) {
-      if(res.code == 200) {
+      if (res.code == 200) {
         this.form.coverImage = res.data.url;
       } else {
         this.$message.error('上传失败')
@@ -797,9 +821,9 @@ export default {
     },
     handleUploadSuccess (file, fileList) {
       this.uploadLoading = false
-      if(file.code == 200) {
-         this.$message.success('上传视频成功')
-         this.dialogForm.videoUrl = file.data.url;
+      if (file.code == 200) {
+        this.$message.success('上传视频成功')
+        this.dialogForm.videoUrl = file.data.url;
       } else {
         this.$message.error('上传视频失败')
       }

+ 173 - 122
src/views/editionManager/editionList.vue

@@ -4,111 +4,162 @@
       <div class="squrt"></div>版本控制
     </h2>
     <div class="m-core">
-       <!--   -->
-      <div class="newBand" @click="createEdi" v-permission="'appVersionInfo/add'">新建</div>
-      <el-form :inline="true" :model="searchForm">
+      <!--   -->
+      <div class="newBand"
+           @click="createEdi"
+           v-permission="'appVersionInfo/add'">新建</div>
+      <el-form :inline="true"
+               :model="searchForm">
         <el-form-item label="客户端">
-          <el-select clearable v-model="searchForm.search">
-            <el-option v-for="(item,index) in sectionList" :key='index' :value="item.value" :label="item.label"></el-option>
+          <el-select clearable
+                     v-model="searchForm.search">
+            <el-option v-for="(item,index) in sectionList"
+                       :key='index'
+                       :value="item.value"
+                       :label="item.label"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item >
-          <el-button type="danger" @click="search">搜索</el-button>
+        <el-form-item>
+          <el-button type="danger"
+                     @click="search">搜索</el-button>
         </el-form-item>
       </el-form>
-     
+
       <div class="tableWrap">
-        <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column align="center" prop="id" label="编号"></el-table-column>
-          <el-table-column align="center" prop="platform" label="客户端">
+        <el-table :data="tableList"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align="center"
+                           prop="id"
+                           label="编号"></el-table-column>
+          <el-table-column align="center"
+                           prop="platform"
+                           label="客户端">
             <template slot-scope="scope">
               <div>{{ scope.row.platform|editionFilter }}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="version" label="版本号"></el-table-column>
-          <el-table-column align="center" prop="isForceUpdate" label="强制更新">
+          <el-table-column align="center"
+                           prop="version"
+                           label="版本号"></el-table-column>
+          <el-table-column align="center"
+                           prop="isForceUpdate"
+                           label="强制更新">
             <template slot-scope="scope">
               <div>{{ scope.row.isForceUpdate?'是':'否'}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="status" label="状态">
+          <el-table-column align="center"
+                           prop="status"
+                           label="状态">
             <template slot-scope="scope">
               <div>{{scope.row.status | statusFilter}}</div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="description" label="描述"></el-table-column>
-          <el-table-column align="center" prop="downloadUrl" label="下载链接"></el-table-column>
-          <el-table-column align="center" label="操作">
+          <el-table-column align="center"
+                           prop="description"
+                           label="描述"></el-table-column>
+          <el-table-column align="center"
+                           prop="downloadUrl"
+                           label="下载链接"></el-table-column>
+          <el-table-column align="center"
+                           label="操作">
             <template slot-scope="scope">
               <div>
-                <el-button v-permission="'appVersionInfo/update'" type="text" @click="resetEdit(scope.row)">修改</el-button>
+                <el-button v-permission="'appVersionInfo/update'"
+                           type="text"
+                           @click="resetEdit(scope.row)">修改</el-button>
               </div>
             </template>
           </el-table-column>
         </el-table>
-        <pagination
-          :total="rules.total"
-          :page.sync="rules.page"
-          :limit.sync="rules.limit"
-          :page-sizes="rules.page_size"
-          @pagination="getList"
-        />
+        <pagination :total="rules.total"
+                    :page.sync="rules.page"
+                    :limit.sync="rules.limit"
+                    :page-sizes="rules.page_size"
+                    @pagination="getList" />
       </div>
     </div>
     <!-- v-if="sectionVisible" -->
-    <el-dialog title="版本修改" width="400px" :visible.sync="sectionVisible" :before-close="resetForm" >
-      <el-form
-        :model="sectionForm"
-        ref="sectionForm"
-        :rules="sectionRules"
-        label-position="right"
-        label-width="80px"
-        :inline="true"
-        v-if="sectionVisible"
-      >
-      <el-form-item label="客户端" prop="platform"  v-if="isNew">
-        <el-select v-model="sectionForm.platform" clearable>
-          <el-option v-for="(item,index) in sectionList" :key="index" :label="item.label" :value="item.value"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="版本号" prop="version" v-if="isNew">
-        <el-input v-model.trim="sectionForm.version"   @mousewheel.native.prevent></el-input>
-      </el-form-item>
-      <el-form-item label="强制更新" prop="isForceUpdate">
-        <el-select clearable v-model="sectionForm.isForceUpdate">
-          <el-option label="是" :value="true"></el-option>
-          <el-option label="否" :value="false"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-           <el-select clearable v-model="sectionForm.status">
-          <el-option label="最新" value="newest"></el-option>
-          <el-option label="历史" value="history"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="下载链接" prop="downloadUrl">
-        <el-input v-model.trim="sectionForm.downloadUrl" type="textarea"></el-input>
-      </el-form-item>
-       <el-form-item label="描述" prop="description">
-         <el-input type="textarea" v-model="sectionForm.description"></el-input>
-       </el-form-item>
+    <el-dialog title="版本修改"
+               width="400px"
+               :visible.sync="sectionVisible"
+               :before-close="resetForm">
+      <el-form :model="sectionForm"
+               ref="sectionForm"
+               :rules="sectionRules"
+               label-position="right"
+               label-width="80px"
+               :inline="true"
+               v-if="sectionVisible">
+        <el-form-item label="客户端"
+                      prop="platform"
+                      v-if="isNew">
+          <el-select v-model="sectionForm.platform"
+                     clearable>
+            <el-option v-for="(item,index) in sectionList"
+                       :key="index"
+                       :label="item.label"
+                       :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="版本号"
+                      prop="version"
+                      v-if="isNew">
+          <el-input v-model.trim="sectionForm.version"
+                    @mousewheel.native.prevent></el-input>
+        </el-form-item>
+        <el-form-item label="强制更新"
+                      prop="isForceUpdate">
+          <el-select clearable
+                     v-model="sectionForm.isForceUpdate">
+            <el-option label="是"
+                       :value="true"></el-option>
+            <el-option label="否"
+                       :value="false"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态"
+                      prop="status">
+          <el-select clearable
+                     v-model="sectionForm.status">
+            <el-option label="最新"
+                       value="newest"></el-option>
+            <el-option label="历史"
+                       value="history"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="下载链接"
+                      prop="downloadUrl">
+          <el-input v-model.trim="sectionForm.downloadUrl"
+                    type="textarea"></el-input>
+        </el-form-item>
+        <el-form-item label="描述"
+                      prop="description">
+          <el-input type="textarea"
+                    v-model="sectionForm.description"></el-input>
+        </el-form-item>
       </el-form>
-        <div slot="footer" class="dialog-footer">
+      <div slot="footer"
+           class="dialog-footer">
         <el-button @click="sectionVisible = false">取 消</el-button>
-        <el-button v-if="isNew" type="primary" @click="createEdition">确 定</el-button>
-        <el-button v-if="!isNew" type="primary" @click="resetEdition">确 定</el-button>
+        <el-button v-if="isNew"
+                   type="primary"
+                   @click="createEdition">确 定</el-button>
+        <el-button v-if="!isNew"
+                   type="primary"
+                   @click="resetEdition">确 定</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 <script>
-import { appVersionInfo,addAppVersionInfo,resetAppVersionInfo } from "@/api/systemManage";
+import { appVersionInfo, addAppVersionInfo, resetAppVersionInfo } from "@/api/systemManage";
 import pagination from "@/components/Pagination/index";
 export default {
   components: {
     pagination
   },
-  data() {
+  data () {
     return {
       sectionVisible: false,
       tableList: [],
@@ -119,111 +170,111 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      searchForm:{
-        search:null
+      searchForm: {
+        search: null
       },
-      sectionList: [{value:'ios-teacher',label:'苹果-老师端'},
-      {value:'ios-student',label:'苹果-学生端'},{value:'ios-education',label:'苹果-教务端'},{value:'android-teacher',label:'安卓-老师端'},
-      {value:'android-student',label:'安卓-学生端'},{value:'android-education',label:'安卓-教务端'}],
+      sectionList: [{ value: 'ios-teacher', label: '苹果-老师端' },
+      { value: 'ios-student', label: '苹果-学生端' }, { value: 'ios-education', label: '苹果-教务端' }, { value: 'android-teacher', label: '安卓-老师端' },
+      { value: 'android-student', label: '安卓-学生端' }, { value: 'android-education', label: '安卓-教务端' }],
       sectionForm: {
-        platform:'',
-        version:'',
-        isForceUpdate:'',
-        downloadUrl:'',
-        status:'',
-        id:''
+        platform: '',
+        version: '',
+        isForceUpdate: '',
+        downloadUrl: '',
+        status: '',
+        id: ''
       },
       sectionRules: {
-         platform: [
+        platform: [
           { required: true, message: "请选择客户端", trigger: "blur" }
         ],
-         version: [
+        version: [
           { required: true, message: "请输入版本号", trigger: "blur" }
         ],
-          isForceUpdate: [
+        isForceUpdate: [
           { required: true, message: "请选择是否强更", trigger: "blur" }
         ],
         status: [
           { required: true, message: "请选择版本状态", trigger: "blur" }
         ],
       },
-      isNew:false
+      isNew: false
     };
   },
-  activated() {
+  activated () {
     this.init();
   },
-  created() {
-    this.init();
+  created () {
+    // this.init();
   },
   methods: {
-    search(){
+    search () {
       this.rules.page = 1;
       this.getList()
     },
-    init() {
+    init () {
       this.getList();
     },
-    getList() {
-      this.searchForm.search?this.searchForm.search:this.searchForm.search = null;
-      appVersionInfo({search:this.searchForm.search}).then(res => {
+    getList () {
+      this.searchForm.search ? this.searchForm.search : this.searchForm.search = null;
+      appVersionInfo({ search: this.searchForm.search }).then(res => {
         if (res.code == 200) {
           this.tableList = res.data.rows;
           this.rules.total = res.data.total;
         }
       });
     },
-    createEdi(){
+    createEdi () {
       this.isNew = true;
       this.sectionVisible = true;
     },
-    createEdition(){
-      this.$refs.sectionForm.validate(v=>{
-        if(v){
-           addAppVersionInfo(this.sectionForm).then(res=>{
-        if(res.code == 200){
-          this.$message.success('新增成功')
-          this.sectionVisible = false;
-      
-          this.getList()
+    createEdition () {
+      this.$refs.sectionForm.validate(v => {
+        if (v) {
+          addAppVersionInfo(this.sectionForm).then(res => {
+            if (res.code == 200) {
+              this.$message.success('新增成功')
+              this.sectionVisible = false;
+
+              this.getList()
+            }
+          })
         }
       })
-        }
-      })
-     
+
     },
-    resetEdit(row){
-       this.isNew = false;
-       this.sectionForm =row;
-       this.sectionVisible = true;
+    resetEdit (row) {
+      this.isNew = false;
+      this.sectionForm = row;
+      this.sectionVisible = true;
     },
-    resetEdition(){
+    resetEdition () {
       // 修改
-      resetAppVersionInfo(this.sectionForm).then(res=>{
-        if(res.code == 200){
-           this.$message.success('修改成功')
+      resetAppVersionInfo(this.sectionForm).then(res => {
+        if (res.code == 200) {
+          this.$message.success('修改成功')
           this.sectionVisible = false;
-      
+
           this.getList()
         }
       })
     },
-    resetForm(){
+    resetForm () {
       this.sectionForm = {
-        platform:'',
-        version:'',
-        isForceUpdate:'',
-        downloadUrl:'',
-        status:'',
-        id:''
+        platform: '',
+        version: '',
+        isForceUpdate: '',
+        downloadUrl: '',
+        status: '',
+        id: ''
       }
-    // console.log(this.sectionForm.status)
-    this.$refs.sectionForm.resetFields();
-    this.sectionVisible = false;
+      // console.log(this.sectionForm.status)
+      this.$refs.sectionForm.resetFields();
+      this.sectionVisible = false;
     }
   },
   filters: {
-    statusFilter(val) {
+    statusFilter (val) {
       if (val == "newest") {
         return "最新";
       }

+ 61 - 53
src/views/evaluateManager/evaluateDetail.vue

@@ -1,19 +1,21 @@
 <template>
   <div class="m-container">
-      <el-page-header @back="onCancel"
-                      content="评价详情"></el-page-header>
+    <el-page-header @back="onCancel"
+                    content="评价详情"></el-page-header>
     <div class="m-core">
       <div class="left">
-        <el-table
-          style="width: 100%"
-          :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-          :data="tableData"
-        >
-          <el-table-column align="center" prop="month" label="时间"></el-table-column>
-          <el-table-column align="center" label="操作">
+        <el-table style="width: 100%"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                  :data="tableData">
+          <el-table-column align="center"
+                           prop="month"
+                           label="时间"></el-table-column>
+          <el-table-column align="center"
+                           label="操作">
             <template slot-scope="scope">
               <div>
-                <el-button type="text" @click="getReviews(scope.row.id)">查看</el-button>
+                <el-button type="text"
+                           @click="getReviews(scope.row.id)">查看</el-button>
               </div>
             </template>
           </el-table-column>
@@ -26,7 +28,8 @@
           @pagination="getList"
         />-->
       </div>
-      <div class="right" v-if="isLook"> 
+      <div class="right"
+           v-if="isLook">
         <el-card class="box-card">
           评价详情
           <div class="cardWrap">
@@ -38,23 +41,27 @@
               <p class="row">声部:{{ commitWrap.soundName }}</p>
               <p class="row">训练次数:{{ commitWrap.count }}</p>
               <p class="row">训练时长:{{ commitWrap.timers }}</p>
-              <div  v-if="version == 2">
+              <div v-if="version == 2">
                 <p class="title">授课内容</p>
-              <el-divider></el-divider>
-              <p class="row">乐理:{{ musicTheory }}</p>
-              <p class="row">曲子: {{ song}}</p>
-              <p class="row">教材: {{teachingMaterial }}</p>
+                <el-divider></el-divider>
+                <p class="row">乐理:{{ musicTheory }}</p>
+                <p class="row">曲子: {{ song}}</p>
+                <p class="row">教材: {{teachingMaterial }}</p>
               </div>
-              
+
             </div>
             <div class="cardWrapright">
               <p class="title">课程点评</p>
               <el-divider></el-divider>
               <div v-if="version == 1">
-                <p class="row" v-for="(item,index) in askList" :key="index">{{subjectJsonOld[index+1].title+' : '+item}}</p>
+                <p class="row"
+                   v-for="(item,index) in askList"
+                   :key="index">{{subjectJsonOld[index+1].title+' : '+item}}</p>
               </div>
               <div v-if="version == 2">
-                <p class="row" v-for="(item,index) in askList"  :key="index">{{item}}</p>
+                <p class="row"
+                   v-for="(item,index) in askList"
+                   :key="index">{{item}}</p>
               </div>
 
               <!-- <div class="textWrap"></div> -->
@@ -71,7 +78,7 @@ import { getGroupReviews, getReviewsInfo } from "@/api/buildTeam";
 import { subjectJsonOld, subjectJson } from "@/utils/questionJson";
 export default {
   components: { pagination },
-  data() {
+  data () {
     return {
       tableData: [],
       id: null,
@@ -97,22 +104,22 @@ export default {
       musicTheory: null,
       teachingMaterial: null,
       song: null,
-        Fsearch: null,
+      Fsearch: null,
       Frules: null
     };
   },
-  activated() {
+  activated () {
     this.init();
   },
-  created() {
+  created () {
 
-    this.init();
+    // this.init();
   },
   methods: {
-    init() {
+    init () {
       this.id = this.$route.query.id;
       this.evaluateId = this.$route.query.evaluateId;
-        if (this.$route.query.search) {
+      if (this.$route.query.search) {
         this.Fsearch = this.$route.query.search;
       }
       if (this.$route.query.rules) {
@@ -125,7 +132,7 @@ export default {
         this.getReviews(this.evaluateId);
       }
     },
-    getList() {
+    getList () {
       getGroupReviews({ groupId: this.id }).then(res => {
         if (res.code == 200) {
           // this.tableData = res.data.rows;
@@ -134,7 +141,7 @@ export default {
         }
       });
     },
-    getReviews(id) {
+    getReviews (id) {
       getReviewsInfo({ id }).then(res => {
         if (res.code == 200) {
           this.isLook = true;
@@ -163,55 +170,56 @@ export default {
             for (let key in this.item) {
               switch (key) {
                 case "one": {
-                  this.askList.push(this.subjectJson[1].title+' : '+this.subjectJson[1][this.item[key]])
+                  this.askList.push(this.subjectJson[1].title + ' : ' + this.subjectJson[1][this.item[key]])
                   break;
                 }
                 case "two": {
-                      this.askList.push(this.subjectJson[2].title+' : '+this.subjectJson[2][this.item[key]])
+                  this.askList.push(this.subjectJson[2].title + ' : ' + this.subjectJson[2][this.item[key]])
                   break;
                 }
                 case "three": {
-                      this.askList.push(this.subjectJson[3].title+' : '+this.subjectJson[3][this.item[key]])
+                  this.askList.push(this.subjectJson[3].title + ' : ' + this.subjectJson[3][this.item[key]])
                   break;
                 }
                 case "four": {
-                      this.askList.push(this.subjectJson[4].title+' : '+this.subjectJson[4][this.item[key]])
+                  this.askList.push(this.subjectJson[4].title + ' : ' + this.subjectJson[4][this.item[key]])
                   break;
                 }
                 case "five": {
-                      this.askList.push(this.subjectJson[5].title+' : '+this.subjectJson[5][this.item[key]])
+                  this.askList.push(this.subjectJson[5].title + ' : ' + this.subjectJson[5][this.item[key]])
                   break;
                 }
                 case "six": {
-                  if(this.item['six']){
-                      this.askList.push(this.subjectJson[6].title+' : '+this.subjectJson[6][this.item[key]])
+                  if (this.item['six']) {
+                    this.askList.push(this.subjectJson[6].title + ' : ' + this.subjectJson[6][this.item[key]])
                   }
-                    
+
                   break;
                 }
                 case "seven":
-                  {     if(this.item['seven']){
-                    this.askList.push(this.subjectJson[7].title+' : '+this.subjectJson[7][this.item[key]])
-                  }
-                        
-                        break;
+                  {
+                    if (this.item['seven']) {
+                      this.askList.push(this.subjectJson[7].title + ' : ' + this.subjectJson[7][this.item[key]])
+                    }
+
+                    break;
                   }
-                  
+
                 case "eight": {
-                  if(this.item['eight']){
-                     this.askList.push(this.subjectJson[8].title+' : '+this.subjectJson[8][this.item[key]])
+                  if (this.item['eight']) {
+                    this.askList.push(this.subjectJson[8].title + ' : ' + this.subjectJson[8][this.item[key]])
                   }
-                     
+
                   break;
                 }
               }
-           
+
               // this.askList.push(this.subjectJson[])
             }
-              this.askList.sort((a,b)=>{
-                return parseInt(a)-parseInt(b)
-              })
-              // console.log( this.askList)
+            this.askList.sort((a, b) => {
+              return parseInt(a) - parseInt(b)
+            })
+            // console.log( this.askList)
 
             this.musicTheory = JSON.parse(res.data.musicTheory)
               .map(item => {
@@ -229,7 +237,7 @@ export default {
 
           this.commitWrap = {
             time: res.data.createTime,
-            teacher: res.data.teacher&&res.data.teacher.name,
+            teacher: res.data.teacher && res.data.teacher.name,
             soundName: res.data.subjectName,
             count: res.data.times,
             timers: res.data.totalMinutes
@@ -237,8 +245,8 @@ export default {
         }
       });
     },
-    onCancel(){
-             this.$router.push({ path: '/operateManager/commentManager', query: { search: this.Fsearch, rules: this.Frules,activeIndex:'1' } })
+    onCancel () {
+      this.$router.push({ path: '/operateManager/commentManager', query: { search: this.Fsearch, rules: this.Frules, activeIndex: '1' } })
     }
   }
 };

+ 152 - 127
src/views/evaluateManager/evaluateList.vue

@@ -1,112 +1,135 @@
 <template>
 
-    <!-- <h2>
+  <!-- <h2>
       <div class="squrt"></div>评论列表
     </h2> -->
-    <div class="m-core">
-      <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
-        <!-- 状态 指导老师 活动方案-->
-        <el-form-item>
-          <el-input
-            v-model.trim="searchForm.search"
-            @keyup.enter.native="search"
-            placeholder="请输入课程组名称 ID"
-          ></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-select placeholder="请选择分部" v-model="searchForm.organId" clearable>
-            <el-option
-              v-for="(item,index) in organList"
-              :label="item.name"
-              :value="item.id"
-              :key="index"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-select placeholder="请选择状态" v-model="searchForm.isOver" clearable>
-            <el-option label="已完成" value="1"></el-option>
-            <el-option label="进行中" value="0"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-select placeholder="请选择指导老师" v-model="searchForm.teacherId" clearable filterable>
-            <el-option
-              v-for="(item,index) in teacherList"
-              :label="item.realName"
-              :value="item.id"
-              :key="index"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-select placeholder="是否完成评价" v-model="searchForm.hasReport" clearable>
-            <el-option label="是" value="1"></el-option>
-            <el-option label="否" value="0"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-date-picker
-          :clearable='false'
-            v-model="searchForm.month"
-            type="month"
-            value-format="yyyy-MM"
-            placeholder="选择年月"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="search" type="danger">搜索</el-button>
-          <el-button @click="onReSet" type="primary">重置</el-button>
-        </el-form-item>
-      </el-form>
-      <div class="tableWrap">
-        <el-table
-          style="width: 100%"
-          :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-          :data="tableData"
-        >
-          <el-table-column align="center" prop="id" label="课程组编号"></el-table-column>
-          <el-table-column align="center" prop="name" label="课程组名称"></el-table-column>
-          <el-table-column align="center" prop="organName" label="分部名称"></el-table-column>
-          <!-- <el-table-column align="center" prop="id" label="类型"></el-table-column> -->
-          <el-table-column align="center" prop="id" label="收费类型">
-            <template slot-scope="scope">
-              <div>{{scope.row.buyMonths>0?'付费':'免费'}}</div>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="状态">
-            <template slot-scope="scope">
-              <div>{{ scope.row.coursesExpireDate | coursesStatus}}</div>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="teacherName" label="指导老师"></el-table-column>
-          <el-table-column align="center" label="课次">
-            <template slot-scope="scope">
-              <div>{{scope.row.currentClassTimes+'/'+scope.row.totalClassTimes}}</div>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="id" label="是否评价">
-            <template slot-scope="scope">
-              <div>{{scope.row.evaluateStatus?'是':'否'}}</div>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="操作">
-            <template slot-scope="scope">
-              <div>
-                <el-button type="text" v-permission="'evaluateList/look'" v-show='scope.row.evaluateStatus' @click="gotoEvakuateDetail(scope.row)">查看</el-button>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-        <pagination
-          :total="rules.total"
-          :page.sync="rules.page"
-          :limit.sync="rules.limit"
-          :page-sizes="rules.page_size"
-          @pagination="getList"
-        />
-      </div>
+  <div class="m-core">
+    <el-form :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
+      <!-- 状态 指导老师 活动方案-->
+      <el-form-item>
+        <el-input v-model.trim="searchForm.search"
+                  @keyup.enter.native="search"
+                  placeholder="请输入课程组名称 ID"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-select placeholder="请选择分部"
+                   v-model="searchForm.organId"
+                   clearable>
+          <el-option v-for="(item,index) in organList"
+                     :label="item.name"
+                     :value="item.id"
+                     :key="index"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-select placeholder="请选择状态"
+                   v-model="searchForm.isOver"
+                   clearable>
+          <el-option label="已完成"
+                     value="1"></el-option>
+          <el-option label="进行中"
+                     value="0"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-select placeholder="请选择指导老师"
+                   v-model="searchForm.teacherId"
+                   clearable
+                   filterable>
+          <el-option v-for="(item,index) in teacherList"
+                     :label="item.realName"
+                     :value="item.id"
+                     :key="index"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-select placeholder="是否完成评价"
+                   v-model="searchForm.hasReport"
+                   clearable>
+          <el-option label="是"
+                     value="1"></el-option>
+          <el-option label="否"
+                     value="0"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker :clearable='false'
+                        v-model="searchForm.month"
+                        type="month"
+                        value-format="yyyy-MM"
+                        placeholder="选择年月"></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="search"
+                   type="danger">搜索</el-button>
+        <el-button @click="onReSet"
+                   type="primary">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <div class="tableWrap">
+      <el-table style="width: 100%"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                :data="tableData">
+        <el-table-column align="center"
+                         prop="id"
+                         label="课程组编号"></el-table-column>
+        <el-table-column align="center"
+                         prop="name"
+                         label="课程组名称"></el-table-column>
+        <el-table-column align="center"
+                         prop="organName"
+                         label="分部名称"></el-table-column>
+        <!-- <el-table-column align="center" prop="id" label="类型"></el-table-column> -->
+        <el-table-column align="center"
+                         prop="id"
+                         label="收费类型">
+          <template slot-scope="scope">
+            <div>{{scope.row.buyMonths>0?'付费':'免费'}}</div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center"
+                         label="状态">
+          <template slot-scope="scope">
+            <div>{{ scope.row.coursesExpireDate | coursesStatus}}</div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center"
+                         prop="teacherName"
+                         label="指导老师"></el-table-column>
+        <el-table-column align="center"
+                         label="课次">
+          <template slot-scope="scope">
+            <div>{{scope.row.currentClassTimes+'/'+scope.row.totalClassTimes}}</div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center"
+                         prop="id"
+                         label="是否评价">
+          <template slot-scope="scope">
+            <div>{{scope.row.evaluateStatus?'是':'否'}}</div>
+          </template>
+        </el-table-column>
+        <el-table-column align="center"
+                         label="操作">
+          <template slot-scope="scope">
+            <div>
+              <el-button type="text"
+                         v-permission="'evaluateList/look'"
+                         v-show='scope.row.evaluateStatus'
+                         @click="gotoEvakuateDetail(scope.row)">查看</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination :total="rules.total"
+                  :page.sync="rules.page"
+                  :limit.sync="rules.limit"
+                  :page-sizes="rules.page_size"
+                  @pagination="getList" />
     </div>
+  </div>
 
 </template>
 <script>
@@ -114,7 +137,7 @@ import pagination from "@/components/Pagination/index";
 import { getReviews, getTeacher, getEmployeeOrgan } from "@/api/buildTeam";
 export default {
   components: { pagination },
-  data() {
+  data () {
     return {
       searchForm: {
         organId: null,
@@ -137,15 +160,15 @@ export default {
       organList: []
     };
   },
-  created() {
-    this.init();
+  created () {
+    // this.init();
   },
-  activated() {
+  activated () {
     this.init();
   },
   methods: {
-    init() {
-        if (this.$route.query.search) {
+    init () {
+      if (this.$route.query.search) {
         this.$route.query.search instanceof Object ? this.searchForm = this.$route.query.search : this.searchForm = JSON.parse(this.$route.query.search);
       }
       if (this.$route.query.rules) {
@@ -175,7 +198,7 @@ export default {
       this.getList();
       // getReviews()
     },
-    getList() {
+    getList () {
       // 数据效验
       let obj = {};
       obj.hasReport = this.searchForm.hasReport || null;
@@ -184,44 +207,46 @@ export default {
       obj.organId = this.searchForm.organId || null;
       obj.page = this.rules.page;
       obj.rows = this.rules.limit;
-      obj.search = this.searchForm.search|| null
+      obj.search = this.searchForm.search || null
       obj.teacherId = this.searchForm.teacherId || null;
       getReviews(obj).then(res => {
         if (res.code == 200) {
           this.tableData = res.data.rows;
-          this.rules.total = res.data.total; 
+          this.rules.total = res.data.total;
         }
       });
     },
-    search() {
+    search () {
       this.rules.page = 1;
       this.getList();
     },
-    onReSet() {
-      this.searchForm = { organId: null,
+    onReSet () {
+      this.searchForm = {
+        organId: null,
         isOver: "",
         teacherId: null,
         hasReport: "",
         month: null,
-        search: null}
-            var now = new Date();
-        this.searchForm.month = new Date(
-          Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
-        )
-          .toISOString()
-          .slice(0, 7);
-      
+        search: null
+      }
+      var now = new Date();
+      this.searchForm.month = new Date(
+        Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+      )
+        .toISOString()
+        .slice(0, 7);
+
     },
-    gotoEvakuateDetail(row){
+    gotoEvakuateDetail (row) {
       let id = row.id;
       let evaluateId = row.evaluateId
       let search = JSON.stringify(this.searchForm)
       let rules = JSON.stringify(this.rules)
-      this.$router.push({path:'/operateManager/evaluateDetail',query:{id,evaluateId,search,rules}})
+      this.$router.push({ path: '/operateManager/evaluateDetail', query: { id, evaluateId, search, rules } })
     }
   },
   filters: {
-    coursesStatus(val) {
+    coursesStatus (val) {
       return new Date().getTime() - new Date(val) > 0 ? "已完成" : "进行中";
     }
   }

+ 1 - 1
src/views/evaluateManager/index.vue

@@ -50,7 +50,7 @@ export default {
     }
   },
   created () {
-    this.init();
+    // this.init();
   },
   activated () {
     this.init();

+ 1 - 1
src/views/evaluateManager/networkList.vue

@@ -444,7 +444,7 @@ export default {
   created () { },
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted () {
-    this.init();
+    // this.init();
   },
   activated () {
     this.init();

+ 1 - 1
src/views/evaluateManager/vipEvaluateList.vue

@@ -384,7 +384,7 @@ export default {
   created () { },
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted () {
-    this.init();
+    // this.init();
   },
   activated () {
     this.init();

+ 59 - 39
src/views/helpCenter/helpCategory.vue

@@ -3,23 +3,38 @@
   <div class="m-container">
     <h2>
       <!-- <div class="squrt"></div>帮助中心分类 -->
-      <el-page-header @back="onCancel" content="帮助中心分类"></el-page-header>
+      <el-page-header @back="onCancel"
+                      content="帮助中心分类"></el-page-header>
     </h2>
     <div class="m-core">
-      <div class="newBand" v-permission="'helpCenterCatalog/modify'" @click="openTypes('create')">添加</div>
+      <div class="newBand"
+           v-permission="'helpCenterCatalog/modify'"
+           @click="openTypes('create')">添加</div>
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data="tableList" 
-          :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-          row-key="id"
-          :tree-props="{children: 'children', hasChildren: 'hasChildren'}">>
-          <el-table-column width="120px" align="center" prop="id" label="分类编号"></el-table-column>
-          <el-table-column align="center" prop="text" label="分类名称"></el-table-column>
-          <el-table-column align="center" label="操作">
+        <el-table :data="tableList"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}"
+                  row-key="id"
+                  :tree-props="{children: 'children', hasChildren: 'hasChildren'}">>
+          <el-table-column width="120px"
+                           align="center"
+                           prop="id"
+                           label="分类编号"></el-table-column>
+          <el-table-column align="center"
+                           prop="text"
+                           label="分类名称"></el-table-column>
+          <el-table-column align="center"
+                           label="操作">
             <template slot-scope="scope">
-              <el-button v-permission="'helpCenterCatalog/modify'" @click="openTypes('add', scope.row)" type="text">添加</el-button>
-              <el-button v-permission="'helpCenterCatalog/modify'" @click="openTypes('update', scope.row)" type="text">修改</el-button>
-              <el-button v-permission="'helpCenterCatalog/delete'" @click="onTypeDelOpeation(scope.row)" type="text">删除</el-button>
+              <el-button v-permission="'helpCenterCatalog/modify'"
+                         @click="openTypes('add', scope.row)"
+                         type="text">添加</el-button>
+              <el-button v-permission="'helpCenterCatalog/modify'"
+                         @click="openTypes('update', scope.row)"
+                         type="text">修改</el-button>
+              <el-button v-permission="'helpCenterCatalog/delete'"
+                         @click="onTypeDelOpeation(scope.row)"
+                         type="text">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -32,20 +47,25 @@
         /> -->
       </div>
     </div>
-    <el-dialog
-      :title="formTitle[formActionTitle]"
-      :visible.sync="typeStatus"
-      @close="onFormClose('ruleForm')"
-      width="500px"
-    >
-      <el-form :model="form" :rules="rules" ref="ruleForm">
-        <el-form-item label="分类名称" prop="text" :label-width="formLabelWidth">
-          <el-input v-model.trim="form.text" autocomplete="off"></el-input>
+    <el-dialog :title="formTitle[formActionTitle]"
+               :visible.sync="typeStatus"
+               @close="onFormClose('ruleForm')"
+               width="500px">
+      <el-form :model="form"
+               :rules="rules"
+               ref="ruleForm">
+        <el-form-item label="分类名称"
+                      prop="text"
+                      :label-width="formLabelWidth">
+          <el-input v-model.trim="form.text"
+                    autocomplete="off"></el-input>
         </el-form-item>
       </el-form>
-      <span slot="footer" class="dialog-footer">
+      <span slot="footer"
+            class="dialog-footer">
         <el-button @click="typeStatus = false">取 消</el-button>
-        <el-button type="primary" @click="onTypeSubmit('ruleForm')">确 定</el-button>
+        <el-button type="primary"
+                   @click="onTypeSubmit('ruleForm')">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -61,7 +81,7 @@ import {
 export default {
   components: { pagination },
   name: "helpCategory",
-  data() {
+  data () {
     return {
       tableList: [],
       subjectList: [], // 声部列表
@@ -90,14 +110,14 @@ export default {
       }
     };
   },
-  activated() {
+  activated () {
     this.getList()
   },
-  mounted() {
-    this.getList()
+  mounted () {
+    // this.getList()
   },
   methods: {
-    onTypeDelOpeation(row) {
+    onTypeDelOpeation (row) {
       this.$confirm('您是否删除该分类?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -106,11 +126,11 @@ export default {
         helpCenterCatalogDelete({ id: row.id }).then(res => {
           this.messageTips('删除', res)
         })
-      }).catch(() => {         
+      }).catch(() => {
       })
-      
+
     },
-    onTypeSubmit(formName) {
+    onTypeSubmit (formName) {
       // 添加数据
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -133,7 +153,7 @@ export default {
       });
     },
 
-    messageTips(title, res) {
+    messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success(title + "成功");
         this.typeStatus = false;
@@ -142,7 +162,7 @@ export default {
         this.$message.error(res.msg);
       }
     },
-    getList() {
+    getList () {
       // {
       //   delFlag: 0
       //   rows: this.pageInfo.limit,
@@ -154,7 +174,7 @@ export default {
         let result = res.data;
         if (res.code == 200) {
           this.tableList = this.setTableData(result);
-          
+
         }
       });
     },
@@ -173,10 +193,10 @@ export default {
       })
       return list
     },
-    openTypes(type, row) {
+    openTypes (type, row) {
       this.typeStatus = true;
       this.formActionTitle = type;
-      if(type == 'create') {
+      if (type == 'create') {
         // 添加时,默认添加一级分类
         this.form.parentId = 0
       } else if (type == "update") {
@@ -186,16 +206,16 @@ export default {
           text: row.text, // 作业模块名称
           parentId: 0
         };
-      } else if(type == 'add') {
+      } else if (type == 'add') {
         this.form.parentId = row.id
       }
     },
-    onCancel() {
+    onCancel () {
       this.$router.push({
         path: "/insideSetting/helpContent"
       });
     },
-    onFormClose(formName) {
+    onFormClose (formName) {
       // 关闭弹窗重置验证
       this.form = {
         name: null, // 作业模块名称

+ 124 - 96
src/views/helpCenter/helpContent.vue

@@ -5,77 +5,105 @@
       <div class="squrt"></div>帮助中心
     </h2>
     <div class="m-core">
-      <div class="newBand" v-permission="'helpCenterContent/modify'" @click="openTypes('create')">添加</div>
-      <div class="newBand" v-permission="'/helpCategory'" @click="onToUrl()">分类管理</div>
+      <div class="newBand"
+           v-permission="'helpCenterContent/modify'"
+           @click="openTypes('create')">添加</div>
+      <div class="newBand"
+           v-permission="'/helpCategory'"
+           @click="onToUrl()">分类管理</div>
       <!-- 搜索标题 -->
-      <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+      <el-form :inline="true"
+               class="searchForm"
+               v-model.trim="searchForm">
         <el-form-item prop="hasPracticeCourse">
           <el-cascader ref="cascader"
-            :show-all-levels="false"
-            :options="treeList"
-            v-model="searchForm.catalogId"
-            :props="{ checkStrictly: true }"
-            clearable></el-cascader>
+                       :show-all-levels="false"
+                       :options="treeList"
+                       v-model="searchForm.catalogId"
+                       :props="{ checkStrictly: true }"
+                       clearable></el-cascader>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getList" type="danger">搜索</el-button>
+          <el-button @click="getList"
+                     type="danger">搜索</el-button>
         </el-form-item>
       </el-form>
       <div class="tableWrap">
-        <el-table :data="tableList" 
-          :header-cell-style="{background:'#EDEEF0',color:'#444'}">>
-          <el-table-column width="120px" align="center" prop="id" label="编号"></el-table-column>
-          <el-table-column align="center" prop="title" label="标题"></el-table-column>
-          <el-table-column align="center" prop="content" label="内容"></el-table-column>
-          <el-table-column align="center" prop="catalog.text" label="分类名"></el-table-column>
-          <el-table-column align="center" label="操作">
+        <el-table :data="tableList"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">>
+          <el-table-column width="120px"
+                           align="center"
+                           prop="id"
+                           label="编号"></el-table-column>
+          <el-table-column align="center"
+                           prop="title"
+                           label="标题"></el-table-column>
+          <el-table-column align="center"
+                           prop="content"
+                           label="内容"></el-table-column>
+          <el-table-column align="center"
+                           prop="catalog.text"
+                           label="分类名"></el-table-column>
+          <el-table-column align="center"
+                           label="操作">
             <template slot-scope="scope">
-              <el-button v-permission="'helpCenterContent/modify'" @click="openTypes('update', scope.row)" type="text">修改</el-button>
+              <el-button v-permission="'helpCenterContent/modify'"
+                         @click="openTypes('update', scope.row)"
+                         type="text">修改</el-button>
               <el-button @click="onTypeDelOpeation(scope.row)"
-                v-permission="'helpCenterContent/delete'" type="text">删除</el-button>
+                         v-permission="'helpCenterContent/delete'"
+                         type="text">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
-        <pagination
-          :total="pageInfo.total"
-          :page.sync="pageInfo.page"
-          :limit.sync="pageInfo.limit"
-          :page-sizes="pageInfo.page_size"
-          @pagination="getList"
-        />
+        <pagination :total="pageInfo.total"
+                    :page.sync="pageInfo.page"
+                    :limit.sync="pageInfo.limit"
+                    :page-sizes="pageInfo.page_size"
+                    @pagination="getList" />
       </div>
     </div>
-    <el-dialog
-      :title="formTitle[formActionTitle]"
-      :visible.sync="typeStatus"
-      @close="onFormClose('ruleForm')"
-      width="500px"
-    >
-      <el-form :model="form" :rules="rules" ref="ruleForm">
-        <el-form-item label="标题" prop="title" :label-width="formLabelWidth">
-          <el-input v-model.trim="form.title" autocomplete="off" placeholder="请输入标题"></el-input>
+    <el-dialog :title="formTitle[formActionTitle]"
+               :visible.sync="typeStatus"
+               @close="onFormClose('ruleForm')"
+               width="500px">
+      <el-form :model="form"
+               :rules="rules"
+               ref="ruleForm">
+        <el-form-item label="标题"
+                      prop="title"
+                      :label-width="formLabelWidth">
+          <el-input v-model.trim="form.title"
+                    autocomplete="off"
+                    placeholder="请输入标题"></el-input>
         </el-form-item>
-        <el-form-item label="分类" prop="catalogId" :label-width="formLabelWidth">
-          <el-cascader v-if="typeStatus" style="width: 100%;"
-            :show-all-levels="false"
-            ref="formCascader"
-            :options="treeList"
-            v-model="form.catalogId"
-            :props="{ checkStrictly: true }"
-            clearable></el-cascader>
+        <el-form-item label="分类"
+                      prop="catalogId"
+                      :label-width="formLabelWidth">
+          <el-cascader v-if="typeStatus"
+                       style="width: 100%;"
+                       :show-all-levels="false"
+                       ref="formCascader"
+                       :options="treeList"
+                       v-model="form.catalogId"
+                       :props="{ checkStrictly: true }"
+                       clearable></el-cascader>
         </el-form-item>
-        <el-form-item label="内容" prop="content" :label-width="formLabelWidth">
-          <el-input
-            type="textarea"
-            :rows="3"
-            placeholder="请输入内容"
-            v-model="form.content">
+        <el-form-item label="内容"
+                      prop="content"
+                      :label-width="formLabelWidth">
+          <el-input type="textarea"
+                    :rows="3"
+                    placeholder="请输入内容"
+                    v-model="form.content">
           </el-input>
         </el-form-item>
       </el-form>
-      <span slot="footer" class="dialog-footer">
+      <span slot="footer"
+            class="dialog-footer">
         <el-button @click="typeStatus = false">取 消</el-button>
-        <el-button type="primary" @click="onTypeSubmit('ruleForm')">确 定</el-button>
+        <el-button type="primary"
+                   @click="onTypeSubmit('ruleForm')">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -92,7 +120,7 @@ import {
 export default {
   components: { pagination },
   name: "helpCategory",
-  data() {
+  data () {
     return {
       searchForm: {
         catalogId: null
@@ -127,16 +155,16 @@ export default {
       tempTreeList: []
     };
   },
-  activated() {
+  activated () {
     this.getList();
     this.getTreeList()
   },
-  mounted() {
-    this.getList();
-    this.getTreeList()
+  mounted () {
+    // this.getList();
+    // this.getTreeList()
   },
   methods: {
-    onTypeDelOpeation(row) {
+    onTypeDelOpeation (row) {
       this.$confirm('您是否删除该内容?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -145,11 +173,11 @@ export default {
         helpCenterContentDelete({ id: row.id }).then(res => {
           this.messageTips('删除', res)
         })
-      }).catch(() => {         
+      }).catch(() => {
       })
-      
+
     },
-    onTypeSubmit(formName) {
+    onTypeSubmit (formName) {
       // 添加数据
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -178,7 +206,7 @@ export default {
         }
       });
     },
-    messageTips(title, res) {
+    messageTips (title, res) {
       if (res.code == 200) {
         this.$message.success(title + "成功");
         this.typeStatus = false;
@@ -187,9 +215,9 @@ export default {
         this.$message.error(res.msg);
       }
     },
-    getList() {
+    getList () {
       let catalogId = this.searchForm.catalogId ? this.searchForm.catalogId : null
-      if(catalogId) {
+      if (catalogId) {
         catalogId = catalogId[catalogId.length - 1]
       }
       let params = {
@@ -205,7 +233,7 @@ export default {
         }
       });
     },
-    getTreeList() {
+    getTreeList () {
       helpCenterCatalogList({
         parentId: 0
       }).then(res => {
@@ -231,7 +259,7 @@ export default {
       })
       return list
     },
-    openTypes(type, row) {
+    openTypes (type, row) {
       this.typeStatus = true
       this.formActionTitle = type
       if (type == "update") {
@@ -244,40 +272,40 @@ export default {
         };
       }
     },
-    onToUrl() {
+    onToUrl () {
       this.$router.push('/insideSetting/helpCategory')
     },
-    getAllIds(row) {
-      let idAndParent=[];// idAndParent保存 Tree所有节点的id和parentId
-      this.getIdAndParent(this.treeList,idAndParent);	
+    getAllIds (row) {
+      let idAndParent = [];// idAndParent保存 Tree所有节点的id和parentId
+      this.getIdAndParent(this.treeList, idAndParent);
       let parentIds = []; // 用于保存选中节点的父节点及父节点的父节点
       this.getId(row.catalogId, parentIds, idAndParent);
       return parentIds.reverse(); //反转数组
     },
-    getIdAndParent(tree, idAndParentIds) {// idAndParentIds用来保存所有节点的id,parentId
-			// 对原有的数据结构进行遍历,拿出所有节点的id,parentId到一个一维数组中。
-			tree.forEach(item => {
-				let mid = {
-					id: item.value,
-					parentId: item.parentId,
-				};
-				idAndParentIds.push(mid);
-				if (item.children) {
-					this.getIdAndParent(item.children, idAndParentIds);
-				}
-			});
-		},
-    getId(id, parentIds, idAndParent) {
-			idAndParent.forEach(item => {
-				if (item.id == id) {
-					parentIds.push(id);
-					if (item.parentId != -1) {
-						this.getId(item.parentId, parentIds, idAndParent);
-					}
-				}
-			});
+    getIdAndParent (tree, idAndParentIds) {// idAndParentIds用来保存所有节点的id,parentId
+      // 对原有的数据结构进行遍历,拿出所有节点的id,parentId到一个一维数组中。
+      tree.forEach(item => {
+        let mid = {
+          id: item.value,
+          parentId: item.parentId,
+        };
+        idAndParentIds.push(mid);
+        if (item.children) {
+          this.getIdAndParent(item.children, idAndParentIds);
+        }
+      });
+    },
+    getId (id, parentIds, idAndParent) {
+      idAndParent.forEach(item => {
+        if (item.id == id) {
+          parentIds.push(id);
+          if (item.parentId != -1) {
+            this.getId(item.parentId, parentIds, idAndParent);
+          }
+        }
+      });
     },
-    onFormClose(formName) {
+    onFormClose (formName) {
       // 关闭弹窗重置验证
       this.form = {
         title: null, // 标题
@@ -310,11 +338,11 @@ export default {
   width: 100% !important;
 }
 /deep/.el-table .cell {
-    display: -webkit-box;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    -webkit-line-clamp: 3;
-    -webkit-box-orient: vertical;
+  display: -webkit-box;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
 }
 /deep/.el-dialog__body {
   padding: 10px 20px;

+ 2 - 2
src/views/levelManager/levelManager.vue

@@ -216,8 +216,8 @@ export default {
     this.__init();
   },
   mounted () {
-    this.getList();
-    this.__init();
+    // this.getList();
+    // this.__init();
   },
   methods: {
     __init () {

+ 1 - 1
src/views/operateManager/operateStudent.vue

@@ -210,7 +210,7 @@ export default {
       }
     });
     // 获取分部
-    this.init();
+    // this.init();
   },
   methods: {
     init () {

+ 1 - 1
src/views/operateManager/serverIndexDetail.vue

@@ -162,7 +162,7 @@ export default {
     }
   },
   mounted () {
-    this.init()
+    // this.init()
   },
   activated () {
     this.init()

+ 1 - 1
src/views/operateManager/serverIndexList.vue

@@ -320,7 +320,7 @@ export default {
       }
     });
     // 获取分部  老师
-    this.init();
+    // this.init();
   },
   activated () {
     this.init();

+ 1 - 1
src/views/recodeManager/recodeList.vue

@@ -227,7 +227,7 @@ export default {
         this.organList = res.data;
       }
     });
-    this.init();
+    // this.init();
 
 
   },

+ 3 - 3
src/views/repairManager/repairList.vue

@@ -327,9 +327,9 @@ export default {
         }
       }
     })
-    if (!this.isInit) {
-      this.init();
-    }
+    // if (!this.isInit) {
+    //   this.init();
+    // }
 
   },
   activated () {

+ 25 - 26
src/views/resetTeaming/components/resetPayList.vue

@@ -40,12 +40,12 @@
         <el-table-column align="center"
                          prop="paymentPattern"
                          label="缴费方式">
-            <template slot-scope="scope">
-              <div>
-                {{scope.row.paymentPattern | teamPayStatus}}
-              </div>
-            </template>
-          </el-table-column>
+          <template slot-scope="scope">
+            <div>
+              {{scope.row.paymentPattern | teamPayStatus}}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column align="center"
                          prop="paymentValidStartDate"
                          label="缴费有效期开始日期">
@@ -140,23 +140,22 @@
                           value-format="yyyy-MM-dd"
                           placeholder="结束日期"></el-date-picker>
         </el-form-item>
-        <el-form-item
-                      label="缴费方式"
+        <el-form-item label="缴费方式"
                       prop="paymentPattern"
                       :rules="[{ required: true, message: '请选择缴费方式'},]">
-                      <el-select placeholder="缴费方式"
-                                  style="width: 220px"
-                                  clearable
-                                  filterable
-                                  @change="paymentPatternChange"
-                                  v-model.trim="payForm.paymentPattern">
-                                  <el-option :value="0"
-                                              label="按月"></el-option>
-                                  <el-option :value="1"
-                                              label="按季"></el-option>
-                                  <el-option :value="2"
-                                              label="一次性"></el-option>
-                      </el-select>
+          <el-select placeholder="缴费方式"
+                     style="width: 220px"
+                     clearable
+                     filterable
+                     @change="paymentPatternChange"
+                     v-model.trim="payForm.paymentPattern">
+            <el-option :value="0"
+                       label="按月"></el-option>
+            <el-option :value="1"
+                       label="按季"></el-option>
+            <el-option :value="2"
+                       label="一次性"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="缴费有效期开始"
                       :rules="[{ required: true, message: '请设置缴费有效期开始日期',trigger: 'blur'}]"
@@ -303,7 +302,7 @@ export default {
   mounted () {
     // 获取分部
 
-    this.init();
+    // this.init();
 
   },
   activated () {
@@ -321,8 +320,8 @@ export default {
         }
       })
     },
-    paymentPatternChange(val) {
-      if(val === 2) {
+    paymentPatternChange (val) {
+      if (val === 2) {
         this.payForm.paymentValidEndDate = null
       }
     },
@@ -423,8 +422,8 @@ export default {
       obj.startPaymentDate = this.payForm.startPaymentDate + ' 00:00:00'
       obj.deadlinePaymentDate = this.payForm.deadlinePaymentDate + ' 23:59:59'
       obj.paymentValidStartDate = this.payForm.paymentValidStartDate ? dayjs(this.payForm.paymentValidStartDate).format('YYYY-MM-DD') : this.payForm.paymentValidStartDate,
-      obj.paymentValidEndDate = this.payForm.paymentValidEndDate ? dayjs(this.payForm.paymentValidEndDate).format('YYYY-MM-DD') : this.payForm.paymentValidEndDate,
-      obj.paymentPattern = this.payForm.paymentPattern
+        obj.paymentValidEndDate = this.payForm.paymentValidEndDate ? dayjs(this.payForm.paymentValidEndDate).format('YYYY-MM-DD') : this.payForm.paymentValidEndDate,
+        obj.paymentPattern = this.payForm.paymentPattern
       obj.type = this.payForm.type
       obj.memo = this.payForm.memo
       addMusicGroupPaymentCalender(obj).then(res => {

+ 1 - 1
src/views/resetTeaming/components/resetSound.vue

@@ -354,7 +354,7 @@ export default {
   },
   mounted () {
 
-    this.init()
+    // this.init()
   },
   activated () {
     this.init()

+ 4 - 2
src/views/resetTeaming/components/strudentPayInfo.vue

@@ -118,7 +118,9 @@
              @click="delStudentBtn"
              v-if="info.paymentStatus == 0"
              v-permission="'musicGroupPaymentCalenderDetail/batchDel'">删除学员</div>
-        <div class="newBand" v-permission="'export/musicGroupPaymentCalenderDetail'" @click="onMusicGroupPaymentCalenderDetail">缴费记录导出</div>
+        <div class="newBand"
+             v-permission="'export/musicGroupPaymentCalenderDetail'"
+             @click="onMusicGroupPaymentCalenderDetail">缴费记录导出</div>
       </div>
 
       <div class="tableWrap">
@@ -381,7 +383,7 @@ export default {
       }
     });
     // 获取分部
-    this.init();
+    // this.init();
   },
   activated () {
     this.init();

+ 1 - 1
src/views/resetTeaming/components/studentPayBase.vue

@@ -175,7 +175,7 @@ export default {
 
     // 获取分部
 
-    this.init();
+    // this.init();
 
 
   },

+ 1 - 1
src/views/resetTeaming/index.vue

@@ -82,7 +82,7 @@ export default {
     }
   },
   created () {
-    this.__init()
+    // this.__init()
   },
   beforeDestroy () {
     sessionStorage.setItem('setStep', 0)

+ 1 - 1
src/views/returnVisitManager/returnVisitList.vue

@@ -206,7 +206,7 @@ export default {
         this.organList = res.data;
       }
     })
-    this.getList()
+    // this.getList()
   },
   activated () {
     this.getList()

+ 1 - 1
src/views/settlementManager/settlementList.vue

@@ -161,7 +161,7 @@ export default {
       }
     });
     // 获取分部
-    this.init();
+    // this.init();
   },
   activated () {
     this.init();

+ 1 - 1
src/views/studentManager/components/studentCashout.vue

@@ -74,7 +74,7 @@ export default {
     }
   },
   mounted () {
-    this.getList()
+    // this.getList()
   },
   activated () {
     this.getList()

+ 2 - 2
src/views/studentManager/components/studentInfo.vue

@@ -74,9 +74,9 @@ export default {
     }
   },
   mounted () {
-    this.__init()
+    // this.__init()
   },
-  activated() {
+  activated () {
     this.__init()
   },
   methods: {

+ 1 - 1
src/views/studentManager/components/studentNetwork.vue

@@ -93,7 +93,7 @@ export default {
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted () {
     // 获取分部
-    this.init();
+    // this.init();
   },
   activated () {
     this.init();

+ 3 - 3
src/views/studentManager/components/studentOrder.vue

@@ -391,9 +391,9 @@ export default {
     };
   },
   mounted () {
-    this.searchForm.studentId = this.$route.query.userId;
-    this.getList();
-    this.__init();
+    // this.searchForm.studentId = this.$route.query.userId;
+    // this.getList();
+    // this.__init();
   },
   activated () {
     this.searchForm.studentId = this.$route.query.userId;

+ 12 - 13
src/views/studentManager/components/studentOutList.vue

@@ -10,14 +10,13 @@
                   @keyup.enter.native='onSearch'
                   v-model.trim="searchForm.search"></el-input>
       </el-form-item>
-       <el-form-item label="课程状态">
-        <el-select v-model.trim="searchForm.groupStatus" clearable>
-          <el-option
-            v-for="(item,index) in commGroupStatus"
-            :key="index"
-            :value="item.value"
-            :label="item.label"
-          ></el-option>
+      <el-form-item label="课程状态">
+        <el-select v-model.trim="searchForm.groupStatus"
+                   clearable>
+          <el-option v-for="(item,index) in commGroupStatus"
+                     :key="index"
+                     :value="item.value"
+                     :label="item.label"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -55,7 +54,7 @@
         <el-table-column label="开课时间"
                          align='center'
                          prop="firstClassesStartTime">
-                         <template slot-scope="scope">
+          <template slot-scope="scope">
             {{ scope.row.firstClassesStartTime | dateForMinFormat }}
           </template>
         </el-table-column>
@@ -114,13 +113,13 @@ export default {
       searchForm: {
         studentId: null,
         search: null,
-        groupStatus:null
+        groupStatus: null
       },
       checkIndex: null, // 选中的课程
       dialogTableVisible: false,
       tableList: [],
       courseList: [],
-      commGroupStatus:commGroupStatus,
+      commGroupStatus: commGroupStatus,
       pageInfo: {
         // 分页规则
         limit: 10, // 限制显示条数
@@ -138,9 +137,9 @@ export default {
   },
   mounted () {
     this.searchForm.studentId = this.$route.query.userId
-    this.getCourseList()
+    // this.getCourseList()
   },
-  activated() {
+  activated () {
     this.userId = this.$route.query.userId || null
     this.searchForm.studentId = this.$route.query.userId
     this.getCourseList()

+ 2 - 2
src/views/studentManager/components/studentPayList.vue

@@ -111,8 +111,8 @@ export default {
     }
   },
   mounted () {
-    this.searchForm.studentId = this.$route.query.userId
-    this.getList()
+    // this.searchForm.studentId = this.$route.query.userId
+    // this.getList()
   },
   activated () {
     this.searchForm.studentId = this.$route.query.userId

+ 2 - 2
src/views/studentManager/components/studentRecord.vue

@@ -172,8 +172,8 @@ export default {
     };
   },
   mounted () {
-    this.searchForm.studentId = this.$route.query.userId;
-    this.getList();
+    // this.searchForm.studentId = this.$route.query.userId;
+    // this.getList();
   },
   activated () {
     this.searchForm.studentId = this.$route.query.userId;

+ 2 - 2
src/views/studentManager/components/studentVip.vue

@@ -154,8 +154,8 @@ export default {
     this.userId = this.$route.query.userId || null;
   },
   mounted () {
-    this.searchForm.studentId = this.$route.query.userId;
-    this.getCourseList();
+    // this.searchForm.studentId = this.$route.query.userId;
+    // this.getCourseList();
   },
   activated () {
     this.userId = this.$route.query.userId || null;

+ 97 - 72
src/views/studentManager/components/teamAndcourse.vue

@@ -1,89 +1,104 @@
 <template>
   <div>
     <div class="tabTopWrap">
-      <el-table :data="musicGroupInfo" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column align="center" prop="musicGroupId" label="乐团编号"></el-table-column>
-        <el-table-column align="center" prop="joinMusicGroupDate" label="入团时间">
+      <el-table :data="musicGroupInfo"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align="center"
+                         prop="musicGroupId"
+                         label="乐团编号"></el-table-column>
+        <el-table-column align="center"
+                         prop="joinMusicGroupDate"
+                         label="入团时间">
           <template slot-scope="scope">{{ scope.row.joinMusicGroupDate | dateForMinFormat }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="musicGroupName" label="乐团名称"></el-table-column>
-        <el-table-column align="center" label="乐团状态">
+        <el-table-column align="center"
+                         prop="musicGroupName"
+                         label="乐团名称"></el-table-column>
+        <el-table-column align="center"
+                         label="乐团状态">
           <template slot-scope="scope">{{ scope.row.musicGroupStatus | musicGroupType }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="subjectName" label="专业"></el-table-column>
-        <el-table-column align="center" prop label="乐器来源">
+        <el-table-column align="center"
+                         prop="subjectName"
+                         label="专业"></el-table-column>
+        <el-table-column align="center"
+                         prop
+                         label="乐器来源">
           <template slot-scope="scope">{{ scope.row.kitPurchaseMethod | instrumentType }}</template>
         </el-table-column>
-        <el-table-column align="center" label="学员状态">
+        <el-table-column align="center"
+                         label="学员状态">
           <template slot-scope="scope">
             {{ scope.row.userMusicGroupStatus | musicGroupStudentType }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="退团时间" prop="quitMusicGroupDate">
+        <el-table-column align="center"
+                         label="退团时间"
+                         prop="quitMusicGroupDate">
           <template slot-scope="scope">
             <span v-if="scope.row.userMusicGroupStatus == 'QUIT'">
               {{ scope.row.quitMusicGroupDate | formatTimer }}
             </span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="所选乐器">
+        <el-table-column align="center"
+                         label="所选乐器">
           <template slot-scope="scope">
-            <span
-              v-for="good in scope.row.userGoodsDtos"
-              :key="good.goodsId"
-            >{{ good.goodsName | joinArray(',') }}</span>
+            <span v-for="good in scope.row.userGoodsDtos"
+                  :key="good.goodsId">{{ good.goodsName | joinArray(',') }}</span>
             {{ scope.row.kitPurchaseMethod == 'LEASE' ? '(租赁:' + scope.row.depositFee + ')' : '' }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="操作">
+        <el-table-column align="center"
+                         label="操作">
           <template slot-scope="scope">
-            <el-button
-              @click="onCourse(scope.row)"
-              v-permission="'studentManage/findStudentCourses'"
-              type="text"
-            >排课详情</el-button>
+            <el-button @click="onCourse(scope.row)"
+                       v-permission="'studentManage/findStudentCourses'"
+                       type="text">排课详情</el-button>
           </template>
         </el-table-column>
       </el-table>
     </div>
     <!-- 搜索类型 -->
-    <el-form v-if="coursesShow" :inline="true" class="searchForm" v-model.trim="searchForm">
+    <el-form v-if="coursesShow"
+             :inline="true"
+             class="searchForm"
+             v-model.trim="searchForm">
       <el-form-item>
-        <el-select v-model.trim="searchForm.classGroupType" clearable filterable placeholder="课程类型">
-          <el-option
-            v-for="(item, index) in courseArray"
-            :key="index"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
+        <el-select v-model.trim="searchForm.classGroupType"
+                   clearable
+                   filterable
+                   placeholder="课程类型">
+          <el-option v-for="(item, index) in courseArray"
+                     :key="index"
+                     :label="item.label"
+                     :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model.trim="searchForm.courseStatus" clearable filterable placeholder="课程状态">
-          <el-option
-            v-for="(item, index) in courseStatus"
-            :key="index"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
+        <el-select v-model.trim="searchForm.courseStatus"
+                   clearable
+                   filterable
+                   placeholder="课程状态">
+          <el-option v-for="(item, index) in courseStatus"
+                     :key="index"
+                     :label="item.label"
+                     :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-input
-          placeholder="班级名称"
-          @keyup.enter.native="search"
-          v-model.trim="searchForm.classGroupName"
-        ></el-input>
+        <el-input placeholder="班级名称"
+                  @keyup.enter.native="search"
+                  v-model.trim="searchForm.classGroupName"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-input
-          placeholder="老师姓名"
-          @keyup.enter.native="search"
-          v-model.trim="searchForm.teacherName"
-        ></el-input>
+        <el-input placeholder="老师姓名"
+                  @keyup.enter.native="search"
+                  v-model.trim="searchForm.teacherName"></el-input>
       </el-form-item>
       <el-form-item>
-        <div @click="search" class="searchBtn">搜索</div>
+        <div @click="search"
+             class="searchBtn">搜索</div>
       </el-form-item>
     </el-form>
     <!-- 查询列表 -->
@@ -96,28 +111,38 @@
         <i class="el-icon-close"></i>
       </div>
     </div>-->
-    <div v-if="coursesShow" class="tableWrap">
-      <el-table :data="coursesInfo" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column align="center" prop="classGroupId" label="编号"></el-table-column>
-        <el-table-column align="center" prop="courseDate" label="时间">
-           <template slot-scope="scope">{{ scope.row.courseDate | dateForMinFormat }}</template>
+    <div v-if="coursesShow"
+         class="tableWrap">
+      <el-table :data="coursesInfo"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align="center"
+                         prop="classGroupId"
+                         label="编号"></el-table-column>
+        <el-table-column align="center"
+                         prop="courseDate"
+                         label="时间">
+          <template slot-scope="scope">{{ scope.row.courseDate | dateForMinFormat }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="classGroupName" label="班级名称"></el-table-column>
-        <el-table-column align="center" label="课程类型">
+        <el-table-column align="center"
+                         prop="classGroupName"
+                         label="班级名称"></el-table-column>
+        <el-table-column align="center"
+                         label="课程类型">
           <template slot-scope="scope">{{ scope.row.classGroupType | coursesType }}</template>
         </el-table-column>
-        <el-table-column align="center" label="课程状态">
+        <el-table-column align="center"
+                         label="课程状态">
           <template slot-scope="scope">{{ scope.row.courseStatus | coursesStatus }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="teacherName" label="老师姓名"></el-table-column>
+        <el-table-column align="center"
+                         prop="teacherName"
+                         label="老师姓名"></el-table-column>
       </el-table>
-      <pagination
-        :total="pageInfo.total"
-        :page.sync="pageInfo.page"
-        :limit.sync="pageInfo.limit"
-        :page-sizes="pageInfo.page_size"
-        @pagination="getStudentCourses"
-      />
+      <pagination :total="pageInfo.total"
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getStudentCourses" />
     </div>
   </div>
 </template>
@@ -130,7 +155,7 @@ import {
 export default {
   name: "teamAndcourse",
   components: { pagination },
-  data() {
+  data () {
     return {
       userId: null,
       musicGroupInfo: [], // 乐团列表
@@ -166,25 +191,25 @@ export default {
       }
     };
   },
-  mounted() {
-    this.userId = this.$route.query.userId;
-    this.searchForm.studentId = this.$route.query.userId;
-    this.__init();
+  mounted () {
+    // this.userId = this.$route.query.userId;
+    // this.searchForm.studentId = this.$route.query.userId;
+    // this.__init();
   },
-  activated() {
+  activated () {
     this.userId = this.$route.query.userId;
     this.searchForm.studentId = this.$route.query.userId;
     this.__init();
   },
   methods: {
-    __init() {
+    __init () {
       findStudentMusicGroups({ userId: this.userId }).then(res => {
         if (res.code == 200) {
           this.musicGroupInfo = res.data;
         }
       });
     },
-    onCourse(row) {
+    onCourse (row) {
       this.coursesShow = true;
       this.searchForm = {
         studentId: this.$route.query.userId,
@@ -196,11 +221,11 @@ export default {
       };
       this.getStudentCourses();
     },
-    search() {
+    search () {
       this.pageInfo.page = 1;
       this.getStudentCourses();
     },
-    getStudentCourses() {
+    getStudentCourses () {
       let params = this.searchForm;
       params.rows = this.pageInfo.limit;
       params.page = this.pageInfo.page;

+ 1 - 1
src/views/teacherManager/teacherDetail/components/courseInfo.vue

@@ -174,7 +174,7 @@ export default {
     this.musicGroupStatus = musicGroupStatus
   },
   mounted () {
-    this.getList()
+    // this.getList()
     this.musicGroupStatus = musicGroupStatus;
     // 获取指导老师
     getTeacher({}).then(res => {

+ 3 - 3
src/views/teacherManager/teacherDetail/components/courseInfo1.vue

@@ -117,8 +117,8 @@ export default {
     this.getList()
   },
   mounted () {
-    this.vipGroupStatus = vipGroupStatus;
-    this.getList()
+    // this.vipGroupStatus = vipGroupStatus;
+    // this.getList()
   },
   methods: {
     getList () {
@@ -151,7 +151,7 @@ export default {
       return result
     },
     formatterStatus (val) {
-      let arr = ["未开始", "报名中", "进行中", '取消', '已结束', '报名结束','暂停']
+      let arr = ["未开始", "报名中", "进行中", '取消', '已结束', '报名结束', '暂停']
       return arr[val];
     }
   }

+ 1 - 1
src/views/teacherManager/teacherDetail/components/courseInfo2.vue

@@ -49,7 +49,7 @@ export default {
     }
   },
   mounted () {
-    this.getList()
+    // this.getList()
   },
   activated () {
     this.teacherId = this.$route.query.teacherId

+ 1 - 1
src/views/teacherManager/teacherDetail/components/leaveRecord.vue

@@ -100,7 +100,7 @@ export default {
     }
   },
   mounted () {
-    this.getList()
+    // this.getList()
   },
   activated () {
     this.teacherId = this.$route.query.teacherId

+ 52 - 36
src/views/teacherManager/teacherDetail/components/outCourseList.vue

@@ -1,57 +1,73 @@
 <template>
   <div class="courseInfo">
-    <el-form :inline="true" :model="searchList">
+    <el-form :inline="true"
+             :model="searchList">
       <el-form-item>
-        <el-input placeholder="课程组名称" @keyup.enter.native="search" v-model.trim="searchList.search"></el-input>
+        <el-input placeholder="课程组名称"
+                  @keyup.enter.native="search"
+                  v-model.trim="searchList.search"></el-input>
       </el-form-item>
       <el-form-item label="课程状态">
-        <el-select v-model.trim="searchList.status" clearable>
-          <el-option
-            v-for="(item,index) in commGroupStatus"
-            :key="index"
-            :value="item.value"
-            :label="item.label"
-          ></el-option>
+        <el-select v-model.trim="searchList.status"
+                   clearable>
+          <el-option v-for="(item,index) in commGroupStatus"
+                     :key="index"
+                     :value="item.value"
+                     :label="item.label"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="danger" @click="search">搜索</el-button>
+        <el-button type="danger"
+                   @click="search">搜索</el-button>
       </el-form-item>
     </el-form>
     <div class="tableWrap tableMargin">
-      <el-table :data="teamList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column label="编号" prop="id" align="center"></el-table-column>
-        <el-table-column label="课程组名称" prop="name" align="center"></el-table-column>
-        <el-table-column label="课程组状态" align="center">
+      <el-table :data="teamList"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column label="编号"
+                         prop="id"
+                         align="center"></el-table-column>
+        <el-table-column label="课程组名称"
+                         prop="name"
+                         align="center"></el-table-column>
+        <el-table-column label="课程组状态"
+                         align="center">
           <template slot-scope="scope">{{ scope.row.status | courseGroup}}</template>
         </el-table-column>
-        <el-table-column label="班级人数" prop="studentNum" align="center"></el-table-column>
-        <el-table-column label="课程组时间" prop="groupClassesTotalDuration" align="center"></el-table-column>
-        <el-table-column label="消耗时间" prop="groupClassesConsumeDuration" align="center"></el-table-column>
-         <el-table-column label="当前课次"
+        <el-table-column label="班级人数"
+                         prop="studentNum"
+                         align="center"></el-table-column>
+        <el-table-column label="课程组时间"
+                         prop="groupClassesTotalDuration"
+                         align="center"></el-table-column>
+        <el-table-column label="消耗时间"
+                         prop="groupClassesConsumeDuration"
+                         align="center"></el-table-column>
+        <el-table-column label="当前课次"
                          align='center'
                          prop="currentClassTimes">
           <template slot-scope="scope">
             {{ scope.row.currentClassTimes }}/{{ scope.row.totalClassTimes }}
           </template>
         </el-table-column>
-        <el-table-column label="开课时间" align="center">
+        <el-table-column label="开课时间"
+                         align="center">
           <template slot-scope="scope">{{scope.row.firstClassesStartTime | formatterTime}}</template>
         </el-table-column>
-        <el-table-column label="结束时间" align="center">
+        <el-table-column label="结束时间"
+                         align="center">
           <template slot-scope="scope">{{ scope.row.lastClassesEndTime | formatTimer }}</template>
         </el-table-column>
-        <el-table-column label="申请时间" align="center">
+        <el-table-column label="申请时间"
+                         align="center">
           <template slot-scope="scope">{{scope.row.createTime | formatterTime}}</template>
         </el-table-column>
       </el-table>
-      <pagination
-        :total="pageInfo.total"
-        :page.sync="pageInfo.page"
-        :limit.sync="pageInfo.limit"
-        :page-sizes="pageInfo.page_size"
-        @pagination="getList"
-      />
+      <pagination :total="pageInfo.total"
+                  :page.sync="pageInfo.page"
+                  :limit.sync="pageInfo.limit"
+                  :page-sizes="pageInfo.page_size"
+                  @pagination="getList" />
     </div>
   </div>
 </template>
@@ -66,7 +82,7 @@ export default {
   components: {
     pagination
   },
-  data() {
+  data () {
     return {
       searchList: {
         status: "",
@@ -85,14 +101,14 @@ export default {
       }
     };
   },
-  activated() {
-    this.getList();
+  activated () {
+    // this.getList();
   },
-  mounted() {
+  mounted () {
     this.getList();
   },
   methods: {
-    getList() {
+    getList () {
       this.teacherId = this.$route.query.teacherId;
       findTeacherCourseGroupsWithWeb({
         rows: this.pageInfo.limit,
@@ -107,13 +123,13 @@ export default {
         }
       });
     },
-    search() {
+    search () {
       this.pageInfo.page = 1;
       this.getList();
     }
   },
   filters: {
-    formatterTime(val) {
+    formatterTime (val) {
       let result;
       if (val) {
         result = val.split(" ")[0];
@@ -122,7 +138,7 @@ export default {
       }
       return result;
     },
-    formatterStatus(val) {
+    formatterStatus (val) {
       let arr = [
         "未开始",
         "报名中",

+ 1 - 1
src/views/teacherManager/teacherDetail/components/serveStudentList.vue

@@ -113,7 +113,7 @@ export default {
         this.teacherList = res.data;
       }
     });
-    this.getList()
+    // this.getList()
   },
   activated () {
     this.teacherId = this.$route.query.teacherId

+ 7 - 7
src/views/teacherManager/teacherDetail/components/settlement.vue

@@ -252,13 +252,13 @@ export default {
     })
   },
   mounted () {
-    this.teacherId = this.$route.query.teacherId
-    this.getList()
-    sumTeacherNoPay({ teacherId: this.teacherId }).then(res => {
-      if (res.code == 200) {
-        this.teacherNoPay = res.data
-      }
-    })
+    // this.teacherId = this.$route.query.teacherId
+    // this.getList()
+    // sumTeacherNoPay({ teacherId: this.teacherId }).then(res => {
+    //   if (res.code == 200) {
+    //     this.teacherNoPay = res.data
+    //   }
+    // })
   },
   methods: {
     search () {

+ 15 - 11
src/views/teacherManager/teacherDetail/components/teacherInfo.vue

@@ -6,13 +6,17 @@
         <el-form :model="topForm">
           <el-row>
             <el-col :span="12">
-              <el-form-item label="姓名" :label-width="formLabelWidth">
-                <el-input v-model.trim="topForm.realName"  disabled></el-input>
+              <el-form-item label="姓名"
+                            :label-width="formLabelWidth">
+                <el-input v-model.trim="topForm.realName"
+                          disabled></el-input>
               </el-form-item>
             </el-col>
-             <el-col :span="12">
-              <el-form-item label="姓名(备注)" :label-width="formLabelWidth">
-                <el-input v-model.trim="topForm.memo"  disabled></el-input>
+            <el-col :span="12">
+              <el-form-item label="姓名(备注)"
+                            :label-width="formLabelWidth">
+                <el-input v-model.trim="topForm.memo"
+                          disabled></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -89,7 +93,7 @@
                           v-model.trim="topForm.introduction"></el-input>
               </el-form-item>
             </el-col>
-               <el-col :span="12">
+            <el-col :span="12">
               <el-form-item label="开放陪练"
                             :label-width="formLabelWidth">
                 <el-input disabled
@@ -198,8 +202,8 @@ export default {
     // console.log(this.$route.query.teacherId);
   },
   mounted () {
-    this.teacherId = this.$route.query.teacherId
-    this.teacherGet()
+    // this.teacherId = this.$route.query.teacherId
+    // this.teacherGet()
   },
   methods: {
     teacherGet () {
@@ -246,10 +250,10 @@ export default {
       return template[value]
     }
   },
-  computed:{
-    isSupportExtraPracticeLesson(){
+  computed: {
+    isSupportExtraPracticeLesson () {
       let str = ''
-      this.topForm.isSupportExtraPracticeLesson?str='是':str="否"
+      this.topForm.isSupportExtraPracticeLesson ? str = '是' : str = "否"
       return str
     }
   }

+ 1 - 1
src/views/teacherManager/teacherDetail/components/teacherNetwork.vue

@@ -157,7 +157,7 @@ export default {
       }
     });
     // 获取分部
-    this.init();
+    // this.init();
   },
   activated () {
     this.init();

+ 1 - 1
src/views/teacherManager/teacherDetail/components/teacherRecord.vue

@@ -132,7 +132,7 @@ export default {
     };
   },
   mounted () {
-    this.getList();
+    // this.getList();
   },
   activated () {
     this.getList();

+ 1 - 1
src/views/teacherManager/teacherDetail/components/timerList.vue

@@ -172,7 +172,7 @@ export default {
   created () { },
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted () {
-    this.init();
+    // this.init();
   },
   activated () {
     this.init();

+ 2 - 2
src/views/teacherManager/teacherList.vue

@@ -280,8 +280,8 @@ export default {
     this.getList();
   },
   mounted () {
-    this.__init();
-    this.getList();
+    // this.__init();
+    // this.getList();
   },
   methods: {
     search () {

+ 1 - 1
src/views/teacherManager/teacherOperation/components/accompanySet.vue

@@ -168,7 +168,7 @@ export default {
     };
   },
   created () {
-    this.init();
+    // this.init();
   },
   activated () {
     this.init();

+ 1 - 1
src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -334,7 +334,7 @@ export default {
   },
   created () { },
   mounted () {
-    this.__init();
+    // this.__init();
   },
   activated () {
     this.pageType = this.$route.query.type;

+ 3 - 3
src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -410,9 +410,9 @@ export default {
   },
   created () { },
   mounted () {
-    this.pageType = this.$route.query.type;
-    this.teacherId = this.$route.query.teacherId;
-    this.__init();
+    // this.pageType = this.$route.query.type;
+    // this.teacherId = this.$route.query.teacherId;
+    // this.__init();
 
   },
   activated () {

+ 4 - 4
src/views/teacherManager/teacherOperation/index.vue

@@ -22,11 +22,11 @@
                      v-if="activeName=='1'" />
         </el-tab-pane>
         <!--   'teacherFreeTime/query'  v-if="permission('/teacherFreeTime/query')"-->
-         <el-tab-pane label="网管课设置"
+        <el-tab-pane label="网管课设置"
                      v-if="accompanyStatus"
                      name="2"
                      :disabled="isTeacher">
-                   <accompany :teacherId="teacherId"
+          <accompany :teacherId="teacherId"
                      v-if="activeName=='2'" />
         </el-tab-pane>
         <!-- v-permission="pageType == 'create' ? '/teacherAdd/salarySeting' : '/teacherUpdate/saraySeting'" -->
@@ -40,7 +40,7 @@ import salarySet from './components/salarySet'
 import accompany from './components/accompanySet'
 import { permission } from '@/utils/directivePage'
 export default {
-  components: { teacherOperation, salarySet,accompany },
+  components: { teacherOperation, salarySet, accompany },
   name: 'teacherOperations',
   data () {
     return {
@@ -58,7 +58,7 @@ export default {
     }
   },
   mounted () {
-    this.init()
+    // this.init()
   },
   activated () {
     this.activeName = null

+ 1 - 1
src/views/teamBuild/components/teamBaseInfo.vue

@@ -710,7 +710,7 @@ export default {
     this.init();
   },
   mounted () {
-    this.init();
+    // this.init();
     // this.$forceUpdate()
     // 获取分部下的员工
   },

+ 3 - 3
src/views/teamBuild/components/teamResetSound.vue

@@ -202,11 +202,11 @@ export default {
     }
   },
   created () {
+    // this.init();
+  },
+  activated () {
     this.init();
   },
-  // activated () {
-  //   this.init();
-  // },
   mounted () {
 
   },

+ 5 - 5
src/views/teamBuild/components/teamSoundMoney.vue

@@ -825,15 +825,15 @@ export default {
   },
   created () {
     // 判断是否带缓存参数
-    this.init();
+    // this.init();
   },
   mounted () {
 
   },
-  // activated () {
-  //   // 判断是否带缓存参
-  //   this.init();
-  // },
+  activated () {
+    // 判断是否带缓存参
+    this.init();
+  },
   methods: {
     onCourseChange (item) {
       // 判断用户是否可以选择

+ 1 - 1
src/views/teamBuild/index.vue

@@ -87,7 +87,7 @@ export default {
   },
   created () {
     // 判断 是新建乐团还是修改乐团 
-    this.init()
+    // this.init()
   },
   activated () {
     this.activeIndex = 0

+ 1 - 1
src/views/teamBuild/signupList.vue

@@ -682,7 +682,7 @@ export default {
   },
   created () {
     // 通过乐团状态判断显示隐藏的东西
-    this.init()
+    // this.init()
   },
   activated () {
 

+ 1 - 1
src/views/teamBuild/teamSeting/components/coursePlan.vue

@@ -366,7 +366,7 @@ export default {
     }
   },
   created () {
-    this.init()
+    // this.init()
   },
   mounted () {
 

+ 1 - 1
src/views/teamBuild/teamSeting/components/lookCourse.vue

@@ -121,7 +121,7 @@ export default {
       },
     }
   }, mounted () {
-    this.init()
+    // this.init()
   },
   activated () {
     this.init()

+ 1 - 1
src/views/teamBuild/teamSeting/components/setClassV2.vue

@@ -822,7 +822,7 @@ export default {
   //生命周期 - 挂载完成(可以访问DOM元素)
   mounted () {
     // 获取节假日
-    this.init();
+    // this.init();
   },
   activated () {
     this.init();

+ 1 - 1
src/views/teamBuild/teamSeting/components/setImprovement.vue

@@ -164,7 +164,7 @@ export default {
     }
   },
   mounted () {
-    this.init()
+    // this.init()
   },
   activated () {
     this.init()

+ 1 - 1
src/views/teamDetail/componentCourse/classList.vue

@@ -75,7 +75,7 @@ export default {
     this.getList();
   },
   mounted () {
-    this.getList();
+    // this.getList();
   },
   methods: {
 

+ 30 - 22
src/views/teamDetail/componentCourse/courseEvaluate.vue

@@ -2,16 +2,24 @@
 <template>
   <div class>
     <div class="tableWrap">
-      <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column align="center" width="100" prop="username" label="学生姓名"></el-table-column>
-        <el-table-column align="center" width="100" prop="score" label="星级">
-            <template slot-scope="scope">
-                <div>
-                    {{ scope.row.score?scope.row.score+'星':'' }}
-                </div>
-            </template>
+      <el-table :data="tableList"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align="center"
+                         width="100"
+                         prop="username"
+                         label="学生姓名"></el-table-column>
+        <el-table-column align="center"
+                         width="100"
+                         prop="score"
+                         label="星级">
+          <template slot-scope="scope">
+            <div>
+              {{ scope.row.score?scope.row.score+'星':'' }}
+            </div>
+          </template>
         </el-table-column>
-        <el-table-column  prop="reason" label="评价内容"></el-table-column>
+        <el-table-column prop="reason"
+                         label="评价内容"></el-table-column>
       </el-table>
       <!-- <pagination
         :total="rules.total"
@@ -25,10 +33,10 @@
 
 <script>
 // import pagination from '@/components/Pagination/index'
-import {getStuAndTeaReview} from '@/api/buildTeam'
+import { getStuAndTeaReview } from '@/api/buildTeam'
 export default {
-    props: ['courseScheduleId'],
-  data() {
+  props: ['courseScheduleId'],
+  data () {
     return {
       tableList: [],
       rules: {
@@ -41,20 +49,20 @@ export default {
     };
   },
   //生命周期 - 创建完成(可以访问当前this实例)
-  created() {},
+  created () { },
   //生命周期 - 挂载完成(可以访问DOM元素)
-  mounted() {
-    this.getList()
+  mounted () {
+    // this.getList()
   },
-  activated(){
-      this.getList()
+  activated () {
+    this.getList()
   },
   methods: {
-    getList() {
-         getStuAndTeaReview({courseId:this.courseScheduleId}).then(res=>{
-          if(res.code == 200){
-              this.tableList = res.data.courseScheduleComplaints
-          }
+    getList () {
+      getStuAndTeaReview({ courseId: this.courseScheduleId }).then(res => {
+        if (res.code == 200) {
+          this.tableList = res.data.courseScheduleComplaints
+        }
       })
     }
   }

+ 1 - 1
src/views/teamDetail/componentCourse/courseList.vue

@@ -136,7 +136,7 @@ export default {
     this.init()
   },
   mounted () {
-    this.init()
+    // this.init()
   },
   methods: {
     /**

+ 11 - 1
src/views/teamDetail/componentCourse/gpsLocation.vue

@@ -75,7 +75,7 @@ export default {
     }
   },
   mounted () {
-    this.init()
+    // this.init()
   },
   activated () {
     this.init()
@@ -96,6 +96,16 @@ export default {
             this.signInLongitudeLatitude = res.data.signInLongitudeLatitude.split(',')
             this.markers.push(add)
           }
+          if (res.data && res.data.signOutLongitudeLatitude) {
+            let add = {
+              title: '签退点',
+              location: res.data.signOutLongitudeLatitude.split(',')
+            }
+            this.center = res.data.signOutLongitudeLatitude.split(',');
+            this.signOutLongitudeLatitude = res.data.signOutLongitudeLatitude.split(',')
+            this.markers.push(add)
+          }
+
           if (res.data && res.data.schoolLongitudeLatitude) {
             let add = {
               title: '教学点',

+ 1 - 1
src/views/teamDetail/componentCourse/studentRollCall.vue

@@ -91,7 +91,7 @@ export default {
     }
   },
   mounted () {
-    this.init()
+    // this.init()
   },
   activated () {
     this.init()

+ 50 - 42
src/views/teamDetail/componentCourse/studentWork.vue

@@ -19,60 +19,68 @@
     </el-form>
     <p class="work">老师布置的作业:{{content}}</p>
     <div class="tableWrap">
-      <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-        <el-table-column align="center" prop="username" label="学生姓名"></el-table-column>
-        <el-table-column align="center" prop="phone" label="手机号"></el-table-column>
-        <el-table-column align="center" prop="subjectName" label="声部名称"></el-table-column>
-        <el-table-column align="center" prop="createTime" width="150" label="交作业时间">
-           <template slot-scope="scope">
+      <el-table :data="tableList"
+                :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table-column align="center"
+                         prop="username"
+                         label="学生姓名"></el-table-column>
+        <el-table-column align="center"
+                         prop="phone"
+                         label="手机号"></el-table-column>
+        <el-table-column align="center"
+                         prop="subjectName"
+                         label="声部名称"></el-table-column>
+        <el-table-column align="center"
+                         prop="createTime"
+                         width="150"
+                         label="交作业时间">
+          <template slot-scope="scope">
             <div>{{ scope.row.createTime | dateForMinFormat}}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="isView" label="是否查看">
+        <el-table-column align="center"
+                         prop="isView"
+                         label="是否查看">
           <template slot-scope="scope">
             <div>{{ scope.row.isView ? '是' : '否' }}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="isReplied" label="是否回复">
+        <el-table-column align="center"
+                         prop="isReplied"
+                         label="是否回复">
           <template slot-scope="scope">
             <div>{{ scope.row.isReplied ? '是' : '否' }}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="查看作业" width="200px">
+        <el-table-column align="center"
+                         label="查看作业"
+                         width="200px">
           <template slot-scope="scope">
             <div>
               <!--   -->
-              <el-button
-                type="text"
-                v-for="(item,index) in scope.row.urlList"
-                :key="index"
-                @click="lookWork(item)"
-              >{{'作业'+(index+1) }}</el-button>
+              <el-button type="text"
+                         v-for="(item,index) in scope.row.urlList"
+                         :key="index"
+                         @click="lookWork(item)">{{'作业'+(index+1) }}</el-button>
             </div>
           </template>
         </el-table-column>
       </el-table>
-      <pagination
-        :total="rules.total"
-        :page.sync="rules.page"
-        :limit.sync="rules.limit"
-        @pagination="getList"
-      />
+      <pagination :total="rules.total"
+                  :page.sync="rules.page"
+                  :limit.sync="rules.limit"
+                  @pagination="getList" />
     </div>
-    <el-dialog
-      title="查看作业"
-      @close="closeWorkVisible"
-      width="680px"
-      append-to-body
-      :visible.sync="workVisible"
-    >
+    <el-dialog title="查看作业"
+               @close="closeWorkVisible"
+               width="680px"
+               append-to-body
+               :visible.sync="workVisible">
       <!-- activeUrl -->
-      <video
-        style="width:640px;"
-        :src="activeUrl"
-        ref="dialogVideo"
-        controls="controls"
-      >您的浏览器不支持视频播放</video>
+      <video style="width:640px;"
+             :src="activeUrl"
+             ref="dialogVideo"
+             controls="controls">您的浏览器不支持视频播放</video>
     </el-dialog>
   </div>
 </template>
@@ -86,7 +94,7 @@ import {
 export default {
   props: ["courseScheduleId"],
   components: { pagination },
-  data() {
+  data () {
     return {
       tableList: [],
       rules: {
@@ -103,14 +111,14 @@ export default {
       content: null
     };
   },
-  mounted() {
-    this.init();
+  mounted () {
+    // this.init();
   },
-  activated() {
+  activated () {
     this.init();
   },
   methods: {
-    init() {
+    init () {
       sumStudentAttendance({ courseScheduleId: this.courseScheduleId }).then(
         res => {
           if (res.code == 200) {
@@ -135,7 +143,7 @@ export default {
       });
       this.getList();
     },
-    getList() {
+    getList () {
       findStudentCourseHomeworks({ search: this.courseScheduleId }).then(
         res => {
           if (res.code == 200) {
@@ -148,11 +156,11 @@ export default {
         }
       );
     },
-    lookWork(url) {
+    lookWork (url) {
       this.workVisible = true;
       this.activeUrl = url;
     },
-    closeWorkVisible() {
+    closeWorkVisible () {
       this.activeUrl = "";
     }
   }

+ 1 - 1
src/views/teamDetail/components/baseInfo.vue

@@ -142,7 +142,7 @@ export default {
     }
   },
   created () {
-    this.init()
+    // this.init()
   },
   activated () {
     this.init()

+ 1 - 1
src/views/teamDetail/components/classList.vue

@@ -176,7 +176,7 @@ export default {
 
   },
   mounted () {
-    this.getList();
+    // this.getList();
   },
   activated () {
     this.getList();

+ 1 - 1
src/views/teamDetail/components/courseList.vue

@@ -525,7 +525,7 @@ export default {
     pagination
   },
   mounted () {
-    this.init();
+    // this.init();
   },
   activated () {
     this.init();

部分文件因文件數量過多而無法顯示