From 33dbc6a161554f3a897f9e9273feb4f2c1b47381 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 15 十二月 2025 17:04:27 +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/CreateDelivery.vue | 611 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 533 insertions(+), 78 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
index 9620a9c..4f080d7 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue
@@ -11,8 +11,16 @@
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove";
import { useI18n } from 'vue-i18n'
import OrderOtherMoney from "@/components/sd/order/OrderOtherMoney.vue";
+import FinishedGlassShelfInformation from "@/views/mm/finishedGlassShelf/FinishedGlassShelfInformation.vue";
+import CreateFinishedGlassShelfEmit from "@/views/mm/finishedGlassShelf/CreateFinishedGlassShelfEmit.vue";
import footSum from "@/hook/footSum";
import {changeFilterEvent,filterChanged} from "@/hook"
+import companyInfo from "@/stores/sd/companyInfo";
+import {multiply} from "@/utils/decimal";
+import MaterialAddition from "@/views/mm/ingredientStock/MaterialAddition.vue";
+import {copyTableCellValue} from "@/hook/copyTableCellValue";
+import SelectOrderList from "@/views/sd/delivery/SelectOrderList.vue";
+import { ElDialog } from "element-plus";
//璇█鑾峰彇
const { t } = useI18n()
@@ -21,11 +29,27 @@
const userStore = useUserInfoStore()
const username = userStore.user.userName
const userid = userStore.user.userId
+const company = companyInfo()
+let dialogTableVisible = ref(false)
+let dialogTableVisible2 = ref(false)
let produceList = ref([])
let cellArea = ref()
let otherMoneyVisible = ref(false)
let otherMoney = ref(null)
+const dialogSelectOrderVisible = ref(false); // 鎺у埗寮圭獥鏄剧ず
+const currentOrderIds = ref([]); // 宸叉湁鐨勮鍗旾D锛岀敤浜庢帓闄�
+
+
+// 鍒濆鍖栧凡閫夎鍗旾D锛堝湪onMounted涓皟鐢級
+const initCurrentOrderIds = () => {
+ if (produceList && produceList.length > 0) {
+ const orderIds = produceList.map(item => item.orderId);
+ currentOrderIds.value = [...new Set(orderIds)];
+ }else {
+ currentOrderIds.value = [];
+ }
+};
const hasDecimal=(value)=>{
const regex=/\./ // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
@@ -54,6 +78,7 @@
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
let titleUploadData = ref({
+ deliveryId:'',
deliveryState:'',
stockState:'',
paymentTerms:'',
@@ -71,6 +96,9 @@
deliveryDate:'',
salesmanId:'',
salesman:'',
+ freight:'',
+ freightPrice:'',
+ freightQuantity:'',
creatorId:userStore.user.userid,
creator:userStore.user.userName
})
@@ -100,7 +128,10 @@
remarks:'',
createTime:'',
deliveryDate:'',
- creator:''
+ creator:'',
+ freight:'',
+ freightPrice:'',
+ freightQuantity:'',
},
finishedGoodsInventory:{
quantityAvailable:'',
@@ -110,34 +141,37 @@
},
})
+const initOrder = async ()=> {
//椤甸潰绗竴娆″姞杞�
-request.get(`/basicData/BasicDataByType/delivery`).then((res) => {
+ await request.get(`/basicData/BasicDataByType/delivery`).then((res) => {
- if(res.code==200){
- titleSelectJson.value=deepClone(res.data)
- //鍏朵粬閲戦
- otherMoney.value = titleSelectJson.value.deliveryOtherMoney[0]
- //let columns = []
- otherMoney.value.forEach(item => {
- let column = {field: `otherColumns.${item.column}`,width:50, title: item.alias,editRender: { name: 'input'}}
- //columns.push(column)
- gridOptions.columns.push(column)
- })
- const today = new Date
- today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
- titleUploadData.value.deliveryDate = today.getFullYear() +
- '-' + ("0" + (today.getMonth() + 1)).slice(-2)
- + '-' + ("0" + today.getDate()).slice(-2)
- }else{
- ElMessage.warning(res.msg)
- }
-})
+ if (res.code == 200) {
+ titleSelectJson.value = deepClone(res.data)
+ //鍏朵粬閲戦
+ otherMoney.value = titleSelectJson.value.deliveryOtherMoney[0]
+ //let columns = []
+ otherMoney.value.forEach(item => {
+ let column = {field: `otherColumns.${item.column}`, width: 50, title: item.alias, editRender: {name: 'input'}}
+ //columns.push(column)
+ gridOptions.columns.push(column)
+ })
+ const today = new Date
+ today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
+ titleUploadData.value.deliveryDate = today.getFullYear() +
+ '-' + ("0" + (today.getMonth() + 1)).slice(-2)
+ + '-' + ("0" + today.getDate()).slice(-2)
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
const xGrid = ref();
const number = ref();
-onMounted(()=>{
+onMounted( async()=>{
+ await initOrder()
//鍚敤琛ㄦ牸鎷栧姩閫変腑
addListener(xGrid.value,gridOptions,cellArea.value)
//鍙戣揣鏂板
@@ -146,7 +180,7 @@
filterData.value.orderId=orderId
number.value=orderId
//绗竴娆¤皟鐢�
- request.post("/Delivery/getSelectShippingOrderDetails/1/100",filterData.value).then((res) => {
+ request.post("/delivery/getSelectShippingOrderDetails/1/100",filterData.value).then((res) => {
if(res.code==200){
pageTotal.value=res.data.total
@@ -155,8 +189,9 @@
titleUploadData.value=deepClone(res.data.title)
titleUploadData.value.paymentTerms = titleSelectJson.value.paymentTerms[0].basicName
titleUploadData.value.payMethod = titleSelectJson.value.payMethod[0].basicName
+ titleUploadData.value.deliveryId=""
const today = new Date
- today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
+ today.setTime(today.getTime() )
titleUploadData.value.deliveryDate=today.getFullYear() +
'-' + ("0" + (today.getMonth() + 1)).slice(-2)
+ '-' + ("0" + today.getDate()).slice(-2)
@@ -172,12 +207,24 @@
pageNum=1
produceList = deepClone(res.data.data)
+
+
+ const orderDetails = res.data.data
+ orderDetails.forEach(item => {
+ item.otherColumns = JSON.parse(item.otherColumns)
+ })
+ xGrid.value.reloadData(orderDetails)
xGrid.value.loadData(produceList)
-
+ if(userStore.user.permissions.indexOf('createDelivery.add') > -1&&userStore.user.permissions.indexOf('createDelivery.review') > -1){
+ gridOptions.toolbarConfig.buttons[0].visible = false
+ }else{
+ gridOptions.toolbarConfig.buttons[1].visible = false
+ }
//绂佺敤鎸夐挳
- gridOptions.toolbarConfig.buttons[1].disabled = true
- gridOptions.toolbarConfig.buttons[2].disabled = true
+ gridOptions.toolbarConfig.buttons[2].disabled = true
+ gridOptions.toolbarConfig.buttons[3].disabled = true
+ //gridOptions.toolbarConfig.buttons[4].disabled = false
//鏄剧ず澶嶉�夋
xGrid.value.showColumn("select")
gridOptions.loading=false
@@ -192,33 +239,44 @@
if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){
filterData.value.deliveryDetail.deliveryId=str
//绗竴娆¤皟鐢�
- request.post("/Delivery/getSelectShippingOrderDetail/1/100",filterData.value).then((res) => {
+ request.post("/delivery/getSelectShippingOrderDetail/1/100",filterData.value).then((res) => {
if(res.code==200){
pageTotal.value=res.data.total
titleUploadData.value=deepClone(res.data.delivery)
+ titleUploadData.value.deliveryId=str
-
+ if(userStore.user.permissions.indexOf('createDelivery.add') > -1&&userStore.user.permissions.indexOf('createDelivery.review') > -1){
+ gridOptions.toolbarConfig.buttons[0].visible = false
+ }else{
+ gridOptions.toolbarConfig.buttons[1].visible = false
+ }
+ //鍒ゆ柇鏄惁鍙戣揣鍑哄簱
+ if(!company.deliveryOutbound){
+ if(titleUploadData.value.stockState!==0){
+ gridOptions.toolbarConfig.buttons[3].disabled = true
+ }
+ }
//鏍规嵁瀹℃牳鐘舵�佹樉绀哄鏍告寜閽垨鑰呮槸鍙嶅鎸夐挳
-
if(titleUploadData.value.deliveryState!==0){
+ gridOptions.toolbarConfig.buttons[2].disabled = true
gridOptions.toolbarConfig.buttons[1].disabled = true
- gridOptions.toolbarConfig.buttons[0].disabled = true
+ //gridOptions.toolbarConfig.buttons[4].disabled = true
}
if(titleUploadData.value.deliveryState===0){
- gridOptions.toolbarConfig.buttons[2].disabled = true
+ gridOptions.toolbarConfig.buttons[3].disabled = true
}
- if(titleUploadData.value.stockState!==0){
- gridOptions.toolbarConfig.buttons[2].disabled = true
- }
+
pageNum=1
produceList = deepClone(res.data.data)
-
const orderDetails = res.data.data
orderDetails.forEach(item => {
item.otherColumns = JSON.parse(item.otherColumns)
})
otherMoney.value =res.data.orderOtherMoneyList
+
+ titleUploadData.value.creator=userStore.user.userName
+ titleUploadData.value.creatorId=userStore.user.userId
xGrid.value.reloadData(orderDetails)
xGrid.value.loadData(produceList)
@@ -266,7 +324,7 @@
options: [
[
{ code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
- { code: 'otherMoney', name: t('basicData.otherAmounts'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false }
+ { code: 'copyAll', name: t('basicData.sameAfterwards'), prefixIcon: 'vxe-icon-feedback', visible: true, disabled: false },
]
]
}
@@ -275,12 +333,16 @@
resizable: true,
useKey: true
},
+ sortConfig: {
+ multiple: true,
+ },
filterConfig: { //绛涢�夐厤缃」
//remote: true
},
customConfig: {
storage: true
},
+ checkboxConfig:{checkAll:true},
mouseConfig:{selected: true},//榧犳爣閫変腑
keyboardConfig:{isArrow: true, isDel: true, isEnter: true, isTab: true, isEdit: true, isChecked: true},
editConfig: {
@@ -295,21 +357,23 @@
{field: 'select',type:'checkbox',title: t('basicData.check'), width: 80,fixed:"left"},
{type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left"},
{field: 'orderId',width:120, title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'order.batch',width:120, title: t('order.batch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'finishedGoodsInventory.quantityAvailable',width:120, title: t('delivery.availableStock'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'order.quantity',width:120, title: t('delivery.unpaidQuantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'quantity',width:120, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'deliveryDetail.quantity',width:120, title: t('delivery.deliveryQuantity'),editRender: { name: 'input' },filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- //{field: 'buildingNumber',width:120, title: '妤煎彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'productId',width:120, title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'orderNumber',width:120, title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'finishedGoodsInventory.boxNo',width:120, title: t('productStock.boxNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'productName',width:120, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'price',width:120, title: t('order.price'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'finishedGoodsInventory.storageRegion',width:120, title: t('productStock.inventoryArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'deliveryDetail.money',width:120, title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'width',width:120, title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'height',width:120, title: t('order.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'deliveryDetail.quantity',width:120, title: t('delivery.deliveryQuantity'),editRender: { name: 'input' },filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'finishedGoodsInventory.quantityAvailable',width:120, title: t('delivery.availableStock'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'order.quantity',width:160, title: t('delivery.unpaidQuantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'quantity',width:120, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ //{field: 'buildingNumber',width:120, title: '妤煎彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'productId',width:120, title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'price',width:120, title: t('order.price'),editRender: { name: 'input' },filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'finishedGoodsInventory.storageRegion',width:120, title: t('productStock.inventoryArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'deliveryDetail.money',width:120, title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'order.batch',width:120, title: t('order.batch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'shape',width:120, title: t('order.shape'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'finishedGoodsInventory.actualSignalArea',width:120, title: t('productStock.singlePieceArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
+ {field: 'area',width:120, title: t('productStock.singlePieceArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'grossArea',width:120, title: t('productStock.totalArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'computeArea',width:120, title: t('order.computeArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
{field: 'computeGrossArea',width:120, title: t('order.computeGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
@@ -323,8 +387,11 @@
toolbarConfig: {
buttons: [
{'code': 'add', 'name': t('basicData.save'),status: 'primary',icon: 'vxe-icon-save'},
+ {'code': 'addToExamine', 'name': t('reportingWorks.saveAndReview'),status: 'primary',icon: 'vxe-icon-save'},
{'code': 'toExamine', 'name': t('basicData.review'),status: 'primary'},
- {'code': 'CounterExamination', 'name': t('basicData.cancelReview'),status: 'primary'}
+ {'code': 'CounterExamination', 'name': t('basicData.cancelReview'),status: 'primary'},
+ //{'code': 'addOtherOrders','name': t('delivery.orderAdd'),'status': 'primary'}
+ //{'code': 'glassShelf', 'name': t('finishedGlassShelf.finishedGlassShelfEmit'),status: 'primary'}
],
/*import: false,
export: true,
@@ -370,11 +437,6 @@
return
}
//琛ㄥご鏁版嵁鏍￠獙
- const project = titleUploadData.value.project
- if(project === null || project === undefined || project === ''){
- ElMessage.error(t('delivery.pleaseEnterTheAmountOfFunds'))
- return
- }
const paymentTerms = titleUploadData.value.paymentTerms
if(paymentTerms === null || paymentTerms === undefined || paymentTerms === ''){
ElMessage.error(t('delivery.pleaseSelectPaymentTerms'))
@@ -385,44 +447,77 @@
ElMessage.error(t('delivery.pleaseEnterThePaymentMethod'))
return
}
+ const freightPrice = titleUploadData.value.freightPrice
+ if(freightPrice=== null || freightPrice === undefined || freightPrice === ''){
+ titleUploadData.value.freightPrice=0
+ }
+ const freightQuantity = titleUploadData.value.freightQuantity
+ if(freightQuantity=== null || freightQuantity === undefined || freightQuantity === ''){
+ titleUploadData.value.freightQuantity=0
+ }
-
-
+ if($grid.getCheckedFilters().length!==0){
+ ElMessage.error(t('order.msg.pleaseCancelTheFilteringFirst'))
+ return
+ }
let flowData = ref({
delivery: selectRecords,
title: titleUploadData.value,
deliveryId: route.query.deliveryID,
- otherMoney:otherMoney.value
+ otherMoney:otherMoney.value,
+ deliveryIdType:company.deliveryIdType,
+ deliveryOutbound:company.deliveryOutbound,
+ type:1
})
- request.post("/Delivery/insertDelivery", flowData.value).then((res) => {
- if(res.code==200 && res.data===true){
+ gridOptions.toolbarConfig.buttons[0].disabled = true
+ request.post("/delivery/insertDelivery", flowData.value).then((res) => {
+ if(res.code==200 && res.data==="true"){
ElMessage.success(t('delivery.deliveryNoteSubmittedSuccessfully'))
- router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ //router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ if(titleUploadData.value.deliveryId.trim()===""){
+ router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ }else{
+ router.push({path:'/main/delivery/createDelivery',query:{
+ deliveryID:titleUploadData.value.deliveryId,
+ random:Math.random()}})
+ }
+ }else if(res.data==="false1"){
+ ElMessage.warning(t('delivery.pleaseMsg1'))
+ }else if(res.data==="false2"){
+ ElMessage.warning(t('basicData.msg.quantityError'))
+ }else if(res.data==="false3"){
+ ElMessage.warning(t('basicData.msg.dataDoesNotExist'))
}else{
ElMessage.warning(t('basicData.msg.saveFail'))
- router.push("/login")
}
}).catch((err)=>{
ElMessage.error(t('basicData.msg.ServerConnectionError'))
router.push("/login")
+ }).finally(()=>{
+ gridOptions.toolbarConfig.buttons[0].disabled = false
})
break
}
case 'toExamine': {
let flowData = ref({
deliveryId: route.query.deliveryID,
- type: 2
+ type: 2,
+ userName:userStore.user.userName,
+ userId:userStore.user.userId,
+ deliveryOutbound:company.deliveryOutbound
})
- request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
- if (res.code == 200 && res.data===true) {
+ request.post("/delivery/updateDeliveryToExamine", flowData.value).then((res) => {
+ if (res.code == 200 && res.data==="true") {
ElMessage.success(t('basicData.msg.ReviewSuccess'))
- router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ //router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ router.push({path:'/main/delivery/createDelivery',query:{
+ deliveryID:titleUploadData.value.deliveryId,
+ random:Math.random()}})
} else {
ElMessage.warning(t('basicData.msg.reviewFail'))
- router.push("/login")
}
}).catch((err)=>{
ElMessage.error(t('basicData.msg.ServerConnectionError'))
@@ -433,16 +528,21 @@
case 'CounterExamination': {
let flowData = ref({
deliveryId: route.query.deliveryID,
- type: 0
+ type: 0,
+ userName:userStore.user.userName,
+ userId:userStore.user.userId,
+ deliveryOutbound:company.deliveryOutbound
})
- request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
- if (res.code == 200 && res.data===true) {
+ request.post("/delivery/updateDeliveryToExamine", flowData.value).then((res) => {
+ if (res.code == 200 && res.data==="true") {
ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
- router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ //router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ router.push({path:'/main/delivery/createDelivery',query:{
+ deliveryID:titleUploadData.value.deliveryId,
+ random:Math.random()}})
} else {
ElMessage.warning(t('basicData.msg.reviewFail'))
- router.push("/login")
}
}).catch((err)=>{
ElMessage.error(t('basicData.msg.ServerConnectionError'))
@@ -450,7 +550,100 @@
})
break
}
+ case 'glassShelf': {
+ dialogTableVisible.value=true
+ /*if(titleUploadData.value.deliveryId!=null&&titleUploadData.value.deliveryId!=''){
+ router.push({path:'/main/finishedGlassShelf/finishedGlassShelfInformation',query:{deliveryID:titleUploadData.value.deliveryId}})
+ }else if(number.value!=null){
+ router.push({path:'/main/finishedGlassShelf/finishedGlassShelfInformation',query:{orderId:number.value}})
+ }*/
+ break
+ }
+ case 'addToExamine': {
+ const selectRecords = $grid.getCheckboxRecords()
+
+ if (selectRecords.length === 0) {
+ ElMessage.warning(t('productStock.unselectedData'))
+ return
+ }
+ const errMap = await $grid.validate(selectRecords)
+ if (errMap) {
+ ElMessage.warning(t('productStock.dataVerificationFailed'))
+ return
+ }
+ //琛ㄥご鏁版嵁鏍￠獙
+ const paymentTerms = titleUploadData.value.paymentTerms
+ if(paymentTerms === null || paymentTerms === undefined || paymentTerms === ''){
+ ElMessage.error(t('delivery.pleaseSelectPaymentTerms'))
+ return
+ }
+ const payMethod = titleUploadData.value.payMethod
+ if(payMethod === null || payMethod === undefined || payMethod === ''){
+ ElMessage.error(t('delivery.pleaseEnterThePaymentMethod'))
+ return
+ }
+ const freightPrice = titleUploadData.value.freightPrice
+ if(freightPrice=== null || freightPrice === undefined || freightPrice === ''){
+ titleUploadData.value.freightPrice=0
+ }
+ const freightQuantity = titleUploadData.value.freightQuantity
+ if(freightQuantity=== null || freightQuantity === undefined || freightQuantity === ''){
+ titleUploadData.value.freightQuantity=0
+ }
+
+ if($grid.getCheckedFilters().length!==0){
+ ElMessage.error(t('order.msg.pleaseCancelTheFilteringFirst'))
+ return
+ }
+
+
+ let flowData = ref({
+ delivery: selectRecords,
+ title: titleUploadData.value,
+ deliveryId: route.query.deliveryID,
+ otherMoney:otherMoney.value,
+ deliveryIdType:company.deliveryIdType,
+ deliveryOutbound:company.deliveryOutbound,
+ type:2
+
+ })
+ gridOptions.toolbarConfig.buttons[1].disabled = true
+ request.post("/delivery/insertDelivery", flowData.value).then((res) => {
+ if(res.code==200 && res.data==="true"){
+ ElMessage.success(t('delivery.deliveryNoteSubmittedSuccessfully'))
+ //router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ if(titleUploadData.value.deliveryId.trim()===""){
+ router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
+ }else{
+ router.push({path:'/main/delivery/createDelivery',query:{
+ deliveryID:titleUploadData.value.deliveryId,
+ random:Math.random()}})
+ }
+ }else if(res.data==="false1"){
+ ElMessage.warning(t('delivery.pleaseMsg1'))
+ }else if(res.data==="false2"){
+ ElMessage.warning(t('basicData.msg.quantityError'))
+ }else if(res.data==="false3"){
+ ElMessage.warning(t('basicData.msg.dataDoesNotExist'))
+ }else{
+ ElMessage.warning(t('basicData.msg.saveFail'))
+ }
+ }).catch((err)=>{
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
+ router.push("/login")
+ }).finally(()=>{
+ gridOptions.toolbarConfig.buttons[1].disabled = false
+ })
+ break
+ }
+ case 'addOtherOrders': {
+ // 鏄剧ず寮圭獥鍓嶆洿鏂板凡閫夎鍗旾D
+ initCurrentOrderIds();
+ // 鏄剧ず寮圭獥
+ dialogSelectOrderVisible.value = true;
+ break;
+ }
}
}
},
@@ -471,6 +664,38 @@
}
dataList.forEach((item,index) =>{
if(index>=result.start && index<=result.end){
+ //鍙栨秷閫変腑
+ if(parseInt(firstVal)<=0){
+ xGrid.value.setCheckboxRow(item, false);
+ }
+ if(result.cell.indexOf('.')>-1){
+ const columnArr = result.cell.split('.')
+ item[columnArr[0]][columnArr[1]] = firstVal
+ }else{
+ item[result.cell] = firstVal
+ }
+
+ }
+ })
+ }
+ break
+ }
+ case 'copyAll' :{
+ let result = toolbarButtonClickEvent()
+ if(result){
+ const dataList = xGrid.value.getTableData().visibleData
+ let firstVal=null;
+ if(result.cell.indexOf('.')>-1){
+ firstVal = eval("dataList["+result.start +"]."+result.cell)
+ }else {
+ firstVal=dataList[result.start][result.cell];
+ }
+ dataList.forEach((item,index) =>{
+ if(index>=result.start){
+ //鍙栨秷閫変腑
+ if(parseInt(firstVal)<=0){
+ xGrid.value.setCheckboxRow(item, false);
+ }
if(result.cell.indexOf('.')>-1){
const columnArr = result.cell.split('.')
item[columnArr[0]][columnArr[1]] = firstVal
@@ -490,8 +715,55 @@
}
}
+ },
+ cellDblclick ({row,column}) {
+ copyTableCellValue(row,column)
}
}
+
+//澶嶉�夋瑙﹀彂浜嬩欢
+const handleCheckboxChange = ({ records, checked, row }) => {
+ const $grid = xGrid.value;
+ if (!$grid) return;
+
+ // 鑾峰彇褰撳墠鎵�鏈夐�変腑鐨勮锛堣繑鍥炴暟缁勶級
+ const allCheckedRows = $grid.getCheckboxRecords();
+ // 鑾峰彇琛ㄦ牸鎵�鏈夋暟鎹紙visibleData 鏄綋鍓嶅彲瑙佹暟鎹紝fullData 鏄叏閮ㄦ暟鎹紝鏍规嵁闇�姹傞�夋嫨锛�
+ const tableData = $grid.getTableData().visibleData;
+ // 鎸夌鍙峰垎缁�
+ const boxNoGroup = groupByBoxNo(tableData);
+ // 褰撳墠琛岀殑绠卞彿
+ const currentBoxNo = row.finishedGoodsInventory?.boxNo || '';
+
+ // 閫変腑閫昏緫锛氬鏋滄槸鈥滈�変腑鈥濇搷浣滐紝鍚岀鍙风殑琛屽叏閮ㄩ�変腑
+ if (checked && currentBoxNo!="" && currentBoxNo!=null) {
+ const sameBoxRows = boxNoGroup[currentBoxNo] || [];
+ // 鎵归噺璁剧疆鍚岀鍙风殑琛屼负閫変腑鐘舵�侊紙璺宠繃宸查�変腑鐨勮锛岄伩鍏嶉噸澶嶈Е鍙戯級
+ sameBoxRows.forEach(item => {
+ const isAlreadyChecked = allCheckedRows.some(checkedRow => {
+ return checkedRow._X_ROW_KEY === item._X_ROW_KEY;
+ });
+ // 鏈�変腑鍒欒缃负閫変腑
+ if (!isAlreadyChecked) {
+ $grid.setCheckboxRow(item, true);
+ }
+ });
+ }
+};
+
+
+const groupByBoxNo = (tableData) => {
+ return tableData.reduce((group, row) => {
+ // 鑾峰彇褰撳墠琛岀殑绠卞彿锛堟敞鎰忓鐞� undefined 鎯呭喌锛�
+ const boxNo = row.finishedGoodsInventory?.boxNo || '';
+ if (!group[boxNo]) {
+ group[boxNo] = [];
+ }
+ group[boxNo].push(row);
+ return group;
+ }, {});
+};
+
//璁＄畻閲戦挶
const countMoney = (list) => {
@@ -515,6 +787,22 @@
}
}
+function getNestedProperty(obj, path) {
+ return path.split('.').reduce(function(o, p) {
+ if(o && o.hasOwnProperty(p)) {
+ return o[p];
+ }
+ }, obj);
+}
+
+function setNestedValue(obj, path, value) {
+ const keys = path.split('.');
+ const lastKey = keys.pop();
+ const lastObj = keys.reduce((obj, key) => obj[key], obj);
+ lastObj[lastKey] = value;
+}
+
+
/*鏁版嵁鏍￠獙*/
const validRules = ref({
"deliveryDetail.quantity": [{
@@ -523,7 +811,7 @@
return new Error(t('delivery.theShipmentQuantityCannotBeGreaterThanTheInventoryQuantity'))
}else if (e.row.deliveryDetail.quantity ==="") {
return new Error(t('delivery.theShipmentQuantityCannotBeEmptyOr0'))
- }
+ }
const regex = /^[1-9]\d*$/g
if ( !regex.test(e.row.deliveryDetail.quantity) ) {
return new Error(t('productStock.pleaseEnterAPositiveInteger'))
@@ -545,18 +833,116 @@
})
+const editClosedEvent = ({ row, column }) => {
+
+ if (['deliveryDetail.quantity'].includes(column.property)) {
+ if(parseInt(row.deliveryDetail.quantity)===0){
+ xGrid.value.setCheckboxRow(row, false);
+ }
+ }
+
+}
+const datas=ref(null)
+const handleChildResult = (data) => {
+ datas.value=data
+ dialogTableVisible.value=false
+ dialogTableVisible2.value=true
+};
+
+const handleChildResult2 = (data) => {
+ dialogTableVisible2.value=false
+};
+
+
+// 澶勭悊浠嶴electOrderList閫変腑鐨勮鍗�
+const handleSelectedOrders = async (selectedOrders) => {
+ if (!selectedOrders || selectedOrders.length === 0) return;
+
+ // 鍏抽棴寮圭獥
+ dialogSelectOrderVisible.value = false;
+
+ // 楠岃瘉閫変腑鐨勮鍗曟槸鍚︾鍚堟潯浠�
+ const { customerId, project } = titleUploadData.value;
+ const invalidOrders = selectedOrders.filter(order =>
+ order.customerId !== parseInt(customerId) || order.project !== project
+ );
+
+ if (invalidOrders.length > 0) {
+ ElMessage.warning(t('delivery.onlySameCustomerProject'));
+ return;
+ }
+
+ try {
+ // 鏄剧ず鍔犺浇鐘舵��
+ gridOptions.loading = true;
+
+ // 鎵归噺鏌ヨ璁㈠崟鏄庣粏锛堟寜璁㈠崟ID锛�
+ const orderIds = selectedOrders.map(order => order.orderId).join('|');
+ filterData.value.orderId=orderIds
+ request.post("/delivery/getSelectShippingOrderDetails/1/100",filterData.value).then((res) => {
+ if (res.code == 200) {
+ // 澶勭悊杩斿洖鐨勬槑缁嗘暟鎹�
+ const orderDetails = res.data.data || [];
+ //鍚堝苟鏁版嵁
+ mergeData(orderDetails);
+ } else {
+ ElMessage.warning(res.msg || t('basicData.msg.data鑾峰彇澶辫触'));
+ }
+ })
+ } catch (error) {
+ ElMessage.error(t('basicData.msg.ServerConnectionError'));
+ console.error('鏌ヨ璁㈠崟鏄庣粏澶辫触:', error);
+ } finally {
+ // 鍏抽棴鍔犺浇鐘舵��
+ gridOptions.loading = false;
+ }
+};
+
+// 鍚堝苟鏁版嵁锛氬垽鏂璷rderId銆乷rderNumber銆乥oxNo鏄惁鐩稿悓锛岀浉鍚屽垯绱姞鏁伴噺锛屼笉鍚屽垯鏂板
+const mergeData = (newDataList) => {
+ // 澶嶅埗鐜版湁鏁版嵁锛堥伩鍏嶇洿鎺ヤ慨鏀瑰搷搴斿紡婧愭暟鎹級
+ const currentList = [...produceList];
+
+ newDataList.forEach(newItem => {
+ // 鎻愬彇鏂版暟鎹殑鍏抽敭姣斿瀛楁
+ const newOrderId = newItem.orderId;
+ const newOrderNumber = newItem.orderNumber;
+ const newBoxNo = newItem.finishedGoodsInventory?.boxNo || ''; // 澶勭悊鍙兘鐨剈ndefined
+
+ // 鍦ㄧ幇鏈夋暟鎹腑鏌ユ壘鍖归厤椤癸紙涓変釜瀛楁瀹屽叏鐩稿悓锛�
+ const matchedItem = currentList.find(item =>
+ item.orderId === newOrderId &&
+ item.orderNumber === newOrderNumber &&
+ (item.finishedGoodsInventory?.boxNo || '') === newBoxNo
+ );
+
+ if (matchedItem) {
+ // 鎵惧埌鍖归厤椤癸細绱姞鏁伴噺锛堢‘淇濇槸鏁板�肩被鍨嬶級
+ matchedItem.deliveryDetail.quantity = (Number(matchedItem.deliveryDetail.quantity) || 0) +
+ (Number(newItem.deliveryDetail.quantity) || 0);
+ } else {
+ // 鏈壘鍒板尮閰嶉」锛氭柊澧炰竴鏉℃暟鎹�
+ currentList.push(newItem);
+ }
+ });
+
+ // 鏇存柊鍝嶅簲寮忔暟鎹�
+ produceList = currentList;
+ // 鍒锋柊琛ㄦ牸
+ xGrid.value.reloadData(produceList);
+};
</script>
<template>
- <div class="main-div">
- <div class="order-primary" style="background-color: white">
+ <div style="width: 100%;height: 100%">
+ <div class="head" style="background-color: white">
<el-row>
<el-col :span="2"><el-text>{{$t('customer.customerNumber')}}:</el-text></el-col>
<el-col :span="3"><el-input style="font-size: large;color: #181818" v-model="titleUploadData.customerId" :readonly="true" ></el-input></el-col>
<el-col :span="2"><el-text>{{$t('customer.customerName')}}:</el-text></el-col>
<el-col :span="5"><el-input v-model="titleUploadData.customerName" :readonly="true"></el-input></el-col>
- <el-col :span="2"><el-text>{{$t('customer.customerNumber')}}:</el-text></el-col>
+ <el-col :span="2"><el-text>{{$t('order.project')}}:</el-text></el-col>
<el-col :span="5"><el-input v-model="titleUploadData.project" :readonly="true"></el-input></el-col>
</el-row>
<el-row>
@@ -622,22 +1008,34 @@
<el-col :span="3"><el-input v-model="titleUploadData.salesman" :readonly="true"/></el-col>
<el-col :span="2"><el-text>{{$t('delivery.shipper')}}:</el-text></el-col>
<el-col :span="5"><el-input v-model="titleUploadData.creator" :readonly="true"/></el-col>
+ <el-col :span="1"><el-text>{{$t('delivery.freightPrice')}}:</el-text></el-col>
+ <el-col :span="1"><el-input v-model="titleUploadData.freightPrice" /></el-col>
+ <el-col :span="1"><el-text>{{$t('delivery.freightQuantity')}}:</el-text></el-col>
+ <el-col :span="1"><el-input v-model="titleUploadData.freightQuantity" /></el-col>
+ <el-col :span="1"><el-text>{{$t('delivery.freight')}}:</el-text></el-col>
+ <el-col :span="2"><el-input v-model="titleUploadData.freight" :readonly="true"/></el-col>
</el-row>
</div>
- <div class="order-detail">
+ <div class="main-table">
<vxe-grid
- max-height="97%"
+ height="100%"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
v-on="gridEvents"
:edit-rules="validRules"
+ @edit-closed="editClosedEvent"
+ @checkbox-change="handleCheckboxChange"
>
<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)"/>
+ <input
+ type="type"
+ v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
@@ -671,6 +1069,53 @@
ref="refOtherMoney"
:otherMoney="otherMoney"
style="width: 100%;height: 100%" />
+ </el-dialog>
+
+ <!-- 鏂欐灦搴撳瓨寮圭獥-->
+ <el-dialog v-model="dialogTableVisible"
+ :title="$t('finishedGlassShelf.finishedGlassShelfInformation')"
+ style="width: 70%;height:75%"
+ destroy-on-close
+ :close-on-click-modal="false"
+ :close-on-press-escape="false">
+ <Finished-glass-shelf-information
+ style="width: 100%;height: 600px"
+ type=1
+ @handle-result="handleChildResult"
+ />
+ </el-dialog>
+
+ <!-- 鏂欐灦鍑哄簱寮圭獥-->
+ <el-dialog v-model="dialogTableVisible2"
+ :title="$t('finishedGlassShelf.finishedGlassShelfEmit')"
+ style="width: 70%;height:75% "
+ destroy-on-close
+ :close-on-click-modal="false"
+ :close-on-press-escape="false">
+ <Create-finished-glass-shelf-emit
+ style="width: 100%;height: 600px"
+ type=1
+ :customerName="titleUploadData.customerName"
+ :project="titleUploadData.project"
+ :data="datas"
+ @handle-result="handleChildResult2"
+ />
+ </el-dialog>
+
+ <el-dialog
+ v-model="dialogSelectOrderVisible"
+ :title="t('delivery.orderAdd')"
+ style="width: 70%;height:75% "
+ destroy-on-close
+ :close-on-click-modal="false"
+ :close-on-press-escape="false">
+ <SelectOrderList
+ style="width: 100%;height: 600px"
+ :customer-id="titleUploadData.customerId"
+ :project="titleUploadData.project"
+ :exclude-order-ids="currentOrderIds"
+ @select-orders="handleSelectedOrders"
+ />
</el-dialog>
</div>
@@ -709,4 +1154,14 @@
height: 90%;
width: 100%;
}
+
+.head{
+ width: 100%;
+ height: 170px;
+}
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 170px);
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0