Commit 3cc0f6c3a1952b6e9ffe0d9d7beabb63de4677aa

Authored by 史婷婷
1 parent 92d8a1a2

feat: 订货单&外贸未锁规合同-只读-产品-规格处理

@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <image v-if="mode === 'add'" class="opAdd" @click="onAdd" src="/static/images/plus.png" /> 7 <image v-if="mode === 'add'" class="opAdd" @click="onAdd" src="/static/images/plus.png" />
8 <view v-if="mode === 'view'" class="op1" @click="toggleViewCollapse"> 8 <view v-if="mode === 'view'" class="op1" @click="toggleViewCollapse">
9 <image class="opAdd" :src="collapsedView ? '/static/images/down.png' : '/static/images/up.png'" /> 9 <image class="opAdd" :src="collapsedView ? '/static/images/down.png' : '/static/images/up.png'" />
10 - <text class="op">{{ collapsedView ? '展开' : '收起'}} </text> 10 + <text class="op">{{ collapsedView ? '展开' : '收起'}} </text>
11 </view> 11 </view>
12 12
13 </view> 13 </view>
@@ -158,27 +158,27 @@ @@ -158,27 +158,27 @@
158 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view> 158 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
159 <!-- 厚(公差) * 宽(公差) * 长(公差) --> 159 <!-- 厚(公差) * 宽(公差) * 长(公差) -->
160 <view class="row row-spec"><text class="label">规格(mm)</text> 160 <view class="row row-spec"><text class="label">规格(mm)</text>
161 - <view class="value value-spec">  
162 - <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>  
163 - <view v-if="item.thickness" class="value-spec_box">  
164 - <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}  
165 - </view>  
166 - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}  
167 - </view>  
168 - </view>  
169 - <view v-if="item.width" class="value-spec_val p12">*</view>  
170 - <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>  
171 - <view v-if="item.width" class="value-spec_box">  
172 - <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>  
173 - <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>  
174 - </view>  
175 - <view v-if="item.length" class="value-spec_val p12">*</view>  
176 - <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>  
177 - <view v-if="item.length" class="value-spec_box">  
178 - <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>  
179 - <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>  
180 - </view> 161 + <view class="value value-spec">
  162 + <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
  163 + <view v-if="item.thickness" class="value-spec_box">
  164 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{ item.thicknessTolPos ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
  165 + </view>
  166 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
  167 + </view>
181 </view> 168 </view>
  169 + <view v-if="item.width" class="value-spec_val p12">*</view>
  170 + <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
  171 + <view v-if="item.width" class="value-spec_box">
  172 + <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}</view>
  173 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}</view>
  174 + </view>
  175 + <view v-if="item.length" class="value-spec_val p12">*</view>
  176 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  177 + <view v-if="item.length" class="value-spec_box">
  178 + <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}</view>
  179 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}</view>
  180 + </view>
  181 + </view>
182 </view> 182 </view>
183 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view> 183 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
184 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view> 184 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
@@ -341,13 +341,13 @@ export default { @@ -341,13 +341,13 @@ export default {
341 } 341 }
342 return null 342 return null
343 } 343 }
344 - 344 +
345 let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度') 345 let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
346 if (err) { uni.showToast({ title: err, icon: 'none' }); return false } 346 if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
347 - 347 +
348 err = check(it.widthTolPos, it.widthTolNeg, '宽度') 348 err = check(it.widthTolPos, it.widthTolNeg, '宽度')
349 if (err) { uni.showToast({ title: err, icon: 'none' }); return false } 349 if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
350 - 350 +
351 err = check(it.lengthTolPos, it.lengthTolNeg, '长度') 351 err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
352 if (err) { uni.showToast({ title: err, icon: 'none' }); return false } 352 if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
353 } 353 }
@@ -26,9 +26,9 @@ @@ -26,9 +26,9 @@
26 <view class="value value-spec"> 26 <view class="value value-spec">
27 <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view> 27 <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
28 <view v-if="item.thickness" class="value-spec_box"> 28 <view v-if="item.thickness" class="value-spec_box">
29 - <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }} 29 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{ item.thicknessTolPos ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
30 </view> 30 </view>
31 - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }} 31 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
32 </view> 32 </view>
33 </view> 33 </view>
34 <view v-if="item.width" class="value-spec_val p12">*</view> 34 <view v-if="item.width" class="value-spec_val p12">*</view>