From 69d40271248054a6af3fd792fb2cb0b79cff38dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=9D=96?= <10034423+lihaoyuelijing@user.noreply.gitee.com> Date: Wed, 5 Jun 2024 14:13:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=91=84=E5=83=8F?= =?UTF-8?q?=E5=A4=B4=E6=89=AB=E7=A0=81=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/equipment/Inspection/index.vue | 51 +++++++++++++++++++----- src/pages/login/login/index.vue | 2 +- 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/src/pages/equipment/Inspection/index.vue b/src/pages/equipment/Inspection/index.vue index 11c1364..321df85 100644 --- a/src/pages/equipment/Inspection/index.vue +++ b/src/pages/equipment/Inspection/index.vue @@ -11,14 +11,14 @@ - - + + - +
工单号: {{ item.orderCode }}
{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}
- +
设备编码:{{ item.equipmentCode }}
设备名称:{{ item.equipmentName }}
@@ -28,11 +28,11 @@
循环执行时间结束: {{ item.planLoopEnd }}
 - +
工单号: {{ item.orderCode }}
{{ item.orderStatus == 0 ? '进行中' : item.orderStatus == 1 ? '已完成' : '已逾期' }}
- +
设备编码:{{ item.equipmentCode }}
设备名称:{{ item.equipmentName }}
@@ -51,6 +51,7 @@ import model from './model'; import chooseOne from '@/components/choose-one/choose-one.vue'; import jPicker from '@/components/J-Picker/jPicker.vue'; import model1 from '../../equipment/Repairbx/model'; +const mpaasScanModule: any = uni.requireNativePlugin('Mpaas-Scan-Module'); // import { session } from '@/store/modules/session'; //import store from '@/store'; @Component({ @@ -109,6 +110,7 @@ export default class ChangePalletNew extends BasePage { }, ]; userinfo: any = null; + isorderNo: any = null; // remove: any = {}; async onShow() { console.log(uni.getStorageSync('userinfo')); @@ -123,18 +125,47 @@ export default class ChangePalletNew extends BasePage { //await this.model.getpalletLocation(); //this.remove = this.model.WlList[0]; } + // 扫码 + scanCodeOne() { + // http://lj08.cn/21201501124240221021300171390045 + mpaasScanModule.mpaasScan( + { + // 扫码识别类型，参数可多选，qrCode、barCode， + // 如不设置，默认识别所有扫码类型，可能有些许影响识别效率 + scanType: ['qrCode', 'barCode'], + // 是否隐藏相册，默认false不隐藏 + hideAlbum: false, + }, + (ret) => { + // uni.showModal({ + // title: '扫码结果', + // // 返回值中，有三个参数 resp_code、resp_message、resp_result + // // resp_code 表示返回结果值，10：用户取消，11：其他错误，1000：成功 + // // resp_message 表示返回结果信息 + // // resp_result 表示扫码结果，只有成功才会有返回 + // content: JSON.stringify(ret), + // showCancel: false, + // confirmText: '确定', + // }); + if (ret.resp_message == 'success') { + this.orderNo = ret.resp_result; + this.search(this.orderNo); + } else { + this.customToast(ret.resp_result); + } + }, + ); + } async onLoad() { // console.log(uni.getStorageSync('userinfo')); } search(value) { - console.log(value); let data = []; if (this.current == 0) { data = this.listdata.filter((v) => v.equipmentCode == value); } else { data = this.detailsdata.filter((v) => v.equipmentCode == value); } - console.log(data); if (data.length == 0) { (this.$refs.uToast as any).show({ title: '当前设备无点检任务', @@ -202,7 +233,9 @@ export default class ChangePalletNew extends BasePage { background-size: 100% 600rpx; padding: 118rpx 30rpx 162rpx; min-height: 100%; - + .single-left { + display: flex; + } .header { position: fixed; top: 0rpx; diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 9f38458..833e2d0 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -142,7 +142,7 @@ export default class LoginPage extends BasePage { // console.log('Version////', this.Version); } ///********版本号修改区域********** - version = '0.0.66'; //正式版本号 + version = '0.0.67'; //正式版本号 //version = '0.0.3'; //测试版本号 //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本**************** //isTest = true;