feat: 规格变更单-包装费放到产品里面，可输入-新增&编辑,只读-查看&审核&审核详情 number 大于等于0，可小数

史婷婷
1 parent b1b039ac
Showing 5 changed files with 20 additions and 27 deletions
pages/change_list/add.vue
pages/change_list/detail.vue
pages/change_list/modify.vue
pages/change_list/product.vue
pages/change_list/viewer.vue
--- a/pages/change_list/add.vue
View file @efa1bbd
+++ b/pages/change_list/add.vue
View file @efa1bbd
@@ -69,17 +69,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>
--- a/pages/change_list/detail.vue
View file @efa1bbd
+++ b/pages/change_list/detail.vue
View file @efa1bbd
@@ -29,7 +29,6 @@
           <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
           <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view>
           <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
-          <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view>
           <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
             form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
           <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{ form.executionStandardRemarks }}</text></view>
--- a/pages/change_list/modify.vue
View file @efa1bbd
+++ b/pages/change_list/modify.vue
View file @efa1bbd
@@ -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>
--- a/pages/change_list/product.vue
View file @efa1bbd
+++ b/pages/change_list/product.vue
View file @efa1bbd
@@ -125,9 +125,24 @@
                                     @blur="onNonNegativeNumberBlur(item, idx, 'salesPrice')" />
                             </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="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" @change="onDeliveryChange($event, item, idx)" />
+                                <uni-datetime-picker type="date" v-model="item.deliveryDate" :start="minDeliveryDate"
+                                    @change="onDeliveryChange($event, item, idx)" />
                             </template>
                         </uni-list-item>
                         <uni-list-item title="考核超协">
@@ -187,10 +202,12 @@
                 <!-- 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
-                }}</text></view>
+                        }}</text></view>
             </view>
             <view class="view-total">
                 <view class="head">合计</view>
@@ -220,7 +237,7 @@ export default {
             collapsedView: false,
         }
     },
-     computed: {
+    computed: {
         minDeliveryDate() {
             const s = this.orderDate
             if (!s) return ''
--- a/pages/change_list/viewer.vue
View file @efa1bbd
+++ b/pages/change_list/viewer.vue
View file @efa1bbd
@@ -29,7 +29,6 @@
       <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
       <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view>
       <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
-      <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view>
       <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
         form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
       <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{