From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue | 111 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 66 insertions(+), 45 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
index 1bf1b48..fb092ed 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
@@ -1,6 +1,6 @@
<script setup>
-import {reactive, ref} from "vue";
+import {onMounted, reactive, ref} from "vue";
import {useRouter} from 'vue-router'
import request from "@/utils/request";
import deepClone from "@/utils/deepClone";
@@ -11,12 +11,14 @@
import useUserInfoStore from "@/stores/userInfo";
import footSum from "@/hook/footSum"
import userInfo from "@/stores/userInfo"
+import useOrderInfoStore from "@/stores/sd/order/orderInfo";
//璇█鑾峰彇
const { t } = useI18n()
const userStore = useUserInfoStore()
let router=useRouter()
const user=userInfo()
+const orderInfo = useOrderInfoStore()
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
@@ -118,38 +120,37 @@
// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
date.setDate(date.getDate() + 1);
let newEndTime = date.toISOString().split('T')[0]; // 鑾峰彇 YYYY-MM-DD 鏍煎紡鐨勫瓧绗︿覆
+const getReportingWorkList = async () => {
//绗竴娆″姞杞芥暟鎹�
-request.post(`/reportingWork/selectReportingWork/1/${total.pageSize}/${startTime}/${newEndTime}/${inputVal}`, filterData.value).then((res) => {
+ await request.post(`/reportingWork/selectReportingWork/1/${total.pageSize}/${orderInfo.reportingWorkDate}/${inputVal}`, filterData.value).then((res) => {
- if (res.code == 200) {
- total.dataTotal = res.data.total.total*1
- total.pageTotal= res.data.total.pageTotal
- pageTotal.value = res.data.total
- total.value = res.data.total
- produceList = produceList.value.concat(deepClone(res.data.data))
- // 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
- let modifiedCollection = produceList.map(item => {
- if (item.reviewedState === 1) {
- return { ...item, reviewedState: "宸插鏍�" };
- }
- else if (item.reviewedState === 0) {
- return { ...item, reviewedState: "鏈鏍�" };
- }
- else if (item.reviewedState === 2){
- return { ...item, reviewedState: "瀹℃牳涓嶉�氳繃" };
- }
- else {
- // 鍏朵粬鎯呭喌淇濇寔涓嶅彉
- return item;
- }
- });
- xGrid.value.loadData(modifiedCollection)
- gridOptions.loading = false
- } else {
- ElMessage.warning(res.msg)
- }
-})
-
+ if (res.code == 200) {
+ total.dataTotal = res.data.total.total * 1
+ total.pageTotal = res.data.total.pageTotal
+ orderInfo.reportingWorkDate = res.data.selectDate
+ pageTotal.value = res.data.total
+ total.value = res.data.total
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ // 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
+ let modifiedCollection = produceList.map(item => {
+ if (item.reviewedState === 1) {
+ return {...item, reviewedState: t('productStock.approved')};
+ } else if (item.reviewedState === 0) {
+ return {...item, reviewedState: t('reportingWorks.unreviewed')};
+ } else if (item.reviewedState === 2) {
+ return {...item, reviewedState: t('reportingWorks.notunreviewed')};
+ } else {
+ // 鍏朵粬鎯呭喌淇濇寔涓嶅彉
+ return item;
+ }
+ });
+ xGrid.value.loadData(modifiedCollection)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
//椤佃剼缈婚〉鏌ヨ
const selectPageList = ()=>{
let startTime = form.date1[0]
@@ -162,7 +163,8 @@
// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
date.setDate(date.getDate() + 1);
let newEndTime = date.toISOString().split('T')[0]; // 鑾峰彇 YYYY-MM-DD 鏍煎紡鐨勫瓧绗︿覆
- request.post(`/reportingWork/selectReportingWork/${pageNum.value}/${total.pageSize}/${startTime}/${newEndTime}/${inputVal}`,filterData.value).then((res) => {
+ gridOptions.loading=true
+ request.post(`/reportingWork/selectReportingWork/${pageNum.value}/${total.pageSize}/${orderInfo.reportingWorkDate}/${inputVal}`,filterData.value).then((res) => {
if(res.code==200){
total.value = res.data.total
@@ -170,13 +172,16 @@
// 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
let modifiedCollection = produceList.map(item => {
if (item.reviewedState === 1) {
- return { ...item, reviewedState: "宸插鏍�" };
+ //宸插鏍�
+ return { ...item, reviewedState: t('productStock.approved') };
}
else if (item.reviewedState === 0) {
- return { ...item, reviewedState: "鏈鏍�" };
+ //鏈鏍�
+ return { ...item, reviewedState: t('reportingWorks.unreviewed') };
}
else if (item.reviewedState === 2){
- return { ...item, reviewedState: "瀹℃牳涓嶉�氳繃" };
+ //瀹℃牳鏈�氳繃
+ return { ...item, reviewedState: t('reportingWorks.notunreviewed') };
}
else {
// 鍏朵粬鎯呭喌淇濇寔涓嶅彉
@@ -184,6 +189,7 @@
}
});
xGrid.value.loadData(modifiedCollection)
+ gridOptions.loading=false
}else{
ElMessage.warning(res.msg)
}
@@ -203,23 +209,27 @@
// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
date.setDate(date.getDate() + 1);
let newEndTime = date.toISOString().split('T')[0]; // 鑾峰彇 YYYY-MM-DD 鏍煎紡鐨勫瓧绗︿覆
- request.post(`/reportingWork/selectReportingWork/${pageNum.value}/${total.pageSize}/${startTime}/${newEndTime}/${inputVal}`, filterData.value).then((res) => {
+ request.post(`/reportingWork/selectReportingWork/${pageNum.value}/${total.pageSize}/${orderInfo.reportingWorkDate}/${inputVal}`, filterData.value).then((res) => {
if (res.code == 200) {
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
pageTotal.value = res.data.total
total.value = res.data.total
+ orderInfo.reportingWorkDate = res.data.selectDate
produceList=res.data.data
// 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
let modifiedCollection = produceList.map(item => {
if (item.reviewedState === 1) {
- return { ...item, reviewedState: "宸插鏍�" };
+ //宸插鏍�
+ return { ...item, reviewedState: t('productStock.approved') };
}
else if (item.reviewedState === 0) {
- return { ...item, reviewedState: "鏈鏍�" };
+ //鏈鏍�
+ return { ...item, reviewedState: t('reportingWorks.unreviewed') };
}
else if (item.reviewedState === 2){
- return { ...item, reviewedState: "瀹℃牳涓嶉�氳繃" };
+ //瀹℃牳鏈�氳繃
+ return { ...item, reviewedState: t('reportingWorks.notunreviewed') };
}
else {
// 鍏朵粬鎯呭喌淇濇寔涓嶅彉
@@ -269,7 +279,7 @@
// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
date.setDate(date.getDate() + 1);
let newEndTime = date.toISOString().split('T')[0]; // 鑾峰彇 YYYY-MM-DD 鏍煎紡鐨勫瓧绗︿覆
- request.post(`/reportingWork/selectReportingWork/1/${total.pageSize}/${startTime}/${newEndTime}/${inputVal}`, filterData.value).then((res) => {
+ request.post(`/reportingWork/selectReportingWork/1/${total.pageSize}/${orderInfo.reportingWorkDate}/${inputVal}`, filterData.value).then((res) => {
if(res.code==200){
total.dataTotal = res.data.total.total*1
total.pageTotal=parseInt(res.data.total)
@@ -279,13 +289,16 @@
// 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
let modifiedCollection = produceList.map(item => {
if (item.reviewedState === 1) {
- return { ...item, reviewedState: "宸插鏍�" };
+ //宸插鏍�
+ return { ...item, reviewedState: t('productStock.approved') };
}
else if (item.reviewedState === 0) {
- return { ...item, reviewedState: "鏈鏍�" };
+ //鏈鏍�
+ return { ...item, reviewedState: t('reportingWorks.unreviewed') };
}
else if (item.reviewedState === 2){
- return { ...item, reviewedState: "瀹℃牳涓嶉�氳繃" };
+ //瀹℃牳鏈�氳繃
+ return { ...item, reviewedState: t('reportingWorks.notunreviewed') };
}
else {
// 鍏朵粬鎯呭喌淇濇寔涓嶅彉
@@ -294,6 +307,8 @@
});
xGrid.value.loadData(modifiedCollection)
gridOptions.loading=false
+ orderInfo.selectReportingWorksFilter.list = xGrid.value.getCheckedFilters()
+ orderInfo.selectReportingWorksFilter.data = filterData.value
}else{
ElMessage.warning(res.msg)
}
@@ -390,14 +405,20 @@
})
-
+onMounted(async () => {
+ filterData.value = orderInfo.selectReportingWorksFilter.data
+ await getReportingWorkList()
+ orderInfo.selectReportingWorksFilter.list.forEach(item => {
+ xGrid.value.getColumnByField(item.field).filters = item.column.filters
+ })
+})
</script>
<template>
<div style="width: 100%;height: 100%">
<div class="head">
<el-date-picker
- v-model="form.date1"
+ v-model="orderInfo.reportingWorkDate"
type="daterange"
format="YYYY/MM/DD"
value-format="YYYY-MM-DD"
--
Gitblit v1.8.0