From e00b54ec7322cf7cba5883e17f2e2843f71b8833 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 十一月 2025 17:05:54 +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 | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 f22de57..0c193cf 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
@@ -134,7 +134,8 @@
{ code: 'sizeCheck', name: t('basicData.sizeReview'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
{ code: 'updateOrderId', name: t('searchOrder.updateOrderId'), prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: false },
{ code: 'reportingTransfer', name: t('searchOrder.reportingTransfer'), prefixIcon: 'vxe-icon-send', visible: true, disabled: true },
- { code: 'uploadPicture', name: t('order.graphic'),prefixIcon: 'vxe-icon-picture-fill', visible: true, }
+ { code: 'uploadPicture', name: t('order.graphic'),prefixIcon: 'vxe-icon-picture-fill', visible: true, },
+ { code: 'fileUpload', name: t('涓婁紶dwg鏂囦欢'),prefixIcon: 'vxe-icon-picture-fill', visible: true, }
]
]
}
@@ -818,11 +819,18 @@
return
}
rowIndex=row
- if(orderTypeState.value===1){
- fileUploadVisible.value=true
- }else{
- alienEditorVisible.value=true
+ alienEditorVisible.value=true
+ break
+ }
+ case 'fileUpload':{
+ const row = xGrid.value.getCurrentRecord()
+ if(row===null){
+ ElMessage.warning(t('components.pleaseClickToSelectARowFirst'))
+ return
}
+ rowIndex=row
+ fileUploadVisible.value=true
+ break
}
}
@@ -1698,10 +1706,11 @@
}
//鍥剧墖涓婁紶鍚嶇О
-const getUploadPicture = async (name, fileData) => {
+const getUploadPicture = async (name, fileData,fileJson) => {
const row = xGrid.value.getCurrentRecord()
row.fileName = name
row.fileData = fileData
+ row.fileJson = fileJson
row.shape=2
ElMessage.success(t('basicData.msg.saveSuccess'))
alienEditorVisible.value=false
@@ -2017,6 +2026,7 @@
<upload-picture
:rowIndex="rowIndex"
:orderId="titleUploadData.orderId"
+ :state="orderTypeState"
/>
</el-dialog>
--
Gitblit v1.8.0