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/erpbusiness/add_quality_testing.vue

@@ -42,8 +42,10 @@
 			<view v-else class="c-row ">
 				<view class="title">扣杂</view>
 				<view class="con-list">
-					<input v-model='gridList.buckleMiscellaneous' placeholder="请输入扣杂" @input="waterContentChange"
+					<input v-model='gridList.buckleMiscellaneous' placeholder="初检扣杂" @input="waterContentChange"
 						 name="input"></input>
+					<input v-model='gridList.reBuckleMiscellaneous' placeholder="复检扣杂" @input="waterContentChange"
+						 	 name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
@@ -113,8 +115,10 @@
 			<view class="c-row ">
 				<view class="title">水分（%）</view>
 				<view class="con-list">
-					<input v-model='gridList.waterContent' placeholder="请输入水分占比" @input="waterContentChange"
+					<input v-model='gridList.waterContent' placeholder="初检水分" @input="waterContentChange"
 					 name="input"></input>
+					 <input v-model='gridList.rewaterContent' placeholder="复检水分" @input="waterContentChange"
+					  name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">

pages/erpbusiness/edit_quality_testing.vue

@@ -23,43 +23,48 @@
 			<view class="c-row ">
 				<view class="title">车牌号</view>
 				<view class="con-list">
-					<input v-model='gridList.carNumber' placeholder="请输入车牌号"
+					<input :disabled='flag==1' v-model='gridList.carNumber' placeholder="请输入车牌号"
 						 name="input"></input>
 				</view>
 			</view>
 			<view v-if="gridList.paramType != '1'" class="c-row ">
 				<view class="title">扣重比</view>
 				<view class="con-list">
-					<input v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比"
+					<input :disabled='flag==1' v-model='gridList.buckleWeightRatio' placeholder="请输入扣重比"
 						 name="input"></input>
 				</view>
 			</view>
 			<view v-else class="c-row ">
 				<view class="title">扣杂</view>
 				<view class="con-list">
-					<input v-model='gridList.buckleMiscellaneous' placeholder="请输入扣杂" @input="waterContentChange"
-						 name="input"></input>
+					<input :disabled='flag==1' v-model='gridList.buckleMiscellaneous' placeholder="初检扣杂" @input="waterContentChange"
+						 	 name="input"></input>
+					<input v-if='flag==0' value='未复检' disabled placeholder="复检扣杂" 
+						name="input"></input>
+					<input v-else :disabled='flag!=1' v-model='gridList.reBuckleMiscellaneous' placeholder="复检扣杂"
+						name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">购粮性质</view>
 				<view class="con-list">
-					<input v-model='gridList.natureOfGrainPurchase' placeholder="请输入购粮性质"
+					<input :disabled='flag==1' v-model='gridList.natureOfGrainPurchase' placeholder="请输入购粮性质"
 						 name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">仓位号</view>
 				<view class="con-list">
-					<view @click='show=true'>{{gridList.binNumber}}</view>
-					<u-picker :range="warehouseList" range-key="binNumber" @confirm='binNumberpicker($event)' v-model="show" mode="selector" >
+					<u-picker  :range="warehouseList" range-key="binNumber" @confirm='binNumberpicker($event)' v-model="show" mode="selector" >
 					</u-picker>
+					<view v-if='flag!=1' @click='show=true'>{{gridList.binNumber}}</view>
+					<view v-else>{{gridList.binNumber}}</view>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">囤位号</view>
 				<view class="con-list">
-					<input v-model='gridList.storageTagNo' placeholder="请输入囤位号"
+					<input :disabled='flag==1' v-model='gridList.storageTagNo' placeholder="请输入囤位号"
 						 name="input"></input>
 				</view>
 			</view>
@@ -78,7 +83,7 @@
 			<view class="c-row">
 				<view class="title">净重单价（元/公斤）</view>
 				<view class="con-list">
-					<input v-model='gridList.tidalGrainPrice' disabled placeholder="自动获取,不可编辑"
+					<input :disabled='flag==1' v-model='gridList.tidalGrainPrice' disabled placeholder="自动获取,不可编辑"
 						 name="input"></input>
 				</view>
 			</view>
