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/components/pp/SelectSortDetailProcessCard.vue | 97 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 82 insertions(+), 15 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue b/north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue
index 0504186..9eae22a 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/SelectSortDetailProcessCard.vue
@@ -15,15 +15,20 @@
import useUserInfoStore from '@/stores/userInfo'
import {useI18n} from "vue-i18n";
import {filterChanged} from "@/hook";
-import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
+import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove"
+import domZindex from 'dom-zindex'
+import { VxeUI } from 'vxe-pc-ui'
+
const { t } = useI18n()
const userStore = useUserInfoStore()
let selectRecords = ref(null)
let router = useRouter()
let props = defineProps({
processId:null,
- technologyNumber:null
+ technologyNumber:null,
+ process:null
})
+domZindex.setCurrent(3000)
//瀹氫箟鏁版嵁杩斿洖缁撴灉
let produceDetailList = ref([])
@@ -62,7 +67,7 @@
})
//绗竴娆″姞杞芥暟鎹�
-request.post(`/processCard/printFlowCardDetails/${props.processId}/${props.technologyNumber}`,filterData.value).then((res) => {
+request.post(`/processCard/printFlowCardDetails/${props.processId}/${props.technologyNumber}/${props.process}`,filterData.value).then((res) => {
if (res.code == 200) {
produceDetailList.value = (res.data.data)
xGridDetail.value.reloadData(produceDetailList.value)
@@ -122,7 +127,7 @@
isChecked: true
},
editConfig: {
- trigger: 'click',
+ trigger: 'dblclick',
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
@@ -167,6 +172,13 @@
visible: true,
disabled: false
},
+ {
+ code: 'flashback',
+ name: t('processCard.flashback'),
+ prefixIcon: 'vxe-icon-indicator',
+ visible: true,
+ disabled: false
+ },
]
]
}
@@ -176,8 +188,9 @@
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{
field: 'sort',
- width: 80,
+ width: 90,
editRender: {name: 'input', attrs: {placeholder: ''}},
+ sortable: true,
title: t('processCard.sorting'),
},
{
@@ -185,35 +198,49 @@
title: t('processCard.processId'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,width: 130
},
{
field: 'order_number',
title: t('order.OrderNum'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,width: 100
},
{
field: 'technology_number',
title: t('processCard.technologyNumber'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,width: 100
+ },
+ {
+ field: 'glassNumber',
+ title: t('reportingWorks.glassNumber'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,width: 100
},
{
field: 'glass_address',
title: t('processCard.glassAddress'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,width: 100
+ },
+ {
+ field: 'glass_child',
+ title: t('reportingWorks.glassChild'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,width: 120
},
{
field: 'quantity',
title: t('order.quantity'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
+ filterMethod: filterChanged,width: 70
},
{
field: 'child_width',
@@ -222,6 +249,7 @@
slots: {filter: 'num1_filter'},
filterMethod: filterChanged,
sortable: true,
+ width: 100
},
{
field: 'child_height',
@@ -229,11 +257,26 @@
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged,
- sortable: true,
+ sortable: true,width: 100
+ },
+ {
+ field: 'bend_radius',
+ title: t('order.bendRadius'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ sortable: true,width: 120
},
{
field: 'area',
title: t('order.area'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,width: 100
+ },
+ {
+ field: 'process',
+ title: t('craft.process'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
@@ -377,7 +420,7 @@
let result = toolbarButtonClickEvent()
if (result.cell === "sort" ) {
if (result) {
- const dataList = xGrid.value.getTableData().visibleData
+ const dataList = xGridDetail.value.getTableData().visibleData
let val = 1
dataList.forEach((item, index) => {
if (index >= result.start && index <= result.end) {
@@ -393,12 +436,28 @@
let result = toolbarButtonClickEvent()
if (result.cell === "sort" ) {
if (result) {
- const dataList = xGrid.value.getTableData().visibleData
+ const dataList = xGridDetail.value.getTableData().visibleData
let val = dataList[result.start][result.cell]
dataList.forEach((item, index) => {
if (index >= result.start && index <= result.end) {
item[result.cell] = val
val=val*1+1
+ }
+ })
+ }
+ }
+ break
+ }
+ case 'flashback' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "sort" ) {
+ if (result) {
+ const dataList = xGridDetail.value.getTableData().visibleData
+ let val = dataList[result.start][result.cell]
+ dataList.forEach((item, index) => {
+ if (index >= result.start && index <= result.end) {
+ item[result.cell] = val
+ val=val*1-1
}
})
}
@@ -411,7 +470,9 @@
}
-
+const handleCellDblClick = ({ row, column, cell, $event }) => {
+ VxeUI.clipboard.copy(row[column.property])
+}
</script>
@@ -424,7 +485,9 @@
height="100%"
size="small"
v-bind="detailGridOptions"
- v-on="gridEventsDetail">
+ v-on="gridEventsDetail"
+ @cell-dblclick="handleCellDblClick"
+ >
<template #content="{ row }">
<ul class="expand-wrapper">
@@ -442,6 +505,7 @@
<div v-for="(option, index) in column.filters" :key="index">
<input type="text"
v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
@input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
@@ -468,4 +532,7 @@
-ms-user-select: none;
user-select: none;
}
+:deep(.my-menus) {
+ z-index: 9999 !important;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0