fix

src/views/customer/AddCustomer.vue

@@ -173,14 +173,14 @@
           <ul class="filter">
             <li>
               <label>订单类型</label>
-              <el-select v-model="form3.orderType" clearable placeholder="请选择订单类型" @change="getOrder">
+              <el-select v-model="form3.orderType" clearable placeholder="请选择订单类型" @change="initOrder">
                 <el-option v-for="(item, index) in orderTypeList" :key="index" :label="item.name"
                   :value="item.value"></el-option>
               </el-select>
             </li>
             <li>
               <label>订单状态</label>
-              <el-select v-model="form3.orderStatus" clearable placeholder="请选择订单状态" @change="getOrder">
+              <el-select v-model="form3.orderStatus" clearable placeholder="请选择订单状态" @change="initOrder">
                 <el-option v-for="(item, index) in orderStatusList" :key="index" :label="item.name"
                   :value="item.id"></el-option>
               </el-select>
@@ -935,11 +935,11 @@ export default {
 
     // 订单记录
     getOrder () {
-      const { orderStatus, orderType } = this.form3
+      const { orderStatus, orderType, keyword } = this.form3
       this.$post(this.api.getCustomerOrderRecord, {
         customerId: this.customerId,
         cityId: '',
-        customerName: this.form.customerName,
+        orderContent: keyword,
         orderStatus,
         orderType,
         pageNo: this.pageOrder,

src/views/match/add/index.vue

@@ -154,9 +154,10 @@ export default {
     next (next, setupId, competitionId) {
       if (!next) {
         if (this.step === 3 && this.$refs['step' + this.step].form[0].contentId) {
-          // 处于第三步 && 编辑
+          // 处于第三步 && 编辑：返回到第一步的查看状态
           this.editing = 0
           this.step = 1
+          this.$parent.initTabs && this.$parent.initTabs()
         } else {
           // 新增
           this.$router.push(`/match`)

src/views/match/add/step2.vue

@@ -322,12 +322,12 @@ export default {
       // 团队赛
       if (this.step1.completeCompetitionSetup.competitionType) {
         const { form, originForm } = this
-
         // 赛制、阶段数量、是否限制成员只参加一个阶段、参赛人数限制。这些字段有改一个，则调接口查询其他3个条件；一共4个条件都满足后，才需要弹框；否则直接进入下一步
         let changeLimit = 0
         for (const i in form.competitionStageList) {
           const e = form.competitionStageList[i]
-          if (e.teamNumLimit !== originForm.competitionStageList[i].teamNumLimit || e.customNumber !== originForm.competitionStageList[i].customNumber) {
+          const originStage = originForm.competitionStageList[i]
+          if (!originStage || e.teamNumLimit !== originStage.teamNumLimit || e.customNumber !== originStage.customNumber) {
             changeLimit = 1
             break
           }

src/views/match/manage/index.vue

@@ -42,7 +42,6 @@ export default {
         tab3: "竞赛进展",
         tab4: "公告通知",
         tab5: "报名人员",
-        tab6: '查看异常团队'
       }
     };
   },
@@ -55,11 +54,11 @@ export default {
     AbnormalTeam
   },
   mounted () {
-    if (Setting.dynamicRoute) {
+    // if (Setting.dynamicRoute) {
     this.initTabs()
-    } else {
+    // } else {
-      this.active = this.$route.query.tab || 'tab1'
+    //   this.active = this.$route.query.tab || 'tab1'
-    }
+    // }
   },
   methods: {
     async initTabs () {
@@ -77,7 +76,12 @@ export default {
       tab3 || this.$delete(this.tabs, 'tab3')
       tab4 || this.$delete(this.tabs, 'tab4')
       tab5 || this.$delete(this.tabs, 'tab5')
-      res.competition.completeCompetitionSetup.competitionType || this.$delete(this.tabs, 'tab6')
+
+      if (res.competition.completeCompetitionSetup.competitionType) {
+        this.tabs.tab6 || this.$set(this.tabs, 'tab6', '查看异常团队')
+      } else {
+        this.tabs.tab6 && this.$delete(this.tabs, 'tab6')
+      }
 
       const type = this.$route.query.tab
       const keys = Object.keys(this.tabs)

src/views/match/manage/matchArchList.vue

@@ -340,6 +340,10 @@ export default {
           data: data.map(e => e.count),
           type: "line",
           areaStyle: {},
+          label: {
+            show: true,
+            position: 'top'
+          },
           color: ["#8191fd"]
         }]
       });

src/views/match/manage/matchSignup.vue

@@ -23,9 +23,11 @@
               '取消' : '' }}自动分配阶段成员</el-button>
           <el-tooltip placement="top">
             <div slot="content">
-              <p style="margin-bottom: 5px;">报名结束前，设置的自动分配将在报名结束时触发一次系统自动分配（取消则不触发）</p>
+              <p>报名结束前，设置的自动分配将在报名结束时触发一次系统自动分配（取消则不触发）</p>
-              <p>报名结束后，也可以手动点击自动分配按钮来立即触发系统自动分配，并且点击一次就触发一次</p>
+              <p style="margin: 5px 0;">报名结束后，也可以手动点击自动分配按钮来立即触发系统自动分配，并且点击一次就触发一次</p>
-              <p>注：自动分配仅对触发时已报名的人员进行。对于分配后才报名的人员，如需自动分配，则需手动再次触发自动分配</p>
+              <p>注：</p>
+              <p style="margin: 5px 0;">&emsp;&emsp;1. 自动分配仅对触发时已报名的人员进行。对于分配后才报名的人员，如需自动分配，则需手动再次触发自动分配</p>
+              <p>&emsp;&emsp;2. 若已有学生提交了成绩报告，则无法启用自动分配功能</p>
             </div>
             <i class="el-icon-question"
               style="margin: 0 10px 0 5px;font-size: 16px;color: #8f8f8f;cursor: pointer;"></i>

src/views/match/manage/otherArchList.vue

@@ -412,6 +412,10 @@ export default {
           data,
           type: "line",
           areaStyle: {},
+          label: {
+            show: true,
+            position: 'top'
+          },
           color: ["#8191fd"]
         }]
       });