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

config/index.js

@@ -1,9 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://192.168.1.120:8090/',
-	// baseUrlNew: 'https://apitest.eliangeyun.com/',
-	// baseUrlNew: 'http://api1.eliangeyun.com/',
-	// baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://192.168.1.120:8090/',
+	baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

manifest.json

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

pageD/identity/companyIdentity.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="center">
 		<view v-if='!status' class="top">
-			<text @click='consent' v-bind:class="switchs1">公司</text>
-			<text @click='consent' v-bind:class="switchs2">个人</text>
+			<text @click='consent' v-bind:class="switchs1" v-if="consentStatus">公司</text>
+			<text @click='consent' v-bind:class="switchs2" v-if="consentStatus1">个人</text>
 		</view>
 		<view class="content">
 			<view v-if="consentStatus == true">
@@ -80,6 +80,7 @@
 		name: "buy",
 		data() {
 			return {
+				isShowPerson:false,
 				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
@@ -118,17 +119,19 @@
 				id1: "../../static/img/authentication/identityup(3).png",
 				id2: "../../static/img/authentication/identitylow(3).png",
 				identityImgs1: {},
-status:false,
+				status:false,
 				identityAuthenticationInfo: {},
 				tempFilePaths: [],
 				businessLicenseAddressUrl: "",
 				certificates: true,
+				isEdit:false
 			};
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		onLoad(options) {
+			// this.isEdit = options.isEdit;
 			if(options.status){
 				this.status=true
 				this.consentStatus = false

pageD/identity/companyIdentityThree.vue

@@ -2,20 +2,21 @@
 	<view class="center">
 		<view>
 			<!-- 上传银行卡正面 -->
-			<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-				:size-type="['compressed']" @on-success="getImgUrl"  @on-remove="onRemove"
+			<upload class="upload" :file-list='payeeAddressUrlList[0]' ref="upload" :action="action" :max-size="maxSize"
+				:max-count="1" :size-type="['compressed']" @on-success="getImgUrl" @on-remove="onRemove"
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions"
 				:custom="uploadCustom"></upload>
 			<!-- 上传银行卡反面 -->
-			<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
-				:size-type="['compressed']" @on-success="getImgUrl1"  @on-remove="onRemove"
+			<upload class="upload" :file-list='payeeAddressUrlList[1]' ref="upload" :action="action" :max-size="maxSize"
+				:max-count="1" :size-type="['compressed']" @on-success="getImgUrl1" @on-remove="onRemove"
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
-				:custom="uploadCustom" ></upload>
+				:custom="uploadCustom"></upload>123456
 		</view>
 		<view class="c-row b-b">
 			<text class="tit">银行卡号</text>
 			<view class="con-list">
-				<input type='number' placeholder="请填写银行卡号" name="input" v-model="identityAuthenticationInfo.bankCard"></input>
+				<input type='number' placeholder="请填写银行卡号" name="input"
+					v-model="identityAuthenticationInfo.bankCard"></input>
 			</view>
 		</view>
 		<view class="c-row b-b">
@@ -129,6 +130,7 @@
 				zhihangStatus: true,
 				verification: true,
 				identityAuthenticationInfos: {},
+				payeeAddressUrlList: []
 			}
 		},
 		computed: {
@@ -140,6 +142,16 @@
 				this.identityAuthenticationInfo.payeeName = this.identityAuthenticationInfo.customerName
 				this.identityAuthenticationInfo.payeeNumberCard = this.identityAuthenticationInfo.customerNumberCard
 			}
+			if (this.identityAuthenticationInfo.payeeAddressUrl) {
+				let _lsit = []
+				_lsit = this.identityAuthenticationInfo.payeeAddressUrl.split(',')
+				this.payeeAddressUrlList[0] = [{
+					url: _lsit[0]
+				}]
+				this.payeeAddressUrlList[1] = [{
+					url: _lsit[0]
+				}]
+			}
 		},
 		methods: {
 			filterFileType(index, lists) {
@@ -321,15 +333,15 @@
 					// 	return
 					// }
 				} else if (this.identityAuthenticationInfo.customerTypeFlag == 2) {
-					// if (!this.identityAuthenticationInfo.compAddress) {
-					// 	this.$api.msg('公司地址不能为空')
-					// 	return
-					// }
-					// if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
-					// 	.compAddress.length > 20) {
-					// 	this.$api.msg('公司地址输入错误')
-					// 	return
-					// }
+					if (!this.identityAuthenticationInfo.compAddress) {
+						this.$api.msg('公司地址不能为空')
+						return
+					}
+					if (this.identityAuthenticationInfo.compAddress.length < 2 || this.identityAuthenticationInfo
+						.compAddress.length > 20) {
+						this.$api.msg('公司地址输入错误')
+						return
+					}
 				}
 				this.amendprice()
 
@@ -348,23 +360,26 @@
 					showCancel: true,
 					confirmText: '确定',
 					success: function(res) {
+
+						console.log('confirmInfo', that.identityAuthenticationInfo)
 						if (res.confirm) {
 							uni.showLoading({
-								title:"正在提交",
-								mask:true
+								title: "正在提交",
+								mask: true
 							})
 							that.$api.doRequest('get', '/commonUser/loginVerifyCode', {
 									phone: that.identityAuthenticationInfo.customerPhone,
 									verifyCode: that.verifyCode
 								}).then(res => {
-									console.log("loginVerifyCode:",res)
+									console.log("loginVerifyCode:", res)
 									if (res.data.code == 200) {
 										if (that.userInfo) {
 											that.identityAuthenticationInfo.commonId = that.userInfo.id
 										} else {
 											that.identityAuthenticationInfo.commonId = res.data.data.id
 										}
-										that.identityAuthenticationInfo.payeeAddressUrl = that.bankid.toString()
+										that.identityAuthenticationInfo.payeeAddressUrl = that.bankid
+											.toString()
 										// that.identityAuthenticationInfo.compId = "2710b21efc1e4393930c5dc800010dc4"
 										that.identityAuthenticationInfos.customerPhone = that
 											.identityAuthenticationInfo.customerPhone
@@ -372,63 +387,164 @@
 												'/identityAuthenticationInfo/selectPhone', that
 												.identityAuthenticationInfos)
 											.then(res => {
-												console.log("selectPhone:",res)
+												console.log("selectPhone:", res)
 												if (res.data.code == '11018') {
 													uni.showModal({
 														title: '提示',
 														content: '该手机号已认证过个人粮商，再次认证将覆盖之前的认证信息，是否确定认证？',
 														success: function(res) {
 															if (res.confirm) {
-																that.$api.doRequest('post',
-																		'/identityAuthenticationInfo/api/addIdentityAuthenticationInfo',
-																		that
-																		.identityAuthenticationInfo
+																if (that
+																	.identityAuthenticationInfo
+																	.id) {
+																	that.$api.doRequest(
+																			'post',
+																			'/identityAuthenticationInfo/api/editIdentityAuthenticationInfo',
+																			that
+																			.identityAuthenticationInfo,
+																			'application/json;charset=UTF-8'
+																		).then(res => {
+																			console
+																				.log(
+																					"成功连接"
+																				)
+																			if (!that
+																				.identityAuthenticationInfo
+																				.goodsName
+																			) {
+																				that.$api
+																					.msg(
+																						'修改成功！'
+																					)
+																				uni.navigateTo({
+																					url: `/pages/attestation/index`
+																				})
+																				return
+																			}
+
+
+																		})
+																		.catch(res => {
+																			if (res
+																				.errmsg
+																			) {
+																				uni.showToast({
+																					title: res
+																						.errmsg,
+																					icon: 'none',
+																					duration: 2000
+																				})
+																			} else {
+																				uni.showToast({
+																					title: "系统异常，请联系管理员",
+																					icon: 'none',
+																					duration: 2000
+																				})
+																			}
+																		});
+
+
+																} else {
+																	that.$api.doRequest(
+																			'post',
+																			'/identityAuthenticationInfo/api/addIdentityAuthenticationInfo',
+																			that
+																			.identityAuthenticationInfo
 																		)
-																	.then(res => {
-																		if (res.data.code ==200) {
-																			uni.showToast({
-																				title: '提交成功',
-																				icon: 'none',
-																				duration: 2000
-																			})
-																			setTimeout(()=>{uni.navigateBack({
-																				delta: 3
-																			})},2000);
-																		}
-																	})
+																		.then(res => {
+																			if (res
+																				.data
+																				.code ==
+																				200) {
+																				uni.showToast({
+																					title: '提交成功',
+																					icon: 'none',
+																					duration: 2000
+																				})
+																				setTimeout
+																					(() => {
+																							uni.navigateBack({
+																								delta: 3
+																							})
+																						},
+																						2000
+																					);
+																			}
+																		})
+																}
 															}
 														}
 													});
 												} else if (res.data.code == 200) {
-													that.$api.doRequest('post',
-															'/identityAuthenticationInfo/api/addIdentityAuthenticationInfo',
-															that.identityAuthenticationInfo)
-														.then(res => {
-															console.log("addIdentityAuthenticationInfo:",res)
-															if (res.data.code == 200) {
-																uni.showToast({
-																	title: '提交成功',
-																	icon: 'none',
-																	duration: 2000
-																})
-																setTimeout(()=>{uni.navigateBack({
-																	delta: 3
-																})},2000);
-																
-															}
-															else{
-																console.log("异常1:",res)
-																uni.showToast({
-																	title: "系统异常，请联系管理员",
-																	icon: 'none',
-																	duration: 2000
+													if (that.identityAuthenticationInfo.id) {
+														that.$api.doRequest('post',
+																'/identityAuthenticationInfo/api/editIdentityAuthenticationInfo',
+																that.identityAuthenticationInfo,
+																'application/json;charset=UTF-8').then(
+																res => {
+																	console.log("成功连接")
+																	if (!that
+																		.identityAuthenticationInfo
+																		.goodsName) {
+																		that.$api.msg('修改成功！')
+																		uni.navigateTo({
+																			url: `/pages/attestation/index`
+																		})
+																		return
+																	}
+
 																})
-															}
-														})
+															.catch(res => {
+																if (res.errmsg) {
+																	uni.showToast({
+																		title: res.errmsg,
+																		icon: 'none',
+																		duration: 2000
+																	})
+																} else {
+																	uni.showToast({
+																		title: "系统异常，请联系管理员",
+																		icon: 'none',
+																		duration: 2000
+																	})
+																}
+															});
+
+													} else {
+														that.$api.doRequest('post',
+																'/identityAuthenticationInfo/api/addIdentityAuthenticationInfo',
+																that.identityAuthenticationInfo)
+															.then(res => {
+																console.log(
+																	"addIdentityAuthenticationInfo:",
+																	res)
+																if (res.data.code == 200) {
+																	uni.showToast({
+																		title: '提交成功',
+																		icon: 'none',
+																		duration: 2000
+																	})
+																	setTimeout(() => {
+																		uni.navigateBack({
+																			delta: 3
+																		})
+																	}, 2000);
+
+																} else {
+																	console.log("异常1:", res)
+																	uni.showToast({
+																		title: "系统异常，请联系管理员",
+																		icon: 'none',
+																		duration: 2000
+																	})
+																}
+															})
+													}
+
 												}
 												uni.hideLoading()
 											}).catch(res => {
-												console.log("异常:",res)
+												console.log("异常:", res)
 												uni.showToast({
 													title: "系统异常，请联系管理员",
 													icon: 'none',
@@ -457,13 +573,13 @@
 									uni.hideLoading()
 									return false
 								});
-							
+
 						} else if (res.cancel) {
 							// console.log('用户点击取消');
 						}
 					}
 				})
-				
+
 			},
 			getcode() {
 				var that = this
@@ -591,10 +707,12 @@
 		top: -150px;
 		text-align: center;
 	}
+
 	.upload {
 		margin: 20rpx 0;
 	}
-	.tit_red{
+
+	.tit_red {
 		color: #E54D42;
 	}
 </style>

pageD/identity/companyIdentityTwo.vue

@@ -2,12 +2,12 @@
 	<view class="center">
 		<view>
 			<!-- 个人身份证正面 -->
-			<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+			<upload class="upload" :file-list='cardAddressUrlList[0]' ref="upload" :action="action" :max-size="maxSize" :max-count="1"
 				:size-type="['compressed']" @on-success="getImgUrl1"  @on-remove="onRemove"
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
 				:custom="uploadCustom1" ></upload>
 			<!-- 个人身份证反面 -->
-			<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+			<upload class="upload" :file-list='cardAddressUrlList[1]' ref="upload" :action="action" :max-size="maxSize" :max-count="1"
 				:size-type="['compressed']" @on-success="getImgUrl2"  @on-remove="onRemove"
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions2"
 				:custom="uploadCustom1" ></upload>
@@ -45,6 +45,7 @@
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
+				cardAddressUrlList:[],
 				imgUrls: [],
 				uploadCustom1: true,
 				uploadCustom2: true,
@@ -68,6 +69,12 @@
 		onLoad(options) {
 			this.identityAuthenticationInfo = JSON.parse(options.identityAuthenticationInfo)
 			console.log(this.identityAuthenticationInfo)
+			if (this.identityAuthenticationInfo.cardAddressUrl) {
+				let _lsit = []
+				_lsit = this.identityAuthenticationInfo.cardAddressUrl.split(',')
+				this.cardAddressUrlList[0] = [{url:_lsit[0]}]
+				this.cardAddressUrlList[1] = [{url:_lsit[0]}]
+			}
 		},
 		methods: {
 			filterFileType(index, lists) {
@@ -152,6 +159,7 @@
 				this.imgUrls.splice(index, 1);
 			},
 			jumpUrl() {
+				
 				this.identityAuthenticationInfo.cardAddressUrl = this.id.toString()
 				// if (this.id[0] == '' || this.id[0] == null) {
 				// 	this.$api.msg('请上传身份证正面')

pages.json

@@ -865,6 +865,15 @@
 		        "enablePullDownRefresh": false
 		    }
 		    
+		},
+		{
+		    "path" : "pages/erp/exWarehousing/selectContractNo",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "选择合同",
+		        "enablePullDownRefresh": false
+		    }
+		    
 		}
 		,{
 		    "path" : "pages/erp/warehousing/selectCarNo",
@@ -874,6 +883,15 @@
 		        "enablePullDownRefresh": false
 		    }
 		    
+		},
+		{
+		    "path" : "pages/erp/exWarehousing/selectCarNo",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "选择车牌号",
+		        "enablePullDownRefresh": false
+		    }
+		    
 		}
         ,{
             "path" : "pages/erp/improvedWrehousing/improvedWrehousing",
@@ -947,6 +965,115 @@
             }
             
         }
+        ,{
+            "path" : "pages/task/audit/warehouse_approval",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "仓库设置审核",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/warehouse_details",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "仓库设置详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/freight_setting_approval",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "运费设置审核",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/freight_setting_details",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "运费设置详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/freight_settlement _approval",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "运费结算审核",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/freight_settlement _details",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "运费结算详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/acquisition_settlement_approval",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "收购结算审核",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/acquisition_settlement_details",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "收购结算详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/purchase_settlement_approval",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "采购结算审核",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+		,{
+		    "path" : "pages/task/audit/purchase_settlement_details",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "采购结算详情",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
+        ,{
+            "path" : "pages/task/audit/Issueandreceipt_task_approval",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "出入库任务审核",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/Issueandreceipt_task_details",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "出入库任务详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        
     ],
 	"subpackages": [{
 			"root": "pageA",
@@ -1673,7 +1800,7 @@
 				, {
 					"path": "warehousings/warehousingDetails",
 					"style": {
-						"navigationBarTitleText": "详情",
+						"navigationBarTitleText": "入库详情",
 						"enablePullDownRefresh": false
 					}
 

pages/attestation/indexTwo.vue

@@ -49,9 +49,9 @@
 					<text style="font-size: 12px;" @click.stop="select(item)">设为默认</text>
 				</view>
 				<view class="options flex">
-					<view class='but' v-if="item.authenticationStatus == '已覆盖'||item.authenticationStatus == '已认证'"
+					<view class='but' v-if="item.cover == '1'||item.authenticationStatus == '已认证'"
 						@click="open(item)">更换手机号</view>
-					<view class='but' v-if="item.authenticationStatus == '未通过'" @click="companyEdit(item)">修改</view>
+					<view class='but' v-if="item.cover != '1'&&item.authenticationStatus == '未通过'" @click="companyEdit(item)">修改</view>
 					<view class='but' @click="deleteLS(item)">删除</view>
 				</view>
 			</view>
@@ -450,8 +450,9 @@
 				})
 			},
 			companyEdit(item) {
+				
 				uni.navigateTo({
-					url: `/pageD/identity/companyIdentity?id=${item.id}`
+					url: `/pageD/identity/companyIdentity?isEdit=${true}&id=${item.id}`
 				})
 			},
 		}

pages/erp/exWarehousing/exWarehousing.vue

@@ -139,7 +139,6 @@
 		</view>
 	</view>
 </template>
-
 <script>
 	import upload from '@/components/upload.vue';
 	import helper from '@/common/helper.js';
@@ -184,19 +183,7 @@
 						type: "等外"
 					}
 				],
-				handlerList: [{
-						name: "张三"
-					},
-					{
-						name: "二等"
-					},
-					{
-						name: "三等"
-					},
-					{
-						name: "等外"
-					}
-				],
+				handlerList: [],
 				warehousingTypeList: [],
 				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
@@ -215,20 +202,12 @@
 					gradeKey: "",
 					grossWeight: 0,
 					tare: 0,
-					// buckleWeightRatio: 0,
-					// solidGrainWater: 0,
-					// tidalGrainWater: 0,
-					// pureWeight: 0,
 				},
 				params: {
 					year: true,
 					month: true,
 					day: true,
-					// hour: true,
-					// minute: true,
-					// second: true
 				},
