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

ssff

master
huangli865118801 4 years ago
parent
f0a64e3aae
commit
f6ea0845ca
11 changed files with 158 additions and 150 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. 16
      pages/assembleInfo/assembleInfo.vue
  2. 44
      pages/assembleInfo/index.scss
  3. 19
      pages/hardwareInfo/hardwareInfo.vue
  4. 44
      pages/hardwareInfo/index.scss
  5. 14
      pages/rawMaterialInfo/rawMaterialInfo.vue
  6. 44
      pages/sprayInfo/index.scss
  7. 16
      pages/sprayInfo/sprayInfo.vue
  8. 44
      pages/stampingInspectionInfo/index.scss
  9. 14
      pages/stampingInspectionInfo/stampingInspectionInfo.vue
  10. 42
      pages/tcqInfo/index.scss
  11. 11
      pages/tcqInfo/tcqInfo.vue

16
pages/assembleInfo/assembleInfo.vue
Unescape View File

@ -87,15 +87,17 @@
</view>
</view>
<view class="cyxj-content-card" v-else>
<view class="tx-ul">
<view class="tx-title"><text v-if="value.val" style="color: #007AFF;margin-right: 30upx;">规格: {{value.val}} ±{{((value.top - value.bottom)/2).toFixed(2)}}</text> {{ value.title }}</view>
<view style="border-bottom: 1upx solid #999;padding-bottom: 20upx;">
<view class="tx-ul">
<view class="tx-title"><text v-if="value.val" style="color: #007AFF;margin-right: 30upx;">规格:{{value.val}} <text style="margin-left: 20upx;color: red;">(+{{(value.top).toFixed(2)}} -{{(value.bottom).toFixed(2)}})</text></text> {{ value.title }} </view>
</view>
<view class="tx-in-nav">
<view>{{value.bottom}}</view>
<view>{{(value.val-value.bottom).toFixed(2)}}</view>
<input :class="value.inputState==false?'re-bor':''" :disabled="type==2?true:false" type="number" @input="inputListener($event,index, idx)" v-model="value.input"
placeholder="请输入" />
<view>{{value.top}}</view>
/>
<view>{{(value.val+value.top).toFixed(2)}}</view>
</view>
</view>
</view>
</view>
</view>
</view>
@ -229,7 +231,7 @@
if (!item.input) {
this.configSet[index].product_tcq_conf[idx].inputState = false;
} else {
if (item.input < item.bottom || item.input > item.top) {
if (item.input < (item.val-item.bottom).toFixed(2) || item.input > (item.val+item.top).toFixed(2)) {
this.configSet[index].product_tcq_conf[idx].inputState = false;
}
else {

44
pages/assembleInfo/index.scss
Unescape View File

@ -434,28 +434,28 @@
.tx-ul{
width: 710upx;
@include flex(center,space-bteween);
.tx-title{
width: 500upx;
@include fonts(24upx,#666,400);
}
.tx-in-nav{
@include flex(center,space-between);
.tx-title{
//width: 200upx;
@include fonts(24upx,#666,400);
}
}
.tx-in-nav{
//width:250upx;
@include flex(center,flex-start);
margin-top: 20upx;
input{
width: 200upx;
@include flex(center,space-bteween);
input{
width: 100upx;
padding: 20upx;
border: 1upx solid #F1F1F1;
font-size: 24upx;
text-align: right;
margin-left: 5upx;
margin-right: 5upx;
text-align: center;
}
view{
font-size: 24upx;
color:#007AFF;
}
padding: 20upx;
border: 1upx solid #F1F1F1;
font-size: 24upx;
text-align: right;
margin-left: 5upx;
margin-right: 5upx;
text-align: center;
}
view{
font-size: 24upx;
color:#007AFF;
}
}

19
pages/hardwareInfo/hardwareInfo.vue
Unescape View File

@ -104,18 +104,17 @@
</view>
</view>
<view class="cyxj-content-card" v-else>
<view class="tx-ul">
<view class="tx-title"><text v-if="value.val" style="color: #007AFF;margin-right: 30upx;">规格: {{value.val}} ±{{((value.top - value.bottom)/2).toFixed(2)}}</text> {{ value.title }}</view>
<view style="border-bottom: 1upx solid #999;padding-bottom: 20upx;">
<view class="tx-ul">
<view class="tx-title"><text v-if="value.val" style="color: #007AFF;margin-right: 30upx;">规格:{{value.val}} <text style="margin-left: 20upx;color: red;">(+{{(value.top).toFixed(2)}} -{{(value.bottom).toFixed(2)}})</text></text> {{ value.title }} </view>
</view>
<view class="tx-in-nav">
<view>{{value.bottom}}</view>
<view>{{(value.val-value.bottom).toFixed(2)}}</view>
<input :class="value.inputState==false?'re-bor':''" :disabled="type==2?true:false" type="number" @input="inputListener($event,index, idx)" v-model="value.input"
placeholder="请输入" />
<view>{{value.top}}</view>
/>
<view>{{(value.val+value.top).toFixed(2)}}</view>
</view>
</view>
<view class="re-colo" v-if="value.inputState==false">
请输入范围内的值
</view>
</view>
</view>
</view>
</view>
@ -254,7 +253,7 @@
if (!item.input) {
this.configSet[index].check_conf_msg[idx].inputState = false;
} else {
if (item.input < item.bottom || item.input > item.top) {
if (item.input < (item.val-item.bottom).toFixed(2) || item.input > (item.val+item.top).toFixed(2)) {
this.configSet[index].check_conf_msg[idx].inputState = false;
}
else {

44
pages/hardwareInfo/index.scss
Unescape View File

@ -434,28 +434,28 @@
.tx-ul{
width: 710upx;
@include flex(center,space-bteween);
.tx-title{
width: 500upx;
@include fonts(24upx,#666,400);
}
.tx-in-nav{
@include flex(center,space-between);
.tx-title{
//width: 200upx;
@include fonts(24upx,#666,400);
}
}
.tx-in-nav{
//width:250upx;
@include flex(center,flex-start);
margin-top: 20upx;
input{
width: 200upx;
@include flex(center,space-bteween);
input{
width: 100upx;
padding: 20upx;
border: 1upx solid #F1F1F1;
font-size: 24upx;
text-align: right;
margin-left: 5upx;
margin-right: 5upx;
text-align: center;
}
view{
font-size: 24upx;
color:#007AFF;
}
padding: 20upx;
border: 1upx solid #F1F1F1;
font-size: 24upx;
text-align: right;
margin-left: 5upx;
margin-right: 5upx;
text-align: center;
}
view{
font-size: 24upx;
color:#007AFF;
}
}

14
pages/rawMaterialInfo/rawMaterialInfo.vue
Unescape View File

@ -63,11 +63,11 @@
</view>
<view class="pd-title">最大值</view>
<view class="pd-list">
<text>{{item.up}}</text>
<text>{{Number(item.size) + item.up}}</text>
</view>
<view class="pd-title">最小值</view>
<view class="pd-list">
<text>{{item.down}}</text>
<text>{{Number(item.size) - item.down}}</text>
</view>
</view>
<view class="cc-input-ul">
@ -83,7 +83,7 @@
<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':''"
:class="item.no1!=''&&(item.no1>(Number(item.size) + item.up)||item.no1<(Number(item.size) - item.down))?'borders':''"
v-model="item.no1" />
</view>
</view>
@ -91,7 +91,7 @@
<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':''"
:class="item.no2!=''&&(item.no2>(Number(item.size) + item.up)||item.no2<(Number(item.size) - item.down))?'borders':''"
v-model="item.no2" />
</view>
</view>
@ -99,7 +99,7 @@
<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':''"
:class="item.no3!=''&&(item.no3>(Number(item.size) + item.up)||item.no3<item.no2<(Number(item.size) - item.down))?'borders':''"
v-model="item.no3" />
</view>
</view>
@ -107,7 +107,7 @@
<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':''"
:class="item.no4!=''&&(item.no4>(Number(item.size) + item.up)||item.no4<item.no2<(Number(item.size) - item.down))?'borders':''"
v-model="item.no4" />
</view>
</view>
@ -115,7 +115,7 @@
<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':''"
:class="item.no5!=''&&(item.no5>(Number(item.size) + item.up)||item.no5<item.no2<(Number(item.size) - item.down))?'borders':''"
v-model="item.no5" />
</view>
</view>

44
pages/sprayInfo/index.scss
Unescape View File

@ -434,28 +434,28 @@
.tx-ul{
width: 710upx;
@include flex(center,space-bteween);
.tx-title{
width: 500upx;
@include fonts(24upx,#666,400);
}
.tx-in-nav{
@include flex(center,space-between);
.tx-title{
//width: 200upx;
@include fonts(24upx,#666,400);
}
}
.tx-in-nav{
//width:250upx;
@include flex(center,flex-start);
margin-top: 20upx;
input{
width: 200upx;
@include flex(center,space-bteween);
input{
width: 100upx;
padding: 20upx;
border: 1upx solid #F1F1F1;
font-size: 24upx;
text-align: right;
margin-left: 5upx;
margin-right: 5upx;
text-align: center;
}
view{
font-size: 24upx;
color:#007AFF;
}
padding: 20upx;
border: 1upx solid #F1F1F1;
font-size: 24upx;
text-align: right;
margin-left: 5upx;
margin-right: 5upx;
text-align: center;
}
view{
font-size: 24upx;
color:#007AFF;
}
}

16
pages/sprayInfo/sprayInfo.vue
Unescape View File

@ -88,15 +88,17 @@
</view>
</view>
<view class="cyxj-content-card" v-else>
<view class="tx-ul">
<view class="tx-title"><text v-if="value.val" style="color: #007AFF;margin-right: 30upx;">规格: {{value.val}} ±{{((value.top - value.bottom)/2).toFixed(2)}}</text> {{ value.title }}</view>
<view style="border-bottom: 1upx solid #999;padding-bottom: 20upx;">
<view class="tx-ul">
<view class="tx-title"><text v-if="value.val" style="color: #007AFF;margin-right: 30upx;">规格:{{value.val}} <text style="margin-left: 20upx;color: red;">(+{{(value.top).toFixed(2)}} -{{(value.bottom).toFixed(2)}})</text></text> {{ value.title }} </view>
</view>
<view class="tx-in-nav">
<view>{{value.bottom}}</view>
<view>{{(value.val-value.bottom).toFixed(2)}}</view>
<input :class="value.inputState==false?'re-bor':''" :disabled="type==2?true:false" type="number" @input="inputListener($event,index, idx)" v-model="value.input"
placeholder="请输入" />
<view>{{value.top}}</view>
/>
<view>{{(value.val+value.top).toFixed(2)}}</view>
</view>
</view>
</view>
</view>
</view>
</view>
@ -231,7 +233,7 @@
if (!item.input) {
this.configSet[index].check_conf_msg[idx].inputState = false;
} else {
if (item.input < item.bottom || item.input > item.top) {
if (item.input < (item.val-item.bottom).toFixed(2) || item.input > (item.val+item.top).toFixed(2)) {
this.configSet[index].check_conf_msg[idx].inputState = false;
}
else {

44
pages/stampingInspectionInfo/index.scss
Unescape View File

@ -422,28 +422,28 @@
.tx-ul{
width: 710upx;
@include flex(center,space-bteween);
.tx-title{
width: 500upx;
@include fonts(24upx,#666,400);
}
.tx-in-nav{
@include flex(center,space-between);
.tx-title{
//width: 200upx;
@include fonts(24upx,#666,400);
}
}
.tx-in-nav{
//width:250upx;
@include flex(center,flex-start);
margin-top: 20upx;
input{
width: 200upx;
@include flex(center,space-bteween);
input{
width: 100upx;
padding: 20upx;
border: 1upx solid #F1F1F1;
font-size: 24upx;
text-align: right;
margin-left: 5upx;
margin-right: 5upx;
text-align: center;
}
view{
font-size: 24upx;
color:#007AFF;
}
padding: 20upx;
border: 1upx solid #F1F1F1;
font-size: 24upx;
text-align: right;
margin-left: 5upx;
margin-right: 5upx;
text-align: center;
}
view{
font-size: 24upx;
color:#007AFF;
}
}

14
pages/stampingInspectionInfo/stampingInspectionInfo.vue
Unescape View File

@ -69,15 +69,17 @@
</view>
</view>
<view class="cyxj-content-card" v-else>
<view class="tx-ul">
<view class="tx-title"><text v-if="value.val" style="color: #007AFF;margin-right: 30upx;">规格: {{value.val}} ±{{((value.top - value.bottom)/2).toFixed(2)}}</text> {{ value.title }} </view>
<view style="border-bottom: 1upx solid #999;padding-bottom: 20upx;">
<view class="tx-ul">
<view class="tx-title"><text v-if="value.val" style="color: #007AFF;margin-right: 30upx;">规格:{{value.val}} <text style="margin-left: 20upx;color: red;">(+{{(value.top).toFixed(2)}} -{{(value.bottom).toFixed(2)}})</text></text> {{ value.title }} </view>
</view>
<view class="tx-in-nav">
<view>{{value.bottom}}</view>
<view>{{(value.val-value.bottom).toFixed(2)}}</view>
<input :class="value.inputState==false?'re-bor':''" :disabled="type==2?true:false" type="number" @input="inputListener($event,index, idx)" v-model="value.input"
/>
<view>{{value.top}}</view>
<view>{{(value.val+value.top).toFixed(2)}}</view>
</view>
</view>
</view>
</view>
</view>
</view>
@ -211,7 +213,7 @@ console.log("xinshuzu", this.jurisdiction)
if (!item.input) {
this.configSet[index].check_conf_msg[idx].inputState = false;
} else {
if (item.input < item.bottom || item.input > item.top) {
if (item.input < (item.val-item.bottom).toFixed(2) || item.input > (item.val+item.top).toFixed(2)) {
this.configSet[index].check_conf_msg[idx].inputState = false;
}
else {

42
pages/tcqInfo/index.scss
Unescape View File

@ -434,28 +434,28 @@
.tx-ul{
width: 710upx;
@include flex(center,space-between);
.tx-title{
@include flex(center,space-between);
.tx-title{
width: 200upx;
@include fonts(24upx,#666,400);
}
}
.tx-in-nav{
//width:250upx;
@include flex(center,flex-start);
margin-top: 20upx;
input{
width: 200upx;
@include fonts(24upx,#666,400);
padding: 20upx;
border: 1upx solid #F1F1F1;
font-size: 24upx;
text-align: right;
margin-left: 5upx;
margin-right: 5upx;
text-align: center;
}
.tx-in-nav{
width:250upx;
@include flex(center,space-between);
input{
//width: 200upx;
padding: 20upx;
border: 1upx solid #F1F1F1;
font-size: 24upx;
text-align: right;
margin-left: 5upx;
margin-right: 5upx;
text-align: center;
}
view{
font-size: 24upx;
color:#007AFF;
}
view{
font-size: 24upx;
color:#007AFF;
}
}

11
pages/tcqInfo/tcqInfo.vue
Unescape View File

@ -87,16 +87,19 @@
</view>
</view>
<view class="cyxj-content-card" v-else>
<view class="tx-ul">
<view class="xx-title" style="font-size: 26upx;color: #007AFF;">规格:{{ value.spec }} ±{{((value.top - value.bottom)/2).toFixed(2)}}</view>
<view style="border-bottom: 1upx solid #999;padding-bottom: 20upx;">
<view class="tx-ul">
<view class="xx-title" style="font-size: 26upx;color: #007AFF;">规格:{{ value.spec }} <text style="margin-left: 20upx;color: red;">(+{{(value.top).toFixed(2)}} -{{(value.bottom).toFixed(2)}})</text> </view>
</view>
<view class="tx-in-nav">
<view>{{value.bottom}}</view>
<view>{{(value.spec-value.bottom).toFixed(2)}}</view>
<input :class="value.inputState==false?'re-bor':''" :disabled="type==2?true:false"
type="number" @input="inputListener($event,index, idx)" v-model="value.input"
placeholder="请输入" />
<view>{{value.top}}</view>
<view>{{(value.spec+value.top).toFixed(2)}}</view>
</view>
</view>
</view>
</view>
</view>

Write Preview
Loading…
Cancel
Save