更新

pages/erp/exWarehousing/exWarehousing.vue

@@ -424,8 +424,20 @@
 						this.detailData.contractNo = this.inOutNoList[0].moveTaskNo
 					}
 					this.detailData.goodsName = this.inOutNoList[0].goodsName
+					this.detailData.goodsNameKey = this.inOutNoList[0].goodsNameKey
 					this.detailData.grade = this.inOutNoList[0].grade
 					this.detailData.inOutType = this.inOutNoList[0].inOutType
+					if (this.detailData.inOutType == '销售出库') {
+						this.detailData.inOutTypeKey = 1
+					} else if (this.detailData.inOutType == '移库出库') {
+						this.detailData.inOutTypeKey = 3
+					} else if (this.detailData.inOutType == '暂存出库') {
+						this.detailData.inOutTypeKey = 4
+					} else if (this.detailData.inOutType == '贸易服务出库') {
+						this.detailData.inOutTypeKey = 5
+					} else if (this.detailData.inOutType == '采购出库') {
+						this.detailData.inOutTypeKey = 6
+					}
 					//查询所有的合同  进行获取车牌号
 					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
 						flag: 5,
@@ -470,6 +482,7 @@
 					this.detailData.contractNo = this.inOutNoList[e[0]].moveTaskNo
 				}
 				this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
+				this.detailData.goodsNameKey = this.inOutNoList[e[0]].goodsNameKey
 				this.detailData.grade = this.inOutNoList[e[0]].grade
 				this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
 				this.weightbills.goodsName = this.inOutNoList[e[0]].goodsName

pages/erp/warehousing/warehousing.vue

@@ -345,17 +345,6 @@
 			this.detailData.contractNo = _data.contractNo;
 			this.detailData.goodsNameKey = _data.goodsNameKey;
 			this.detailData.inOutType = _data.inOutType;
-			if (this.detailData.inOutType == '采购入库') {
-				this.detailData.inOutTypeKey = 1
-			} else if (this.detailData.inOutType == '移库入库') {
-				this.detailData.inOutTypeKey = 3
-			} else if (this.detailData.inOutType == '暂存入库') {
-				this.detailData.inOutTypeKey = 4
-			} else if (this.detailData.inOutType == '贸易服务入库') {
-				this.detailData.inOutTypeKey = 5
-			} else if (this.detailData.inOutType == '退库') {
-				this.detailData.inOutTypeKey = 6
-			}
 			if (_data.unitContractPrice) {
 				this.detailData.cost = _data.unitContractPrice
 			}
@@ -428,6 +417,7 @@
 		},
 		methods: {
 			inOutNo() {
+				let  that  = this
 				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
 					flag: 2,
 					warehouseName:this.warehouseName,
@@ -443,8 +433,20 @@
 						this.detailData.contractNo = this.inOutNoList[0].moveTaskNo
 					}
 					this.detailData.goodsName = this.inOutNoList[0].goodsName
+					this.detailData.goodsNameKey = this.inOutNoList[0].goodsNameKey;
 					this.detailData.grade = this.inOutNoList[0].grade
 					this.detailData.inOutType = this.inOutNoList[0].inOutType
+					if (this.detailData.inOutType == '采购入库') {
+						this.detailData.inOutTypeKey = 1
+					} else if (this.detailData.inOutType == '移库入库') {
+						this.detailData.inOutTypeKey = 3
+					} else if (this.detailData.inOutType == '暂存入库') {
+						this.detailData.inOutTypeKey = 4
+					} else if (this.detailData.inOutType == '贸易服务入库') {
+						this.detailData.inOutTypeKey = 5
+					} else if (this.detailData.inOutType == '退库') {
+						this.detailData.inOutTypeKey = 6
+					}
 					//查询所有的合同  进行获取车牌号
 					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
 						flag: 7,
@@ -500,6 +502,7 @@
 					this.detailData.contractNo = this.inOutNoList[e[0]].moveTaskNo
 				}
 				this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