@@ -89,50 +94,55 @@
 			<view class="c-row ">
 				<view class="title">等级</view>
 				<view class="con-list">
-					<view @click='show1=true'>{{gridList.grade?gridList.grade:'请选择等级'}}</view>
 					<u-picker :range="gradeList" range-key="value" @confirm='gradepicker($event)' v-model="show1" mode="selector" >
 					</u-picker>
+					<view v-if='flag!=1' @click='show1=true'>{{gridList.grade?gridList.grade:'请选择等级'}}</view>
+					<view v-else>{{gridList.grade}}</view>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">水分（%）</view>
 				<view class="con-list">
-					<input v-model='gridList.waterContent' placeholder="请输入水分占比" @input="waterContentChange"
+					<input :disabled='flag==1' v-model='gridList.waterContent' placeholder="初检水分" @input="waterContentChange"
 					 name="input"></input>
+					  <input v-if='flag==0' value='未复检' disabled placeholder="复检水分"
+					  	name="input"></input>
+						<input :disabled='flag!=1' v-else v-model='gridList.reWaterContent' placeholder="复检水分"
+						 name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">容重（克/升）</view>
 				<view class="con-list">
-					<input v-model='gridList.bulkDensity' placeholder="请输入容重"
+					<input :disabled='flag==1' v-model='gridList.bulkDensity' placeholder="请输入容重"
 					 name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">不完善粒（%）</view>
 				<view class="con-list">
-					<input v-model='gridList.imperfectGrain' placeholder="请输入不完整粒占比"
+					<input :disabled='flag==1' v-model='gridList.imperfectGrain' placeholder="请输入不完整粒占比"
 						 name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">杂质（%）</view>
 				<view class="con-list">
-					<input v-model='gridList.impurity' placeholder="请输入杂质占比"
+					<input :disabled='flag==1' v-model='gridList.impurity' placeholder="请输入杂质占比"
 					 name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">霉变粒（%）</view>
 				<view class="con-list">
-					<input v-model='gridList.mildewGrain' placeholder="请输入霉变粒占比"
+					<input :disabled='flag==1' v-model='gridList.mildewGrain' placeholder="请输入霉变粒占比"
 					 name="input"></input>
 				</view>
 			</view>
 			<view class="c-row ">
 				<view class="title">热损伤（%）</view>
 				<view class="con-list">
-					<input v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
+					<input :disabled='flag==1' v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
 					 name="input"></input>
 				</view>
 			</view>
@@ -172,6 +182,7 @@
 				footprintList: [],
 				searchKeyWord:'',
 				isVip: false,
+				flag:0,
 				userInfoTmp: [],
 				inputStatus: 'none',
 				carInfo: [],
@@ -235,6 +246,7 @@
 		},
 		onLoad(options){
 			this.id=options.id
+			this.flag=options.flag
 			this.cangid=options.cangid
 			this.managementType=options.managementType
 		},
