检查项: {{ item.itemName }}
检查方法: {{ item.itemMethod }}
@@ -100,6 +101,7 @@ import chooseOne from '@/components/choose-one/choose-one.vue';
import jPicker from '@/components/J-Picker/jPicker.vue';
import { session } from '@/store/modules/session';
import model1 from '../../equipment/Repairbx/model';
+const mpaasScanModule: any = uni.requireNativePlugin('Mpaas-Scan-Module');
//import store from '@/store';
@Component({
components: {
@@ -268,7 +270,7 @@ export default class ChangePalletNew extends BasePage {
};
await this.model.getInspectionOrderInfo(query);
this.detailsinfolist = this.model.OrderInfList;
- this.orderNo = this.detailsinfolist.equipmentCode;
+ // this.orderNo = this.detailsinfolist.equipmentCode;
}
}
created() {
@@ -388,15 +390,36 @@ export default class ChangePalletNew extends BasePage {
this.imgList.splice(index, 1);
}
scanCodeOne() {
- uni.scanCode({
- scanType: ['barCode'],
- success: (res) => {
- this.orderNo = res.result;
+ mpaasScanModule.mpaasScan(
+ {
+ // 扫码识别类型，参数可多选，qrCode、barCode，
+ // 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
+ scanType: ['qrCode', 'barCode'],
+ // 是否隐藏相册，默认false不隐藏
+ hideAlbum: false,
},
- fail(result) {
- this.customToast(result);
+ (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);
+ // uni.navigateTo({
+ // url: `/pages/quality/Materialinspection/web?listitem=` + encodeURIComponent(ret.resp_result),
+ // });
+ } else {
+ this.customToast(ret.resp_result);
+ }
},
- });
+ );
}
async onSubmit() {
if (this.orderNo == '' || this.orderNo.length == 0) {
@@ -448,16 +471,15 @@ export default class ChangePalletNew extends BasePage {
}
}
search(value) {
- console.log(value);
- // if (value == this.detailsinfolist.equipmentCode) {
- // this.isaccord = true;
- // } else {
- // (this.$refs.uToast as any).show({
- // title: '失败请扫码正确条码',
- // type: 'default',
- // });
- // this.isaccord = false;
- // }
+ if (value == this.detailsinfolist.equipmentCode) {
+ this.isaccord = true;
+ } else {
+ (this.$refs.uToast as any).show({
+ title: '失败请扫码正确条码',
+ type: 'default',
+ });
+ this.isaccord = false;
+ }
}
}
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 48fe218..d94f110 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.56';
+ version = '0.0.57';
compareVersion(version1: any, version2: any) {
//如果version1 大 会返回1 &&& 如果version2 大 会返回 -1
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index b281688..5f75d04 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -104,7 +104,7 @@
-->
项目名称: {{ item.ruleName }}
- 检查标准: {{ item.checkStandard }}
+ 检查标准: {{ item.checkStandard }}
检查结果: {{ item.itemMethod }}
@@ -115,8 +115,8 @@
-