diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 43fe486..d19dbdd 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.120'; //正式版本号
+ version = '0.0.121'; //正式版本号
//version = '0.0.14'; //测试版本号
//***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
//isTest = true;
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index a04d8f1..4c294c1 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -7,21 +7,35 @@
质量检验
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 查询
+
+
@@ -598,6 +612,7 @@ export default class PurchaseWHSRM extends BasePage {
abnormallist: any = [];
selectedFormIndexes: any = [];
selectedForms: any = [];
+ materialCode: any = '';
//sampleQuality = null; //成品检验样本数量
// 引入原生插件
// 调用插件的 mpaasScan 方法
@@ -740,6 +755,7 @@ export default class PurchaseWHSRM extends BasePage {
await this.model.getmaterialFromListPDA();
this.getmaterialFromList = this.model.locList3;
}
+
async onPass(item) {
this.clickitem = item;
let query1 = {
@@ -970,6 +986,19 @@ export default class PurchaseWHSRM extends BasePage {
changeradio1(checkResult) {
console.log(checkResult);
}
+ async querylist() {
+ let query = {
+ factoryCode: session.PoolName,
+ checkManCode: session.userName,
+ checkStatus: 0,
+ checkType: this.selectList.value,
+ checkLoc: this.selectList1.value,
+ materialCode: this.materialCode,
+ };
+ this.getDefectListPDA();
+ await this.model.getCheckTaskListall(query);
+ this.list = this.model.CheckTaskListall;
+ }
async selectProductlocCode(e: any) {
this.selectList = e.pickerName;
let query = {
@@ -2127,7 +2156,7 @@ export default class PurchaseWHSRM extends BasePage {
.form {
background-color: #fff;
- padding: 40rpx;
+ padding: 20rpx;
border-radius: 10rpx;
box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
@@ -2145,7 +2174,7 @@ export default class PurchaseWHSRM extends BasePage {
.single {
width: 100%;
- height: 100rpx;
+ // height: 100rpx;
display: flex;
.single-left {
@@ -2162,7 +2191,6 @@ export default class PurchaseWHSRM extends BasePage {
.single-right {
button {
- margin-top: 15rpx;
width: 140rpx;
height: 70rpx;
background-color: #fa3534;