Commit 0e34d852c1a6f1d988b532229974bb7d399b2fbf
1 parent
c7a083a5
Exists in
master
and in
1 other branch
fix: 货源
Showing
6 changed files
with
44 additions
and
18 deletions
Show diff stats
pages/goodSource/add.vue
| ... | ... | @@ -75,7 +75,7 @@ |
| 75 | 75 | <template v-if="more"> |
| 76 | 76 | <view class="card"> |
| 77 | 77 | <u-form-item label="订单备注"> |
| 78 | - <u-input v-model="form.remark" border="none" suffix-icon="arrow-right" placeholder="请输入，选填" /> | |
| 78 | + <u-input v-model="form.remark" border="none" placeholder="请输入，选填" /> | |
| 79 | 79 | </u-form-item> |
| 80 | 80 | </view> |
| 81 | 81 | <view class="card"> | ... | ... |
pages/goodSource/card.vue
| ... | ... | @@ -62,7 +62,7 @@ |
| 62 | 62 | </view> |
| 63 | 63 | </view> |
| 64 | 64 | <view v-if="!onlyShow" class="cc-operate"> |
| 65 | - <view class="price-box"> | |
| 65 | + <view class="price-box" style="white-space: nowrap"> | |
| 66 | 66 | <template v-if="item.priceType === 'TON'"> |
| 67 | 67 | <text class="com-price">{{ item.weightUnitPrice }}</text> |
| 68 | 68 | 元/吨 | ... | ... |
pages/goodSource/grab-record.vue
| ... | ... | @@ -6,8 +6,8 @@ |
| 6 | 6 | <view class="quick-tag"> |
| 7 | 7 | <view class="quick-tag-group"> |
| 8 | 8 | <view class="quick-tag-item" :class="searchForm.vehicleLicenseNum ? 'active' : ''" @click="onSelectPlate"> |
| 9 | - <text>{{ searchForm.vehicleLicenseNum || '车牌号' }}</text> | |
| 10 | - <view @click.stop="clearSearchForm('vehicleLicenseNum')" v-if="searchForm.vehicleLicenseNum" style="position: absolute; right: 0"> | |
| 9 | + <view class="value">{{ searchForm.vehicleLicenseNum || '车牌号' }}</view> | |
| 10 | + <view @click.stop="clearSearchForm('vehicleLicenseNum')" v-if="searchForm.vehicleLicenseNum" style="width: 10px; padding: 0 2px"> | |
| 11 | 11 | <u-icon name="close-circle"></u-icon> |
| 12 | 12 | </view> |
| 13 | 13 | <view v-else class="sx-img"> |
| ... | ... | @@ -15,8 +15,8 @@ |
| 15 | 15 | </view> |
| 16 | 16 | </view> |
| 17 | 17 | <view class="quick-tag-item" :class="searchForm.driverName ? 'active' : ''" @click="selectQuickTag({ key: 'driverName', value: searchForm.driverName })"> |
| 18 | - <text>{{ searchForm.driverName || '司机姓名' }}</text> | |
| 19 | - <view @click.stop="clearSearchForm('driverName')" v-if="searchForm.driverName" style="position: absolute; right: 0"> | |
| 18 | + <view class="value">{{ searchForm.driverName || '司机姓名' }}</view> | |
| 19 | + <view @click.stop="clearSearchForm('driverName')" v-if="searchForm.driverName" style="width: 10px; padding: 0 2px"> | |
| 20 | 20 | <u-icon name="close-circle"></u-icon> |
| 21 | 21 | </view> |
| 22 | 22 | <view v-else class="sx-img"> |
| ... | ... | @@ -24,8 +24,8 @@ |
| 24 | 24 | </view> |
| 25 | 25 | </view> |
| 26 | 26 | <view class="quick-tag-item" :class="searchForm.driverMobile ? 'active' : ''" @click="selectQuickTag({ key: 'driverMobile', value: searchForm.driverMobile })"> |
| 27 | - <text>{{ searchForm.driverMobile || '司机手机' }}</text> | |
| 28 | - <view @click.stop="clearSearchForm('driverMobile')" v-if="searchForm.driverMobile" style="position: absolute; right: 0"> | |
| 27 | + <view class="value">{{ searchForm.driverMobile || '司机手机' }}</view> | |
| 28 | + <view @click.stop="clearSearchForm('driverMobile')" v-if="searchForm.driverMobile" style="width: 10px; padding: 0 2px"> | |
| 29 | 29 | <u-icon name="close-circle"></u-icon> |
| 30 | 30 | </view> |
| 31 | 31 | <view v-else class="sx-img"> |
| ... | ... | @@ -316,7 +316,11 @@ export default { |
| 316 | 316 | font-weight: 400; |
| 317 | 317 | color: #2673fb; |
| 318 | 318 | } |
| 319 | - | |
| 319 | + .value { | |
| 320 | + white-space: nowrap; | |
| 321 | + overflow: hidden; | |
| 322 | + flex: 1; | |
| 323 | + } | |
| 320 | 324 | .sx-img { |
| 321 | 325 | height: 12upx; |
| 322 | 326 | width: 14upx; | ... | ... |
pages/goodSource/index.vue
| ... | ... | @@ -6,18 +6,17 @@ |
| 6 | 6 | <view class="quick-tag"> |
| 7 | 7 | <view class="quick-tag-group"> |
| 8 | 8 | <view class="quick-tag-item" :class="searchForm.projectCode ? 'active' : ''" @click="selectQuickTag({ key: 'projectCode', value: searchForm.projectCode })"> |
| 9 | - <text>{{ searchForm.projectName || '所属项目' }}</text> | |
| 10 | - <view @click.stop="clearProject" v-if="searchForm.projectCode" style="position: absolute; right: 0"> | |
| 9 | + <view class="value">{{ searchForm.projectName || '所属项目' }}</view> | |
| 10 | + <view @click.stop="clearProject" v-if="searchForm.projectCode" style="width: 10px; padding: 0 2px"> | |
| 11 | 11 | <u-icon name="close-circle"></u-icon> |
| 12 | 12 | </view> |
| 13 | 13 | <view v-else class="sx-img"> |
| 14 | - <!-- <image class="sx-image" :src="formatImagePath('active-down')"></image>--> | |
| 15 | 14 | <image class="sx-image" :src="formatImagePath('down')"></image> |
| 16 | 15 | </view> |
| 17 | 16 | </view> |
| 18 | 17 | <view class="quick-tag-item" :class="searchForm.startCityCode ? 'active' : ''" @click="selectQuickTag({ key: 'startCityCode', value: searchForm.startCityCode })"> |
| 19 | - <text>{{ searchForm.startCityName || '始发地' }}</text> | |
| 20 | - <view @click.stop="clearStartCity" v-if="searchForm.startCityCode" style="position: absolute; right: 0"> | |
| 18 | + <view class="value">{{ searchForm.startCityName || '始发地' }}</view> | |
| 19 | + <view @click.stop="clearStartCity" v-if="searchForm.startCityCode" style="width: 10px; padding: 0 2px"> | |
| 21 | 20 | <u-icon name="close-circle"></u-icon> |
| 22 | 21 | </view> |
| 23 | 22 | <view v-else class="sx-img"> |
| ... | ... | @@ -26,12 +25,11 @@ |
| 26 | 25 | </view> |
| 27 | 26 | </view> |
| 28 | 27 | <view class="quick-tag-item" :class="searchForm.endCityCode ? 'active' : ''" @click="selectQuickTag({ key: 'endCityCode', value: searchForm.endCityCode })"> |
| 29 | - <text>{{ searchForm.endCityName || '目的地' }}</text> | |
| 30 | - <view @click.stop="clearEndCity" v-if="searchForm.endCityCode" style="position: absolute; right: 0"> | |
| 28 | + <view class="value">{{ searchForm.endCityName || '目的地' }}</view> | |
| 29 | + <view @click.stop="clearEndCity" v-if="searchForm.endCityCode" style="width: 10px; padding: 0 2px"> | |
| 31 | 30 | <u-icon name="close-circle"></u-icon> |
| 32 | 31 | </view> |
| 33 | 32 | <view v-else class="sx-img"> |
| 34 | - <!-- <image v-if="searchForm.endCityCode" class="sx-image" :src="formatImagePath('active-down')"></image>--> | |
| 35 | 33 | <image class="sx-image" :src="formatImagePath('down')"></image> |
| 36 | 34 | </view> |
| 37 | 35 | </view> |
| ... | ... | @@ -377,6 +375,12 @@ export default { |
| 377 | 375 | color: #2673fb; |
| 378 | 376 | } |
| 379 | 377 | |
| 378 | + .value { | |
| 379 | + white-space: nowrap; | |
| 380 | + overflow: hidden; | |
| 381 | + flex: 1; | |
| 382 | + } | |
| 383 | + | |
| 380 | 384 | .sx-img { |
| 381 | 385 | height: 12upx; |
| 382 | 386 | width: 14upx; | ... | ... |
pages/order/add.vue
| ... | ... | @@ -593,7 +593,7 @@ export default { |
| 593 | 593 | uni.$u.debounce(this.getServiceAmountInfo, 500); |
| 594 | 594 | }, |
| 595 | 595 | computedPaid() { |
| 596 | - if (this.eventCode) { | |
| 596 | + if (this.eventCode && this.form.priceType === 'TON') { | |
| 597 | 597 | this.form.paidAmount = Number(Number(this.form.goodsWeight) * Number(this.form.weightUnitPrice)).toFixed(2); |
| 598 | 598 | this.computedService(); |
| 599 | 599 | } | ... | ... |
pages/order/change-fee.vue
| ... | ... | @@ -2,6 +2,18 @@ |
| 2 | 2 | <Page name="change-fee"> |
| 3 | 3 | <template #content> |
| 4 | 4 | <u-alert type="warning" description="注意：只支持修改总运费，未支付或支付失败的款项"></u-alert> |
| 5 | + <view class="card" v-if="item.priceType === 'TON'"> | |
| 6 | + <view class="item"> | |
| 7 | + <view class="td">运输单价</view> | |
| 8 | + <view class="amount">￥{{ item.weightUnitPrice }}</view> | |
| 9 | + </view> | |
| 10 | + <view class="item"> | |
| 11 | + <view class="td">货物吨位</view> | |
| 12 | + <view class="amount"> | |
| 13 | + <u-input type="digit" @change="changeGoodsWeight" v-model="form.goodsWeight" suffix-icon="arrow-right" border="none" placeholder="请输入"> </u-input> | |
| 14 | + </view> | |
| 15 | + </view> | |
| 16 | + </view> | |
| 5 | 17 | <view class="card"> |
| 6 | 18 | <view class="item"> |
| 7 | 19 | <view class="th">费用项</view> |
| ... | ... | @@ -134,6 +146,7 @@ export default { |
| 134 | 146 | deliveryAmount: '', |
| 135 | 147 | prepaidAmount: '', |
| 136 | 148 | balancePaymentAmount: '', |
| 149 | + goodsWeight: '', | |
| 137 | 150 | }, |
| 138 | 151 | }; |
| 139 | 152 | }, |
| ... | ... | @@ -195,6 +208,11 @@ export default { |
| 195 | 208 | this.updateAfterAmount(this.item.orderFeePayPlanList); |
| 196 | 209 | }); |
| 197 | 210 | }, |
| 211 | + changeGoodsWeight() { | |
| 212 | + let paidAmount = Number(this.item.weightUnitPrice) * Number(this.form.goodsWeight); | |
| 213 | + this.form.paidAmount = paidAmount.toFixed(2); | |
| 214 | + this.computedService(); | |
| 215 | + }, | |
| 198 | 216 | updateAfterAmount(list) { |
| 199 | 217 | let oilPay = list.filter(i => i.type === 'OIL_COST')[0]; |
| 200 | 218 | let prePay = list.filter(i => i.type === 'OUT_INVITE_PRE')[0]; | ... | ... |