From 3e5bb05019528ef63f82033cbcc91f0f4844089c Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Mon, 4 Sep 2023 14:35:33 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.json b/manifest.json index a5ec375..150f93d 100644 --- a/manifest.json +++ b/manifest.json @@ -16,6 +16,9 @@ "autoclose" : true, "delay" : 0 }, + "compatible":{ + "ignoreVersion":true + }, /* 模块配置 */ "modules" : {}, /* 应用发布信息 */ From 91fcaebddc817cc6bbb6d2693b51acf5af54fbeb Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Mon, 18 Sep 2023 10:14:38 +0800 Subject: [PATCH 2/7] =?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/WarehouseManage/InStoreConfirm.vue | 31 ++++++++++++++++++++---- utils/getData2.js | 10 ++++++-- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/pages/WarehouseManage/InStoreConfirm.vue b/pages/WarehouseManage/InStoreConfirm.vue index 65a633f..f2c0133 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' }, + /** 选择器2 */ + 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/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: {} +}) /** * 客户标签打印 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 3/7] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E5=8A=9F=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 = '' From 7b5a7a3235ee4876d5238357f6466ce195c0d2fd Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Wed, 20 Sep 2023 15:33:12 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index e741dff..6cd900d 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.1", + "versionCode" : 101, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { From 4fc154739f382a19fcf3a36ba1f3da1a1dff1386 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Wed, 20 Sep 2023 15:34:54 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=B8=8D=E6=A0=A1=E9=AA=8C=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/login/login.vue | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) 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 From 6ae392916e7de51bd8f08d5660d97d54b749dc4e Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Mon, 9 Oct 2023 14:14:30 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=A9=BA=E7=AE=A1=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/ProductManage/EmptyPipeInStore.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 9b72c1d98d0464e0ed1e7db86bc3db35c480f4dd Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Mon, 9 Oct 2023 16:03:38 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 6cd900d..7347406 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "海亮铜箔", "appid" : "__UNI__22404A1", "description" : "海亮铜箔手持系统", - "versionName" : "1.0.1", - "versionCode" : 101, + "versionName" : "1.0.2", + "versionCode" : 102, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : {