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 | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 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 710310f..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
@@ -31,6 +31,7 @@
let dialogTransferVisible = ref(false)
let uploadPictureVisible = ref(false)
let alienEditorVisible = ref(false)
+let fileUploadVisible = ref(false)
const transferData = ref({
oldOrderId:null,
newOrderNumber:null,
@@ -50,6 +51,8 @@
{label:t('order.universalShape'),value:'1'}, {label:t('order.alien'),value:'2'}
])
const newOrderId = ref([])
+
+const orderTypeState = ref(0)
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
const titleUploadData = ref({
@@ -131,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, }
]
]
}
@@ -815,7 +819,18 @@
return
}
rowIndex=row
- 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
}
}
@@ -896,6 +911,7 @@
titleUploadData.value['verifierId'] = null
titleUploadData.value['verifier'] = null
+
const orderDetails = res.data.orderDetails
orderDetails.forEach(item => {
item.otherColumns = JSON.parse(item.otherColumns)
@@ -931,6 +947,11 @@
if(res.data.order.processReview === 2 && res.data.order.orderReview === 0){
gridOptions.toolbarConfig.buttons[2].disabled = false
//gridOptions.menuConfig.body.options[0][8].disabled =false
+ }
+
+ //涓嬪崟鍚庡伐鑹哄鏍镐箣鍓嶅彲浠ュ彸閿笂浼燿wg鏂囦欢
+ if(res.data.order.createOrder === 2 && res.data.order.processReview === 0){
+ orderTypeState.value=1
}
//鎸夐挳瀹℃牳杩囧悗鍙樹负鍙嶅
@@ -1685,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
@@ -1997,10 +2019,15 @@
<order-number-report-transfer :transferData="transferData" @orderNumberTransfer="orderNumberTransfer"/>
</el-dialog>
- <el-dialog v-model="uploadPictureVisible"
+ <el-dialog id="loadDWG"
+ v-model="fileUploadVisible"
:close-on-click-modal="false"
- destroy-on-close width="500">
- <upload-picture />
+ destroy-on-close width="800px">
+ <upload-picture
+ :rowIndex="rowIndex"
+ :orderId="titleUploadData.orderId"
+ :state="orderTypeState"
+ />
</el-dialog>
@@ -2051,4 +2078,9 @@
/*flex-direction : row;
justify-content: space-between;*/
}
+
+ :deep(#loadDWG .el-dialog__body){
+ height: 70vh;
+ overflow-y: auto;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.8.0