zhangsiyu
/
erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

提交

master
865118801@qq.com 4 years ago
parent
88941208f0
commit
cb009f52f5
2 changed files with 138 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      pages/rawMaterialInfo/index.scss
  2. 135
      pages/rawMaterialInfo/rawMaterialInfo.vue

29
pages/rawMaterialInfo/index.scss
Unescape View File

@ -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;
}

135
pages/rawMaterialInfo/rawMaterialInfo.vue
Unescape View File

@ -41,7 +41,7 @@
</view>
</view>
</view>
<view class="contet-up-card" style="margin-top: 20upx;">
<view class="btitle-cc">尺寸检测数据</view>
<!-- <view class="contet-up-card-cont">
@ -51,22 +51,82 @@
<input v-model="froms.dimensional_inspection[0][key]" type="number" />
</view>
</view> -->
<view class="cc-card">
<view class="cc-card" v-for="(item,index) in froms.dimensional_inspection" :key="index">
<view class="pd-ul2">
<view class="pd-title">规格</view>
<view class="pd-list">
<text>{{item.size}}</text>
</view>
<view class="pd-title">最大值</view>
<view class="pd-list">
<text>{{item.up}}</text>
</view>
<view class="pd-title">最小值</view>
<view class="pd-list">
<text>{{item.down}}</text>
</view>
</view>
<view class="cc-input-ul">
<view class="cc-input-list">
<view class="title">rule</view>
<view class="cc-input">
<input type="number" />
<input type="number" @input="updateResult($event,index)"
:class="item.rule!=''&&(item.rule>item.up||item.rule<item.down)?'borders':''"
v-model="item.rule" />
</view>
</view>
<view class="cc-input-list">
<view class="title">no1</view>
<view class="cc-input">
<input type="number" @input="updateResult($event,index)"
:class="item.no1!=''&&(item.no1>item.up||item.no1<item.down)?'borders':''"
v-model="item.no1" />
</view>
</view>
<view class="cc-input-list">
<view class="title">no2</view>
<view class="cc-input">
<input type="number" @input="updateResult($event,index)"
:class="item.no2!=''&&(item.no2>item.up||item.no2<item.down)?'borders':''"
v-model="item.no2" />
</view>
</view>
</view>
<view class="cc-input-list">
<view class="title">no3</view>
<view class="cc-input">
<input type="number" @input="updateResult($event,index)"
:class="item.no3!=''&&(item.no3>item.up||item.no3<item.down)?'borders':''"
v-model="item.no3" />
</view>
</view>
<view class="cc-input-list">
<view class="title">no4</view>
<view class="cc-input">
<input type="number" @input="updateResult($event,index)"
:class="item.no4!=''&&(item.no4>item.up||item.no4<item.down)?'borders':''"
v-model="item.no4" />
</view>
</view>
<view class="cc-input-list">
<view class="title">no5</view>
<view class="cc-input">
<input type="number" @input="updateResult($event,index)"
:class="item.no5!=''&&(item.no5>item.up||item.no5<item.down)?'borders':''"
v-model="item.no5" />
</view>
</view>
</view>
<view class="pd-ul">
<view class="pd-title">判定</view>
<view class="pd-list">
<image src="../../static/xz.png"></image>
<image :src="item.result=='OK'?'../../static/xz.png':'../../static/wxz.png'"></image>
<text>OK</text>
</view>
</view>
<view class="pd-list">
<image :src="item.result=='NG'?'../../static/xz.png':'../../static/wxz.png'"></image>
<text>NG</text>
</view>
</view>
</view>
</view>
<view class="testing">
@ -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
})
})
})

Write Preview
Loading…
Cancel
Save