From 733ad4523cb3e32876dc2155d12c1c527c590f6b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 03 七月 2025 09:14:32 +0800
Subject: [PATCH] 洛阳发货单打印功能新增以及优化模块部分修改
---
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue | 85 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 85 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
index 6b17992..0b7d410 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
@@ -13,13 +13,16 @@
import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global";
import PrintSheet1 from "@/components/sd/delivery/PrintSheet1.vue";
import PrintSheet2 from "@/components/sd/delivery/PrintSheet2.vue";
+import PrintSheetLuoyang from "@/components/sd/delivery/PrintSheetLuoyang.vue";
import useOrderInfoStore from "@/stores/sd/order/orderInfo";
import { saveAs } from "file-saver"
+import companyInfo from "@/stores/sd/companyInfo";
//璇█鑾峰彇
const { t } = useI18n()
const orderInfo = useOrderInfoStore()
const router = useRouter()
+const company = companyInfo()
const userStore = useUserInfoStore()
const username = userStore.user.userName
const userid = userStore.user.userId
@@ -107,6 +110,10 @@
orderInfo.selectDeliveryDate = res.data.selectDate
pageNum.value=1
produceList = deepClone(res.data.data)
+ if(company.companyName=='娲涢槼鍖楁柟鐜荤拑鎶�鏈偂浠芥湁闄愬叕鍙�'){
+ xGrid.value.menuConfig.body.options[0][2].visible=true
+ xGrid.value.menuConfig.body.options[0][3].visible=true
+ }
xGrid.value.loadData(produceList)
gridOptions.loading=false
}else{
@@ -146,6 +153,10 @@
pageNum.value=1
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
+ if(company.companyName=='娲涢槼鍖楁柟鐜荤拑鎶�鏈偂浠芥湁闄愬叕鍙�'){
+ xGrid.value.menuConfig.body.options[0][2].visible=true
+ xGrid.value.menuConfig.body.options[0][3].visible=true
+ }
gridOptions.loading=false
}else{
ElMessage.warning(res.msg)
@@ -165,6 +176,10 @@
}
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
+ if(company.companyName=='娲涢槼鍖楁柟鐜荤拑鎶�鏈偂浠芥湁闄愬叕鍙�'){
+ xGrid.value.menuConfig.body.options[0][2].visible=true
+ xGrid.value.menuConfig.body.options[0][3].visible=true
+ }
gridOptions.loading=false
}else{
ElMessage.warning(res.msg)
@@ -263,6 +278,72 @@
}
break
}
+ case 'sheet3': {
+ const selectRecords = $grid.getCheckboxRecords()
+ if (selectRecords.length === 0) {
+ if(rowClickIndex.value.deliveryState>0){
+ ElMessage.warning(t('order.printingNumber')+rowClickIndex.value.printingNumber)
+ let delivery=([])
+ delivery.push(rowClickIndex.value)
+ flowData.value.delivery=delivery
+ dialogTableVisible.value = true
+ sheetIndex.value=3
+ }else{
+ ElMessage.warning(t('order.orderNotApproved'))
+ }
+ }else{
+ let a=0
+ selectRecords.forEach((item) => {
+ if(item.deliveryState==0){
+ ElMessage.warning(t('order.orderNotApproved'))
+ a=1
+ }
+ })
+ if(a==0){
+ flowData.value.delivery=selectRecords
+ dialogTableVisible.value = true
+ sheetIndex.value=3
+ }
+
+
+ }
+
+ break
+
+ }
+ case 'sheet4': {
+ const selectRecords = $grid.getCheckboxRecords()
+ if (selectRecords.length === 0) {
+ if(rowClickIndex.value.deliveryState>0){
+ ElMessage.warning(t('order.printingNumber')+rowClickIndex.value.printingNumber)
+ let delivery=([])
+ delivery.push(rowClickIndex.value)
+ flowData.value.delivery=delivery
+ dialogTableVisible.value = true
+ sheetIndex.value=4
+ }else{
+ ElMessage.warning(t('order.orderNotApproved'))
+ }
+ }else{
+ let a=0
+ selectRecords.forEach((item) => {
+ if(item.deliveryState==0){
+ ElMessage.warning(t('order.orderNotApproved'))
+ a=1
+ }
+ })
+ if(a==0){
+ flowData.value.delivery=selectRecords
+ dialogTableVisible.value = true
+ sheetIndex.value=4
+ }
+
+
+ }
+
+ break
+
+ }
}
}
},
@@ -305,6 +386,8 @@
[
{ code: 'sheet1', name: t('basicData.print'), prefixIcon: 'vxe-icon-file-txt', visible: true},
{ code: 'sheet2', name: t('basicData.print')+ t('delivery.noMoney'), prefixIcon: 'vxe-icon-file-txt', visible: true},
+ { code: 'sheet3', name: t('娲涢槼鎵撳嵃'), prefixIcon: 'vxe-icon-file-txt', visible: false},
+ { code: 'sheet4', name: t('娲涢槼鎵撳嵃')+ t('delivery.noMoney'), prefixIcon: 'vxe-icon-file-txt', visible: false},
]
]
}
@@ -501,6 +584,8 @@
</template>
<print-sheet1 id="child" v-if="sheetIndex===1" :deliveryId="flowData.delivery" />
<print-sheet2 id="child" v-if="sheetIndex===2" :deliveryId="flowData.delivery" />
+ <print-sheet-luoyang id="child" v-if="sheetIndex===3" :deliveryId="flowData.delivery" :type=1 />
+ <print-sheet-luoyang id="child" v-if="sheetIndex===4" :deliveryId="flowData.delivery" :type=2 />
</el-dialog>
</div>
--
Gitblit v1.8.0