From 18fb477ea840e3dd4b19ff63f68f994d31fab43b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 21 五月 2024 13:07:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 28 +++++++++++++++++-----------
1 files changed, 17 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 7162bad..28e3da6 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
@@ -25,7 +25,7 @@
const xGrid = ref()
let cellArea = ref()
const shapeList = ref([
- {name:'鏅舰',value:1}, {name:'寮傚舰',value:2}
+ {label:'鏅舰',value:'1'}, {label:'寮傚舰',value:'2'}
])
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
@@ -117,8 +117,10 @@
customConfig: {
storage: true
},
+ mouseConfig:{selected: true},//榧犳爣閫変腑
+ keyboardConfig:{isArrow: true, isDel: true, isEnter: true, isTab: true, isEdit: true, isChecked: true},
editConfig: {
- trigger: 'click',
+ trigger: 'dblclick',
mode: 'cell',
showStatus: true,
showIcon:false
@@ -141,7 +143,7 @@
title: t('order.shape'),
editRender: { name: 'input'},
filters:[{ data: '' }],
- slots: { filter: 'num1_filter',edit:'shape_edit' }, sortable: true,filterMethod:filterChanged},
+ 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: 'processingNote',width:200, title: t('order.processingNote'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -416,9 +418,13 @@
}
},
cellDblclick (params) {//琛ㄦ牸鍐呭鍙屽嚮鎵撳紑浜у搧鐣岄潰
- const { row } = params
- productVisible.value = true
- rowIndex=row
+ const { row,column } = params
+ console.log(column)
+ if(column.field==='productName' || column.field==='productId'){
+ productVisible.value = true
+ rowIndex=row
+ }
+
},
cellClick({ row }){
rowClickIndex.value = row
@@ -466,6 +472,7 @@
if(history.state.type=='copy'){
xGrid.value.reloadData(res.data.orderDetails)
}
+ gridOptions.loading = false
return
}
//鍙栨秷宸ヨ壓鎸夐挳绂佺敤
@@ -504,11 +511,9 @@
item.otherColumns = JSON.parse(item.otherColumns)
})
otherMoney.value =res.data.orderOtherMoneyList
-
//鍔犺浇鍓〃鏁版嵁
xGrid.value.reloadData(orderDetails)
gridOptions.loading = false
-
}else{
ElMessage.error(res.msg)
}
@@ -937,10 +942,11 @@
<vxe-button @click="importTemplate">{{$t('order.template')}}</vxe-button>
<vxe-button @click="importEvent">{{$t('order.import')}}</vxe-button>
</template>
+ <template #default_shape="{ row }">
+ <span>{{ row.shape=='1'?'鏅舰':row.shape=='2'?'寮傚舰':null }}</span>
+ </template>
<template #shape_edit="{ row }">
- <vxe-select v-model="row.shape" transfer>
- <vxe-option v-for="item in shapeList" :key="item" :value="item.value" :label="item.name" />
- </vxe-select>
+ <vxe-select v-model="row.shape" transfer :options="shapeList" placeholder=" "/>
</template>
--
Gitblit v1.8.0