diff --git a/pages/rawMaterialInfo/index.scss b/pages/rawMaterialInfo/index.scss
index 042f8a9..c7f058c 100644
--- a/pages/rawMaterialInfo/index.scss
+++ b/pages/rawMaterialInfo/index.scss
@@ -157,11 +157,35 @@
}
}
}
+.pd-ul2{
+ @include flex(center,flex-start);
+ margin-top: 20upx;
+
+ .pd-title{
+ @include fonts(24upx,#666);
+
+ }
+ .pd-list{
+ @include flex(center,flex-start);
+ margin-left:20upx;
+ image{
+ @include wh(33upx,33upx);
+
+ }
+ text{
+ @include fonts(24upx,#666);
+ margin-left: 10upx;
+ color: #007AFF;
+ margin-right: 20upx;
+ }
+ }
+}
.cc-input-ul{
@include flex(center,flex-start);
flex-wrap: wrap;
.cc-input-list{
@include flex(center,flex-start);
+ margin-top: 20upx;
.title{
@include fonts(24upx,#666)
}
@@ -171,7 +195,12 @@
border: 1upx solid #C0C0C0;
border-radius: 10upx;
font-size: 24upx;
+ text-align: center;
}
}
}
+}
+.borders{
+ border:1upx solid red !important;
+ color: red!important;
}
\ No newline at end of file
diff --git a/pages/rawMaterialInfo/rawMaterialInfo.vue b/pages/rawMaterialInfo/rawMaterialInfo.vue
index aaf5162..41651ca 100644
--- a/pages/rawMaterialInfo/rawMaterialInfo.vue
+++ b/pages/rawMaterialInfo/rawMaterialInfo.vue
@@ -41,7 +41,7 @@
-
+
尺寸检测数据
-
+
+
+ 规格
+
+ {{item.size}}
+
+ 最大值
+
+ {{item.up}}
+
+ 最小值
+
+ {{item.down}}
+
+
rule
-
+
+
+
+
+ no1
+
+
+
+
+
+ no2
+
+
-
+
+
+ no3
+
+
+
+
+
+ no4
+
+
+
+
+
+ no5
+
+
+
+
判定
-
+
OK
-
+
+
+ NG
+
+
@@ -167,10 +227,10 @@
check_status: 0,
jyxItem: {},
buttonState: true,
- jurisdiction:[],
+ jurisdiction: [],
standard: {},
- tooList:[],
- power:[],
+ tooList: [],
+ power: [],
froms: {
result: 1,
purchase_id: '', //采购数据ID
@@ -183,20 +243,13 @@
arrival_quantity: "", //到货数量
number_of_inspections: "", //检测数量
result_describe: '', //检验不合格描述
- dimensional_inspection: [{
- rule: "",
- no1: "",
- no2: "",
- no3: "",
- no4: "",
- no5: ""
- }], //尺寸
+ dimensional_inspection: [], //尺寸
}
};
},
computed: {
...mapGetters(['userInfo', 'roleType'])
-
+
},
onLoad(e) {
this.CyInfo = JSON.parse(decodeURIComponent(e.planInfo));
@@ -206,34 +259,36 @@
this.getitem()
this.getArr()
this.isMenu();
-
+
console.log('检验项', this.userInfo)
},
methods: {
getArr() {
- if(this.power.length>0){
+ if (this.power.length > 0) {
let newArr = this.power.map(item => {
if (item.children) {
-
+
item.children.map(items => {
this.jurisdiction.push(items.title)
return items
})
}
-
+
})
}
-
+
console.log("xinshuzu", this.jurisdiction)
},
isMenu(title) {
return this.jurisdiction.includes(title);
},
getitem() {
- materialItem({name:this.CyInfo.purchase_number}).then(res => {
+ materialItem({
+ name: this.CyInfo.purchase_number
+ }).then(res => {
this.itemList = res.item;
this.standard = res.standard;
- this.tooList=res.tool;
+ this.tooList = res.tool;
for (let b in res.item) {
this.item.push({
check_item: res.item[b],
@@ -250,8 +305,36 @@
this.getInfo()
}
+ res.size.map(item => {
+ this.froms.dimensional_inspection.push({
+ rule: "",
+ no1: "",
+ no2: "",
+ no3: "",
+ no4: "",
+ no5: "",
+ size: item.size,
+ up: item.up,
+ down: item.down,
+ result: 'NG'
+ })
+ })
+
})
},
+ updateResult(e, index) {
+ let item = this.froms.dimensional_inspection[index];
+ if ((item.rule > item.up || item.rule < item.down) || (item.no1 >
+ item.up || item.no1 < item.down) || (item.no2 > item.up || item.no2 < item
+ .down) || (item.no3 > item.up || item.no3 < item
+ .down) || (item.no4 > item.up || item.no4 < item
+ .down) || (item.no5 > item.up || item.no5 < item
+ .down)) {
+ this.froms.dimensional_inspection[index].result = "NG";
+ } else {
+ this.froms.dimensional_inspection[index].result = "OK";
+ }
+ },
getInfo() {
rawFormDetail({
purchase_id: this.CyInfo.id
@@ -336,7 +419,7 @@
this.$functions.success("提交成功").then(() => {
uni.navigateBack()
}).catch(res => {
- this.buttonState = true
+ this.buttonState = true
})
})
})