From 49c052b10687fa8734470bea9eb68e952ec88d30 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 29 五月 2024 15:25:42 +0800
Subject: [PATCH] 提交 1.差异尺寸设置默认值0.4， 2.报表框选导出excel
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 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 843427d..232a4a0 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
@@ -19,7 +19,7 @@
let productVisible = ref(false)
let errorAreaVisible = ref(false)
let otherMoneyVisible = ref(false)
-let errorArea = ref(null)
+let errorArea = ref(0.4)
const userStore = useUserInfoStore()
const router = useRouter()
const route = useRoute()
@@ -97,7 +97,7 @@
options: [
[
{ code: 'addRow', name: t('basicData.add'), prefixIcon: 'vxe-icon-square-plus', visible: true, disabled: false },
- { code: 'deleteRow', name: t('basicData.delete'), prefixIcon: 'vxe-icon-delete', visible: true, disabled: true },
+ { code: 'deleteRow', name: t('basicData.delete'), prefixIcon: 'vxe-icon-delete', visible: true, disabled: false },
{ code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
{ code: 'copyAll', name: t('basicData.sameAfterwards'), prefixIcon: 'vxe-icon-feedback', visible: true, disabled: false },
{ code: 'clearChecked', name: t('basicData.clearSelection'), prefixIcon: 'vxe-icon-indicator', visible: true, disabled: false },
@@ -119,7 +119,17 @@
storage: true
},
mouseConfig:{selected: true},//榧犳爣閫変腑
- keyboardConfig:{isArrow: true, isDel: true, isEnter: true, isTab: true, isEdit: true, isChecked: true},
+ keyboardConfig:{
+ isArrow: true,
+ isDel: true,
+ isEnter: true,
+ isTab: true,
+ isEdit: true,
+ isChecked: true,
+ editMethod:()=>{
+ alert(1)
+ }
+ },
editConfig: {
trigger: 'dblclick',
mode: 'cell',
@@ -132,10 +142,10 @@
{field: 'productId',width:140, title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'productName',width:300, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'price',width:140, title: t('order.price'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'quantity',width:140, title: t('order.quantity'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'grossAmount',width:160, title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'width',width:120, title: t('order.width') ,editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'height',width:140, title: t('order.height'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'quantity',width:140, title: t('order.quantity'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'area',width:150, title: t('order.trueArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
{field: 'grossArea',width:160, title: t('order.trueGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
{field: 'computeArea',width:180, title: t('order.computeArea'),editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -347,11 +357,21 @@
break
}
case 'deleteRow':{
+ // $grid.remove(rowClickIndex.value)
+ // rowClickIndex.value = null
+ // gridOptions.menuConfig.body.options[0][1].disabled=true
+ // gridOptions.menuConfig.body.options[0][5].disabled=false
- $grid.remove(rowClickIndex.value)
- rowClickIndex.value = null
- gridOptions.menuConfig.body.options[0][1].disabled=true
- gridOptions.menuConfig.body.options[0][5].disabled=false
+ let result = toolbarButtonClickEvent()
+ if(result){
+ const dataList = xGrid.value.getTableData().visibleData
+ const val = dataList[result.start][result.cell]
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ $grid.remove(item)
+ }
+ })
+ }
break
}
case 'copyChecked' :{
@@ -429,9 +449,9 @@
},
cellClick({ row }){
- rowClickIndex.value = row
+ //rowClickIndex.value = row
//鍙抽敭鑿滃崟鍒犻櫎鍚敤
- gridOptions.menuConfig.body.options[0][1].disabled=false
+ //gridOptions.menuConfig.body.options[0][1].disabled=false
}
}
//鑾峰彇瀛愰〉闈骇鍝佹柟娉�
@@ -918,7 +938,7 @@
<el-col :span="2"><el-input v-model="titleUploadData.batch"/></el-col>
<el-col :span="2"><el-text>{{$t('order.calculateType')}}锛�</el-text></el-col>
<el-col :span="2">
- <el-select @change="changeCalculateType" v-model="titleUploadData.calculateType" clearable placeholder=" " >
+ <el-select @change="changeCalculateType" v-model="titleUploadData.calculateType" placeholder=" " >
<el-option :value="1" label="闈㈢Н閲戦锛堝崟鐗囷級"/>
<el-option :value="2" label="闈㈢Н閲戦锛堟�婚潰绉級"/>
</el-select>
--
Gitblit v1.8.0