朱园亮 / erp-mobile · Commits

Commit 6655f8246ba45a214bcb0f62f3ef89a29494e2b5

Authored by 史婷婷
1 parent 025d3696

feat: 发货单-产品-厚（公差） * 宽（公差） * 长（公差）增加判断条件

Inline Side-by-side
Showing 1 changed file with 35 additions and 32 deletions
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <view class="product" :class="{ 'history': mode == 'history' }"> 2 <view class="product" :class="{ 'history': mode == 'history' }">
3 3
4 <!-- 新增&详情-产品 --> 4 <!-- 新增&详情-产品 -->
5 - <view class="header bp" > 5 + <view class="header bp">
6 <image class="opCollapse" src="/static/images/title.png" /> 6 <image class="opCollapse" src="/static/images/title.png" />
7 <text class="title">产品</text> 7 <text class="title">产品</text>
8 <view class="ops"> 8 <view class="ops">
@@ -26,27 +26,29 @@ @@ -26,27 +26,29 @@
26 <view class="row row-spec"><text class="label">规格(mm)</text> 26 <view class="row row-spec"><text class="label">规格(mm)</text>
27 <view class="value value-spec"> 27 <view class="value value-spec">
28 <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view> 28 <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
29 - <view class="value-spec_box">  
30 - <view class="value-spec_box_1">+{{ item.thicknessTolPos }}</view>  
31 - <view class="value-spec_box_2">-{{ item.thicknessTolNeg }}</view> 29 + <view v-if="item.thickness" class="value-spec_box">
  30 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
  31 + </view>
  32 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }}
  33 + </view>
32 </view> 34 </view>
33 - <view class="value-spec_val p12">*</view>  
34 - <view class="value-spec_val">{{ item.width }}</view>  
35 - <view class="value-spec_box">  
36 - <view class="value-spec_box_1">+{{ item.widthTolPos }}</view>  
37 - <view class="value-spec_box_2">-{{ item.widthTolNeg }}</view> 35 + <view v-if="item.width" class="value-spec_val p12">*</view>
  36 + <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
  37 + <view v-if="item.width" class="value-spec_box">
  38 + <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
  39 + <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view>
38 </view> 40 </view>
39 - <view class="value-spec_val p12">*</view>  
40 - <view class="value-spec_val">{{ item.length }}</view>  
41 - <view class="value-spec_box">  
42 - <view class="value-spec_box_1">+{{ item.lengthTolPos }}</view>  
43 - <view class="value-spec_box_2">-{{ item.lengthTolNeg }}</view> 41 + <view v-if="item.length" class="value-spec_val p12">*</view>
  42 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  43 + <view v-if="item.length" class="value-spec_box">
  44 + <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
  45 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
44 </view> 46 </view>
45 </view> 47 </view>
46 </view> 48 </view>
47 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view> 49 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
48 - <view class="row" :class="{ 'noneStyle': !item.showSalesPrice }"><text class="label">数量kg</text><text  
49 - class="value">{{ item.quantity }}</text> 50 + <view class="row" :class="{ 'noneStyle': !item.showSalesPrice }"><text
  51 + class="label">数量kg</text><text class="value">{{ item.quantity }}</text>
50 </view> 52 </view>
51 <view class="row" :class="{ 'noneStyle': item.showSalesPrice }" v-if="item.showSalesPrice"><text 53 <view class="row" :class="{ 'noneStyle': item.showSalesPrice }" v-if="item.showSalesPrice"><text
52 class="label">销售价格</text><text class="value">{{ 54 class="label">销售价格</text><text class="value">{{
@@ -85,22 +87,24 @@ @@ -85,22 +87,24 @@
85 <!-- 厚（公差） * 宽（公差） * 长（公差） --> 87 <!-- 厚（公差） * 宽（公差） * 长（公差） -->
86 <view class="row row-spec"><text class="label">规格(mm)</text> 88 <view class="row row-spec"><text class="label">规格(mm)</text>
87 <view class="value value-spec"> 89 <view class="value value-spec">
88 - <view class="value-spec_val">{{ item.thickness }}</view>  
89 - <view class="value-spec_box">  
90 - <view class="value-spec_box_1">+{{ item.thicknessTolPos }}</view>  
91 - <view class="value-spec_box_2">-{{ item.thicknessTolNeg }}</view> 90 + <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
  91 + <view v-if="item.thickness" class="value-spec_box">
  92 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
  93 + </view>
  94 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }}
  95 + </view>
92 </view> 96 </view>
93 - <view class="value-spec_val p12">*</view>  
94 - <view class="value-spec_val">{{ item.width }}</view>  
95 - <view class="value-spec_box">  
96 - <view class="value-spec_box_1">+{{ item.widthTolPos }}</view>  
97 - <view class="value-spec_box_2">-{{ item.widthTolNeg }}</view> 97 + <view v-if="item.width" class="value-spec_val p12">*</view>
  98 + <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
  99 + <view v-if="item.width" class="value-spec_box">
  100 + <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
  101 + <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view>
98 </view> 102 </view>
99 - <view class="value-spec_val p12">*</view>  
100 - <view class="value-spec_val">{{ item.length }}</view>  
101 - <view class="value-spec_box">  
102 - <view class="value-spec_box_1">+{{ item.lengthTolPos }}</view>  
103 - <view class="value-spec_box_2">-{{ item.lengthTolNeg }}</view> 103 + <view v-if="item.length" class="value-spec_val p12">*</view>
  104 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  105 + <view v-if="item.length" class="value-spec_box">
  106 + <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
  107 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view>
104 </view> 108 </view>
105 </view> 109 </view>
106 </view> 110 </view>
@@ -112,7 +116,7 @@ @@ -112,7 +116,7 @@
112 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text> 116 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text>
113 </view> 117 </view>
114 <view class="row"><text class="label">考核超协</text><text class="value">{{ item.assessmentExceedsAgreement 118 <view class="row"><text class="label">考核超协</text><text class="value">{{ item.assessmentExceedsAgreement
115 - }}</text></view> 119 + }}</text></view>
116 </view> 120 </view>
117 <view class="view-total"> 121 <view class="view-total">
118 <view class="head">合计</view> 122 <view class="head">合计</view>
@@ -255,7 +259,6 @@ export default { @@ -255,7 +259,6 @@ export default {
255 } 259 }
256 </script> 260 </script>
257 <style lang="scss" scoped> 261 <style lang="scss" scoped>
258 -  
259 .header { 262 .header {
260 background-color: #fff; 263 background-color: #fff;
261 display: flex; 264 display: flex;