|
@@ -3,7 +3,12 @@
|
|
|
<div class="m-container">
|
|
|
<h2>
|
|
|
<div class="squrt"></div>
|
|
|
- 服务指标明细<filter-search ref='filterSearch' @reload="reloadSearch" :keys="['searchType']" :moreKeys="['start', 'end', 'organId']"/>
|
|
|
+ 服务指标明细<filter-search
|
|
|
+ ref="filterSearch"
|
|
|
+ @reload="reloadSearch"
|
|
|
+ :keys="['searchType']"
|
|
|
+ :moreKeys="['organId']"
|
|
|
+ />
|
|
|
</h2>
|
|
|
<div class="m-core">
|
|
|
<save-form
|
|
@@ -11,11 +16,12 @@
|
|
|
:model="searchForm"
|
|
|
@submit="search"
|
|
|
@reset="onReSet"
|
|
|
+ ref="form"
|
|
|
>
|
|
|
- <el-form-item>
|
|
|
+ <el-form-item prop="organId">
|
|
|
<el-select
|
|
|
class="multiple"
|
|
|
- v-model.trim="searchForm.organIdList"
|
|
|
+ v-model.trim="searchForm.organId"
|
|
|
filterable
|
|
|
clearable
|
|
|
placeholder="请选择分部"
|
|
@@ -28,16 +34,16 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item>
|
|
|
+ <el-form-item prop="teacherId">
|
|
|
<remote-search
|
|
|
:commit="'setTeachers'"
|
|
|
v-model="searchForm.teacherId"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item>
|
|
|
+ <el-form-item prop="unDone">
|
|
|
<el-select
|
|
|
class="multiple"
|
|
|
- v-model.trim="searchForm.operatingTag"
|
|
|
+ v-model.trim="searchForm.unDone"
|
|
|
clearable
|
|
|
placeholder="是否异常"
|
|
|
>
|
|
@@ -45,10 +51,10 @@
|
|
|
<el-option label="否" :value="0"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item>
|
|
|
+ <el-form-item prop="reminded">
|
|
|
<el-select
|
|
|
class="multiple"
|
|
|
- v-model.trim="searchForm.operatingTag"
|
|
|
+ v-model.trim="searchForm.reminded"
|
|
|
clearable
|
|
|
placeholder="是否提醒"
|
|
|
>
|
|
@@ -56,26 +62,23 @@
|
|
|
<el-option label="否" :value="0"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item>
|
|
|
- <el-select
|
|
|
- class="multiple"
|
|
|
- v-model.trim="searchForm.operatingTag"
|
|
|
- clearable
|
|
|
- placeholder="操作人"
|
|
|
- >
|
|
|
- <el-option label="是" :value="1"></el-option>
|
|
|
- <el-option label="否" :value="0"></el-option>
|
|
|
- </el-select>
|
|
|
+ <el-form-item prop="operatorId">
|
|
|
+ <remote-search
|
|
|
+ :commit="'setEmploys'"
|
|
|
+ v-model.trim="searchForm.operatorId"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-date-picker
|
|
|
style="width: 410px"
|
|
|
- v-model.trim="searchForm.orderDate"
|
|
|
+ v-model.trim="orderDate"
|
|
|
type="daterange"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
range-separator="至"
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
+ :clearable="false"
|
|
|
+ @change="changeWeek"
|
|
|
:picker-options="{ firstDayOfWeek: 1 }"
|
|
|
>
|
|
|
</el-date-picker>
|
|
@@ -85,50 +88,65 @@
|
|
|
<el-button native-type="reset" type="danger">重置</el-button>
|
|
|
</el-form-item>
|
|
|
</save-form>
|
|
|
+ <div class="btnWraps" style="margin-bottom: 20px">
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ v-permission="'exercisesSituation/teacherServeRemindPush'"
|
|
|
+ @click="remindTeachers"
|
|
|
+ >批量提醒</el-button
|
|
|
+ >
|
|
|
+ </div>
|
|
|
<div class="tableWrap">
|
|
|
<el-table
|
|
|
style="width: 100%"
|
|
|
:header-cell-style="{ background: '#EDEEF0', color: '#444' }"
|
|
|
:data="tableList"
|
|
|
+ @selection-change="handleSelectionChange"
|
|
|
>
|
|
|
<el-table-column
|
|
|
+ type="selection"
|
|
|
+ width="55"
|
|
|
+ :selectable="checkSelectable"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
align="center"
|
|
|
- prop="studentId"
|
|
|
+ prop="organName"
|
|
|
label="分部"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
align="center"
|
|
|
- prop="studentId"
|
|
|
+ prop="teacherId"
|
|
|
label="老师编号"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
align="center"
|
|
|
- prop="studentId"
|
|
|
+ prop="teacherName"
|
|
|
label="老师姓名"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
align="center"
|
|
|
- prop="studentId"
|
|
|
+ prop="homeworkNum"
|
|
|
label="课后作业(节)"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
align="center"
|
|
|
- prop="studentId"
|
|
|
+ prop="exerciseNum"
|
|
|
label="课外作业(人)"
|
|
|
></el-table-column>
|
|
|
+ <el-table-column align="center" prop="studentId" label="是否异常">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.unDone ? "是" : "否" }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
align="center"
|
|
|
- prop="studentId"
|
|
|
- label="是否异常"
|
|
|
- ></el-table-column>
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- prop="studentId"
|
|
|
+ prop="remindDate"
|
|
|
label="提醒时间"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
align="center"
|
|
|
- prop="studentId"
|
|
|
+ prop="operatorName"
|
|
|
label="操作人"
|
|
|
></el-table-column>
|
|
|
<el-table-column align="center" prop="studentId" label="操作">
|
|
@@ -137,7 +155,13 @@
|
|
|
<el-button type="text" @click="gotoDteail(scope.row)"
|
|
|
>查看</el-button
|
|
|
>
|
|
|
- <el-button type="text">提醒老师</el-button>
|
|
|
+ <el-button
|
|
|
+ type="text"
|
|
|
+ v-if="scope.row.unDone"
|
|
|
+ v-permission="'exercisesSituation/teacherServeRemindPush'"
|
|
|
+ @click="remindTeacher(scope.row)"
|
|
|
+ >提醒老师</el-button
|
|
|
+ >
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -156,10 +180,9 @@
|
|
|
destroy-on-close
|
|
|
:close-on-click-modal="false"
|
|
|
:visible.sync="lookVisible"
|
|
|
- v-if="lookVisible"
|
|
|
+ v-if="lookVisible"
|
|
|
>
|
|
|
<serverMask
|
|
|
-
|
|
|
:detail="activeRow"
|
|
|
@close="lookVisible = false"
|
|
|
@submited="getList"
|
|
@@ -180,15 +203,23 @@ import { getToken } from "@/utils/auth";
|
|
|
import pagination from "@/components/Pagination/index";
|
|
|
import serverMask from "./conponent/serverMask";
|
|
|
import load from "@/utils/loading";
|
|
|
+import { getTeacherServeInfo, teacherServeRemindPush } from "./api";
|
|
|
+import { getTimes } from "@/utils";
|
|
|
+import { getNowDateAndSunday, getNowDateAndMonday } from "@/utils/date";
|
|
|
export default {
|
|
|
components: { pagination, serverMask },
|
|
|
data() {
|
|
|
return {
|
|
|
searchForm: {
|
|
|
- organIdList: [],
|
|
|
+ organId: "",
|
|
|
teacherId: "",
|
|
|
+ operatorId: "",
|
|
|
+ reminded: "",
|
|
|
+ unDone: "",
|
|
|
+ operatorId: "",
|
|
|
},
|
|
|
- tableList: [{}],
|
|
|
+ orderDate: [],
|
|
|
+ tableList: [],
|
|
|
organList: [],
|
|
|
rules: {
|
|
|
// 分页规则
|
|
@@ -199,6 +230,7 @@ export default {
|
|
|
},
|
|
|
lookVisible: false,
|
|
|
activeRow: null,
|
|
|
+ chioseList: [],
|
|
|
};
|
|
|
},
|
|
|
//生命周期 - 创建完成(可以访问当前this实例)
|
|
@@ -212,17 +244,110 @@ export default {
|
|
|
methods: {
|
|
|
init() {
|
|
|
this.$store.dispatch("setBranchs");
|
|
|
+ this.$store.dispatch("setEmploys");
|
|
|
+ this.getDefaultTime();
|
|
|
+ if (this.$route.query.searchType) {
|
|
|
+ console.log();
|
|
|
+ this.searchForm.organId = this.$route.query.organId * 1 || "";
|
|
|
+ const dayjs = this.$helpers.dayjs;
|
|
|
+ let nowDate = dayjs(new Date()).format("YYYY-MM-DD");
|
|
|
+ this.orderDate = [
|
|
|
+ getNowDateAndMonday(nowDate),
|
|
|
+ getNowDateAndSunday(nowDate),
|
|
|
+ ];
|
|
|
+ }
|
|
|
+
|
|
|
+ this.getList();
|
|
|
+ },
|
|
|
+ async getList() {
|
|
|
+
|
|
|
+ try {
|
|
|
+ const {orderDate, ...rest} = this.searchForm;
|
|
|
+ const result = await getTeacherServeInfo({
|
|
|
+ ...rest,
|
|
|
+ ...getTimes(this.orderDate, ["monday", "sunday"]),
|
|
|
+ rows: this.rules.limit,
|
|
|
+ page: this.rules.page,
|
|
|
+ });
|
|
|
+ this.rules.total = result.data.total;
|
|
|
+ this.tableList = result.data.rows;
|
|
|
+ } catch (e) {}
|
|
|
},
|
|
|
- getList() {},
|
|
|
search() {
|
|
|
this.rules.page = 1;
|
|
|
this.getList();
|
|
|
},
|
|
|
- onReSet() {},
|
|
|
+ onReSet() {
|
|
|
+ this.$refs.form.resetFields();
|
|
|
+ this.getDefaultTime();
|
|
|
+ this.search();
|
|
|
+ },
|
|
|
gotoDteail(row) {
|
|
|
this.activeRow = row;
|
|
|
this.lookVisible = true;
|
|
|
},
|
|
|
+ reloadSearch() {
|
|
|
+ this.getList();
|
|
|
+ },
|
|
|
+ getDefaultTime() {
|
|
|
+ const dayjs = this.$helpers.dayjs;
|
|
|
+ let nowDate = dayjs(new Date()).format("YYYY-MM-DD");
|
|
|
+ let lastWeek = dayjs(nowDate).subtract(1, "week").format("YYYY-MM-DD");
|
|
|
+ this.orderDate = [
|
|
|
+ getNowDateAndMonday(lastWeek),
|
|
|
+ getNowDateAndSunday(nowDate),
|
|
|
+ ];
|
|
|
+ },
|
|
|
+ changeWeek(val) {
|
|
|
+ if (val) {
|
|
|
+ this.orderDate = [
|
|
|
+ getNowDateAndMonday(val[0]),
|
|
|
+ getNowDateAndSunday(val[1]),
|
|
|
+ ]
|
|
|
+ } else {
|
|
|
+ this.getDefaultTime();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ remindTeacher(row) {
|
|
|
+ this.$confirm("是否给老师发送提醒?", "提示", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning",
|
|
|
+ }).then(async () => {
|
|
|
+ try {
|
|
|
+ const result = await teacherServeRemindPush([row]);
|
|
|
+ this.getList();
|
|
|
+ this.$message.success("提醒成功");
|
|
|
+ } catch (e) {
|
|
|
+ console.log(e);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+ remindTeachers() {
|
|
|
+ if (this.chioseList.length <= 0) {
|
|
|
+ this.$message.error("请至少选择一条信息");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ this.$confirm("是否批量给老师发送提醒?", "提示", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning",
|
|
|
+ }).then(async () => {
|
|
|
+ try {
|
|
|
+ const result = await teacherServeRemindPush(this.chioseList);
|
|
|
+ this.getList();
|
|
|
+ this.$message.success("提醒成功");
|
|
|
+ } catch (e) {
|
|
|
+ console.log(e);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+ checkSelectable(row) {
|
|
|
+ return row.unDone;
|
|
|
+ },
|
|
|
+ handleSelectionChange(arr) {
|
|
|
+ this.chioseList = arr;
|
|
|
+ },
|
|
|
},
|
|
|
};
|
|
|
</script>
|