From bedf461ff5403517478598e9f36d3c1ce033925f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 24 十二月 2024 13:06:39 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/dream_web
---
src/views/class/index.vue | 419 +++++++++++++++++++++++++---------------------------
src/api/student.js | 6
src/api/order.js | 20 ++
src/utils/print.js | 30 --
src/api/class.js | 2
5 files changed, 233 insertions(+), 244 deletions(-)
diff --git a/src/api/class.js b/src/api/class.js
index 21e36e8..ba5bd5e 100644
--- a/src/api/class.js
+++ b/src/api/class.js
@@ -40,6 +40,7 @@
}
}
`,
+ fetchPolicy:'no-cache',
variables: params,
});
}
@@ -73,6 +74,7 @@
}
}
`,
+ fetchPolicy:'no-cache',
variables: params,
});
}
diff --git a/src/api/order.js b/src/api/order.js
index 5280e3c..bcb6174 100644
--- a/src/api/order.js
+++ b/src/api/order.js
@@ -2,15 +2,27 @@
import gql from "graphql-tag";
export function getData(params) {
- return apolloClient.query({
- query: gql`
+ return apolloClient.query({
+ query: gql `
query vars($staffId:Int!,$keyword:String,$pageIn:PageIn!){
findOrderByOrgId(staffId:$staffId,keyword:$keyword,pageIn:$pageIn) {
ls{id number createTime state payType payState message buyer{name } mobile amt discount originAmt
playerBaseInfo{id name} orgBaseInfo{id name} saleStaff{name}
details{goodsName skuName unitName voucherName giftQty qty amt price goodsGalleries{url1 url2 url3 origin def ext} }} pageOut{total index size} }}`,
- variables: params,
- });
+ fetchPolicy: 'no-cache',
+ variables: params,
+ });
+}
+
+export function findPlayerAccByOrderId(params) {
+ return apolloClient.query({
+ query: gql `
+ query vars($orderId:Int!){
+ findPlayerAccByOrderId(orderId:$orderId) {
+ id staffName }}`,
+ fetchPolicy: 'no-cache',
+ variables: params,
+ });
}
diff --git a/src/api/student.js b/src/api/student.js
index 6456ede..93733af 100644
--- a/src/api/student.js
+++ b/src/api/student.js
@@ -43,6 +43,7 @@
}
}
`,
+ fetchPolicy:'no-cache',
variables: params,
});
}
@@ -89,6 +90,7 @@
}
}
`,
+ fetchPolicy:'no-cache',
variables: params,
});
}
@@ -131,6 +133,7 @@
}
}
`,
+ fetchPolicy:'no-cache',
variables: params,
});
}
@@ -177,6 +180,7 @@
}
}
`,
+ fetchPolicy:'no-cache',
variables: params,
});
}
@@ -301,6 +305,7 @@
}
}
`,
+ fetchPolicy:'no-cache',
variables: params,
});
}
@@ -333,6 +338,7 @@
}
}
`,
+ fetchPolicy:'no-cache',
variables: params,
});
}
diff --git a/src/utils/print.js b/src/utils/print.js
index d4c72e1..13b07cf 100644
--- a/src/utils/print.js
+++ b/src/utils/print.js
@@ -1,16 +1,17 @@
-export function printHtml(html) {
+export function loadPrintStyle() {
let style = getStyle();
- let container = getContainer(html);
-
document.body.appendChild(style);
- document.body.appendChild(container);
+}
+export function printHtml(html) {
+ let container = getContainer(html);
+ document.body.appendChild(container);
getLoadPromise(container).then(() => {
window.print();
- document.body.removeChild(style);
document.body.removeChild(container);
});
}
+
// 璁剧疆鎵撳嵃鏍峰紡
function getStyle() {
@@ -32,24 +33,7 @@
@page {
margin-top: 0;
margin-bottom: 0
- }
- .div-2-column {
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- }
- .m-h2 {
- text-align: center;
- font-size: 1.17em;
- margin-top: 50px;
- font-weight: bold;
- }
- #tr {
- height: 30px;
- }
- .txt-center {
- text-align: center;
- }
+ }
`;
let style = document.createElement("style");
style.innerHTML = styleContent;
diff --git a/src/views/class/index.vue b/src/views/class/index.vue
index f795f0f..b24b83c 100644
--- a/src/views/class/index.vue
+++ b/src/views/class/index.vue
@@ -1,231 +1,216 @@
<template>
- <div class="app-container">
- <el-tabs v-model="activeName" @tab-click="fetchData">
- <el-tab-pane label="鍏ㄩ儴" name="all" />
- <el-tab-pane label="宸插仠鐢�" name="deactivated" />
- </el-tabs>
- <div style="display: flex; flex-direction: row-reverse">
- <div style="width: 300px">
- <el-input
- placeholder="鎸夌彮绾у悕绉版悳绱�"
- v-model="data.keyword"
- class="input-with-select"
- size="small"
- >
- <el-button
- slot="append"
- icon="el-icon-search"
- @click="fetchData"
- ></el-button>
- </el-input>
- </div>
- </div>
- <div style="height: calc(100vh - 208px)">
- <el-table
- v-loading="listLoading"
- :data="list"
- element-loading-text="Loading"
- fit
- v-if="activeName == 'all'"
- height="100%"
- >
- <el-table-column label="鐝骇鍚嶇О">
- <template slot-scope="scope">
- <el-link type="primary" :underline="false">{{
- scope.row.team.name
- }}</el-link>
- </template>
- </el-table-column>
- <el-table-column label="鐝骇浜烘暟" width="200">
- <template slot-scope="scope"
- >{{ scope.row.playerCount }} 浜�</template
- >
- </el-table-column>
- <el-table-column label="璇惧寘/浼氬憳鍗�" width="200">
- <template slot-scope="scope">{{
- scope.row.team.voucher
- ? scope.row.team.voucher.name
- : ''
- }}</template>
- </el-table-column>
- <el-table-column label="鏁欏笀" width="">
- <template slot-scope="scope">{{
- concatenateArray(scope.row.team.sessionStaffs)
- }}</template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" width="200">
- <template slot-scope="scope">
- <el-button type="text" @click="handleExport(scope.row)">
- 瀵煎嚭
- </el-button>
- </template>
- </el-table-column>
- </el-table>
- <el-table
- v-loading="listLoading"
- :data="list"
- element-loading-text="Loading"
- fit
- height="100%"
- v-else
- >
- <el-table-column label="鐝骇鍚嶇О">
- <template slot-scope="scope"
- >{{ scope.row.name }}
- </template>
- </el-table-column>
- <el-table-column label="鍋滅敤鏃堕棿">
- <template slot-scope="scope"
- >{{ scope.row.modifyTime }}
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" width="200">
- <template slot-scope="">
- <el-link type="primary" :underline="false"
- >鎭㈠</el-link
- >
- </template>
- </el-table-column>
- </el-table>
- </div>
- <div>
- <el-pagination
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="data.pageIn.index + 1"
- :page-sizes="[10, 20, 30, 40]"
- :page-size="data.pageIn.size"
- layout="total, sizes, prev, pager, next, jumper"
- :total="total"
- >
- </el-pagination>
- </div>
- <el-dialog title="瀵煎嚭" :visible.sync="dialogVisible" width="50%">
- <el-form ref="form" :model="form" label-width="180px">
- <el-form-item label="鏃ユ湡鑼冨洿">
- <el-date-picker
- v-model="form.dateRange"
- type="daterange"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- value-format="yyyy-MM-dd"
- ></el-date-picker>
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="confirmExport"
- >瀵� 鍑�</el-button
- >
- </div>
- </el-dialog>
+ <div class="app-container">
+ <el-tabs v-model="activeName" @tab-click="fetchData">
+ <el-tab-pane label="鍏ㄩ儴" name="all" />
+ <el-tab-pane label="宸插仠鐢�" name="deactivated" />
+ </el-tabs>
+ <div style="display: flex; flex-direction: row-reverse">
+ <div style="width: 300px">
+ <el-input
+ placeholder="鎸夌彮绾у悕绉版悳绱�"
+ v-model="data.keyword"
+ class="input-with-select"
+ size="small"
+ >
+ <el-button
+ slot="append"
+ icon="el-icon-search"
+ @click="fetchData"
+ ></el-button>
+ </el-input>
+ </div>
</div>
+ <div style="height: calc(100vh - 208px)">
+ <el-table
+ v-loading="listLoading"
+ :data="list"
+ element-loading-text="Loading"
+ fit
+ v-if="activeName == 'all'"
+ height="100%"
+ >
+ <el-table-column label="鐝骇鍚嶇О" prop="team.name"> </el-table-column>
+ <el-table-column label="鐝骇浜烘暟" width="200" prop="playerCount">
+ </el-table-column>
+ <el-table-column label="璇惧寘/浼氬憳鍗�" width="200" prop="voucher.name">
+ </el-table-column>
+ <el-table-column label="鏁欏笀" width="" prop="sessionStaffs">
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="200">
+ <template slot-scope="scope">
+ <el-link
+ @click="handleExport(scope.row)"
+ type="primary"
+ :underline="false"
+ >瀵煎嚭</el-link
+ >
+ <!-- <el-button type="text" @click="handleExport(scope.row)">
+ 瀵煎嚭
+ </el-button> -->
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-table
+ v-loading="listLoading"
+ :data="list"
+ element-loading-text="Loading"
+ fit
+ height="100%"
+ v-else
+ >
+ <el-table-column label="鐝骇鍚嶇О" prop="name"> </el-table-column>
+ <el-table-column label="鍋滅敤鏃堕棿" prop="modifyTime"> </el-table-column>
+ <el-table-column label="鎿嶄綔" width="200">
+ <template slot-scope="">
+ <el-link type="primary" :underline="false">鎭㈠</el-link>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ <div>
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="data.pageIn.index + 1"
+ :page-sizes="[10, 20, 30, 40]"
+ :page-size="data.pageIn.size"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="total"
+ >
+ </el-pagination>
+ </div>
+ <el-dialog title="瀵煎嚭" :visible.sync="dialogVisible" width="50%">
+ <el-form ref="form" :model="form" label-width="180px">
+ <el-form-item label="鏃ユ湡鑼冨洿">
+ <el-date-picker
+ v-model="form.dateRange"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ value-format="yyyy-MM-dd"
+ ></el-date-picker>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="confirmExport">瀵� 鍑�</el-button>
+ </div>
+ </el-dialog>
+ </div>
</template>
<script>
import { getTeamDtoAll, getDeletedItem } from "@/api/class";
export default {
- filters: {
- statusFilter(status) {
- const statusMap = {
- published: "success",
- draft: "gray",
- deleted: "danger",
- };
- return statusMap[status];
- },
+ filters: {
+ statusFilter(status) {
+ const statusMap = {
+ published: "success",
+ draft: "gray",
+ deleted: "danger",
+ };
+ return statusMap[status];
},
- data() {
- return {
- dialogVisible: false,
- form: {
- dateRange: [],
- teamId: "",
- name: "",
- },
- list: null,
- listLoading: true,
- activeName: "all",
- total: 0,
- data: {
- staffId: JSON.parse(localStorage.getItem("selectStaff")).id,
- keyword: "",
- pageIn: {
- //鍙�夛紝濡傛灉鏄垎椤垫煡璇紝闇�瑕佸姞涓娿��
- index: 0, //蹇呴��
- size: 10, //姣忛〉鐨勫ぇ灏忋�傞粯璁�20
- sorts: {
- name: "name", //鎺掑簭瀛楁鍚嶇О
- direction: "ASC", //鎺掑簭鏂瑰悜
- },
- },
- types: ["NORMAL"],
- },
+ },
+ data() {
+ return {
+ dialogVisible: false,
+ form: {
+ dateRange: [],
+ teamId: "",
+ name: "",
+ },
+ list: null,
+ listLoading: true,
+ activeName: "all",
+ total: 0,
+ data: {
+ staffId: JSON.parse(localStorage.getItem("selectStaff")).id,
+ keyword: "",
+ pageIn: {
+ //鍙�夛紝濡傛灉鏄垎椤垫煡璇紝闇�瑕佸姞涓娿��
+ index: 0, //蹇呴��
+ size: 10, //姣忛〉鐨勫ぇ灏忋�傞粯璁�20
+ sorts: {
+ name: "name", //鎺掑簭瀛楁鍚嶇О
+ direction: "ASC", //鎺掑簭鏂瑰悜
+ },
+ },
+ types: ["NORMAL"],
+ },
+ };
+ },
+ created() {
+ this.fetchData();
+ },
+ methods: {
+ handleExport(row) {
+ this.form.dateRange = [];
+ this.form.teamId = row.team.id;
+ this.form.name = row.team.name;
+ this.dialogVisible = true;
+ },
+ confirmExport() {
+ this.download(
+ "exportSignIn?teamId=" +
+ this.form.teamId +
+ "&startTime=" +
+ this.form.dateRange[0] +
+ "&endTime=" +
+ this.form.dateRange[1],
+ {},
+ `${this.form.name}涓婅绛惧埌琛�.xlsx`
+ );
+ },
+ handleSizeChange(val) {
+ this.data.pageIn.size = val;
+ this.fetchData("pageIn");
+ },
+ handleCurrentChange(val) {
+ this.data.pageIn.index = val - 1;
+ this.fetchData("pageIn");
+ },
+ fetchData(_val) {
+ if (_val !== "pageIn") {
+ this.data.pageIn.index = 0;
+ this.data.pageIn.size = 10;
+ }
+ this.listLoading = true;
+ if (this.activeName == "all") {
+ this.listLoading = true;
+ getTeamDtoAll(this.data).then((response) => {
+ this.list = response.data.findTeamDtoAll.ls;
+ this.total = response.data.findTeamDtoAll.pageOut.total;
+ this.listLoading = false;
+ });
+ } else if (this.activeName == "deactivated") {
+ this.listLoading = true;
+ let data = {
+ itemType: "TEAM",
+ staffId: JSON.parse(localStorage.getItem("selectStaff")).id,
+ keyword: this.data.keyword,
+ pageIn: { ...this.data.pageIn },
};
+ getDeletedItem(data).then((response) => {
+ this.list = response.data.findDeletedItem.ls;
+ this.total = response.data.findDeletedItem.pageOut.total;
+ this.listLoading = false;
+ });
+ }
},
- created() {
- this.fetchData();
+ concatenateArray(arr) {
+ let result = "";
+ for (let i = 0; i < arr.length; i++) {
+ if (i == 0) {
+ result += arr[i].name;
+ } else {
+ result += "," + arr[i].name;
+ }
+ }
+ return result;
},
- methods: {
- handleExport(row) {
- this.form.dateRange = [];
- this.form.teamId = row.team.id;
- this.form.name = row.team.name;
- this.dialogVisible = true;
- },
- confirmExport() {
- this.download('exportSignIn?teamId=' + this.form.teamId + '&startTime=' + this.form.dateRange[0] + '&endTime=' + this.form.dateRange[1], {
- }, `${this.form.name}涓婅绛惧埌琛�.xlsx`)
- },
- handleSizeChange(val) {
- this.data.pageIn.size = val;
- this.fetchData("pageIn");
- },
- handleCurrentChange(val) {
- this.data.pageIn.index = val - 1;
- this.fetchData("pageIn");
- },
- fetchData(_val) {
- if (_val !== "pageIn") {
- this.data.pageIn.index = 0;
- this.data.pageIn.size = 10;
- }
- this.listLoading = true;
- if (this.activeName == "all") {
- this.listLoading = true;
- getTeamDtoAll(this.data).then((response) => {
- this.list = response.data.findTeamDtoAll.ls;
- this.total = response.data.findTeamDtoAll.pageOut.total;
- this.listLoading = false;
- });
- } else if (this.activeName == "deactivated") {
- this.listLoading = true;
- let data = {
- itemType: "TEAM",
- staffId: JSON.parse(localStorage.getItem("selectStaff")).id,
- keyword: this.data.keyword,
- pageIn: { ...this.data.pageIn },
- };
- getDeletedItem(data).then((response) => {
- this.list = response.data.findDeletedItem.ls;
- this.total = response.data.findDeletedItem.pageOut.total;
- this.listLoading = false;
- });
- }
- },
- concatenateArray(arr) {
- let result = "";
- for (let i = 0; i < arr.length; i++) {
- if (i == 0) {
- result += arr[i].name;
- } else {
- result += "," + arr[i].name;
- }
- }
- return result;
- },
- },
+ },
};
</script>
--
Gitblit v1.8.0