From 045e7dbed6c82299796d8b7176ebe7963508229f Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Sun, 11 Aug 2024 15:08:25 +0800 Subject: [PATCH 01/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=89=AB=E6=8F=8F=E8=B5=8B=E5=80=BC=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/job/issueJob.vue | 2 +- src/pages/productPutaway/job/productPutawayJob.vue | 2 +- src/pages/productReceipt/job/productReceiptJob.vue | 2 +- src/pages/repleinsh/job/repleinshJob.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index fd57836e..f8680e9d 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -417,7 +417,7 @@ openJobDetail(item, scanMessage = '') { - this.getJobInfoByNumber(item.number,scanMessage = '') + this.getJobInfoByNumber(item.number,scanMessage) }, diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue index 11625ff6..b901b688 100644 --- a/src/pages/productPutaway/job/productPutawayJob.vue +++ b/src/pages/productPutaway/job/productPutawayJob.vue @@ -213,7 +213,7 @@ }, openJobDetail(item, scanMessage = '') { - this.getJobInfoByNumber(item.number,scanMessage = '') + this.getJobInfoByNumber(item.number,scanMessage) }, getJobInfoByNumber(number,scanMessage){ diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue index 5a0a3828..3bf276b4 100644 --- a/src/pages/productReceipt/job/productReceiptJob.vue +++ b/src/pages/productReceipt/job/productReceiptJob.vue @@ -218,7 +218,7 @@ }, openJobDetail(item, scanMessage = '') { - this.getJobInfoByNumber(item.number,scanMessage = '') + this.getJobInfoByNumber(item.number,scanMessage) }, showItemList(itemList) { diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue index 0bb09863..1a820cf9 100644 --- a/src/pages/repleinsh/job/repleinshJob.vue +++ b/src/pages/repleinsh/job/repleinshJob.vue @@ -348,7 +348,7 @@ }, openJobDetail(item, scanMessage = '') { - this.getJobInfoByNumber(item.number,scanMessage = '') + this.getJobInfoByNumber(item.number,scanMessage ) }, From 64035597b53b84b3c6286099608b7b29bb7ac7d2 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Sun, 11 Aug 2024 15:31:52 +0800 Subject: [PATCH 02/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E5=8C=85?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=B7=B3=E8=BD=AC=E5=88=B0=E8=AF=A6=E6=83=85?= =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scan/winComScanBalanceLocation.vue | 31 +++++ src/pages/package/coms/comScanPackagePack.vue | 12 ++ src/pages/package/job/overPackageJob.vue | 130 +++++++++++++++++- .../package/job/overPackageJobDetail.vue | 10 +- 4 files changed, 176 insertions(+), 7 deletions(-) diff --git a/src/mycomponents/scan/winComScanBalanceLocation.vue b/src/mycomponents/scan/winComScanBalanceLocation.vue index 68f9ae8e..188bd60e 100644 --- a/src/mycomponents/scan/winComScanBalanceLocation.vue +++ b/src/mycomponents/scan/winComScanBalanceLocation.vue @@ -63,6 +63,10 @@ getBalanceByParams, getBasicItemByCode } from '@/api/request2.js'; + + import { + getLabelInfo + } from '@/common/label.js'; import { getListLocationAreaTypeDesc, @@ -165,6 +169,33 @@ this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态 }, + //模拟扫描 + openScanPopupForJobSimulate(fromLocationCode, fromLocationList, jobContent, scanMessage) { + this.fromLocationCode = fromLocationCode; + this.fromLocationList = fromLocationList; + if (!fromLocationCode) { + if (this.fromLocationList.length == 0) { + // this.locationGetFocus(); + alert('没有来源库位：List') + } else { + this.fromLocationCode = this.fromLocationList[0]; + } + } + + this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses) + this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态 + this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态 + getLabelInfo(scanMessage, this.headerType, callback => { + if (callback.success) { + this.getScanResult(callback); + } else { + this.showErrorMessage(callback.message, res => {}) + } + + }) + + }, + handleConfirm() { this.$emit('confirm', this.fromLocationCode) }, diff --git a/src/pages/package/coms/comScanPackagePack.vue b/src/pages/package/coms/comScanPackagePack.vue index e1e04d3d..d6b8b098 100644 --- a/src/pages/package/coms/comScanPackagePack.vue +++ b/src/pages/package/coms/comScanPackagePack.vue @@ -95,6 +95,17 @@ import { getDirectoryItemArray } from '@/common/directory'; that.fromLocationList = that.getFromLocationList(); } }, + + //模拟扫描 + openScanPopupForJobSimulate(content, jobcontent, scanMessage) { + this.issueRecord = []; + this.dataContent = content; + this.jobContent = jobcontent; + this.initData(); + this.$refs.scanPopup.openScanPopupForJobSimulate(this.fromLocationCode, this.fromLocationList, this.jobContent, + scanMessage); + + }, showBalanceSelect(items) { this.$refs.balanceSelect.openPopup(items); @@ -342,6 +353,7 @@ import { getDirectoryItemArray } from '@/common/directory'; batch.Records.push(record); this.calcBatchHandleQty(batch); this.packGetFocus(); + this.$emit('refresh'); }, swipeClick(e, item, index) { diff --git a/src/pages/package/job/overPackageJob.vue b/src/pages/package/job/overPackageJob.vue index 92c25cca..f1473476 100644 --- a/src/pages/package/job/overPackageJob.vue +++ b/src/pages/package/job/overPackageJob.vue @@ -19,6 +19,13 @@ + + + + + @@ -32,6 +39,10 @@ goHome, updateTitle } from '@/common/basic.js'; + + import { + getBusinessType + } from '@/common/record.js'; import { planRefreshTime } from '@/common/config.js'; @@ -45,6 +56,9 @@ import jobFilter from '@/mycomponents/job/jobFilter.vue' import comOverPackJobCard from '@/pages/package/coms/comOverPackJobCard.vue' import jobInfoPopup from '@/pages/issue/coms/jobInfoPopup.vue' + import winScanButton from '@/mycomponents/scan/winScanButton.vue' + import winComScanBalance from '@/mycomponents/scan/winComScanBalance.vue' + import jobList from '@/mycomponents/jobList/jobList.vue' export default { name: 'issue', @@ -52,7 +66,10 @@ comEmptyView, jobFilter, comOverPackJobCard, - jobInfoPopup + jobInfoPopup, + winComScanBalance, + winScanButton, + jobList }, data() { return { @@ -68,7 +85,11 @@ detailOptions: [], detailGiveupOptions: [], title:'', - timer:null + businessTypeCode: "OverPackage", + businessType: null, + timer:null, + scanMessage:"" + }; }, @@ -125,6 +146,16 @@ }, methods: { + getBusinessTypeFunc() { + getBusinessType(this.businessTypeCode, res => { + if (res.success) { + this.businessType = res.businessType; + this.openScanPopup(); + } else { + this.showErrorMessage(res.message) + } + }); + }, timerRefresh() { this.getList('refresh') this.stopRefresh(); @@ -225,8 +256,8 @@ }, - openJobDetail(item) { - this.getJobInfoByNumber(item.number) + openJobDetail(item,scanMessage = '') { + this.getJobInfoByNumber(item.number,scanMessage) }, showItemList(itemList) { @@ -327,8 +358,16 @@ } }); }, + openScanPopup() { + if (this.businessType == null) { + this.getBusinessTypeFunc() + } else { + this.$refs.scanPopup.openScanPopup(this.businessType); + } + }, - getJobInfoByNumber(number){ + getJobInfoByNumber(number,scanMessage){ + console.log("扫描",scanMessage) let that = this; uni.showLoading({ title: "加载中....", @@ -367,14 +406,93 @@ return; } uni.navigateTo({ - url: './overPackageJobDetail?id=' + result.masterId + '&status=' + result.status+'&title='+this.title + url: './overPackageJobDetail?id=' + result.masterId + '&status=' + result.status+'&title='+this.title+'&scanMessage=' + + scanMessage }); + this.scanMessage="" } }).catch(error => { uni.hideLoading(); that.showMessage(error); }) }, + + selectItem(item) { + this.$refs.scanPopup.closeScanPopup(); + this.openJobDetail(item, this.scanMessage); + }, + + getScanResult(result) { + let balance = result.balance; + if (balance != null) { + this.scanMessage = "" + if (!result.label.batch) { + this.showMessage("批次为空") + return; + } + if (!result.label.itemCode) { + this.showMessage("物料号为空") + return; + } + try { + var filters = [{ + column: "status", + action: "in", + value: '1,2' + }, + { + column: "batch", + action: "==", + value: result.label.batch + }, + { + column: "itemCode", + action: "==", + value: result.label.itemCode + }, + { + column: "fromLocationCode", + action: "==", + value: balance.locationCode + } + ] + getOverPageJobList({ + filters: filters, + pageNo: 1, + pageSize: 1000, + sort: 'createTime', + by: 'asc' + }).then(res => { + this.scanMessage = result.scanMessage + let resultList = res.data.list; + if (resultList.length > 0) { + resultList.forEach(item => { + item.title = item.number; + item.selected = false + }) + let list = [] + resultList.forEach(item => { + if (!list.find(subItem => subItem.title == item.title)) { + list.push(item) + } + }) + if (list.length > 0) { + this.selectItem(list[0]) + } + } else { + this.showMessage("按来源库位[" + balance.locationCode + "]批次[" + result.label.batch + + "]物料号[" + result.label.itemCode + "]未查找到任务\n" + "扫描[" + result + .scanMessage + "]") + } + }).catch(error => { + this.showMessage(error + "\n扫描[" + result.scanMessage + "]") + }) + + } catch (e) { + this.showMessage(e.message) + } + } + } } } diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue index 2d91d17b..9c2d2319 100644 --- a/src/pages/package/job/overPackageJobDetail.vue +++ b/src/pages/package/job/overPackageJobDetail.vue @@ -58,7 +58,7 @@ - + @@ -128,6 +128,7 @@ detailOptions: [], scanOptions: [], jobStatus: "", + scanMessage: '' // printDeafult: {}, //默认打印机 // templateDeafult: {} //默认的模板 @@ -143,6 +144,7 @@ title: option.title + '详情' }) this.id = option.id; + this.scanMessage = option.scanMessage || ''; if (this.id != undefined) { //新建的任务自动接收 if (option.status == "1") { @@ -229,6 +231,9 @@ that.jobStatus = res.data.status that.subList = res.data.subList; that.detailSource = getDataSource(that.detailSource, that.subList) + if (this.scanMessage) { + this.openScanPopupSimulate(this.scanMessage); + } // this.$nextTick(() => { // if (uni.getStorageSync('overPackageJobDetailPointParams')) { // const overPackageJobDetailPointParams = uni.getStorageSync( @@ -255,6 +260,9 @@ this.showErrorMessage(error) }) }, + openScanPopupSimulate(scanMessage) { + this.$refs.comScanPackagePack.openScanPopupForJobSimulate(this.detailSource, this.jobContent, scanMessage); + }, closeScan() { this.resizeCollapse(); From 77ffbfaa8729fb1e38f08cd766fd0fca600287b1 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sun, 11 Aug 2024 18:01:24 +0800 Subject: [PATCH 03/28] =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/manifest.json b/src/manifest.json index 6a45e3e6..a5f98d04 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,10 +1,10 @@ { "name" : "wms", "package" : "uni.UNI43932FE", - "appid" : "__UNI__C9CF4BF", + "appid" : "__UNI__F36DDCF", "description" : "", - "versionName" : "1.0.52", - "versionCode" : 52, + "versionName" : "1.0.53", + "versionCode" : 53, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { From 01063ee217d37f822c4cbf6d5e0ca67fb917e420 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sun, 11 Aug 2024 19:10:39 +0800 Subject: [PATCH 04/28] =?UTF-8?q?=E8=A1=A5=E6=96=99=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0onUnLoad?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/repleinsh/job/repleinshJob.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue index 1a820cf9..d0c1605f 100644 --- a/src/pages/repleinsh/job/repleinshJob.vue +++ b/src/pages/repleinsh/job/repleinshJob.vue @@ -125,7 +125,9 @@ onHide() { this.stopRefresh(); }, - + onUnload(){ + this.stopRefresh(); + }, onReady() { this.detailOptions = getDetailOption(); this.detailGiveupOptions = getDetailGiveupOption(); From 89d63b84aaab0f86bd5d83aa6d139379682e1aaf Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sun, 11 Aug 2024 19:11:13 +0800 Subject: [PATCH 05/28] =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/manifest.json b/src/manifest.json index a5f98d04..fedfa8f9 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,8 +3,8 @@ "package" : "uni.UNI43932FE", "appid" : "__UNI__F36DDCF", "description" : "", - "versionName" : "1.0.53", - "versionCode" : 53, + "versionName" : "1.0.54", + "versionCode" : 54, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { From bf836b13f5a0b99dc5138032e1071016668c8393 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Sun, 11 Aug 2024 19:28:18 +0800 Subject: [PATCH 06/28] =?UTF-8?q?=E5=8F=91=E6=96=99=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/productionReceiptJob.vue | 68 ++++++++++++++++--- 1 file changed, 58 insertions(+), 10 deletions(-) diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue index 5bc91f36..c529f434 100644 --- a/src/pages/productionReceipt/job/productionReceiptJob.vue +++ b/src/pages/productionReceipt/job/productionReceiptJob.vue @@ -4,7 +4,10 @@ + :productionline="productionLineList" + :isShowItemCode="true" + :isShowQurery='true' + @onQuery="getListByFilter"> @@ -84,7 +87,8 @@ title: '', scanMessage: "", productionLineList: [], - productionLine: "" + productionLine: "", + filterItemCode:"" }; }, onLoad(option) { @@ -93,7 +97,7 @@ }, onShow() { - this.getList('refresh', this.productionLine); + this.getList('refresh', this.productionLine,this.filterItemCode) }, onReady() { @@ -106,11 +110,11 @@ if (this.loadingType == 'loading' || this.loadingType == 'nomore') { return; } - this.getList("more", this.productionLine); + this.getList('more', this.productionLine,this.filterItemCode) }, onPullDownRefresh() { - this.getList('refresh', this.productionLine); + this.getList('refresh', this.productionLine,this.filterItemCode) }, //后退按钮 @@ -135,7 +139,7 @@ methods: { productionLineCode(productionLineCode) { this.productionLine = productionLineCode - this.getList('refresh', this.productionLine) + this.getList('refresh', this.productionLine,this.filterItemCode) }, getProductionReceiptJobByProductionline() { getProductionReceiptJobByProductionline().then(res => { @@ -153,7 +157,7 @@ } }) }, - getList(type, productionLine = '') { + getList(type, productionLine = '',filterItemCode="") { let that = this; uni.showLoading({ title: "加载中­....", @@ -194,6 +198,15 @@ value: productionLine }) } + + if(filterItemCode){ + // 物料代码 + filters.push({ + column: "itemCode", + action: "like", + value: filterItemCode + }) + } var params = { filters: filters, @@ -266,7 +279,7 @@ cancleJob(id) { cancleTakeProductionReceiptJob(id).then(res => { if (res.data) { - this.getList("refresh", this.productionLine) + this.getList('refresh', this.productionLine,this.filterItemCode) uni.showToast({ title: "放弃任务成功" }) @@ -281,13 +294,13 @@ switchChangeToday(state, creationTime) { this.checkedToday = state; this.todayTime = creationTime; - this.getList("refresh", this.productionLine); + this.getList('refresh', this.productionLine,this.filterItemCode) }, switchChangeWait(state, jobStatus) { this.checkedWaitTask = state; this.status = jobStatus; - this.getList("refresh"), this.productionLine; + this.getList('refresh', this.productionLine,this.filterItemCode) }, getScanNumber(code) { this.getDataListByType(code) @@ -405,6 +418,41 @@ this.showMessage(e.message) } }, + + getListByFilter(params) { + console.log('getListByFilter',params) + let that = this; + var filters = [] + if (this.checkedToday) { + filters.push({ + column: "create_time", + action: "betweeen", + value: this.todayTime + }) + } + + filters.push({ + column: "status", + action: "in", + value: this.status + }) + + + if (params.productionLineCode) { + // 生产线 + this.productionLine = params.productionLineCode + }else{ + this.productionLine = '' + } + if (params.itemCode) { + // 物料代码 + this.filterItemCode = params.itemCode + }else{ + this.filterItemCode = '' + } + + this.getList('refresh', this.productionLine, this.filterItemCode) + }, } } From edd078a40ff4906aebca6fb02ce9ab62462cce96 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 12 Aug 2024 08:48:58 +0800 Subject: [PATCH 07/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B2=A1=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E8=AF=B7=E6=B1=82=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/httpRequest3.js | 130 ++++++++++++++++++++++---------------- src/pages/login/index.vue | 4 +- 2 files changed, 79 insertions(+), 55 deletions(-) diff --git a/src/api/httpRequest3.js b/src/api/httpRequest3.js index 0b362130..30c879c4 100644 --- a/src/api/httpRequest3.js +++ b/src/api/httpRequest3.js @@ -1,10 +1,10 @@ - import storage from '../common/utils/storage' import { removeToken } from '@/common/utils/auth' - + function service(options = {}) { + var token = storage.getStorage(storage.constant.token) var tenantId = storage.getStorage('tenantId') // if(getApp()!=undefined){ @@ -16,63 +16,85 @@ function service(options = {}) { // } var requestUrl = "" requestUrl = import.meta.env.VITE_BASE_URL - + options.header = { "content-type": "application/json", - "Authorization": "Bearer "+token, - "dataType":"json", - "dataSource":"PDA", - "tenant-id":tenantId + "Authorization": "Bearer " + token, + "dataType": "json", + "dataSource": "PDA", + "tenant-id": tenantId }; options.timeout = 300000 - - options.url = requestUrl+options.url - + + options.url = requestUrl + options.url + return new Promise((resolve, reject) => { - options.success = (res) => { - if (res ) { - if(res.statusCode == 200){ - if(res.data.code==0){ - resolve(res.data); - }else { - if(res.data.code==401){ - uni.clearStorageSync() - uni.removeStorageSync('overPackageRecord') // 删除直接翻包中缓存的来源库位 - removeToken(); - uni.reLaunch({ - url: '/pages/login/index' - }) - } - reject("系统异常:"+res.data.msg) - console.log("系统异常",res.data.msg) - } - - }else { - reject("系统异常:"+ res.data.msg) - console.log("系统异常",res.data.msg) - } - + options.success = (res) => { + if (res) { + if (res.statusCode == 200) { + if (res.data.code == 0) { + resolve(res.data); } else { - reject("系统异常:"+res.data.msg) - console.log("系统异常",res.data.msg) - } - }; - options.fail = (error) => { - var message = error.errMsg - if (message === 'Network Error') { - message = '接口连接异常' - } else if (message.includes('timeout')) { - message = '接口请求超时' - } else if (message.includes('Request failed with status code')) { - message = '接口' + message.substr(message.length - 3) + '异常' + if (res.data.code == 401) { + uni.clearStorageSync() + uni.removeStorageSync('overPackageRecord') // 删除直接翻包中缓存的来源库位 + removeToken(); + uni.reLaunch({ + url: '/pages/login/index' + }) + } + reject("系统异常:" + res.data.msg) + console.log("系统异常", res.data.msg) } - reject("系统异常:"+message); - console.log("系统异常",message) - }; - uni.request(options); - }); - } - - - export default service; + } else { + reject("系统异常:" + res.data.msg) + console.log("系统异常", res.data.msg) + } + + } else { + reject("系统异常:" + res.data.msg) + console.log("系统异常", res.data.msg) + } + }; + options.fail = (error) => { + var message = error.errMsg + if (message === 'Network Error') { + message = '接口连接异常' + } else if (message.includes('timeout')) { + message = '接口请求超时' + } else if (message.includes('Request failed with status code')) { + message = '接口' + message.substr(message.length - 3) + '异常' + } + reject("系统异常:" + message); + console.log("系统异常", message) + }; + // #ifdef APP + uni.getNetworkType({ + success: function(res) { + const networkType = res.networkType; + console.log("网络类型", networkType) + if (networkType == "none") { + reject("当前无网络"); + } else { + uni.request(options); + } + } + }) + // #endif + // #ifdef H5 + console.log("网s络H5", navigator.onLine) + if(navigator.onLine){ + uni.request(options); + }else { + reject("当前无网络"); + } + // #endif + + + }); +} + + + +export default service; \ No newline at end of file diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 20a86f20..46030461 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -261,7 +261,9 @@ this.imageSrc = base64.replace(/[\r\n]/g, "") this.uuid = res.data.uuid } - }) + }).catch(error => { + this.showErrorMessage(error); + }) }, getAppVersion() { const systemInfo = uni.getSystemInfoSync(); From c1952deaf11cc9b7a3b412c5705487cdd61d05e5 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 12 Aug 2024 08:57:03 +0800 Subject: [PATCH 08/28] =?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 --- src/manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/manifest.json b/src/manifest.json index fedfa8f9..7a1fc122 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,10 +1,10 @@ { "name" : "wms", "package" : "uni.UNI43932FE", - "appid" : "__UNI__F36DDCF", + "appid" : "__UNI__C9CF4BF", "description" : "", - "versionName" : "1.0.54", - "versionCode" : 54, + "versionName" : "1.0.55", + "versionCode" : 55, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { From 16fa4a251681079fe53500f5d1d16f49005ebeda Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Mon, 12 Aug 2024 09:56:51 +0800 Subject: [PATCH 09/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E5=8C=85=E8=A3=85=E5=8F=B7=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/inventoryMove/coms/comMoveRecord.vue | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index 09a271e2..a0da6804 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -49,6 +49,10 @@ import comBlankView from '@/mycomponents/common/comBlankView.vue' import winScanLocation from "@/mycomponents/scan/winScanLocation.vue" import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue" + + import { + getInventoryStatusName + } from '@/common/directory.js'; import { inventoryMoveRecordSubmit, getBasicLocationByCode, @@ -278,11 +282,18 @@ } else { newDetail.toInventoryStatus = this.toInventoryStatus; } + + if (newDetail.packingNumber == '') { + newDetail.packingNumber = pack.number; + } newDetail.toLocationCode = this.toLocationCode; newDetail.fromLocationCode = result.fromLocationCode item.subList.push(newDetail); } else { - this.showErrorMessage(detail.packingNumber + "重复扫描") + this.showErrorMessage("包装["+detail.packingNumber+"]\n"+ + "批次["+detail.batch+"]\n"+"库位["+detail.fromLocationCode+"]\n"+ + "库存状态["+getInventoryStatusName(detail.toInventoryStatus)+"]\n" + + "重复扫描") } } calcHandleQty(this.detailSource); From ab395f1498ab7ce9d59ce94da2a1c1f5c40b87dc Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 12 Aug 2024 10:14:15 +0800 Subject: [PATCH 10/28] =?UTF-8?q?=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=A5=E6=BA=90=E5=BA=93=E5=8C=BA=E5=92=8C?= =?UTF-8?q?=E5=88=B0=E5=BA=93=E5=8C=BA=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/job/jobFilter.vue | 32 +++++++++++++++ src/pages/issue/job/issueJob.vue | 66 ++++++++++++++++++++++++------ 2 files changed, 85 insertions(+), 13 deletions(-) diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue index 0da05f0f..4dcd4b84 100644 --- a/src/mycomponents/job/jobFilter.vue +++ b/src/mycomponents/job/jobFilter.vue @@ -46,6 +46,22 @@ + + + 来源库区 + + + + + + 到库区 + + + - + @@ -73,10 +77,10 @@ type: Boolean, default: true }, - boxFocus: { - type: Boolean, - default: true - }, + // boxFocus: { + // type: Boolean, + // default: true + // }, isShowHistory: { type: Boolean, default: true @@ -100,41 +104,7 @@ } }, mounted() { - this.boxfocus =true; - // uni.hideKeyboard(); - - // #ifdef H5 - // if (document.querySelector('textarea') != null) { - // document.querySelector('textarea').setAttribute('inputmode', 'none') - // } - // #endif - // this.hide() - // #ifdef APP-PLUS - // - // this.hide() - // uni.onKeyboardHeightChange(res => { - // console.log(res.height) - // if(res.height>0){ - // // uni.hideKeyboard(); - // plus.key.hideSoftKeybord(); - // } - // }) - // - // uni.onWindowResize((res) => { - // plus.key.hideSoftKeybord() - // }) - // plus.key.hideSoftKeybord(); - // setInterval(function(){ - // plus.key.hideSoftKeybord(); - // // uni.hideKeyboard();//隐藏软键盘 - // // plus.key.hideSoftKeybord(); - // },60); - // #endif - - // if (this.$el.querySelector('textarea') != null) { - // this.$el.querySelector('textarea').setAttribute('inputmode', 'none') - // } }, watch: { placeholder() { @@ -169,6 +139,7 @@ }, clearScanValue() { this.scanMsg = '' + this.cursorIndex =0 this.getfocus(); }, clickScanMsg() { @@ -186,10 +157,10 @@ if (index >= 0) { // that.scanMsg = 'HPQ;V1.0;ICE115F11161AG;PP20230427000027;B20230427002;Q50'; setTimeout(() => { - that.losefocus(); + that.losefocus(); let content = uni.$u.trim(that.scanMsg) if (content == "") { - that.getfocus(); + // that.getfocus(); this.$refs.comMessage.showErrorMessage("扫描内容为空,请重新扫描", res => { if (res) { that.scanMsg = "" @@ -212,6 +183,7 @@ that.$emit("getResult", scanResult); } else { that.clear(); + that.losefocus(); this.$refs.comMessage.showErrorMessage(scanResult.message, res => { if (res) { that.getfocus(); @@ -222,20 +194,25 @@ }, 500); } }, + + handleFocus(){ + }, + + handleBlur(){ + // setTimeout(res=>{ + // uni.hideKeyboard(); + // },200) + }, getfocus() { let that = this; this.$nextTick(r => { - console.log("获取焦点") that.boxfocus = true; }); - // this.hide() }, losefocus() { let that = this; this.$nextTick(r => { - console.log("失去焦点") that.boxfocus = false; - uni.hideKeyboard(); }); }, clear() { @@ -289,7 +266,7 @@ diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue index eeb54da6..148baaf9 100644 --- a/src/mycomponents/scan/winComScanBalance.vue +++ b/src/mycomponents/scan/winComScanBalance.vue @@ -118,6 +118,9 @@ this.toLocationAreaTypeList = getDirectoryItemArray(businessType.inAreaTypes) this.itemTypesList = getDirectoryItemArray(businessType.itemTypes) this.$refs.popup.open('bottom') + setTimeout(res=>{ + this.getfocus() + },500) }, getScanResult(result) { diff --git a/src/mycomponents/scan/winComScanBalanceLocation.vue b/src/mycomponents/scan/winComScanBalanceLocation.vue index 188bd60e..0dfdc271 100644 --- a/src/mycomponents/scan/winComScanBalanceLocation.vue +++ b/src/mycomponents/scan/winComScanBalanceLocation.vue @@ -145,28 +145,31 @@ this.fromLocationAreaTypeList = getDirectoryItemArray(businessType.outAreaTypes) this.itemTypesList = getDirectoryItemArray(businessType.itemTypes) this.$refs.popup.open('bottom') + setTimeout(res=>{ + this.packGetFocus() + },500) }, openScanPopupForJob(fromLocationCode, fromLocationList, jobContent){ this.fromLocationCode = fromLocationCode; this.fromLocationList = fromLocationList; - if (fromLocationCode != '') { - this.packGetFocus(); - } else { - if (this.fromLocationList.length == 0) { - this.locationGetFocus(); - } else { - this.fromLocationCode = this.fromLocationList[0]; - } - } - - setTimeout(res => { - this.$refs.popup.open('bottom') - }, 500) this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses) this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态 this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态 + this.$refs.popup.open('bottom') + setTimeout(res => { + if (this.fromLocationCode != '') { + this.packGetFocus(); + } else { + if (this.fromLocationList.length == 0) { + this.locationGetFocus(); + } else { + this.fromLocationCode = this.fromLocationList[0]; + this.packGetFocus(); + } + } + }, 500) }, //模拟扫描 @@ -294,6 +297,7 @@ }) }, showErrorMessage(message) { + this.packLoseFocus(); this.$refs.comMessage.showErrorMessage(message, res => { if (res) { if(this.$refs.comscan){ diff --git a/src/mycomponents/scan/winComScanFg.vue b/src/mycomponents/scan/winComScanFg.vue index 531c5a36..b8772969 100644 --- a/src/mycomponents/scan/winComScanFg.vue +++ b/src/mycomponents/scan/winComScanFg.vue @@ -6,12 +6,14 @@ + style="margin-left: 5px;width: 90%;" + :focus="boxfocus" :placeholder="placeholderValue" + @focus="handleFocus" + @input="handelScanMsg" :cursor="cursorIndex"> - + @@ -103,13 +105,11 @@ } }, mounted() { - this.boxfocus = true; - // uni.hideKeyboard(); // #ifdef H5 - if (document.querySelector('textarea') != null) { - document.querySelector('textarea').setAttribute('inputmode', 'none') - } + // if (document.querySelector('textarea') != null) { + // document.querySelector('textarea').setAttribute('inputmode', 'none') + // } // #endif // this.hide() // #ifdef APP-PLUS @@ -125,20 +125,6 @@ this.placeholderValue = '请扫描' + this.placeholder; }, methods: { - - hide() { - // #ifdef APP-PLUS - // 只是解决软键盘的闪现 - var interval = setInterval(function() { - uni.hideKeyboard(); //隐藏软键盘 - console.log('刷新') - }, 5); - setTimeout(() => { - clearInterval(interval); - console.log('停止刷新') - }, 1000); - // #endif - }, setItemCodeSimulate(itemCode, scanMsg) { this.itemCode = itemCode; this.scanMsg = scanMsg; @@ -154,6 +140,7 @@ this.scanMsg = val }, clearScanValue() { + this.cursorIndex=0, this.scanMsg = '' this.getfocus(); }, @@ -171,7 +158,6 @@ let content = uni.$u.trim(that.scanMsg) // let content = that.scanMsg; if (content == "") { - that.getfocus(); this.$refs.comMessage.showErrorMessage("扫描内容为空,请重新扫描", res => { if (res) { that.scanMsg = "" @@ -235,6 +221,7 @@ that.$emit("getResult", scanResult); } } catch (error) { + that.losefocus(); this.$refs.comMessage.showErrorMessage(error.message, res => { if (res) { that.getfocus(); @@ -243,6 +230,7 @@ } }).catch(error => { + that.losefocus(); this.$refs.comMessage.showErrorMessage(error, res => { if (res) { that.scanMsg = "" @@ -268,6 +256,11 @@ that.boxfocus = false; }); }, + // handleBlur(){ + // setTimeout(res=>{ + // uni.hideKeyboard(); + // },200) + // }, clear() { this.cursorIndex = 0; this.scanMsg = '' diff --git a/src/mycomponents/scan/winScanAsnNumber.vue b/src/mycomponents/scan/winScanAsnNumber.vue index 100a1c68..02ac8ca5 100644 --- a/src/mycomponents/scan/winScanAsnNumber.vue +++ b/src/mycomponents/scan/winScanAsnNumber.vue @@ -55,8 +55,9 @@ }, methods: { openScanPopup() { + this.$refs.popup.open('bottom') setTimeout(res => { - this.$refs.popup.open('bottom') + this.getfocus('bottom') }, 500) }, closeScanPopup() { diff --git a/src/mycomponents/scan/winScanContainer.vue b/src/mycomponents/scan/winScanContainer.vue index d7323344..5ec28c5c 100644 --- a/src/mycomponents/scan/winScanContainer.vue +++ b/src/mycomponents/scan/winScanContainer.vue @@ -54,8 +54,9 @@ }, methods: { openScanPopup() { + this.$refs.popup.open('bottom') setTimeout(res => { - this.$refs.popup.open('bottom') + this.getfocus() }, 500) }, closeScanPopup() { diff --git a/src/mycomponents/scan/winScanFgLabel.vue b/src/mycomponents/scan/winScanFgLabel.vue index 552d3b0e..8d953201 100644 --- a/src/mycomponents/scan/winScanFgLabel.vue +++ b/src/mycomponents/scan/winScanFgLabel.vue @@ -60,13 +60,13 @@ this.$refs.comscansimulate.clickScanMsg(); }, openScanPopup(itemCode) { + this.$refs.popup.open('bottom') setTimeout(res => { - this.$refs.popup.open('bottom') setTimeout(re=>{ this.$refs.comscan.setItemCode(itemCode) },500) - - }, 200) + this.getfocus() + }, 500) }, closeScanPopup() { @@ -91,13 +91,13 @@ }, getfocus() { - if (this.$refs.comscan != undefined) { + if (this.$refs.comscan ) { this.$refs.comscan.getfocus(); } }, losefocus() { - if (this.$refs.comscan != undefined) { + if (this.$refs.comscan ) { this.$refs.comscan.losefocus(); } }, diff --git a/src/mycomponents/scan/winScanItem.vue b/src/mycomponents/scan/winScanItem.vue index aee8b8d7..9b2a6abd 100644 --- a/src/mycomponents/scan/winScanItem.vue +++ b/src/mycomponents/scan/winScanItem.vue @@ -76,8 +76,10 @@ }, methods: { openScanPopup() { + this.$refs.popup.open('bottom') + var that =this; setTimeout(res => { - this.$refs.popup.open('bottom') + that.getfocus() }, 500) }, closeScanPopup() { diff --git a/src/mycomponents/scan/winScanJobNumber.vue b/src/mycomponents/scan/winScanJobNumber.vue index e12dfbfe..5f7355f2 100644 --- a/src/mycomponents/scan/winScanJobNumber.vue +++ b/src/mycomponents/scan/winScanJobNumber.vue @@ -61,8 +61,9 @@ }, methods: { openScanPopup() { + this.$refs.popup.open('bottom') setTimeout(res => { - this.$refs.popup.open('bottom') + this.getfocus() }, 500) }, closeScanPopup() { @@ -72,7 +73,7 @@ this.$refs.popup.close() }, getfocus() { - if (this.isShow) { + if (this.$refs.scan) { this.$refs.scan.getfocus() } }, diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue index 70f3aeea..0f4c0144 100644 --- a/src/mycomponents/scan/winScanLocation.vue +++ b/src/mycomponents/scan/winScanLocation.vue @@ -65,8 +65,9 @@ }, methods: { openScanPopup() { + this.$refs.popup.open('bottom') setTimeout(res => { - this.$refs.popup.open('bottom') + this.getfocus() }, 500) }, openScanPopupSimulate(location) { diff --git a/src/mycomponents/scan/winScanPack.vue b/src/mycomponents/scan/winScanPack.vue index 4fa855f5..7da05b49 100644 --- a/src/mycomponents/scan/winScanPack.vue +++ b/src/mycomponents/scan/winScanPack.vue @@ -70,9 +70,10 @@ }) }, openScanPopup() { + this.$refs.popup.open('bottom') setTimeout(res => { - this.$refs.popup.open('bottom') - }, 200) + this.getfocus() + }, 500) }, closeScanPopup() { @@ -103,13 +104,13 @@ }, getfocus() { - if (this.$refs.comscan != undefined) { + if (this.$refs.comscan) { this.$refs.comscan.getfocus(); } }, losefocus() { - if (this.$refs.comscan != undefined) { + if (this.$refs.comscan) { this.$refs.comscan.losefocus(); } }, diff --git a/src/mycomponents/scan/winScanPackAndCont.vue b/src/mycomponents/scan/winScanPackAndCont.vue index e71b2eaf..01941270 100644 --- a/src/mycomponents/scan/winScanPackAndCont.vue +++ b/src/mycomponents/scan/winScanPackAndCont.vue @@ -61,8 +61,9 @@ }, methods: { openScanPopup() { + this.$refs.popup.open('bottom') setTimeout(res => { - this.$refs.popup.open('bottom') + this.getfocus() }, 500) }, diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue index 91c712b1..e958c8d4 100644 --- a/src/mycomponents/scan/winScanPackAndLocation.vue +++ b/src/mycomponents/scan/winScanPackAndLocation.vue @@ -152,43 +152,44 @@ }, //直接扫描 openScanPopupForType(fromLocationCode, businessType) { - this.businessType = businessType; this.fromLocationCode = fromLocationCode; - if (fromLocationCode != '') { - this.packGetFocus(); - } else { - this.locationGetFocus(); - } + this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses) this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态 this.fromLocationAreaTypeList = getDirectoryItemArray(this.businessType.outAreaTypes); //出库库区 - if (!this.show) { - setTimeout(res => { - this.$refs.popup.open('bottom') - }, 500) - } + this.$refs.popup.open('bottom') + setTimeout(res => { + if (fromLocationCode != '') { + this.packGetFocus(); + } else { + this.locationGetFocus(); + } + }, 500) }, //在任务中扫描 openScanPopupForJob(fromLocationCode, fromLocationList, jobContent) { this.fromLocationCode = fromLocationCode; this.fromLocationList = fromLocationList; - if (fromLocationCode != '') { - this.packGetFocus(); - } else { - if (this.fromLocationList.length == 0) { - this.locationGetFocus(); - } else { - this.fromLocationCode = this.fromLocationList[0]; - } - } - setTimeout(res => { - this.$refs.popup.open('bottom') - }, 500) this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses) this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态 this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态 + this.$refs.popup.open('bottom') + + setTimeout(res => { + if (this.fromLocationCode != '') { + this.packGetFocus(); + } else { + if (this.fromLocationList.length == 0) { + this.locationGetFocus(); + } else { + this.fromLocationCode = this.fromLocationList[0]; + this.packGetFocus(); + } + } + }, 500) + }, //模拟扫描 openScanPopupForJobSimulate(fromLocationCode, fromLocationList, jobContent, scanMessage) { @@ -417,7 +418,7 @@ balance: datas, fromLocationCode: this.fromLocationCode, } - this.packGetFocus(); + // this.packGetFocus(); this.$emit("getResult", data); this.$emit("getCountScanResult", data); }, @@ -433,18 +434,18 @@ balance: item, fromLocationCode: this.fromLocationCode, } - this.packGetFocus(); + // this.packGetFocus(); this.$emit("getResult", data); }, packGetFocus() { - if (this.$refs.comscan != undefined) { + if (this.$refs.comscan) { this.$refs.comscan.getfocus(); } }, packLoseFocus() { - if (this.$refs.comscan != undefined) { + if (this.$refs.comscan) { this.$refs.comscan.losefocus(); } }, diff --git a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue index f43c2bb1..c1f8c477 100644 --- a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue +++ b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue @@ -131,16 +131,16 @@ openScanPopupForType(fromLocationCode, businessType) { this.businessType = businessType; this.fromLocationCode = fromLocationCode; - if (fromLocationCode != '') { - this.packGetFocus(); - } else { - this.locationGetFocus(); - } this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses) this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态 this.fromLocationTypeArray = getDirectoryItemArray(this.businessType.outLocationTypes); //出库库存状态 + this.$refs.popup.open('bottom') setTimeout(res => { - this.$refs.popup.open('bottom') + if (fromLocationCode != '') { + this.packGetFocus(); + } else { + this.locationGetFocus(); + } }, 500) }, @@ -148,21 +148,23 @@ openScanPopupForJob(fromLocationCode, fromLocationList, jobContent) { this.fromLocationCode = fromLocationCode; this.fromLocationList = fromLocationList; - if (fromLocationCode != '') { - this.packGetFocus(); - } else { - if (this.fromLocationList.length == 0) { - this.locationGetFocus(); - } else { - this.fromLocationCode = this.fromLocationList[0]; - } - } - setTimeout(res => { - this.$refs.popup.open('bottom') - }, 500) + this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses) this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态 this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态 + this.$refs.popup.open('bottom') + setTimeout(res => { + if (fromLocationCode != '') { + this.packGetFocus(); + } else { + if (this.fromLocationList.length == 0) { + this.locationGetFocus(); + } else { + this.fromLocationCode = this.fromLocationList[0]; + this.packGetFocus(); + } + } + }, 500) }, closeScanPopup(content) { diff --git a/src/mycomponents/scan/winScanPackAndPosition.vue b/src/mycomponents/scan/winScanPackAndPosition.vue index 1ee6edc6..266ba324 100644 --- a/src/mycomponents/scan/winScanPackAndPosition.vue +++ b/src/mycomponents/scan/winScanPackAndPosition.vue @@ -105,23 +105,23 @@ this.showErrorMessage(error) }) } - + this.$refs.popup.open('bottom') setTimeout(res => { - this.$refs.popup.open('bottom') + this.getfocus() }, 500) }, - - initData(){ + + initData() { this.positionInfo = "请选择位置"; this.positionList = []; this.productionLineCode = ''; this.rawLocationCode = ""; this.fgLocationCode = ""; this.workshopCode = ""; - this.workStationCode =""; + this.workStationCode = ""; this.workShopName = ""; - this.productionLineName=""; - this.workStationName=""; + this.productionLineName = ""; + this.workStationName = ""; this.show = false; this.isEditPosition = true }, @@ -223,4 +223,4 @@ height: auto; max-height: 300rpx; } - + \ No newline at end of file diff --git a/src/mycomponents/scan/winScanPackJob.vue b/src/mycomponents/scan/winScanPackJob.vue index eb53f519..c9db3744 100644 --- a/src/mycomponents/scan/winScanPackJob.vue +++ b/src/mycomponents/scan/winScanPackJob.vue @@ -71,6 +71,9 @@ // 弹出 openScanPopup(){ this.$refs.popup.open('bottom') + setTimeout(res=>{ + this.packGetFocus() + },500) }, // 关闭 closeScanPopup(content) { @@ -83,13 +86,13 @@ this.$emit("getResult", result); }, packGetFocus() { - if (this.$refs.comscan != undefined) { + if (this.$refs.comscan) { this.$refs.comscan.getfocus(); } }, packLoseFocus() { - if (this.$refs.comscan != undefined) { + if (this.$refs.comscan) { this.$refs.comscan.losefocus(); } }, diff --git a/src/mycomponents/scan/winScanPackLevel.vue b/src/mycomponents/scan/winScanPackLevel.vue index 6c78f008..07dd2bcd 100644 --- a/src/mycomponents/scan/winScanPackLevel.vue +++ b/src/mycomponents/scan/winScanPackLevel.vue @@ -96,9 +96,10 @@ }) }, openScanPopup() { + this.$refs.popup.open('bottom') setTimeout(res => { - this.$refs.popup.open('bottom') - }, 200) + this.getfocus(); + }, 500) }, closeScanPopup() { @@ -130,13 +131,13 @@ }, getfocus() { - if (this.$refs.comscan != undefined) { + if (this.$refs.comscan) { this.$refs.comscan.getfocus(); } }, losefocus() { - if (this.$refs.comscan != undefined) { + if (this.$refs.comscan) { this.$refs.comscan.losefocus(); } }, diff --git a/src/mycomponents/scan/winScanPackage.vue b/src/mycomponents/scan/winScanPackage.vue index ffb26638..e751e5f4 100644 --- a/src/mycomponents/scan/winScanPackage.vue +++ b/src/mycomponents/scan/winScanPackage.vue @@ -67,18 +67,19 @@ this.$refs.comscansimulate.clickScanMsg(); }, openScanPopup() { + this.$refs.popup.open('bottom') setTimeout(res => { - this.$refs.popup.open('bottom') - }, 200) + this.getfocus() + }, 500) }, openScanPopupByBusinessType(businessType) { + this.$refs.popup.open('bottom') setTimeout(res => { - this.$refs.popup.open('bottom') + this.getfocus() this.businessType = businessType; - - }, 200) + }, 500) }, @@ -223,13 +224,13 @@ }, getfocus() { - if (this.$refs.comscan != undefined) { + if (this.$refs.comscan) { this.$refs.comscan.getfocus(); } }, losefocus() { - if (this.$refs.comscan != undefined) { + if (this.$refs.comscan ) { this.$refs.comscan.losefocus(); } }, @@ -240,9 +241,10 @@ this.show = e.show }, showErrorMessage(message) { + this.losefocus() this.$refs.comMessage.showErrorMessage(message, res => { if (res) { - + this.getfocus(); } }); }, diff --git a/src/pages.json b/src/pages.json index 265152ee..b697869a 100644 --- a/src/pages.json +++ b/src/pages.json @@ -2297,7 +2297,8 @@ // "fontSize": "58rpx" // }] // }, - "softinputMode": "adjustPan" //adjustResize + //手机软键盘升起不让其将页面头部上推 + "softinputMode": "adjustResize" //adjustResize }, "tabBar": { "color": "#000000", diff --git a/src/pages/count/job/fuzzyCountDetail.vue b/src/pages/count/job/fuzzyCountDetail.vue index addbf80e..ad1a4642 100644 --- a/src/pages/count/job/fuzzyCountDetail.vue +++ b/src/pages/count/job/fuzzyCountDetail.vue @@ -433,10 +433,12 @@ }, remove(item, index) { + this.scanPopupLoseFocus(); this.showQuestionMessage("是否要移除扫描信息?", res => { if (res) { this.detailSource.splice(index, 1) } + this.scanPopupGetFocus(); }); }, @@ -489,6 +491,7 @@ showMessage(message) { + this.scanPopupLoseFocus(); this.$refs.comMessage.showMessage(message, res => { if (res) { this.afterCloseMessage() @@ -496,6 +499,7 @@ }); }, showErrorMessage(message) { + this.scanPopupLoseFocus(); this.$refs.comMessage.showErrorMessage(message, res => { if (res) { this.afterCloseMessage() diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue index 5592f322..27c5ce1c 100644 --- a/src/pages/deliver/coms/comScanDeliverPack.vue +++ b/src/pages/deliver/coms/comScanDeliverPack.vue @@ -184,8 +184,9 @@ this.initData(); this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode + "-" + this.jobContent.subList[0].workStationCode + this.$refs.popup.open('bottom') setTimeout(res => { - this.$refs.popup.open('bottom') + this.getfocus(); }, 500) }, diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index a0da6804..8c38f935 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -300,6 +300,9 @@ }, showErrorMessage(message) { + if(this.$refs.scanPopup){ + this.$refs.scanPopup.packLoseFocus() + } this.$refs.comMessage.showErrorMessage(message, res => { if (res) { diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index 3f266f6b..67204f8a 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -213,8 +213,9 @@ this.initData(); // this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode + // "-" + this.jobContent.subList[0].workStationCode + this.$refs.popup.open('bottom') setTimeout(res => { - this.$refs.popup.open('bottom') + this.getfocus(); }, 500) }, @@ -315,7 +316,10 @@ "状态 [" + status + "] \n" + "库区 [" + areaType + "] \n" + "未查找到库存余额" - this.showErrorMessage(hint) + this.showErrorMessage(hint, + res => { + that.getfocus(); + }) } else if (res.data.length == 1) { result.balance = res.data[0] @@ -332,11 +336,16 @@ uni.hideLoading() }).catch(error => { uni.hideLoading() - this.showErrorMessage(error) + this.showErrorMessage(error, + res => { + that.getfocus(); + }) }) } } catch (e) { - this.showErrorMessage(e.stack) + this.showErrorMessage(e.stack,res => { + that.getfocus(); + }) uni.hideLoading(); } }, diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue index 541e4808..2bfd64cd 100644 --- a/src/pages/issue/job/issueDetail.vue +++ b/src/pages/issue/job/issueDetail.vue @@ -481,6 +481,8 @@ '】不一致，是否继续提交', res => { if (res) { this.submit(); + }else { + this.scanPopupGetFocus() } }); } @@ -489,8 +491,8 @@ }, scanPopupGetFocus() { - if (this.$refs.scanPopup != undefined) { - this.$refs.scanPopup.getfocus(); + if (this.$refs.comScanIssuePack) { + this.$refs.comScanIssuePack.getfocus(); } }, diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue index 2a784cbe..7d44bfd7 100644 --- a/src/pages/issue/record/directIssue.vue +++ b/src/pages/issue/record/directIssue.vue @@ -256,8 +256,13 @@ }, showErrorMessage(message) { + if (this.$refs.scanPopup) { + this.$refs.scanPopup.losefocus(); + } this.$refs.comMessage.showErrorMessage(message, res => { - if (res) {} + if (res) { + this.scanPopupGetFocus() + } }); }, diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue index 33ad2b6c..d0b0d057 100644 --- a/src/pages/issue/request/issueScanRequest.vue +++ b/src/pages/issue/request/issueScanRequest.vue @@ -151,6 +151,9 @@ this.$refs.scanPopup.closeScanPopup(); }, showErrorMessage(message) { + if (this.$refs.scanPopup) { + this.$refs.scanPopup.losefocus(); + } this.$refs.comMessage.showErrorMessage(message, res => { if (res) { this.scanPopupGetFocus() @@ -158,7 +161,7 @@ }); }, scanPopupGetFocus() { - if (this.$refs.scanPopup != undefined) { + if (this.$refs.scanPopup) { this.$refs.scanPopup.getfocus(); } }, diff --git a/src/pages/package/coms/comScanPackagePack.vue b/src/pages/package/coms/comScanPackagePack.vue index d6b8b098..34278165 100644 --- a/src/pages/package/coms/comScanPackagePack.vue +++ b/src/pages/package/coms/comScanPackagePack.vue @@ -171,6 +171,7 @@ import { getDirectoryItemArray } from '@/common/directory'; let lot = result.label.batch; let item = that.toLocation.Items.find(r => r.itemCode == itemCode); if (item == undefined) { + this.packLoseFocus() that.showErrorMessage('未查找到物料【' + itemCode + '】的翻包明细', res => { that.packGetFocus(); diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue index b901b688..25541856 100644 --- a/src/pages/productPutaway/job/productPutawayJob.vue +++ b/src/pages/productPutaway/job/productPutawayJob.vue @@ -357,8 +357,14 @@ }, showMessage(message) { + if(this.$refs.scanPopup){ + this.$refs.scanPopup.packLoseFocus() + } this.$refs.comMessage.showErrorMessage(message, res => { if (res) { + if(this.$refs.scanPopup){ + this.$refs.scanPopup.packLoseFocus() + } } }); diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue index bb40a81b..1c98771d 100644 --- a/src/pages/productPutaway/record/productPutawayRecord.vue +++ b/src/pages/productPutaway/record/productPutawayRecord.vue @@ -232,7 +232,10 @@ }, showErrorMessage(message) { - this.$refs.comMessage.showErrorMessage(message, res => {}); + this.scanPopupLoseFocus(); + this.$refs.comMessage.showErrorMessage(message, res => { + this.scanPopupGetFocus(); + }); }, calcHandleQty() { calcHandleQty(this.detailSource); @@ -274,6 +277,12 @@ this.$refs.scanPopup.getfocus(); } }, + + scanPopupLoseFocus() { + if (this.$refs.scanPopup != undefined) { + this.$refs.scanPopup.losefocus(); + } + }, scanLocationCode(location, code) { this.toLocationCode = code diff --git a/src/pages/productReceipt/job/ccProductReceiptJob.vue b/src/pages/productReceipt/job/ccProductReceiptJob.vue index e79c2565..a9e11e68 100644 --- a/src/pages/productReceipt/job/ccProductReceiptJob.vue +++ b/src/pages/productReceipt/job/ccProductReceiptJob.vue @@ -322,9 +322,14 @@ }, showMessage(message) { + if(this.$refs.scanPopup){ + this.$refs.scanPopup.packLoseFocus() + } this.$refs.comMessage.showErrorMessage(message, res => { if (res) { - + if(this.$refs.scanPopup){ + this.$refs.scanPopup.packGetFocus() + } } }); }, diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue index 3bf276b4..baf01cda 100644 --- a/src/pages/productReceipt/job/productReceiptJob.vue +++ b/src/pages/productReceipt/job/productReceiptJob.vue @@ -312,9 +312,14 @@ }, showMessage(message) { + if(this.$refs.scanPopup){ + this.$refs.scanPopup.packLoseFocus() + } this.$refs.comMessage.showErrorMessage(message, res => { if (res) { - + if(this.$refs.scanPopup){ + this.$refs.scanPopup.packGetFocus() + } } }); }, diff --git a/src/pages/productRecycle/job/productRecycleJobDetail.vue b/src/pages/productRecycle/job/productRecycleJobDetail.vue index a6530486..8908d9fa 100644 --- a/src/pages/productRecycle/job/productRecycleJobDetail.vue +++ b/src/pages/productRecycle/job/productRecycleJobDetail.vue @@ -442,6 +442,7 @@ }, showMessage(message) { + this.scanPopupLoseFocus(); this.$refs.comMessage.showMessage(message, res => { if (res) { this.scanPopupGetFocus() @@ -450,6 +451,7 @@ }, showErrorMessage(message) { + this.scanPopupLoseFocus(); this.$refs.comMessage.showErrorMessage(message, res => { if (res) { this.scanPopupGetFocus() @@ -463,6 +465,8 @@ this.$refs.comMessage.showQuestionMessage(message, res => { if (res) { callback(res); + }else { + this.scanPopupGetFocus() } }); }) diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue index c529f434..c92ec8f5 100644 --- a/src/pages/productionReceipt/job/productionReceiptJob.vue +++ b/src/pages/productionReceipt/job/productionReceiptJob.vue @@ -347,9 +347,14 @@ }, showMessage(message) { + if(this.$refs.scanPopup){ + this.$refs.scanPopup.packLoseFocus() + } this.$refs.comMessage.showErrorMessage(message, res => { if (res) { - + if(this.$refs.scanPopup){ + this.$refs.scanPopup.packGetFocus() + } } }); }, diff --git a/src/pages/productionReturn/coms/comScanReturnPack.vue b/src/pages/productionReturn/coms/comScanReturnPack.vue index 290b934d..69862044 100644 --- a/src/pages/productionReturn/coms/comScanReturnPack.vue +++ b/src/pages/productionReturn/coms/comScanReturnPack.vue @@ -159,8 +159,6 @@ this.scanOptions = getDetailEditRemoveOption(); }, methods: { - - openScanPopup(content, jobcontent) { this.issueRecord = []; this.dataContent = content; @@ -168,8 +166,9 @@ this.initData(); // this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode + // "-" + this.jobContent.subList[0].workStationCode + this.$refs.popup.open('bottom') setTimeout(res => { - this.$refs.popup.open('bottom') + that.getfocus(); }, 500) }, diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index ba9aa9c6..fa506e5a 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -373,7 +373,7 @@ }) if (itemDetail.scaned && scanedLength == itemDetail .packList.length) { - isExit.scanDate = new Date(); + itemDetail.scanDate = new Date(); this.showMessage("箱码【" + packingNumber + "】已经扫描") } else { itemDetail.scaned = true; @@ -712,6 +712,9 @@ showMessage(message) { + if(this.$refs.scanPopup){ + this.$refs.scanPopup.losefocus(); + } setTimeout(r => { this.$refs.comMessage.showMessage(message, res => { if (res) { @@ -722,6 +725,9 @@ }, showErrorMessage(message) { + if(this.$refs.scanPopup){ + this.$refs.scanPopup.losefocus(); + } setTimeout(r => { this.$refs.comMessage.showErrorMessage(message, res => { if (res) { diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue index 4a43391a..3f610ed2 100644 --- a/src/pages/purchaseReceipt/job/receiptJob.vue +++ b/src/pages/purchaseReceipt/job/receiptJob.vue @@ -20,7 +20,7 @@ - + @@ -78,7 +78,7 @@ status: '1,2', //待处理 、进行中 detailOptions: [], detailGiveupOptions: [], - scanMessage:"" + scanMessage: "" }; }, @@ -95,7 +95,7 @@ scanTitle: { type: String, default: '箱标签' - }, + }, title: { type: String, default: '' @@ -185,11 +185,11 @@ column: "status", action: "in", value: this.status - }) - filters.push({ - column: "accept_user_id", - action: "==", - value: this.$store.state.user.id + }) + filters.push({ + column: "accept_user_id", + action: "==", + value: this.$store.state.user.id }) var params = { @@ -205,7 +205,7 @@ var list = res.data.list; this.totalCount = res.data.total - updateTitle(this.title+"(" + this.totalCount + ")"); + updateTitle(this.title + "(" + this.totalCount + ")"); this.loadingType = "loadmore"; if (list == null || list.length == 0) { this.loadingType = "nomore"; @@ -292,7 +292,7 @@ url: './receiptDetail?id=' + item.masterId + '&status=' + item.status + '&operation=' + this .operation + '&scanMessage=' + scanMessage }); - this.scanMessage="" + this.scanMessage = "" }, showItemList(itemList) { @@ -350,12 +350,14 @@ }, showMessage(message) { + if (this.$refs.scanPopup) { + this.$refs.scanPopup.packLoseFocus() + } this.$refs.comMessage.showErrorMessage(message, res => { if (res) { - - if(this.$refs.scanPopup){ - this.$refs.scanPopup.packGetFocus() - } + if (this.$refs.scanPopup) { + this.$refs.scanPopup.packGetFocus() + } } }); @@ -363,20 +365,20 @@ openScanPopup() { this.$refs.scanPopup.openScanPopup(); }, - selectItem(item,isScanedASN=false) { - - this.$refs.scanPopup.closeScanPopup(); - if(isScanedASN){ - this.openJobDetail(item) - }else{ - this.openJobDetail(item, this.scanMessage); + selectItem(item, isScanedASN = false) { + + this.$refs.scanPopup.closeScanPopup(); + if (isScanedASN) { + this.openJobDetail(item) + } else { + this.openJobDetail(item, this.scanMessage); } - + }, - getScanResult(result) { + getScanResult(result) { try { - this.scanMessage="" + this.scanMessage = "" let filters = [] if (result.label.barType == "BarCode") { // ASN单号 @@ -384,17 +386,17 @@ column: "asn_number", action: "==", value: result.label.code - },{ - column: "status", - action: "in", - value: '1,2', + }, { + column: "status", + action: "in", + value: '1,2', }] } else { filters = [{ - column: "packingNumber", - action: "in", - value: result.package.number + "," + result.package.parentNumber - }, + column: "packingNumber", + action: "in", + value: result.package.number + "," + result.package.parentNumber + }, { column: "batch", action: "==", @@ -409,11 +411,11 @@ column: "itemCode", action: "==", value: result.label.itemCode - }, - { - column: "status", - action: "in", - value: '1,2', + }, + { + column: "status", + action: "in", + value: '1,2', }, { column: "accept_user_id", @@ -432,7 +434,7 @@ pageNo: 1, pageSize: 100, }).then(res => { - this.scanMessage =result.scanMessage + this.scanMessage = result.scanMessage let resultList = res.data.list; if (resultList.length > 0) { resultList.forEach(item => { @@ -448,15 +450,15 @@ console.log('list', list) if (list.length > 1) { - this.$refs.jobList.openList(list,result.scanMessage.indexOf('ASN')>-1) + this.$refs.jobList.openList(list, result.scanMessage.indexOf('ASN') > -1) } else { - this.selectItem(list[0],result.scanMessage.indexOf('ASN')>-1) + this.selectItem(list[0], result.scanMessage.indexOf('ASN') > -1) } } else { - this.showMessage("未查找到任务\n"+"扫描["+result.scanMessage+"]") + this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]") } }).catch(error => { - this.showMessage(error+"\n扫描["+result.scanMessage+"]") + this.showMessage(error + "\n扫描[" + result.scanMessage + "]") }) } catch (e) { diff --git a/src/pages/purchaseReturn/job/returnDetail.vue b/src/pages/purchaseReturn/job/returnDetail.vue index 09cb8434..11708552 100644 --- a/src/pages/purchaseReturn/job/returnDetail.vue +++ b/src/pages/purchaseReturn/job/returnDetail.vue @@ -458,15 +458,21 @@ }, closeScanPopup() { - this.$refs.scanPopup.closeScanPopup(); + if(this.$refs.scanPopup){ + this.$refs.scanPopup.closeScanPopup(); + } }, scanPopupGetFocus() { - this.$refs.scanPopup.packGetFocus(); + if(this.$refs.scanPopup){ + this.$refs.scanPopup.packGetFocus(); + } }, scanPopupLoseFocus() { - this.$refs.scanPopup.packLoseFocus(); + if(this.$refs.scanPopup){ + this.$refs.scanPopup.packLoseFocus(); + } }, openDetail(item) { @@ -474,6 +480,7 @@ }, showMessage(message) { + this.scanPopupLoseFocus(); this.$refs.comMessage.showMessage(message, res => { if (res) { this.scanPopupGetFocus() @@ -482,6 +489,7 @@ }, showErrorMessage(message) { + this.scanPopupLoseFocus(); this.$refs.comMessage.showErrorMessage(message, res => { if (res) { this.scanPopupGetFocus() diff --git a/src/pages/purchaseReturn/record/returnRecord.vue b/src/pages/purchaseReturn/record/returnRecord.vue index fea85dee..06a41339 100644 --- a/src/pages/purchaseReturn/record/returnRecord.vue +++ b/src/pages/purchaseReturn/record/returnRecord.vue @@ -211,6 +211,7 @@ } } calcHandleQty(this.detailSource); + this.scanPopupGetFocus() }, updateData() { diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue index 494f8686..a9d9fbe2 100644 --- a/src/pages/putaway/job/putawayDetail.vue +++ b/src/pages/putaway/job/putawayDetail.vue @@ -1,14 +1,14 @@ -