From 82685a4ec94db01c564561582141c03054012ea3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 07 二月 2025 10:16:38 +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 | 21 +++++++++++++--------
1 files changed, 13 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 cfcbd10..1295817 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
@@ -213,8 +213,13 @@
titleUploadData.value=deepClone(res.data.delivery)
titleUploadData.value.deliveryId=str
+ //鍒ゆ柇鏄惁鍙戣揣鍑哄簱
+ if(!company.deliveryOutbound){
+ if(titleUploadData.value.stockState!==0){
+ gridOptions.toolbarConfig.buttons[2].disabled = true
+ }
+ }
//鏍规嵁瀹℃牳鐘舵�佹樉绀哄鏍告寜閽垨鑰呮槸鍙嶅鎸夐挳
-
if(titleUploadData.value.deliveryState!==0){
gridOptions.toolbarConfig.buttons[1].disabled = true
gridOptions.toolbarConfig.buttons[0].disabled = true
@@ -222,9 +227,7 @@
if(titleUploadData.value.deliveryState===0){
gridOptions.toolbarConfig.buttons[2].disabled = true
}
- if(titleUploadData.value.stockState!==0){
- gridOptions.toolbarConfig.buttons[2].disabled = true
- }
+
pageNum=1
produceList = deepClone(res.data.data)
@@ -447,11 +450,12 @@
deliveryId: route.query.deliveryID,
type: 2,
userName:userStore.user.userName,
- userId:userStore.user.userId
+ userId:userStore.user.userId,
+ deliveryOutbound:company.deliveryOutbound
})
request.post("/delivery/updateDeliveryToExamine", flowData.value).then((res) => {
- if (res.code == 200 && res.data===true) {
+ 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/createDelivery',query:{
@@ -471,11 +475,12 @@
deliveryId: route.query.deliveryID,
type: 0,
userName:userStore.user.userName,
- userId:userStore.user.userId
+ userId:userStore.user.userId,
+ deliveryOutbound:company.deliveryOutbound
})
request.post("/delivery/updateDeliveryToExamine", flowData.value).then((res) => {
- if (res.code == 200 && res.data===true) {
+ 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/createDelivery',query:{
--
Gitblit v1.8.0