From f840648d65d3ff3b08dfb6727b0fa70a79eed734 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Tue, 19 Mar 2024 16:53:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E6=9C=9F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locale/en.json | 1 + locale/id.json | 1 + locale/zh-Hans.json | 1 + manifest.json | 3 ++ pages/ProductManage/EmptyPipeInStore.vue | 2 +- pages/WarehouseManage/InStoreConfirm.vue | 29 +++++++++++++--- pages/WarehouseManage/InStoreSplit.vue | 28 ++++++++++++--- pages/WarehouseManage/ReturngoodsInStore.vue | 28 ++++++++++++--- pages/WarehouseManage/ScrapInStore.vue | 28 ++++++++++++--- pages/login/login.vue | 36 +++++++++++--------- utils/getData2.js | 10 ++++-- 11 files changed, 131 insertions(+), 36 deletions(-) diff --git a/locale/en.json b/locale/en.json index ae41a4d..1047017 100644 --- a/locale/en.json +++ b/locale/en.json @@ -106,6 +106,7 @@ "filter.remark": "Remark", "filter.document-type": "Document type", "filter.keywords": "Keywords", + "filter.warehouse-area": "Warehouse area", "grid.number": "No.", "grid.select": "Select", "grid.work-order-number": "Work order number", diff --git a/locale/id.json b/locale/id.json index 06ae472..fe5e14e 100644 --- a/locale/id.json +++ b/locale/id.json @@ -92,6 +92,7 @@ "grid.number": "Nomor", "grid.select": "Pilihan", "filter.keywords": "Kata kunci", + "filter.warehouse-area": "Daerah gudang", "filter.point": "Posisi titik", "filter.mother-roll": "Mother roll", "filter.state": "Keadaan", diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index a53b49c..8475f46 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -106,6 +106,7 @@ "filter.remark": "备注", "filter.document-type": "单据类型", "filter.keywords": "关键字", + "filter.warehouse-area": "库区", "grid.number": "序号", "grid.select": "选择", "grid.work-order-number": "工单号", diff --git a/manifest.json b/manifest.json index 78d0d7c..c3c9c4e 100644 --- a/manifest.json +++ b/manifest.json @@ -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 8f6180d..e544fda 100644 --- a/pages/ProductManage/EmptyPipeInStore.vue +++ b/pages/ProductManage/EmptyPipeInStore.vue @@ -133,7 +133,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 a5eff09..3ae957f 100644 --- a/pages/WarehouseManage/InStoreConfirm.vue +++ b/pages/WarehouseManage/InStoreConfirm.vue @@ -32,6 +32,12 @@ {{$t('filter.virtual-library')}} + + {{$t('filter.warehouse-area')}} + + + + @@ -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 5ed12fd..c5c9308 100644 --- a/pages/WarehouseManage/InStoreSplit.vue +++ b/pages/WarehouseManage/InStoreSplit.vue @@ -32,6 +32,12 @@ {{$t('filter.virtual-library')}} + + {{$t('filter.warehouse-area')}} + + + + @@ -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 f79499b..a799d11 100644 --- a/pages/WarehouseManage/ReturngoodsInStore.vue +++ b/pages/WarehouseManage/ReturngoodsInStore.vue @@ -38,6 +38,12 @@ --> + + {{$t('filter.warehouse-area')}} + + + + @@ -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 bbddea7..30d028c 100644 --- a/pages/WarehouseManage/ScrapInStore.vue +++ b/pages/WarehouseManage/ScrapInStore.vue @@ -32,6 +32,12 @@ {{$t('filter.virtual-library')}} + + {{$t('filter.warehouse-area')}} + + + + @@ -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 e2983a6..f8d100a 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -89,18 +89,18 @@ }) this.disabled = true if (this.user === '') { - uni.showToast({ - title: '用户名不能为空', - icon: 'none' - }) + // uni.showToast({ + // title: '用户名不能为空', + // icon: 'none' + // }) this.disabled = false return } if (this.password === '') { - uni.showToast({ - title: '密码不能为空', - icon: 'none' - }) + // uni.showToast({ + // title: '密码不能为空', + // icon: 'none' + // }) this.disabled = false return } @@ -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 de5e921..4afa46e 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -541,7 +541,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, @@ -549,7 +549,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 } }) @@ -563,6 +564,11 @@ export const stPrint = (box_jo) => request({ box_jo: box_jo } }) +// 库区 +export const getStorSect = () => request({ + url:'api/sectattr/getStorSect', + data: {} +}) /** * 客户标签打印