订单修改

packageA/orderForm/add/float/index.js

@@ -1,13 +1,13 @@
 const _Http = getApp().globalData.http;
-
+/* {
+            name: '促销订单'
+        },  */
 Component({
     data: {
         types: [{
             name: '标准订单'
         }, {
             name: '项目订单'
-        }, {
-            name: '促销订单'
         }, {
             name: '工具订单'
         }],

packageA/orderForm/detail.js

@@ -25,7 +25,8 @@ Page({
     },
     onLoad(options) {
         this.setData({
-            sa_orderid: options.id
+            sa_orderid: options.id,
+            order_rebate_used: wx.getStorageSync('siteP').order_rebate_used
         });
         this.getDetail(true);
     },

packageA/orderForm/detail.wxml

@@ -13,7 +13,7 @@
     <view class="exp" wx:if="{{detail.type=='项目订单'}}">关联项目：{{detail.projectname || '暂无'}}</view>
     <view class="exp">订单类型：{{detail.type}}</view>
     <view class="exp">订单状态：{{detail.status}}</view>
-    <view class="exp">单据日期：{{detail.submitdate || '暂无'}}</view>
+    <view class="exp">单据日期：{{detail.billdate || '暂无'}}</view>
     <view class="exp">创建日期：{{detail.createdate}}</view>
     <view class="exp">核销状态：{{detail.writeoffstatus}}</view>
     <view class="exp">开票状态：{{detail.invoicestatus}}</view>
@@ -64,7 +64,7 @@
         </view>
     </view>
 
-    <block wx:if="{{detail.type=='标准订单'||detail.type=='特殊订单'}}">
+    <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)' />

packageA/orderForm/index.wxml

@@ -19,4 +19,4 @@
 <!-- 新建浮动按钮 -->
 <Float />
 <!-- 筛选条件 -->
-<Yl_Filtrate id='Filtrate' list="{{filter}}" bind:handle="handleFilter" dateRange='{{false}}' />
+<Yl_Filtrate id='Filtrate' list="{{filter}}" bind:handle="handleFilter" dateRange='{{false}}' />

packageA/orderForm/modules/list/index.js

@@ -1,5 +1,9 @@
 Component({
   properties: {
-    list: Array
+    list: Array,
+    userrole: {
+      type: String,
+      value: wx.getStorageSync('userrole')
+    }
   },
 })

packageA/orderForm/modules/list/index.wxml

@@ -13,11 +13,14 @@
         <view class="num">
             {{item.type}}：{{item.sonum}}
         </view>
+        <view class="exp" wx:if="{{userrole=='业务员'}}">
+            经销商：{{item.abbreviation || ' --'}}
+        </view>
         <view class="exp">
-            区域经理：{{item.name || ' --'}}
+            区域经理：{{item.salename || ' --'}}
         </view>
         <view class="exp">
-            单据时间：{{item.createdate}}
+            单据时间：{{item.billdate}}
         </view>
         <view class="exp">
             共计{{item.qty}}件商品

packageA/orderForm/modules/product/index.js

@@ -122,6 +122,7 @@ Component({
 					...data,
 					...obj
 				};
+				data.amount = data.qty * data.price;
 				if (res.msg == '成功' && calculatePrice) {
 					let page = getCurrentPages()[getCurrentPages().length - 1];
 					if (page) {
@@ -131,7 +132,11 @@ Component({
 						page.setData({
 							"detail.amount": amount - 0
 						})
-						page.setRebate_amount();
+						page.setRebate_amount({
+							detail: {
+								value: amount - 0
+							}
+						});
 					}
 				}
 				this.setData({
@@ -173,7 +178,7 @@ Component({
 							})
 							page.setRebate_amount({
 								detail: {
-									value: page.data.detail.rebateamount
+									value: amount - 0
 								}
 							})
 						}
@@ -231,6 +236,7 @@ Component({
 									sa_orderitemsid: 0,
 									"itemid": v.itemid, //商品ID
 									"qty": 1, //数量
+									price: v.contractprice
 								}
 							})
 						}

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

@@ -41,7 +41,7 @@
 		<view class="row">
 			<view>
 				<view class="label">数量<text wx:if="{{item.auxunit}}">({{item.auxunit}})</text>：</view>
-				<input disabled='{{disabled}}' bindtap="isEdit" class="input" style="width: 240rpx;" type="digit" value="{{item.qty}}" data-name="qty" data-data="{{item}}" bindblur="onBlur" />
+				<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>￥{{item.amount}}元</text>