frontend / freight-ma

Download as
Browse Code »

Commit 0e34d852c1a6f1d988b532229974bb7d399b2fbf

Authored by lxf
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
  Diff comments   View file @0e34d85
@@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
75 <template v-if="more"> 75 <template v-if="more">
76 <view class="card"> 76 <view class="card">
77 <u-form-item label="订单备注"> 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 </u-form-item> 79 </u-form-item>
80 </view> 80 </view>
81 <view class="card"> 81 <view class="card">
pages/goodSource/card.vue
  Diff comments   View file @0e34d85
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 </view> 62 </view>
63 </view> 63 </view>
64 <view v-if="!onlyShow" class="cc-operate"> 64 <view v-if="!onlyShow" class="cc-operate">
65 - <view class="price-box"> 65 + <view class="price-box" style="white-space: nowrap">
66 <template v-if="item.priceType === 'TON'"> 66 <template v-if="item.priceType === 'TON'">
67 <text class="com-price">{{ item.weightUnitPrice }}</text> 67 <text class="com-price">{{ item.weightUnitPrice }}</text>
68 元/吨 68 元/吨
pages/goodSource/grab-record.vue
  Diff comments   View file @0e34d85
@@ -6,8 +6,8 @@ @@ -6,8 +6,8 @@
6 <view class="quick-tag"> 6 <view class="quick-tag">
7 <view class="quick-tag-group"> 7 <view class="quick-tag-group">
8 <view class="quick-tag-item" :class="searchForm.vehicleLicenseNum ? 'active' : ''" @click="onSelectPlate"> 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 <u-icon name="close-circle"></u-icon> 11 <u-icon name="close-circle"></u-icon>
12 </view> 12 </view>
13 <view v-else class="sx-img"> 13 <view v-else class="sx-img">
@@ -15,8 +15,8 @@ @@ -15,8 +15,8 @@
15 </view> 15 </view>
16 </view> 16 </view>
17 <view class="quick-tag-item" :class="searchForm.driverName ? 'active' : ''" @click="selectQuickTag({ key: 'driverName', value: searchForm.driverName })"> 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 <u-icon name="close-circle"></u-icon> 20 <u-icon name="close-circle"></u-icon>
21 </view> 21 </view>
22 <view v-else class="sx-img"> 22 <view v-else class="sx-img">
@@ -24,8 +24,8 @@ @@ -24,8 +24,8 @@
24 </view> 24 </view>
25 </view> 25 </view>
26 <view class="quick-tag-item" :class="searchForm.driverMobile ? 'active' : ''" @click="selectQuickTag({ key: 'driverMobile', value: searchForm.driverMobile })"> 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 <u-icon name="close-circle"></u-icon> 29 <u-icon name="close-circle"></u-icon>
30 </view> 30 </view>
31 <view v-else class="sx-img"> 31 <view v-else class="sx-img">
@@ -316,7 +316,11 @@ export default { @@ -316,7 +316,11 @@ export default {
316 font-weight: 400; 316 font-weight: 400;
317 color: #2673fb; 317 color: #2673fb;
318 } 318 }
319 - 319 + .value {
  320 + white-space: nowrap;
  321 + overflow: hidden;
  322 + flex: 1;
  323 + }
