From 3769e18d49817d5cd4c0ee4843d7561c7a44268d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 12 十一月 2024 16:07:37 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue
index 1fc4def..2b6df5c 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue
@@ -103,25 +103,27 @@
//椤甸潰绗竴娆″姞杞�
-request.get(`/BasicWarehouse/BasicWarehouseTypes/`+t('ingredientsStock.materialOutboundType')).then((res) => {
+const initOrder = async ()=> {
+ await request.get(`/BasicWarehouse/BasicWarehouseTypes/` + t('ingredientsStock.materialOutboundType')).then((res) => {
- if(res.code==200){
+ if (res.code == 200) {
- titleSelectJson.value=deepClone(res.data)
- const today = new Date
- today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
- titleUploadData.value.materialRequisitionDate = today.getFullYear() +
- '-' + ("0" + (today.getMonth() + 1)).slice(-2)
- + '-' + ("0" + today.getDate()).slice(-2)
- getWork()
- }else{
- ElMessage.warning(res.msg)
- }
-})
-
+ titleSelectJson.value = deepClone(res.data)
+ console.log("a"+titleSelectJson.value)
+ const today = new Date
+ today.setTime(today.getTime() + (15 * 24 * 60 * 60 * 1000))
+ titleUploadData.value.materialRequisitionDate = today.getFullYear() +
+ '-' + ("0" + (today.getMonth() + 1)).slice(-2)
+ + '-' + ("0" + today.getDate()).slice(-2)
+ getWork()
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
//鍒楁煡璇�
-const getWork = () => {
- request.get(`/BasicWarehouse/BasicWarehouseType/`+t('ingredients.originalFilm')+'|'+t('ingredients.accessories')).then((res) => {
+const getWork = async ()=> {
+ await request.get(`/BasicWarehouse/BasicWarehouseType/`+t('ingredients.originalFilm')+'|'+t('ingredients.accessories')).then((res) => {
if(res.code==200){
gridOptions.columns=[]
BasicData.value = res.data
@@ -149,7 +151,10 @@
const number = ref();
-onMounted(()=>{
+onMounted(async()=>{
+ await initOrder()
+
+
//鍚敤琛ㄦ牸鎷栧姩閫変腑
addListener(xGrid.value,gridOptions,cellArea.value)
//鍑哄簱鏂板
@@ -163,7 +168,7 @@
request.post("/materialInventory/getSelectMaterialInventory/1/100",filterData.value).then((res) => {
if(res.code==200){
-
+ console.log("b"+titleSelectJson.value)
titleUploadData.value.warehouseManager=userStore.user.userName
titleUploadData.value.outboundType = titleSelectJson.value.outboundType[0].operateTypeName
materialStore.value=[]
--
Gitblit v1.8.0