From cba0b2eecbbf49b91865434173a590754c74ef43 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 26 六月 2024 14:57:03 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 be9d046..0c09748 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
@@ -17,6 +17,7 @@
import {useI18n} from "vue-i18n"
import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global"
import { saveAs } from "file-saver"
+import PrintSheet3 from "@/components/sd/order/PrintSheet3.vue";
const { t } = useI18n()
const userStore = useUserInfoStore()
const company = companyInfo()
@@ -79,7 +80,8 @@
name: '鍔犲伐鍗�',
children: [
{ code: 'sheet1', name: '妯増-鏅��' },
- { code: 'sheet2', name: '妯増-澶氬眰鏄庣粏' }
+ { code: 'sheet2', name: '妯増-澶氬眰鏄庣粏' },
+ { code: 'sheet3', name: '娴忚鍙戣揣淇℃伅' }
]
}
// { code: 'getProcessList', name: t('searchOrder.processFlows'), prefixIcon: 'vxe-icon-file-txt', visible: true}
@@ -193,6 +195,18 @@
}
dialogTableVisible.value = true
sheetIndex.value=2
+ if(rowClickIndex.value.processReview===2 && rowClickIndex.value.orderReview===0){
+ reviewDisabled.value=false
+ }
+ break
+ }
+ case 'sheet3': {
+ if(rowClickIndex.value===null){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+ dialogTableVisible.value = true
+ sheetIndex.value=3
if(rowClickIndex.value.processReview===2 && rowClickIndex.value.orderReview===0){
reviewDisabled.value=false
}
@@ -521,6 +535,7 @@
<print-sheet1 id="child" v-if="sheetIndex===1" :orderId="rowClickIndex.orderId" />
<print-sheet2 id="child" v-else-if="sheetIndex===2" :orderId="rowClickIndex.orderId" />
+ <print-sheet3 id="child" v-else-if="sheetIndex===3" :orderId="rowClickIndex.orderId" />
</el-dialog>
--
Gitblit v1.8.0