From 8fbb9414ac41fd267691356147757602f3b6371c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 09 十二月 2025 12:27:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue | 198 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 164 insertions(+), 34 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 e75aa5c..d4ca703 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
@@ -1,6 +1,6 @@
<script setup>
import {Search} from "@element-plus/icons-vue";
-import {reactive, ref} from "vue";
+import {onMounted, reactive, ref} from "vue";
import {useRouter} from "vue-router"
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
@@ -18,6 +18,8 @@
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()
@@ -31,7 +33,7 @@
let sheetIndex = ref(-1)
let rowClickIndex = ref(null)
let produceList = ref([])
-
+let optionVal = ref(null)
let flowData = ref({
delivery: null
@@ -90,6 +92,10 @@
//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
let filterData = ref({})
+let sortData = ref({
+ field:'id',
+ order:null
+})
let selectDate = ref(["",""])
@@ -101,29 +107,44 @@
pageSize : 100
})
-//绗竴娆¤皟鐢�
-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
-
- 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{
- ElMessage.warning(res.msg)
- router.push("/login")
- }
+onMounted(async () => {
+ filterData.value = orderInfo.searchDeliverFilter.data
+ await getDeliveryList()
+ orderInfo.searchDeliverFilter.list.forEach(item =>{
+ xGrid.value.getColumnByField(item.field).filters = item.column.filters
+ })
})
+
+const getDeliveryList = async () => {
+ //鍔犺浇璇锋眰
+ const config = {
+ filter: filterData.value,
+ sort: sortData.value
+ }
+ await request.post(`/delivery/getSelectShippingOrder/1/${total.pageSize}/${orderInfo.selectDeliveryDate}`,config).then((res) => {
+
+ if(res.code==200){
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal= res.data.total.pageTotal
+
+ 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{
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
+}
+
//瀹氫箟褰撳墠椤垫暟
@@ -148,7 +169,12 @@
}else{
filterData.value[column.property] = value
}
- request.post(`/delivery/getSelectShippingOrder/1/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {
+
+ const config = {
+ filter: filterData.value,
+ sort: sortData.value
+ }
+ request.post(`/delivery/getSelectShippingOrder/1/${total.pageSize}/${orderInfo.selectDeliveryDate}`,config).then((res) => {
if(res.code==200){
total.dataTotal = res.data.total.total*1
@@ -160,6 +186,9 @@
xGrid.value.menuConfig.body.options[0][2].visible=true
xGrid.value.menuConfig.body.options[0][3].visible=true
}
+
+ orderInfo.searchDeliverFilter.list = xGrid.value.getCheckedFilters()
+ orderInfo.searchDeliverFilter.data = filterData.value
gridOptions.loading=false
}else{
ElMessage.warning(res.msg)
@@ -170,7 +199,11 @@
const selectOrderList = ()=>{
- request.post(`/delivery/getSelectShippingOrder/${pageNum.value}/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {
+ const config = {
+ filter: filterData.value,
+ sort: sortData.value
+ }
+ request.post(`/delivery/getSelectShippingOrder/${pageNum.value}/${total.pageSize}/${orderInfo.selectDeliveryDate}`,config).then((res) => {
if(res.code==200){
if (res.data.total!=null){
@@ -292,6 +325,7 @@
flowData.value.delivery=delivery
dialogTableVisible.value = true
sheetIndex.value=3
+ optionVal.value = 4
}else{
ElMessage.warning(t('order.orderNotApproved'))
}
@@ -307,6 +341,7 @@
flowData.value.delivery=selectRecords
dialogTableVisible.value = true
sheetIndex.value=3
+ optionVal.value = 4
}
@@ -325,6 +360,7 @@
flowData.value.delivery=delivery
dialogTableVisible.value = true
sheetIndex.value=4
+ optionVal.value = 4
}else{
ElMessage.warning(t('order.orderNotApproved'))
}
@@ -340,6 +376,7 @@
flowData.value.delivery=selectRecords
dialogTableVisible.value = true
sheetIndex.value=4
+ optionVal.value = 4
}
@@ -358,6 +395,7 @@
flowData.value.delivery=delivery
dialogTableVisible.value = true
sheetIndex.value=5
+ optionVal.value = 8
}else{
ElMessage.warning(t('order.orderNotApproved'))
}
@@ -373,6 +411,7 @@
flowData.value.delivery=selectRecords
dialogTableVisible.value = true
sheetIndex.value=5
+ optionVal.value = 8
}
@@ -391,6 +430,7 @@
flowData.value.delivery=delivery
dialogTableVisible.value = true
sheetIndex.value=6
+ optionVal.value = 8
}else{
ElMessage.warning(t('order.orderNotApproved'))
}
@@ -406,6 +446,7 @@
flowData.value.delivery=selectRecords
dialogTableVisible.value = true
sheetIndex.value=6
+ optionVal.value = 8
}
@@ -413,11 +454,81 @@
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
+
+ }
}
}
},
cellClick({ row }){
rowClickIndex.value = row
+ },
+ sortChange ({ field, order }) {
+ sortData.value = {field,order}
+ selectOrderList()
}
}
@@ -441,6 +552,9 @@
filterConfig: { //绛涢�夐厤缃」
remote: true
},
+ sortConfig: { //鎺掑簭閰嶇疆椤�
+ remote: true//鏄惁鏈嶅姟绔帓搴�
+ },
customConfig: {
storage: true
},
@@ -455,10 +569,12 @@
[
{ 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},
- { code: 'sheet5', name: t('娲涢槼鎵撳嵃鏈夊昂瀵�'), prefixIcon: 'vxe-icon-file-txt', visible: false},
- { code: 'sheet6', name: t('娲涢槼鎵撳嵃鏈夊昂瀵�')+ t('delivery.noMoney'), prefixIcon: 'vxe-icon-file-txt', visible: false},
+ { 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},
]
]
}
@@ -479,6 +595,7 @@
{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: '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' }},
@@ -652,13 +769,26 @@
<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" />
- <print-sheet-luoyang id="child" v-if="sheetIndex===4" :deliveryId="flowData.delivery" :type="2" />
- <print-sheet-luoyang-details id="child" v-if="sheetIndex===5" :deliveryId="flowData.delivery" :type="3" />
- <print-sheet-luoyang-details id="child" v-if="sheetIndex===6" :deliveryId="flowData.delivery" :type="4" />
+ <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>
--
Gitblit v1.8.0