gjy 3 년 전
부모
커밋
ca2256977c

+ 19 - 14
common/helper.js

@@ -12,21 +12,26 @@ const isArray = Array.isArray || function(obj) {
 const getListByUserId = function() {
 	let baseUrlNew = config.def().baseUrlNew
 	var userInfo = uni.getStorageSync("userInfo")
-	uni.request({
-		url: baseUrlNew + '/roleMenu/query/getListByUserId',
-		data: {
-			userId: userInfo.id
-		},
-		method: 'GET',
-		success: (res) => {
-			if (res.statusCode === 200) {
-				uni.setStorageSync("jurisdiction", res.data.data)
-				let list = getUserAllRoles(res.data.data);
-				uni.setStorageSync("rolesList", list)
-
+	
+	console.log("------",userInfo)
+	if(userInfo){
+		uni.request({
+			url: baseUrlNew + '/roleMenu/query/getListByUserId',
+			data: {
+				userId: userInfo.id?userInfo.id:userInfo.data.id
+			},
+			method: 'GET',
+			success: (res) => {
+				if (res.statusCode === 200) {
+					uni.setStorageSync("jurisdiction", res.data.data)
+					let list = getUserAllRoles(res.data.data);
+					uni.setStorageSync("rolesList", list)
+		
+				}
 			}
-		}
-	})
+		})
+	}
+
 }
 const getUserAllRoles = (item) => {
 	console.log(item)

+ 2 - 0
demo.vue

@@ -59,6 +59,8 @@
 				title: '提交成功',
 				type: 'success'
 			})
+			// 深拷贝
+			let b = this.$u.deepClone(a);
 			uni.setStorageSync("depotAcquisition_warehouseName",this.warehouseName)
 			uni.getStorageSync("depotAcquisition_warehouseName")
 			// 公司id

+ 5 - 3
pages/erp/index.vue

@@ -40,8 +40,11 @@
 				<view class="cu-item" v-for="(item,index) in gridList1" :key="index" @click="gridClick(item, index)"
 					v-if="index<gridCol*2">
 					<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]" class="ys-item">
-						<view class="ys-number" v-if="index==0&&ysSNumber!=0||index==1&&ysFNumber!=0">
-							{{index==0?ysSNumber:ysFNumber}}
+						<view class="ys-number" v-if="index==0&&ysFNumber!=0">
+							{{ysFNumber}}
+						</view>
+						<view class="ys-number" v-if="index==1&&ysSNumber!=0">
+							{{ysSNumber}}
 						</view>
 						<image :src="item.src" class="sign"></image>
 					</view>
@@ -253,7 +256,6 @@
 				pageSize: 1
 			}).then(res => {
 				if (res.data.code == 200) {
-
 					this.ysFNumber = res.data.data.total
 				}
 			})

+ 42 - 6
pages/erpbusiness/add_quality_testing.vue

@@ -156,8 +156,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>
 
@@ -175,6 +179,8 @@
 		},
 		data() {
 			return {
+				isShowAlert: false,
+				content: '确认初检信息后,初检员不需要再次确认质检信息,是否确定提交?',
 				inputShow: false,
 				modalName: '',
 				mycarStyle: '',
@@ -291,9 +297,19 @@
 		onShow() {
 			this.purchasePriceList = uni.getStorageSync('purchasePriceList')
 			if (uni.getStorageSync('checkcustomer')) {
-				this.gridList.customerName = uni.getStorageSync('checkcustomer').customerName
-				this.gridList.customerPhone = uni.getStorageSync('checkcustomer').customerPhone
-				this.gridList.customerNumberCard = uni.getStorageSync('checkcustomer').customerNumberCard
+
+				let _customerInfo = uni.getStorageSync('checkcustomer')
+				if (_customerInfo.shipperName) {
+					//点击登记客户
+					this.gridList.customerName = _customerInfo.shipperName
+					this.gridList.customerPhone =_customerInfo.shipperPhone
+				} else {
+					//点击搜索客户
+					this.gridList.customerName =_customerInfo.customerName
+					this.gridList.customerPhone = _customerInfo.customerPhone
+				}
+
+				this.gridList.customerNumberCard = _customerInfo.customerNumberCard
 			}
 			this.gridList.grade = this.gradeList[0].value
 			this.gridList.gradeKey = this.gradeList[0].key
@@ -338,6 +354,24 @@
 			})
 		},
 		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('提交失败')
