朱园亮 / erp-mobile · Commits

Commit efa1bbda865b78279373ec33747174383a725769

Authored by 史婷婷
1 parent b1b039ac

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

Inline Side-by-side
Showing 5 changed files with 20 additions and 27 deletions
... ... @@ -69,17 +69,6 @@
69 69 </view>
70 70 </template>
71 71 </uni-list-item>
72   - <uni-list-item class="amount-item">
73   - <template v-slot:body>
74   - <view class="item-title"><text>包装费</text></view>
75   - </template>
76   - <template v-slot:footer>
77   - <view class="amount-row">
78   - <uni-easyinput type="number" v-model="form.packagingFee" placeholder="0.00" :inputBorder="false" />
79   - <text class="unit">元</text>
80   - </view>
81   - </template>
82   - </uni-list-item>
83 72 <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
84 73 @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
85 74 <template v-slot:body>
... ...
... ... @@ -29,7 +29,6 @@
29 29 <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
30 30 <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view>
31 31 <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
32   - <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view>
33 32 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
34 33 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
35 34 <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{ form.executionStandardRemarks }}</text></view>
... ...
... ... @@ -68,17 +68,6 @@
68 68 </view>
69 69 </template>
70 70 </uni-list-item>
71   - <uni-list-item class="amount-item">
72   - <template v-slot:body>
73   - <view class="item-title"><text>包装费</text></view>
74   - </template>
75   - <template v-slot:footer>
76   - <view class="amount-row">
77   - <uni-easyinput type="number" v-model="form.packagingFee" placeholder="0.00" :inputBorder="false" />
78   - <text class="unit">元</text>
79   - </view>
80   - </template>
81   - </uni-list-item>
82 71 <uni-list-item class="select-item" :class="form.executionStandardName ? 'is-filled' : 'is-empty'" clickable
83 72 @click="openSheet('executionStandard')" :rightText="form.executionStandardName || '请选择'" showArrow>
84 73 <template v-slot:body>
... ...
... ... @@ -125,9 +125,24 @@
125 125 @blur="onNonNegativeNumberBlur(item, idx, 'salesPrice')" />
126 126 </template>
127 127 </uni-list-item>
  128 + <uni-list-item class="amount-item">
  129 + <template v-slot:body>
  130 + <view class="item-title"><text>包装费</text></view>
  131 + </template>
  132 + <template v-slot:footer>
  133 + <view class="amount-row">
  134 + <uni-easyinput type="digit" v-model="item.packagingFee" placeholder="0.00"
  135 + :inputBorder="false"
  136 + @input="onNonNegativeNumberInput($event, item, idx, 'packagingFee')"
  137 + @blur="onNonNegativeNumberBlur(item, idx, 'packagingFee')" />
  138 + <text class="unit">元</text>
  139 + </view>
  140 + </template>
  141 + </uni-list-item>
128 142 <uni-list-item title="发货日期">
129 143 <template v-slot:footer>
130   - <uni-datetime-picker type="date" v-model="item.deliveryDate" :start="minDeliveryDate" @change="onDeliveryChange($event, item, idx)" />
  144 + <uni-datetime-picker type="date" v-model="item.deliveryDate" :start="minDeliveryDate"
  145 + @change="onDeliveryChange($event, item, idx)" />
131 146 </template>
132 147 </uni-list-item>
133 148 <uni-list-item title="考核超协">
... ... @@ -187,10 +202,12 @@
187 202 <!-- showSalesPrice 判断是否显示 -->
188 203 <view class="row" v-if="item.showSalesPrice"><text class="label">销售价格</text><text class="value">{{
189 204 item.salesPrice }}</text></view>
  205 + <view class="row"><text class="label">包装费</text><text class="value">{{
  206 + item.packagingFee }}</text></view>
190 207 <view class="row"><text class="label">发货日期</text><text class="value">{{ item.deliveryDate }}</text>
191 208 </view>
192 209 <view class="row"><text class="label">考核超协</text><text class="value">{{ item.assessmentExceedsAgreement
193   - }}</text></view>
  210 + }}</text></view>
194 211 </view>
195 212 <view class="view-total">
196 213 <view class="head">合计</view>
... ... @@ -220,7 +237,7 @@ export default {
220 237 collapsedView: false,
221 238 }
222 239 },
223   - computed: {
  240 + computed: {
224 241 minDeliveryDate() {
225 242 const s = this.orderDate
226 243 if (!s) return ''
... ...
... ... @@ -29,7 +29,6 @@
29 29 <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
30 30 <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view>
31 31 <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
32   - <view class="row"><text class="label">包装费</text><text class="value">{{ form.packagingFee }}</text></view>
33 32 <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
34 33 form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
35 34 <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text class="value">{{
... ...