From bf48ed39911f0a3a42d2a7ac79a5935df9a335e6 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 28 Oct 2022 10:25:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/home/home.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index fa9f8ee..65a2a2d 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -24,7 +24,7 @@
export default {
data() {
return {
- menu: [{url: '/pages/ProductManage/SboProdProgress', name: '生箔生产进度'}, {url: '/pages/ProductManage/SboProcess', name: '生箔工序'}, {url: '/pages/ProductManage/BakeProcess', name: '烘烤工序'}, {url: '/pages/ProductManage/PointManage', name: '点位管理'}, {url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/WarehouseManage/SemifinishedInStore', name: '半成品入库'}, {url: '/pages/WarehouseManage/SemifinishedOutStore', name: '半成品出库'}, {url: '/pages/WarehouseManage/ReturngoodsInStore', name: '退货入库'}, {url: '/pages/WarehouseManage/ScrapInStore', name: '报废入库'}, {url: '/pages/WarehouseManage/InStoreConfirm', name: '入库确认'}]
+ menu: [{url: '/pages/ProductManage/SboProdProgress', name: '生箔生产进度'}, {url: '/pages/ProductManage/SboProcess', name: '生箔工序'}, {url: '/pages/ProductManage/BakeProcess', name: '烘烤工序'}, {url: '/pages/ProductManage/PointManage', name: '点位管理'}, {url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/WarehouseManage/SemifinishedInStore', name: '半成品入库'}, {url: '/pages/WarehouseManage/SemifinishedOutStore', name: '半成品出库'}, {url: '/pages/WarehouseManage/ReturngoodsInStore', name: '退货入库'}, {url: '/pages/WarehouseManage/ScrapInStore', name: '报废入库'}, {url: '/pages/WarehouseManage/InStoreConfirm', name: '生产入库'}]
};
},
mounted () {
From e9ee7922f673db36ce97c47eebd2d10015cf0092 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 28 Oct 2022 10:28:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/style/layout.css | 15 +++++++++++
pages/WarehouseManage/InStoreConfirm.vue | 20 +++++++++++---
pages/WarehouseManage/ReturngoodsInStore.vue | 27 ++++++++++++++++---
pages/WarehouseManage/ScrapInStore.vue | 20 +++++++++++---
.../WarehouseManage/SemifinishedOutStore.vue | 8 +++---
utils/getData2.js | 17 +++++++-----
6 files changed, 87 insertions(+), 20 deletions(-)
diff --git a/common/style/layout.css b/common/style/layout.css
index 9a5ad84..615cd2c 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -107,11 +107,26 @@ uni-button:after {
text-align-last: justify;
text-justify: inter-ideograph;/*兼容ie*/
}
+.filter_label_1 {
+ line-height: 30rpx;
+}
.filter_input_wraper {
flex: 1;
height: 80rpx;
padding: 5rpx 0;
margin-left: 30rpx;
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+}
+.filter_input_wraper_1 {
+ height: 30rpx;
+}
+.filter_input_wraper_inn_text {
+ line-height: 30rpx;
+ font-size: 28rpx;
+ color: #606266;
+ margin-left: 10rpx;
}
.filter_input {
width: 100%;
diff --git a/pages/WarehouseManage/InStoreConfirm.vue b/pages/WarehouseManage/InStoreConfirm.vue
index 5da8a90..d4de9d5 100644
--- a/pages/WarehouseManage/InStoreConfirm.vue
+++ b/pages/WarehouseManage/InStoreConfirm.vue
@@ -23,6 +23,15 @@
/>
+
+
+
+
+
+
+ 虚拟库
+
+
@@ -50,7 +59,7 @@
-
+
@@ -70,6 +79,7 @@
return {
val1: '',
val2: '',
+ isV: '0',
dataList: [],
pkId: '',
pkObj: {},
@@ -81,6 +91,10 @@
this._boxQuery()
},
methods: {
+ /** 虚拟库 */
+ isVirtual () {
+ this.isV = this.isV === '0' ? '1' : '0'
+ },
/** 初始化查询 */
async _boxQuery () {
let res = await boxQuery(this.val1, this.val2, '2')
@@ -89,12 +103,12 @@
/** 确认 */
async _stConfirm () {
this.disabled = true
- if (!this.val2 || !this.pkId) {
+ if (!this.pkId) {
this.disabled = false
return
}
try {
- let res = await stConfirm(this.pkObj, this.val2)
+ let res = await stConfirm(this.pkObj, this.val2, '2', this.isV)
uni.showToast({
title: res.message,
icon: 'none'
diff --git a/pages/WarehouseManage/ReturngoodsInStore.vue b/pages/WarehouseManage/ReturngoodsInStore.vue
index 2bcd7a4..b1b10ae 100644
--- a/pages/WarehouseManage/ReturngoodsInStore.vue
+++ b/pages/WarehouseManage/ReturngoodsInStore.vue
@@ -23,6 +23,21 @@
/>
+
+
+
+
+
+
+ 虚拟库
+
+
+
+ 木箱料号
+
+
+
+
@@ -50,7 +65,7 @@
-
+
@@ -69,6 +84,8 @@
return {
val1: '',
val2: '',
+ val3: '',
+ isV: '0',
dataList: [],
pkId: '',
pkObj: {},
@@ -79,6 +96,10 @@
this._boxQuery()
},
methods: {
+ /** 虚拟库 */
+ isVirtual () {
+ this.isV = this.isV === '0' ? '1' : '0'
+ },
/** 初始化查询 */
async _boxQuery () {
let res = await boxQuery(this.val1, this.val2, '3')
@@ -87,12 +108,12 @@
/** 确认 */
async _stConfirm () {
this.disabled = true
- if (!this.val2 || !this.pkId) {
+ if (!this.pkId) {
this.disabled = false
return
}
try {
- let res = await stConfirm(this.pkObj, this.val2)
+ let res = await stConfirm(this.pkObj, this.val2, '3', this.isV, this.val3)
uni.showToast({
title: res.message,
icon: 'none'
diff --git a/pages/WarehouseManage/ScrapInStore.vue b/pages/WarehouseManage/ScrapInStore.vue
index 52cac2f..f211fc1 100644
--- a/pages/WarehouseManage/ScrapInStore.vue
+++ b/pages/WarehouseManage/ScrapInStore.vue
@@ -23,6 +23,15 @@
/>
+
+
+
+
+
+
+ 虚拟库
+
+
@@ -50,7 +59,7 @@
-
+
@@ -69,6 +78,7 @@
return {
val1: '',
val2: '',
+ isV: '0',
dataList: [],
pkId: '',
pkObj: {},
@@ -79,6 +89,10 @@
this._boxQuery()
},
methods: {
+ /** 虚拟库 */
+ isVirtual () {
+ this.isV = this.isV === '0' ? '1' : '0'
+ },
/** 初始化查询 */
async _boxQuery () {
let res = await boxQuery(this.val1, this.val2, '1')
@@ -87,12 +101,12 @@
/** 确认 */
async _stConfirm () {
this.disabled = true
- if (!this.val2 || !this.pkId) {
+ if (!this.pkId) {
this.disabled = false
return
}
try {
- let res = await stConfirm(this.pkObj, this.val2)
+ let res = await stConfirm(this.pkObj, this.val2, '1', this.isV)
uni.showToast({
title: res.message,
icon: 'none'
diff --git a/pages/WarehouseManage/SemifinishedOutStore.vue b/pages/WarehouseManage/SemifinishedOutStore.vue
index 5a9d82c..8db3ff9 100644
--- a/pages/WarehouseManage/SemifinishedOutStore.vue
+++ b/pages/WarehouseManage/SemifinishedOutStore.vue
@@ -62,7 +62,7 @@
-
+
@@ -104,18 +104,18 @@
},
/** 初始化查询 */
async _outcoolIOQuery () {
- let res = await outcoolIOQuery(this.val2, this.index, this.val1)
+ let res = await outcoolIOQuery(this.val2, this.index)
this.dataList = [...res.data]
},
/** 确认 */
async _outconfirmInstor () {
this.disabled = true
- if (!this.pkId) {
+ if (!this.pkId || !this.val1) {
this.disabled = false
return
}
try {
- let res = await outconfirmInstor(this.pkObj)
+ let res = await outconfirmInstor(this.pkObj, this.val1)
uni.showToast({
title: res.message,
icon: 'none'
diff --git a/utils/getData2.js b/utils/getData2.js
index 6a68972..7d1e5f3 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -122,15 +122,15 @@ export const outcoolIOQuery = (name, area, code) => request({
url:'api/pda/coolOut/coolIOQuery',
data: {
container_name: name,
- product_area: area,
- point_code: code
+ product_area: area
}
})
// 1.2确认出库
export const outconfirmInstor = (raw_jo, code, is_bake) => request({
url:'api/pda/coolOut/confirmInstor',
data: {
- raw_jo: raw_jo
+ raw_jo: raw_jo,
+ point_code: code
}
})
@@ -146,17 +146,20 @@ export const boxQuery = (no, option, code) => request({
point_code: code
}
})
-// 1.2确认出库
-export const stConfirm = (box_jo, code) => request({
+// 1.2确认入库
+export const stConfirm = (box_jo, code, option, is, mcode) => request({
url:'api/pda/st/confirm',
data: {
box_jo: box_jo,
- point_code: code
+ point_code: code,
+ option: option,
+ is_virtual: is,
+ material_code: mcode
}
})
/**
- * 入库确认
+ * 生产入库
*/
// 1.3补码
export const stPrint = (box_jo) => request({
From 622a0f92be7f55d52a19e61e766a1a4fd6beb281 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 28 Oct 2022 10:46:22 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=AB=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/SearchBox.vue | 3 ++-
pages/WarehouseManage/InStoreConfirm.vue | 12 ++++++------
pages/WarehouseManage/ReturngoodsInStore.vue | 14 +++++++-------
pages/WarehouseManage/ScrapInStore.vue | 14 +++++++-------
utils/getData2.js | 3 +--
5 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index 6f54767..2bf4a8e 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -34,7 +34,8 @@
methods: {
handleChange ($event) {
this.cur = $event.target.value
- this.$emit('input', this.cur)
+ this.$emit('input', this.cur)
+ this.$emit('handleChange', this.cur)
},
toSearch () {
this.$emit('toSearch', this.cur)
diff --git a/pages/WarehouseManage/InStoreConfirm.vue b/pages/WarehouseManage/InStoreConfirm.vue
index d4de9d5..cfaaddd 100644
--- a/pages/WarehouseManage/InStoreConfirm.vue
+++ b/pages/WarehouseManage/InStoreConfirm.vue
@@ -10,6 +10,7 @@
@@ -61,7 +62,6 @@
-
@@ -87,17 +87,17 @@
disabled1: false
};
},
- created () {
- this._boxQuery()
- },
methods: {
/** 虚拟库 */
isVirtual () {
this.isV = this.isV === '0' ? '1' : '0'
},
+ handleChange (e) {
+ this._boxQuery(e)
+ },
/** 初始化查询 */
async _boxQuery () {
- let res = await boxQuery(this.val1, this.val2, '2')
+ let res = await boxQuery(e, '2')
this.dataList = [...res.data]
},
/** 确认 */
@@ -116,7 +116,7 @@
this.pkId = ''
this.pkObj = {}
this.disabled = false
- this._boxQuery()
+ this._boxQuery(this.val1)
} catch (e) {
this.disabled = false
diff --git a/pages/WarehouseManage/ReturngoodsInStore.vue b/pages/WarehouseManage/ReturngoodsInStore.vue
index b1b10ae..8bae475 100644
--- a/pages/WarehouseManage/ReturngoodsInStore.vue
+++ b/pages/WarehouseManage/ReturngoodsInStore.vue
@@ -10,6 +10,7 @@
@@ -66,7 +67,6 @@
-
@@ -92,17 +92,17 @@
disabled: false
};
},
- created () {
- this._boxQuery()
- },
methods: {
/** 虚拟库 */
isVirtual () {
this.isV = this.isV === '0' ? '1' : '0'
},
+ handleChange (e) {
+ this._boxQuery(e)
+ },
/** 初始化查询 */
- async _boxQuery () {
- let res = await boxQuery(this.val1, this.val2, '3')
+ async _boxQuery (e) {
+ let res = await boxQuery(e, '3')
this.dataList = [...res.data]
},
/** 确认 */
@@ -121,7 +121,7 @@
this.pkId = ''
this.pkObj = {}
this.disabled = false
- this._boxQuery()
+ this._boxQuery(this.val1)
} catch (e) {
this.disabled = false
diff --git a/pages/WarehouseManage/ScrapInStore.vue b/pages/WarehouseManage/ScrapInStore.vue
index f211fc1..2ead091 100644
--- a/pages/WarehouseManage/ScrapInStore.vue
+++ b/pages/WarehouseManage/ScrapInStore.vue
@@ -10,6 +10,7 @@
@@ -60,7 +61,6 @@
-
@@ -85,17 +85,17 @@
disabled: false
};
},
- created () {
- this._boxQuery()
- },
methods: {
/** 虚拟库 */
isVirtual () {
this.isV = this.isV === '0' ? '1' : '0'
},
+ handleChange (e) {
+ this._boxQuery(e)
+ },
/** 初始化查询 */
- async _boxQuery () {
- let res = await boxQuery(this.val1, this.val2, '1')
+ async _boxQuery (e) {
+ let res = await boxQuery(e, '1')
this.dataList = [...res.data]
},
/** 确认 */
@@ -114,7 +114,7 @@
this.pkId = ''
this.pkObj = {}
this.disabled = false
- this._boxQuery()
+ this._boxQuery(this.val1)
} catch (e) {
this.disabled = false
diff --git a/utils/getData2.js b/utils/getData2.js
index 7d1e5f3..eec2eaf 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -142,8 +142,7 @@ export const boxQuery = (no, option, code) => request({
url:'api/pda/st/boxQuery',
data: {
box_no: no,
- option: option,
- point_code: code
+ option: option
}
})
// 1.2确认入库