320 .sx-img { 324 .sx-img {
321 height: 12upx; 325 height: 12upx;
322 width: 14upx; 326 width: 14upx;
pages/goodSource/index.vue
  Diff comments   View file @0e34d85
@@ -6,18 +6,17 @@ @@ -6,18 +6,17 @@
6 <view class="quick-tag"> 6 <view class="quick-tag">
7 <view class="quick-tag-group"> 7 <view class="quick-tag-group">
8 <view class="quick-tag-item" :class="searchForm.projectCode ? 'active' : ''" @click="selectQuickTag({ key: 'projectCode', value: searchForm.projectCode })"> 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 <u-icon name="close-circle"></u-icon> 11 <u-icon name="close-circle"></u-icon>
12 </view> 12 </view>
13 <view v-else class="sx-img"> 13 <view v-else class="sx-img">
14 - <!-- <image class="sx-image" :src="formatImagePath('active-down')"></image>-->  
15 <image class="sx-image" :src="formatImagePath('down')"></image> 14 <image class="sx-image" :src="formatImagePath('down')"></image>
16 </view> 15 </view>
17 </view> 16 </view>
18 <view class="quick-tag-item" :class="searchForm.startCityCode ? 'active' : ''" @click="selectQuickTag({ key: 'startCityCode', value: searchForm.startCityCode })"> 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 <u-icon name="close-circle"></u-icon> 20 <u-icon name="close-circle"></u-icon>
22 </view> 21 </view>
23 <view v-else class="sx-img"> 22 <view v-else class="sx-img">
@@ -26,12 +25,11 @@ @@ -26,12 +25,11 @@
26 </view> 25 </view>
27 </view> 26 </view>
28 <view class="quick-tag-item" :class="searchForm.endCityCode ? 'active' : ''" @click="selectQuickTag({ key: 'endCityCode', value: searchForm.endCityCode })"> 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 <u-icon name="close-circle"></u-icon> 30 <u-icon name="close-circle"></u-icon>
32 </view> 31 </view>
33 <view v-else class="sx-img"> 32 <view v-else class="sx-img">
34 - <!-- <image v-if="searchForm.endCityCode" class="sx-image" :src="formatImagePath('active-down')"></image>-->  
35 <image class="sx-image" :src="formatImagePath('down')"></image> 33 <image class="sx-image" :src="formatImagePath('down')"></image>
36 </view> 34 </view>
37 </view> 35 </view>
@@ -377,6 +375,12 @@ export default { @@ -377,6 +375,12 @@ export default {
377 color: #2673fb; 375 color: #2673fb;
378 } 376 }
379 377
  378 + .value {
  379 + white-space: nowrap;
  380 + overflow: hidden;
  381 + flex: 1;
  382 + }
  383 +
380 .sx-img { 384 .sx-img {
381 height: 12upx; 385 height: 12upx;
382 width: 14upx; 386 width: 14upx;
pages/order/add.vue
  Diff comments   View file @0e34d85
@@ -593,7 +593,7 @@ export default { @@ -593,7 +593,7 @@ export default {
593 uni.$u.debounce(this.getServiceAmountInfo, 500); 593 uni.$u.debounce(this.getServiceAmountInfo, 500);
594 }, 594 },
595 computedPaid() { 595 computedPaid() {
596 - if (this.eventCode) { 596 + if (this.eventCode && this.form.priceType === 'TON') {
597 this.form.paidAmount = Number(Number(this.form.goodsWeight) * Number(this.form.weightUnitPrice)).toFixed(2); 597 this.form.paidAmount = Number(Number(this.form.goodsWeight) * Number(this.form.weightUnitPrice)).toFixed(2);
598 this.computedService(); 598 this.computedService();
599 } 599 }
pages/order/change-fee.vue
  Diff comments   View file @0e34d85
@@ -2,6 +2,18 @@ @@ -2,6 +2,18 @@
2 <Page name="change-fee"> 2 <Page name="change-fee">
3 <template #content> 3 <template #content>
4 <u-alert type="warning" description="注意：只支持修改总运费，未支付或支付失败的款项"></u-alert> 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 <view class="card"> 17 <view class="card">
6 <view class="item"> 18 <view class="item">
7 <view class="th">费用项</view> 19 <view class="th">费用项</view>
@@ -134,6 +146,7 @@ export default { @@ -134,6 +146,7 @@ export default {
134 deliveryAmount: '', 146 deliveryAmount: '',
135 prepaidAmount: '', 147 prepaidAmount: '',
136 balancePaymentAmount: '', 148 balancePaymentAmount: '',
  149 + goodsWeight: '',
137 }, 150 },
138 }; 151 };
139 }, 152 },
@@ -195,6 +208,11 @@ export default { @@ -195,6 +208,11 @@ export default {
195 this.updateAfterAmount(this.item.orderFeePayPlanList); 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 updateAfterAmount(list) { 216 updateAfterAmount(list) {
199 let oilPay = list.filter(i => i.type === 'OIL_COST')[0]; 217 let oilPay = list.filter(i => i.type === 'OIL_COST')[0];
200 let prePay = list.filter(i => i.type === 'OUT_INVITE_PRE')[0]; 218 let prePay = list.filter(i => i.type === 'OUT_INVITE_PRE')[0];