diff --git a/src/api/request2.js b/src/api/request2.js index 678424d..1626372 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -381,3 +381,47 @@ export function plasticsNoGoodSubmit(params) { }); } +/** + * @param params 泡沫合格品上悬 计划 + */ +export function getUpLinkPlaneNumberList() { + return request({ + url: baseApi + "/Plan/GetList?Type=paomo", + method: "get", + data: {}, + }); +} + +/** + * @param params 泡沫 合格品上悬扫码 + */ +export function getFoamScanUpLinkInfo(machineCode) { + return request({ + url: baseApi + "/MachineClass/Get?MachineCode="+machineCode, + method: "get", + data: {}, + }); +} + +/** + * @param params获取泡沫 不良品收货 计划单号 + */ +export function getFoamNoGoodNumberList() { + return request({ + url: baseApi + "/Plan/GetList?Type=paomo", + method: "get", + data: {}, + }); +} + +/** + * @param params获取注塑 不良品收货 计划单号 + */ +export function getPlasticsNoGoodNumberList() { + return request({ + url: baseApi + "/Plan/GetList?Type=paomo", + method: "get", + data: {}, + }); +} + diff --git a/src/pages.json b/src/pages.json index c2d5091..c0e8cc6 100644 --- a/src/pages.json +++ b/src/pages.json @@ -78,7 +78,7 @@ { "path": "pages/foam/foamNoGood", "style": { - "navigationBarTitleText": "不良品收货", + "navigationBarTitleText": "不良品收货(泡沫)", "titleNView": { "buttons": [{}] } @@ -105,7 +105,7 @@ { "path": "pages/plastics/plasticsNoGood", "style": { - "navigationBarTitleText": "不良品收货", + "navigationBarTitleText": "不良品收货(注塑)", "titleNView": { "buttons": [{}] } diff --git a/src/pages/appUpdate/appUpdate.js b/src/pages/appUpdate/appUpdate.js index 82c69c1..8603f89 100644 --- a/src/pages/appUpdate/appUpdate.js +++ b/src/pages/appUpdate/appUpdate.js @@ -10,10 +10,15 @@ export function checkVersion(isShowHint){ versionCode: widgetInfo.versionCode } curversionCode = data.versionCode + uni.showLoading({ + title:"加载中", + mask:true + }) uni.request({ url:"http://192.168.0.105:9527/appUpdate.json", method:"GET" }).then(res=>{ + uni.hideLoading() console.log("当前版本提示", curversionCode) var json = JSON.stringify(res) console.log("获取更新数据", json) @@ -53,7 +58,8 @@ export function checkVersion(isShowHint){ } } }).catch(error=>{ - + uni.hideLoading() + console.log("请求错误"+error) }) }) } diff --git a/src/pages/foam/check.vue b/src/pages/foam/check.vue index 32ab365..7a41ee9 100644 --- a/src/pages/foam/check.vue +++ b/src/pages/foam/check.vue @@ -3,7 +3,7 @@ - - - - + + @@ -25,18 +25,17 @@ 点检人 : {{worker}} --> - - + + + + + + + + 设备编号 : {{deviceCheckCode}} 设备名称 : {{deviceName}} @@ -48,8 +47,8 @@ 点检人 : {{worker}} - - + + @@ -89,7 +88,7 @@ foamCheckSubmit, getFoamDeviceInfo } from '@/api/request2.js'; - + import { showConfirmMsg } from "@/common/utils.js" @@ -102,7 +101,7 @@ return { dateTime: "", deviceCode: "", - deviceCheckCode:"", + deviceCheckCode: "", deviceName: "", worker: this.$store.state.user.name, dataList: [], @@ -241,7 +240,8 @@ }) getFoamDeviceInfo(result).then(res => { uni.hideLoading() - this.deviceCode = result; + this.deviceCode = ""; + this.deviceCheckCode = result console.log(result) var groupSelect = { Type: "4", @@ -252,45 +252,48 @@ // this.dataList = this.formData this.dataList = res.Result; this.dataList.push(groupSelect) - - this.deviceName=this.dataList[0].Name; + + this.deviceName = this.dataList[0].Name; this.dateTime = getCurrDateTime() this.worker = this.$store.state.user.name + this.$forceUpdate(); }).catch(error => { + this.deviceCode = "" + this.deviceCheckCode = result uni.hideLoading() - this.showMessage(error) + this.showMessage("扫描设备[" + data + "]" + error) }) }, submit() { - if (this.deviceCode == "") { - this.deviceCheckCode="" + if (this.deviceCheckCode == "") { + this.deviceCheckCode = "" this.showMessage("请先扫描设备编号") return } this.$refs.customerFrom.submit(data => { - var groupName=""; - var groupValue="" - data.forEach(res=>{ - if(res.Type=="4"){ - groupName=res.SelectName; - groupValue=res.SelectValue; + var groupName = ""; + var groupValue = "" + data.forEach(res => { + if (res.Type == "4") { + groupName = res.SelectName; + groupValue = res.SelectValue; } }) - var commitData={ - id:this.$store.state.user.id, - createTime:getCurrDateTime(), - groupName:groupName, - groupValue:groupValue, - dataList:data + var commitData = { + id: this.$store.state.user.id, + createTime: getCurrDateTime(), + groupName: groupName, + groupValue: groupValue, + dataList: data } - + console.log("提交", JSON.stringify(commitData)) - foamCheckSubmit(commitData).then(res=>{ + foamCheckSubmit(commitData).then(res => { uni.hideLoading() this.showMessage("提交成功") this.clearData() - }).catch(error=>{ + }).catch(error => { uni.hideLoading() this.showMessage(error) }) @@ -298,15 +301,15 @@ }, clearData() { this.deviceCode = "" - this.deviceName=""; - this.dateTime =""; + this.deviceCheckCode = "" + this.deviceName = ""; + this.dateTime = ""; this.dateTime = "", - this.deviceCode = "", this.deviceName = "", - this.worker="" - this.dataList=[] - // this.reset(); - }, + this.worker = "" + this.dataList = [] + // this.reset(); + }, reset() { this.$refs.customerFrom.reset() }, @@ -317,28 +320,28 @@ closeScanPopup() { this.$refs.scanPopup.closeScanPopup(); }, - deviceClear(){ - this.deviceCode=""; - this.deviceCheckCode="" + deviceClear() { + this.deviceCode = ""; + this.deviceCheckCode = "" }, - showMessage(hint){ - showConfirmMsg("提示", hint,false,callBack=>{ - - } ) + showMessage(hint) { + showConfirmMsg("提示", hint, false, callBack => { + + }) }, - onConfirmDevice(data){ - if(data==undefined||data==""){ - this.showMessage("请扫描设备编号") + onConfirmDevice(data) { + if (data == undefined || data == "") { + this.showMessage("扫描数据为空,请输入设备编号") return; } - + uni.showLoading({ title: "加载中", mask: true }) getFoamDeviceInfo(data).then(res => { uni.hideLoading() - this.deviceCode = data; + this.deviceCode = ""; this.deviceCheckCode = data; console.log(data) var groupSelect = { @@ -349,11 +352,12 @@ } this.dataList = res.Result; this.dataList.push(groupSelect) - this.deviceName=this.dataList[0].Name; + this.deviceName = this.dataList[0].Name; this.dateTime = getCurrDateTime() }).catch(error => { + this.deviceCode = ""; uni.hideLoading() - this.showMessage(error) + this.showMessage("扫描设备[" + data + "]" + error) }) }, diff --git a/src/pages/foam/downLink.vue b/src/pages/foam/downLink.vue index b5abc7c..ecb5a21 100644 --- a/src/pages/foam/downLink.vue +++ b/src/pages/foam/downLink.vue @@ -17,11 +17,38 @@ + + + + + + + 箱码 + 1234 + + + 批次 + 20240508 + + + 库位 + 103 + + + + + + @@ -53,7 +80,8 @@