diff --git a/manifest.json b/manifest.json
index a5ec375..7347406 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "海亮铜箔",
"appid" : "__UNI__22404A1",
"description" : "海亮铜箔手持系统",
- "versionName" : "1.0.0",
- "versionCode" : 100,
+ "versionName" : "1.0.2",
+ "versionCode" : 102,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
@@ -16,6 +16,9 @@
"autoclose" : true,
"delay" : 0
},
+ "compatible" : {
+ "ignoreVersion" : true
+ },
/* 模块配置 */
"modules" : {},
/* 应用发布信息 */
diff --git a/pages/ProductManage/EmptyPipeInStore.vue b/pages/ProductManage/EmptyPipeInStore.vue
index 99645c3..cc9d3d1 100644
--- a/pages/ProductManage/EmptyPipeInStore.vue
+++ b/pages/ProductManage/EmptyPipeInStore.vue
@@ -132,7 +132,7 @@
})
return
}
- let res = await taskQuerydevice([{device_code: this.index2}])
+ let res = await taskQuerydevice([{product_area: this.index1, device_code: this.index2}])
let data = res.data[0]
this.qty = data.qty
this._queryPaperMaterial(data.material_code)
diff --git a/pages/WarehouseManage/InStoreConfirm.vue b/pages/WarehouseManage/InStoreConfirm.vue
index 65a633f..03552fc 100644
--- a/pages/WarehouseManage/InStoreConfirm.vue
+++ b/pages/WarehouseManage/InStoreConfirm.vue
@@ -9,7 +9,7 @@
-
+
@@ -32,6 +32,12 @@
虚拟库
+
+ 库区
+
+
+
+
@@ -59,7 +65,7 @@
-
+
@@ -71,7 +77,7 @@
import SearchBox from '@/components/SearchBox.vue'
import SearchBoxMx from '@/components/SearchBoxMx.vue'
import permision from "@/utils/permission.js"
- import {boxQuery, stConfirm, stPrint} from '@/utils/getData2.js'
+ import {boxQuery, stConfirm, stPrint, getStorSect} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -83,12 +89,17 @@
val1: '',
val2: '',
isV: '0',
+ options1: [],
+ index1: '',
dataList: [],
disabled: false,
disabled1: false,
focused: true
};
},
+ created () {
+ this._getStorSect()
+ },
mounted () {
setTimeout(() => {
uni.hideKeyboard()
@@ -99,6 +110,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, '2')
@@ -107,17 +127,18 @@
/** 确认 */
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, '2', this.isV, '', this.val1)
+ let res = await stConfirm(this.dataList, this.val2, '2', this.isV, '', this.val1, this.index1)
this.disabled = false
// this._boxQuery(this.val1)
this.val1 = ''
this.val2 = ''
this.isV = '0'
+ this.index1 = ''
this.dataList = []
uni.showToast({
title: res.message,
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 = ''
diff --git a/pages/login/login.vue b/pages/login/login.vue
index bf7ddd0..7101216 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -123,15 +123,17 @@
},
async _pdaUpdate () {
let res = await pdaUpdate()
- if (res.versionName === this.version) {
- uni.showToast({
- title: '当前为最新版本',
- icon: 'none'
- })
- } else {
- this.grade = true
- this.androidUrl = res.url
- }
+ // if (res.versionName === this.version) {
+ // uni.showToast({
+ // title: '当前为最新版本',
+ // icon: 'none'
+ // })
+ // } else {
+ // this.grade = true
+ // this.androidUrl = res.url
+ // }
+ this.grade = true
+ this.androidUrl = res.url
},
closeUpdate () {
this.grade = false
diff --git a/utils/getData2.js b/utils/getData2.js
index fadbeff..90bb9f2 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -363,7 +363,7 @@ export const boxQuery = (no, option, code) => request({
}
})
// 1.2确认入库
-export const stConfirm = (box_jo, code, option, is, mcode, no) => request({
+export const stConfirm = (box_jo, code, option, is, mcode, no, sid) => request({
url:'api/pda/st/confirm',
data: {
box_jo: box_jo,
@@ -371,7 +371,8 @@ export const stConfirm = (box_jo, code, option, is, mcode, no) => request({
option: option,
is_virtual: is,
material_code: mcode,
- box_no: no
+ box_no: no,
+ sect_id: sid
}
})
@@ -385,6 +386,11 @@ export const stPrint = (box_jo) => request({
box_jo: box_jo
}
})
+// 库区
+export const getStorSect = () => request({
+ url:'api/sectattr/getStorSect',
+ data: {}
+})
/**
* 客户标签打印