From 329e41ccb0cd24d102b8d5c6db5c167ca01da857 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 16 四月 2024 11:08:15 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue
index 8649d29..ca904c7 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue
@@ -98,7 +98,7 @@
//椤甸潰绗竴娆″姞杞�
-request.get(`/BasicWarehouse/BasicWarehouseTypes/鏉愭枡杩斿簱绫诲瀷`).then((res) => {
+request.get(`/BasicWarehouse/BasicWarehouseTypes/搴撳瓨缁勭粐|鏉愭枡杩斿簱绫诲瀷`).then((res) => {
if(res.code==200){
titleSelectJson.value=deepClone(res.data)
@@ -186,7 +186,7 @@
getStoreWork()
getStoreWorks()
- getInventoryOrganization()
+ //getInventoryOrganization()
}else{
@@ -201,9 +201,10 @@
//搴撳瓨缁勭粐
const getInventoryOrganization=()=>{
//椤甸潰绗竴娆″姞杞�
- request.get(`/BasicWarehouse/BasicWarehouseTypes/搴撳瓨缁勭粐`).then((res) => {
+ request.get(`/BasicWarehouse/BasicWarehouseTypes/搴撳瓨缁勭粐|鏉愭枡杩斿簱绫诲瀷`).then((res) => {
if(res.code==200){
+ console.log(res.data)
titleSelectJson.value=deepClone(res.data)
// for(let i=0;i<titleSelectJson.value.inventoryOrganization.length;i++){
// this.$set(this.produceList[i], "inventoryOrganization", titleSelectJson.value["inventoryOrganization"][i].operateTypeName);
@@ -216,12 +217,17 @@
})
}
+const getWork = () => {
+ getStoreWork()
+ getStoreWorks()
+}
//鍒楁煡璇�
const getStoreWork = () => {
filterData.value.type=value.value
request.get(`/BasicWarehouse/BasicWarehouseType/${value.value}`).then((res) => {
if(res.code==200){
+ console.log(res.data)
gridOptions.columns=[]
BasicData.value = res.data
//娣诲姞鍒�
@@ -261,9 +267,16 @@
materialStore.value[i].json=(JSON.parse(res.data.data[i].json))
}
- materialStore.value.forEach(item => {
- item['inventoryOrganization'] = titleSelectJson.value["inventoryOrganization"][0].operateTypeName
- })
+ if(value.value==='鍘熺墖'){
+ materialStore.value.forEach(item => {
+ item['inventoryOrganization'] = titleSelectJson.value["inventoryOrganization"][0].operateTypeName
+ })
+ }else if(value.value==='杈呮枡'){
+ materialStore.value.forEach(item => {
+ item['inventoryOrganization'] = titleSelectJson.value["inventoryOrganization"][1].operateTypeName
+ })
+ }
+
produceList = deepClone(materialStore.value)
@@ -340,7 +353,7 @@
request.post("/MaterialInventory/saveReturningWarehouse", flowData.value).then((res) => {
if(res.code==200){
ElMessage.success('淇濆瓨鎴愬姛')
- router.push({path: '/main/ingredientsStock/MaterialOutbound', query:{random:Math.random()}})
+ router.push({path: '/main/ingredientsStock/ReturnToStorage', query:{random:Math.random()}})
}else{
ElMessage.warning(res.msg)
router.push("/login")
@@ -359,7 +372,7 @@
request.post("/MaterialInventory/updateReturningWarehouseToExamine", flowData.value).then((res) => {
if (res.code == 200) {
ElMessage.success(t('basicData.msg.ReviewSuccess'))
- router.push({path: '/main/ingredientsStock/MaterialOutbound', query:{random:Math.random()}})
+ router.push({path: '/main/ingredientsStock/ReturnToStorage', query:{random:Math.random()}})
} else {
ElMessage.warning(res.msg)
router.push("/login")
@@ -377,7 +390,7 @@
request.post("/MaterialInventory/updateReturningWarehouseToExamine", flowData.value).then((res) => {
if (res.code == 200) {
ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
- router.push({path: '/main/ingredientsStock/MaterialOutbound', query:{random:Math.random()}})
+ router.push({path: '/main/ingredientsStock/ReturnToStorage', query:{random:Math.random()}})
} else {
ElMessage.warning(res.msg)
router.push("/login")
@@ -546,7 +559,7 @@
<el-row>
- <el-select v-model="value" placeholder="璇烽�夋嫨绫诲埆" @change="getStoreWork" style="margin-top: 10px;border: #181818 1px solid;">
+ <el-select v-model="value" placeholder="璇烽�夋嫨绫诲埆" @change="getWork" style="margin-top: 10px;border: #181818 1px solid;">
<el-option
v-for="item in options"
:key="item.value"
--
Gitblit v1.8.0