diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 0c20147..b81cf7b 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.69'; //正式版本号
+ version = '0.0.70'; //正式版本号
//version = '0.0.3'; //测试版本号
//***************标志修改区域:是否是测试标志: false 正式版本; true 测试版本****************
//isTest = true;
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index 995610d..80c4feb 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -129,7 +129,11 @@
-
+
+
抽样数量: {{ item.itemMethod }}
+
+
+
检查结果:
@@ -179,7 +183,7 @@
-
+
@@ -427,7 +431,7 @@ export default class PurchaseWHSRM extends BasePage {
uni.$on('scanCodeData', (data) => {
let str = `${data.code}`;
let recData = JSON.parse(str);
- console.log(recData);
+ console.log(recData, 'assdasdasdasdad cc');
this.scanCodeOne2;
// 现在你可以使用 recData 进行进一步的处理
});
@@ -437,6 +441,7 @@ export default class PurchaseWHSRM extends BasePage {
if (str) {
this.detailsinfo = JSON.parse(str);
this.selectList.value = this.detailsinfo.checkType;
+
this.getDefectListPDA();
let query = {
factoryCode: session.PoolName,
@@ -540,6 +545,11 @@ export default class PurchaseWHSRM extends BasePage {
item.noOkQuality = 0;
}
});
+ this.detaillistdefects.forEach((item) => {
+ if (item.sampleQuality == null) {
+ item.sampleQuality = 0;
+ }
+ });
this.detaillistceshi.forEach((item) => {
item.factoryCode = session.PoolName;
item.checkType = this.selectList.value;
@@ -589,6 +599,7 @@ export default class PurchaseWHSRM extends BasePage {
this.getDefectListPDA();
await this.model.getCheckTaskListall(query);
this.list = this.model.CheckTaskListall;
+ console.log(this.selectList.value, 'assdasdasdasdad cc');
// let params = {
// productionState: this.productCodelocList.value.toString(),
// };
@@ -687,10 +698,8 @@ export default class PurchaseWHSRM extends BasePage {
this.isgetAutoJudge = true;
}
}
- console.log(item, value, index, this.isgetAutoJudge, this.detaillistceshi[index].upperDiff == null && this.detaillistceshi[index].downDiff == null, this.detaillistceshi[index].updiff);
if (this.detaillistceshi[index].actualValue) {
this.tagslist = JSON.parse(this.detaillistceshi[index].actualValue);
- console.log(this.detaillistceshi[index], 'sdsaasd');
this.selectList4.value = this.detaillistceshi[index].sampleAql;
this.selectList5.value = this.detaillistceshi[index].checkLevel;
} else {
@@ -730,7 +739,6 @@ export default class PurchaseWHSRM extends BasePage {
this.isvalue2 = false;
this.isvalue3 = false;
this.isquality = false;
- console.log(this.selectList, this.nodelist, this.detaillistceshi);
let typeCode = '';
this.nodelist.forEach((item) => {
if (this.selectList.value == item.orderCode) {
@@ -761,7 +769,6 @@ export default class PurchaseWHSRM extends BasePage {
});
if (this.selectList.value == 'checkTypeSC') {
- // console.log(this.detaillistceshi, this.isvalue, this.isquality);
if (this.isvalue) {
(this.$refs.uToast as any).show({
title: '实际测量值不能为空',
@@ -771,7 +778,6 @@ export default class PurchaseWHSRM extends BasePage {
}
}
if (this.selectList.value == 'checkTypeSC') {
- // console.log(this.detaillistceshi, this.isvalue, this.isquality);
if (this.formdata.reason === null || this.formdata.reason === '') {
(this.$refs.uToast as any).show({
title: '首检原因不能为空',
@@ -858,7 +864,6 @@ export default class PurchaseWHSRM extends BasePage {
// }
// });
// }
- // console.log(this.defectCodelist, 'wwwwww');
// for (let index = 0; index < this.defectCodelist.length; index++) {
// this.detaillistdefects.forEach((item) => {
// if (item.defectCode == this.defectCodelist[index].defectCode) {
@@ -946,7 +951,6 @@ export default class PurchaseWHSRM extends BasePage {
this.tagsvalue = null;
}
async getAutoJudgelist() {
- console.log(this.detaillistceshi[this.equipmentindex[0]].actualValue, this.tagslist);
let query1 = {
factoryCode: session.PoolName,
sampleQuality: this.clickitem.quality,
@@ -995,7 +999,6 @@ export default class PurchaseWHSRM extends BasePage {
sourceType: ['album', 'camera'],
success: (res) => {
// uni.showLoading();
- //console.log('/////',res);
let tempFilePaths: any = res.tempFilePaths;
// (this.$refs.uToast as any).show({