-				// inOutDate: "请选择出库日期",
 				netWeight: 0,
 			}
 		},
@@ -245,7 +224,7 @@
 			this.cangId = options.cangId
 		},
 		onShow() {
-			let _data = uni.getStorageSync('erpContractNo')
+			let _data = uni.getStorageSync('erpContractNoCK') == '' ? {} : uni.getStorageSync('erpContractNoCK')
 			this.binNumber = helper.erpWarehouse.binNumber
 			this.warehouseName = helper.erpWarehouse.warehouseName
 			this.detailData.goodsName = _data.goodsName;
@@ -253,7 +232,18 @@
 				this.detailData.contractNo = _data.contractNo;
 			}
 			this.detailData.goodsNameKey = _data.goodsNameKey;
-			if (!_data.tranCarInfoList) _data.tranCarInfoList = []
+			// this.detailData.carNo = uni.getStorageSync('erpcarNoCK')
+			if (!_data.tranCarInfoList) {
+				this.isPC = false
+				_data.tranCarInfoList = []
+			} else {
+				this.isPC = true
+				if (uni.getStorageSync('ContractNoCarCK')) {
+					this.detailData.carNo = uni.getStorageSync('ContractNoCarCK')
+				} else {
+					this.detailData.carNo = _data.tranCarInfoList[0].carNo
+				}
+			}
 			if (!this.detailData.contractNo) {
 				this.detailData.contractNo = '请选择合同编号'
 			} else {
@@ -269,10 +259,11 @@
 			this.detailData.inOutDate = _day.getFullYear() + "-" + (_day.getMonth() + 1) + "-" + _day.getDate();
 			//出库类型
 			this.outWarehouse()
-			this.detailData.agent = helper.erpWarehouse.personCharge
+			if (helper.erpWarehouse.personCharge) {
+				this.detailData.agent = helper.erpWarehouse.personCharge
+			}
 			//经办人
 			this.handler()
-
 		},
 		methods: {
 			//计算纯重
@@ -307,7 +298,7 @@
 				this.detailData.type = this.typeList[e].type
 			},
 			pjPicker(e) {
-				this.detailData.gradeKey = e[0]
+				this.detailData.gradeKey = e[0]+1
 				this.detailData.grade = this.pjList[e].type
 			},
 			handlerPicker(e) {
@@ -370,9 +361,9 @@
 					(String(this.detailData.grossWeight).indexOf('.') != -1 &&
 						String(this.detailData.grossWeight).length -
 						(String(this.detailData.grossWeight).indexOf('.') + 1) >
-						1) ||
-					this.detailData.grossWeight < 1 ||
-					this.detailData.grossWeight > 100000
+						3) ||
+					this.detailData.grossWeight < 0 ||
+					this.detailData.grossWeight > 10000
 				) {
 					this.$api.msg('毛重输入错误！')
 					return
@@ -385,19 +376,20 @@
 					(String(this.detailData.tare).indexOf('.') != -1 &&
 						String(this.detailData.tare).length -
 						(String(this.detailData.tare).indexOf('.') + 1) >
-						1) ||
-					this.detailData.tare < 1 ||
-					this.detailData.tare > 100000
+						3) ||
+					this.detailData.tare < 0 ||
+					this.detailData.tare > 10000
 				) {
 					this.$api.msg('皮重输入错误！')
 					return
 				}