+				this.detailData.goodsNameKey = this.inOutNoList[e[0]].goodsNameKey;
 				this.detailData.grade = this.inOutNoList[e[0]].grade
 				this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
 				for (var i = 0; i < this.contractNoList.length; i++) {

pages/erpbusiness/acquisitionInspection/tareDetail.vue

@@ -49,6 +49,16 @@
 				<view class="left">净重（公斤）</view>
 				<input class="right-bottom" disabled placeholder="自动计算" v-model="detailData.netWeight"></input>
 			</view>
+			<view  class="row row-bottom">
+				<view class="left">应收卸车过磅费（元）</view>
+				<input disabled class="right-bottom" placeholder="未获取到卸车过磅费金额"
+					v-model="detailData.receivableWeighingFee"></input>
+			</view>
+			<view class="row row-bottom" style="border: 0;">
+				<view class="left">实收卸车过磅费（元）</view>
+				<input disabled class="right-bottom" placeholder="输入卸车过磅费"
+					v-model="detailData.actualWeighingFee"></input>
+			</view>
 		</view>
 		<u-button type="primary" class="submit" @click="submit">提交</u-button>
 		<u-toast ref="uToast" />
@@ -79,6 +89,7 @@
 		},
 		onLoad(options) {
 			this.detailData = JSON.parse(options.detailData)
+			console.log(this.detailData)
 			if (!this.detailData.buckleMiscellaneous) {
 				this.detailData.buckleMiscellaneous = 0
 			}

pages/erpbusiness/add_quality_testing.vue

@@ -102,7 +102,10 @@
 		</view>
 		<view style='padding-bottom:300rpx;'>
 			<view class='wrap'>
-				<view class='title_b'>化验信息</view>
+				<view style='margin-right:10px;' class='flex justify-between align-item-center'>
+					<view class='title_b'>化验信息</view>
+					<view class='flex justify-between align-item-center'>补录：<u-switch activeColor="#22C572" v-model="value" @change="change"></u-switch></view>
+				</view>
 
 				<view class="c-row ">
 					<view class="title">等级</view>
@@ -216,6 +219,7 @@
 				show2: false,
 				goodsList: [],
 				currentPage: 1,
+				value:false,
 				gridBorder: false,
 				headUrl: "../../static/img/myimg/YongHu@3x.png",
 				userphone: "",
@@ -362,6 +366,14 @@
 			})
 		},
 		methods: {
+			change(e){
+				if(e){
+					this.gridList.supplementaryRecording=1
+				}else{
+					this.gridList.supplementaryRecording=0
+				}
+				
+			},
 			print(){
 				uni.navigateTo({
 					url: '/pages/erpbusiness/bleConnect'
@@ -523,33 +535,39 @@
 					this.$api.msg('购粮性质不能为空')
 					return
 				}
-				if (!this.gridList.grade) {
-					this.$api.msg('等级不能为空')
-					return
-				}
-				if (!this.gridList.impurity) {
-					this.$api.msg('杂质不能为空')
-					return
-				}
-				if (!this.gridList.waterContent) {
-					this.$api.msg('水分不能为空')
-					return
-				}
-				if (!this.gridList.mildewGrain) {
-					this.$api.msg('霉变粒不能为空')
-					return
-				}
-				if (!this.gridList.bulkDensity) {
-					this.$api.msg('容重不能为空')
-					return
-				}
-				if (!this.gridList.jiaorenli) {
-					this.$api.msg('热损伤不能为空')
-					return
-				}
-				if (!this.gridList.imperfectGrain) {
-					this.$api.msg('不完整粒不能为空')
-					return
+				if(this.value==false){
+					if (!this.gridList.grade) {
+						this.$api.msg('等级不能为空')
+						return
+					}
+					if (!this.gridList.impurity) {
+						this.$api.msg('杂质不能为空')
+						return
+					}
+					if (!this.gridList.waterContent) {
+						this.$api.msg('初检水分不能为空')
+						return
+					}
+					// if (!this.gridList.reWaterContent) {
+					// 	this.$api.msg('复检水分不能为空')
+					// 	return
+					// }
+					if (!this.gridList.mildewGrain) {
+						this.$api.msg('霉变粒不能为空')
+						return
+					}
+					if (!this.gridList.bulkDensity) {
+						this.$api.msg('容重不能为空')
+						return
+					}
+					if (!this.gridList.jiaorenli) {
+						this.$api.msg('热损伤不能为空')
+						return
+					}
+					if (!this.gridList.imperfectGrain) {
+						this.$api.msg('不完整粒不能为空')
+						return
+					}
 				}
 				uni.showModal({
 					content: "确定提交质检信息？",
@@ -586,7 +604,7 @@
 															'/qualityInspectionManagement/api/addQualityInspection',
 															that.gridList)
 														.then(res => {
-															if (res.data.code == 200) {debugger
+															if (res.data.code == 200) {
 																that.$api.msg('提交成功')
 																that.isShowPrint = true
 																that.gridList.warehouseId = that.cangid

pages/erpbusiness/edit_quality_testing.vue

@@ -71,7 +71,7 @@
 			</view>
 			<view class="c-row ">
 				<view class="title">货名</view>
-				<view class="con-list">
+				<view  class="con-list">
 					 <!-- <view v-if="flag != '0'">
 						{{gridList.goodsName}}
 					</view> -->
@@ -103,13 +103,21 @@
 				<view style="margin: 0px 0px 30rpx 10rpx;">复检备注</view>
 					<textarea class='textarea-style' v-model='gridList.reMemo' placeholder="请输入复检备注" maxlength="300"></textarea>
 			</view>
-			
+			<view class="c-row" v-if="flag==1&&gridList.warehouseName=='鲅鱼圈金信库'">
+				<view class="title">车型</view>
+				<view class="con-list">
+					<view @click='carstatus = true'>{{gridList.carModel?gridList.carModel:'请选择车型'}}</view>
+				<u-picker :range="carModeList" range-key="constValue" @confirm='carPicker($event)' v-model="carstatus" mode="selector" >
+				</u-picker>
+				</view>
+				
+			</view>
 		</view>
 		<view style='padding-bottom:300rpx;'>
 			<view class='wrap'>
 				<view style='margin-right:10px;' class='flex justify-between align-item-center'>
 					<view class='title_b'>化验信息</view>
-					<u-switch v-if='flag!=1' v-model="value" @change="change"></u-switch>
+					<view class='flex justify-between align-item-center'>补录：<u-switch activeColor="#22C572" v-if='flag==0' v-model="value" @change="change"></u-switch></view>
 				</view>
 				<view class="c-row ">
 					<view class="title">等级</view>
@@ -162,9 +170,9 @@
 				<view class="c-row ">
 					<view class="title">热损伤（%）</view>
 					<view class="con-list">
-						<!-- <input :disabled='flag==1' v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
-							name="input"></input> -->
-							<input v-model='gridList.jiaorenli' @click.stop="handleShowKeyboard1":disabled="true" placeholder="请输入热损伤占比" name="input"></input>
+						<input :disabled='flag==1' v-model='gridList.jiaorenli' placeholder="请输入热损伤占比"
+							name="input"></input>
+							<!-- <input v-model='gridList.jiaorenli' @click.stop="handleShowKeyboard1":disabled="true" placeholder="请输入热损伤占比" name="input"></input> -->
 					</view>
 				</view>
 			</view>
@@ -212,6 +220,7 @@
 				selector: [],
 				show1: false,
 				goodsName:false,
+				carstatus:false,
 				inputContent: '',
 				coverTransform: 'translateY(0px)',
 				coverTransition: '0s',
@@ -235,7 +244,8 @@
 					type: '潮粮',
 					tidalGrainPrice: '',
 					dryGrainPrice: '',
-					carNumber:''
+					carNumber:'',
+					carModel:'',
 				},
 				managementType: '',
 				warehouseName: '',
@@ -244,6 +254,7 @@
 				companyId: 1,
 				current: 4,
 				value:false,
+				carModeList:[],
 				gradeList: [{
 						key: 1,
 						value: '一等品'
@@ -325,6 +336,13 @@
 					})
 				}
 			})
+			this.$api.doRequest('get', 'commonSysParameter/getInfo', {
+				constId: 'QUA1'
+			}).then(res => {
+				if (res.data.data) {
+					that.carModeList=res.data.data
+				}
+			})
 			//质检货名下拉
 			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
 				 warehouseId: this.cangid
@@ -356,6 +374,9 @@
 			hidden(){
 				this.$refs.keyboard.open(false)
 			},
+			carPicker(e){
+				this.gridList.carModel=this.carModeList[e[0]].constValue
+			},
 			handleShowKeyboard(){
 				if(this.flag==0){
 					if(this.$refs.keyboard.open){
@@ -531,7 +552,7 @@
 					this.$api.msg('购粮性质不能为空')
 					return
 				}
-				if(this.value==false){
+				if(this.value==false||this.flag==2){
 					if (!this.gridList.grade) {
 						this.$api.msg('等级不能为空')
 						return

pages/task/audit/purchase_settlement_approval.vue

@@ -20,15 +20,15 @@
 		<view class="content">
 			<view class="content-item">
 				<view class="top">
-				<view>{{contractNo}} ({{goodsName}})</view>
-				<view>{{unitPrice}}元/吨</view>
-			    </view>
-			<view class="top1">
-				<view>客户</view>
-				<view style="font-size: 30rpx;">{{customerName}}</view>
-			</view>
+					<view>{{contractNo}} ({{goodsName}})</view>
+					<view>{{unitPrice}}元/吨</view>
+				</view>
+				<view class="top1">
+					<view>客户</view>
+					<view style="font-size: 30rpx;">{{customerName}}</view>
+				</view>
 			</view>
-			
+
 			<view class="content-item">
 				<view class="car-container" v-for="(item,index) in list">
 					<view class="car-num title">{{item.carNo}}</view>
@@ -101,15 +101,15 @@
 				border: false,
 				unitPrice: "",
 				goodsName: "",
-				customerName:""//客户
+				customerName: "" //客户
 			}
 		},
 		onBackPress(e) {
-			if(this.everyCheck){
-			uni.navigateTo({
-				url: "/pages/task/my_task"
-			})
-			return true;
+			if (this.everyCheck) {
+				uni.navigateTo({
+					url: "/pages/task/my_task"
+				})
+				return true;
 			}
 		},
 		onLoad(options) {
@@ -126,7 +126,7 @@
 					this.contractNo = res.data.data.contractNo
 					this.unitPrice = res.data.data.price
 					this.goodsName = res.data.data.goodsName
-					this.customerName = res.data.data.customer//客户
+					this.customerName = res.data.data.customer //客户
 					if (res.data.code == 200) {
 						this.$api.doRequest('get', '/stockPurchaseReceiptReport/selectPurchaseOrder', {
 							compId: "2710b21efc1e4393930c5dc800010dc4",
@@ -181,21 +181,18 @@
 				if (this.title == '驳回原因（驳回）') {
 					this.rejectSubmit()
 				} else {
-					if (!this.rejectInfo1) {
-						this.$api.msg('审核意见不能为空！')
-					} else {
-						that.show2 = false
-						uni.showModal({
-							content: "是否确定通过？",
-							showCancel: true,
-							confirmText: '确定',
-							success: function(res) {
-								if (res.confirm) {
-									that.audit(that.list[0], 0, true, 2)
-								}
+					that.show2 = false
+					uni.showModal({
+						content: "是否确定通过？",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.audit(that.list[0], 0, true, 2)
 							}
-						})
-					}
+						}
+					})
+
 				}
 			},
 			//审核方法
@@ -246,6 +243,7 @@
 			margin-top: 10rpx;
 			margin-bottom: 30rpx;
 		}
+
 		.top1 {
 			display: flex;
 			justify-content: space-between;
@@ -424,6 +422,7 @@
 		right: 0;
 		color: #22C572;
 	}
+
 	.u-textarea-style {
 		margin: 20rpx;
 		background: #F9F9FA;
@@ -431,7 +430,7 @@
 		border: 1px solid #EEEEEE;
 		padding: 10rpx 20rpx;
 		position: relative;
-	
+
 		.right-bottom {
 			position: absolute;
 			right: 20rpx;

pages/task/audit/warehouse_approval.vue

@@ -86,7 +86,7 @@
 					<u-input class="" v-model='rejectInfo' placeholder="请在此输入审核意见" type="textarea" height="414"
 						maxlength="100" />
 				</view>
-			<!-- 	<u-button @click="show1 = false"  class="cancel">取消</u-button>
+				<!-- 	<u-button @click="show1 = false"  class="cancel">取消</u-button>
 				<u-button @click="reject()" class="confirm">确定</u-button> -->
 				<view @click='show1 = false' class="cancel">取消</view>
 				<view @click='reject()' class="confirm">确定</view>
@@ -151,11 +151,11 @@
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		onBackPress(e) {
-			if(this.everyCheck){
-			uni.navigateTo({
-				url: "/pages/task/my_task"
-			})
-			return true;
+			if (this.everyCheck) {
+				uni.navigateTo({
+					url: "/pages/task/my_task"
+				})
+				return true;
 			}
 		},
 		onLoad(options) {
@@ -170,7 +170,7 @@
 			})
 		},
 		methods: {
-			close(){
+			close() {
 				this.show1 = false
 				this.show2 = false
 			},
@@ -188,51 +188,48 @@
 				this.list.contractNo = item[0].value
 			},
 			audit() {
-				if (!this.rejectInfo1) {
-					this.$api.msg('审核意见不能为空！')
-				} else {
-					var that = this
-					that.show2 = false
-					uni.showModal({
-						content: "是否确定通过审核？",
-						showCancel: true,
-						confirmText: '确定',
-						success: function(res) {
-							if (res.confirm) {
-								uni.showLoading({
-									title: "审核中"
+				var that = this
+				that.show2 = false
+				uni.showModal({
+					content: "是否确定通过审核？",
+					showCancel: true,
+					confirmText: '确定',
+					success: function(res) {
+						if (res.confirm) {
+							uni.showLoading({
+								title: "审核中"
+							})
+							that.$api.doRequest('post', '/purchasePrice/purchasePriceEdit', that.list)
+								.then(res => {
+									if (res.data.code == 200) {
+										that.$api.doRequest('post', '/workflow/api/handle', {
+											approved: true,
+											auditMind: that.rejectInfo1,
+											needReapply: true,
+											taskId: that.list.taskId,
+										}).then(res1 => {
+											if (res1.data.code == 200) {
+												that.$api.msg('审核成功');
+												setTimeout(function() {
+													if (this.everyCheck) {
+														helper.setAudit(that.list)
+													} else {
+														uni.navigateBack()
+													}
+													uni.hideLoading()
+												}, 1000);
+											} else {
+												that.$api.msg(res1.data.message);
+											}
+										})
+									} else {
+										that.$api.msg('系统异常，请联系管理员');
+									}
 								})
-								that.$api.doRequest('post', '/purchasePrice/purchasePriceEdit', that.list)
-									.then(res => {
-										if (res.data.code == 200) {
-											that.$api.doRequest('post', '/workflow/api/handle', {
-												approved: true,
-												auditMind: that.rejectInfo1,
-												needReapply: true,
-												taskId: that.list.taskId,
-											}).then(res1 => {
-												if (res1.data.code == 200) {
-													that.$api.msg('审核成功');
-													setTimeout(function() {
-														if (this.everyCheck) {
-															helper.setAudit(that.list)
-														} else {
-															uni.navigateBack()
-														}
-														uni.hideLoading()
-													}, 1000);
-												} else {
-													that.$api.msg(res1.data.message);
-												}
-											})
-										} else {
-											that.$api.msg('系统异常，请联系管理员');
-										}
-									})
-							}
 						}
-					})
-				}
+					}
+				})
+
 			},
 			reject() {
 				if (!this.rejectInfo) {
@@ -456,9 +453,11 @@
 			color: #AFB3BF;
 		}
 	}
+
 	/deep/.u-input__textarea {
 		height: 300rpx !important;
 	}
+
 	.cancel,
 	.confirm {
 		position: absolute;
@@ -470,13 +469,13 @@
 		border-top: 1px solid #eee;
 		font-size: 34rpx;
 	}
-	
+
 	.cancel {
 		left: 0;
 		border-right: 1px solid #eee;
 		color: #AFB3BF;
 	}
-	
+
 	.confirm {
 		right: 0;
 		color: #22C572;