fix

src/views/customer/AddCustomer.vue

@@ -63,6 +63,10 @@
                 <i v-if="!isDetail"
                    class="el-icon-circle-plus-outline plus-cus"
                    @click="addCustomer"></i>
+                <!-- <el-button style="margin-left: 5px"
+                           type="primary"
+                           size="mini"
+                           @click="addCustomer">设置</el-button> -->
               </div>
             </el-form-item>
             <el-form-item prop="cityId"
@@ -557,6 +561,79 @@
                    @click="submitCustomer">确定</el-button>
       </span>
     </el-dialog>
+
+    <el-dialog title="客户设置"
+               :visible.sync="customerListVisible"
+               width="800px"
+               class="dialog"
+               :close-on-click-modal="false"
+               custom-class="customer-dia">
+      <div style="width: 300px;margin-bottom: 10px">
+        <el-input placeholder="请输入客户名称"
+                  prefix-icon="el-icon-search"
+                  v-model="customerKeyword"
+                  clearable></el-input>
+      </div>
+      <el-table :data="customers"
+                class="table"
+                ref="table"
+                stripe
+                header-align="center"
+                row-key="customerId">
+        <el-table-column type="index"
+                         width="100"
+                         label="序号"
+                         align="center">
+          <template slot-scope="scope">
+            {{scope.$index + (page - 1) * pageSize + 1}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerName"
+                         label="客户名称"
+                         align="center">
+        </el-table-column>
+        <el-table-column prop="provinceName"
+                         label="省份"
+                         align="center">
+        </el-table-column>
+        <el-table-column prop="cityName"
+                         label="城市"
+                         align="center">
+        </el-table-column>
+        <el-table-column prop="countries"
+                         label="是否创建"
+                         align="center">
+          <template slot-scope="scope">
+            是
+          </template>
+        </el-table-column>
+        <el-table-column label="操作"
+                         width="100"
+                         align="center">
+          <template slot-scope="scope">
+            <i class="el-icon-edit icon"
+               @click="editCustomer(item)"></i>
+            <i class="el-icon-delete icon"
+               @click="delCustomer(item, i)"></i>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination">
+        <el-pagination background
+                       layout="total, prev, pager, next"
+                       :total="totalCustomer"
+                       @current-change="handleCurrentChangeCustomer"
+                       :current-page="pageCustomer"
+                       :page-size="pageSizeCustomer">
+        </el-pagination>
+      </div>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="customerListVisible = false">取消</el-button>
+        <el-button type="primary"
+                   @click="submitCustomer">确定</el-button>
+      </span>
+    </el-dialog>
     <pdf :visible.sync="pdfVisible"
          :src.sync="fileSrc"></pdf>
   </div>
@@ -784,7 +861,14 @@ export default {
         schoolName: '',
         provinceName: '',
         cityName: '',
-      }
+      },
+
+      customerListVisible: false,
+      customers: [{}],
+      pageCustomer: 1,
+      pageSizeCustomer: 10,
+      totalCustomer: 0,
+      customerKeyword: '',
     };
   },
   watch: {
@@ -948,7 +1032,6 @@ export default {
               1
           }
         })
-        console.log("🚀 ~ file: AddCustomer.vue:651 ~ getProduct ~ data:", data)
         this.productAll = data
         this.totalProduct = data.length
         this.handlePage()
