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

# Conflicts:
#	pages/user/setUp.vue

config/index.js

@@ -4,13 +4,13 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
 	// baseUrlNew: 'http://192.168.110.9:9100/',
-	baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	 // baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	// baseUrlNew: 'https://api2.eliangeyun.com/',
+	baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

manifest.json

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

pages.json

@@ -387,10 +387,10 @@
 			}
 		},
 		{
-			"path": "pages/user/report",
+			"path": "pages/user/newReport",
 			"style": {
-				"navigationBarTitleText": "数据报表",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
@@ -612,6 +612,13 @@
 		},
 		{
 			"path": "pages/user/set_nickname",
+			"style": {
+				"navigationBarTitleText": "用户名",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/user/set_wechatNo",
 			"style": {
 				"navigationBarTitleText": "昵称",
 				"enablePullDownRefresh": true

pages/bill/index.vue

@@ -12,11 +12,16 @@
 					name="close-circle-fill" color="#D6D9E0"></u-icon>
 				<!-- <text @click='emptysearch' v-if='searchKeyWord.length>0' class='tip_text cuIcon-roundclosefill'></text> -->
 			</view>
-			<view style='background:#fff;padding:0 15px;border-radius:0rpx 0rpx 30rpx 30rpx;' class="Semibold">
+			<view style='background:#fff;padding:0 15px;border-radius:0rpx 0rpx 30rpx 30rpx;position:relative;' class="Semibold">
 				<view @click='tabcarchange(0)' class='line' :class='TabCur==0?"active":""'>全部</view>
 				<view @click='tabcarchange(5)' class='line' :class='TabCur==5?"active":""'>待付款</view>
 				<view @click='tabcarchange(6)' class='line' :class='TabCur==6?"active":""'>已付款</view>
+			<view style='position:absolute;right: 20px;font-weight:500;top:25%;' @click='dateshow=true'>{{datetext?datetext:'日期筛选'}}</view>
 			</view>
+			
+			<u-picker :range="dateList" range-key="value" @confirm='dateCheck($event)' v-model="dateshow"
+				mode="selector">
+			</u-picker>
 		</view>
 		<view class='wrap' v-for='item in dataInfo'>
 			<view style='margin:5px;padding:10px 0;border-bottom:1px solid #eee;'
@@ -100,7 +105,10 @@
 				show: false,
 				img: '',
 				searchType: '',
-				dataInfo: []
+				dataInfo: [],
+				dateshow:false,
+				dateList:[{value:'一个月'},{value:'三个月'},{value:'一年'}],
+				datetext:'一个月'
 			}
 		},
 		onShow() {},
@@ -134,6 +142,10 @@
 			closepop() {
 				this.show = false
 			},
+			dateCheck(e){
+				this.datetext=this.dateList[e[0]].value
+				this.loadData()
+			},
 			xiazai() {
 				const that = this;
 				uni.downloadFile({
@@ -259,6 +271,7 @@
 						managementType: 1,
 						appFlag:1,
 						customerPhone: this.userInfo.phone,
+						dateFilter:this.datetext
 						// pcFlag:1
 						// warehouseName:'',
 					}).then(res => {

pages/erpbusiness/add_quality_testing.vue

@@ -345,15 +345,7 @@
 					</view>
 					<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
 				</view>
-				<view v-show="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
-					class="c-row">
-					<view class="title">干粮单价（元/公斤）</view>
-					<view class="con-list">
-						<input v-model='gridList.dryGrainPrice' :disabled='pricedisabled'  @blur='inputprice'
-							placeholder="请输入干粮单价" name="input" type="digit"></input>
-					</view>
-					<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
-				</view>
+				
 				<view v-show="utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
 					class="c-row">
 					<view class="title">水分增价（元/吨）</view>
@@ -387,7 +379,15 @@
 							placeholder="请输入质量扣价" name="input" type="digit"></input>
 					</view>
 				</view>
-				
+				<view v-show="gridList.type == '干粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==3"
+					class="c-row">
+					<view class="title">干粮单价（元/公斤）</view>
+					<view class="con-list">
+						<input v-model='gridList.dryGrainPrice' :disabled='pricedisabled'  @blur='inputprice'
+							placeholder="请输入干粮单价" name="input" type="digit"></input>
+					</view>
+					<button class='cu-btn bg-green shadow' @click="changeprice">{{pricetext}}</button>
+				</view>
 				<view v-show="gridList.type == '潮粮'&&utils.getCurrectRoles('acquisitionQuality.initial')&&typevalue==1"
 					class="c-row">
 					<view class="title">净重单价（元/公斤）</view>
@@ -1317,24 +1317,30 @@
 					}).then(res => {
 						
 						if (that.gridList.paramType == '1') {
+							// console.log(that.gridList)
 							if(that.gridList.buckleMiscellaneous){
 								that.gridList.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that
 								.gridList.buckleMiscellaneous) / 100 * parseFloat(that.gridList
 								.dryGrainPrice)).toFixed(4)
 								that.tidalGrainPrice = parseFloat(parseFloat(res.data.data) - parseFloat(that
-									.gridList.buckleMiscellaneous) / 100 * parseFloat(that.gridList
-									.dryGrainPrice)).toFixed(4)
+								.gridList.buckleMiscellaneous) / 100 * parseFloat(that.gridList
+								.dryGrainPrice)).toFixed(4)
 							}
-							
 							if (!that.gridList.tidalGrainPrice) {
 								that.gridList.tidalGrainPrice = ''
 							}
+							if(that.gridList.type == '干粮'){
+								that.gridList.dryGrainPrice = res.data.data
+								that.dryGrainPrice = that.gridList.dryGrainPrice 
+							}
 						} else {
-							if (that.gridList.type == '干粮') {
+							that.gridList.tidalGrainPrice = res.data.data
+							if(that.gridList.type == '干粮'){
 								that.gridList.dryGrainPrice = res.data.data
-							} else {
+								that.dryGrainPrice = that.gridList.dryGrainPrice 
+							}else{
 								that.gridList.tidalGrainPrice = res.data.data
-								that.tidalGrainPrice = res.data.data
+								that.tidalGrainPrice = that.gridList.tidalGrainPrice 
 							}
 						}
 					})

