From 3a06ce5786fb65f4a015a18b82e867b288a60032 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 08 一月 2025 17:13:02 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 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 4a60862..896d765 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
@@ -27,16 +27,21 @@
let sheetIndex = ref(-1)
let rowClickIndex = ref(null)
let produceList = ref([])
+
+let flowData = ref({
+ delivery: null
+
+})
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
router.push({path: '/main/delivery/createDelivery', query: { deliveryID: row.deliveryId }})
break
}
- case 'printing' :{
+ /*case 'printing' :{
router.push({path: '/main/delivery/deliveryPrinting', query: { deliveryID: row.deliveryId }})
break
- }
+ }*/
case 'delete':{
let flowData = ref({
deliveryId:row.deliveryId,
@@ -196,31 +201,44 @@
break
}
case 'sheet1': {
- if(rowClickIndex.value===null){
- ElMessage.warning(t('searchOrder.msgList.checkOrder'))
- return
- }
- if(rowClickIndex.value.deliveryState>0){
- ElMessage.warning(t('order.printingNumber')+rowClickIndex.value.printingNumber)
+ 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=1
+ }else{
+ ElMessage.warning(t('order.orderNotApproved'))
+ }
+ }else{
+ flowData.value.delivery=selectRecords
dialogTableVisible.value = true
sheetIndex.value=1
- }else{
- ElMessage.warning(t('order.orderNotApproved'))
}
+
break
}
case 'sheet2': {
- if(rowClickIndex.value===null){
- ElMessage.warning(t('searchOrder.msgList.checkOrder'))
- return
- }
- if(rowClickIndex.value.deliveryState>0){
- ElMessage.warning(t('order.printingNumber')+rowClickIndex.value.printingNumber)
+ 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=2
+ }else{
+ ElMessage.warning(t('order.orderNotApproved'))
+ }
+ }else{
+ flowData.value.delivery=selectRecords
dialogTableVisible.value = true
sheetIndex.value=2
- }else{
- ElMessage.warning(t('order.orderNotApproved'))
}
break
}
@@ -272,7 +290,7 @@
},
//琛ㄥご鍙傛暟
columns:[
- {type:'expand',slots: { content:'content' },width: 60,fixed:"left"},
+ {field: 'select',type:'checkbox',title: t('basicData.check'), width: 80,fixed:"left"},
{title: t('basicData.operate'), width: 150, slots: { default: 'button_slot' },fixed:"left"},
{type: 'seq', title: t('basicData.Number'), width: 80},
@@ -326,7 +344,7 @@
})
const printingNumber = ()=>{
- request.post(`/delivery/updateDeliveryPrintNumber/${rowClickIndex.value.deliveryId}`).then(res =>{
+ request.post(`/delivery/updateDeliveryPrintNumber/${flowData.value.delivery[0].deliveryId}`).then(res =>{
})
}
@@ -460,8 +478,8 @@
<el-button v-print="printContent" @click="printingNumber" :icon="Printer" circle />
<el-button @click="exportFile" :icon="Download" circle />
</template>
- <print-sheet1 id="child" v-if="sheetIndex===1" :deliveryId="rowClickIndex.deliveryId" />
- <print-sheet2 id="child" v-if="sheetIndex===2" :deliveryId="rowClickIndex.deliveryId" />
+ <print-sheet1 id="child" v-if="sheetIndex===1" :deliveryId="flowData.delivery" />
+ <print-sheet2 id="child" v-if="sheetIndex===2" :deliveryId="flowData.delivery" />
</el-dialog>
</div>
--
Gitblit v1.8.0