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 | 282 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 274 insertions(+), 8 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 d17f5ef..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
@@ -18,6 +18,9 @@
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()
@@ -34,6 +37,19 @@
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=/\./ // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
@@ -199,9 +215,16 @@
})
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
@@ -223,19 +246,25 @@
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[2].disabled = true
+ 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
}
pageNum=1
@@ -304,6 +333,9 @@
resizable: true,
useKey: true
},
+ sortConfig: {
+ multiple: true,
+ },
filterConfig: { //绛涢�夐厤缃」
//remote: true
},
@@ -326,7 +358,7 @@
{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: 'orderNumber',width:120, title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
- {field: 'finishedGoodsInventory.boxNo',width:120, title: t('绠卞彿'),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: '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},
@@ -355,8 +387,10 @@
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': 'addOtherOrders','name': t('delivery.orderAdd'),'status': 'primary'}
//{'code': 'glassShelf', 'name': t('finishedGlassShelf.finishedGlassShelfEmit'),status: 'primary'}
],
/*import: false,
@@ -422,15 +456,22 @@
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
+ deliveryIdType:company.deliveryIdType,
+ deliveryOutbound:company.deliveryOutbound,
+ type:1
})
+ 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'))
@@ -454,6 +495,8 @@
}).catch((err)=>{
ElMessage.error(t('basicData.msg.ServerConnectionError'))
router.push("/login")
+ }).finally(()=>{
+ gridOptions.toolbarConfig.buttons[0].disabled = false
})
break
}
@@ -517,7 +560,90 @@
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;
+ }
}
}
},
@@ -589,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) => {
@@ -681,7 +854,83 @@
};
+// 澶勭悊浠嶴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>
@@ -769,13 +1018,14 @@
</div>
<div class="main-table">
<vxe-grid
- max-height="100%"
+ 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 }">
@@ -851,6 +1101,22 @@
@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>
</template>
--
Gitblit v1.8.0