pages/erpbusiness/edit_quality_testing.vue

@@ -582,6 +582,7 @@
 						that.value = false
 					}
 					that.gridList = data
+					
 					if(that.gridList.type=='干粮'){
 						if (this.gridList.goodsName &&
 							this.gridList.bulkDensity &&
@@ -798,6 +799,8 @@
 				
 			},
 			deductionchange(){
+				console.log(this.gridList.type,this.tidalGrainPrice,
+				Number(this.tidalGrainPrice+(this.gridList.waterPriceIncrease/1000)-(this.gridList.waterPriceDeduction/1000)+(this.gridList.qualityPriceIncrease/1000)-(this.gridList.qualityPriceDeduction/1000)).toFixed(3))
 				if(this.gridList.type=='干粮'){
 					if(this.dryGrainPrice!=''){
 						console.log(Number(this.dryGrainPrice+(this.gridList.waterPriceIncrease/1000)-(this.gridList.waterPriceDeduction/1000)+(this.gridList.qualityPriceIncrease/1000)-(this.gridList.qualityPriceDeduction/1000)),Number(this.dryGrainPrice+(this.gridList.waterPriceIncrease/1000)-(this.gridList.waterPriceDeduction/1000)+(this.gridList.qualityPriceIncrease/1000)-(this.gridList.qualityPriceDeduction/1000)).toFixed(2))
@@ -1031,9 +1034,21 @@
 								if (!that.gridList.tidalGrainPrice) {
 									that.gridList.tidalGrainPrice = ''
 								}
+								if(that.gridList.type == '干粮'){
+									that.gridList.dryGrainPrice = res.data.data
+									that.dryGrainPrice = that.gridList.dryGrainPrice 
+								}
 							} else {
 								that.gridList.tidalGrainPrice = res.data.data
+								if(that.gridList.type == '干粮'){
+									that.gridList.dryGrainPrice = res.data.data
+									that.dryGrainPrice = that.gridList.dryGrainPrice 
+								}else{
+									that.gridList.tidalGrainPrice = res.data.data
+									that.tidalGrainPrice = that.gridList.tidalGrainPrice 
+								}
 							}
+							// that.tidalGrainPrice = that.gridList.tidalGrainPrice
 						})
 					}
 				

