|
@@ -75,7 +75,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<div style="display: flex;justify-content: center;">
|
|
|
<div class="TabBtn" @click="lookScore(scope.row)">评分</div>
|
|
|
- <div class="TabBtn" @click="withdraw(scope.row.id)">撤回</div>
|
|
|
+ <div class="TabBtn" @click="withdraw(scope.row.id)">退回</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -258,6 +258,51 @@
|
|
|
></iframe>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
+
|
|
|
+ <!-- 提醒弹框 -->
|
|
|
+ <el-dialog
|
|
|
+ title="提醒"
|
|
|
+ :visible.sync="remDig"
|
|
|
+ :append-to-body="true"
|
|
|
+ width="600"
|
|
|
+ :before-close="handleClose3"
|
|
|
+ class="dialog_remDig"
|
|
|
+ >
|
|
|
+ <div v-loading="digLoading" style="height: 100%;padding: 15px;">
|
|
|
+ <div class="remFlex" style="align-items: center;">
|
|
|
+ <div class="remFlexTit">填写范围:</div>
|
|
|
+ <el-select disabled v-model="teas" multiple placeholder="请选择">
|
|
|
+ <el-option
|
|
|
+ v-for="item in TeaList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
+ <div class="remFlex">
|
|
|
+ <div class="remFlexTit">需提交人数:</div>
|
|
|
+ <div>{{ remindNum }}</div>
|
|
|
+ </div>
|
|
|
+ <div class="remFlex">
|
|
|
+ <div class="remFlexTit">未完成人数:</div>
|
|
|
+ <div>{{ remindList.length }}</div>
|
|
|
+ </div>
|
|
|
+ <div class="remFlex">
|
|
|
+ <div class="remFlexTit">需提交人数:</div>
|
|
|
+ <div class="remFlex" style="flex-wrap: wrap;">
|
|
|
+ <div
|
|
|
+ v-for="(item, index) in remindList"
|
|
|
+ :key="index"
|
|
|
+ style="margin-right: 2px;"
|
|
|
+ >
|
|
|
+ {{ item }},
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -297,7 +342,10 @@ export default {
|
|
|
tableData: [],
|
|
|
teas: [],
|
|
|
TeachingOptions: [],
|
|
|
- txtLoading: false
|
|
|
+ txtLoading: false,
|
|
|
+ remindNum: 0,
|
|
|
+ remindList: [],
|
|
|
+ remDig: false
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
@@ -472,7 +520,7 @@ export default {
|
|
|
}
|
|
|
];
|
|
|
|
|
|
- this.$confirm("确认撤回?", "提示", {
|
|
|
+ this.$confirm("是否确认退回?", "提示", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
type: " info"
|
|
@@ -490,23 +538,37 @@ export default {
|
|
|
.catch(() => {
|
|
|
this.$message({
|
|
|
type: "info",
|
|
|
- message: "已取消撤回"
|
|
|
+ message: "已取消退回"
|
|
|
});
|
|
|
});
|
|
|
},
|
|
|
// 提醒
|
|
|
remindExamine() {
|
|
|
+ this.remindList = [];
|
|
|
+ this.remindNum = 0;
|
|
|
+ this.remDig = true;
|
|
|
+ this.digLoading = true;
|
|
|
+
|
|
|
let params = {
|
|
|
oid: this.oid,
|
|
|
org: this.org,
|
|
|
tea: this.teas.join(","),
|
|
|
ptype: this.pType
|
|
|
};
|
|
|
- return console.log(params);
|
|
|
+ // return console.log(params);
|
|
|
|
|
|
this.ajax
|
|
|
.get(this.$store.state.api + "selectExamineTeaRemind", params)
|
|
|
- .then(res => {})
|
|
|
+ .then(res => {
|
|
|
+ let data = res.data[0];
|
|
|
+ this.remindNum = data.length > 0 ? data[0].num : 0;
|
|
|
+ data.forEach(e => {
|
|
|
+ this.remindList.push(e.username);
|
|
|
+ });
|
|
|
+ this.digLoading = false;
|
|
|
+
|
|
|
+ console.log(this.remindList);
|
|
|
+ })
|
|
|
.catch(err => {
|
|
|
console.error(err);
|
|
|
});
|
|
@@ -520,13 +582,13 @@ export default {
|
|
|
},
|
|
|
// 教研室筛选
|
|
|
filterTea(value, row, column) {
|
|
|
- console.log(value, row, column);
|
|
|
+ // console.log(value, row, column);
|
|
|
const property = column["property"];
|
|
|
return row[property].includes(value);
|
|
|
},
|
|
|
// 是否完成筛选
|
|
|
filterExa(value, row, column) {
|
|
|
- console.log(value, row, column);
|
|
|
+ // console.log(value, row, column);
|
|
|
const property = column["property"];
|
|
|
return row[property] == value;
|
|
|
},
|
|
@@ -774,10 +836,12 @@ export default {
|
|
|
// 数据来源关闭弹框
|
|
|
handleClose2(done) {
|
|
|
this.digLoading = true;
|
|
|
-
|
|
|
this.getPageBase();
|
|
|
done();
|
|
|
},
|
|
|
+ handleClose3(done) {
|
|
|
+ done();
|
|
|
+ },
|
|
|
// 处理数据来源
|
|
|
async handleData() {
|
|
|
for (const e of this.PageBaseData) {
|
|
@@ -820,6 +884,15 @@ export default {
|
|
|
white-space: nowrap;
|
|
|
text-overflow: ellipsis;
|
|
|
}
|
|
|
+/* .remFlex {
|
|
|
+ display: flex;
|
|
|
+ justify-content: flex-start;
|
|
|
+ margin-bottom: 20px;
|
|
|
+}
|
|
|
+.remFlexTit {
|
|
|
+ width: 80px;
|
|
|
+ flex-shrink: 0;
|
|
|
+} */
|
|
|
.digTop {
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
@@ -831,6 +904,18 @@ export default {
|
|
|
color: #528df6;
|
|
|
margin: 0 10px;
|
|
|
}
|
|
|
+/* .dialog_remDig >>> .el-dialog {
|
|
|
+ height: 700px;
|
|
|
+ margin: 0 auto !important;
|
|
|
+ margin-top: 20px !important;
|
|
|
+ overflow: hidden;
|
|
|
+ min-width: 800px !important;
|
|
|
+}
|
|
|
+
|
|
|
+.dialog_remDig >>> .el-dialog__header {
|
|
|
+ background: #454545 !important;
|
|
|
+ padding: 15px 20px;
|
|
|
+} */
|
|
|
.dialog_diy >>> .el-dialog {
|
|
|
height: 95%;
|
|
|
margin: 0 auto !important;
|