From 37931d04e87cbae60cf833890c2c8432b389fa1a Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 01 三月 2024 08:56:51 +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/SelectOrder.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
index 7ee1b79..4d00f0a 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
@@ -218,6 +218,10 @@
break
}
case 'delete': {
+ if (row.processReview === 2) {
+ ElMessage.warning('宸插鏍哥殑璁㈠崟涓嶈兘鍒犻櫎')
+ return
+ }
request.post(`/order/deleteOrder/${row.orderId}`).then((res) => {
if(res.code==200){
ElMessage.success('鍒犻櫎鎴愬姛')
@@ -236,7 +240,7 @@
</script>
<template>
- <div style="width: 100%;height: 100%">
+ <div style="width: 100%;height: 100% ;">
<el-date-picker
v-model="selectDate"
type="daterange"
@@ -250,7 +254,7 @@
<vxe-grid
@filter-change="filterChanged"
@cell-dblclick="cellClickEvent"
- max-height="97%"
+ style="max-height: 95%"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
--
Gitblit v1.8.0