pages/erpbusiness/quality_testing.vue

@@ -68,7 +68,7 @@
 						@click.stop='del(item)' class='button'>删除</view>
 					<view v-if='getRoles("acquisitionQuality.qview")&&item.status=="待初检"&&managementType==1'
 							@click.stop='edit(item,3)' class='button'>钎样</view>
-					<view v-if='getRoles("acquisitionQuality.initial")&&item.status=="待初检"&&managementType==1'
+					<view v-if='getRoles("acquisitionQuality.initial")&&(!item.waterContent||item.status=="待初检")&&managementType==1'
 						@click.stop='edit(item,0)' class='button'>初检</view>
 					<view
 						v-if='getRoles("acquisitionQuality.con")&&item.confirm!="1"&&item.status=="已复检"&&managementType==1'

pages/reimbursement/request_funds.vue

@@ -288,13 +288,17 @@
 						for (let item of chooseImageRes.tempFiles) {
 							files.push({
 								name: 'fileName',
-								uri : item.path
+								url : item.path
 							});
 						}
-						uni.uploadFile({
+						console.log(files)
+						for (let i = 0; i < files.length; i++) {
+							uni.uploadFile({
 							url: baseUrlNew + 'appendix/api/uploadFiles',
 							// url: baseUrlNew+'appendix/api/uploadFiles', //仅为示例，非真实的接口地址
-							files: files,
+							// files: files[i],
+							filePath:files[i].url,
+							name:files[i].name,
 							formData: {
 								// fileName: chooseImageRes.tempFiles[0],
 								companyId: "2710b21efc1e4393930c5dc800010dc4",
@@ -318,6 +322,8 @@
 								console.log(res);
 							}
 						});
+						}
+						
 					}
 				});
 			},

pages/task/audit/warehouse_warrant.vue