-				if (this.detailData.tare > this.detailData.grossWeight) {
+				if (Number(this.detailData.tare) > Number(this.detailData.grossWeight)) {
+
 					this.$api.msg('皮重不能大于毛重')
 					return
 				}
-				if (this.netWeight < 0) {
-					this.$api.msg('净重不能小于0')
+				if (this.netWeight <= 0) {
+					this.$api.msg('净重不能小于等于0')
 					return
 				}
 				if (this.detailData.type == "潮粮") {
@@ -411,7 +403,7 @@
 							(String(this.detailData.buckleWeightRatio).indexOf('.') + 1) >
 							2) ||
 						this.detailData.buckleWeightRatio < 0 ||
-						this.detailData.buckleWeightRatio > 2
+						this.detailData.buckleWeightRatio > 3
 					) {
 						this.$api.msg('扣重比输入错误！')
 						return
@@ -441,12 +433,12 @@
 							(String(this.detailData.tidalGrainWater).indexOf('.') + 1) >
 							1) ||
 						this.detailData.tidalGrainWater < 1 ||
-						this.detailData.tidalGrainWater > 40
+						this.detailData.tidalGrainWater > 40	
 					) {
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
-					if (this.detailData.tidalGrainWater < this.detailData.solidGrainWater) {
+					if (this.detailData.tidalGrainWater <= this.detailData.solidGrainWater) {
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
@@ -499,15 +491,16 @@
 					if (this.detailData.type == "干粮") {
 						if (this.detailData.warehouseInOutDetail.waterContent < 0 || this.detailData.warehouseInOutDetail
 							.waterContent > 40) {
-							this.$api.msg('热损伤占比输入错误')
-							return
-						}
-						if (String(this.detailData.warehouseInOutDetail.waterContent).indexOf('.') != -1 && String(this
-								.detailData.warehouseInOutDetail.jiaorenli).length - (String(
-								this.detailData.warehouseInOutDetail.waterContent).indexOf('.') + 1) > 1) {
-							this.$api.msg('热损伤占比输入错误')
+							this.$api.msg('水分占比输入错误')
 							return
 						}
+
+					}
+					if (String(this.detailData.warehouseInOutDetail.waterContent).indexOf('.') != -1 && String(this
+							.detailData.warehouseInOutDetail.waterContent).length - (String(
+							this.detailData.warehouseInOutDetail.waterContent).indexOf('.') + 1) > 1) {
+						this.$api.msg('水分占比输入错误')
+						return
 					}
 				}
 				if (this.detailData.warehouseInOutDetail.bulkDensity) {
@@ -581,7 +574,7 @@
 				this.detailData.warehouseName = helper.erpWarehouse.warehouseName
 				this.detailData.positionId = helper.erpWarehouse.positionId
 				this.detailData.binNumber = this.binNumber
-				this.detailData.goodsNameKey = uni.getStorageSync('erpContractNo').goodsNameKey;
+				this.detailData.goodsNameKey = uni.getStorageSync('erpContractNoCK').goodsNameKey;
 				this.detailData.compId = helper.erpWarehouse.compId
 				this.detailData.netWeight = this.netWeight
 				this.detailData.inOutFlag = 1
@@ -595,6 +588,8 @@
 					title = "暂存成功"
 				} else if (num == 2) {
 					this.detailData.statusFlag = 3
+					this.detailData.backOffice = this.userInfo.userName
+					this.detailData.backOfficeId = this.userInfo.id
 					title = "提交成功"
 				}
 				let that = this
@@ -606,7 +601,11 @@
 								that.detailData).then(res => {
 								if (res.data.code == 200) {
 									that.$api.msg(title)
-									uni.navigateBack()
+									setTimeout(() => {
+										uni.navigateBack()
+									}, 1000)
+								} else {
+									that.$api.msg(res.data.message)
 								}
 							})
 						}
@@ -615,7 +614,7 @@
 			},
 			slectcontractNo() {
 				uni.navigateTo({
-					url: '/pages/erp/warehousing/selectContractNo?flag=' + 5
+					url: '/pages/erp/exWarehousing/selectContractNo?flag=' + 5
 				})
 			},
 			slectCarNo() {
@@ -715,10 +714,12 @@
 	}
 
 	.bottom-btn {
+		padding: 30rpx;
+		background: #FFFFFF;
 		width: 92%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom: 0rpx;
 		display: flex;
-		z-index: 2;
+		z-index: 9999;
 	}
 </style>

pages/erp/exWarehousing/selectCarNo.vue

@@ -4,16 +4,16 @@
 			<u-search placeholder="输入车牌号" :show-action="false" v-model="inputKeyword"></u-search>
 		</view>
 		<view class="content2" v-if="!inputKeyword">
-			<view class="title">编号123456789可选车牌号如下：</view>
+			<view class="title">编号{{contractNo}}可选车牌号如下：</view>
 			<view class="item-contnet">
 				<view class="item-list" v-for="(item,index) in newList" :key="index" @click="confirm(item)">
-					{{item.contractNo}}
+					{{item.carNo}}({{item.tranCarNo}})
 				</view>
 			</view>
 		</view>
 		<view class="content3" v-if="inputKeyword">
 			<view class="search-item-list" v-for="(item,index) in filterNewList" :key="index" @click="confirm(item)">
-				{{item.contractNo}}
+				{{item.carNo}}
 			</view>
 		</view>
 	</view>
@@ -27,19 +27,21 @@
 				inputKeyword: '',
 				newList: [],
 				filterNewList: [],
-				compId: ''
+				compId: '',
+				contractNo:''
 			}
 		},
-		onShow() {},
+		onShow() {
+			this.newList = uni.getStorageSync('erpContractNoCK').tranCarInfoList
+			this.contractNo = uni.getStorageSync('erpContractNoCK').contractNo
+		},
 		onLoad(options) {
-			this.compId = options.compId
-			console.log(helper.selectContractNo); 
-			this.getContractNoList()
+			
 		},
 		watch: {
 			inputKeyword(val) {
 				this.filterNewList = this.newList.filter(function(item) {
-					if (item.contractNo.indexOf(val) > -1) {
+					if (item.carNo.indexOf(val) > -1) {
 						return item
 					}
 				})
@@ -47,21 +49,10 @@
 		},
 		methods: {
 			confirm(item){
-				uni.setStorageSync('ContractNo', item);
-				uni.setStorageSync('ContractNoCar',item.carNo);
+				uni.setStorageSync('erpcarNoListCK', item);
+				uni.setStorageSync('ContractNoCarCK',item.carNo);
 				uni.navigateBack({})
 			},
-			getContractNoList() {
-				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
-					compId: this.compId,
-					flag: 5,
-				}).then(res => {
-					if (res.data.code == 200) {
-						console.log(res)
-						this.newList = res.data.data
-					}
-				})
-			},
 		}
 	}
 </script>

pages/erp/exWarehousing/selectContractNo.vue

@@ -3,10 +3,18 @@
 		<view class="content1">
 			<u-search placeholder="输入合同编号" :show-action="false" v-model="inputKeyword"></u-search>
 		</view>
-		<view class="content2" v-if="!inputKeyword">
-			<view class="title">最新合同</view>
+		<view class="content2" v-if="!inputKeyword&&newSelectList.length!=0">
+			<view class="title" v-if="">最新选择</view>
 			<view class="item-contnet">
-				<view class="item-list" v-for="(item,index) in newList" :key="index" @click="confirm(item)">
+				<view class="item-list" v-for="(item,index) in newSelectList" :key="index" @click="confirm(item)">
+					{{item.contractNo}}
+				</view>
+			</view>
+		</view>
+		<view class="content2" v-if="!inputKeyword&&moreList.length!=0 ">
+			<view class="title" v-if="">更多合同</view>
+			<view class="item-contnet">
+				<view class="item-list" v-for="(item,index) in moreList" :key="index" @click="confirm(item)">
 					{{item.contractNo}}
 				</view>
 			</view>
@@ -26,14 +34,19 @@
 			return {
 				inputKeyword: '',
 				newList: [],
+				newSelectList:[],
 				filterNewList: [],
-				compId: ''
+				moreList:[],
+				compId: '',
+				flag:""
 			}
 		},
-		onShow() {},
+		onShow() {
+			this.newSelectList =  uni.getStorageSync('erpContractNoListCK');
+		},
 		onLoad(options) {
-			this.compId = options.compId
-			console.log(helper.selectContractNo); 
+			this.flag = options.flag
+			this.compId = helper.erpWarehouse.compId 
 			this.getContractNoList()
 		},
 		watch: {
@@ -47,19 +60,34 @@
 		},
 		methods: {
 			confirm(item){
-				uni.setStorageSync('ContractNo', item);
+				let _list = uni.getStorageSync('erpContractNoListCK');
+				if(_list==''){
+					_list=[]
+				}
+				if(_list.length<=20){
+					_list = _list.filter(function(val) {
+						if (val.contractNo!=item.contractNo) {
+							return val
+						}
+					})
+					_list.unshift(item)
+				}else{
+					_list.unshift(item).pop(item)
+				}
+				uni.setStorageSync('erpContractNoListCK', _list);
+				uni.setStorageSync('erpContractNoCK', item);
 				uni.navigateBack({})
 			},
 			getContractNoList() {
-				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
-					compId: this.compId,
-					flag: 5,
-				}).then(res => {
-					if (res.data.code == 200) {
-						console.log(res)
-						this.newList = res.data.data
-					}
-				})
+					this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
+						compId: this.compId,
+						flag: 5,
+					}).then(res => {
+						if (res.data.code == 200) {
+							this.moreList = res.data.data
+							this.newList = res.data.data
+						}
+					})
 			},
 		}
 	}

pages/erp/improvedExWaehousing/improvedExWaehousing.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="warp">
+	<view class="wrap">
 		<view class="dropdown content1">
 			<view class="left" @click='show1=true'>
 				<view>{{warehouseName}}</view>
@@ -14,14 +14,6 @@
 					:range="warehouseCWList"></u-picker>
 			</view>
 		</view>
-		<!-- <view class="content2">
-			<view class="content2-item" v-for="(item,index) in dataList" @click="goDetail(item)">
-				<view class="item-style">{{item.contractNo}}</view>
-				<view class="item-style">{{item.carNo}}</view>
-				<view class="item-style">{{item.updateDate}}</view>
-				<view class="item-style">{{item.backOffice}}</view>
-			</view>
-		</view> -->
 		<view class="content2">
 			<view class="content2-item" v-for="(item,index) in dataList" @click="goDetail(item)">
 				<view class="row">
@@ -53,40 +45,40 @@
 				show1: false,
 				show2: false,
 				currentPage: 1,
-				pageSize: 10,
+				pageSize: 9999,
 				positionId: "",
 				binNumber: "",
-				binNumber: "",
 				warehouseName: '',
+				positionName: '',
 				warehouseList: [],
