From 38a76edfd2e2d01f67ef2be50f1d27ea49301f03 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 21 十一月 2023 10:37:15 +0800
Subject: [PATCH] modified: src/api/product/personboard.js modified: src/views/product/workbench/feed-pane.vue modified: vue.config.js
---
src/views/product/workbench/feed-pane.vue | 12 +++++-------
vue.config.js | 4 ++--
src/api/product/personboard.js | 8 ++++++++
3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/api/product/personboard.js b/src/api/product/personboard.js
index 39dbfe5..d3b39bd 100644
--- a/src/api/product/personboard.js
+++ b/src/api/product/personboard.js
@@ -94,6 +94,14 @@
})
}
+export function getFeed2(query, workstationId) {
+ return request({
+ url: '/mes/stock/getFeedingStock2/' + workstationId,
+ method: 'get',
+ params: query
+ })
+}
+
export function getTodoStock(query) {
return request({
url: '/mes/stock/getToDealStockByWorkstationId',
diff --git a/src/views/product/workbench/feed-pane.vue b/src/views/product/workbench/feed-pane.vue
index 7b41bbb..52b123f 100644
--- a/src/views/product/workbench/feed-pane.vue
+++ b/src/views/product/workbench/feed-pane.vue
@@ -1487,11 +1487,11 @@
</template>
<script>
-import { getStock, getFeed, getTodoStock, submitInsPart, inputHandle } from '@/api/product/personboard'
+import { getStock, getFeed,getFeed2, getTodoStock, submitInsPart, inputHandle } from '@/api/product/personboard'
import { getMaterial } from '@/api/plan/operationtask'
import {
getERPStockListByPart,
- fetchList
+ fetchList,
} from '@/api/warehouse/joinstockorder'
import feedFormDialog from './feed-form'
import returnMaterialFormDialog from './returnmaterial-form'
@@ -1814,7 +1814,7 @@
this.paramObject,
this.queryParamThree
)
- getFeed(query, stationId)
+ getFeed2(query, stationId)
.then((response) => {
var data = response.data
if (data.code === 0) {
@@ -2035,8 +2035,7 @@
getERPStockListByPart({
partNo: part.partNo,
partBatchNo: part.partBatchNo
- })
- .then((resp) => {
+ }).then((resp) => {
const respCode = resp.data.code
const respData = resp.data.data
if (respCode === 0) {
@@ -2045,8 +2044,7 @@
this.isSubmit = false
this.$message.error('搴撳瓨鍒楄〃鏌ヨ澶辫触')
}
- })
- .catch(() => {
+ }).catch(() => {
this.isSubmit = false
console.log('鏌ヨ闆朵欢瀵瑰簲鐨勫簱瀛樺垪琛ㄦ椂锛屽彂鐢熼敊璇�')
})
diff --git a/vue.config.js b/vue.config.js
index d12b323..94a4809 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,10 +2,10 @@
* 閰嶇疆鍙傝��:
* https://cli.vuejs.org/zh/config/
*/
-const url = 'http://192.168.0.23:9999'
+// const url = 'http://192.168.0.23:9999'
// const url = 'http://192.168.0.60:9999'
- // const url = 'http://localhost:9999'
+ const url = 'http://localhost:9999'
// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3