@@ -414,31 +414,30 @@
 						var arr=[]
 						if(res1.data.data.warehousingOrderList){
 							var datalist=JSON.parse(JSON.stringify(res1.data.data.warehousingOrderList))
-						}
-						var arr=[]
-						for (var i = 0; i < datalist.length; i++) {
-							if(arr.length==0){
-								arr.push(datalist[i])
-							}else{
-								var arr1=arr.filter((item)=>{return item.goodsName==datalist[i].goodsName})
-								if(arr1.length>0){
-									for (var q = 0; q < arr.length; q++) {
-										
-										if(arr[q].goodsName==datalist[i].goodsName){console.log(22222)
-											console.log(arr[q].inWarehouseWeight,datalist[i].inWarehouseWeight)
-											arr[q].inWarehouseWeight+=datalist[i].inWarehouseWeight
-											arr[q].requestFunds+=datalist[i].requestFunds
+							for (var i = 0; i < datalist.length; i++) {
+								if(arr.length==0){
+									arr.push(datalist[i])
+								}else{
+									var arr1=arr.filter((item)=>{return item.goodsName==datalist[i].goodsName})
+									if(arr1.length>0){
+										for (var q = 0; q < arr.length; q++) {
+											
+											if(arr[q].goodsName==datalist[i].goodsName){console.log(22222)
+												console.log(arr[q].inWarehouseWeight,datalist[i].inWarehouseWeight)
+												arr[q].inWarehouseWeight+=datalist[i].inWarehouseWeight
+												arr[q].requestFunds+=datalist[i].requestFunds
+											}
 										}
+									}else{
+										arr.push(datalist[i])
 									}
-								}else{
-									arr.push(datalist[i])
 								}
+								
+							}
+							for (var q = 0; q < arr.length; q++) {
+								arr[q].inWarehouseWeight=arr[q].inWarehouseWeight.toFixed(2)
+								arr[q].requestFunds=arr[q].requestFunds.toFixed(2)
 							}
-							
-						}
-						for (var q = 0; q < arr.length; q++) {
-							arr[q].inWarehouseWeight=arr[q].inWarehouseWeight.toFixed(2)
-							arr[q].requestFunds=arr[q].requestFunds.toFixed(2)
 						}
 						console.log(arr,1111111)
 						this.auditInfo.goodNameList=arr

pages/task/my_task.vue

@@ -362,6 +362,8 @@
 				var data = {}
 				if (this.statusFlag == 1) {
 					data.searchKeyword = searchKeyword
+					data.currentPage = pages
+					data.pageSize = limit
 					url = '/newNoticeTask/query/noticeTasks'
 				} else if (this.statusFlag == 3) {
 					data.currentPage = pages

pages/user/newReport.vue

@@ -0,0 +1,44 @@
+<template>
+	<view class="content">
+		<view class="header">
+			<image src="../../static/img/tjbgc.png" mode="widthFix" class="bgc"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	import maoScroll from '@/components/mao-scroll/mao-scroll.vue';
+	export default {
+		components: {
+			maoScroll
+		},
+		data() {
+			return {
+
+				background: {
+					backgroundColor: '#2E303A',
+					backgroundColor: 'red',
+				},
+
+			}
+		},
+		onLoad: function(option) {
+
+		},
+		destroyed() {
+
+		},
+		onUnload() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.bgc {
+		width: 100vw;
+	}
+</style>

pages/user/setUp.vue

@@ -14,7 +14,7 @@
 			</view>
 			<view class='cu-item' style='margin-bottom:10px;' @click="nickname(username)">
 				<view>
-					<text>昵称</text>
+					<text>用户名</text>
 				</view>
 				<view style='align-items: center;' class="flex">
 					<view class="username">
@@ -23,6 +23,17 @@
 					<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow"></image>
 				</view>
 			</view>
+			<view class='cu-item' style='margin-bottom:10px;' @click="nickname1(wechatNo)">
+				<view>
+					<text>昵称</text>
+				</view>
+				<view style='align-items: center;' class="flex">
+					<view class="username">
+						{{wechatNo}}
+					</view>
+					<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow"></image>
+				</view>
+			</view>
 			<view class='cu-item' style='margin-bottom:10px;' @click='fankui'>
 				<view>
 					<text>意见反馈</text>
@@ -100,6 +111,7 @@
 				content: '您确定要退出吗?',
 				headUrl: "../../static/img/myimg/YongHu@3x.png",
 				username: "",
+				wechatNo: '',
 				gridList: [{
 					num: 0,
 					name: '退出登录',
@@ -123,7 +135,6 @@
 				this.version = info.version;
 				console.log("当前版本为：", this.version)
 				this.checkVersion()
-			})
 			// #endif
 		},
 		onLoad() {},
@@ -152,6 +163,7 @@
 						console.log("查看--------", res)
 						if (!res.data.data.version) {
 							this.version = "当前为最新版" + this.version
+
 						} else {
 							this.version = "发现新版本，立即更新"
 						}
@@ -333,6 +345,12 @@
 					this.headUrl = "../../static/img/myimg/YongHu@3x.png"
 				}
 				this.username = this.userInfo.userName
+				if (!uni.getStorageSync('userInfo').wechatNo) {
+					this.wechatNo = this.userInfo.userName
+				} else {
+					this.wechatNo = this.userInfo.wechatNo
+				}
+
 			},
 			switchPicture() {
 				uni.navigateTo({
@@ -344,6 +362,11 @@
 					url: `/pages/user/set_nickname?nickname=${username}`
 				})
 			},
+			nickname1(username) {
+				uni.navigateTo({
+					url: `/pages/user/set_wechatNo?nickname=${username}`
+				})
+			},
 			exitlogin() {
 
 			},

pages/user/set_nickname.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="explain">
-			昵称长度限制在2-24个字符内
+			用户名长度限制在2-24个字符内
 		</view>
 		<view class="editText">
 			<input placeholder="请输入昵称" placeholder-color="#C6C6C6" name="input" v-model="nickname" class="texts"></input>

pages/user/set_wechatNo.vue

@@ -0,0 +1,144 @@
+<template>
+	<view class="container">
+		<view class="explain">
+			昵称长度限制在2-24个字符内
+		</view>
+		<view class="editText">
+			<input placeholder="请输入昵称" placeholder-color="#C6C6C6" name="input" v-model="nickname" class="texts"></input>
+		</view>
+		<view class="btn" :class="nickname.length==0?'':'btn-active'" @click="commit">
+			保存
+		</view>
+	</view>
+
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				nickname: "",
+				deptListurl: {},
+			}
+		},
+		onLoad(param) {
+			this.nickname = param.nickname
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		methods: {
+
+			commit() {
+				if (this.nickname == null || this.nickname == "") {
+					this.$api.msg('请输入昵称！')
+					return
+				}
+				if (this.nickname.length < 2 || this.nickname.length > 24) {
+					this.$api.msg('请正确输入昵称！')
+					return
+				}
+				var that = this
+				that.deptListurl.wechatNo = that.nickname
+				that.deptListurl.id = that.userInfo.id
+				that.$api.doRequest('post', '/commonUser/editUserInfo', that.deptListurl).then(
+						res => {
+							if (res.data.code == 200) {
+								uni.showToast({
+									title: '修改成功！',
+									icon: 'success',
+									duration: 2000,
+									success() {
+										setTimeout(()=>{
+											var _student = uni.getStorageSync('userInfo');
+											_student.wechatNo = that.nickname;
+											uni.setStorageSync('userInfo', _student);
+											var name = 'userInfo';
+											var value = _student;
+											that.$store.commit('$uStore', {
+												name,
+												value
+											});
+											uni.navigateBack()
+										},2000)
+									}
+								})
+							}
+						})
+					.catch(res => {
+						if(res.errmsg){
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						}
+						else{
+							uni.showToast({
+								title: "系统异常，请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					});
+
+
+
+			},
+		}
+	}
+</script>
+
+<style>
+	.container {
+		padding: 10px 0px;
+		background-color: #F5F6FA;
+	}
+
+	.explain {
+		margin-left: 16px;
+		font-size: 16px;
+		color: #6D6D72;
+		margin-top: 20px;
+	}
+
+	.editText {
+		width: 100%;
+		height: 50px;
+		background-color: #FFFFFF;
+		line-height: 50px;
+		padding-left: 20px;
+		margin-top: 10px;
+		padding-top: 12px;
+		border-top: 1px solid #C9C9CB;
+		border-bottom:1px solid #C9C9CB;
+	}
+
+	.texts {
+		line-height: 50px;
+		/* color: #C6C6C8; */
+		font-size: 16px;
+		/* placeholder-style="font-size:18px" */
+	}
+	.btn{
+		width: 90%;
+		height: 46px;
+		font-size: 17px;
+		margin:0 auto;
+		margin-top: 16px;
+		border-radius: 20px;
+		line-height: 46px;
+		font-weight: 500;
+		text-align: center;
+		background-color: #D8DAE0;
+		color: #fff;
+	}
+	.btn-active {
+		background-color: #FFFFFF;
+		color: #22C572;
+		
+	}
+</style>

pages/user/user.vue

@@ -415,7 +415,6 @@
 			}
 			// console.log("uni.getStorageSync('compName1')")
 			// console.log(uni.getStorageSync("compName1"))
-			
 			// if (uni.getStorageSync("compName1")) {
 			// 	this.haveCompany = true
 			// } else {