From 25cc86fd8a2fb3b2bb6b385cba0adaf89ff3dcdc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 十二月 2025 16:39:32 +0800
Subject: [PATCH] 流程卡进度打印部分代码
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
index bec2f10..7a95bd4 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
@@ -22,11 +22,9 @@
break
}
case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
break
}
case 'setType':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鎺掔増鐘舵��')
break
}
}
@@ -86,7 +84,7 @@
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
- const end = new Date(new Date().getTime()+ 3600 * 1000 * 24)
+ const end = new Date(new Date().getTime())
.toISOString()
.replace('T', ' ')
.slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
@@ -102,11 +100,12 @@
let endTime = orderInfo.workOrderDate[1]
//绗竴娆″姞杞芥暟鎹�
-request.post(`/processCard/selectAddProcess/${startTime}/${endTime}`, filterData.value).then((res) => {
+request.post(`/processCard/selectAddProcess/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
if (res.code == 200) {
pageTotal.value = res.data.total
produceList = produceList.value.concat(deepClone(res.data.data))
+ orderInfo.workOrderDate = res.data.selectDate
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -116,17 +115,19 @@
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
+ gridOptions.loading = true
- let startTime = orderInfo.workOrderDate[0]
- let endTime = orderInfo.workOrderDate[1]
- request.post(`/processCard/selectAddProcess/${startTime}/${endTime}`, filterData.value).then((res) => {
+ request.post(`/processCard/selectAddProcess/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
if (res.code == 200) {
pageTotal.value = res.data.total
xGrid.value.loadData(res.data.data)
+ orderInfo.workOrderDate = res.data.selectDate
gridOptions.loading = false
+
} else {
ElMessage.warning(res.msg)
+ gridOptions.loading = false
}
})
}
@@ -156,7 +157,7 @@
let startTime = orderInfo.workOrderDate[0]
let endTime = orderInfo.workOrderDate[1]
- request.post(`/processCard/selectAddProcess/${startTime}/${endTime}`, filterData.value).then((res) => {
+ request.post(`/processCard/selectAddProcess/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
if (res.code == 200) {
pageTotal.value = res.data.total
@@ -258,9 +259,8 @@
</script>
<template>
- <div class="main-div-customer">
- <div id="selectForm">
- <el-row :gutter="0">
+ <div style="width: 100%;height: 100%">
+ <div class="head">
<el-date-picker
v-model="orderInfo.workOrderDate"
:default-time="defaultTime"
@@ -277,11 +277,12 @@
id="select"
type="primary" :icon="Search">{{$t('basicData.search')}}
</el-button>
- </el-row>
</div>
+
+ <div class="main-table">
<vxe-grid
- height="95%"
+ height="100%"
@filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGrid"
@@ -326,6 +327,7 @@
</vxe-grid>
</div>
+ </div>
</template>
<style scoped>
@@ -337,4 +339,13 @@
width: 50%;
text-align: center;
}
+.head{
+ width: 100%;
+ height: 35px;
+}
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0