@@ -304,6 +316,10 @@
 				}
 			},
 			submit(){
+				this.gridList.flag=this.flag
+				// if(this.flag==2){
+				// 	this.gridList.reInspector=this.userInfo.userName
+				// }
 				var that = this
 				if (!this.gridList.qualityNo) {
 					this.$api.msg('编号不能为空')
@@ -337,18 +353,26 @@
 					this.$api.msg('货名不能为空')
 					return
 				}
-				if (this.gridList.buckleWeightRatio < 0 ||this.gridList.buckleWeightRatio > 2) {
+				if (this.gridList.paramType!=1&&this.gridList.buckleWeightRatio < 0 ||this.gridList.paramType!=1&&this.gridList.buckleWeightRatio > 2) {
 					this.$api.msg('扣重比输入错误')
 					return
 				}
 				if (
-					String(this.gridList.buckleWeightRatio).indexOf('.') != -1 &&
+					this.gridList.paramType!=1&&String(this.gridList.buckleWeightRatio).indexOf('.') != -1 &&
 					String(this.gridList.buckleWeightRatio).length -
 					(String(this.gridList.buckleWeightRatio).indexOf('.') + 1) > 2) 
 					{
 						this.$api.msg('扣重比输入错误')
 						return
 				}
+				if (this.flag==0&&this.gridList.paramType==1&&this.gridList.buckleMiscellaneous < 0 ||this.flag==0&&this.gridList.paramType==1&&this.gridList.buckleMiscellaneous > 50) {
+					this.$api.msg('初检扣杂输入错误')
+					return
+				}
+				if (this.flag==1&&this.gridList.paramType==1&&this.gridList.reBuckleMiscellaneous < 0 ||this.flag==0&&this.gridList.paramType==1&&this.gridList.reBuckleMiscellaneous > 50) {
+					this.$api.msg('复检扣杂输入错误')
+					return
+				}
 				if (!this.gridList.type) {
 					this.$api.msg('类型不能为空')
 					return
@@ -366,7 +390,11 @@
 					return
 				}
 				if (!this.gridList.waterContent) {
-					this.$api.msg('水分不能为空')
+					this.$api.msg('初检水分不能为空')
+					return
+				}
+				if (!this.gridList.reWaterContent) {
+					this.$api.msg('复检水分不能为空')
 					return
 				}
 				if (!this.gridList.mildewGrain) {
@@ -586,6 +614,9 @@
 		text-align: right;
 		padding-right: 20rpx;
 	}
+	input:disabled {
+		color:#ccc;
+	}
 </style>
 
 

pages/erpbusiness/quality_testing.vue

@@ -32,6 +32,9 @@
 						<view class="left status1" v-if="item.status=='已质检'">检</view>
 						<view class="left status2" v-if="item.status=='已称皮重'">皮</view>
 						<view class="left status3" v-if="item.status=='已称毛重'">毛</view>
+						<view class="left status1" v-if="item.status=='已初检'">初</view>
+						<view class="left status2" v-if="item.status=='已复检'&&item.confirm!='1'">复</view>
+						<view class="left status3" v-if="item.confirm=='1'">确</view>
 						<view>
 							<view class="top-title">
 								<view  v-if='managementType==1' >{{item.qualityNo}}</view>
@@ -41,7 +44,7 @@
 						</view>
 					</view>
 					<view class="right">{{item.customer}}</view>
-					<view class='right'>{{item.qualityInspector}}</view>
+					<view class='right'>{{item.qualityInspector}} {{item.reInspector}}</view>
 				</view>
 				<view class="row2" >
 					<view v-if='managementType==1'>{{item.customerName}}</view>
@@ -50,7 +53,9 @@
 				</view>
 				<view class="row3">
 					<view v-if='item.status=="已质检"&&managementType==1' @click.stop='del(item)' class='button'>删除</view>
-						<view v-if='item.status!="已称皮重"&&managementType==1' @click.stop='edit(item)' class='button'>编辑</view>
+						<view v-if='item.status=="已初检"&&managementType==1' @click.stop='edit(item,0)' class='button'>初检</view>
+						<view v-if='item.confirm!="1"&&item.status=="已复检"&&managementType==1' @click.stop='edit(item,2)' class='button'>确认</view>
+						<view v-if='item.confirm!="1"&&managementType==1' @click.stop='edit(item,1)' class='button'>复检</view>
 						<view v-if='item.status=="已称毛重"&&managementType==3' @click.stop='quality_testing(item)' class='button'>质检</view>
 				</view>
 			</view>
@@ -304,9 +309,9 @@
 					uni.hideLoading()
 				})
 			},
