From 33dbc6a161554f3a897f9e9273feb4f2c1b47381 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 15 十二月 2025 17:04:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 105 insertions(+), 11 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..64c5d54 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
@@ -21,6 +21,7 @@
import {multiply,multiplyAuto,divideAuto} from '@/utils/decimal'
import OrderNumberReportTransfer from "@/components/sd/order/OrderNumberReportTransfer.vue"
import UploadPicture from "@/components/sd/order/UploadPicture.vue"
+import ProcessAttribute from "@/components/sd/order/ProcessAttribute.vue"
const { t } = useI18n()
let dialogTableVisible = ref(false)
@@ -32,6 +33,7 @@
let uploadPictureVisible = ref(false)
let alienEditorVisible = ref(false)
let fileUploadVisible = ref(false)
+let processAttributeVisible = ref(false)
const transferData = ref({
oldOrderId:null,
newOrderNumber:null,
@@ -50,6 +52,7 @@
const shapeList = ref([
{label:t('order.universalShape'),value:'1'}, {label:t('order.alien'),value:'2'}
])
+
const newOrderId = ref([])
const orderTypeState = ref(0)
@@ -92,7 +95,8 @@
orderClassify:[],
packType:[],
customer:[],
- saleMan:[]
+ saleMan:[],
+ edgingType:[]
})
let filterData = ref({})
let rowIndex = ref(null)
@@ -135,7 +139,7 @@
{ 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: 'fileUpload', name: t('涓婁紶dwg鏂囦欢'),prefixIcon: 'vxe-icon-picture-fill', visible: true, }
+ { code: 'fileUpload', name: t('order.fileUpload'),prefixIcon: 'vxe-icon-picture-fill', visible: true, }
]
]
}
@@ -186,7 +190,14 @@
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'),filters:[{ data: '' }],
+ slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {
+ field: 'processAttribute',
+ width: 160,
+ title: t('craft.processAttribute'),
+ filters:[{ data: '' }],slots: { filter: 'num1_filter' }, 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},
@@ -390,7 +401,9 @@
creator:userStore.user.userName,
creatorId:userStore.user.userId,
newOrderId:newOrderId.value,
- position:company.position
+ position:company.position,
+ orderIdTypeLetter:company.orderIdTypeLetter,
+ orderIdTypeMantissa:company.orderIdTypeMantissa
}
const grossAreaList = $grid.getTableData().fullData.filter(
item=>item.grossArea === 0
@@ -578,6 +591,24 @@
item["productName"] = val1
}
})
+ }else if(result.cell=='processAttribute'){
+ const val = dataList[result.start][result.cell]
+ const val1 = dataList[result.start]["edgingType"]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ item[result.cell] = val
+ item["edgingType"] = val1
+ }
+ })
+ }else if(result.cell=='edgingType'){
+ const val = dataList[result.start][result.cell]
+ const val1 = dataList[result.start]["processAttribute"]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ item[result.cell] = val
+ item["processAttribute"] = val1
+ }
+ })
}else{
const val = getNestedProperty(dataList[result.start],result.cell)
@@ -616,6 +647,24 @@
item["productName"] = val1
}
})
+ }else if(result.cell=='processAttribute'){
+ const val = dataList[result.start][result.cell]
+ const val1 = dataList[result.start]["edgingType"]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start ){
+ item[result.cell] = val
+ item["edgingType"] = val1
+ }
+ })
+ }else if(result.cell=='edgingType'){
+ const val = dataList[result.start][result.cell]
+ const val1 = dataList[result.start]["processAttribute"]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start ){
+ item[result.cell] = val
+ item["processAttribute"] = val1
+ }
+ })
}else{
const val = getNestedProperty(dataList[result.start],result.cell)
dataList.forEach((item,index) =>{
@@ -636,11 +685,28 @@
let result = toolbarButtonClickEvent()
if(result){
const dataList = xGrid.value.getTableData().visibleData
- dataList.forEach((item,index) =>{
- if(index>=result.start && index<=result.end){
- item[result.cell] = ''
- }
- })
+ if(result.cell=='processAttribute'){
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ item[result.cell] = ''
+ item['edgingType'] = ''
+ }
+ })
+ }else if(result.cell=='edgingType'){
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ item[result.cell] = ''
+ item['processAttribute'] = ''
+ }
+ })
+ }else{
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ item[result.cell] = ''
+ }
+ })
+ }
+
}
computedMoney(result.cell)
gridOptions.menuConfig.body.options[0][5].disabled=false
@@ -838,9 +904,13 @@
},
cellDblclick (params) {//琛ㄦ牸鍐呭鍙屽嚮鎵撳紑浜у搧鐣岄潰
const { row,column } = params
- if(column.field==='productName' || column.field==='productId'){
+ if (column.field === 'processAttribute'||column.field === 'edgingType') {
+ rowIndex = row
+ processAttributeVisible.value = true
+ } else if (column.field === 'productName' || column.field === 'productId') {
+ // 淇濈暀鍘熶骇鍝侀�夋嫨閫昏緫
productVisible.value = true
- rowIndex=row
+ rowIndex = row
}
},
@@ -1089,6 +1159,7 @@
})
}
+
//杩涘叆椤甸潰涓嬫媺妗嗚缃粯璁ゅ��
titleUploadData.value.orderType = titleSelectJson.value.orderType[0].basicName
titleUploadData.value.orderClassify = titleSelectJson.value.orderClassify[0].basicName
@@ -1726,6 +1797,15 @@
});
};
+
+
+
+const getEdgingProcess = (value,edgingType) => {
+ rowIndex.processAttribute=JSON.stringify(value)
+ rowIndex.edgingType=edgingType
+ processAttributeVisible.value = false
+}
+
</script>
<template>
@@ -1910,6 +1990,7 @@
</template>
+
</vxe-grid>
</div>
<el-dialog v-model="dialogTableVisible" :draggable="true" :title="$t('order.processingNote')" style="width: 60%;height:75% ">
@@ -2031,6 +2112,19 @@
</el-dialog>
+ <el-dialog
+ v-model="processAttributeVisible"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ destroy-on-close
+ style="width: 1114px;height:650px ">
+ <process-attribute :rowIndex="rowIndex"
+ :edging-type-list="titleSelectJson"
+ @getEdgingProcess="getEdgingProcess"
+ />
+ </el-dialog>
+
+
</div>
</template>
--
Gitblit v1.8.0