-				warehouseCWList:[],
-				dataList: []
+				warehouseCWList: [],
+				dataList: [],
+				allWarehouse: [],
+				showTime: ''
 			}
 		},
 		onLoad() {
 			this.positionId = helper.erpWarehouse.positionId
 			this.warehouseId = helper.erpWarehouse.warehouseId
-			this.getList()
 		},
 		onShow() {
-			this.positionId = helper.erpWarehouse.positionId
-			this.warehouseId = helper.erpWarehouse.warehouseId
 			let _data = helper.erpWarehouse
-			this.positionId = _data.positionId
-			this.warehouseId = _data.warehouseId
+			this.warehouseName = _data.warehouseName
 			this.warehouseList = _data.allWarehouse
 			this.warehouseCWList = _data.warehouseCWList
-			this.warehouseName = _data.warehouseName
 			this.binNumber = _data.binNumber
+			this.positionId = _data.positionId
+			this.warehouseId = _data.warehouseId
+			this.getList()
 		},
 		methods: {
 			getList() {
 				this.$api.doRequest('get', '/warehouseInOutInfo/selectWarehouseInOutInfo', {
-					positionId:this.positionId,
+					positionId: this.positionId,
 					baseId: this.warehouseId,
 					currentPage: this.currentPage,
 					pageSize: this.pageSize,
-					inOutFlag:1
+					inOutFlag: 1
 				}).then(res => {
 					if (res.data.code == 200) {
 						this.dataList = res.data.data.records
@@ -94,50 +86,32 @@
 				})
 			},
 			warehousechange(e) {
-				 this.warehouseName = this.warehouseList[e[0]].warehouseName
-				 this.warehouseId =this.warehouseList[e[0]].id
-				 this.warehouseCWList = this.warehouseList[e[0]].positionInfos
-				 this.warehouseCWchange([0])
+				this.warehouseName = this.warehouseList[e[0]].warehouseName
+				this.warehouseId = this.warehouseList[e[0]].id
+				this.warehouseCWList = this.warehouseList[e[0]].positionInfos
+				this.warehouseCWchange([0])
 			},
 			warehouseCWchange(e) {
-				 this.binNumber = this.warehouseCWList[e[0]].binNumber
-				 this.warehouseId = this.warehouseCWList[e[0]].baseId
-				 this.positionId = this.warehouseCWList[e[0]].id
-				 helper.erpWarehouse.binNumber = this.binNumber
-				  helper.erpWarehouse.warehouseName = this.warehouseName
-				 helper.erpWarehouse.positionId =  this.positionId
-				 helper.erpWarehouse.warehouseId = this.warehouseId 
-				 this.getList()
+				this.binNumber = this.warehouseCWList[e[0]].binNumber
+				this.warehouseId = this.warehouseCWList[e[0]].baseId
+				this.positionId = this.warehouseCWList[e[0]].id
+				helper.erpWarehouse.binNumber = this.binNumber
+				helper.erpWarehouse.warehouseName = this.warehouseName
+				helper.erpWarehouse.positionId = this.positionId
+				helper.erpWarehouse.warehouseId = this.warehouseId
+				helper.erpWarehouse.warehouseCWList = this.warehouseCWList//保存仓位列表，用于解决待完善出入库返回该页面仓库与仓位不匹配问题
+				this.getList()
 			},
 			goDetail(val) {
 				uni.navigateTo({
 					url: '/pages/erp/improvedExWaehousing/improvedExWaehousingDetail?data=' + JSON.stringify(val),
 				})
 			}
-
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-	uni-page-body {
-		overflow: hidden;
-	}
-	// .warp {
-	// 	margin: 10rpx;
-	// 	padding: 20rpx 20rpx 140rpx 20rpx;
-	
-	// 	.top {
-	// 		display: flex;
-	// 		margin-bottom: 20rpx;
-	// 		border-radius: 20rpx;
-	// 		background: white;
-	// 		padding: 20rpx;
-	// 		.top-left {
-	// 			margin-right: 20rpx;
-	// 		}
-	// 	}
-	// }
 	.dropdown {
 		display: flex;
 		margin: 20rpx 0;
@@ -146,6 +120,7 @@
 		.left,
 		.right {
 			display: flex;
+			align-items: center;
 		}
 	}
 
@@ -157,46 +132,19 @@
 	}
 
 	.content2 {
-		margin: 20rpx;
-		background: #FFFFFF;
-		border-radius: 10rpx;
-
-		.content2-item {
-			padding: 20rpx;
-			margin-bottom: 10rpx;
-			// border-bottom: 1px solid #ccc;
-		}
-
-		.item-style {
-			display: inline-block;
-			width: 50%;
-		}
-	}
-	.content,
-	.content1,
-	.content2 {
-		border-radius: 20rpx;
-		background: white;
-		padding: 20rpx;
-	
-		.title {
-			font-size: 28rpx;
-			font-weight: 600;
-			color: #333333;
-		}
-	
 		.row {
 			display: flex;
 			justify-content: space-between;
 			border-bottom: 1px solid #EEEEEE;
 			padding: 21rpx 0;
-	
+
 			.right,
 			input {
 				font-size: 28rpx;
 				color: #333333;
 			}
 		}
+
 		.row-bottom {
 			.right-bottom {
 				width: 300rpx;
@@ -204,11 +152,15 @@
 			}
 		}
 	}
-	.bottom-btn {
-		width: 92%;
-		position: fixed;
-		bottom: 40rpx;
-		display: flex;
-		z-index: 2;
+
+	.content2-item {
+		background: white;
+		margin: 0 20rpx 20rpx 20rpx;
+		padding: 10rpx;
+		border-radius: 15rpx;
+	}
+
+	.no-boder {
+		border-bottom: none !important;
 	}
 </style>

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -19,7 +19,6 @@
 				<view @click='show1=true'>{{detailData.type}}</view>
 				<u-picker :range="typeList" range-key="type" @confirm='typePicker($event)' v-model="show1"
 					mode="selector">
-					<!-- <view class="">{{detailData.type}}</view> -->
 				</u-picker>
 			</view>
 			<view class="row row-bottom">
@@ -81,8 +80,11 @@
 				</u-picker>
 			</view>
 			<view class="row row-bottom">
+			<!-- 	<view class="left">车牌号</view>
+				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input> -->
 				<view class="left">车牌号</view>
-				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input>
+				<input v-if="!isPC" v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input>
+				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view>
 			</view>
 		</view>
 		<view class="content2">
@@ -159,9 +161,7 @@
 				show5: false,
 				show6: false,
 				show7: false,
-				contractNoList: [{
-					contractNo: ""
-				}],
+				isPC:true,
 				typeList: [{
 						type: "干粮"
 					},
@@ -182,19 +182,7 @@
 						type: "等外"
 					}
 				],
-				handlerList: [{
-						name: "张三"
-					},
-					{
-						name: "二等"
-					},
-					{
-						name: "三等"
-					},
-					{
-						name: "等外"
-					}
-				],
+				handlerList: [],
 				warehousingTypeList: [],
 				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
@@ -232,16 +220,18 @@
 		onLoad(options) {
 			this.detailData = JSON.parse(options.data)
 			this.netWeight = this.detailData.netWeight
+			if(this.detailData.addressUrl){
 				this.imgUrl.push({
-						url:this.detailData.addressUrl.split(",")[0]
-					})
+				url: this.detailData.addressUrl.split(",")[0]
+			})
+			}
 			this.cangId = options.cangId
 		},
 		onShow() {
 			this.binNumber = helper.erpWarehouse.binNumber
 			this.warehouseName = helper.erpWarehouse.warehouseName
-			this.detailData.goodsName = uni.getStorageSync('erpContractNo').goodsName;
-			this.detailData.contractNo = uni.getStorageSync('erpContractNo').contractNo;
+			// this.detailData.goodsName = uni.getStorageSync('erpContractNo').goodsName;
+			// this.detailData.contractNo = uni.getStorageSync('erpContractNo').contractNo;
 			this.detailData.goodsNameKey = uni.getStorageSync('erpContractNo').goodsNameKey;
 			if (!this.detailData.contractNo) {
 				this.detailData.contractNo = '请选择合同编号'
@@ -249,6 +239,18 @@
 			if (!this.detailData.goodsName) {
 				this.detailData.goodsName = '货名'
 			}
+			let _data = uni.getStorageSync('erpContractNoCK') == '' ? {} : uni.getStorageSync('erpContractNoCK')
+			if (!_data.tranCarInfoList) {
+				this.isPC = false
+				_data.tranCarInfoList = []
+			} else {
+				this.isPC = true
+				if (uni.getStorageSync('ContractNoCarCK')) {
+					this.detailData.carNo = uni.getStorageSync('ContractNoCarCK')
+				} else {
+					this.detailData.carNo = _data.tranCarInfoList[0].carNo
+				}
+			}
 			//出库类型
 			this.outWarehouse()
 			//经办人
@@ -341,8 +343,6 @@
 					this.$api.msg('货名不能为空')
 					return
 				}
-				
-				
 				if (!this.detailData.grossWeight) {
 					this.$api.msg('毛重不能为空')
 					return
@@ -351,9 +351,9 @@
 					(String(this.detailData.grossWeight).indexOf('.') != -1 &&
 						String(this.detailData.grossWeight).length -
 						(String(this.detailData.grossWeight).indexOf('.') + 1) >
-						1) ||
-					this.detailData.grossWeight < 1 ||
-					this.detailData.grossWeight > 100000
+						3) ||
+					this.detailData.grossWeight < 0 ||
+					this.detailData.grossWeight > 10000
 				) {
 					this.$api.msg('毛重输入错误！')
 					return
@@ -366,9 +366,9 @@
 					(String(this.detailData.tare).indexOf('.') != -1 &&
 						String(this.detailData.tare).length -
 						(String(this.detailData.tare).indexOf('.') + 1) >
-						1) ||
-					this.detailData.tare < 1 ||
-					this.detailData.tare > 100000
+						3) ||
+					this.detailData.tare < 0 ||
+					this.detailData.tare > 10000
 				) {
 					this.$api.msg('皮重输入错误！')
 					return
@@ -377,8 +377,8 @@
 					this.$api.msg('皮重不能大于毛重')
 					return
 				}
