From fcd6de629c4f6b8d9e610da854f15ef40115b058 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 07 五月 2024 17:03:49 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue | 91 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 79 insertions(+), 12 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 63173af..618f499 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
@@ -8,6 +8,7 @@
import useUserInfoStore from "@/stores/userInfo";
import {ElMessage} from "element-plus";
import { useI18n } from 'vue-i18n'
+import DeliveryPrinting from "@/views/sd/delivery/DeliveryPrinting.vue";
//璇█鑾峰彇
const { t } = useI18n()
@@ -15,11 +16,17 @@
const userStore = useUserInfoStore()
const username = userStore.user.userName
const userid = userStore.user.userId
+const dialogTableVisible = ref(false)
+let rowClickIndex = ref(null)
let produceList = ref([])
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
router.push({path: '/main/delivery/createDelivery', query: { deliveryID: row.deliveryId }})
+ break
+ }
+ case 'printing' :{
+ router.push({path: '/main/delivery/deliveryPrinting', query: { deliveryID: row.deliveryId }})
break
}
case 'delete':{
@@ -69,14 +76,13 @@
let total = reactive({
pageTotal : 0,
dataTotal : 0,
- pageSize : 10
+ pageSize : 100
})
//绗竴娆¤皟鐢�
request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
if(res.code==200){
- console.log(res.data.data)
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
@@ -135,6 +141,10 @@
request.post(`/Delivery/getSelectShippingOrder/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
if(res.code==200){
+ if (res.data.total!=null){
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal= res.data.total.pageTotal
+ }
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
gridOptions.loading=false
@@ -156,6 +166,29 @@
pageNum.value=currentPage
selectOrderList()
+}
+
+const gridEvents = {
+
+ menuClick ({ menu, row, column }) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (menu.code) {
+ case 'getProcessList': {
+ if(rowClickIndex.value===null){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+ dialogTableVisible.value = true
+ break
+ }
+
+ }
+ }
+ },
+ cellClick({ row }){
+ rowClickIndex.value = row
+ }
}
const gridOptions = reactive({
@@ -185,16 +218,26 @@
trigger: 'click',
mode: 'row',
showStatus: true
- },//琛ㄥご鍙傛暟
+ },
+ menuConfig: {
+ body: {
+ options: [
+ [
+ { code: 'getProcessList', name: "鎵撳嵃", prefixIcon: 'vxe-icon-file-txt', visible: true}
+ ]
+ ]
+ }
+ },
+ //琛ㄥご鍙傛暟
columns:[
{type:'expand',slots: { content:'content' },width: 60},
- {title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' }},
+ {title: t('basicData.operate'), width: 150, slots: { default: 'button_slot' }},
{type: 'seq', title: t('basicData.Number'), width: 80 },
{field: 'deliveryState',title: t('basicData.review'), width: 40, slots: { default: 'state' }},
{field: 'stockState',title: t('productStock.outbound'), width: 40, slots: { default: 'state' }},
- {field: 'deliveryId',width:120, title: t('delivery.deliveryNoteNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'deliveryId',width:120, title: t('delivery.deliveryNoteId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'creator',width:120, title: t('delivery.shipper'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'deliveryDate',width:120, title: t('delivery.deliveryDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'customerId',width:120, title: t('customer.customerNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -219,20 +262,31 @@
},
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ let footList=['quantity','area']
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
}
- // if (props.tableProp.footList.includes(column.field)) {
- // return sumNum(data, column.field)
- // }
+ if (footList.includes(column.field)) {
+ return sumNum(data, column.field)
+ }
return ''
})
]
}
})
+
+
+//琛ㄥ熬姹傚拰
+const sumNum = (list, field) => {
+ let count = 0
+ list.forEach(item => {
+ count += Number(item[field])
+ })
+ return count.toFixed(2)
+}
</script>
<template>
@@ -250,10 +304,10 @@
<vxe-grid
max-height="97%"
@filter-change="filterChanged"
- @cell-dblclick="cellClickEvent"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
+ v-on="gridEvents"
>
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
@@ -276,7 +330,12 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
<el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('basicData.edit')}}</el-button>
- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>
+ <el-button @click="getTableRow(row,'printing')" :disabled="row.deliveryState!==2" link type="primary" size="small">鎵撳嵃</el-button>
+ <el-popconfirm @confirm="getTableRow(row,'delete')" title="纭畾鍒犻櫎?">
+ <template #reference>
+ <el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
+ </template>
+ </el-popconfirm>
</template>
<template #num1_filter="{ column, $panel }">
@@ -300,9 +359,17 @@
</vxe-pager>
</template>
</vxe-grid>
+
+ <el-dialog
+ v-model="dialogTableVisible"
+ destroy-on-close
+ id="deliveryPrinting"
+ style="width: 100%;height:100%;margin-top: 0; ">
+ <DeliveryPrinting
+ :deliveryId="rowClickIndex.deliveryId"
+ style="width: 100%;height: 100%;" />
+ </el-dialog>
</div>
</template>
-<style scoped>
-</style>
\ No newline at end of file
--
Gitblit v1.8.0