From 627726cc0f7e2347f8b70d79af21bcf54461ce3c Mon Sep 17 00:00:00 2001
From: Amjacks <1932302177@qq.com>
Date: Fri, 11 Apr 2025 17:01:15 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E8=BE=85=E6=9D=90=E5=85=A5=E5=BA=93?=
=?UTF-8?q?=E8=81=9A=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/stockIn/NoPoStockIn/index.vue | 53 ++++++++++++---------
src/views/stockIn/StockInByCharge/index.vue | 3 +-
src/views/stockIn/deliveryNote/index.vue | 2 +-
3 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/src/views/stockIn/NoPoStockIn/index.vue b/src/views/stockIn/NoPoStockIn/index.vue
index a3f07d3..bd969a1 100644
--- a/src/views/stockIn/NoPoStockIn/index.vue
+++ b/src/views/stockIn/NoPoStockIn/index.vue
@@ -32,12 +32,14 @@
+
-
-
-
-
+ style="width: 100%">
+
+
+
+
@@ -45,10 +47,18 @@
+
+
+
+
+
+
+
+ default-first-option filterable >
@@ -57,19 +67,15 @@
- -->
+
-
-
-
-
-
-
@@ -113,6 +119,7 @@ import { NoChargeStockIn } from '@/api/StockIn'
import {getOpCode} from "@/api/opcode";
import { bTableHeight } from "../../../composables/calcTableHeight";
import Drawer from '@/views/stockIn/delivery/drawer.vue'
+import { getStoreDetail } from '@/api/delivery'
const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(220);
const route = useRoute()
@@ -145,6 +152,7 @@ const state = reactive({
//SITENAME: localStorage.get("siteName"),
SITENAME: 'SDK',
RECEIVEREQUESTNAME: "",
+ deliveryType: '02'
},
},
ChangeParams: {
@@ -241,25 +249,24 @@ function handleQuery() {
})
return
}
- getQueryList(state.queryParams).then((res: any) => {
- console.log(res.data)
- if(res.data.length == 0){
+ getStoreDetail(state.queryParams).then((res: any) => {
+ if (res.resultObj) {
+ // 加载库位
+ if (res.resultObj.length > 0) {
+ getERPLocation(res.resultObj[0].ERPFACTORY)
+ getStorageSpec(res.resultObj[0].ERPFACTORY)
+ }
+ state.MATERIALRECEIVEACT = res.resultObj
+ } else {
ElMessageBox.alert('查无数据', '提醒框', {
confirmButtonText: 'OK',
})
- return
- } else {
- state.MATERIALRECEIVEACT = res.data
-
}
-
}).catch((error: any) => {
ElMessageBox.alert(error.message, '提醒框', {
confirmButtonText: 'OK',
})
})
-
-
}
diff --git a/src/views/stockIn/StockInByCharge/index.vue b/src/views/stockIn/StockInByCharge/index.vue
index b4213d8..39144d6 100644
--- a/src/views/stockIn/StockInByCharge/index.vue
+++ b/src/views/stockIn/StockInByCharge/index.vue
@@ -258,7 +258,8 @@ const state = reactive({
params: {
SITENAME: 'SDK',
RECEIVEREQUESTNAME: '',
- MATERIALSPECNAME: ''
+ MATERIALSPECNAME: '',
+ deliveryType: '01'
}
},
operateParams: {
diff --git a/src/views/stockIn/deliveryNote/index.vue b/src/views/stockIn/deliveryNote/index.vue
index 8acfcad..33631aa 100644
--- a/src/views/stockIn/deliveryNote/index.vue
+++ b/src/views/stockIn/deliveryNote/index.vue
@@ -112,7 +112,7 @@ const state = reactive({
loading: true, // 表格
// 到货单类型
deliveryType: [{label: '批次到货单', key: '01'}, {label: '辅材到货单', key: '02'}],
- deliveryState: [{label: '新建', key: '01'}, {label: '结束', key: '02'}],
+ deliveryState: [{label: '新建', key: '01'}, {label: '进行中', key: '02'}, {label: '结束', key: '03'}],
// 查询参数
queryParams: {
params: {