From c581a6c396f1b367fe132bc302d6337b1ff0ad6f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 22 四月 2024 08:36:36 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue | 5 ++---
1 files changed, 2 insertions(+), 3 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 f23ba28..464631f 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
@@ -3,7 +3,7 @@
import {useRouter} from "vue-router"
import {computed, reactive, ref} from "vue"
import ProcessCardProgress from '@/views/pp/report/ProcessCardProgress.vue'
- import request from "@/utils/request";
+ import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
import {ElMessage} from "element-plus"
import {VXETable} from "vxe-table"
@@ -248,7 +248,6 @@
selectDate.value=res.data.selectDate
orderList.value = deepClone(res.data.data)
xGrid.value.loadData(orderList.value)
- console.log(xGrid.value.getTableData().fullData)
}else{
ElMessage.warning(res.msg)
}
@@ -279,7 +278,7 @@
break
}
case 'delete': {
- if (row.processReview === 2) {
+ if (Math.abs(row.processReview) === 2) {
ElMessage.warning(t('searchOrder.msgDelete'))
return
}
--
Gitblit v1.8.0