Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/erp/warehousing/warehousing.vue

@@ -573,7 +573,7 @@
 							String(this.detailData.deductionAmount).length -
 							(String(this.detailData.deductionAmount).indexOf('.') + 1) >
 							2) ||
-						this.detailData.deductionAmount < 1 ||
+						this.detailData.deductionAmount < 0 ||
 						this.detailData.deductionAmount > 10000
 					) {
 						this.$api.msg('扣款输入错误！')

pages/task/audit/warehouse_approval.vue

@@ -22,7 +22,7 @@
 				<view class="left">水分上限（%）</view>
 				<view class="right">{{list.waterMax}}</view>
 			</view>
-			<view class='row'>
+			<view v-if="list.paramType == '2'" class='row'>
 				<view class="left">扣重比</view>
 				<view class="right">{{list.deductWeight}}</view>
 			</view>
@@ -42,12 +42,13 @@
 					<view class="left">等级</view>
 					<view class="right">{{item.level}}</view>
 				</view>
-				<view class="row">
+				<view v-if="list.paramType == '2'" class="row">
 					<view class="left">基准单价（元/公斤）</view>
 					<view class="right">{{item.basePrice}}</view>
 				</view>
-				<view class="row" v-for="(item1,index1) in item.modelList" :key="index1">
-					<view class="left">{{item1.startWater}}-{{item1.endWater}}降幅（元/0.1%）</view>
+				<view  class="row" v-for="(item1,index1) in item.modelList" :key="index1">
+					<view v-if="list.paramType == '2'" class="left">{{item1.startWater}}-{{item1.endWater}}降幅（元/0.1%）</view>
+					<view v-else class="left">{{item1.startWater}}-{{item1.endWater}}扣重比</view>
 					<view class="right">{{item1.price}}</view>
 				</view>
 			</view>

pages/task/audit/warehouse_details.vue

@@ -22,7 +22,7 @@
 				<view class="left">水分上限（%）</view>
 				<view class="right">{{list.waterMax}}</view>
 			</view>
-			<view class='row'>
+			<view v-if="list.paramType == '2'" class='row'>
 				<view class="left">扣重比</view>
 				<view class="right">{{list.deductWeight}}</view>
 			</view>
@@ -42,12 +42,13 @@
 					<view class="left">等级</view>
 					<view class="right">{{item.level}}</view>
 				</view>	
-				<view class="row">
+				<view v-if="list.paramType == '2'" class="row">
 					<view class="left">基准单价（元/公斤）</view>
 					<view class="right">{{item.basicUnitPrice}}</view>
 				</view>	
 				<view class="row" v-for="(item1,index1) in item.modelList" :key="index1">
-					<view class="left">{{item1.startWater}}-{{item1.endWater}}降幅（元/0.1%）</view>
+					<view v-if="list.paramType == '2'" class="left">{{item1.startWater}}-{{item1.endWater}}降幅（元/0.1%）</view>
+					<view v-else class="left">{{item1.startWater}}-{{item1.endWater}}扣重比</view>
 					<view class="right">{{item1.price}}</view>
 				</view>	
 			</view>

pages/task/my_task.vue

@@ -14,7 +14,7 @@
 			<view v-for="(item, index) in taskInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
 				<view class="title flex">
 					<text>{{item.messageTitle}}</text>
-					<view class='line'>2021-06-30 11:11:22</view>
+					<view class='line'>{{item.createDate}}</view>
 				</view>
 				<view class="flex title_b">
 					<view class="title">
@@ -292,7 +292,7 @@
 			tabcarchange(statusFlag) {
 				this.statusFlag = statusFlag
 				this.pageSize = 1
-				this.getIndexBuyData(1)
+				this.getIndexBuyData(statusFlag)
 			},
 			navToDetailPage(item) {
 				if (item.businessCode == 'PROCUREMENT-ORDER-APPROVE') {