shish 2 luni în urmă
părinte
comite
41530a33de

+ 1 - 1
ghsApp/src/admin/home/member.vue

@@ -242,7 +242,7 @@ export default {
       tabs: [
         { name: "全部", value: 0 },
         { name: "消费排行", value: 0 },
-        { name: "挂账排行", value: 0 }
+        { name: "待结排行", value: 0 }
       ],
       showFilterPanel: false,
       distList: [],

+ 1 - 1
ghsApp/src/pagesClient/member/detail.vue

@@ -114,7 +114,7 @@
         <view class="input-line-wrap">
 
             <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({ url: '/pagesArrears/details',query: {id: userInfo.id}})">
-              <div class="tui-title">挂账订单</div>
+              <div class="tui-title">待结订单</div>
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({ url: '/admin/clear/customList',query: {customId: userInfo.id}})">

+ 1 - 1
ghsApp/src/pagesPurchase/refund.vue

@@ -54,7 +54,7 @@
 		</view>
 		<view class="flex refund-item">
 			<view class="refund-label"><text></text>实际退款:</view>
-			<input type="digit" v-model="refundMoney">
+			<input type="digit" v-model="refundMoney" placeholder="请输入" placeholder-style="color:#CCCCCC" @focus="refundMoney=''" />
 		</view>
 		<view class="refund-item">
 			<view class="refund-label">备注:</view>

+ 12 - 6
ghsApp/src/pagesPurchase/supplier.vue

@@ -22,8 +22,8 @@
     <view class="order_list">
       <!-- 总欠款统计 -->
       <view class="total-debt-header" v-if="isNormalList">
-        <text class="debt-title">总欠款</text>
-        <text class="debt-amount">¥{{info.totalDebtAmount?parseFloat(info.totalDebtAmount):0}}</text>
+        <text class="debt-title">总待结</text>
+        <text class="debt-amount">¥{{Math.abs(parseFloat(info.totalDebtAmount || 0))}}</text>
       </view>
 
       <!-- 列表内容 -->
@@ -55,7 +55,7 @@
               <view class="more-dropdown" v-if="activeMenuId === item.id">
                 <view class="dropdown-item" hover-class="none" @click.stop="handleDebtChangeFromMenu(item)">
                   <text class="dropdown-icon">📋</text>
-                  <text class="dropdown-text">挂账变动明细</text>
+                  <text class="dropdown-text">挂账变动明细(废弃)</text>
                 </view>
                 <view class="dropdown-item" hover-class="none" @click.stop="handleDeleteFromMenu(item)">
                   <text class="dropdown-icon">🗑</text>
@@ -191,7 +191,7 @@ export default {
 					value: "0"
 				},
 				{
-					name: "挂账排行",
+					name: "待结排行",
 					sortType: "debt",
 					value: "0"
 				},
@@ -647,7 +647,8 @@ export default {
             box-shadow: 0 4upx 24upx rgba(0, 0, 0, 0.12);
             border-radius: 12upx;
             padding: 8upx 0;
-            min-width: 220upx;
+            min-width: 400upx;
+            width: max-content;
             border: 1upx solid #ebeef5;
             z-index: 101;
             
@@ -674,8 +675,10 @@ export default {
             
             .dropdown-item {
               display: flex;
+              flex-direction: row;
               align-items: center;
-              padding: 20upx 24upx;
+              padding: 22upx 32upx;
+              white-space: nowrap;
               cursor: pointer;
               transition: background-color 0.2s ease;
               
@@ -691,11 +694,14 @@ export default {
                 font-size: 26upx;
                 color: #999;
                 margin-right: 12upx;
+                flex-shrink: 0;
               }
               
               .dropdown-text {
                 font-size: 26upx;
                 color: #555;
+                white-space: nowrap;
+                flex-shrink: 0;
               }
             }
           }

+ 4 - 12
hdApp/src/admin/home/components/purchase-ghs-panel.vue

@@ -121,29 +121,21 @@
 
                 <view class="box_6 flex-row" @click="settleAccounts(ghsInfo)" v-if="Number(ghsInfo.debtAmount) > 0">
                   <view class="show_clear_area flex-row justify-between">
-                    <text class="waite_clear_order">待结订单 {{ ghsInfo.debtNum }}笔 合计¥{{ ghsInfo.debtAmount ? parseFloat(ghsInfo.debtAmount) : 0 }}</text>
-                    <text class="clear-action" v-if="ghsInfo.remainDebtAmount > 0">查看明细</text>
+                    <text class="waite_clear_order">待结 {{ ghsInfo.debtNum }}笔 合计¥{{ ghsInfo.debtAmount ? parseFloat(ghsInfo.debtAmount) : 0 }} 查看明细 &gt;</text>
                   </view>
                 </view>
 
                 <view class="box_6 flex-row box_6--settle" v-if="Number(ghsInfo.balance) < 0">
                   <view class="show_clear_area flex-row justify-between show_clear_area--inline-settle">
-                    <text class="waite_clear_order">
-                      待结 ¥{{ Math.abs(parseFloat(ghsInfo.balance)) }}
+                    <text class="waite_clear_order" @click.stop="settleAccounts(ghsInfo)">
+                      待结 ¥{{ Math.abs(parseFloat(ghsInfo.balance)) }} 查看明细 &gt;
                     </text>
                     <view
                       class="settle-options flex-row"
                       :class="{ 'settle-options--single': !canSelectOrderClear(ghsInfo) }"
                     >
-                      <view
-                        v-if="canSelectOrderClear(ghsInfo)"
-                        class="settle-option"
-                        @click.stop="settleAccounts(ghsInfo)"
-                      >
-                        <text class="settle-option__title">订单明细</text>
-                      </view>
                       <view class="settle-option" @click.stop="recharge(ghsInfo)">
-                        <text class="settle-option__title">金额结算</text>
+                        <text class="settle-option__title">自定义金额结算</text>
                       </view>
                     </view>
                   </view>