朱园亮 / erp-mobile · Commits

Commit 51aa83bb417bb7f944e41ad96b84caae976ec5c2

Authored by gesilong
1 parent 3b823a87

Changes

Inline Side-by-side
Showing 2 changed files with 2 additions and 20 deletions
... ... @@ -90,11 +90,6 @@
90 90 placeholder="不可编辑" />
91 91 </template>
92 92 </uni-list-item>
93   - <uni-list-item title="本次锁价数量">
94   - <template v-slot:footer>
95   - <uni-easyinput v-model="item.currentQuantity" type="number" :inputBorder="false" placeholder="请输入本次锁价数量" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'currentQuantity', 3)" />
96   - </template>
97   - </uni-list-item>
98 93 <uni-list-item title="单价">
99 94 <template v-slot:footer>
100 95 <uni-easyinput v-model="item.unitPrice" type="digit" :inputBorder="false"
... ... @@ -280,7 +275,6 @@ export default {
280 275 lengthTolNeg: v.lengthTolNeg || '',
281 276 materialCode: v.materialCode || '',
282 277 status: v.status || '',
283   - currentQuantity: v.currentQuantity === 0 ? 0 : (v.currentQuantity || ''),
284 278 quantity: v.productQuantity || v.quantity || '',
285 279 unitPrice: v.unitPrice || '',
286 280 // amountExcludingTax: v.amountExcludingTax || 0,
... ... @@ -361,7 +355,6 @@ export default {
361 355 this.items = this.items.map((it, i) => ({
362 356 ...it,
363 357 quantity: '',
364   - currentQuantity: '',
365 358 unitPrice: '',
366 359 // amountExcludingTax: 0
367 360 }))
... ... @@ -371,12 +364,10 @@ export default {
371 364 const raw = { ...(it.raw || {}) }
372 365 const qty = this.toNumber(it.quantity)
373 366 const price = this.toNumber(it.unitPrice)
374   - const curQtyRaw = it.currentQuantity
375 367 const total = this.toNumber(it.totalAmount)
376 368 // const excl = this.toNumber(it.amountExcludingTax)
377 369 if (Object.prototype.hasOwnProperty.call(raw, 'productQuantity')) raw.productQuantity = qty
378 370 else raw.quantity = qty
379   - raw.currentQuantity = (curQtyRaw === '' || curQtyRaw === null || curQtyRaw === undefined) ? null : this.toNumber(curQtyRaw)
380 371 raw.unitPrice = price
381 372 raw.totalAmount = total
382 373 raw.deliveryDate = it.deliveryDate
... ... @@ -821,4 +812,4 @@ export default {
821 812 height: 60rpx;
822 813 align-items: center;
823 814 }
824   -</style>
  815 +</style>
\ No newline at end of file
... ...
... ... @@ -84,11 +84,6 @@
84 84 <uni-easyinput v-model="item.quantity" type="number" :inputBorder="false" disabled placeholder="不可编辑" />
85 85 </template>
86 86 </uni-list-item>
87   - <uni-list-item title="本次锁价数量">
88   - <template v-slot:footer>
89   - <uni-easyinput v-model="item.currentQuantity" type="number" :inputBorder="false" placeholder="请输入本次锁价数量" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'currentQuantity', 3)" />
90   - </template>
91   - </uni-list-item>
92 87 <uni-list-item title="单价">
93 88 <template v-slot:footer>
94 89 <uni-easyinput v-model="item.unitPrice" type="digit" :inputBorder="false" placeholder="请输入单价" @input="onImmediateChange(idx)" @blur="onNumberBlur(idx, 'unitPrice', 0)" />
... ... @@ -268,7 +263,6 @@ export default {
268 263 materialCode: v.materialCode || '',
269 264 status: v.status || '',
270 265 quantity: v.productQuantity || v.quantity || '',
271   - currentQuantity: v.currentQuantity === 0 ? 0 : (v.currentQuantity || ''),
272 266 unitPrice: v.unitPrice || '',
273 267 amountExcludingTax: v.amountExcludingTax || 0,
274 268 totalAmount: v.totalAmount || 0,
... ... @@ -348,7 +342,6 @@ export default {
348 342 this.items = this.items.map((it, i) => ({
349 343 ...it,
350 344 quantity: '',
351   - currentQuantity: '',
352 345 unitPrice: '',
353 346 amountExcludingTax: 0
354 347 }))
... ... @@ -357,13 +350,11 @@ export default {
357 350 const selected = this.items.filter(it => it.locked).map(it => {
358 351 const raw = { ...(it.raw || {}) }
359 352 const qty = this.toNumber(it.quantity)
360   - const curQtyRaw = it.currentQuantity
361 353 const price = this.toNumber(it.unitPrice)
362 354 const total = this.toNumber(it.totalAmount)
363 355 const excl = this.toNumber(it.amountExcludingTax)
364 356 if (Object.prototype.hasOwnProperty.call(raw, 'productQuantity')) raw.productQuantity = qty
365 357 else raw.quantity = qty
366   - raw.currentQuantity = (curQtyRaw === '' || curQtyRaw === null || curQtyRaw === undefined) ? null : this.toNumber(curQtyRaw)
367 358 raw.unitPrice = price
368 359 raw.totalAmount = total
369 360 raw.amountExcludingTax = excl
... ... @@ -803,4 +794,4 @@ export default {
803 794 height: 60rpx;
804 795 align-items: center;
805 796 }
806   -</style>
  797 +</style>
\ No newline at end of file
... ...