朱园亮 / erp-mobile · Commits

Commit 8e9444193e421dc9d94b7618479930658f95d8cc

Authored by gesilong
1 parent ad12a236

commit: bug修复

Inline Side-by-side
Showing 15 changed files with 35 additions and 35 deletions
@@ -234,7 +234,8 @@ export default { @@ -234,7 +234,8 @@ export default {
234 ] 234 ]
235 } 235 }
236 }, 236 },
237 - onLoad(options) { 237 + onShow() {
  238 + const options = this.$route.query || {}
238 const id = options && options.id ? options.id : '' 239 const id = options && options.id ? options.id : ''
239 this.id = id 240 this.id = id
240 this.loadDetail() 241 this.loadDetail()
@@ -163,20 +163,20 @@ @@ -163,20 +163,20 @@
163 <view v-if="item.thickness" class="value-spec_box"> 163 <view v-if="item.thickness" class="value-spec_box">
164 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }} 164 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
165 </view> 165 </view>
166 - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }} 166 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
167 </view> 167 </view>
168 </view> 168 </view>
169 <view v-if="item.width" class="value-spec_val p12">*</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> 170 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
171 <view v-if="item.width" class="value-spec_box"> 171 <view v-if="item.width" class="value-spec_box">
172 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view> 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> 173 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
174 </view> 174 </view>
175 <view v-if="item.length" class="value-spec_val p12">*</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> 176 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
177 <view v-if="item.length" class="value-spec_box"> 177 <view v-if="item.length" class="value-spec_box">
178 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view> 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> 179 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
180 </view> 180 </view>
181 </view> 181 </view>
182 </view> 182 </view>
@@ -304,7 +304,8 @@ export default { @@ -304,7 +304,8 @@ export default {
304 ] 304 ]
305 } 305 }
306 }, 306 },
307 - onLoad(options) { 307 + onShow() {
  308 + const options = this.$route.query || {}
308 const id = options && options.id ? options.id : '' 309 const id = options && options.id ? options.id : ''
309 this.id = id 310 this.id = id
310 this.loadDetail() 311 this.loadDetail()
@@ -165,20 +165,20 @@ @@ -165,20 +165,20 @@
165 <view v-if="item.thickness" class="value-spec_box"> 165 <view v-if="item.thickness" class="value-spec_box">
166 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }} 166 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
167 </view> 167 </view>
168 - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }} 168 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
169 </view> 169 </view>
170 </view> 170 </view>
171 <view v-if="item.width" class="value-spec_val p12">*</view> 171 <view v-if="item.width" class="value-spec_val p12">*</view>
172 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view> 172 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
173 <view v-if="item.width" class="value-spec_box"> 173 <view v-if="item.width" class="value-spec_box">
174 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view> 174 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
175 - <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view> 175 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
176 </view> 176 </view>
177 <view v-if="item.length" class="value-spec_val p12">*</view> 177 <view v-if="item.length" class="value-spec_val p12">*</view>
178 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view> 178 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
179 <view v-if="item.length" class="value-spec_box"> 179 <view v-if="item.length" class="value-spec_box">
180 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view> 180 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
181 - <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view> 181 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
182 </view> 182 </view>
183 </view> 183 </view>
184 </view> 184 </view>
@@ -311,7 +311,8 @@ export default { @@ -311,7 +311,8 @@ export default {
311 ] 311 ]
312 } 312 }
313 }, 313 },
314 - onLoad(options) { 314 + onShow() {
  315 + const options = this.$route.query || {}
315 const id = options && options.id ? options.id : '' 316 const id = options && options.id ? options.id : ''
316 this.id = id 317 this.id = id
317 this.loadDetail() 318 this.loadDetail()
@@ -163,20 +163,20 @@ @@ -163,20 +163,20 @@
163 <view v-if="item.thickness" class="value-spec_box"> 163 <view v-if="item.thickness" class="value-spec_box">
164 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }} 164 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
165 </view> 165 </view>
166 - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }} 166 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
167 </view> 167 </view>
168 </view> 168 </view>
169 <view v-if="item.width" class="value-spec_val p12">*</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> 170 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
171 <view v-if="item.width" class="value-spec_box"> 171 <view v-if="item.width" class="value-spec_box">
172 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view> 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> 173 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
174 </view> 174 </view>
175 <view v-if="item.length" class="value-spec_val p12">*</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> 176 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
177 <view v-if="item.length" class="value-spec_box"> 177 <view v-if="item.length" class="value-spec_box">
178 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view> 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> 179 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
180 </view> 180 </view>
181 </view> 181 </view>
182 </view> 182 </view>
@@ -224,7 +224,8 @@ export default { @@ -224,7 +224,8 @@ export default {
224 ] 224 ]
225 } 225 }
226 }, 226 },
227 - onLoad(options) { 227 + onShow() {
  228 + const options = this.$route.query || {}
228 const id = options && options.id ? options.id : '' 229 const id = options && options.id ? options.id : ''
229 this.id = id 230 this.id = id
230 this.loadDetail() 231 this.loadDetail()
@@ -187,20 +187,20 @@ @@ -187,20 +187,20 @@
187 <view v-if="item.thickness" class="value-spec_box"> 187 <view v-if="item.thickness" class="value-spec_box">
188 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }} 188 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
189 </view> 189 </view>
190 - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }} 190 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
191 </view> 191 </view>
192 </view> 192 </view>
193 <view v-if="item.width" class="value-spec_val p12">*</view> 193 <view v-if="item.width" class="value-spec_val p12">*</view>
194 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view> 194 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
195 <view v-if="item.width" class="value-spec_box"> 195 <view v-if="item.width" class="value-spec_box">
196 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view> 196 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
197 - <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view> 197 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
198 </view> 198 </view>
199 <view v-if="item.length" class="value-spec_val p12">*</view> 199 <view v-if="item.length" class="value-spec_val p12">*</view>
200 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view> 200 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
201 <view v-if="item.length" class="value-spec_box"> 201 <view v-if="item.length" class="value-spec_box">
202 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view> 202 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
203 - <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view> 203 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
204 </view> 204 </view>
205 </view> 205 </view>
206 </view> 206 </view>
@@ -632,13 +632,6 @@ export default { @@ -632,13 +632,6 @@ export default {
632 } 632 }
633 633
634 </script> 634 </script>
635 -<style>  
636 -/* 强制提升日历层级，解决被 footer 遮挡问题 */  
637 -.uni-calendar--mask,  
638 -.uni-calendar--fixed {  
639 - z-index: 9999 !important;  
640 -}  
641 -</style>  
642 <style lang="scss" scoped> 635 <style lang="scss" scoped>
643 .total { 636 .total {
644 .total-text { 637 .total-text {
@@ -227,7 +227,8 @@ export default { @@ -227,7 +227,8 @@ export default {
227 ] 227 ]
228 } 228 }
229 }, 229 },
230 - onLoad(options) { 230 + onShow() {
  231 + const options = this.$route.query || {}
231 const id = options && options.id ? options.id : '' 232 const id = options && options.id ? options.id : ''
232 const status = options && options.status ? options.status : '' 233 const status = options && options.status ? options.status : ''
233 this.id = id 234 this.id = id
@@ -158,20 +158,20 @@ @@ -158,20 +158,20 @@
158 <view v-if="item.thickness" class="value-spec_box"> 158 <view v-if="item.thickness" class="value-spec_box">
159 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }} 159 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
160 </view> 160 </view>
161 - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }} 161 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
162 </view> 162 </view>
163 </view> 163 </view>
164 <view v-if="item.width" class="value-spec_val p12">*</view> 164 <view v-if="item.width" class="value-spec_val p12">*</view>
165 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view> 165 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
166 <view v-if="item.width" class="value-spec_box"> 166 <view v-if="item.width" class="value-spec_box">
167 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view> 167 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
168 - <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view> 168 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
169 </view> 169 </view>
170 <view v-if="item.length" class="value-spec_val p12">*</view> 170 <view v-if="item.length" class="value-spec_val p12">*</view>
171 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view> 171 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
172 <view v-if="item.length" class="value-spec_box"> 172 <view v-if="item.length" class="value-spec_box">
173 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view> 173 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
174 - <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view> 174 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
175 </view> 175 </view>
176 </view> 176 </view>
177 </view> 177 </view>
@@ -290,7 +290,8 @@ export default { @@ -290,7 +290,8 @@ export default {
290 ] 290 ]
291 } 291 }
292 }, 292 },
293 - onLoad(options) { 293 + onShow() {
  294 + const options = this.$route.query || {}
294 const id = options && options.id ? options.id : '' 295 const id = options && options.id ? options.id : ''
295 this.id = id 296 this.id = id
296 this.loadDetail() 297 this.loadDetail()
@@ -158,20 +158,20 @@ @@ -158,20 +158,20 @@
158 <view v-if="item.thickness" class="value-spec_box"> 158 <view v-if="item.thickness" class="value-spec_box">
159 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }} 159 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
160 </view> 160 </view>
161 - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }} 161 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
162 </view> 162 </view>
163 </view> 163 </view>
164 <view v-if="item.width" class="value-spec_val p12">*</view> 164 <view v-if="item.width" class="value-spec_val p12">*</view>
165 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view> 165 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
166 <view v-if="item.width" class="value-spec_box"> 166 <view v-if="item.width" class="value-spec_box">
167 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view> 167 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
168 - <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view> 168 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
169 </view> 169 </view>
170 <view v-if="item.length" class="value-spec_val p12">*</view> 170 <view v-if="item.length" class="value-spec_val p12">*</view>
171 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view> 171 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
172 <view v-if="item.length" class="value-spec_box"> 172 <view v-if="item.length" class="value-spec_box">
173 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view> 173 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
174 - <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view> 174 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
175 </view> 175 </view>
176 </view> 176 </view>
177 </view> 177 </view>
@@ -296,7 +296,8 @@ export default { @@ -296,7 +296,8 @@ export default {
296 ] 296 ]
297 } 297 }
298 }, 298 },
299 - onLoad(options) { 299 + onShow() {
  300 + const options = this.$route.query || {}
300 const id = options && options.id ? options.id : '' 301 const id = options && options.id ? options.id : ''
301 this.id = id 302 this.id = id
302 this.loadDetail() 303 this.loadDetail()
@@ -158,20 +158,20 @@ @@ -158,20 +158,20 @@
158 <view v-if="item.thickness" class="value-spec_box"> 158 <view v-if="item.thickness" class="value-spec_box">
159 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }} 159 <view v-if="item.thicknessTolPos" class="value-spec_box_1">+{{ item.thicknessTolPos }}
160 </view> 160 </view>
161 - <view v-if="item.thicknessTolNeg" class="value-spec_box_2">-{{ item.thicknessTolNeg }} 161 + <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg }}
162 </view> 162 </view>
163 </view> 163 </view>
164 <view v-if="item.width" class="value-spec_val p12">*</view> 164 <view v-if="item.width" class="value-spec_val p12">*</view>
165 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view> 165 <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
166 <view v-if="item.width" class="value-spec_box"> 166 <view v-if="item.width" class="value-spec_box">
167 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view> 167 <view v-if="item.widthTolPos" class="value-spec_box_1">+{{ item.widthTolPos }}</view>
168 - <view v-if="item.widthTolNeg" class="value-spec_box_2">-{{ item.widthTolNeg }}</view> 168 + <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg }}</view>
169 </view> 169 </view>
170 <view v-if="item.length" class="value-spec_val p12">*</view> 170 <view v-if="item.length" class="value-spec_val p12">*</view>
171 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view> 171 <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
172 <view v-if="item.length" class="value-spec_box"> 172 <view v-if="item.length" class="value-spec_box">
173 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view> 173 <view v-if="item.lengthTolPos" class="value-spec_box_1">+{{ item.lengthTolPos }}</view>
174 - <view v-if="item.lengthTolNeg" class="value-spec_box_2">-{{ item.lengthTolNeg }}</view> 174 + <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg }}</view>
175 </view> 175 </view>
176 </view> 176 </view>
177 </view> 177 </view>