From 0e34d852c1a6f1d988b532229974bb7d399b2fbf Mon Sep 17 00:00:00 2001
From: lxf <xunfeng1122@163.com>
Date: Thu, 3 Jul 2025 11:05:30 +0800
Subject: [PATCH] fix: 货源

---
 pages/goodSource/add.vue         |  2 +-
 pages/goodSource/card.vue        |  2 +-
 pages/goodSource/grab-record.vue | 18 +++++++++++-------
 pages/goodSource/index.vue       | 20 ++++++++++++--------
 pages/order/add.vue              |  2 +-
 pages/order/change-fee.vue       | 18 ++++++++++++++++++
 6 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/pages/goodSource/add.vue b/pages/goodSource/add.vue
index c9dd3bc..34c8c67 100644
--- a/pages/goodSource/add.vue
+++ b/pages/goodSource/add.vue
@@ -75,7 +75,7 @@
         <template v-if="more">
           <view class="card">
             <u-form-item label="订单备注">
-              <u-input v-model="form.remark" border="none" suffix-icon="arrow-right" placeholder="请输入，选填" />
+              <u-input v-model="form.remark" border="none" placeholder="请输入，选填" />
             </u-form-item>
           </view>
           <view class="card">
diff --git a/pages/goodSource/card.vue b/pages/goodSource/card.vue
index 6b1afa7..f805467 100644
--- a/pages/goodSource/card.vue
+++ b/pages/goodSource/card.vue
@@ -62,7 +62,7 @@
         </view>
       </view>
       <view v-if="!onlyShow" class="cc-operate">
-        <view class="price-box">
+        <view class="price-box" style="white-space: nowrap">
           <template v-if="item.priceType === 'TON'">
             <text class="com-price">{{ item.weightUnitPrice }}</text>
             元/吨
diff --git a/pages/goodSource/grab-record.vue b/pages/goodSource/grab-record.vue
index 521120e..1d2e46b 100644
--- a/pages/goodSource/grab-record.vue
+++ b/pages/goodSource/grab-record.vue
@@ -6,8 +6,8 @@
       <view class="quick-tag">
         <view class="quick-tag-group">
           <view class="quick-tag-item" :class="searchForm.vehicleLicenseNum ? 'active' : ''" @click="onSelectPlate">
-            <text>{{ searchForm.vehicleLicenseNum || '车牌号' }}</text>
-            <view @click.stop="clearSearchForm('vehicleLicenseNum')" v-if="searchForm.vehicleLicenseNum" style="position: absolute; right: 0">
+            <view class="value">{{ searchForm.vehicleLicenseNum || '车牌号' }}</view>
+            <view @click.stop="clearSearchForm('vehicleLicenseNum')" v-if="searchForm.vehicleLicenseNum" style="width: 10px; padding: 0 2px">
               <u-icon name="close-circle"></u-icon>
             </view>
             <view v-else class="sx-img">
@@ -15,8 +15,8 @@
             </view>
           </view>
           <view class="quick-tag-item" :class="searchForm.driverName ? 'active' : ''" @click="selectQuickTag({ key: 'driverName', value: searchForm.driverName })">
-            <text>{{ searchForm.driverName || '司机姓名' }}</text>
-            <view @click.stop="clearSearchForm('driverName')" v-if="searchForm.driverName" style="position: absolute; right: 0">
+            <view class="value">{{ searchForm.driverName || '司机姓名' }}</view>
+            <view @click.stop="clearSearchForm('driverName')" v-if="searchForm.driverName" style="width: 10px; padding: 0 2px">
               <u-icon name="close-circle"></u-icon>
             </view>
             <view v-else class="sx-img">
@@ -24,8 +24,8 @@
             </view>
           </view>
           <view class="quick-tag-item" :class="searchForm.driverMobile ? 'active' : ''" @click="selectQuickTag({ key: 'driverMobile', value: searchForm.driverMobile })">
-            <text>{{ searchForm.driverMobile || '司机手机' }}</text>
-            <view @click.stop="clearSearchForm('driverMobile')" v-if="searchForm.driverMobile" style="position: absolute; right: 0">
+            <view class="value">{{ searchForm.driverMobile || '司机手机' }}</view>
+            <view @click.stop="clearSearchForm('driverMobile')" v-if="searchForm.driverMobile" style="width: 10px; padding: 0 2px">
               <u-icon name="close-circle"></u-icon>
             </view>
             <view v-else class="sx-img">
@@ -316,7 +316,11 @@ export default {
             font-weight: 400;
             color: #2673fb;
           }
