添加账户余额显示

packageA/orderForm/detail.js

@@ -43,13 +43,24 @@ Page({
                 title: res.msg,
                 icon: "none"
             });
+            let CND = value => currency(value, {
+                symbol: "￥",
+                precision: 2
+            }).format();
+            let account = {
+                name: "",
+                text: ""
+            };
+            let accountclass = res.data.accountclass;
+            if (accountclass.accountname) {
+                account.name = accountclass.accountname
+                account.text = `\n(余额:${CND(accountclass.balance)},信用额度:${CND(accountclass.creditquota)})`
+            }
             this.setData({
                 detail: res.data,
                 loading: false,
-                defaultamount: currency(res.data.defaultamount, {
-                    symbol: "￥",
-                    precision: 2
-                }).format()
+                defaultamount: CND(res.data.defaultamount),
+                account
             });
             if (init) {
                 this.partialRenewal(true)
@@ -82,8 +93,8 @@ Page({
         } else if (figure == 0) {
             logistics = '预付'
         } else {
-            let defaultamount = this.data.detail.defaultamount;
-            logistics = defaultamount >= figure ? '免运费' : '差' + currency(figure).subtract(defaultamount).value + '元免运费';
+            let amount = this.data.detail.amount;
+            logistics = amount >= figure ? '免运费' : '差' + currency(figure).subtract(amount).value + '元免运费';
         }
         this.setData({
             logistics
@@ -295,7 +306,7 @@ Page({
         if (this.isEdit()) return this.setData({
             detail: this.data.detail
         })
-        let amount = (this.data.detail.order_rebate_userate * this.data.detail.defaultamount).toFixed(2); //最大可用金额
+        let amount = (this.data.detail.order_rebate_userate * this.data.detail.amount).toFixed(2); //最大可用金额
         let rebatebalance = this.data.detail.rebatebalance; //返利金账户余额
         _Http.basic({
             "id": 20230218225002,
@@ -324,7 +335,7 @@ Page({
         let value = e.detail.value;
         let rebatebalance = this.data.detail.rebatebalance; //返利金账户余额
         value = value > rebatebalance ? rebatebalance : value;
-        let amount = (this.data.detail.order_rebate_userate * this.data.detail.defaultamount).toFixed(2); //最大可用金额
+        let amount = (this.data.detail.order_rebate_userate * this.data.detail.amount).toFixed(2); //最大可用金额
         _Http.basic({
             "id": 20230218225002,
             "content": {
@@ -443,10 +454,6 @@ Page({
             title: '当前订单状态不可设置!',
             icon: "none"
         });
-        if (this.data.detail.type == '特殊订单') wx.showToast({
-            title: '特殊订单不可设置!',
-            icon: "none"
-        });
         return this.data.detail.status != '新建' || this.data.detail.type == '特殊订单';
     },
     /* 拷贝订单 */

packageA/orderForm/detail.wxml

@@ -16,7 +16,7 @@
 	<view class="exp">订单状态：{{detail.status}}</view>
 	<view class="exp">单据日期：{{detail.billdate || '暂无'}}</view>
 	<view class="exp">创建日期：{{detail.createdate}}</view>
-	<van-button custom-class='copy' bindtap="copyItem">一键复制订单</van-button>
+	<!-- <van-button custom-class='copy' bindtap="copyItem">一键复制订单</van-button> -->
 </view>
 
 <navigator url="#" class="box location" bindtap="selectFinance">
@@ -45,37 +45,21 @@
 
 	<view class="row">
 		<view class="label">支付账户</view>
-		<view style="font-size: 28rpx;">
-			{{detail.accountclass.accountname || '暂无'}}
+		<view style="font-size: 28rpx; text-align: right;">
+			{{account.name}}
+			<text style="font-size: 22rpx;">{{account.text}}</text>
 		</view>
 	</view>
-
-	<block wx:if="{{order_rebate_used==1 && (detail.type=='标准订单'||detail.type=='特殊订单')}}">
-		<navigator url="#" class="row" style="font-size: 0;" bindtap="changeRebateUsed">
-			<view class="label">是否使用返利金（余额：{{detail.rebatebalance}}）</view>
-			<checkbox disabled="{{detail.status!='新建'}}" checked="{{detail.rebate_used==1}}" color='var(--assist)' />
-		</navigator>
-		<block wx:if="{{detail.rebate_used==1}}">
-			<view class="row">
-				<view class="label">返利金支付(最多订单金额{{detail.order_rebate_userate}})</view>
-				<input disabled="{{detail.status!='新建'}}" bindtap="isEdit" type="digit" class="remarks" placeholder-class='placeholder' value="{{detail.rebateamount}}" placeholder="使用金额" bindblur="setRebate_amount" />
-			</view>
-			<view class="row">
-				<view class="label" style="font-size: 28rpx;">支付合计：{{detail.amount}}（{{detail.accountclass.accountname}}）+ {{detail.rebateamount}}（返利金）</view>
-			</view>
-		</block>
-	</block>
 </view>
-
 <view class="box" style="padding: 10rpx 30rpx;">
 	<view class="row">
 		<view class="label">订单备注</view>
-		<textarea disabled="{{detail.status!='新建'||detail.type=='特殊订单'}}" bindtap="isEdit" class="remarks" placeholder-class='placeholder' bindblur="changeRemarks" value="{{detail.remarks}}" auto-height placeholder="订单备注" />
+		<textarea disabled="{{detail.status!='新建'}}" bindtap="isEdit" class="remarks" placeholder-class='placeholder' bindblur="changeRemarks" value="{{detail.remarks}}" auto-height placeholder="订单备注" />
 	</view>
 </view>
 <view style="height: 20rpx;" />
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
-	<Product slot='产品明细' id='Product' disabled="{{detail.status!='新建'||detail.type=='特殊订单'}}" />
+	<Product slot='产品明细' id='Product' disabled="{{detail.status!='新建'}}" />
 	<Yl_Attachment slot='附件' id='Yl_Attachment' ownertable="sa_order" ownerid="{{detail.sa_orderid}}" disabled="{{detail.status!='新建'}}" />
 	<Progress slot='订单进度' id='Progress' />
 </Yl_FunTabs>
@@ -84,17 +68,17 @@
 <view class="footer">
 	<view class="price">
 		<view class="count">
-			{{handleHide.query(defaultamount,hidePrice)}}元
+			{{handleHide.query(amount,hidePrice)}}元
 		</view>
 		<view>
 			{{logistics}}
 		</view>
 	</view>
 	<view class="but-box">
-		<van-button custom-class='but delete' wx:if="{{detail.status=='新建'&&detail.type!='特殊订单'}}" bind:click="deleteItem">删除订单</van-button>
+		<van-button custom-class='but delete' wx:if="{{detail.status=='新建'}}" bind:click="deleteItem">删除订单</van-button>
 		<block wx:if="{{detail.type=='特殊订单'}}">
 			<van-button custom-class='but' wx:if="{{detail.status=='新建'}}" bind:click="presubmission">预提交</van-button>
-			<van-button custom-class='but' wx:if="{{detail.status=='确定'}}" bind:click="submit">提交订单</van-button>
+			<van-button custom-class='but' wx:if="{{detail.status=='确认'}}" bind:click="submit">提交订单</van-button>
 		</block>
 		<block wx:else>
 			<van-button custom-class='but' wx:if="{{detail.status=='新建'}}" bind:click="submit">提交订单</van-button>

packageA/orderForm/modules/list/index.wxml

@@ -26,7 +26,7 @@
             共计{{item.qty}}件商品
         </view>
         <view class="amount">
-            合计:{{handleHide.query(item.defaultamount,hidePrice)}}元
+            合计:{{handleHide.query(item.amount,hidePrice)}}元
         </view>
     </view>
     <view wx:if="{{item.contacts.length||item.name}}" class="bottom line-1">

packageA/orderForm/modules/product/index.js

@@ -52,9 +52,9 @@ Component({
                         let image = v.attinfos.find(v => v.fileType == "image");
                         v.cover = image ? image.cover : "";
                     };
-                    v.defaultprice = CNY(v.defaultprice)
+                    v.price = CNY(v.price)
                     v.marketprice = CNY(v.marketprice)
-                    v.defaultamount = CNY(v.defaultamount)
+                    v.amount = CNY(v.amount)
                     return v;
                 })
                 let page = getCurrentPages().find(v => v.__route__ == 'packageA/orderForm/detail').data.detail;
@@ -101,7 +101,7 @@ Component({
                     ...data,
                     ...obj
                 };
-                data.defaultamount = CNY(currency(data.defaultprice).multiply(data.qty).format());
+                data.amount = CNY(currency(data.price).multiply(data.qty).format());
                 this.setData({
                     [`list[${index}]`]: data
                 })
@@ -149,6 +149,9 @@ Component({
                 case '标准订单':
                     id = 20221109153502;
                     break;
+                case '特殊订单':
+                    id = 20221109153502;
+                    break;
             }
             wx.navigateTo({
                 url: `${detail.type=='促销订单'?'/packageA/activity/selectProduct/index':'/select/product/index'}?params=${JSON.stringify({
@@ -219,7 +222,7 @@ Component({
             //     let page = getCurrentPages()[getCurrentPages().length - 1];
             //     if (page) {
             //         this.setData({
-            //             "detail.defaultamount": CNY(res.data.amount)
+            //             "detail.amount": CNY(res.data.amount)
             //         })
             //         page.setLogisticsMsg();
             //     }

packageA/orderForm/modules/product/list/index.wxml

@@ -28,7 +28,7 @@
                     <text class="line-1" style="margin-right: 6rpx;">可退数量：{{item.returnqty||' --'}}</text>
                 </view>
                 <view style="margin-top: 8rpx;">
-                    <text class="price">{{handleHide.query(item.defaultprice,hidePrice)}}</text>
+                    <text class="price">{{handleHide.query(item.price,hidePrice)}}</text>
                     <!-- <text class="old-price">{{handleHide.query(item.marketprice,hidePrice)}}</text> -->
                 </view>
             </view>
@@ -44,7 +44,7 @@
                 <input disabled='{{disabled}}' bindtap="isEdit" class="input" style="width: 180rpx;" type="digit" value="{{item.qty}}" data-name="qty" data-data="{{item}}" bindblur="onBlur" />
             </view>
             <view class="money">
-                金额：<text>{{handleHide.query(item.defaultamount,hidePrice)}}元</text>
+                金额：<text>{{handleHide.query(item.amount,hidePrice)}}元</text>
             </view>
         </view>