增加状态判断条件

components/Yl_Attachment/index.js

@@ -6,7 +6,7 @@ Component({
 	properties: {
 		ownertable: String,
 		ownerid: String,
-		admin: Boolean
+		disabled: Boolean
 	},
 	data: {
 		content: {

components/Yl_Attachment/index.wxml

@@ -2,7 +2,7 @@
 	<view class="count">
 		总共{{content.total}}个
 	</view>
-	<view class="expand" wx:if="{{admin}}">
+	<view class="expand" wx:if="{{!disabled}}">
 		<Yl_Upload accept='media' bind:uploadCallback='addFiles'>
 			<navigator url="#" class="but">
 				<text class="iconfont icon-webqiyeshuiyintupian" />
@@ -16,9 +16,8 @@
 	</view>
 </view>
 
-<Yl_Files id="Yl_Files" delete='{{admin}}' binddeleteCallBack='deleteFiles' />
-
-<block wx:if="{{list.length==0}}">
+<Yl_Files id="Yl_Files" delete='{{!disabled}}' binddeleteCallBack='deleteFiles' />
+<block wx:if="{{content.total==0}}">
 	<Yl_Empty />
-	<view style="height: 150rpx;" />
+	<view style="height: 100rpx;" />
 </block>

packageA/orderForm/detail.js

@@ -94,7 +94,7 @@ Page({
 				"tradefield": data.tradefield, //必选
 				"pay_enterpriseid": data.pay_enterpriseid, //结算单位
 				"rebate_userate": data.accountclass.rebate_userate, //返利金使用比例
-				"rebate_used": data.accountclass.rebate_used, //默认0，是否使用返利金
+				"rebate_used": data.rebate_used, //默认0，是否使用返利金
 				"billdate": data.billdate, //单据日期，默认创建日期
 			};
 		if (content.type != '标准订单') {
@@ -139,12 +139,16 @@ Page({
 	},
 	/* 设置是否使用返利金 */
 	async changeRebateUsed() {
+		if (this.data.detail.status != '新建') return wx.showToast({
+			title: '当前订单状态不可设置!',
+			icon: "none"
+		})
 		this.setData({
-			"detail.accountclass.rebate_used": this.data.detail.accountclass.rebate_used == 0 ? 1 : 0
+			"detail.accountclass.rebate_used": this.data.detail.rebate_used == 1 ? 0 : 1
 		})
 		let res = await this.changeDetail();
 		if (res.msg != '成功') this.setData({
-			"detail.accountclass.rebate_used": this.data.detail.accountclass.rebate_used == 0 ? 1 : 0
+			"detail.accountclass.rebate_used": this.data.detail.rebate_used == 1 ? 0 : 1
 		});
 	},
 	/* 删除订单 */
@@ -239,5 +243,13 @@ Page({
 				})
 			}
 		})
+	},
+	/* 判断是否可以编辑 */
+	isEdit() {
+		if (this.data.detail.status != '新建') wx.showToast({
+			title: '当前订单状态不可设置!',
+			icon: "none"
+		});
+		return this.data.detail.status == '新建';
 	}
 })

packageA/orderForm/detail.wxml

@@ -60,30 +60,30 @@
     </navigator>
     <navigator url="#" class="row" style="font-size: 0;" bindtap="changeRebateUsed">
         <view class="label">是否使用返利金（余额：{{detail.accountclass.rebate_amount}}）</view>
-        <checkbox checked="{{detail.accountclass.rebate_used==1}}" color='var(--assist)' />
+        <checkbox disabled="{{detail.status!='新建'}}" checked="{{detail.rebate_used==1}}" color='var(--assist)' />
     </navigator>
-    <view class="row" wx:if="{{detail.accountclass.rebate_used==1}}">
+    <view class="row" wx:if="{{detail.rebate_used==1}}">
         <view class="label">返利金支付(最多订单金额20%)</view>
-        <input type="digit" class="remarks" placeholder-class='placeholder' value="{{detail.accountclass.rebate_amount}}" placeholder="使用金额" />
+        <input disabled="{{detail.status!='新建'}}" bindtap="isEdit" type="digit" class="remarks" placeholder-class='placeholder' value="{{detail.accountclass.rebate_amount}}" placeholder="使用金额" />
     </view>
 </view>
 
 <view class="box" style="padding: 10rpx 30rpx;">
     <view class="row">
         <view class="label">订单备注</view>
-        <textarea 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>
     <navigator url="#" class="row" style="font-size: 0;">
         <view class="label">是否需要回签单</view>
-        <checkbox checked="{{true}}" color='var(--assist)' />
+        <checkbox disabled="{{detail.status!='新建'}}" bindtap="isEdit" checked="{{true}}" color='var(--assist)' />
     </navigator>
 </view>
 
 <view style="height: 20rpx;" />
 
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
-    <Product slot='产品明细' id='Product' />
-    <Yl_Attachment slot='附件' id='Yl_Attachment' admin ownertable="sa_order" ownerid="{{detail.sa_orderid}}" />
+    <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>
 

packageA/orderForm/modules/product/index.wxml

@@ -1,10 +1,10 @@
 <view class="head">
   <view class="count">产品明细</view>
   <view class="expand">
-    <navigator url="#" class="but" bindtap="addProduct">
+    <navigator wx:if="{{!disabled}}" url="#" class="but" bindtap="addProduct">
       <van-icon name="plus" />
     </navigator>
   </view>
 </view>
 
-<List list='{{list}}' bindchangeProduct='changeProduct' binddeleteItem="deleteItem" />
+<List list='{{list}}' disabled='{{disabled}}' bindchangeProduct='changeProduct' binddeleteItem="deleteItem" />

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

@@ -51,6 +51,12 @@ Component({
 				item
 			} = e.currentTarget.dataset;
 			this.triggerEvent("deleteItem", item)
+		},
+		isEdit() {
+			if (this.data.disabled) wx.showToast({
+				title: '当前状态不可编辑！',
+				icon: "none"
+			})
 		}
 	}
 })

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