-
+          .value {
+            white-space: nowrap;
+            overflow: hidden;
+            flex: 1;
+          }
           .sx-img {
             height: 12upx;
             width: 14upx;
diff --git a/pages/goodSource/index.vue b/pages/goodSource/index.vue
index 4e2e579..577666a 100644
--- a/pages/goodSource/index.vue
+++ b/pages/goodSource/index.vue
@@ -6,18 +6,17 @@
       <view class="quick-tag">
         <view class="quick-tag-group">
           <view class="quick-tag-item" :class="searchForm.projectCode ? 'active' : ''" @click="selectQuickTag({ key: 'projectCode', value: searchForm.projectCode })">
-            <text>{{ searchForm.projectName || '所属项目' }}</text>
-            <view @click.stop="clearProject" v-if="searchForm.projectCode" style="position: absolute; right: 0">
+            <view class="value">{{ searchForm.projectName || '所属项目' }}</view>
+            <view @click.stop="clearProject" v-if="searchForm.projectCode" style="width: 10px; padding: 0 2px">
               <u-icon name="close-circle"></u-icon>
             </view>
             <view v-else class="sx-img">
-              <!--		          <image class="sx-image" :src="formatImagePath('active-down')"></image>-->
               <image class="sx-image" :src="formatImagePath('down')"></image>
             </view>
           </view>
           <view class="quick-tag-item" :class="searchForm.startCityCode ? 'active' : ''" @click="selectQuickTag({ key: 'startCityCode', value: searchForm.startCityCode })">
-            <text>{{ searchForm.startCityName || '始发地' }}</text>
-            <view @click.stop="clearStartCity" v-if="searchForm.startCityCode" style="position: absolute; right: 0">
+            <view class="value">{{ searchForm.startCityName || '始发地' }}</view>
+            <view @click.stop="clearStartCity" v-if="searchForm.startCityCode" style="width: 10px; padding: 0 2px">
               <u-icon name="close-circle"></u-icon>
             </view>
             <view v-else class="sx-img">
@@ -26,12 +25,11 @@
             </view>
           </view>
           <view class="quick-tag-item" :class="searchForm.endCityCode ? 'active' : ''" @click="selectQuickTag({ key: 'endCityCode', value: searchForm.endCityCode })">
-            <text>{{ searchForm.endCityName || '目的地' }}</text>
-            <view @click.stop="clearEndCity" v-if="searchForm.endCityCode" style="position: absolute; right: 0">
+            <view class="value">{{ searchForm.endCityName || '目的地' }}</view>
+            <view @click.stop="clearEndCity" v-if="searchForm.endCityCode" style="width: 10px; padding: 0 2px">
               <u-icon name="close-circle"></u-icon>
             </view>
             <view v-else class="sx-img">
-              <!--              <image v-if="searchForm.endCityCode" class="sx-image" :src="formatImagePath('active-down')"></image>-->
               <image class="sx-image" :src="formatImagePath('down')"></image>
             </view>
           </view>
@@ -377,6 +375,12 @@ export default {
             color: #2673fb;
           }
 
+          .value {
+            white-space: nowrap;
+            overflow: hidden;
+            flex: 1;
+          }
+
           .sx-img {
             height: 12upx;
             width: 14upx;
diff --git a/pages/order/add.vue b/pages/order/add.vue
index a742e67..a2e0e25 100644
--- a/pages/order/add.vue
+++ b/pages/order/add.vue
@@ -593,7 +593,7 @@ export default {
       uni.$u.debounce(this.getServiceAmountInfo, 500);
     },
     computedPaid() {
-      if (this.eventCode) {
+      if (this.eventCode && this.form.priceType === 'TON') {
         this.form.paidAmount = Number(Number(this.form.goodsWeight) * Number(this.form.weightUnitPrice)).toFixed(2);
         this.computedService();
       }
diff --git a/pages/order/change-fee.vue b/pages/order/change-fee.vue
index 4f70393..cb2481e 100644
--- a/pages/order/change-fee.vue
+++ b/pages/order/change-fee.vue
@@ -2,6 +2,18 @@
   <Page name="change-fee">
     <template #content>
       <u-alert type="warning" description="注意：只支持修改总运费，未支付或支付失败的款项"></u-alert>
+      <view class="card" v-if="item.priceType === 'TON'">
+        <view class="item">
+          <view class="td">运输单价</view>
+          <view class="amount">￥{{ item.weightUnitPrice }}</view>
+        </view>
+        <view class="item">
+          <view class="td">货物吨位</view>
+          <view class="amount">
+            <u-input type="digit" @change="changeGoodsWeight" v-model="form.goodsWeight" suffix-icon="arrow-right" border="none" placeholder="请输入"> </u-input>
+          </view>
+        </view>
+      </view>
       <view class="card">
         <view class="item">
           <view class="th">费用项</view>
@@ -134,6 +146,7 @@ export default {
         deliveryAmount: '',
         prepaidAmount: '',
         balancePaymentAmount: '',
+        goodsWeight: '',
       },
     };
   },
@@ -195,6 +208,11 @@ export default {
         this.updateAfterAmount(this.item.orderFeePayPlanList);
       });
     },
+    changeGoodsWeight() {
+      let paidAmount = Number(this.item.weightUnitPrice) * Number(this.form.goodsWeight);
+      this.form.paidAmount = paidAmount.toFixed(2);
+      this.computedService();
+    },
     updateAfterAmount(list) {
       let oilPay = list.filter(i => i.type === 'OIL_COST')[0];
       let prePay = list.filter(i => i.type === 'OUT_INVITE_PRE')[0];
--
libgit2 0.21.0