From 1e9a52cf65f364b4332a008210700adbaea0c35e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 06 九月 2024 11:34:16 +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/CreateDelivery.vue | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 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 ee2f4ce..58243e5 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
@@ -14,6 +14,7 @@
import footSum from "@/hook/footSum";
import {changeFilterEvent,filterChanged} from "@/hook"
import companyInfo from "@/stores/sd/companyInfo";
+import {multiply} from "@/utils/decimal";
//璇█鑾峰彇
const { t } = useI18n()
@@ -56,6 +57,7 @@
// 瀹氫箟琛ㄥご涓婁紶鏁版嵁
let titleUploadData = ref({
+ deliveryId:'',
deliveryState:'',
stockState:'',
paymentTerms:'',
@@ -166,6 +168,7 @@
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() )
titleUploadData.value.deliveryDate=today.getFullYear() +
@@ -208,7 +211,7 @@
if(res.code==200){
pageTotal.value=res.data.total
titleUploadData.value=deepClone(res.data.delivery)
-
+ titleUploadData.value.deliveryId=str
//鏍规嵁瀹℃牳鐘舵�佹樉绀哄鏍告寜閽垨鑰呮槸鍙嶅鎸夐挳
@@ -295,6 +298,7 @@
customConfig: {
storage: true
},
+ checkboxConfig:{checkAll:true},
mouseConfig:{selected: true},//榧犳爣閫変腑
keyboardConfig:{isArrow: true, isDel: true, isEnter: true, isTab: true, isEdit: true, isChecked: true},
editConfig: {
@@ -420,7 +424,14 @@
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"){
@@ -445,7 +456,10 @@
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'))
}
@@ -464,7 +478,10 @@
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'))
}
@@ -569,6 +586,16 @@
})
+const editClosedEvent = ({ row, column }) => {
+
+ if (['deliveryDetail.quantity'].includes(column.property)) {
+ if(parseInt(row.deliveryDetail.quantity)===0){
+ xGrid.value.setCheckboxRow(row, false);
+ }
+ }
+
+}
+
</script>
@@ -662,6 +689,7 @@
v-bind="gridOptions"
v-on="gridEvents"
:edit-rules="validRules"
+ @edit-closed="editClosedEvent"
>
<template #num1_filter="{ column, $panel }">
--
Gitblit v1.8.0