朱园亮 / erp-mobile · Commits

Commit 8f71e713ea0c5291f5025ff452c1d243ad68bf8b

Authored by 史婷婷
2 parents 3a71badb 3cc0f6c3

Merge remote-tracking branch 'origin/cjerp-1.0_20260116' into cjerp-1.0_20260122-sydd

Inline Side-by-side
Showing 2 changed files with 26 additions and 26 deletions
@@ -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>
@@ -164,27 +164,27 @@ @@ -164,27 +164,27 @@
164 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view> 164 <view class="row"><text class="label">品质</text><text class="value">{{ item.quality }}</text></view>
165 <!-- 厚（公差） * 宽（公差） * 长（公差） --> 165 <!-- 厚（公差） * 宽（公差） * 长（公差） -->
166 <view class="row row-spec"><text class="label">规格(mm)</text> 166 <view class="row row-spec"><text class="label">规格(mm)</text>
167 - <view class="value value-spec">  
168 - <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>  
169 - <view v-if="item.thickness" class="value-spec_box">  
170 - <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}  
171 - </view>  
172 - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}  
173 - </view>  
174 - </view>  
175 - <view v-if="item.width" class="value-spec_val p12">*</view>  
176 - <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>  
177 - <view v-if="item.width" class="value-spec_box">  
178 - <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>  
179 - <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>  
180 - </view>  
181 - <view v-if="item.length" class="value-spec_val p12">*</view>  
182 - <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>  
183 - <view v-if="item.length" class="value-spec_box">  
184 - <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>  
185 - <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>  
186 - </view> 167 + <view class="value value-spec">
  168 + <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
  169 + <view v-if="item.thickness" class="value-spec_box">
  170 + <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{ item.thicknessTolPos ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
  171 + </view>
  172 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
  173 + </view>
187 </view> 174 </view>
  175 + <view v-if="item.width" class="value-spec_val p12">*</view>
  176 + <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
  177 + <view v-if="item.width" class="value-spec_box">
  178 + <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}</view>
  179 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}</view>
  180 + </view>
  181 + <view v-if="item.length" class="value-spec_val p12">*</view>
  182 + <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
  183 + <view v-if="item.length" class="value-spec_box">
  184 + <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos }}</view>
  185 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg }}</view>
  186 + </view>
  187 + </view>
188 </view> 188 </view>
189 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view> 189 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
190 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view> 190 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
@@ -348,13 +348,13 @@ export default { @@ -348,13 +348,13 @@ export default {
348 } 348 }
349 return null 349 return null
350 } 350 }
351 - 351 +
352 let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度') 352 let err = check(it.thicknessTolPos, it.thicknessTolNeg, '厚度')
353 if (err) { uni.showToast({ title: err, icon: 'none' }); return false } 353 if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
354 - 354 +
355 err = check(it.widthTolPos, it.widthTolNeg, '宽度') 355 err = check(it.widthTolPos, it.widthTolNeg, '宽度')
356 if (err) { uni.showToast({ title: err, icon: 'none' }); return false } 356 if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
357 - 357 +
358 err = check(it.lengthTolPos, it.lengthTolNeg, '长度') 358 err = check(it.lengthTolPos, it.lengthTolNeg, '长度')
359 if (err) { uni.showToast({ title: err, icon: 'none' }); return false } 359 if (err) { uni.showToast({ title: err, icon: 'none' }); return false }
360 } 360 }
@@ -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>