From 018010a93790ceba86e0a4c328387fd51976919c Mon Sep 17 00:00:00 2001
From: sunshine <1467939124@qq.com>
Date: Wed, 31 Jul 2024 16:30:19 +0800
Subject: [PATCH] =?UTF-8?q?30=E5=A4=A9=E6=8A=A5=E5=B7=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/page_report/replaceForm.vue | 2 -
src/pages/workReport.vue | 583 +++++++++++++++++---------------
2 files changed, 310 insertions(+), 275 deletions(-)
diff --git a/src/page_report/replaceForm.vue b/src/page_report/replaceForm.vue
index 5c04ffb..12c6f80 100644
--- a/src/page_report/replaceForm.vue
+++ b/src/page_report/replaceForm.vue
@@ -110,7 +110,6 @@
import {processTypes, groupTypes} from "@/api/system/dict/data";
import {
- getProductList,
createReport,
getOtherPersonalUser,
getOtherOrgList,
@@ -202,7 +201,6 @@ export default {
submit(ref) {
if(this.customFormData.reportDateString.length<11)this.customFormData.reportDateString+=' 00:00:00';
this.customFormData.reportType = '代报工';
- console.log(this.customFormData);
this.$refs[ref].validate().then(res => {
var ok = 1;
if(this.customFormData.produceReportDetails && this.customFormData.produceReportDetails.length > 0) {
diff --git a/src/pages/workReport.vue b/src/pages/workReport.vue
index b03967f..0550acb 100644
--- a/src/pages/workReport.vue
+++ b/src/pages/workReport.vue
@@ -8,6 +8,8 @@
.
报工报表
+
+
上月报工汇总
@@ -104,6 +106,8 @@ import useUserStore from "@/store/modules/user";
import Config from '@/pages/js/config'
import { ref } from 'vue';
import { onLoad } from "@dcloudio/uni-app";
+import auth from "@/plugins/auth";
+import {getOtherPersonalUser} from "@/api/mes/organization";
const now = new Date();
const nowTime = {
@@ -116,7 +120,6 @@ const useStore = useUserStore()
const userId = ref(useStore.userId)
const isCanvas2d = ref(Config.ISCANVAS2D)
-let expendCount = 0;
let delayload = ref(false);
let historyData = ref({});
const reportTime = ref([])
@@ -128,98 +131,118 @@ const detailList = ref([]);
const historyBtn = ref([
{
name: "总数",
- state: 1,
+ state: true,
type: "sumNumber"
},
{
name: "合格数",
- state: 0,
+ state: false,
type: "totalQualityNumber"
},
{
name: "废品数",
- state: 0,
+ state: false,
type: "totalWasteNumber"
}
]);
-const filterHistoryData = () => {
- getReportTimeList()
- let type = historyBtn.value.filter(x => x.state === 1)[0].type;
- switch (type) {
- case "sumNumber":
- historyData.value = dataOne.sumNumber;
- break;
- case "totalQualityNumber":
- historyData.value = dataOne.totalQualityNumber;
- break;
- case "totalWasteNumber":
- historyData.value = dataOne.totalWasteNumber;
- break;
- }
+const userList = ref([])
+
+const getUserList = ()=> {
+ getOtherPersonalUser().then(response => {
+ userList.value = response.data
+ })
+}
+const handleChange = ()=>{
+ getLastMonthSumList()
+ getThisMonthSumList()
+ getReportTimeList()
+ getSumReportTimeList()
+ getDayReportTimeList()
}
-const changeHistoryBtn = (type) => {
- for (let i = 0; i < historyBtn.value.length; i++) {
- if (historyBtn.value[i].type === type) {
- historyBtn.value[i].state = 1;
- } else {
- historyBtn.value[i].state = 0;
- }
- }
- filterHistoryData();
+const changeHistoryBtn = (type) => {
+ historyBtn.value.forEach(btn => {
+ btn.state = false;
+ });
+ for (let i = 0; i < historyBtn.value.length; i++) {
+ historyBtn.value[i].state = historyBtn.value[i].type === type;
}
-// 30天报工数据
-const getReportTimeList = ()=>{
- getReportTime(userId.value).then(response => {
- reportTime.value = response.data;
+ if(type === 'sumNumber') {
dataOne.sumNumber.categories = []
dataOne.sumNumber.series[0].data = []
- dataOne.totalQualityNumber.categories = []
- dataOne.totalQualityNumber.series[0].data = []
- dataOne.totalWasteNumber.categories = []
- dataOne.totalWasteNumber.series[0].data = []
- reportTime.value.forEach(item=>{
+ reportTime.value.forEach(item => {
dataOne.sumNumber.categories.push(`${new Date(item.reportDay).getMonth() + 1}月${new Date(item.reportDay).getDate()}日`)
dataOne.sumNumber.series[0].data.push(item.sumNumber)
+ })
+ historyData.value = dataOne.sumNumber
+ } else if (type === 'totalQualityNumber') {
+ dataOne.totalQualityNumber.categories = []
+ dataOne.totalQualityNumber.series[0].data = []
+ reportTime.value.forEach(item => {
dataOne.totalQualityNumber.categories.push(`${new Date(item.reportDay).getMonth() + 1}月${new Date(item.reportDay).getDate()}日`)
dataOne.totalQualityNumber.series[0].data.push(item.totalQualityNumber)
+ })
+ historyData.value = dataOne.totalQualityNumber
+ } else {
+ dataOne.totalWasteNumber.categories = []
+ dataOne.totalWasteNumber.series[0].data = []
+ reportTime.value.forEach(item => {
dataOne.totalWasteNumber.categories.push(`${new Date(item.reportDay).getMonth() + 1}月${new Date(item.reportDay).getDate()}日`)
dataOne.totalWasteNumber.series[0].data.push(item.totalWasteNumber)
})
+ historyData.value = dataOne.totalWasteNumber
+ }
+}
+
+// 30天报工数据
+const defaultBtnIndex = ref(0)
+const getReportTimeList = async () => {
+ defaultBtnIndex.value = 0;
+ historyBtn.value.forEach((btn, index) => {
+ btn.state = (index === defaultBtnIndex.value);
+ });
+ historyData.value= {}
+ reportTime.value = []
+ dataOne.sumNumber.categories = [];
+ dataOne.sumNumber.series[0].data = [];
+ const response = await getReportTime(userId.value);
+ reportTime.value = response.data;
+ reportTime.value.forEach(item => {
+ const month = new Date(item.reportDay).getMonth() + 1;
+ const day = new Date(item.reportDay).getDate();
+ dataOne.sumNumber.categories.push(`${month}月${day}日`);
+ dataOne.sumNumber.series[0].data.push(item.sumNumber);
});
+ historyData.value = dataOne.sumNumber;
}
// 上月报工汇总
-const getLastMonthSumList = ()=>{
- getLastMonthSum(userId.value).then(response => {
- lastMonthSum.value = response.data;
- });
+const getLastMonthSumList = async () => {
+ const response = await getLastMonthSum(userId.value);
+ lastMonthSum.value = response.data;
}
// 本月报工汇总
-const getThisMonthSumList = ()=>{
- getThisMonthSum(userId.value).then(response => {
- thisMonthSum.value = response.data;
- });
+const getThisMonthSumList = async () => {
+ const response = await getThisMonthSum(userId.value);
+ thisMonthSum.value = response.data;
}
// 本月上月计时汇总
-const getSumReportTimeList = ()=>{
- getSumReportTime(userId.value).then(response => {
- sumReportTime.value = response.data;
- });
+const getSumReportTimeList = async () => {
+ const response = await getSumReportTime(userId.value);
+ sumReportTime.value = response.data;
}
// 最近30天计时列表
-const getDayReportTimeList = ()=>{
- getDayReportTime(userId.value).then(response => {
- detailList.value = response.data;
- });
+const getDayReportTimeList = async () => {
+ const response = await getDayReportTime(userId.value);
+ detailList.value = response.data;
}
onLoad(() => {
- filterHistoryData()
+ getUserList()
getReportTimeList()
getLastMonthSumList()
getThisMonthSumList()
@@ -230,171 +253,183 @@ onLoad(() => {