-				if (this.netWeight < 0) {
-					this.$api.msg('净重不能小于0')
+				if (this.netWeight <= 0) {
+					this.$api.msg('净重不能小于等于0')
 					return
 				}
 				if (this.detailData.type == "潮粮") {
@@ -427,7 +427,7 @@
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
-					if (this.detailData.tidalGrainWater < this.detailData.solidGrainWater) {
+					if (this.detailData.tidalGrainWater <= this.detailData.solidGrainWater) {
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
@@ -480,16 +480,16 @@
 					if (this.detailData.type == "干粮") {
 						if (this.detailData.warehouseInOutDetail.waterContent < 0 || this.detailData.warehouseInOutDetail
 							.waterContent > 40) {
-							this.$api.msg('热损伤占比输入错误')
-							return
-						}
-						if (String(this.detailData.warehouseInOutDetail.waterContent).indexOf('.') != -1 && String(this
-								.detailData.warehouseInOutDetail.jiaorenli).length - (String(
-								this.detailData.warehouseInOutDetail.waterContent).indexOf('.') + 1) > 1) {
-							this.$api.msg('热损伤占比输入错误')
+							this.$api.msg('水分占比输入错误')
 							return
 						}
 					}
+					if (String(this.detailData.warehouseInOutDetail.waterContent).indexOf('.') != -1 && String(this
+							.detailData.warehouseInOutDetail.waterContent).length - (String(
+							this.detailData.warehouseInOutDetail.waterContent).indexOf('.') + 1) > 1) {
+						this.$api.msg('水分占比输入错误')
+						return
+					}
 				}
 				if (this.detailData.warehouseInOutDetail.bulkDensity) {
 					if (this.detailData.warehouseInOutDetail.bulkDensity < 500 || this.detailData.warehouseInOutDetail
@@ -536,7 +536,8 @@
 						this.$api.msg('霉变粒占比输入错误')
 						return
 					}
-					if (String(this.detailData.warehouseInOutDetail.mildewGrain).indexOf('.') != -1 && String(this.detailData
+					if (String(this.detailData.warehouseInOutDetail.mildewGrain).indexOf('.') != -1 && String(this
+							.detailData
 							.warehouseInOutDetail.mildewGrain).length - (String(
 							this.detailData.warehouseInOutDetail.mildewGrain).indexOf('.') + 1) > 1) {
 						this.$api.msg('霉变粒占比输入错误')
@@ -549,7 +550,8 @@
 						this.$api.msg('不完善粒占比输入错误')
 						return
 					}
-					if (String(this.detailData.warehouseInOutDetail.imperfectGrain).indexOf('.') != -1 && String(this.detailData
+					if (String(this.detailData.warehouseInOutDetail.imperfectGrain).indexOf('.') != -1 && String(this
+							.detailData
 							.warehouseInOutDetail.imperfectGrain).length - (String(
 							this.detailData.warehouseInOutDetail.imperfectGrain).indexOf('.') + 1) > 1) {
 						this.$api.msg('不完善粒占比输入错误')
@@ -574,6 +576,8 @@
 					title = "暂存成功"
 				} else if (num == 2) {
 					this.detailData.statusFlag = 3
+					this.detailData.backOffice = this.userInfo.userName
+					this.detailData.backOfficeId = this.userInfo.id
 					title = "提交成功"
 				}
 				let that = this
@@ -585,7 +589,11 @@
 								that.detailData).then(res => {
 								if (res.data.code == 200) {
 									that.$api.msg(title)
-									uni.navigateBack()
+									setTimeout(() => {
+										uni.navigateBack()
+									}, 1000)
+								} else {
+									that.$api.msg(res.data.message)
 								}
 							})
 						}
@@ -694,10 +702,12 @@
 	}
 
 	.bottom-btn {
+	    padding: 30rpx;
+		background: #FFFFFF;
 		width: 92%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom: 0rpx;
 		display: flex;
-		z-index: 2;
+		z-index: 9999;
 	}
 </style>

pages/erp/improvedWrehousing/improvedWrehousing.vue

@@ -61,7 +61,6 @@
 
 		},
 		onShow() {
-			console.log("完善入库-仓库信息", helper.erpWarehouse)
 			let _data = helper.erpWarehouse
 			this.warehouseName = _data.warehouseName
 			this.warehouseList = _data.allWarehouse
@@ -99,6 +98,7 @@
 				this.warehouseId = this.warehouseCWList[e[0]].baseId
 				this.positionId = this.warehouseCWList[e[0]].id
 				this.binNumber = this.warehouseCWList[e[0]].binNumber
+				helper.erpWarehouse.warehouseCWList = this.warehouseCWList//保存仓位列表，用于解决待完善出入库返回该页面仓库与仓位不匹配问题
 				helper.erpWarehouse.positionId =  this.positionId
 				helper.erpWarehouse.warehouseId = this.warehouseId 
 				helper.erpWarehouse.binNumber = this.binNumber 

pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -104,7 +104,6 @@
 			</view>
 			<view class="row row-bottom has-btn">
 				<view class="left">运费（元/吨）</view>
-				{{detailData.freight}}
 				<input @input='' v-model='detailData.freight' :disabled="isEditYF" class="right-bottom"
 					placeholder="自动获取"></input>
 				<u-button class="edit-btn" hover-class="none" @click="editYF">编辑</u-button>
@@ -130,7 +129,7 @@
 				<input @input='' v-model='detailData.warehouseInOutDetail.waterContent' class="right-bottom"
 					placeholder="输入水分占比"></input>
 			</view>
-			<view class="row row-bottom" style="border: 0;">
+			<view class="row row-bottom" >
 				<view class="left">容重（克/升）</view>
 				<input v-model='detailData.warehouseInOutDetail.bulkDensity' class="right-bottom"
 					placeholder="输入容重"></input>
@@ -188,17 +187,12 @@
 					year: true,
 					month: true,
 					day: true,
-					hour: true,
-					minute: true,
-					second: true
 				},
 				isEditCB: 'false',
 				isEditYF: 'false',
 				warehouseName: '',
 				binNumber: '',
-				contractNoList: [{
-					contractNo: "123"
-				}],
+				
 				typeList: [{
 						type: "干粮"
 					},
@@ -219,19 +213,7 @@
 						grade: "等外"
 					}
 				],
-				handlerList: [{
-						agent: "张三"
-					},
-					{
-						agent: "二等"
-					},
-					{
-						agent: "三等"
-					},
-					{
-						agent: "等外"
-					}
-				],
+				handlerList: [],
 				warehousingTypeList: [],
 				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
@@ -241,10 +223,10 @@
 				inOutDate1: "",
 				detailData: {
 					contractNo: "请选择合同编号",
-					carNo: '辽H12345',
+					carNo: '',
 					type: "干粮",
-					goodsName: "123",
-					inOutDate: '请输入入库日期',
+					goodsName: "",
+					inOutDate: '请输入库日期',
 					grade: "一等品",
 					agent: '请选择经办人',
 					inOutType: '请选择入库类型',
@@ -260,6 +242,7 @@
 		},
 		onLoad(options) {
 			this.detailData = JSON.parse(options.data)
+			this.netWeight = this.detailData.netWeight
 			this.binNumber = this.detailData.binNumber
 			this.warehouseName = this.detailData.warehouseName
 			this.compId = helper.erpWarehouse.compId
@@ -268,15 +251,11 @@
 					url: this.detailData.addressUrl.split(",")[0]
 				})
 			}
-			console.log(this.imgUrl)
-			console.log(helper.erpWarehouse)
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onShow() {
-			
-			console.log('详情数据',this.detailData)
 			if (this.detailData.inOutType == '采购入库'&&this.detailData.status!='已暂存') {
 				this.detailData.freight = 0
 			}
@@ -291,11 +270,32 @@
 			if (!this.detailData.goodsName) {
 				this.detailData.goodsName = '货名'
 			}
+			let _data = uni.getStorageSync('erpContractNo')==''?{}:uni.getStorageSync('erpContractNo')
+		     this.detailData.contractNo = _data.contractNo
+			if (!_data.tranCarInfoList){
+				this.isPC = false
+					this.detailData.carNo = ""
+				_data.tranCarInfoList = []
+			} else{
+				this.isPC = true
+				if(uni.getStorageSync('ContractNoCar')){
+					this.detailData.carNo = uni.getStorageSync('ContractNoCar')
+					this.$api.doRequest('get', '/warehouseBaseInfo/selectCost', {
+						contractNo: this.detailData.contractNo,
+						carNo:this.detailData.carNo
+					}).then(res => {
+						if (res.data.code == 200) {
+							this.detailData.cost = res.data.data
+						}
+					})
+				}else{
+					this.detailData.carNo = _data.tranCarInfoList[0].carNo
+				}
+			}
 			// 获取入库类型
 			this.getrkType()
 			//获取经办人
 			this.getPerson()
-			console.log(this.detailData)
 		},
 		watch: {
 			netWeight: function(v) {
@@ -345,6 +345,10 @@
 			},
 			warehousingTypePicker(e) {
 				this.detailData.inOutType = this.warehousingTypeList[e].constValue
+				let _data = uni.getStorageSync('erpContractNo')==''?{}:uni.getStorageSync('erpContractNo')
+				if (this.detailData.inOutType == '采购入库') {
+					this.detailData.freight = 0
+				}else{this.detailData.freight = uni.getStorageSync('CarFreight')}
 			},
 			filterFileType(index, lists) {
 				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
@@ -472,8 +476,8 @@
 				this.$api.msg('皮重不能大于毛重')
 				return
 			}
-			if (this.netWeight < 0) {
-				this.$api.msg('净重不能小于0')
+			if (this.netWeight <= 0) {
+				this.$api.msg('净重不能小于等于0')
 				return
 			}
 			if (this.detailData.type == "潮粮") {
@@ -610,16 +614,16 @@
 					if (this.detailData.warehouseInOutDetail.waterContent < 0 || this.detailData
 						.warehouseInOutDetail
 						.waterContent > 40) {
-						this.$api.msg('热损伤占比输入错误')
+						this.$api.msg('水分占比输入错误')
 						return
 					}
-					if (String(this.detailData.warehouseInOutDetail.waterContent).indexOf('.') != -1 && String(this
-							.detailData.warehouseInOutDetail.jiaorenli).length - (String(
+				}
+				if (String(this.detailData.warehouseInOutDetail.waterContent).indexOf('.') != -1 && String(this
+							.detailData.warehouseInOutDetail.waterContent).length - (String(
 							this.detailData.warehouseInOutDetail.waterContent).indexOf('.') + 1) > 1) {
-						this.$api.msg('热损伤占比输入错误')
+						this.$api.msg('水分占比输入错误')
 						return
 					}
-				}
 			}
 			if (this.detailData.warehouseInOutDetail.bulkDensity) {
 				if (this.detailData.warehouseInOutDetail.bulkDensity < 500 || this.detailData.warehouseInOutDetail
@@ -705,7 +709,6 @@
 				let title = ""
 				if (num == 1) {
 					this.detailData.statusFlag = 1
-					this.detailData.inOutDate = this.inOutDate1
 					title = "暂存成功"
 				} else if (num == 2) {
 					this.detailData.statusFlag = 3
@@ -713,14 +716,18 @@
 				}
 				let that = this
 				uni.showModal({
-					content: "确定提交入库库信息?",
+					content: "确定提交入库信息?",
 					success(res) {
 						if (res.confirm) {
 							that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
 								that.detailData).then(res => {
 								if (res.data.code == 200) {
 									that.$api.msg(title)
-									uni.navigateBack()
+									setTimeout(() => {
+										uni.navigateBack()
+									}, 1000)
+								}else{
+									that.$api.msg(res.data.message)
 								}
 							})
 						}
@@ -804,7 +811,7 @@
 
 	.content2 {
 		margin-top: 10px;
-		display: flex;
+		// display: flex;
 		align-items: center;
 
 		.left {
@@ -831,10 +838,12 @@
 	}
 
 	.bottom-btn {
+		padding: 30rpx;
+		background: #FFFFFF;
 		width: 92%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom: 0rpx;
 		display: flex;
-		z-index: 2;
+		z-index: 9999;
 	}
 </style>

pages/erp/index.vue

@@ -34,7 +34,6 @@
 				</view>
 			</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='您尚未开通ERP业务' :content="content" @confirm="goOpenService"></u-modal>
@@ -273,7 +272,6 @@
 							this.baseId = _showCWData.baseId
 							this.positionId = _showCWData.id
 							this.personCharge = _showData.personCharge
-							console.log('this.warehouseCWList', this.warehouseCWList)
 						} else {
 							this.allWarehouse = res.data.data
 							this.warehouseName = res.data.data[0].warehouseName
@@ -286,7 +284,6 @@
 							this.baseId = res.data.data[0].positionInfos[0].baseId
 							this.positionId = res.data.data[0].positionInfos[0].id
 							this.personCharge = res.data.data[0].personCharge
-							console.log('this.warehouseCWList', this.warehouseCWList)
 						}
 
 					} else {

pages/erp/warehousing/selectCarNo.vue

@@ -51,6 +51,7 @@
 			confirm(item){
 				uni.setStorageSync('erpcarNo', item);
 				uni.setStorageSync('ContractNoCar',item.carNo);
+				uni.setStorageSync('CarFreight',item.tranPrice);
 				uni.navigateBack({})
 			},
 		}

pages/erp/warehousing/selectContractNo.vue

@@ -41,22 +41,16 @@
 				flag:""
 			}
 		},
-
-		// onShow() {},
-		// onLoad(options) {
-
 		onShow() {
 			this.newSelectList =  uni.getStorageSync('erpContractNoList');
 		},
 		onLoad(options) {
 			this.flag = options.flag
 			this.compId = helper.erpWarehouse.compId 
-			console.log(helper.selectContractNo); 
 			this.getContractNoList()
 		},
 		watch: {
 			inputKeyword(val) {
-				console.log(this.newList)
 				this.filterNewList = this.newList.filter(function(item) {
 					if (item.contractNo.indexOf(val) > -1) {
 						return item
@@ -113,9 +107,7 @@
 						}
 					})
 				}
-				
 			},
-		
 		}
 	}
 </script>

pages/erp/warehousing/warehousing.vue

@@ -80,9 +80,7 @@
 				<view class="left">入库日期</view>
 				<view @click='show4=true'>{{detailData.inOutDate}}</view>
 				<u-picker v-model="show4" mode="time" @confirm='dateChange($event)' :params="params">
-					<!-- <view >{{detailData.inOutDate ? detailData.inOutDate:"请选择日期" }}</view> -->
 				</u-picker>
-				<!-- <u-calendar v-model="show4" mode="date" @change='dateChange'></u-calendar> -->
 			</view>
 			<view class="row">
 				<view class="left">入库类型</view>
@@ -132,7 +130,7 @@
 				<input @input='' v-model='detailData.warehouseInOutDetail.waterContent' class="right-bottom"
 					placeholder="输入水分占比"></input>
 			</view>
-			<view class="row row-bottom" style="border: 0;">
+			<view class="row row-bottom">
 				<view class="left">容重（克/升）</view>
 				<input v-model='detailData.warehouseInOutDetail.bulkDensity' class="right-bottom"
 					placeholder="输入容重"></input>
@@ -190,17 +188,12 @@
 					year: true,
 					month: true,
 					day: true,
-					// hour: true,
-					// minute: true,
-					// second: true
 				},
 				isEditCB: 'false',
 				isEditYF: 'false',
 				warehouseName: '',
 				binNumber: '',
-				contractNoList: [{
-					contractNo: "123"
-				}],
+				contractNoList: [],
 				typeList: [{
 						type: "干粮"
 					},
@@ -221,19 +214,7 @@
 						grade: "等外"
 					}
 				],
-				handlerList: [{
-						agent: "张三"
-					},
-					{
-						agent: "二等"
-					},
-					{
-						agent: "三等"
-					},
-					{
-						agent: "等外"
-					}
-				],
+				handlerList: [],
 				warehousingTypeList: [],
 				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
@@ -245,7 +226,7 @@
 					contractNo: "请选择合同编号",
 					carNo: '请输入车牌号',
 					type: "干粮",
-					goodsName: "123",
+					goodsName: "",
 					inOutDate: '请选择入库日期',
 					grade: "一等品",
 					agent: '请选择经办人',
@@ -264,13 +245,13 @@
 			this.binNumber = helper.erpWarehouse.binNumber
 			this.warehouseName = helper.erpWarehouse.warehouseName
 			this.compId = helper.erpWarehouse.compId
-			console.log(helper.erpWarehouse)
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onShow() {
-			let _data = uni.getStorageSync('erpContractNo')
+			let _data = uni.getStorageSync('erpContractNo')==''?{}:uni.getStorageSync('erpContractNo')
+			if(helper.erpWarehouse.personCharge)
 			this.detailData.agent = helper.erpWarehouse.personCharge
 			this.detailData.goodsName = _data.goodsName;
 			this.detailData.contractNo = _data.contractNo;
@@ -283,14 +264,25 @@
 			this.detailData.inOutDate = _day.getFullYear() + "-" + (_day.getMonth() + 1) + "-" + _day.getDate();
 			if (_data.inOutType == '采购入库') {
 				this.detailData.freight = 0
-			}
-			this.detailData.carNo = uni.getStorageSync('erpcarNo')
+			}else{this.detailData.freight = uni.getStorageSync('CarFreight')}
+				
 			if (!_data.tranCarInfoList){
+				this.isPC = false
+				this.detailData.carNo = ""
+				this.detailData.cost = ""
 				_data.tranCarInfoList = []
 			} else{
 				this.isPC = true
 				if(uni.getStorageSync('ContractNoCar')){
 					this.detailData.carNo = uni.getStorageSync('ContractNoCar')
+					this.$api.doRequest('get', '/warehouseBaseInfo/selectCost', {
+						contractNo: this.detailData.contractNo,
+						carNo:this.detailData.carNo
+					}).then(res => {
+						if (res.data.code == 200) {
+							this.detailData.cost = res.data.data
+						}
+					})
 				}else{
 					this.detailData.carNo = _data.tranCarInfoList[0].carNo
 				}
@@ -306,7 +298,6 @@
 			if (!this.detailData.goodsName) {
 				this.detailData.goodsName = '货名'
 			}
-			console.log('当前合同', _data)
 			// 获取入库类型
 			this.getrkType()
 			//获取经办人
@@ -347,12 +338,9 @@
 			typePicker(e) {
 				console.log(e)
 				this.detailData.type = this.typeList[e].type
-
-
 			},
 			pjPicker(e) {
-				console.log(e)
-				this.detailData.gradeKey = e[0]
+				this.detailData.gradeKey = e[0]+1
 				this.detailData.grade = this.pjList[e].grade
 			},
 			handlerPicker(e) {
@@ -366,6 +354,11 @@
 			},
 			warehousingTypePicker(e) {
 				this.detailData.inOutType = this.warehousingTypeList[e].constValue
+				let _data = uni.getStorageSync('erpContractNo')==''?{}:uni.getStorageSync('erpContractNo')
+				if (this.detailData.inOutType == '采购入库') {
+					this.detailData.freight = 0
+				}else{this.detailData.freight = uni.getStorageSync('CarFreight')}
+				
 			},
 			filterFileType(index, lists) {
 				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
@@ -451,9 +444,9 @@
 					(String(this.detailData.grossWeight).indexOf('.') != -1 &&
 						String(this.detailData.grossWeight).length -
 						(String(this.detailData.grossWeight).indexOf('.') + 1) >
-						1) ||
-					this.detailData.grossWeight < 1 ||
-					this.detailData.grossWeight > 100000
+						3) ||
+					this.detailData.grossWeight < 0 ||
+					this.detailData.grossWeight > 10000
 				) {
 					this.$api.msg('毛重输入错误！')
 					return
@@ -468,7 +461,7 @@
 						(String(this.detailData.tare).indexOf('.') + 1) >
 						3) ||
 					this.detailData.tare < 0 ||
-					this.detailData.tare > 10
+					this.detailData.tare > 100000
 				) {
 					this.$api.msg('皮重输入错误！')
 					return
@@ -484,7 +477,7 @@
 						(String(this.detailData.deductionWeight).indexOf('.') + 1) >
 						1) ||
 					this.detailData.deductionWeight < 1 ||
