From 4086570d2a4091c86e6fad35a0c36c8963cdf415 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 24 十一月 2025 14:56:26 +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 | 611 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 519 insertions(+), 92 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 80a0781..e065b91 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
@@ -9,42 +9,63 @@
import {ElMessage} from "element-plus";
import { useI18n } from 'vue-i18n'
import DeliveryPrinting from "@/views/sd/delivery/DeliveryPrinting.vue";
+import footSum from "@/hook/footSum"
+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 PrintSheetLuoyangDetails from "@/components/sd/delivery/PrintSheetLuoyangDetails.vue";
+import useOrderInfoStore from "@/stores/sd/order/orderInfo";
+import { saveAs } from "file-saver"
+import companyInfo from "@/stores/sd/companyInfo";
+import PrintSheet3 from "@/components/sd/delivery/PrintSheet3.vue";
+import PrintSheet4 from "@/components/sd/delivery/PrintSheet4.vue";
//璇█鑾峰彇
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
const dialogTableVisible = ref(false)
+let sheetIndex = ref(-1)
let rowClickIndex = ref(null)
let produceList = ref([])
+let optionVal = ref(null)
+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' :{
- /*const url = router.resolve({path: '/main/delivery/deliveryPrinting', query: { deliveryID: row.deliveryId }})
- window.open(url.href, '_blank')
- break*/
+ /*case 'printing' :{
router.push({path: '/main/delivery/deliveryPrinting', query: { deliveryID: row.deliveryId }})
break
- }
+ }*/
case 'delete':{
let flowData = ref({
- deliveryId:row.deliveryId
+ deliveryId:row.deliveryId,
+ userName:userStore.user.userName,
+ userId:userStore.user.userId
})
- request.post("/Delivery/deleteDelivery",flowData.value).then((res) => {
- if(res.code==200){
+ request.post("/delivery/deleteDelivery",flowData.value).then((res) => {
+ if(res.code==200 && res.data===true){
ElMessage.success(t('searchOrder.msgDeleteSuccess'))
router.push({path:'/main/delivery/selectDelivery',query:{random:Math.random()}})
}else{
- ElMessage.warning(res.msg)
- router.push("/login")
+ ElMessage.warning(t('basicData.msg.deleteFail'))
}
+ }).catch((err)=>{
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
+ router.push("/login")
})
+
return
}
@@ -83,15 +104,21 @@
})
//绗竴娆¤皟鐢�
-request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+request.post(`/delivery/getSelectShippingOrder/1/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {
if(res.code==200){
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
- selectDate.value = res.data.selectDate
+ 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.menuConfig.body.options[0][4].visible=true
+ xGrid.value.menuConfig.body.options[0][5].visible=true
+ }
xGrid.value.loadData(produceList)
gridOptions.loading=false
}else{
@@ -123,7 +150,7 @@
}else{
filterData.value[column.property] = value
}
- request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+ request.post(`/delivery/getSelectShippingOrder/1/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {
if(res.code==200){
total.dataTotal = res.data.total.total*1
@@ -131,6 +158,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)
@@ -141,15 +172,20 @@
const selectOrderList = ()=>{
- request.post(`/Delivery/getSelectShippingOrder/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+ request.post(`/delivery/getSelectShippingOrder/${pageNum.value}/${total.pageSize}/${orderInfo.selectDeliveryDate}`,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
}
+ orderInfo.selectDeliveryDate = res.data.selectDate
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)
@@ -185,7 +221,274 @@
dialogTableVisible.value = true
break
}
+ case 'sheet1': {
+ 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{
+ 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=1
+ }
+
+ }
+
+ break
+
+ }
+ case 'sheet2': {
+ 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{
+ 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=2
+ }
+
+ }
+ 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
+ optionVal.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=3
+ optionVal.value = 4
+ }
+
+
+ }
+
+ 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
+ optionVal.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
+ optionVal.value = 4
+ }
+
+
+ }
+
+ break
+
+ }
+ case 'sheet5': {
+ 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=5
+ optionVal.value = 8
+ }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=5
+ optionVal.value = 8
+ }
+
+
+ }
+
+ break
+
+ }
+ case 'sheet6': {
+ 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=6
+ optionVal.value = 8
+ }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=6
+ optionVal.value = 8
+ }
+
+
+ }
+
+ break
+ }
+ case 'sheet7': {
+ 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=7
+ }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=7
+ }
+
+
+ }
+
+ break
+
+ }
+ case 'sheet8': {
+ 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=8
+ }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=8
+ }
+
+
+ }
+
+ break
+
+ }
}
}
},
@@ -200,7 +503,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'OrderList',
+ id: 'SelectDelivery',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -226,27 +529,36 @@
body: {
options: [
[
- { code: 'getProcessList', name: "鎵撳嵃", prefixIcon: 'vxe-icon-file-txt', visible: true}
+ { 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('delivery.print1'), prefixIcon: 'vxe-icon-file-txt', visible: false},
+ { code: 'sheet4', name: t('delivery.print1')+ t('delivery.noMoney'), prefixIcon: 'vxe-icon-file-txt', visible: false},
+ { code: 'sheet5', name: t('delivery.print2'), prefixIcon: 'vxe-icon-file-txt', visible: false},
+ { code: 'sheet6', name: t('delivery.print2')+ t('delivery.noMoney'), prefixIcon: 'vxe-icon-file-txt', visible: false},
+ { code: 'sheet7', name: t('鎵撳嵃涓�琛屼咯鍒�'), prefixIcon: 'vxe-icon-file-txt', visible: true},
+ { code: 'sheet8', name: t('鎵撳嵃涓�琛屼咯鍒�')+ t('delivery.noMoney'), prefixIcon: 'vxe-icon-file-txt', visible: true},
]
]
}
},
//琛ㄥご鍙傛暟
columns:[
- {type:'expand',slots: { content:'content' },width: 60},
- {title: t('basicData.operate'), width: 150, slots: { default: 'button_slot' }},
- {type: 'seq', title: t('basicData.Number'), width: 80 },
+ {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},
- {field: 'deliveryState',title: t('basicData.review'), width: 40, slots: { default: 'state' }},
- {field: 'stockState',title: t('productStock.outbound'), width: 40, slots: { default: 'state' }},
+ {field: 'deliveryState',title: t('basicData.review'), width: 40,filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
+ {field: 'stockState',title: t('productStock.outbound'), width: 40, filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
- {field: 'deliveryId',width:120, title: t('delivery.deliveryNoteId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'deliveryId',width:120, title: t('delivery.deliveryNoteId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{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' }},
{field: 'customerName',width:120, title: t('customer.customerName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'orderId',width:120, title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'project',width:120, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'orderId',width:120, title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'order.batch',width:120, title: t('order.batch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'money',width:120, title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'paymentTerms',width:120, title: t('delivery.paymentTerms'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'payMethod',width:120, title:t('delivery.paymentMethod'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'quantity',width:120, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -265,106 +577,221 @@
},
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ let footList=['quantity','area','money']
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 footSum(data, column.field)
+ }
return ''
})
]
}
})
+const printContent = ref({
+ id: 'child',
+
+})
+
+const printingNumber = ()=>{
+ request.post(`/delivery/updateDeliveryPrintNumber/${flowData.value.delivery[0].deliveryId}`).then(res =>{
+ })
+}
+
+const exportFile = ()=>{
+ const html = document.getElementById("child").innerHTML // 鑾峰彇闇�瑕佸鍑虹殑HTML鍐呭
+ const blob = new Blob([html], { type: 'application/vnd.ms-excel' }) // 鍒涘缓Blob瀵硅薄
+ saveAs(blob, rowClickIndex.value.deliveryId+".xls");
+}
+
+
+
+
+
</script>
<template>
<div style="width: 100%;height: 100%">
- <el-date-picker
- v-model="selectDate"
- type="daterange"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
- format="YYYY-MM-DD"
- value-format="YYYY-MM-DD"
+ <div class="head">
+ <el-date-picker
+ v-model="orderInfo.selectDeliveryDate"
+ type="daterange"
+ :start-placeholder="$t('basicData.startDate')"
+ :end-placeholder="$t('basicData.endDate')"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
- />
- <el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button>
- <vxe-grid
- max-height="97%"
- @filter-change="filterChanged"
- @cell-dblclick="cellClickEvent"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
- v-on="gridEvents"
+ />
+ <el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button>
+ </div>
+ <div class="main-table">
+ <vxe-grid
+ height="100%"
+ @filter-change="filterChanged"
+ class="mytable-scrollbar"
+ ref="xGrid"
+ v-bind="gridOptions"
+ v-on="gridEvents"
- >
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row }">
- <ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
- <span style="font-weight: bold">{{item.title+': '}}</span>
- <span v-if="hasDecimal(item.field)">{{ hasDecimalhtml(item.field,row) }}</span>
- <span v-else>{{ row[item.field] }}</span>
- </li>
- </ul>
- </template>
+ >
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <template #content="{ row }">
+ <ul class="expand-wrapper">
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{item.title+': '}}</span>
+ <span v-if="hasDecimal(item.field)">{{ hasDecimalhtml(item.field,row) }}</span>
+ <span v-else>{{ row[item.field] }}</span>
+ </li>
+ </ul>
+ </template>
- <template #state="{ row,column}">
- <el-checkbox @click.native.prevent :indeterminate="row[column.field]===1" :checked="row[column.field]===2"/>
- </template>
+ <template #state="{ row,column}">
+ <el-checkbox
+ v-if="row[column.field] === 2"
+ @click.native.prevent
+ :indeterminate="row[column.field]===1"
+ :checked="true"/>
+ <el-checkbox
+ v-else
+ @click.native.prevent
+ :indeterminate="row[column.field]===1"
+ :checked="false"/>
+ </template>
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <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,'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 #button_slot="{ row }">
+ <el-button @click="getTableRow(row,'edit')"
+ v-if="userStore.user.permissions.indexOf('selectDelivery.edit') > -1"
+ link type="primary" size="small">{{$t('basicData.edit')}}</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="$t('searchOrder.deleteConfirm')">
+ <template #reference>
+ <el-button :disabled="row.deliveryState===2" link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
+ </template>
+ </el-popconfirm>
+ </template>
- <template #num1_filter="{ column, $panel }">
- <div>
- <div v-for="(option, index) in column.filters" :key="index">
- <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input
+ type="type"
+ v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
</div>
- </div>
- </template>
+ </template>
- <template #pager>
- <!--浣跨敤 pager 鎻掓Ы-->
- <vxe-pager
- @page-change="handlePageChange"
- :layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
- v-model:current-page="pageNum"
- v-model:page-size="total.pageSize"
- v-model:pager-count="total.pageTotal"
- :total="total.dataTotal"
- >
- </vxe-pager>
- </template>
- </vxe-grid>
+ <template #num2_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <vxe-select
+ v-model="option.data"
+ @change="changeFilterEvent($event, option, $panel)"
+ :placeholder="$t('processCard.pleaseSelect')">
+ <vxe-option value=0 :label="$t('basicData.unchecked')"></vxe-option>
+ <vxe-option value=1 :label="$t('basicData.partiallySelected')"></vxe-option>
+ <vxe-option value=2 :label="$t('basicData.selected')"></vxe-option>
+ </vxe-select>
+ </div>
+ </div>
+ </template>
+
+ <template #pager>
+ <!--浣跨敤 pager 鎻掓Ы-->
+ <vxe-pager
+ @page-change="handlePageChange"
+ :layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
+ v-model:current-page="pageNum"
+ v-model:page-size="total.pageSize"
+ v-model:pager-count="total.pageTotal"
+ :total="total.dataTotal"
+ >
+ </vxe-pager>
+ </template>
+ </vxe-grid>
+ </div>
+
+
<el-dialog
+ :key="dialogKey"
+ id="print"
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%;" />
+ style="width: 75%;height:75% "
+ >
+ <template #header="{ close, titleId, titleClass }">
+ <el-button v-print="printContent" @click="printingNumber" :icon="Printer" circle />
+ <el-button @click="exportFile" :icon="Download" circle />
+ <el-select
+ v-model="optionVal"
+ v-if="sheetIndex>2&&sheetIndex<7"
+ style="width: 120px">
+ <el-option
+ v-for="n in 8"
+ :key="n"
+ :label="n"
+ :value="n"
+ />
+ </el-select>
+ </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" :optionVal='optionVal'/>
+ <print-sheet-luoyang id="child" v-if="sheetIndex===4" :deliveryId="flowData.delivery" :type="2" :optionVal='optionVal'/>
+ <print-sheet-luoyang-details id="child" v-if="sheetIndex===5" :deliveryId="flowData.delivery" :type="3" :optionVal='optionVal'/>
+ <print-sheet-luoyang-details id="child" v-if="sheetIndex===6" :deliveryId="flowData.delivery" :type="4" :optionVal='optionVal'/>
+ <print-sheet3 id="child" v-if="sheetIndex===7" :deliveryId="flowData.delivery" />
+ <print-sheet4 id="child" v-if="sheetIndex===8" :deliveryId="flowData.delivery" />
+
</el-dialog>
</div>
</template>
<style scoped>
-</style>
\ No newline at end of file
+:deep(.el-tabs__content) {
+ width: 100%;
+ height: 86%;
+}
+.el-tab-pane{
+ width: 100%;
+ height: 100%;
+}
+:deep(#print .el-dialog__body){
+ height: 85%;
+ width: 100%;
+ overflow-y: auto;
+}
+#child{
+ width:100%;
+ height: 100%;
+}
+
+@media print {
+ @page {
+ margin: 8mm 16mm 8mm 16mm;
+ }
+}
+.head{
+ width: 100%;
+ height: 35px;
+}
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
+}
+
+
+
+</style>
+
--
Gitblit v1.8.0