feat: 订货单-包装费放到产品里面，可输入-编辑&审核, 只读-审核详情&详情 number 大于等于0，可小数

史婷婷
1 parent 505e42a4
Showing 2 changed files with 41 additions and 14 deletions
pages/order_list/modify.vue
pages/order_list/product.vue
--- a/pages/order_list/modify.vue
View file @e407775
+++ b/pages/order_list/modify.vue
View file @e407775
@@ -68,17 +68,6 @@
               </view>
             </template>
           </uni-list-item>
-          <uni-list-item class="amount-item">
-            <template v-slot:body>
-              <view class="item-title"><text>包装费</text></view>
-            </template>
-            <template v-slot:footer>
-              <view class="amount-row">
-                <uni-easyinput type="number" v-model="form.packagingFee" placeholder="0.00" :inputBorder="false" />
-                <text class="unit">元</text>
-              </view>
-            </template>
-          </uni-list-item>
           <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
             @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
             <template v-slot:body>
@@ -276,6 +265,7 @@ export default {
       }
     },
     purchaseOrderLineListChange(data) {
+      console.log('purchaseOrderLineListChange__data', data)
       const list = Array.isArray(data) ? data : []
       this.form.purchaseOrderLineList = list;
     },
--- a/pages/order_list/product.vue
View file @e407775
+++ b/pages/order_list/product.vue
View file @e407775
@@ -52,8 +52,21 @@
                     <view class="row" :class="{ 'noneStyle': item.showSalesPrice }" v-if="item.showSalesPrice"><text
                             class="label">销售价格</text><text class="value">{{
                                 item.salesPrice }}</text></view>
-
                     <uni-list class="edit-list">
+                        <uni-list-item class="amount-item">
+                            <template v-slot:body>
+                                <view class="item-title"><text>包装费</text></view>
+                            </template>
+                            <template v-slot:footer>
+                                <view class="amount-row">
+                                    <uni-easyinput type="digit" v-model="item.packagingFee" placeholder="0.00"
+                                        :inputBorder="false"
+                                        @input="onNonNegativeNumberInput($event, item, idx, 'packagingFee')"
+                                        @blur="onNonNegativeNumberBlur(item, idx, 'packagingFee')" />
+                                    <text class="unit">元</text>
+                                </view>
+                            </template>
+                        </uni-list-item>
                         <uni-list-item title="发货日期">
                             <template v-slot:footer>
                                 <uni-datetime-picker type="date" v-model="item.deliveryDate" :start="minDeliveryDate"
@@ -114,6 +127,8 @@
                 <!-- showSalesPrice 判断是否显示 -->
                 <view class="row" v-if="item.showSalesPrice"><text class="label">销售价格</text><text class="value">{{
                     item.salesPrice }}</text></view>
+                <view class="row"><text class="label">包装费</text><text class="value">{{
+                    item.packagingFee }}</text></view>
                 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text>
                 </view>
                 <view class="row"><text class="label">考核超协</text><text class="value">{{ item.assessmentExceedsAgreement
@@ -187,7 +202,7 @@ export default {
     },
     methods: {
         defaultItem() {
-            return { collapsed: false }
+            return { collapsed: false, packagingFee: '' }
         },
         toggleItem(idx) {
             const it = this.items[idx]
@@ -196,7 +211,9 @@ export default {
             this.$set(this.items, idx, it)
         },
         emitChange() {
-            const out = this.items.map(it => ({ ...it }))
+            console.log('emitChange__items', this.items)
+            const out = this.items.map(it => JSON.parse(JSON.stringify(it)))
+            console.log('emitChange__out', out)
             this.$emit('input', out)
             this.$emit('update:value', out)
             this.$emit('change', out)
@@ -226,6 +243,26 @@ export default {
                 this.$set(this.items, idx, { ...item })
                 uni.showToast({ title: '发货日期必须大于订货日期', icon: 'none' })
             }
+        },
+        onNonNegativeNumberInput(val, item, idx, field) {
+            let v = String(val != null ? val : (item && item[field]) || '')
+            v = v.replace(/[^0-9.]/g, '')
+            v = v.replace(/(\..*)\./g, '$1')
+            if (v.startsWith('.')) v = '0' + v
+            if (v === '') { item[field] = ''; if (typeof idx === 'number') this.$set(this.items, idx, { ...item }); return }
+            const num = Number(v)
+            if (isNaN(num) || num < 0) {
+                item[field] = '0'
+            } else {
+                item[field] = v
+            }
+            if (typeof idx === 'number') this.$set(this.items, idx, { ...item })
+        },
+        onNonNegativeNumberBlur(item, idx, field) {
+            const v = String((item && item[field]) || '')
+            const num = Number(v)
+            if (isNaN(num) || num < 0) item[field] = '0'
+            if (typeof idx === 'number') this.$set(this.items, idx, { ...item })
         }
     }
 }