From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整
---
north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue b/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
index a17105f..4763dc1 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/customer/SelectCustomer.vue
@@ -43,7 +43,9 @@
})
ruleForm.value.id=row.id
let flowData = ref({
- customer: ruleForm.value
+ customer: ruleForm.value,
+ userName:userStore.user.userName,
+ userId:userStore.user.userId
})
request.post("/customer/deleteCustomer", flowData.value).then((res) => {
@@ -52,7 +54,6 @@
router.push({path:'/main/customer/selectCustomer',query:{random:Math.random()}})
}else{
ElMessage.warning(t('basicData.msg.deleteFail'))
- router.push("/login")
}
}).catch((err)=>{
ElMessage.error(t('basicData.msg.ServerConnectionError'))
@@ -161,6 +162,15 @@
pageNum.value=currentPage
selectOrderList()
+}
+
+const handleSortChange=({ sortList, sortOrder })=> {
+ // 鏍规嵁鎺掑簭鍙傛暟鏋勫缓璇锋眰鏁版嵁
+ filterData.value.sortList=sortList.map(item => item.property)
+ filterData.value.sortOrder=sortList.map(item => item.order)
+ console.log(filterData.value)
+
+
}
@@ -287,6 +297,7 @@
ref="xGrid"
v-bind="gridOptions"
v-on="gridEvents"
+ @sort-change="handleSortChange"
>
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
@@ -305,8 +316,8 @@
<el-button @click="getTableRow(row,'edit')"
v-if="userStore.user.permissions.indexOf('selectCustomer.edit') > -1"
link type="primary" size="small">{{$t('basicData.edit')}}</el-button>
- <el-button @click="getTableRow(row,'customerOrder')"
- link type="primary" size="small">{{$t('customer.customerOrders')}}</el-button>
+<!-- <el-button @click="getTableRow(row,'customerOrder')"
+ link type="primary" size="small">{{$t('customer.customerOrders')}}</el-button>-->
<el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
<template #reference>
<el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
@@ -317,7 +328,10 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <input type="type"
+ v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
--
Gitblit v1.8.0