-			edit(item){
+			edit(item,status){
 				uni.navigateTo({
-					url:'/pages/erpbusiness/edit_quality_testing?id='+item.id+'&managementType='+this.managementType+'&cangid='+this.cangid
+					url:'/pages/erpbusiness/edit_quality_testing?id='+item.id+'&managementType='+this.managementType+'&cangid='+this.cangid+'&flag='+status
 				})
 			},
 			add(){

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

@@ -12,12 +12,16 @@
 		</view>
 		<view class="introduce-section">
 			<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="title flex align-item-center">
+					<view>
+						<view>{{item.department}}:</view>
+						<view style='font-size:12px;color:#878C9C;'>{{item.createDate}}</view>
+					</view>
+					<text v-if='statusFlag==1' style='color:#FE6430;'>{{item.messageTitle}}</text>
+					<text v-if='statusFlag==3' style='color:#AFB3BF;'>{{item.messageTitle}}</text>
 				</view>
 				<view class="flex title_b">
-					<view class="title">
+					<view style='color:#878C9C;' class="title">
 						{{item.messageContent}}
 					</view>
 				</view>
@@ -196,6 +200,8 @@
 					data = this.data
 					url = '/commonUser/query/findHisPageNoticeTasks'
 				}
+				data.currentPage = pages
+				data.pageSize = limit
 				//this.warehouseInOutInfo.status = this.status
 				this.$api.doRequest('get', url, data).then(res => {
 					if (res.data.code == 200) {
@@ -218,6 +224,7 @@
 							that.loadStatus = 'nomore'
 						}
 						for (var i = 0; i < this.taskInfo.length; i++) {
+							this.taskInfo[i].department=this.taskInfo[i].messageContent.split(' ')[0]
 							if (this.taskInfo[i].businessType == 'WAREHOUSE') {
 								if (this.taskInfo[i].businessCode == 'INOUTTASK-TASK-APPROVE') {
 									this.taskInfo[i].messageTitle = '出入库任务'
@@ -226,9 +233,7 @@
 								if (this.taskInfo[i].businessCode == 'PAYMENT-MANAGEMENT-APPROVE') {
 									this.taskInfo[i].messageTitle = '付款管理'
 								}
-								if (this.taskInfo[i].businessCode == 'PROCUREMENT-PRICE-APPROVE') {
-									this.taskInfo[i].messageTitle = '仓库设置'
-								}
+								
 							} else if (this.taskInfo[i].businessType == 'REPORT') {
 								if (this.taskInfo[i].businessCode == 'PROCUREMENT-CLOSE-REPORT') {
 									this.taskInfo[i].messageTitle = '采购平仓统计'
@@ -253,7 +258,11 @@
 								if (this.taskInfo[i].businessCode == 'SALE-ORDER-APPROVE') {
 									this.taskInfo[i].messageTitle = '销售订单'
 								}
-							} else if (this.taskInfo[i].businessType == 'TRANSPORTATIONTASK') {
+							} else if (this.taskInfo[i].businessType == 'PROCUREMENT') {
+								if (this.taskInfo[i].businessCode == 'PROCUREMENT-PRICE-APPROVE') {
+									this.taskInfo[i].messageTitle = '仓库设置'
+								}
+							} else if (this.taskInfo[i].businessType == 'Tran') {
 								if (this.taskInfo[i].businessCode == 'TRAN-TASK-APPROVE') {
 									this.taskInfo[i].messageTitle = '运费设置'
 								}
@@ -292,7 +301,7 @@
 			tabcarchange(statusFlag) {
 				this.statusFlag = statusFlag
 				this.pageSize = 1
-				this.getIndexBuyData(1)
+				this.getIndexBuyData(statusFlag)
 			},
 			navToDetailPage(item) {
 				if (item.businessCode == 'PROCUREMENT-ORDER-APPROVE') {
@@ -458,8 +467,7 @@
 	}
 
 	.introduce-section .title text {
-		font-size: 17px;
-		font-weight: bold;
+		font-size: 14px;
 		height: 50px;
 		line-height: 50px;
 	}
@@ -485,12 +493,10 @@
 	}
 
 	.introduce-section .guess-item {
-		border-radius: 4px;
+		border-radius: 10px;
 		background: #fff;
-		padding: 0upx 30upx 20upx;
+		padding: 30upx 30upx 80upx;
 		margin: 10px;
-		padding-bottom: 20upx;
-		border-bottom: 1px solid #ccc;
 	}
 
 	.line {