@@ -32,7 +32,7 @@
 					<text class="old-price" wx:if="{{item.price<item.marketprice}}">￥{{item.marketprice}}</text>
 				</view>
 			</view>
-			<view class="delete" data-item="{{item}}" catchtap="deleteProduct">
+			<view wx:if="{{!disabled}}" class="delete" data-item="{{item}}" catchtap="deleteProduct">
 				<text class="iconfont icon-guanlian-shanchu" />
 			</view>
 		</view>
@@ -41,7 +41,7 @@
 		<view class="row">
 			<view>
 				<view class="label">数量<text wx:if="{{item.auxunit}}">({{item.auxunit}})</text>：</view>
-				<input 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: 240rpx;" type="digit" value="{{item.qty}}" data-name="qty" data-data="{{item}}" bindblur="onBlur" />
 			</view>
 			<view class="money">
 				金额：<text>￥{{item.amount}}</text>
@@ -51,14 +51,14 @@
 		<view class="row">
 			<view style="width: 100%;">
 				<view class="label">产品备注:</view>
-				<input class="input" style="flex: 1; text-align: left;padding-left: 10rpx;" type="text" placeholder="备注" value="{{item.remarks}}" data-name="remarks" data-data="{{item}}" bindblur="onBlur" />
+				<input disabled='{{disabled}}' bindtap="isEdit" class="input" style="flex: 1; text-align: left;padding-left: 10rpx;" type="text" placeholder="备注" value="{{item.remarks}}" data-name="remarks" data-data="{{item}}" bindblur="onBlur" />
 			</view>
 		</view>
 
 		<view class="row">
 			<view>
 				<view class="label">期望交期：</view>
-				<picker mode="date" data-data="{{item}}" bindchange='changeDate'>
+				<picker disabled='{{disabled}}' bindtap="isEdit" mode="date" data-data="{{item}}" bindchange='changeDate'>
 					<view class="input" style="width: 240rpx;display: flex;justify-content: center;">
 						<text wx:if="{{item.needdate }}">{{item.needdate}}</text>
 						<text wx:else style="color: #999;">期望交期</text>