@@ -969,7 +1052,38 @@ export default {
     },
     // 创建客户
     addCustomer () {
+      // this.customerListVisible = true
+      this.customerVisible = true
+    },
+    handleCurrentChangeCustomer (val) {
+      this.pageCustomer = val
+      // this.getCustomer()
+    },
+    // 获取客户列表
+    getCustomer () {
+      this.$get(this.api.queryCity, {
+        provinceId: this.provinceList.find(e => e.provinceName == name).provinceId
+      }).then(({ list }) => {
+        this.cities = list
+        this.customerForm.cityName = ''
+      }).catch(res => { });
+    },
+    // 编辑客户
+    editCustomer (row) {
       this.customerVisible = true
+      // this.customerForm = {
+      //   schoolName: '',
+      //   provinceName: '',
+      //   cityName: '',
+      // }
+    },
+    // 删除客户
+    delCustomer (row, i) {
+      this.$confirm('确定要删除吗？', '提示', {
+        type: 'warning'
+      }).then(() => {
+
+      }).catch(() => { })
     },
     // 获取城市
     provinceChange (name) {
@@ -1018,7 +1132,7 @@ export default {
         data.push({
           productName: e.productName,
           productStatus: e.status,
-          productType: e.productName,
+          productType: e.productTypeName,
           remainingPeriod: e.remain,
           startAndEndTime: e.startAndEndTime,
           subscriptionStatus: e.isEnable ? '启用' : '禁用',
@@ -1332,7 +1446,7 @@ export default {
       if ((id && updateTime > 1) || (!id && updateTime)) {
         this.$confirm(`编辑的内容未保存，是否保存？`, '提示', {
           type: 'warning',
-            closeOnClickModal: false
+          closeOnClickModal: false
         }).then(() => {
           this.saveAdd(i)
         }).catch(() => {
@@ -1395,4 +1509,15 @@ export default {
     color: #666;
     cursor: pointer;
 }
+/deep/.customer-dia {
+    .icon {
+        margin-right: 10px;
+        font-size: 16px;
+        color: #7a7a7a;
+        cursor: pointer;
+        &:hover {
+            color: #9076ff;
+        }
+    }
+}
 </style>

src/views/match/add/step3.vue

@@ -259,6 +259,8 @@ export default {
                   url: n
                 })
               })
+            } else {
+              form.competitionStageContentSetting.fileList = []
             }
             form.competitionStageContentSetting.competitionId = this.id
             form.competitionStageContentSetting.stageId = e.stageId

src/views/match/manage/matchArchList.vue

@@ -561,6 +561,7 @@ export default {
       this.uploading = false
       this.uploadFaild = false
       if (res.status === 200) {
+        this.initData()
         const { data } = res
         if (data.exportCode) {
           this.faildData = data
@@ -593,7 +594,7 @@ export default {
     },
     cancelUpload () {
       this.uploading = false
-      this.$refs.upload.abort()
+      if (this.$refs.upload) this.$refs.upload.abort()
       this.keyword = ''
       this.initData()
       this.importVisible = false

src/views/match/manage/matchInfo.vue

@@ -22,6 +22,7 @@
             <th width="150">团队邀请码：</th>
             <td>
               <el-input :disabled="!editing"
+                        maxlength="6"
                         v-model="info.team.invitationCode"></el-input>
             </td>
           </tr>

src/views/match/manage/matchRank.vue

@@ -729,6 +729,7 @@ export default {
       this.uploadFaild = false
       this.uploaded = 0
       if (res.status === 200) {
+        this.getRank()
         const { data } = res
         if (data.exportCode) {
           this.faildData = data
@@ -736,7 +737,6 @@ export default {
         } else {
           this.uploaded = 1
           this.importVisible = false
-          this.getRank()
           util.successMsg(data.tip, 3000)
           // util.successMsg('请检查数据后，点击发布排名以发布数据！')
         }

src/views/match/manage/matchSignup.vue

@@ -476,6 +476,7 @@ export default {
     getInfo () {
       this.$post(`${this.api.getCompetition}?competitionId=${this.id}`).then(({ competition }) => {
         this.info = competition
+        this.getSchool()
         // 非本校内则查询接口获取学校列表
         if (competition.competitionScope) {
           this.getClient()
@@ -757,6 +758,11 @@ export default {
       }
       this.teamVisible = true
     },
+    // 学生所属院校固定查询所有学校
+    async getSchool () {
+      const { list } = await this.$get(this.api.querySchoolData)
+      this.schools = list
+    },
     // 获取客户
     async getClient () {
       if (this.info.competitionScope === 2) {
@@ -780,10 +786,6 @@ export default {
           this.clients = list
         }).catch(res => { })
       }
-      // 学生所属院校固定查询所有学校
-      this.$get(this.api.querySchoolData).then(({ list }) => {
-        this.schools = list
-      }).catch(res => { })
     },
     // 获取团队列表
     getTeam () {