From 6db03250bcbf51193b8dd71a698ea2b202c6d6ad Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 26 十二月 2025 15:59:20 +0800
Subject: [PATCH] 班组产量汇总报表，客户名称不能重复创建显示

---
 north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
index 4f3bb9b..72c9618 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/TeamOutput.vue
@@ -10,6 +10,7 @@
 import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove"
 import {VxeUI} from "vxe-pc-ui";
 import companyInfo from "@/stores/sd/companyInfo";
+import useOrderInfoStore from "@/stores/sd/order/orderInfo";
 //璇█鑾峰彇
 const {t} = useI18n()
 let router = useRouter()
@@ -21,6 +22,9 @@
   orderId: '',
   project: ''
 })
+
+const reportTime=company.reportTime
+const orderInfo = useOrderInfoStore()
 
 //宸ュ簭
 const procseeValue = ref()
@@ -117,13 +121,15 @@
 let day = pad(date.getDate());
 let newEndTime = `${year}-${month}-${day} ${times}`;
 //绗竴娆″姞杞芥暟鎹�
-request.post(`/report/teamOutput/1/${total.pageSize}/${startTime}/${newEndTime}/${selectProcesses}`, filterData.value).then((res) => {
+
+request.post(`/report/teamOutput/1/${total.pageSize}/${orderInfo.teamOutputDate}/${reportTime}/${selectProcesses}`, filterData.value).then((res) => {
 
   if (res.code == 200) {
     total.value = res.data.footSum
     total.dataTotal = res.data.total.total*1
     total.pageTotal= res.data.total.pageTotal
     pageTotal.value = res.data.total
+    orderInfo.teamOutputDate = res.data.selectDate
     produceList = produceList.value.concat(deepClone(res.data.data))
     titleSelectJson.value.processType = res.data.process
     produceList.forEach(item => {
@@ -168,10 +174,11 @@
   const newEndTime = formatDateTime(endPlusOne);
   const selectProcesses = procseeValue.value;
   form.date1 = [startTime, newEndTime];
-  request.post(`/report/teamOutput/${pageNum.value}/${total.pageSize}/${startTime}/${newEndTime}/${selectProcesses}`, filterData.value).then((res) => {
+  request.post(`/report/teamOutput/1/${total.pageSize}/${orderInfo.teamOutputDate}/${reportTime}/${selectProcesses}`, filterData.value).then((res) => {
     if (res.code == 200) {
 
       total.value = res.data.footSum
+      orderInfo.teamOutputDate = res.data.selectDate
       produceList = deepClone(res.data.data)
       produceList.forEach(item => {
         item.mmTotal = sumMmValues(item.workProcessName);
@@ -239,14 +246,14 @@
 
   form.date1 = [startTime, newEndTime];
 
-  request.post(`/report/teamOutput/${pageNum.value}/${total.pageSize}/${startTime}/${newEndTime}/${selectProcesses}`, filterData.value)
+  request.post(`/report/teamOutput/1/${total.pageSize}/${orderInfo.teamOutputDate}/${reportTime}/${selectProcesses}`, filterData.value)
       .then((res) => {
         if (res.code == 200) {
           total.value = res.data.footSum;
           total.dataTotal = res.data.total.total * 1;
           total.pageTotal = res.data.total.pageTotal;
           pageTotal.value = res.data.total;
-
+          orderInfo.teamOutputDate = res.data.selectDate
           produceList = res.data.data;
           produceList.forEach(item => {
             item.mmTotal = sumMmValues(item.workProcessName);
@@ -329,12 +336,13 @@
   endPlusOne.setDate(endPlusOne.getDate());
   const newEndTime = formatDateTime(endPlusOne);
   form.date1 = [startTime, newEndTime];
-  request.post(`/report/teamOutput/1/${total.pageSize}/${startTime}/${newEndTime}/${selectProcesses}`, filterData.value).then((res) => {
+  request.post(`/report/teamOutput/1/${total.pageSize}/${orderInfo.teamOutputDate}/${reportTime}/${selectProcesses}`, filterData.value).then((res) => {
 
     if (res.code == 200) {
       total.dataTotal = res.data.total.total*1
       total.pageTotal=parseInt(res.data.total)
       pageNum.value=1
+      orderInfo.teamOutputDate = res.data.selectDate
       total.value = res.data.footSum
       produceList = deepClone(res.data.data)
       produceList.forEach(item => {
@@ -519,15 +527,14 @@
         <!--        <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
         <!--        <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
 
-        <el-date-picker
-            v-model="form.date1"
-            :start-placeholder="$t('basicData.startDate')"
-            :end-placeholder="$t('basicData.endDate')"
-            format="YYYY/MM/DD HH:mm"
-            style="width: 350px"
-            type="daterange"
-            value-format="YYYY/MM/DD HH:mm"
-        />
+      <el-date-picker
+          v-model="orderInfo.teamOutputDate"
+          type="daterange"
+          :start-placeholder="$t('basicData.startDate')"
+          :end-placeholder="$t('basicData.endDate')"
+          format="YYYY/MM/DD HH:mm"
+          value-format="YYYY-MM-DD HH:mm"
+      />
         &nbsp;&nbsp;
         <el-select v-model="procseeValue" clearable default-value="default_city" style="width: 120px">
           <el-option
@@ -592,7 +599,7 @@
           <vxe-button style="margin-right: 0.5rem"
                       @click="exportExcel('/report/exportTeamOutput',
                                           t('report.teamOutput'),
-                                          form.date1)">
+                                          orderInfo.teamOutputDate)">
             {{t('basicData.export')}}</vxe-button>
         </template>
 

--
Gitblit v1.8.0