From 1e31f9f7fe6f04236e97f72c0df3ce051d5f867e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 24 十一月 2025 16:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index 0c193cf..c003253 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -50,6 +50,7 @@
const shapeList = ref([
{label:t('order.universalShape'),value:'1'}, {label:t('order.alien'),value:'2'}
])
+const edgingTypeList = ref([])
const newOrderId = ref([])
const orderTypeState = ref(0)
@@ -92,7 +93,8 @@
orderClassify:[],
packType:[],
customer:[],
- saleMan:[]
+ saleMan:[],
+ edgingType:[]
})
let filterData = ref({})
let rowIndex = ref(null)
@@ -186,7 +188,8 @@
filters:[{ data: '' }],
slots: { filter: 'num1_filter',edit:'shape_edit',default:'default_shape' }, sortable: true,filterMethod:filterChanged},
{field: 'bendRadius',width:160, title: t('order.bendRadius'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'edgingType',width:160, title: t('order.edgingType'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'edgingType',width:160, title: t('order.edgingType'),editRender: { name: 'input'},filters:[{ data: '' }],
+ slots: { filter: 'num1_filter',edit:'edgingType_edit' }, sortable: true,filterMethod:filterChanged},
{field: 'processingNote',width:200, title: t('order.processingNote'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'fileName',width:200, title: t('order.drawingNo'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'remarks',width:140, title: t('basicData.remarks'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -1089,6 +1092,10 @@
})
}
+ titleSelectJson.value.edgingType.forEach(item=>{
+ let type= {label:item.basicName,value:item.basicName}
+ edgingTypeList.value.push(type)
+ })
//杩涘叆椤甸潰涓嬫媺妗嗚缃粯璁ゅ��
titleUploadData.value.orderType = titleSelectJson.value.orderType[0].basicName
titleUploadData.value.orderClassify = titleSelectJson.value.orderClassify[0].basicName
@@ -1908,6 +1915,9 @@
<template #shape_edit="{ row }">
<vxe-select v-model="row.shape" transfer :options="shapeList" placeholder=" "/>
</template>
+ <template #edgingType_edit="{ row }">
+ <vxe-select v-model="row.edgingType" transfer :options="edgingTypeList" placeholder=" "/>
+ </template>
</vxe-grid>
--
Gitblit v1.8.0