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

config/index.js

@@ -1,7 +1,6 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	// baseUrlNew: 'http://api1.eliangeyun.com/',
-	baseUrlNew: 'http://192.168.1.117:8090/',
+	baseUrlNew: 'http://api1.eliangeyun.com/',
 	// baseUrlNew: 'http://192.168.1.119:9100/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.1.32",
-    "versionCode" : 1132,
+    "versionName" : "1.1.34",
+    "versionCode" : 1134,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages/erpbusiness/add_quality_testing.vue

@@ -212,7 +212,7 @@
 				username: "请更改昵称",
 				gridList: {
 					natureOfGrainPurchase: '贸易粮',
-					type: '潮粮',
+					type: '',
 					tidalGrainPrice: '',
 					dryGrainPrice: '',
 					buckleMiscellaneous: '',
@@ -277,7 +277,6 @@
 			}
 		},
 		onLoad(options) {
-
 			this.commonWarehouseNo = options.commonWarehouseNo
 			this.warehouseCount = Number(options.warehouseCount) + 1
 			let number = '000' + this.warehouseCount
@@ -285,16 +284,19 @@
 			this.gridList.warehouseName = options.warehouseName
 			this.gridList.qualityNo = 'SGRK' + this.getdate() + this.commonWarehouseNo + number
 			this.cangid = options.cangid
-			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
-				warehouseId: this.cangid
-			}).then(res => {
-				if (res.data.data) {
+			// this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
+			// 	warehouseId: this.cangid
+			// }).then(res => {
+			// 	if (res.data.data) {
+			// 		this.setGoodName([0])
 
-				}
-			})
+			// 	}
+			// })
 			this.managementType = options.managementType
 		},
 		onShow() {
+
+			let that = this
 			this.purchasePriceList = uni.getStorageSync('purchasePriceList')
 			if (uni.getStorageSync('checkcustomer')) {
 
@@ -302,10 +304,10 @@
 				if (_customerInfo.shipperName) {
 					//点击登记客户
 					this.gridList.customerName = _customerInfo.shipperName
-					this.gridList.customerPhone =_customerInfo.shipperPhone
+					this.gridList.customerPhone = _customerInfo.shipperPhone
 				} else {
 					//点击搜索客户
-					this.gridList.customerName =_customerInfo.customerName
+					this.gridList.customerName = _customerInfo.customerName
 					this.gridList.customerPhone = _customerInfo.customerPhone
 				}
 
@@ -313,7 +315,6 @@
 			}
 			this.gridList.grade = this.gradeList[0].value
 			this.gridList.gradeKey = this.gradeList[0].key
-			var that = this
 			this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer', {
 				compId: '',
 				authenticationStatusKey: 7
@@ -335,6 +336,15 @@
 					that.goodsList = res.data.data
 					if (that.goodsList.length > 0) {
 						that.gridList.goodsName = that.goodsList[0].goodsName
+						if (that.goodsList[0].goodsName == '玉米') {
+							that.gridList.type = '干粮'
+							that.edit = true
+						} else if (that.goodsList[0].goodsName == '玉米（潮粮）') {
+							that.gridList.type = '潮粮'
+							that.edit = true
+						} else {
+							that.edit = false
+						}
 						uni.setStorageSync('purchasePriceList', that.goodsList)
 						that.purchasePriceList = uni.getStorageSync('purchasePriceList')
 						that.waterContentChange()
@@ -354,21 +364,21 @@
 			})
 		},
 		methods: {
-			confirmInfo(){
-				this.isShowAlert = true
-			},
-			alertBtn() {
-				// this.$api.doRequest('get', '/purchasePrice/dryGrainPrice', {
-				// 	warehouseId: this.cangid,
-				// 	goodsName: this.gridList.goodsName
-				// }).then(res => {
-				// 	if(res.data.code=="200"){
-				// 		this.$api.msg('提交成功！')
-				// 	}else{
-				// 		this.$api.msg('提交失败')
-				// 	}
-				// })
-			},
+			// confirmInfo() {
+			// 	this.isShowAlert = true	
+			// },
+			// alertBtn() {
+			// 	this.$api.doRequest('get', '/qualityInspectionManagement/api/editQualityInspection', {
+			// 		id: this.id,
+			// 		flag:2
+			// 	}).then(res => {
+			// 		if(res.data.code=="200"){
+			// 			this.$api.msg('提交成功！')
+			// 		}else{
+			// 			this.$api.msg('提交失败')
+			// 		}
+			// 	})
+			// },
 			cancelClick() {
 				this.isShowAlert = false
 			},
@@ -581,8 +591,8 @@
 				this.gridList.gradeKey = this.gradeList[e[0]].key
 				this.waterContentChange()
 			},
-			goodspicker(e) {
-				console.log(e)
+			setGoodName(e) {
+				// [e[0]] = 0
 				// this.$set(this.gradeList,'grade',this.gradeList[e[0]].value)
 				if (this.goodsList[e[0]].goodsName == '玉米') {
 					this.gridList.type = '干粮'
@@ -600,11 +610,16 @@
 						warehouseId: this.cangid,
 						goodsName: this.gridList.goodsName
 					}).then(res => {
-						that.gridList.dryGrainPrice = res.data.data
+						this.gridList.dryGrainPrice = res.data.data
 					})
 				}
 				this.waterContentChange()
 			},
