From fcbce36f8734813b13c8f9c5b26b4bd192274534 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 17 十一月 2025 16:30:28 +0800
Subject: [PATCH] 工程打印明细新增玻璃编号显示
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 72 ++++++++++++++++++++++++++++++------
1 files changed, 60 insertions(+), 12 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 4158621..7a87d9a 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-send', 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, }
]
]
}
@@ -193,7 +197,7 @@
editRules: {
edgingType: [
{ required: company.edgingType},
- { min: 0, max: 10, message: t('basicData.msg.max10') }
+ { min: 0, max: 255, message: t('basicData.msg.max255') }
],
buildingNumber: [
{ required: false},
@@ -385,11 +389,28 @@
orderIdType:company.orderIdType,
creator:userStore.user.userName,
creatorId:userStore.user.userId,
- newOrderId:newOrderId.value
+ newOrderId:newOrderId.value,
+ position:company.position
}
const grossAreaList = $grid.getTableData().fullData.filter(
item=>item.grossArea === 0
)
+ //鍒ゆ柇瀹介珮鐩镐箻涓庡瓧娈电粨绠楅潰绉槸鍚︾浉鍚�
+
+ for (const i in $grid.getTableData().fullData) {
+ const item = $grid.getTableData().fullData[i]
+ const grossArea = multiplyAuto(countArea(item),1,2)
+ const itemGrossArea = multiplyAuto(item.grossArea,1,2)
+ if(itemGrossArea!== grossArea ){
+ ElMessage.warning(`${t('order.OrderNum')}
+ ${Number(i)+1}${t('order.area')}: ${grossArea} != ${itemGrossArea}`)
+ return
+ }
+ }
+
+
+
+
const errorAreaList = $grid.getTableData().fullData.filter(
item=>(item.width*item.height/1000000 < errorArea.value*1)
)
@@ -798,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
}
}
@@ -879,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)
@@ -887,9 +920,11 @@
if(history.state.type=='copy'){
xGrid.value.reloadData(orderDetails)
gridOptions.menuConfig.body.options[0][11].disabled = true
+ titleUploadData.value['version'] = null
}
if(history.state.type=='copyTitle'){
gridOptions.menuConfig.body.options[0][11].disabled = true
+ titleUploadData.value['version'] = null
}
gridOptions.loading = false
@@ -912,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
}
//鎸夐挳瀹℃牳杩囧悗鍙樹负鍙嶅
@@ -1118,8 +1158,6 @@
}).catch(()=>{
if(titleUploadData.value.orderId.trim()!==""){
ElMessageBox.alert(t('order.msg.updateOrderError'), 'Title', {
- // if you want to disable its autofocus
- // autofocus: false,
confirmButtonText: 'OK',
callback: (action: Action) => {
router.push({path:'/main/order/createOrder',query:{
@@ -1571,7 +1609,7 @@
}
if(evnt.$event.keyCode === 13 ){
const { rowIndex,row,column } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
- let nextRowIndex = xGrid.value.getRowIndex(row) + 1
+ let nextRowIndex = xGrid.value.getVTRowIndex(row) + 1
switch (column.field){
@@ -1673,7 +1711,7 @@
row.fileName = name
row.fileData = fileData
row.shape=2
- ElMessage.success("淇濆瓨鎴愬姛")
+ ElMessage.success(t('basicData.msg.saveSuccess'))
alienEditorVisible.value=false
}
@@ -1938,7 +1976,7 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
destroy-on-close
- style="width: 614px;height:470px ">
+ style="width: 1114px;height:600px ">
<update-alien-editor
ref="refAlienEditor"
:rowIndex="rowIndex"
@@ -1980,10 +2018,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>
@@ -2034,4 +2077,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