From 1b6dbddd61bd6d8a6e537b46bd8c9e40232adb3b Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 20 Sep 2023 15:32:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=BA=93=E5=8C=BA=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 6 ++---
pages/WarehouseManage/InStoreConfirm.vue | 2 +-
pages/WarehouseManage/InStoreSplit.vue | 28 +++++++++++++++++---
pages/WarehouseManage/ReturngoodsInStore.vue | 28 +++++++++++++++++---
pages/WarehouseManage/ScrapInStore.vue | 28 +++++++++++++++++---
5 files changed, 76 insertions(+), 16 deletions(-)
diff --git a/manifest.json b/manifest.json
index 150f93d..e741dff 100644
--- a/manifest.json
+++ b/manifest.json
@@ -16,9 +16,9 @@
"autoclose" : true,
"delay" : 0
},
- "compatible":{
- "ignoreVersion":true
- },
+ "compatible" : {
+ "ignoreVersion" : true
+ },
/* 模块配置 */
"modules" : {},
/* 应用发布信息 */
diff --git a/pages/WarehouseManage/InStoreConfirm.vue b/pages/WarehouseManage/InStoreConfirm.vue
index f2c0133..03552fc 100644
--- a/pages/WarehouseManage/InStoreConfirm.vue
+++ b/pages/WarehouseManage/InStoreConfirm.vue
@@ -110,7 +110,7 @@
isVirtual () {
this.isV = this.isV === '0' ? '1' : '0'
},
- /** 选择器2 */
+ /** 选择器1 */
selectChange1(e) {
this.index1 = e
},
diff --git a/pages/WarehouseManage/InStoreSplit.vue b/pages/WarehouseManage/InStoreSplit.vue
index a3e8edd..152dad3 100644
--- a/pages/WarehouseManage/InStoreSplit.vue
+++ b/pages/WarehouseManage/InStoreSplit.vue
@@ -32,6 +32,12 @@
虚拟库
+
+ 库区
+
+
+
+
@@ -59,7 +65,7 @@
-
+
@@ -70,7 +76,7 @@
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import SearchBoxMx from '@/components/SearchBoxMx.vue'
- import {boxQuery, stConfirm, stPrint} from '@/utils/getData2.js'
+ import {boxQuery, stConfirm, stPrint, getStorSect} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -82,12 +88,17 @@
val1: '',
val2: '',
isV: '0',
+ options1: [],
+ index1: '',
dataList: [],
disabled: false,
disabled1: false,
focused: true
};
},
+ created () {
+ this._getStorSect()
+ },
mounted () {
setTimeout(() => {
uni.hideKeyboard()
@@ -98,6 +109,15 @@
isVirtual () {
this.isV = this.isV === '0' ? '1' : '0'
},
+ /** 选择器1 */
+ selectChange1(e) {
+ this.index1 = e
+ },
+ /** 库区下拉框查询 */
+ async _getStorSect () {
+ let res = await getStorSect()
+ this.options1 = [...res.data]
+ },
/** 初始化查询 */
async _boxQuery (e) {
let res = await boxQuery(e, '4')
@@ -106,12 +126,12 @@
/** 确认 */
async _stConfirm () {
this.disabled = true
- if (!this.val1 || this.dataList.length === 0) {
+ if (!this.val1 || this.dataList.length === 0 || (this.isV === '1' && this.index1 === '')) {
this.disabled = false
return
}
try {
- let res = await stConfirm(this.dataList, this.val2, '4', this.isV, '', this.val1)
+ let res = await stConfirm(this.dataList, this.val2, '4', this.isV, '', this.val1, this.index1)
this.disabled = false
// this._boxQuery(this.val1)
this.val1 = ''
diff --git a/pages/WarehouseManage/ReturngoodsInStore.vue b/pages/WarehouseManage/ReturngoodsInStore.vue
index 22a966c..4a71b43 100644
--- a/pages/WarehouseManage/ReturngoodsInStore.vue
+++ b/pages/WarehouseManage/ReturngoodsInStore.vue
@@ -38,6 +38,12 @@
-->
+
+ 库区
+
+
+
+
@@ -65,7 +71,7 @@
-
+
@@ -75,7 +81,7 @@
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import SearchBoxMx from '@/components/SearchBoxMx.vue'
- import {boxQuery, stConfirm} from '@/utils/getData2.js'
+ import {boxQuery, stConfirm, getStorSect} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -88,11 +94,16 @@
val2: '',
val3: '',
isV: '0',
+ options1: [],
+ index1: '',
dataList: [],
disabled: false,
focused: true
};
},
+ created () {
+ this._getStorSect()
+ },
mounted () {
setTimeout(() => {
uni.hideKeyboard()
@@ -103,6 +114,15 @@
isVirtual () {
this.isV = this.isV === '0' ? '1' : '0'
},
+ /** 选择器1 */
+ selectChange1(e) {
+ this.index1 = e
+ },
+ /** 库区下拉框查询 */
+ async _getStorSect () {
+ let res = await getStorSect()
+ this.options1 = [...res.data]
+ },
/** 初始化查询 */
async _boxQuery (e) {
console.log(11)
@@ -112,12 +132,12 @@
/** 确认 */
async _stConfirm () {
this.disabled = true
- if (!this.val1 || this.dataList.length === 0) {
+ if (!this.val1 || this.dataList.length === 0 || (this.isV === '1' && this.index1 === '')) {
this.disabled = false
return
}
try {
- let res = await stConfirm(this.dataList, this.val2, '3', this.isV, this.val3, this.val1)
+ let res = await stConfirm(this.dataList, this.val2, '3', this.isV, this.val3, this.val1, this.index1)
this.disabled = false
// this._boxQuery(this.val1)
this.val1 = ''
diff --git a/pages/WarehouseManage/ScrapInStore.vue b/pages/WarehouseManage/ScrapInStore.vue
index c4eff85..aced1df 100644
--- a/pages/WarehouseManage/ScrapInStore.vue
+++ b/pages/WarehouseManage/ScrapInStore.vue
@@ -32,6 +32,12 @@
虚拟库
+
+ 库区
+
+
+
+
@@ -59,7 +65,7 @@
-
+
@@ -69,7 +75,7 @@
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import SearchBoxMx from '@/components/SearchBoxMx.vue'
- import {boxQuery, stConfirm} from '@/utils/getData2.js'
+ import {boxQuery, stConfirm, getStorSect} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -81,11 +87,16 @@
val1: '',
val2: '',
isV: '0',
+ options1: [],
+ index1: '',
dataList: [],
disabled: false,
focused: true
};
},
+ created () {
+ this._getStorSect()
+ },
mounted () {
setTimeout(() => {
uni.hideKeyboard()
@@ -96,6 +107,15 @@
isVirtual () {
this.isV = this.isV === '0' ? '1' : '0'
},
+ /** 选择器1 */
+ selectChange1(e) {
+ this.index1 = e
+ },
+ /** 库区下拉框查询 */
+ async _getStorSect () {
+ let res = await getStorSect()
+ this.options1 = [...res.data]
+ },
/** 初始化查询 */
async _boxQuery (e) {
let res = await boxQuery(e, '1')
@@ -104,12 +124,12 @@
/** 确认 */
async _stConfirm () {
this.disabled = true
- if (!this.val1 || this.dataList.length === 0) {
+ if (!this.val1 || this.dataList.length === 0 || (this.isV === '1' && this.index1 === '')) {
this.disabled = false
return
}
try {
- let res = await stConfirm(this.dataList, this.val2, '1', this.isV, '', this.val1)
+ let res = await stConfirm(this.dataList, this.val2, '1', this.isV, '', this.val1, this.index1)
this.disabled = false
// this._boxQuery(this.val1)
this.val1 = ''