From 714ed2fda4d83bdc2da48ccfe7e42f220acbee99 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 21 十一月 2025 16:49:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 c8080bb..8532246 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('')
//瀹氫箟鏁版嵁杩斿洖缁撴灉
@@ -130,7 +138,6 @@
pageTotal.value = res.data.total
total.value = res.data.total
produceList.value = produceList.value.concat(deepClone(res.data.data))
- console.log(produceList.value)
produceList.value.forEach(item => {
switch (item.layoutStatus) {
case "0":
@@ -589,6 +596,12 @@
})
}
+
+const onCellDblClick = ({ row, column }) => {
+ processVal.value.orderId = row.orderId
+ processVal.value.processId = row.processId
+ dialogProcess.value = true
+};
</script>
<template>
@@ -623,6 +636,7 @@
v-bind="gridOptions"
v-on="gridEvents"
@filter-change="filterChanged"
+ @cell-dblclick="onCellDblClick"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -709,6 +723,20 @@
<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('processCard.combinedFrame')"
destroy-on-close
--
Gitblit v1.8.0