-					this.detailData.deductionWeight > 100000
+					this.detailData.deductionWeight > 10
 				) {
 					this.$api.msg('扣重输入错误！')
 					return
@@ -493,8 +486,8 @@
 					this.$api.msg('皮重不能大于毛重')
 					return
 				}
-				if (this.netWeight < 0) {
-					this.$api.msg('净重不能小于0')
+				if (this.netWeight <= 0) {
+					this.$api.msg('净重不能小于等于0')
 					return
 				}
 				if (this.detailData.type == "潮粮") {
@@ -508,7 +501,7 @@
 							(String(this.detailData.buckleWeightRatio).indexOf('.') + 1) >
 							2) ||
 						this.detailData.buckleWeightRatio < 0 ||
-						this.detailData.buckleWeightRatio > 2
+						this.detailData.buckleWeightRatio > 3
 					) {
 						this.$api.msg('扣重比输入错误！')
 						return
@@ -558,7 +551,7 @@
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
-					if (this.detailData.tidalGrainWater < this.detailData.solidGrainWater) {
+					if (this.detailData.tidalGrainWater <= this.detailData.solidGrainWater) {
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
@@ -631,16 +624,17 @@
 						if (this.detailData.warehouseInOutDetail.waterContent < 0 || this.detailData
 							.warehouseInOutDetail
 							.waterContent > 40) {
-							this.$api.msg('热损伤占比输入错误')
+							this.$api.msg('水分占比输入错误')
 							return
 						}
+					}
 						if (String(this.detailData.warehouseInOutDetail.waterContent).indexOf('.') != -1 && String(this
-								.detailData.warehouseInOutDetail.jiaorenli).length - (String(
+								.detailData.warehouseInOutDetail.waterContent).length - (String(
 								this.detailData.warehouseInOutDetail.waterContent).indexOf('.') + 1) > 1) {
-							this.$api.msg('热损伤占比输入错误')
+							this.$api.msg('水分占比输入错误')
 							return
 						}
-					}
+					
 				}
 				if (this.detailData.warehouseInOutDetail.bulkDensity) {
 					if (this.detailData.warehouseInOutDetail.bulkDensity < 500 || this.detailData.warehouseInOutDetail
@@ -726,22 +720,26 @@
 				let title = ""
 				if (num == 1) {
 					this.detailData.statusFlag = 1
-					this.detailData.inOutDate = this.inOutDate1
 					title = "暂存成功"
 				} else if (num == 2) {
 					this.detailData.statusFlag = 3
 					title = "提交成功"
 				}
+				return
 				let that = this
 				uni.showModal({
-					content: "确定提交入库库信息?",
+					content: "确定提交入库信息?",
 					success(res) {
 						if (res.confirm) {
 							that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
 								that.detailData).then(res => {
 								if (res.data.code == 200) {
-									that.$api.msg(title)
+								that.$api.msg(title)
+								setTimeout(() => {
 									uni.navigateBack()
+								}, 1000)
+								}else{
+									that.$api.msg(res.data.message)
 								}
 							})
 						}
@@ -827,7 +825,7 @@
 
 	.content2 {
 		margin-top: 10px;
-		display: flex;
+		// display: flex;
 		align-items: center;
 
 		.left {
@@ -854,10 +852,12 @@
 	}
 
 	.bottom-btn {
+		padding: 30rpx;
+		background: #FFFFFF;
 		width: 92%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom: 0rpx;
 		display: flex;
-		z-index: 2;
+		z-index: 9999;
 	}
 </style>

pages/grain_pulse/enter.vue

@@ -5,7 +5,7 @@
 		<view class="back-btn cuIcon-back" @click="navBack"></view>
 		<!-- <view class='title1'>入驻</view> -->
 		<view class="titleUp">
-			请完善入驻信息
+			请填写入驻信息
 		</view>
 		<u-form class="forList">
 			<view style='padding-bottom:20px;' class="modular">

pages/grain_pulse/my_grain_pulse.vue

@@ -180,8 +180,8 @@
 					},
 				})
 			},
-			edit(item){
-				if(item.status=='已驳回'||item.status=='已通过'){
+			edit(item){debugger
+				if(item.status=='已驳回'||item.status=='待审核'){
 					uni.navigateTo({
 						url:'/pages/grain_pulse/editcompany?id='+item.id
 					})

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		出入库任务审核
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/task/audit/Issueandreceipt_task_details.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		出入库任务详情
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/task/audit/acquisition_settlement_approval.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		收购结算审核
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/task/audit/acquisition_settlement_details.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		收购结算详情
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/task/audit/freight_setting_approval.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		运费设置审核
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/task/audit/freight_setting_details.vue

@@ -0,0 +1,19 @@
+<template>
+	<view>
+		运费设置详情
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/task/audit/freight_settlement _approval.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		运费结算审核
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/task/audit/freight_settlement _details.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		运费结算详情
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/task/audit/purchase_settlement_approval.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		采购结算审核
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/task/audit/purchase_settlement_details.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		采购结算详情
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/task/audit/warehouse_approval.vue

@@ -0,0 +1,109 @@
+<template>
+	<view class="warp">
+		<view class='content1'>
+			<view class="title">基本信息</view>
+			<view class='row'>
+				<view class="left">仓库</view>
+				<view class="right">鲅鱼圈一号库</view>
+			</view>
+			<view class='row'>
+				<view class="left">货名</view>
+				<view class="right">玉米</view>
+			</view>
+			<view class='row'>
+				<view class="left">基准水分（%）</view>
+				<view class="right">30</view>
+			</view>
+			<view class='row'>
+				<view class="left">干粮水分（%）</view>
+				<view class="right">40</view>
+			</view>
+			<view class='row'>
+				<view class="left">水分上限（%）</view>
+				<view class="right">40</view>
+			</view>
+			<view class='row'>
+				<view class="left">扣重比</view>
+				<view class="right">1.25</view>
+			</view>
+			<view class='row'>
+				<view class="left">干粮收购价格（元/公斤）</view>
+				<view class="right">2.58</view>
+			</view>
+			<view class='row'>
+				<view class="left">销售上限</view>
+				<view class="right">2000</view>
+			</view>
+		</view>
+		<view class="content2">
+			<view class="title">粮价设置</view>
+			<view  v-for="(item,index) in 4" :key="index">
+				<view class="row">
+					<view class="left">等级</view>
+					<view class="right">一等、二等</view>
+				</view>	
+				<view class="row">
+					<view class="left">基准单价（元/公斤）</view>
+					<view class="right">2.2</view>
+				</view>	
+				<view class="row" v-for="(item1,index1) in 10" :key="index1">
+					<view class="left">15-23降幅（元/0.1%）</view>
+					<view class="right">0.001</view>
+				</view>	
+			</view>
+		</view>
+		<view>
+			<button>驳回</button>
+			<button>通过</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.warp {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 140rpx 20rpx;
+	}
+	.content1,
+	.content2 {
+		border-radius: 20rpx;
+		background: white;
+		padding: 20rpx;
+	
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: center;
+		}
+	
+		.row {
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #EEEEEE;
+			padding: 21rpx 0;
+	
+			.right,
+			input {
+				font-size: 28rpx;
+				color: #333333;
+			}
+		}
+	}
+	.content2{
+		margin-top: 20rpx;
+	}
+</style>

pages/task/audit/warehouse_details.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		仓库设置详情
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/task/my_task.vue

@@ -1,31 +1,30 @@
 <template name="task">
 	<view class="content">
 		<view class="cu-bar search bg-white">
-			<view class="search-form round" >
-				<u-search placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword"
-				@search="searchKeyWord()"
-				@custom="searchKeyWord()"
-				></u-search>
+			<view class="search-form round">
+				<u-search placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword" @search="searchKeyWord()"
+					@custom="searchKeyWord()"></u-search>
 			</view>
 		</view>
 		<view style='background:#fff;padding:0 15px;'>
 			<view @click='tabcarchange(1)' class='line' :class='statusFlag==1?"active":""'>未完成</view>
-			<view  @click='tabcarchange(3)' class='line'  :class='statusFlag==3?"active":""'>已完成</view>
+			<view @click='tabcarchange(3)' class='line' :class='statusFlag==3?"active":""'>已完成</view>
 		</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="title-tip-a" v-if="statusFlag==3">已完成</view>
-					<view  class="title-tip" v-if="statusFlag==1">未完成</view>
+					<text>{{item.messageTitle}}</text>
+					<!-- <view  class="title-tip-a" v-if="statusFlag==3">已完成</view>
+					<view  class="title-tip" v-if="statusFlag==1">未完成</view> -->
+					<view class='line'>2021-06-30 11:11:22</view>
 				</view>
 				<view class="flex title_b">
 					<view class="title">
 						{{item.messageContent}}
 					</view>
 				</view>
-				<u-tag :text="item.taskType" type="success" v-if="item.taskType == '出库任务'"/>
-				<u-tag :text="item.taskType" type="primary" v-if="item.taskType == '入库任务'"/>
+				<u-tag :text="item.taskType" type="success" v-if="item.taskType == '出库任务'" />
+				<u-tag :text="item.taskType" type="primary" v-if="item.taskType == '入库任务'" />
 			</view>
 			<view v-show="isSole">
 				<uni-load-more :status="loadStatus"></uni-load-more>
@@ -40,7 +39,7 @@
 	} from 'vuex';
 	export default {
 		name: "task",
-		
+
 		data() {
 			return {
 				PageCur: "task",
@@ -49,13 +48,13 @@
 				limit: 10, //每次取条目数
 				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 				isLoadMore: false, //是否加载中
-				isSole:false,
+				isSole: false,
 				showTran: true,
 				scrollTop: 0,
-				isContent:true,
+				isContent: true,
 				statusFlag: 1,
 				current: 1,
-				pcUserInfo:{},
+				pcUserInfo: {},
 				warehouseInOutInfo: {
 					pageSize: 10,
 					currentPage: 1
@@ -64,20 +63,20 @@
 					pageSize: 10,
 					currentPage: 1
 				},
-				keyword:""
+				keyword: ""
 			};
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		onShow() {
-			this.warehouseInOutInfo.currentPage=1
-			this.data.currentPage=1
-			this.taskInfo=[]
-			this.getIndexBuyData()
-			this.pcUserInfo =  uni.getStorageSync("pcUserInfo")
+			debugger
+			this.warehouseInOutInfo.currentPage = 1
+			this.data.currentPage = 1
+			this.taskInfo = []
+			this.pcUserInfo = uni.getStorageSync("pcUserInfo")
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
-				console.log("checkSession",res)
+				console.log("checkSession", res)
 				if (res.data.data == "INVALID") {
 					uni.showModal({
 						title: '登录提示',
@@ -94,18 +93,20 @@
 						fail: () => {},
 						complete: () => {}
 					})
+				} else {
+					this.getIndexBuyData()
 				}
 			})
 			// this.warehouseInOutInfo.phone = this.userInfo.phone
 		},
 		onReachBottom() { //上拉触底函数
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
-			if(this.statusFlag==1){
-				this.warehouseInOutInfo.currentPage += 1
-			}else{
-				this.data.currentPage+=1
-			}
-				
+				if (this.statusFlag == 1) {
+					this.warehouseInOutInfo.currentPage += 1
+				} else {
+					this.data.currentPage += 1
+				}
+
 				this.getIndexBuyData()
 			}
 		},
@@ -113,54 +114,55 @@
 		// 	this.getIndexBuyData()
 		// },
 		filters: {
-			formatDate (date) {
-				var date=new Date(date)
-				var time=new Date()
-				var newdate=''
-				if(time.getMonth() + 1>=10){
-					newdate=time.getFullYear()+'-'+(time.getMonth()+1)+'-'+time.getDate()
-				}else{
-					newdate=time.getFullYear()+'-0'+(time.getMonth()+1)+'-'+time.getDate()
+			formatDate(date) {
+				var date = new Date(date)
+				var time = new Date()
+				var newdate = ''
+				if (time.getMonth() + 1 >= 10) {
+					newdate = time.getFullYear() + '-' + (time.getMonth() + 1) + '-' + time.getDate()
+				} else {
+					newdate = time.getFullYear() + '-0' + (time.getMonth() + 1) + '-' + time.getDate()
+				}
+				//把时间戳改为yyyy-MM-dd格式
+				//判断是否今天
+				var datatime = ''
+				if (date.getMonth() + 1 >= 10) {
+					datatime = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
+				} else {
+					datatime = date.getFullYear() + '-0' + (date.getMonth() + 1) + '-' + date.getDate()
+				}
+				if (datatime == newdate) {
+					var h = date.getHours();
+					h = h < 10 ? '0' + h : h;
+					var m = date.getMinutes();
+					m = m < 10 ? '0' + m : m;
+					var s = date.getSeconds();
+					s = s < 10 ? '0' + s : s;
+					return h + ':' + m + ':' + s;
+				} else {
+					if (date.getMonth() + 1 >= 10) {
+						return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
+					} else {
+						return date.getFullYear() + '-0' + (date.getMonth() + 1) + '-' + date.getDate()
+					}
+				}
+				let o = {
+					'Y': date.getFullYear(),
+					'M+': date.getMonth() + 1,
+					'd+': date.getDate(),
 				}
-			     //把时间戳改为yyyy-MM-dd格式
-			     //判断是否今天
-				 var datatime=''
-				 if(date.getMonth() + 1>=10){
-				 	datatime=date.getFullYear()+'-'+(date.getMonth()+1)+'-'+date.getDate()
-				 }else{
-				 	datatime=date.getFullYear()+'-0'+(date.getMonth()+1)+'-'+date.getDate()
-				 }
-			     if(datatime == newdate){
-			          var h = date.getHours();
-			             h = h < 10 ? '0' + h : h;
-			             var m = date.getMinutes();
-			             m = m < 10 ? '0' + m : m;
-			             var s = date.getSeconds();
-			             s = s < 10 ? '0' + s : s;
-			             return h + ':' + m + ':' + s;
-			     }else{
-					 if(date.getMonth() + 1>=10){
-						 return date.getFullYear()+'-'+(date.getMonth()+1)+'-'+date.getDate()
-					 }else{
-						  return date.getFullYear()+'-0'+(date.getMonth()+1)+'-'+date.getDate()
-					 } 
-				 }
-			 let o = {
-			  'Y': date.getFullYear(),
-			  'M+': date.getMonth() + 1,
-			  'd+': date.getDate(),
-			 }
 			},
 		},
 		methods: {
-			searchKeyWord(){
-				if(!this.keyword){
+			searchKeyWord() {
+				if (!this.keyword) {
 					this.$api.msg('关键字不能为空')
 				}
 				uni.showLoading({
-					title:"正在加载"
+					title: "正在加载"
 				})
-				this.$api.doRequest('get', '/warehouseInOutInfo/selectInfoByKeyWord', this.warehouseInOutInfo).then(res => {
+				this.$api.doRequest('get', '/warehouseInOutInfo/selectInfoByKeyWord', this.warehouseInOutInfo).then(
+				res => {
 					if (res.data.code == 200) {
 						this.taskInfo = res.data.data
 						uni.hideLoading()
@@ -185,17 +187,17 @@
 				const that = this
 				var pages = that.pages
 				var limit = that.limit
-				var url=''
+				var url = ''
 				uni.showLoading({
-					title:"正在加载"
+					title: "正在加载"
 				})
-			   var data={}
-				if(this.statusFlag==1){
-					data=this.warehouseInOutInfo
-					url='/noticeTask/query/noticeTasks'
-				}else{
-					data=this.data
-					url='/commonUser/query/findHisPageNoticeTasks'
+				var data = {}
+				if (this.statusFlag == 1) {
+					data = this.warehouseInOutInfo
+					url = '/noticeTask/query/noticeTasks'
+				} else {
+					data = this.data
+					url = '/commonUser/query/findHisPageNoticeTasks'
 				}
 				//this.warehouseInOutInfo.status = this.status
 				this.$api.doRequest('get', url, data).then(res => {
@@ -203,55 +205,59 @@
 						let data = res.data.data.records
 						//采购信息
 						if (data.length > 0) {
-							if(status){
-								that.taskInfo=data
-							}else{
+							if (status) {
+								that.taskInfo = data
+							} else {
 								that.taskInfo = that.taskInfo.concat(data)
 							}
-							
-							
+
+
 						} else {
 							if (that.pages > 1) {
 								that.pages -= 1
 							}
-							
+
 							that.isLoadMore = false
 							that.loadStatus = 'nomore'
 						}
-							for(var i=0;i<this.taskInfo.length;i++){
-								if(this.taskInfo[i].businessType=='WAREHOUSE'){
-									if(this.taskInfo[i].businessCode=='INOUTTASK-TASK-APPROVE'){
-										this.taskInfo[i].messageTitle='出入库任务'
-									}
-								}else if(this.taskInfo[i].businessType=='REPORT'){
-									if(this.taskInfo[i].businessCode=='PROCUREMENT-RECEIPT-REPORT'){
-										this.taskInfo[i].messageTitle='采购入库统计'
-									}else if(this.taskInfo[i].businessCode=='PROCUREMENT-CLOSE-REPORT'){
-										this.taskInfo[i].messageTitle='采购平仓统计'
-									}else if(this.taskInfo[i].businessCode=='SALE-RECEIPT-REPORT'){
-										this.taskInfo[i].messageTitle='销售出库统计'
-									}else if(this.taskInfo[i].businessCode=='SALE-CLOSE-REPORT'){
-										this.taskInfo[i].messageTitle='销售平仓统计'
-									}
-								}else if(this.taskInfo[i].businessType=='PROCUREMENT'){
-									if(this.taskInfo[i].businessCode=='PROCUREMENT-ORDER-APPROVE'){
-										this.taskInfo[i].messageTitle='采购订单'
-									}
-								}else if(this.taskInfo[i].businessType=='SALE'){
-									if(this.taskInfo[i].businessCode=='SALE-ORDER-APPROVE'){
-										this.taskInfo[i].messageTitle='销售订单'
-									}
+						for (var i = 0; i < this.taskInfo.length; i++) {
+							if (this.taskInfo[i].businessType == 'WAREHOUSE') {
+								if (this.taskInfo[i].businessCode == 'INOUTTASK-TASK-APPROVE') {
+									this.taskInfo[i].messageTitle = '出入库任务'
+								}
+							} else if (this.taskInfo[i].businessType == 'REPORT') {
+								if (this.taskInfo[i].businessCode == 'PROCUREMENT-RECEIPT-REPORT') {
+									this.taskInfo[i].messageTitle = '仓库设置'
+								} else if (this.taskInfo[i].businessCode == 'PROCUREMENT-CLOSE-REPORT') {
+									this.taskInfo[i].messageTitle = '运费设置'
+								} else if (this.taskInfo[i].businessCode == 'PROCUREMENT-CLOSE-REPORT') {
+									this.taskInfo[i].messageTitle = '运费结算'
+								} else if (this.taskInfo[i].businessCode == 'SALE-RECEIPT-REPORT') {
+									this.taskInfo[i].messageTitle = '收购结算'
+								} else if (this.taskInfo[i].businessCode == 'SALE-CLOSE-REPORT') {
+									this.taskInfo[i].messageTitle = '采购结算'
+								}
+							} else if (this.taskInfo[i].businessType == 'PROCUREMENT') {
+								if (this.taskInfo[i].businessCode == 'PROCUREMENT-ORDER-APPROVE') {
+									this.taskInfo[i].messageTitle = '入库任务'
+								}
+							} else if (this.taskInfo[i].businessType == 'PROCUREMENT') {
+								if (this.taskInfo[i].businessCode == 'PROCUREMENT-ORDER-APPROVE') {
+									this.taskInfo[i].messageTitle = '出库任务'
 								}
 							}
-						if(res.data.data.records.length==0){
-							that.isSole=true
-						}else{
-							that.isSole=false
 						}
-						if(res.data.data.records.length==0&&this.data.currentPage==1&&this.statusFlag==3
-						||res.data.data.records.length==0&&this.warehouseInOutInfo.currentPage==1&&this.statusFlag==1){
+						if (res.data.data.records.length == 0) {
+							that.isSole = true
+						} else {
+							that.isSole = false
+						}
+						if (res.data.data.records.length == 0 && this.data.currentPage == 1 && this.statusFlag ==
+							3 ||
+							res.data.data.records.length == 0 && this.warehouseInOutInfo.currentPage == 1 && this
+							.statusFlag == 1) {
 							console.log()
-							this.taskInfo=[]
+							this.taskInfo = []
 						}
 						uni.hideLoading()
 					} else {
@@ -276,68 +282,70 @@
 				this.pageSize = 1
 				this.getIndexBuyData(1)
 			},
-			navToDetailPage(item) {
-				if(item.businessCode=='PROCUREMENT-ORDER-APPROVE'){
+			navToDetailPage(item) {debugger
+				if (item.businessCode == 'PROCUREMENT-ORDER-APPROVE') {
 					uni.navigateTo({
-						url:'/pages/task/procurement_details?id='+item.businessId
+						url: '/pages/task/procurement_details?id=' + item.businessId
 					})
-				}else if(item.businessCode=='SALE-ORDER-APPROVE'){
+				} else if (item.businessCode == 'SALE-ORDER-APPROVE') {
 					uni.navigateTo({
-						url:'/pages/task/sale_details?id='+item.businessId
+						url: '/pages/task/sale_details?id=' + item.businessId
 					})
-				}else if(item.businessCode=='PROCUREMENT-RECEIPT-REPORT'){
+				} else if (item.businessCode == 'PROCUREMENT-RECEIPT-REPORT') {
 					uni.navigateTo({
-						url:'/pages/task/procurement_report_details?id='+item.businessId
+						url: '/pages/task/procurement_report_details?id=' + item.businessId
 					})
-				}else if(item.businessCode=='PROCUREMENT-CLOSE-REPORT'){
+				} else if (item.businessCode == 'PROCUREMENT-CLOSE-REPORT') {
 					uni.navigateTo({
-						url:'/pages/task/procurement_close_details?id='+item.businessId
+						url: '/pages/task/procurement_close_details?id=' + item.businessId
 					})
-				}else if(item.businessCode=='SALE-RECEIPT-REPORT'){
+				} else if (item.businessCode == 'SALE-RECEIPT-REPORT') {
 					uni.navigateTo({
-						url:'/pages/task/sale_report_details?id='+item.businessId
+						url: '/pages/task/sale_report_details?id=' + item.businessId
 					})
-				}else if(item.businessCode=='SALE-CLOSE-REPORT'){
+				} else if (item.businessCode == 'SALE-CLOSE-REPORT') {
 					uni.navigateTo({
-						url:'/pages/task/sale_close_details?id='+item.businessId
+						url: '/pages/task/sale_close_details?id=' + item.businessId
 					})
-				}else if(item.businessCode=='INOUTTASK-TASK-APPROVE'){
-					if(this.statusFlag==3){
+				} else if (item.businessCode == 'INOUTTASK-TASK-APPROVE') {
+					if (this.statusFlag == 3) {
 						uni.navigateTo({
-							url: '/pageD/warehousings/warehousingDetails?id='+item.businessId+'&compId='+this.pcUserInfo.compId
+							url: '/pageD/warehousings/warehousingDetails?id=' + item.businessId + '&compId=' + this
+								.pcUserInfo.compId
 							// url: '/pageD/warehousings/warehousingDetails?id='+item.businessId+'&compId='+item.compId
 						})
-					}else{
+					} else {
 						uni.navigateTo({
 							// url:'/pageD/warehousings/warehousings?id='+item.businessId+'&compId='+item.compId
-							url:'/pageD/warehousings/warehousings?id='+item.businessId+'&compId='+this.pcUserInfo.compId
+							url: '/pageD/warehousings/warehousings?id=' + item.businessId + '&compId=' + this
+								.pcUserInfo.compId
 						})
 					}
-					
+
 				}
-				
-			// 	if(item.taskType == "入库任务"){
-					
-			// 	if(item.statusFlag == 3){
-			// 	uni.navigateTo({
-			// 		url: `/pageD/warehousings/warehousingDetails?id=${item.id}`
-			// 	})
-			// 	}else{
-			// 		uni.navigateTo({
-			// 			url: `/pageD/warehousings/warehousings?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}&addressUrl=${item.addressUrl}&inOutDate=${item.inOutDate}&binNumber=${item.binNumber}`
-			// 		})
-			// 	}
-			// }else if(item.taskType == "出库任务"){
-			// 	if(item.statusFlag == 3){
-			// 	uni.navigateTo({
-			// 		url: `/pageD/warehousings/ex_warehouse_detail?id=${item.id}`
-			// 	})
-			// 	}else{
-			// 		uni.navigateTo({
-			// 			url: `/pageD/warehousings/ex_warehouse?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&consignee=${item.consignee}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&boxNo=${item.boxNo}&titleNo=${item.titleNo}`
-			// 		})
-			// 	}
-			// }
+
+				// 	if(item.taskType == "入库任务"){
+
+				// 	if(item.statusFlag == 3){
+				// 	uni.navigateTo({
+				// 		url: `/pageD/warehousings/warehousingDetails?id=${item.id}`
+				// 	})
+				// 	}else{
+				// 		uni.navigateTo({
+				// 			url: `/pageD/warehousings/warehousings?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}&addressUrl=${item.addressUrl}&inOutDate=${item.inOutDate}&binNumber=${item.binNumber}`
+				// 		})
+				// 	}
+				// }else if(item.taskType == "出库任务"){
+				// 	if(item.statusFlag == 3){
+				// 	uni.navigateTo({
+				// 		url: `/pageD/warehousings/ex_warehouse_detail?id=${item.id}`
+				// 	})
+				// 	}else{
+				// 		uni.navigateTo({
+				// 			url: `/pageD/warehousings/ex_warehouse?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&consignee=${item.consignee}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&boxNo=${item.boxNo}&titleNo=${item.titleNo}`
+				// 		})
+				// 	}
+				// }
 			}
 		}
 	}
@@ -345,88 +353,101 @@
 
 <style lang="scss" scoped>
 	.tag {
-		background:#F5F6F9;
+		background: #F5F6F9;
 		padding: 5px;
-		color:#333333;
+		color: #333333;
 		display: inline-flex;
 		font-size: 22rpx;
 		border-radius: 3px;
 		margin: 3px;
 	}
-	.introduce-section .title_b .title-tip{
+
+	.introduce-section .title_b .title-tip {
 		font-size: 13px;
-		height:40px;
+		height: 40px;
 		line-height: 40px;
 		flex: 2.5;
 	}
-	.introduce-section .title_b .title{
+
+	.introduce-section .title_b .title {
 		font-size: 13px;
-		height:40px;
-		padding:10px 0;
+		height: 40px;
+		padding: 10px 0;
 		flex: 2.5;
 	}
-	.introduce-section .title_b .title-tip-b{
+
+	.introduce-section .title_b .title-tip-b {
 		flex: 1;
 		font-size: 13px;
 		color: #878C9C;
-		height:40px;
+		height: 40px;
 		line-height: 40px;
 	}
-	.introduce-section .title text{
+
+	.introduce-section .title {
+		justify-content: space-between;
+	}
+
+	.introduce-section .title text {
 		font-size: 17px;
 		font-weight: bold;
-		height:50px;
+		height: 50px;
 		line-height: 50px;
-		flex: 2.5;
-		border-bottom:1px solid #EEEEEE;
 	}
-	.introduce-section .title .title-tip{
+
+	.introduce-section .title .title-tip {
 		flex: 1;
 		font-size: 15px;
 		color: #FE6430;
 		font-weight: 500;
-		height:50px;
+		height: 50px;
 		line-height: 50px;
-		border-bottom:1px solid #EEEEEE;
+		border-bottom: 1px solid #EEEEEE;
 	}
-	.introduce-section .title .title-tip-a{
+
+	.introduce-section .title .title-tip-a {
 		flex: 1;
 		font-size: 15px;
 		color: #AFB3BF;
 		font-weight: 500;
-		height:50px;
+		height: 50px;
 		line-height: 50px;
-		border-bottom:1px solid #EEEEEE;
+		border-bottom: 1px solid #EEEEEE;
 	}
-	.introduce-section .guess-item{
-		border-radius:4px;
+
+	.introduce-section .guess-item {
+		border-radius: 4px;
 		background: #fff;
 		padding: 0upx 30upx 20upx;
-		margin:10px;
+		margin: 10px;
 		padding-bottom: 20upx;
 		border-bottom: 1px solid #ccc;
 	}
-	.line{
-		display:inline-block;
-		padding:5px;
-		position:relative;
-		font-size:17px;
+
+	.line {
+		display: inline-block;
+		padding: 5px;
+		position: relative;
+		font-size: 17px;
 	}
-	.line.active{
-		font-size:19px;
+
+	.line.active {
+		font-size: 19px;
 		font-weight: 900;
 	}
-	.line.active:after{
-		content:'';
-		display:block;
-		position:absolute;
-		width:18px;
-		left:50%;
+
+	.line.active:after {
+		content: '';
+		display: block;
+		position: absolute;
+		width: 18px;
+		left: 50%;
 		transform: translateX(-50%);
-		bottom:0;
-		border-bottom:1px solid #22C572;
+		bottom: 0;
+		border-bottom: 1px solid #22C572;
 	}
-	/deep/.u-action-active{
-		margin-right:6px;
+
+	/deep/.u-action-active {
+		margin-right: 6px;
 	}
 </style>