huoran
/
FE_middlePlatform_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

fix

Browse Source
dev_review
yujialong 2 months ago
parent f07e4ccdb2
commit a033ef3565
4 changed files with 38 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/views/Login.vue
  2. 2
      src/views/match/manage/matchRank.vue
  3. 1
      src/views/match/manage/matchSignup.vue
  4. 69
      src/views/order/AddOrder.vue

1
src/views/Login.vue
Unescape View File

@ -200,6 +200,7 @@ export default {
if (valid) { if (valid) {
this.$post(this.api.logins, param).then(({ status, data, message }) => { this.$post(this.api.logins, param).then(({ status, data, message }) => {
localStorage.removeItem('examPath') localStorage.removeItem('examPath')
localStorage.removeItem('reviewPath')
if (status == 200) { if (status == 200) {
const accounts = data.userAccounts const accounts = data.userAccounts
// 如果返回的是数组，则弹框给用户选择登录哪个用户，否则，直接登录 // 如果返回的是数组，则弹框给用户选择登录哪个用户，否则，直接登录

2
src/views/match/manage/matchRank.vue
Unescape View File

@ -100,7 +100,7 @@
<template v-if="item.accountId"> <template v-if="item.accountId">
<td>{{ i + 1 }}</td> <td>{{ i + 1 }}</td>
<td>{{ item.userName }}</td> <td>{{ item.userName }}</td>
<td>{{ item.schoolName }}</td> <td>{{ item.realSchool }}</td>
<td>{{ item.timeSum }}min</td> <td>{{ item.timeSum }}min</td>
<td>{{ item.score }}</td> <td>{{ item.score }}</td>
<td> <td>

1
src/views/match/manage/matchSignup.vue
Unescape View File

@ -25,6 +25,7 @@
<div slot="content"> <div slot="content">
<p style="margin-bottom: 5px;">报名结束前，设置的自动分配将在报名结束时触发一次系统自动分配（取消则不触发）</p> <p style="margin-bottom: 5px;">报名结束前，设置的自动分配将在报名结束时触发一次系统自动分配（取消则不触发）</p>
<p>报名结束后，也可以手动点击自动分配按钮来立即触发系统自动分配，并且点击一次就触发一次</p> <p>报名结束后，也可以手动点击自动分配按钮来立即触发系统自动分配，并且点击一次就触发一次</p>
<p>注：自动分配仅对触发时已报名的人员进行。对于分配后才报名的人员，如需自动分配，则需手动再次触发自动分配</p>
</div> </div>
<i class="el-icon-question" <i class="el-icon-question"
style="margin: 0 10px 0 5px;font-size: 16px;color: #8f8f8f;cursor: pointer;"></i> style="margin: 0 10px 0 5px;font-size: 16px;color: #8f8f8f;cursor: pointer;"></i>

69
src/views/order/AddOrder.vue
Unescape View File

@ -602,15 +602,15 @@
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<template v-if="viewDisabled || isEdit">使用期限</template> <template v-if="viewDisabled || isEdit">使用期限</template>
<template v-else> <template v-else>
<el-input class="batch-time" :disabled="viewDisabled || isEdit" maxlength="4" <el-input class="batch-time" :disabled="viewDisabled || isEdit" maxlength="4"
@change="batchDeadlineChange(2)" @change="batchDeadlineChange(2)"
@input="productProps[2].deadline = productProps[2].deadline.replace(/[^0-9.]/g, '')" @input="productProps[2].deadline = productProps[2].deadline.replace(/[^0-9.]/g, '')"
v-model="productProps[2].deadline" placeholder="批量输入时间" /> v-model="productProps[2].deadline" placeholder="批量输入时间" />
<el-select class="batch-unit" v-model="productProps[2].unit" :disabled="viewDisabled || isEdit" <el-select class="batch-unit" v-model="productProps[2].unit" :disabled="viewDisabled || isEdit"
placeholder="请选择" @change="batchUnitChange(2)"> placeholder="请选择" @change="batchUnitChange(2)">
<el-option v-for="(item, i) in units" :key="i" :label="item.name" :value="item.id"></el-option> <el-option v-for="(item, i) in units" :key="i" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</template> </template>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
@ -741,15 +741,15 @@
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<template v-if="viewDisabled || isEdit">使用期限</template> <template v-if="viewDisabled || isEdit">使用期限</template>
<template v-else> <template v-else>
<el-input class="batch-time" :disabled="viewDisabled || isEdit" maxlength="4" <el-input class="batch-time" :disabled="viewDisabled || isEdit" maxlength="4"
@change="batchDeadlineChange(3)" @change="batchDeadlineChange(3)"
@input="productProps[3].deadline = productProps[3].deadline.replace(/[^0-9.]/g, '')" @input="productProps[3].deadline = productProps[3].deadline.replace(/[^0-9.]/g, '')"
v-model="productProps[3].deadline" placeholder="批量输入时间" /> v-model="productProps[3].deadline" placeholder="批量输入时间" />
<el-select class="batch-unit" v-model="productProps[3].unit" :disabled="viewDisabled || isEdit" <el-select class="batch-unit" v-model="productProps[3].unit" :disabled="viewDisabled || isEdit"
placeholder="请选择" @change="batchUnitChange(3)"> placeholder="请选择" @change="batchUnitChange(3)">
<el-option v-for="(item, i) in units" :key="i" :label="item.name" :value="item.id"></el-option> <el-option v-for="(item, i) in units" :key="i" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</template> </template>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
@ -888,15 +888,15 @@
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<template v-if="viewDisabled || isEdit">使用期限</template> <template v-if="viewDisabled || isEdit">使用期限</template>
<template v-else> <template v-else>
<el-input class="batch-time" :disabled="viewDisabled || isEdit" maxlength="4" <el-input class="batch-time" :disabled="viewDisabled || isEdit" maxlength="4"
@change="batchDeadlineChange(5)" @change="batchDeadlineChange(5)"
@input="productProps[5].deadline = productProps[5].deadline.replace(/[^0-9.]/g, '')" @input="productProps[5].deadline = productProps[5].deadline.replace(/[^0-9.]/g, '')"
v-model="productProps[5].deadline" placeholder="批量输入时间" /> v-model="productProps[5].deadline" placeholder="批量输入时间" />
<el-select class="batch-unit" v-model="productProps[5].unit" :disabled="viewDisabled || isEdit" <el-select class="batch-unit" v-model="productProps[5].unit" :disabled="viewDisabled || isEdit"
placeholder="请选择" @change="batchUnitChange(5)"> placeholder="请选择" @change="batchUnitChange(5)">
<el-option v-for="(item, i) in units" :key="i" :label="item.name" :value="item.id"></el-option> <el-option v-for="(item, i) in units" :key="i" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</template> </template>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
@ -1906,7 +1906,8 @@ export default {
}, },
// 处理orderRepeat里的id // 处理orderRepeat里的id
handleOrderRepeat (id) { handleOrderRepeat (id) {
this.orderRepeat.includes(id) && this.orderRepeat.splice(this.orderRepeat.findIndex(e => e == id), 1) const i = this.orderRepeat.findIndex(e => e == id)
i !== -1 && this.orderRepeat.splice(i, 1)
}, },
/* 处理0开头的期限 */ /* 处理0开头的期限 */
zero (e, row) { zero (e, row) {
@ -1965,7 +1966,7 @@ export default {
// if (this.renewDisabled && this.coursePermissions.length === 1) { // if (this.renewDisabled && this.coursePermissions.length === 1) {
// return this.$message.warning("续费至少保留一条课程权限"); // return this.$message.warning("续费至少保留一条课程权限");
// } else { // } else {
this.handleOrderRepeat(row.dataOrCourseId) this.handleOrderRepeat(row.mallId)
this.coursePermissions.splice(index, 1); this.coursePermissions.splice(index, 1);
// } // }
}); });
@ -1978,7 +1979,7 @@ export default {
// if (this.renewDisabled && this.theoryCourseList.length === 1) { // if (this.renewDisabled && this.theoryCourseList.length === 1) {
// return this.$message.warning("续费至少保留一条课程权限"); // return this.$message.warning("续费至少保留一条课程权限");
// } else { // } else {
this.handleOrderRepeat(row.dataOrCourseId) this.handleOrderRepeat(row.mallId)
this.theoryCourseList.splice(index, 1); this.theoryCourseList.splice(index, 1);
// } // }
}); });
@ -1992,7 +1993,7 @@ export default {
// if (this.renewDisabled && this.dataPlatformPermissions.length === 1) { // if (this.renewDisabled && this.dataPlatformPermissions.length === 1) {
// return this.$message.warning("续费至少保留一条产品信息"); // return this.$message.warning("续费至少保留一条产品信息");
// } else { // } else {
this.handleOrderRepeat(row.dataOrCourseId) this.handleOrderRepeat(row.mallId)
this.dataPlatformPermissions.splice(index, 1); this.dataPlatformPermissions.splice(index, 1);
// } // }
}); });
@ -2006,7 +2007,7 @@ export default {
// if (this.renewDisabled && this.valuePermissions.length === 1) { // if (this.renewDisabled && this.valuePermissions.length === 1) {
// return this.$message.warning("续费至少保留一条产品信息"); // return this.$message.warning("续费至少保留一条产品信息");
// } else { // } else {
this.handleOrderRepeat(row.dataOrCourseId) this.handleOrderRepeat(row.mallId)
this.valuePermissions.splice(index, 1); this.valuePermissions.splice(index, 1);
// } // }
}); });
@ -2165,7 +2166,7 @@ export default {
// if (this.renewDisabled && this.practicalCourses.length === 1) { // if (this.renewDisabled && this.practicalCourses.length === 1) {
// return this.$message.warning("续费至少保留一条产品信息"); // return this.$message.warning("续费至少保留一条产品信息");
// } else { // } else {
this.handleOrderRepeat(row.dataOrCourseId) this.handleOrderRepeat(row.mallId)
this.practicalCourses.splice(index, 1); this.practicalCourses.splice(index, 1);
// } // }
}); });
@ -2179,7 +2180,7 @@ export default {
if (this.renewDisabled && this.expTools.length === 1) { if (this.renewDisabled && this.expTools.length === 1) {
return this.$message.warning("续费至少保留一条产品信息"); return this.$message.warning("续费至少保留一条产品信息");
} else { } else {
this.handleOrderRepeat(row.dataOrCourseId) this.handleOrderRepeat(row.mallId)
this.expTools.splice(index, 1); this.expTools.splice(index, 1);
} }
}); });

Write Preview
Loading…
Cancel
Save