From fcc47ceae27b5dc6eccacf0fdd014fd7cb71cc2c Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 04 六月 2024 14:20:51 +0800
Subject: [PATCH] 尺寸确认已完成
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index d500099..e90865b 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -8,6 +8,7 @@
import useUserInfoStore from '@/stores/userInfo'
import SelectProduct from "@/views/sd/product/SelectProduct.vue"
import OrderOtherMoney from "@/components/sd/order/OrderOtherMoney.vue"
+import OrderSizeCheck from "@/components/sd/order/OrderSizeCheck.vue"
import {changeFilterEvent,filterChanged} from "@/hook"
import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove"
import downLoadFile from "@/hook/downLoadFile"
@@ -19,6 +20,7 @@
let productVisible = ref(false)
let errorAreaVisible = ref(false)
let otherMoneyVisible = ref(false)
+let sizeCheckVisible = ref(false)
const maxTableLen =ref(150)
let errorArea = ref(0.4)
const userStore = useUserInfoStore()
@@ -104,7 +106,8 @@
{ code: 'clearChecked', name: t('basicData.clearSelection'), prefixIcon: 'vxe-icon-indicator', visible: true, disabled: false },
{ code: 'computedMoney', name: t('basicData.calculateAmount'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: true },
{ code: 'errorArea', name: '璇樊缁撶畻闈㈢Н', prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
- { code: 'otherMoney', name: '鍏朵粬閲戦', prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false }
+ { code: 'otherMoney', name: '鍏朵粬閲戦', prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false },
+ { code: 'sizeCheck', name: '灏哄瀹℃牳', prefixIcon: 'vxe-icon-eye-fill', visible: true, disabled: true }
]
]
}
@@ -434,6 +437,10 @@
otherMoneyVisible.value=true
break
}
+ case 'sizeCheck' :{
+ sizeCheckVisible.value=true
+ break
+ }
}
}
},
@@ -500,10 +507,12 @@
if(res.data.order.processReview === 2){
gridOptions.toolbarConfig.buttons[4].disabled = true
+
}
- //鍙栨秷瀹℃牳鎸夐挳绂佺敤
+ //宸ヨ壓瀹℃牳鍚庯紝璁㈠崟鏈鏍� 鍙栨秷瀹℃牳鎸夐挳绂佺敤鍜屽昂瀵稿鏍�
if(res.data.order.processReview === 2 && res.data.order.orderReview === 0){
gridOptions.toolbarConfig.buttons[2].disabled = false
+ gridOptions.menuConfig.body.options[0][8].disabled =false
}
//鎸夐挳瀹℃牳杩囧悗鍙樹负鍙嶅
@@ -512,6 +521,7 @@
gridOptions.toolbarConfig.buttons[2].code='reviews'
gridOptions.toolbarConfig.buttons[2].name=t('basicData.cancelReview')
gridOptions.toolbarConfig.buttons[3].disabled = false
+
const button = {'code': 'cancelOrder',
status: 'primary',
'name': (res.data.order.orderReview>0?t('basicData.cancel'):t('basicData.restore'))}
@@ -656,6 +666,13 @@
ElMessage.error(res.msg)
}
})
+}
+
+const gaveOrderSizeCheck = () => {
+
+
+
+ reviewOrder(2)
}
const changeCustomer = () => {
@@ -1074,6 +1091,21 @@
style="width: 100%;height: 100%" />
</el-dialog>
+<!-- 灏哄瀹℃牳绐楀彛-->
+ <el-dialog
+ id="sizeCheck"
+ v-model="sizeCheckVisible"
+ :title="'灏哄鏍￠獙'"
+ destroy-on-close
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ style="width: 614px;height:445px "
+ >
+ <order-size-check
+ @getParent="gaveOrderSizeCheck"
+ :OrderDetail="xGrid"/>
+ </el-dialog>
+
</div>
</template>
@@ -1111,4 +1143,9 @@
width: 100%;
}
+ :deep(#sizeCheck .el-dialog__body){
+ height: 90%;
+ width: 100%;
+ }
+
</style>
\ No newline at end of file
--
Gitblit v1.8.0