+			goodspicker(e) {
+				console.log(e)
+				this.setGoodName(e)
+
+			},
 			typepicker(e) {
 				var that = this
 				this.gridList.type = this.typeList[e[0]]
@@ -794,7 +809,7 @@
 		.button {
 			background: #22C572;
 			width: 90%;
-			margin: 0 auto;
+			margin: 20rpx auto;
 			padding: 10px;
 			color: #fff;
 			text-align: center;

pages/erpbusiness/customer.vue

@@ -176,7 +176,7 @@
 			// 	authenticationStatusKey: 7,
 			// 	searchKeyWord:''
 			// }).then(res => {
-			// 	if (res.data.data) {debugger
+			// 	if (res.data.data) {
 			// 		this.customerList = res.data.data
 			// 	}
 			// })

pages/erpbusiness/edit_quality_testing.vue

@@ -166,8 +166,12 @@
 		</view>
 
 		<view class="footer">
+			<view @click='confirmInfo' class="button">确认初检信息</view>
 			<view @click='submit' class="button">提交</view>
 		</view>
+		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
+			showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 
@@ -242,7 +246,9 @@
 					},
 				],
 				cangid: '',
-				goodsList:[]
+				goodsList:[],
+				isShowAlert:false,
+				content: '确认初检信息后，初检员不需要再次确认质检信息，是否确定提交?',
 			}
 		},
 		// #ifndef MP
@@ -309,6 +315,24 @@
 			this.gridList.gradeKey = this.gradeList[0].key
 		},
 		methods: {
+			confirmInfo() {
+				this.isShowAlert = true	
+			},
+			alertBtn() {
+				this.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection', {
+					id: this.id,
+					flag:2
+				}).then(res => {
+					if(res.data.code=="200"){
+						this.$api.msg('提交成功！')
+						setTimeout(function(){
+								uni.navigateBack({})
+						},1000)
+					}else{
+						this.$api.msg('提交失败')
+					}
+				})
+			},
 			waterContentChange() {
 				var that = this
 				if (this.gridList.goodsName && this.cangid) {
@@ -440,10 +464,10 @@
 					this.$api.msg('初检水分不能为空')
 					return
 				}
-				if (!this.gridList.reWaterContent) {
-					this.$api.msg('复检水分不能为空')
-					return
-				}
+				// if (!this.gridList.reWaterContent) {
+				// 	this.$api.msg('复检水分不能为空')
+				// 	return
+				// }
 				if (!this.gridList.mildewGrain) {
 					this.$api.msg('霉变粒不能为空')
 					return
@@ -637,7 +661,7 @@
 		.button {
 			background: #22C572;
 			width: 90%;
-			margin: 0 auto;
+			margin: 20rpx auto;
 			padding: 10px;
 			color: #fff;
 			text-align: center;

pages/erpbusiness/examine_quality_testing.vue

@@ -56,9 +56,9 @@
 			<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=""
 						name="input"></input>
-					<input v-model='gridList.reBuckleMiscellaneous' placeholder="复检扣杂" @input="waterContentChange"
+					<input v-model='gridList.reBuckleMiscellaneous' placeholder="复检扣杂" @input=""
 						name="input"></input>
 				</view>
 			</view>
@@ -104,6 +104,10 @@
 					{{gridList.dryGrainPrice}}
 				</view>
 			</view>
+			<view class="c-row-fj" v-if="statusShow == '已复检'">
+				<view style="margin: 0px 0px 30rpx 10rpx;">复检备注</view>
+					<textarea class='textarea-style' v-model='gridList.reMemo' placeholder="暂无复检备注信息!" maxlength="300" disabled ></textarea>
+			</view>
 		</view>
 		<view style='margin-bottom:300rpx;'>
 			<view class='wrap'>
@@ -118,9 +122,9 @@
 				<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=""
 							name="input"></input>
-						<input v-model='gridList.reWaterContent' placeholder="复检水分" @input="waterContentChange"
+						<input v-model='gridList.reWaterContent' placeholder="复检水分" @input=""
 							name="input"></input>
 					</view>
 					<view class="con-list">
@@ -229,13 +233,10 @@
 						value: '等外'
 					},
 				],
-				cangid: ''
+				cangid: '',
+				statusShow:"",
 			}
 		},
-
-		onLoad() {
-
-		},
 		// #ifndef MP
 		onNavigationBarButtonTap(e) {
 			const index = e.index;
@@ -267,10 +268,11 @@
 			}
 		},
 		onLoad(options) {
-			console.log(options)
 			this.id = options.id
 			this.cangid = options.cangid
 			this.managementType = options.managementType
+			this.statusShow = options.statusShow
+			console.log(this.statusShow)
 		},
 		onShow() {
 			var that = this
@@ -497,4 +499,13 @@
 			border-radius: 30px;
 		}
 	}
+	.textarea-style{
+		border: 1px solid #EEEEEE;
+		width: 100%;
+		padding:20rpx;
+		border-radius: 20rpx;
+	}
+	.c-row-fj{
+		padding:20rpx
+	}
 </style>

pages/erpbusiness/quality_testing.vue

@@ -269,7 +269,7 @@
 			examine(item) {
 				uni.navigateTo({
 					url: '/pages/erpbusiness/examine_quality_testing?id=' + item.id + '&managementType=' + this
-						.managementType + '&cangid=' + this.cangid
+						.managementType + '&cangid=' + this.cangid + '&statusShow=' + item.status
 				})
 			},
 			emptysearch() {