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/SelectProcessCard.vue | 64 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index f1ab3df..e4124a0 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -19,6 +19,7 @@
import useOrderInfoStore from "@/stores/sd/order/orderInfo"
import {Printer} from "@element-plus/icons-vue/global";
import SelectProcessCardDetail from "@/components/pp/SelectProcessCardDetail.vue";
+import OrderProcessCollect from "@/components/sd/order/OrderProcessCollect.vue";
//璇█鑾峰彇
const {t} = useI18n()
@@ -28,6 +29,7 @@
let productGlassTypeStore = useProductGlassTypeStore()
const dialogTableVisible = ref(false)
+const dialogProcess = ref(false)
let router = useRouter()
let props = defineProps({
rowIndex: {}
@@ -104,6 +106,12 @@
}
})
+//娴佺▼鍗¤繘搴︾敤鍊�
+let processVal = ref({
+ orderId:null,
+ row: {},
+ processId:null//鐢ㄤ簬鍚庣鏁版嵁杩斿洖锛岀粨鏋滅瓫閫�
+})
//瀹氫箟椤甸潰鎬婚〉鏁�
let pageTotal = ref('')
//瀹氫箟鏁版嵁杩斿洖缁撴灉
@@ -119,6 +127,7 @@
})
const getFlowCardList = async () => {
+ gridOptions.loading = true
//绗竴娆″姞杞芥暟鎹�
await request.post(`/processCard/flowCard/1/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
@@ -127,6 +136,7 @@
total.pageTotal = res.data.total.pageTotal
orderInfo.workOrderDate = res.data.selectDate
pageTotal.value = res.data.total
+ total.value = res.data.total
produceList.value = produceList.value.concat(deepClone(res.data.data))
produceList.value.forEach(item => {
switch (item.layoutStatus) {
@@ -142,8 +152,10 @@
}
});
xGrid.value.loadData(produceList.value)
+ gridOptions.loading = false
} else {
ElMessage.warning(res.msg)
+ gridOptions.loading = false
}
})
}
@@ -156,6 +168,7 @@
})
//椤佃剼缈婚〉鏌ヨ
const selectPageList = () => {
+ gridOptions.loading = true
request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
if (res.code == 200) {
@@ -174,20 +187,24 @@
}
});
xGrid.value.loadData(produceList.value)
+ gridOptions.loading = false
} else {
ElMessage.warning(res.msg)
+ gridOptions.loading = false
}
})
}
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
-
+ gridOptions.loading = true
request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
if (res.code == 200) {
total.dataTotal = res.data.total.total * 1
total.pageTotal = res.data.total.pageTotal
+ orderInfo.workOrderDate = res.data.selectDate
pageTotal.value = res.data.total
+ total.value = res.data.total
res.data.data.forEach(item => {
switch (item.layoutStatus) {
case "0":
@@ -205,6 +222,7 @@
gridOptions.loading = false
} else {
ElMessage.warning(res.msg)
+ gridOptions.loading = false
}
})
}
@@ -243,6 +261,7 @@
total.dataTotal = res.data.total.total*1
total.pageTotal=parseInt(res.data.total)
pageNum.value=1
+ total.value = res.data.total
produceList.value = deepClone(res.data.data)
produceList.value.forEach(item => {
switch (item.layoutStatus) {
@@ -263,6 +282,7 @@
orderInfo.selectProcessCardFilter.data = filterData.value
} else {
ElMessage.warning(res.msg)
+ gridOptions.loading = false
}
})
}
@@ -335,10 +355,11 @@
},
{field: 'order.project', title: t('order.project'), showOverflow: "ellipsis"},
{field: 'quantity', title: t('order.quantity'),},
- {field: 'orderDetail.computeGrossArea', title: t('order.area'),},
+ {field: 'computeGrossArea', title: t('order.area'),},
{field: 'founder', title: t('processCard.founder'),},
{field: 'orderDetail.processingNote', title: t('order.processingNote'),},
-
+ {field: 'order.createTime', title: t('report.orderTime'),width: 110},
+ {field: 'order.updateTime', title: t('productStock.approvedDate'),width: 110},
{field: 'layoutStatus',width:100, title: t('processCard.layoutStatus'), filters: [{data: ''}], slots: {filter: 'select_filter'}},
{field: 'merge',width:100, title: t('processCard.mergeState'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
{field: 'rack',width:100, title:t('processCard.shelfNumber'), filters: [{data: ''}], slots: {filter: 'num1_filter'}}
@@ -368,9 +389,10 @@
if (columnIndex === 0) {
return t('basicData.total')
}
- const List = ["quantity",'orderDetail.computeGrossArea']
+ const List = ["quantity",'computeGrossArea']
if (List.includes(column.field)) {
- return footSum(data, column.field)
+ //return footSum(data, column.field)
+ return total.value?.[column.field] ?? 0
}
return ''
})
@@ -438,7 +460,7 @@
composing: selectRecords,
})
selectRecords.forEach(item => {
- if (item.layoutStatus == "宸叉帓鐗�"){
+ if (item.layoutStatus == t('processCard.typesetter')){
ElMessage.warning(t('processCard.notSelectTheOptionData'))
return;
}
@@ -453,7 +475,7 @@
})
} else {
- ElMessage.warning("鎾ら攢澶辫触锛岃妫�鏌ユ槸鍚﹀凡鐢熸垚宸ョ▼鍙�")
+ ElMessage.warning(t('processCard.msg.msg7'))
}
})
@@ -574,6 +596,12 @@
})
}
+
+const onCellDblClick = ({ row, column }) => {
+ processVal.value.orderId = row.orderId
+ processVal.value.processId = row.processId
+ dialogProcess.value = true
+};
</script>
<template>
@@ -608,6 +636,7 @@
v-bind="gridOptions"
v-on="gridEvents"
@filter-change="filterChanged"
+ @cell-dblclick="onCellDblClick"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -694,8 +723,22 @@
<el-dialog
id="sizePrintCalrd"
+ v-model="dialogProcess"
+ :title="$t('order.processCardCollect')"
+ destroy-on-close
+ style="width: 75%;height:75% ">
+ <order-process-collect
+ :orderId="processVal.orderId"
+ :processId="processVal.processId"
+ :row="processVal.row"
+ style="width: 100%;height: 100%"
+ />
+ </el-dialog>
+
+ <el-dialog
+ id="sizePrintCalrd"
v-model="dialogTableVisible"
- :title="$t('娴佺▼鍗″悎鏋�')"
+ :title="$t('processCard.combinedFrame')"
destroy-on-close
style="width: 75%;height:75% ">
<select-process-card-detail
@@ -716,4 +759,9 @@
width: 100%;
height: calc(100% - 35px);
}
+
+:deep(.el-dialog__body){
+ height: 90%;
+ width: 100%;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0