+				// 	}
+				// })
+			},
+			cancelClick() {
+				this.isShowAlert = false
+			},
 			waterContentChange() {
 				var that = this
 				if (this.gridList.goodsName && this.cangid) {
@@ -390,7 +424,8 @@
 			},
 			gocustomer() {
 				uni.navigateTo({
-					url: '/pages/erpbusiness/customer?cangid=' + this.cangid
+					url: '/pages/erpbusiness/customer?cangid=' + this.cangid + '&warehouseName=' + this.gridList
+						.warehouseName
 				})
 			},
 			getdate() {
@@ -494,7 +529,7 @@
 					success: function(res) {
 						if (res.confirm) {
 							that.$api.doRequest('get', '/paymentManagement/cumulant', {
-									compId: JSON.parse(localStorage.getItem('pcUserInfo')).data.compId,
+									compId: uni.getStorageSync('pcUserInfo').compId,
 									customerNumberCard: that.gridList.customerNumberCard,
 									goodsName: that.gridList.goodsName,
 								})
@@ -510,7 +545,8 @@
 												if (count <= 0) {
 													count = 0
 													that.$api.msg('该客户累计销售' + this.gridList.goodsName + (
-															response.data.data / 1000).toFixed(2) + '吨,还可售粮' +
+															response.data.data / 1000).toFixed(2) +
+														'吨,还可售粮' +
 														count + '吨', )
 
 												} else {

+ 238 - 142
pages/erpbusiness/customer.vue

@@ -22,18 +22,23 @@
 					<view v-else> {{item.customerName}}({{item.customerPhone}}) </view>
 				</view>
 			</view>
-			<view v-for='item in gridList' style='display:inline-block;'>
-				<view @click='recentcustomer(item)' class='wrap' v-if='show==false'>{{item.searchContent}}</view>
+			<view v-for='item in recentCustomers' style='display:inline-block;'>
+				<view @click='recentcustomer(item)' class='wrap' v-if='show==false'>
+					{{item.customerName}}({{item.customerPhone}})
+				</view>
 			</view>
 		</view>
 		<view class="content content1">
 			<view style='padding-left:20px;color:#AFB3BF;font-size:14px;' v-if='show==false'>登记客户</view>
-		
-			<view v-for='item in gridList'>
-				<view class="row">
-					<view class="row-item">辽H12345</view>
-					<view class="row-item">张三(货)</view>
-					<view class="row-item">李四(商)</view>
+
+			<view v-for='item in registeredCustomer'>
+				<view class="dj-customer" @click="registeredCustomerClick(item)">
+					<view class="left">{{item.carNo}}</view>
+					<view class="right">
+						<view class="">{{item.shipperName}}(货)</view>
+						<view class="">{{item.supplier}}(商)</view>
+					</view>
+
 				</view>
 			</view>
 		</view>
@@ -93,8 +98,9 @@
 				purchasePriceList: [],
 				warehouseCount: '',
 				commonWarehouseNo: '',
-				cangid: ''
-
+				cangid: '',
+				recentCustomers: [],
+				registeredCustomer: []
 			}
 		},
 		computed: {
@@ -109,6 +115,7 @@
 		},
 		onLoad(options) {
 			this.cangid = options.cangid
+			this.warehouseName = options.warehouseName
 			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
 				warehouseId: this.cangid
 			}).then(res => {
@@ -120,26 +127,59 @@
 		},
 		onShow() {
 			this.purchasePriceList = uni.getStorageSync('purchasePriceList')
-			this.gridList = []
-			this.$api.doRequest('get', '/searchRecordsInfo/selectSearchRecordsInfo', {
-				pageSize: this.pageSize,
-				currentPage: this.currentPage,
-				functionType: "3",
-				commonId: this.userInfo.id
-			}).then(res => {
-				if (res.data.data) {
-					this.gridList = res.data.data.records
-					console.log(this.gridList)
+				let _data = uni.getStorageSync('recentCustomers')
+			if (_data) {
+				this.recentCustomers =_data
+				for(let i=0;i<_data.length;i++){
+					if(_data[i].shipperName){
+						this.recentCustomers[i].customerName = _data[i].shipperName
+						this.recentCustomers[i].customerPhone = _data[i].shipperPhone
+					}
 				}
-			})
-			this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer', {
-				compId: '',
-				authenticationStatusKey: 7,
+				
+			} else {
+				this.recentCustomers = []
+			}
+
+			this.$api.doRequest('get', '/grainDeliveryRegistration/grainDeliveryRegistrationCustomer', {
+				warehouseName: this.warehouseName
 			}).then(res => {
 				if (res.data.data) {
-					this.customerList = res.data.data
+					let _endTime = Date.parse(new Date());
+					let _startTime = ""
+					for (let i = 0; i < res.data.data.length; i++) {
+						let _carList = res.data.data[i].shippingInformationList
+						for (let k = 0; k < _carList.length; k++) {
+							//判断是记录是否失效
+							_startTime = new Date((res.data.data[i].validityDate + ' 00:00:00')).getTime();
+							if (_endTime - _startTime <= 0) {
+								this.registeredCustomer.push(_carList[k])
+							}
+						}
+					}
+					console.log(this.registeredCustomer)
 				}
 			})
+			// this.$api.doRequest('get', '/searchRecordsInfo/selectSearchRecordsInfo', {
+			// 	pageSize: this.pageSize,
+			// 	currentPage: this.currentPage,
+			// 	functionType: "3",
+			// 	commonId: this.userInfo.id
+			// }).then(res => {
+			// 	if (res.data.data) {
+			// 		this.gridList = res.data.data.records
+			// 		console.log(this.gridList)
+			// 	}
+			// })
+			// this.$api.doRequest('get', '/identityAuthenticationInfo/identityAuthenticationInfoCustomer', {
+			// 	compId: uni.getStorageSync('pcUserInfo').compId,
+			// 	authenticationStatusKey: 7,
+			// 	searchKeyWord:''
+			// }).then(res => {
+			// 	if (res.data.data) {debugger
+			// 		this.customerList = res.data.data
+			// 	}
+			// })
 		},
 		methods: {
 			searchinput(e) {
@@ -149,129 +189,165 @@
 				}
 
 			},
+			registeredCustomerClick(item){
+			
+			uni.setStorageSync('checkcustomer', item)
+				if (this.recentCustomers.length == 0) {
+					this.recentCustomers.push(item)
+					uni.setStorageSync('recentCustomers', this.recentCustomers)
+				}else{
+					let _copyList = this.$u.deepClone(this.recentCustomers);
+					for (let i = 0; i < this.recentCustomers.length; i++) {
+						if (this.recentCustomers[i].customerPhone != item.shipperPhone) {
+							_copyList.push(item)
+							uni.setStorageSync('recentCustomers', _copyList)
+						}
+					}
+				}
+			
+				uni.navigateBack()
+			},
 			checkcustomer(item) {
-
 				var that = this
 				var count = ''
 				if (item.authenticationStatus == '已认证') {
-					uni.showLoading({
-						title: '加载中'
-					})
-					that.$api.doRequest('post', '/searchRecordsInfo/api/addInfo', {
-							commonId: that.userInfo.id,
-							searchContent: item.customerName + '(' + item.customerPhone + ')',
-							functionType: 3
-						}).then(res => {
-
-							uni.setStorageSync('checkcustomer', item)
-							that.$api.doRequest('get', '/qualityInspectionManagement/api/settledCount', {
-								compId: '',
-								customerName: item.customerName,
-								goodsName: uni.getStorageSync('goodsName'),
-							}).then(res => {
-								if (res.data.code == 200) {
-									count = res.data.data
-									that.$api.doRequest('get', '/paymentManagement/cumulant', {
-										compId: '',
-										customerName: item.customerName,
-										goodsName: uni.getStorageSync('goodsName'),
-									}).then(res => {
-										for (let i = 0; i < that.purchasePriceList.length; i++) {
-											var data = res.data.data / 1000
-											if (that.purchasePriceList[i].goodsName == uni
-												.getStorageSync('goodsName')) {
-												if (that.purchasePriceList[i].saleLimit - data < 50 ||
-													count > 0) {
-													that.$api.msg(
-														`当前客户已累计销售我司${uni.getStorageSync('goodsName')}${data.toFixed(2)}吨,最高可售${that.purchasePriceList[i].saleLimit}吨。`
-														)
-												}
-											}
-										}
-										that.show = false
-										uni.hideLoading()
-										uni.navigateBack()
-									})
-								}
-							})
-						})
-						.catch(res => {
-							uni.showToast({
-								title: '系统异常,请联系管理员',
-								icon: 'none',
-								duration: 2000
-							})
-							uni.hideLoading()
-						})
-
-
-
+					// uni.showLoading({
+					// 	title: '加载中'
+					// })
+					
+					uni.setStorageSync('checkcustomer', item)
+					if (this.recentCustomers.length == 0) {
+						this.recentCustomers.push(item)
+						uni.setStorageSync('recentCustomers', this.recentCustomers)
+					}else{
+						let _isDel = false
+						for (let i = 0; i < this.recentCustomers.length; i++) {
+							if (this.recentCustomers[i].customerPhone == item.customerPhone) {
+										_isDel = true
+							}
+						}
+						if(!_isDel){
+							let _data = uni.getStorageSync('recentCustomers')
+							_data.push(item)
+							uni.setStorageSync('recentCustomers', _data)
+						}
+					}
+					// uni.hideLoading()
+					uni.navigateBack()
+					// that.$api.doRequest('post', '/searchRecordsInfo/api/addInfo', {
+					// 		commonId: that.userInfo.id,
+					// 		searchContent: item.customerName + '(' + item.customerPhone + ')',
+					// 		functionType: 3
+					// 	}).then(res => {
+
+					// 		uni.setStorageSync('checkcustomer', item)
+					// 		that.$api.doRequest('get', '/qualityInspectionManagement/api/settledCount', {
+					// 			compId: '',
+					// 			customerName: item.customerName,
+					// 			goodsName: uni.getStorageSync('goodsName'),
+					// 		}).then(res => {
+					// 			if (res.data.code == 200) {
+					// 				count = res.data.data
+					// 				that.$api.doRequest('get', '/paymentManagement/cumulant', {
+					// 					compId: '',
+					// 					customerName: item.customerName,
+					// 					goodsName: uni.getStorageSync('goodsName'),
+					// 				}).then(res => {
+					// 					for (let i = 0; i < that.purchasePriceList.length; i++) {
+					// 						var data = res.data.data / 1000
+					// 						if (that.purchasePriceList[i].goodsName == uni
+					// 							.getStorageSync('goodsName')) {
+					// 							if (that.purchasePriceList[i].saleLimit - data < 50 ||
+					// 								count > 0) {
+					// 								that.$api.msg(
+					// 									`当前客户已累计销售我司${uni.getStorageSync('goodsName')}${data.toFixed(2)}吨,最高可售${that.purchasePriceList[i].saleLimit}吨。`
+					// 									)
+					// 							}
+					// 						}
+					// 					}
+					// 					that.show = false
+					// 					uni.hideLoading()
+					// 					uni.navigateBack()
+					// 				})
+					// 			}
+					// 		})
+					// 	})
+					// 	.catch(res => {
+					// 		uni.showToast({
+					// 			title: '系统异常,请联系管理员',
+					// 			icon: 'none',
+					// 			duration: 2000
+					// 		})
+					// 		uni.hideLoading()
+					// 	})
 				} else {
 					this.$api.msg('客户身份不可用')
 				}
 
 			},
 			recentcustomer(item) {
-				var count = ''
-				var that = this
-				var name = item.searchContent.split('(')[0]
-				var phone = item.searchContent.split('(')[1]
-				phone = phone.substring(0, phone.length - 1)
-				for (var i = 0; i < this.customerList.length; i++) {
-					// console.log(name,this.customerList[i].customerName,name==this.customerList[i].customerName)
-					if (this.customerList[i].customerPhone == phone) {
-						var tmpName = this.customerList[i].customerName
-						uni.setStorageSync('checkcustomer', this.customerList[i])
-						uni.showLoading({
-							title: '加载中'
-						})
-						that.$api.doRequest('post', '/searchRecordsInfo/api/addInfo', {
-								commonId: that.userInfo.id,
-								searchContent: this.customerList[i].customerName + '(' + this.customerList[i]
-									.customerPhone + ')',
-								functionType: 3
-							}).then(res => {
-								that.$api.doRequest('get', '/qualityInspectionManagement/api/settledCount', {
-									compId: '',
-									customerName: tmpName,
-									goodsName: uni.getStorageSync('goodsName'),
-								}).then(res => {
-									if (res.data.code == 200) {
-										count = res.data.data
-										that.$api.doRequest('get', '/paymentManagement/cumulant', {
-											compId: '',
-											customerName: tmpName,
-											goodsName: uni.getStorageSync('goodsName'),
-										}).then(res => {
-											for (let i = 0; i < that.purchasePriceList.length; i++) {
-												if (that.purchasePriceList[i].goodsName == uni
-													.getStorageSync('goodsName')) {
-													var data = res.data.data / 1000
-													if (that.purchasePriceList[i].saleLimit - data <
-														50 || count > 0) {
-														that.$api.msg(
-															`当前客户已累计销售我司${uni.getStorageSync('goodsName')}${data.toFixed(2)}吨,最高可售${that.purchasePriceList[i].saleLimit}吨。`
-															)
-													}
-												}
-											}
-											that.show = false
-											uni.hideLoading()
-											uni.navigateBack()
-										})
-									}
-								})
-							})
-							.catch(res => {
-								uni.showToast({
-									title: '系统异常,请联系管理员',
-									icon: 'none',
-									duration: 2000
-								})
-								uni.hideLoading()
-							})
-					}
-				}
+				uni.setStorageSync('checkcustomer', item)
+				uni.navigateBack()
+				// var count = ''
+				// var that = this
+				// var name = item.searchContent.split('(')[0]
+				// var phone = item.searchContent.split('(')[1]
+				// phone = phone.substring(0, phone.length - 1)
+				// for (var i = 0; i < this.customerList.length; i++) {
+				// 	// console.log(name,this.customerList[i].customerName,name==this.customerList[i].customerName)
+				// 	if (this.customerList[i].customerPhone == phone) {
+				// 		var tmpName = this.customerList[i].customerName
+				// 		uni.setStorageSync('checkcustomer', this.customerList[i])
+				// 		uni.showLoading({
+				// 			title: '加载中'
+				// 		})
+				// 		that.$api.doRequest('post', '/searchRecordsInfo/api/addInfo', {
+				// 				commonId: that.userInfo.id,
+				// 				searchContent: this.customerList[i].customerName + '(' + this.customerList[i]
+				// 					.customerPhone + ')',
+				// 				functionType: 3
+				// 			}).then(res => {
+				// 				that.$api.doRequest('get', '/qualityInspectionManagement/api/settledCount', {
+				// 					compId: '',
+				// 					customerName: tmpName,
+				// 					goodsName: uni.getStorageSync('goodsName'),
+				// 				}).then(res => {
+				// 					if (res.data.code == 200) {
+				// 						count = res.data.data
+				// 						that.$api.doRequest('get', '/paymentManagement/cumulant', {
+				// 							compId: '',
+				// 							customerName: tmpName,
+				// 							goodsName: uni.getStorageSync('goodsName'),
+				// 						}).then(res => {
+				// 							for (let i = 0; i < that.purchasePriceList.length; i++) {
+				// 								if (that.purchasePriceList[i].goodsName == uni
+				// 									.getStorageSync('goodsName')) {
+				// 									var data = res.data.data / 1000
+				// 									if (that.purchasePriceList[i].saleLimit - data <
+				// 										50 || count > 0) {
+				// 										that.$api.msg(
+				// 											`当前客户已累计销售我司${uni.getStorageSync('goodsName')}${data.toFixed(2)}吨,最高可售${that.purchasePriceList[i].saleLimit}吨。`
+				// 											)
+				// 									}
+				// 								}
+				// 							}
+				// 							that.show = false
+				// 							uni.hideLoading()
+				// 							uni.navigateBack()
+				// 						})
+				// 					}
+				// 				})
+				// 			})
+				// 			.catch(res => {
+				// 				uni.showToast({
+				// 					title: '系统异常,请联系管理员',
+				// 					icon: 'none',
+				// 					duration: 2000
+				// 				})
+				// 				uni.hideLoading()
+				// 			})
+				// 	}
+				// }
 			},
 			emptysearch() {
 				this.show = false
@@ -925,15 +1001,35 @@
 			border-radius: 30px;
 		}
 	}
-	.content1{
+
+	.content1 {
 		margin-top: 20rpx;
 		padding: 20rpx 0;
-		.row{
+
+		.row {
 			display: flex;
-			padding:20rpx 30rpx;
-			.row-item{
+			padding: 20rpx 30rpx;
+
+			.row-item {
 				margin-right: 20rpx;
 			}
 		}
 	}
+
+	.dj-customer {
+		background: #F5F6F9;
+		display: flex;
+		width: 60%;
+		justify-content: space-between;
+		align-items: center;
+		margin: 20rpx;
+		border-radius: 30rpx;
+		padding: 10rpx 20rpx;
+
+		.right {
+			display: flex;
+		}
+
+		;
+	}
 </style>

+ 13 - 11
pages/erpbusiness/index.vue

@@ -14,9 +14,10 @@
 			<!-- 检斤员权限 -->
 			<!-- isShowAcquisitionInfo -->
 			<!-- 获取当前用户负责的仓库,如果无仓库隐藏收购信息 -->
-			<view class="content2">
+			<view class="content2" v-if="isShowAcquisitionInfo&&sgId">
 				<view>收购信息</view>
-				<view @click="navTo('/pages/erpbusiness/acquisitionInformation?status='+status+'&id='+sgId)">{{status}}></view>
+				<view @click="navTo('/pages/erpbusiness/acquisitionInformation?status='+status+'&id='+sgId)">{{status}}>
+				</view>
 			</view>
 		</view>
 		<!-- <view class="wrap">
@@ -54,7 +55,7 @@
 		},
 		data() {
 			return {
-				status:'',
+				status: '',
 				isShowAlert1: false,
 				content1: '当前登入信息验证失败,是否重新登录?',
 				isShowAlert: false,
@@ -149,7 +150,7 @@
 				showTran: true,
 				companyId: 1,
 				current: 4,
-				sgId:''
+				sgId: ''
 			}
 		},
 
@@ -191,7 +192,7 @@
 			uni.hideKeyboard()
 			uni.showTabBar()
 			this.loadData()
-			this.isShowAcquisitionInfo=this.utils.getRoles('acquisitionInfor.view')
+			this.isShowAcquisitionInfo = this.utils.getRoles('acquisitionInfor.view')
 			this.getStatus()
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
 				console.log("checkSession", res)
@@ -260,16 +261,16 @@
 			console.log("this.userInfo", this.userInfo)
 		},
 		methods: {
-			getStatus(){
+			getStatus() {
 				let _obj = {
-					commonId:uni.getStorageSync("userInfo").id,
+					commonId: uni.getStorageSync("userInfo").id,
 				}
-				this.$api.doRequest('get', '/acquisitionInfo/getInfo',_obj ).then(res => {
+				this.$api.doRequest('get', '/acquisitionInfo/getInfo', _obj).then(res => {
 					if (res.data.code == 200) {
-						if(res.data.data){
+						if (res.data.data) {
 							this.status = res.data.data.status
 							this.sgId = res.data.data.commonId
-						}else{
+						} else {
 							this.status = '已隐藏'
 						}
 					}
@@ -985,7 +986,8 @@
 			font-size: 16px;
 		}
 	}
-	.content2{
+
+	.content2 {
 		display: flex;
 		justify-content: space-between;
 	}

+ 3 - 3
pages/erpbusiness/quality_testing.vue

@@ -210,6 +210,9 @@
 			this.managementType = options.managementType
 		},
 		onShow() {
+			uni.showLoading({
+				title: "正在加载"
+			})
 			this.pageSize = 10
 			this.currentPage = 1
 			var that = this
@@ -292,9 +295,6 @@
 			},
 			getList(flag) {
 				var that = this
-				uni.showLoading({
-					title: "正在加载"
-				})
 				this.$api.doRequest('get', 'qualityInspectionManagement/selectQualityInspection', {
 						pageSize: this.pageSize,
 						currentPage: this.currentPage,

+ 1 - 1
pages/public/code.vue

@@ -179,7 +179,7 @@
 									helper.getListByUserId()
 								}
 								else{
-									that.$api.doRequest('post','/commonUser/api/loginQuickly',{mobilePhone: '13333333333',
+									that.$api.doRequest('post','/commonUser/api/loginQuickly',{mobilePhone: '14444444444',
 									veriCode: "123456",}).then(res2 => {
 										uni.setStorageSync('pcUserInfo', res2.data.data)
 										helper.getListByUserId()

+ 1 - 1
pages/public/login_account_number.vue

@@ -120,7 +120,7 @@
 								helper.getListByUserId()
 							}
 							else{
-								that.$api.doRequest('post','/commonUser/api/loginQuickly',{mobilePhone: '13333333333',
+								that.$api.doRequest('post','/commonUser/api/loginQuickly',{mobilePhone: '14444444444',
 								veriCode: "123456",}).then(res2 => {
 									uni.setStorageSync('pcUserInfo', res2.data.data)
 									helper.getListByUserId()

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 543 - 425
pages/public/register.vue


+ 0 - 1
pages/user/depotAcquisition/grainDeliveryRegistration.vue

@@ -227,7 +227,6 @@
 					}
 					this.$api.doRequest('post', '/grainDeliveryRegistration/api/insertInfo', _dataList).then(res => {
 						if (res.data.code == 200) {
-							debugger
 							this.$api.msg('添加成功!')
 							setTimeout(function() {
 								uni.navigateBack()

+ 5 - 0
pages/user/report.vue

@@ -82,6 +82,11 @@
 			})
 			this.url = "https://liangxin.zthymaoyi.com/map.html?id="+uni.getStorageSync('pcUserInfo').compId
 			this.init()
+			uni.onWindowResize((res) => {
+			    console.log('变化后的窗口宽度=' + res.size.windowWidth)
+			    console.log('变化后的窗口高度=' + res.size.windowHeight)
+				this.init()
+			})
 		},
 		methods: {
 			skipContent(index){

+ 1 - 2
pages/user/user.vue

@@ -305,7 +305,6 @@
 				} else {
 					this.headUrl = this.userInfo.avatarUrl
 				}
-				
 				this.username = this.userInfo.userName?this.userInfo.userName:uni.getStorageSync("userInfo").data.userName
 				this.userphone = this.userInfo.phone?this.userInfo.phone:uni.getStorageSync("userInfo").data.phone
 				var that = this
@@ -386,7 +385,7 @@
 						that.$api.msg('切换成功')
 					} else {
 						that.$api.doRequest('post', '/commonUser/api/loginQuickly', {
-							mobilePhone: '13333333333',
+							mobilePhone: '14444444444',
 							companyName: this.companyList[e[0]].compName,
 							veriCode: "123456",
 						}).then(res2 => {

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.