前端

common/helper.js

@@ -82,6 +82,94 @@ const getNowFormatDate = () => {
 	return currentdate;
 }
 
+const convertCurrency = (money) => {
+	//汉字的数字
+	var cnNums = new Array('零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖');
+	//基本单位
+	var cnIntRadice = new Array('', '拾', '佰', '仟');
+	//对应整数部分扩展单位
+	var cnIntUnits = new Array('', '万', '亿', '兆');
+	//对应小数部分单位
+	var cnDecUnits = new Array('角', '分', '毫', '厘');
+	//整数金额时后面跟的字符
+	var cnInteger = '整';
+	//整型完以后的单位
+	var cnIntLast = '元';
+	//最大处理的数字
+	var maxNum = 999999999999999.9999;
+	//金额整数部分
+	var integerNum;
+	//金额小数部分
+	var decimalNum;
+	//输出的中文金额字符串
+	var chineseStr = '';
+	//分离金额后用的数组，预定义
+	var parts;
+	if (money == '') {
+		return '';
+	}
+	money = parseFloat(money);
+	if (money >= maxNum) {
+		//超出最大处理数字
+		return '';
+	}
+	if (money == 0) {
+		chineseStr = cnNums[0] + cnIntLast + cnInteger;
+		return chineseStr;
+	}
+	//转换为字符串
+	money = money.toString();
+	if (money.indexOf('.') == -1) {
+		integerNum = money;
+		decimalNum = '';
+	} else {
+		parts = money.split('.');
+		integerNum = parts[0];
+		decimalNum = parts[1].substr(0, 4);
+	}
+	//获取整型部分转换
+	if (parseInt(integerNum, 10) > 0) {
+		var zeroCount = 0;
+		var IntLen = integerNum.length;
+		for (var i = 0; i < IntLen; i++) {
+			var n = integerNum.substr(i, 1);
+			var p = IntLen - i - 1;
+			var q = p / 4;
+			var m = p % 4;
+			if (n == '0') {
+				zeroCount++;
+			} else {
+				if (zeroCount > 0) {
+					chineseStr += cnNums[0];
+				}
+				//归零
+				zeroCount = 0;
+				chineseStr += cnNums[parseInt(n)] + cnIntRadice[m];
+			}
+			if (m == 0 && zeroCount < 4) {
+				chineseStr += cnIntUnits[q];
+			}
+		}
+		chineseStr += cnIntLast;
+	}
+	//小数部分
+	if (decimalNum != '') {
+		var decLen = decimalNum.length;
+		for (var i = 0; i < decLen; i++) {
+			var n = decimalNum.substr(i, 1);
+			if (n != '0') {
+				chineseStr += cnNums[Number(n)] + cnDecUnits[i];
+			}
+		}
+	}
+	if (chineseStr == '') {
+		chineseStr += cnNums[0] + cnIntLast + cnInteger;
+	} else if (decimalNum == '') {
+		chineseStr += cnInteger;
+	}
+	return chineseStr;
+}
+
 
 
 export default {
@@ -92,5 +180,6 @@ export default {
 	erpWarehouse,
 	getListByUserId,
 	setAudit,
-	getNowFormatDate
+	getNowFormatDate,
+	convertCurrency
 }

pages/sale/information.vue

@@ -240,40 +240,40 @@
 			});
 
 			var infoList = [];
-			uni.request({
-				url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
-				// url: "https://hq.sinajs.cn/list=C2109",
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				success: function(result) {
-					// resolve调用后，即可传递到调用方使用then或者async+await同步方式进行处理逻辑
-					var tmp = result.data.split('"')
-					for (var i = 1; i < tmp.length; i = i + 2) {
-						var list = tmp[i].split(",")
-						var data = {
-							goodsName: list[0],
-							newPrice: list[6],
-							openPrice: list[2]
-						}
-						if (data.goodsName) {
-							infoList.push(data)
-						}
-					}
-					let name = 'infoList';
-					let value = infoList;
-					that.$store.commit('$uStore', {
-						name,
-						value
-					});
-					// console.log("infoList",infoList)
-				},
-				fail: function(e) {
-					console.log('error in...')
-					// reject调用后，即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
-					reject(e)
-				},
-			})
+			// uni.request({
+			// 	url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
+			// 	// url: "https://hq.sinajs.cn/list=C2109",
+			// 	header: {
+			// 		'content-type': 'application/x-www-form-urlencoded'
+			// 	},
+			// 	success: function(result) {
+			// 		// resolve调用后，即可传递到调用方使用then或者async+await同步方式进行处理逻辑
+			// 		var tmp = result.data.split('"')
+			// 		for (var i = 1; i < tmp.length; i = i + 2) {
+			// 			var list = tmp[i].split(",")
+			// 			var data = {
+			// 				goodsName: list[0],
+			// 				newPrice: list[6],
+			// 				openPrice: list[2]
+			// 			}
+			// 			if (data.goodsName) {
+			// 				infoList.push(data)
+			// 			}
+			// 		}
+			// 		let name = 'infoList';
+			// 		let value = infoList;
+			// 		that.$store.commit('$uStore', {
+			// 			name,
+			// 			value
+			// 		});
+			// 		// console.log("infoList",infoList)
+			// 	},
+			// 	fail: function(e) {
+			// 		console.log('error in...')
+			// 		// reject调用后，即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
+			// 		reject(e)
+			// 	},
+			// })
 			uni.showTabBar()
 			this.pages = 1
 			this.isLoadMore = false

pages/sale/newsinfo.vue

@@ -71,40 +71,40 @@
 			onLoad(options) {
 				var that = this
 				var infoList = [];
-				uni.request({
-				    url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
-				    // url: "https://hq.sinajs.cn/list=C2109",
-				    header: {
-				        'content-type': 'application/x-www-form-urlencoded'
-				    },
-				    success: function(result) {
-				        // resolve调用后，即可传递到调用方使用then或者async+await同步方式进行处理逻辑
-						var tmp = result.data.split('"')
-						for(var i = 1; i<tmp.length;i=i+2){
-							var list = tmp[i].split(",")
-							var data = {
-								goodsName:list[0],
-								newPrice:list[6],
-								openPrice:list[2]
-							}
-							if(data.goodsName){
-								infoList.push(data)
-							}
-						}
-						let name = 'infoList';
-						let value = infoList;
-						that.$store.commit('$uStore', {
-							name,
-							value
-						});
-						// console.log("infoList",infoList)
-				    },
-				    fail: function(e) {
-				        console.log('error in...')
-				        // reject调用后，即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
-				        reject(e)
-				    },
-				})
+				// uni.request({
+				//     url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
+				//     // url: "https://hq.sinajs.cn/list=C2109",
+				//     header: {
+				//         'content-type': 'application/x-www-form-urlencoded'
+				//     },
+				//     success: function(result) {
+				//         // resolve调用后，即可传递到调用方使用then或者async+await同步方式进行处理逻辑
+				// 		var tmp = result.data.split('"')
+				// 		for(var i = 1; i<tmp.length;i=i+2){
+				// 			var list = tmp[i].split(",")
+				// 			var data = {
+				// 				goodsName:list[0],
+				// 				newPrice:list[6],
+				// 				openPrice:list[2]
+				// 			}
+				// 			if(data.goodsName){
+				// 				infoList.push(data)
+				// 			}
+				// 		}
+				// 		let name = 'infoList';
+				// 		let value = infoList;
+				// 		that.$store.commit('$uStore', {
+				// 			name,
+				// 			value
+				// 		});
+				// 		// console.log("infoList",infoList)
+				//     },
+				//     fail: function(e) {
+				//         console.log('error in...')
+				//         // reject调用后，即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
+				//         reject(e)
+				//     },
+				// })
 			},
 			onPageScroll(e) {
 				this.scrollTop = e.scrollTop;

pages/sale/plant.vue

@@ -113,40 +113,40 @@
 		onLoad(options) {
 			var that = this
 			var infoList = [];
-			uni.request({
-				url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
-				// url: "https://hq.sinajs.cn/list=C2109",
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				success: function(result) {
-					// resolve调用后，即可传递到调用方使用then或者async+await同步方式进行处理逻辑
-					var tmp = result.data.split('"')
-					for (var i = 1; i < tmp.length; i = i + 2) {
-						var list = tmp[i].split(",")
-						var data = {
-							goodsName: list[0],
-							newPrice: list[6],
-							openPrice: list[2]
-						}
-						if (data.goodsName) {
-							infoList.push(data)
-						}
-					}
-					let name = 'infoList';
-					let value = infoList;
-					that.$store.commit('$uStore', {
-						name,
-						value
-					});
-					// console.log("infoList",infoList)
-				},
-				fail: function(e) {
-					console.log('error in...')
-					// reject调用后，即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
-					reject(e)
-				},
-			})
+			// uni.request({
+			// 	url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
+			// 	// url: "https://hq.sinajs.cn/list=C2109",
+			// 	header: {
+			// 		'content-type': 'application/x-www-form-urlencoded'
+			// 	},
+			// 	success: function(result) {
+			// 		// resolve调用后，即可传递到调用方使用then或者async+await同步方式进行处理逻辑
+			// 		var tmp = result.data.split('"')
+			// 		for (var i = 1; i < tmp.length; i = i + 2) {
+			// 			var list = tmp[i].split(",")
+			// 			var data = {
+			// 				goodsName: list[0],
+			// 				newPrice: list[6],
+			// 				openPrice: list[2]
+			// 			}
+			// 			if (data.goodsName) {
+			// 				infoList.push(data)
+			// 			}
+			// 		}
+			// 		let name = 'infoList';
+			// 		let value = infoList;
+			// 		that.$store.commit('$uStore', {
+			// 			name,
+			// 			value
+			// 		});
+			// 		// console.log("infoList",infoList)
+			// 	},
+			// 	fail: function(e) {
+			// 		console.log('error in...')
+			// 		// reject调用后，即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
+			// 		reject(e)
+			// 	},
+			// })
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;

pages/sale/portprice.vue

@@ -102,40 +102,40 @@
 		onLoad(options) {
 			var that = this
 			var infoList = [];
-			uni.request({
-				url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
-				// url: "https://hq.sinajs.cn/list=C2109",
-				header: {
-					'content-type': 'application/x-www-form-urlencoded'
-				},
-				success: function(result) {
-					// resolve调用后，即可传递到调用方使用then或者async+await同步方式进行处理逻辑
-					var tmp = result.data.split('"')
-					for (var i = 1; i < tmp.length; i = i + 2) {
-						var list = tmp[i].split(",")
-						var data = {
-							goodsName: list[0],
-							newPrice: list[6],
-							openPrice: list[2]
-						}
-						if (data.goodsName) {
-							infoList.push(data)
-						}
-					}
-					let name = 'infoList';
-					let value = infoList;
-					that.$store.commit('$uStore', {
-						name,
-						value
-					});
-					// console.log("infoList",infoList)
-				},
-				fail: function(e) {
-					console.log('error in...')
-					// reject调用后，即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
-					reject(e)
-				},
-			})
+			// uni.request({
+			// 	url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
+			// 	// url: "https://hq.sinajs.cn/list=C2109",
+			// 	header: {
+			// 		'content-type': 'application/x-www-form-urlencoded'
+			// 	},
+			// 	success: function(result) {
+			// 		// resolve调用后，即可传递到调用方使用then或者async+await同步方式进行处理逻辑
+			// 		var tmp = result.data.split('"')
+			// 		for (var i = 1; i < tmp.length; i = i + 2) {
+			// 			var list = tmp[i].split(",")
+			// 			var data = {
+			// 				goodsName: list[0],
+			// 				newPrice: list[6],
+			// 				openPrice: list[2]
+			// 			}
+			// 			if (data.goodsName) {
+			// 				infoList.push(data)
+			// 			}
+			// 		}
+			// 		let name = 'infoList';
+			// 		let value = infoList;
+			// 		that.$store.commit('$uStore', {
+			// 			name,
+			// 			value
+			// 		});
+			// 		// console.log("infoList",infoList)
+			// 	},
+			// 	fail: function(e) {
+			// 		console.log('error in...')
+			// 		// reject调用后，即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
+			// 		reject(e)
+			// 	},
+			// })
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;

pages/task/audit/acquisition_settlement_approval.vue

@@ -8,15 +8,17 @@
 							style="height: 40rpx;"></image><!-- 驳回 -->
 						<image src="../../../static/img/tongguo.png" mode="" v-if="status == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
+							<!-- v-if="status == '审核中' || status == '待决策人审核'" -->
 						<image src="../../../static/img/daishenhe.png" mode=""
-							v-if="status == '审核中' || status == '待决策人审核'" style="height: 40rpx;"></image><!-- 待审核 -->
+							 style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
-					<view class="infoText">{{status}}</view>
+					<!-- {{auditList.length > 0 ?auditList[auditList.length - 1].operatorMajorRoleName:""}} -->
+					<view class="infoText">待决策人审核</view>
 				</view>
 				<view class="infoData">{{updateDate}}</view>
 			</view>
 		</view>
-	<!-- 	<view class='content1'>
+		<!-- 	<view class='content1'>
 			<view class='row content-item'>
 				<view class="left" style="color: #878C9C ;">仓库</view>
 				<view class="right">{{warehouseName}}</view>
@@ -36,60 +38,31 @@
 			</view>
 		</view> -->
 		<view class="content1">
-			<view class="title">
+		<!-- 	<view class="title">
 				销售外勤 张三
-			</view>
+			</view> -->
 			<view class="row">
 				<view class="left">请款金额（元）</view>
-				<view class="left">1000</view>
+				<view class="right">{{auditInfo.amountIngPayableTotal}}</view>
 			</view>
 			<view class="row">
 				<view class="left">大写</view>
-				<view class="left">1000</view>
+				<view class="right">{{auditInfo.amountIngPayableTotal1}}</view>
 			</view>
 			<view class="row">
-				<view class="left">车（数）</view>
-				<view class="left">20</view>
+				<view class="left">车数（辆）</view>
+				<view class="right">{{auditInfo.carTotal}}</view>
 			</view>
 			<view class="row">
 				<view class="left">合计重量（吨）</view>
-				<view class="left">20</view>
-			</view>
-			<view class="row">
-				<view class="left">平均单价（元吨）</view>
-				<view class="left">20</view>
-			</view>
-			<view class="row">
-				<view class="left">平均单价指标</view>
-			</view>
-			<view class="row">
-				<view class="left">容重（%）</view>
-				<view class="left">20</view>
-			</view>
-			
-			<view class="row">
-				<view class="left">水分（%）</view>
-				<view class="left">20</view>
-			</view>
-			
-			<view class="row">
-				<view class="left">杂质（%）</view>
-				<view class="left">20</view>
-			</view>
-			
-			<view class="row">
-				<view class="left">热损伤（%）</view>
-				<view class="left">20</view>
-			</view>
-			<view class="row">
-				<view class="left">霉变粒（%）</view>
-				<view class="left">20</view>
+				<view class="right">{{auditInfo.netWeightTotal}}</view>
 			</view>
 			<view class="row" style="border-bottom:0">
-				<view class="left">不完善粒（%）</view>
-				<view class="left">20</view>
+				<view class="left">平均单价（元吨）</view>
+				<view class="right">{{auditInfo.averageUnitPrice}}</view>
 			</view>
 			
+
 			<!-- <view class="row row-bottom">
 				<view class="left">水分（%）</view>
 				<input type="digit" v-model='detailData.warehouseInOutDetail.waterContent' class="right-bottom"
@@ -121,26 +94,69 @@
 					placeholder="输入不完善粒占比"></input>
 			</view> -->
 		</view>
+		<view class="content1">
+			<view class="row">
+				<view class="left titlerow">平均指标</view>
+			</view>
+			<view class="row">
+				<view class="left">容重（%）</view>
+				<view class="right">{{auditInfo.bulkDensityTotal}}</view>
+			</view>
+			
+			<view class="row">
+				<view class="left">水分（%）</view>
+				<view class="right">{{auditInfo.waterContentTotal}}</view>
+			</view>
+			
+			<view class="row">
+				<view class="left">杂质（%）</view>
+				<view class="right">{{auditInfo.impurityTotal}}</view>
+			</view>
+			
+			<view class="row">
+				<view class="left">热损伤（%）</view>
+				<view class="right">{{auditInfo.jiaorenliTotal}}</view>
+			</view>
+			<view class="row">
+				<view class="left">霉变粒（%）</view>
+				<view class="right">{{auditInfo.mildewGrainTotal}}</view>
+			</view>
+			<view class="row" style="border-bottom:0">
+				<view class="left">不完善粒（%）</view>
+				<view class="right">{{auditInfo.imperfectGrainTotal}}</view>
+			</view>
+		</view>
+		<view class="content1" v-if="url && url != 'ng'">
+			<view class="title ">
+				附件
+			</view>
+			<view class="file" @click="openXls">
+				<image src="../../../static/img/excle.png" mode="" class="img_css"></image>
+				<text class="text_css">明细.xls</text>
+			</view>
+		</view>
 		<view class="content2">
-			<view v-for="(item,index) in 4" :key='index'>
+			<view class="title row">
+			    流程
+			</view>
+			<view v-for="(item,index) in auditList" :key='index' class="audit">
 				<view class="row">
 					<view class="left">
 						<view class="item1">
 							<image :src="src" style="width: 100rpx;height: 100rpx;border-radius: 500%;"></image>
 						</view>
 						<view class="item2">
-							<view class="name">张三</view>
-							<view class="status">发起审批</view>
+							<view class="name">{{item.operatorMajorRoleName}}</view>
+							<view class="status">{{item.approved ? "已审核":"待决策人审核"}}</view>
 						</view>
-						
 					</view>
 					<view class="right">
-						02-18 10:20
+						{{item.updateDate}}
 					</view>
 				</view>
-				<view class="row-line" v-if="index!=3"></view>
+				<view class="row-line" v-if="index!= auditList.length - 1"></view>
 			</view>
-			
+
 		</view>
 		<view v-if='show' class="shade">
 			<view class="wrap">
@@ -177,7 +193,7 @@
 	export default {
 		data() {
 			return {
-				src:'https://www.uviewui.com/index/banner_1920x1080.png',
+				src: '../../../static/img/myimg/LiangShang@2x.png',
 				isSHowBtn: true,
 				height: 200,
 				autoHeight: true,
@@ -192,7 +208,11 @@
 				status: "",
 				updateDate: "",
 				warehouseName: "",
-				everyCheck: ''
+				everyCheck: '',
+				auditInfo: {},
+				id: "",
+				auditList:[],
+				url:"11",
 			}
 		},
 		onBackPress(e) {
@@ -204,6 +224,7 @@
 			}
 		},
 		onLoad(options) {
+			this.id = options.id
 			this.vesselId = options.vesselId
 			this.everyCheck = uni.getStorageSync("everyTask")
 			this.isSHowBtn = options.isShowbtn
@@ -215,16 +236,91 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			openXls(){
+				if(this.url && this.url != "ng"){
+					uni.downloadFile({
+					url: this.url,
+					success: function(res) {
+						var filePath = res.tempFilePath;
+						uni.openDocument({
+							filePath: filePath,
+							showMenu: true,
+							success: function(res) {
+								console.log('打开文档成功');
+							}
+						});
+					}
+				});
+			}	
+			},
 			getList() {
 				// /workflow/query/workflowDefinitions
-				// /workflow/query/workflowInfo
+				// /workflow/query/workflowInfo  exportPhoneData
 				this.$api.doRequest('post', '/paymentManagement/exportPhone', {
 					warehouseName: this.vesselId,
 				}).then(res1 => {
 					if (res1.data.code == 200) {
-						// this.List = res1.data.data.records
+						this.url = res1.data.data
+						// uni.downloadFile({
+						// 	url: res1.data.data,
+						// 	success: function(res1) {
+						// 		var filePath = res1.tempFilePath;
+						// 		uni.openDocument({
+						// 			filePath: filePath,
+						// 			showMenu: true,
+						// 			success: function(res1) {
+						// 				console.log('打开文档成功');
+						// 			}
+						// 		});
+						// 	}
+						// });
+						
 					}
 				})
+				this.$api.doRequest('post', '/paymentManagement/exportPhoneData', {
+					warehouseName: this.vesselId
+				}).then(res1 => {
+					if (res1.data.code == 200) {
+						this.auditInfo = res1.data.data
+						this.auditInfo.amountIngPayableTotal1 = helper.convertCurrency(this.auditInfo.amountIngPayableTotal)
+					}
+				})
+				this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+					businessCode: 'PAYMENT-MANAGEMENT-APPROVE',
+					tmpCompId: uni.getStorageSync('pcUserInfo').compId
+				}).then(res1 => {
+					this.updateDate = res1.data.data[0].updateDate 
+					// this.$api.doRequest('get', '/workflow/query/workflowInfo', {
+					// 	workflowId: res1.data.data[0].id
+					// }).then(response => {
+					// 	this.auditList = response.data.data.steps
+					// })
+					uni.showLoading({
+						title:"加载中...",
+						mask:true
+					})
+					this.$api.doRequest('get', '/commonUser/getHis', {
+						workflowId: res1.data.data[0].id,
+						 businessKey:this.id
+					}).then(response => {
+						uni.hideLoading()
+						debugger
+						this.auditList = response.data.data
+						
+						// for(var i = 0 ; i < response.data.data.length ; i++){
+						// 	if(response.data.data[i].approved){
+						// 		this.auditList.push(response.data.data[i])
+						// 	}
+						// }
+						// this.auditList = response.data.data
+						// this.auditList = response.data.data.steps
+					})
+				})
+				// this.$api.doRequest('get', '/workflow/query/workflowInfo',
+				// {workflowId:this.id}).then(res1 => {
+
+				// })
+
 			},
 			close() {
 				this.show = false
@@ -342,8 +438,8 @@
 		margin-top: 30rpx;
 		padding: 20rpx;
 		// .content-item {
-			border-radius: 20rpx;
-			background: white;
+		border-radius: 20rpx;
+		background: white;
 		// 	padding: 40rpx 20rpx;
 		// 	margin-bottom: 30rpx;
 		// }
@@ -368,52 +464,90 @@
 		// 	color: #22C572;
 		// 	font-weight: 600;
 		// }
-
 		.row {
 			display: flex;
 			justify-content: space-between;
 			border-bottom: 1px solid #EEEEEE;
-			padding:20rpx 0;
+			padding: 20rpx 0;
+
 			.right,
 			input {
 				font-size: 28rpx;
 				// color: #333333;
 			}
 		}
+		.img_css{
+			width: 50rpx;
+			height: 50rpx;
+		}
+		.file{
+			display: flex;
+			align-items: center;
+			margin: 30rpx 0 0 20rpx;
+			.text_css{
+				font-size: 30rpx;
+				margin-left: 20rpx;
+			}
+		}
+	}
+	.title{
+		font-size: 34rpx;
+		font-weight: 700;
+		// margin-bottom: 20rpx;
+		height: 70rpx;
+		border-bottom: 2rpx solid #EEEEEE;
+	}
+	.titlerow{
+		font-size: 34rpx;
+		font-weight: 700;
+		// margin-bottom: 20rpx;
+		// height: 70rpx;
+		// border-bottom: 2rpx solid #EEEEEE;
 	}
-	.content2{
+
+	.content2 {
 		background: white;
 		margin: 20rpx 0;
 		border-radius: 20rpx;
 		padding: 20rpx;
-		.row{
+
+		.row {
 			display: flex;
 			justify-content: space-between;
-			.left{
+
+			.left {
 				display: flex;
 				align-items: center;
-				.item2{
+
+				.item2 {
 					margin-left: 20rpx;
-					.name{
+
+					.name {
 						font-size: 32rpx;
 						font-weight: 800;
 					}
-					.status{
+
+					.status {
 						color: #6CC48C;
 					}
 				}
 			}
-			.right{
+
+			.right {
 				color: #B0B1B5;
+				margin-top: 10px;
 			}
-			
 		}
-		.row-line{
+
+		.row-line {
 			width: 1px;
 			height: 30px;
 			background: #F2F2F2;
 			margin: 10rpx 50rpx;
-			
+
+		}
+		.audit{
+			margin-top: 20rpx;
 		}
 	}
 

pages/task/my_task.vue

@@ -2,7 +2,8 @@
 	<view class="content">
 		<view class="content1-top">
 			<view class="search-form round">
-				<u-search placeholder-color='#AFB3BF' search-icon-color='#AFB3BF' bg-color='#F5F6F9' placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword" @search="searchKeyWord()"
+				<u-search placeholder-color='#AFB3BF' search-icon-color='#AFB3BF' bg-color='#F5F6F9'
+					placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword" @search="searchKeyWord()"
 					@custom="searchKeyWord()"></u-search>
 			</view>
 			<view class="top2">
@@ -23,12 +24,12 @@
 					<view class="title flex align-item-center">
 						<view>
 							<view v-if='statusFlag==1' class="title-row1">待审批
-								<text v-if='item.vesselId' >（{{item.vesselId}}）</text>
+								<text v-if='item.vesselId'>（{{item.vesselId}}）</text>
 							</view>
 							<view v-if='statusFlag==3' class="title-row1">已审批
 								<text v-if='item.vesselId'>（{{item.vesselId}}）</text>
 							</view>
-							
+
 							<view style='font-size:12px;color:#878C9C;'>{{item.createDate}}</view>
 						</view>
 						<text v-if='statusFlag==1' style='color:#FE6430;'>{{item.messageTitle}}</text>
@@ -78,10 +79,7 @@
 					pageSize: 10,
 					currentPage: 1
 				},
-				data: {
-					pageSize: 10,
-					currentPage: 1
-				},
+				data: {},
 				keyword: "",
 				copyTaskInfo: []
 			};
@@ -89,7 +87,7 @@
 		onBackPress(e) {
 			if (uni.getStorageSync("everyTask")) {
 				uni.switchTab({
-				    url: '/pages/user/user'
+					url: '/pages/user/user'
 				});
 				return true
 			}
@@ -107,10 +105,9 @@
 						item.itemUrl = '/pages/task/procurement_details?id=' + item.businessId
 					} else if (item.businessCode == 'SALE-ORDER-APPROVE') {
 						item.itemUrl = '/pages/task/sale_details?id=' + item.businessId
-					}
-					 else if (item.businessCode == 'DAISHOU-CONTRACT-APPROVE') {
-					 	item.itemUrl = '/pages/task/audit/daishou_details?id=' + item.businessId
-					 }else if (item.businessCode == 'SALE-CONTRACT-APPROVE') {
+					} else if (item.businessCode == 'DAISHOU-CONTRACT-APPROVE') {
+						item.itemUrl = '/pages/task/audit/daishou_details?id=' + item.businessId
+					} else if (item.businessCode == 'SALE-CONTRACT-APPROVE') {
 						item.itemUrl = '/pages/task/audit/salecontract?id=' + item.businessId
 					} else if (item.businessCode == 'BUY-CONTRACT-APPROVE') {
 						item.itemUrl = '/pages/task/audit/purchasecontract?id=' + item.businessId
@@ -161,20 +158,19 @@
 						} else {
 							item.itemUrl = `/pages/task/audit/freight_setting_details?id=` + item.businessId
 						}
-					}else if (item.businessCode == 'ACQUISITION-SETTLEMENT-APPRPVE') {//库点收购
+					} else if (item.businessCode == 'ACQUISITION-SETTLEMENT-APPRPVE') { //库点收购
 						if (this.statusFlag == 1) {
 							item.itemUrl = `/pages/task/audit/acquisition_information_approval?id=` + item.businessId
 						} else {
 							item.itemUrl = `/pages/task/audit/acquisition_information_details?id=` + item.businessId
 						}
-					}else if (item.businessCode == 'TRADE-WAREHOUSE-REPORT') {//贸易服务
+					} else if (item.businessCode == 'TRADE-WAREHOUSE-REPORT') { //贸易服务
 						if (this.statusFlag == 1) {
 							item.itemUrl = `/pages/task/audit/tradeServices_audit?id=` + item.businessId
 						} else {
 							item.itemUrl = `/pages/task/audit/tradeServices_audit_approval?id=` + item.businessId
 						}
-					}
-					else if (item.businessCode == 'COLLECTION-WAREHOUSING-RECORD') {
+					} else if (item.businessCode == 'COLLECTION-WAREHOUSING-RECORD') {
 						if (this.statusFlag == 1) {
 							item.itemUrl = `/pages/task/audit/collection_business_approval?id=` + item.businessId
 						} else {
@@ -240,15 +236,17 @@
 			// this.warehouseInOutInfo.phone = this.userInfo.phone
 		},
 		onReachBottom() { //上拉触底函数
-			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
-				this.pages += 1
-				if (this.statusFlag == 1) {
-					this.warehouseInOutInfo.currentPage += 1
-				} else {
-					this.data.currentPage += 1
-				}
+			if (this.statusFlag == 3) {
+				if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+					this.pages += 1
+					if (this.statusFlag == 1) {
+						this.warehouseInOutInfo.currentPage += 1
+					} else {
+						this.data.currentPage += 1
+					}
 
-				this.getIndexBuyData()
+					this.getIndexBuyData()
+				}
 			}
 		},
 		// onLoad(options) {
@@ -330,7 +328,6 @@
 							})
 							uni.hideLoading(this.taskInfo, "信息")
 						}
-						console.log()
 					}).catch(res => {
 					uni.showToast({
 						title: res.data.message,
@@ -340,7 +337,8 @@
 					uni.hideLoading()
 				})
 			},
-			getIndexBuyData(status) {debugger
+			getIndexBuyData(status) {
+				debugger
 				const that = this
 				var pages = that.pages
 				var limit = that.limit
@@ -350,14 +348,16 @@
 				})
 				var data = {}
 				if (this.statusFlag == 1) {
-					data = this.warehouseInOutInfo
+					// data = this.warehouseInOutInfo
 					url = '/newNoticeTask/query/noticeTasks'
 				} else {
-					data = this.data
+					data.currentPage = pages
+					data.pageSize = limit
+					data.roleId = this.userInfo.roleIds
+					data.userId = this.userInfo.id
 					url = '/commonUser/query/findHisPageNoticeTasks'
 				}
-				data.currentPage = pages
-				data.pageSize = limit
+
 
 				//this.warehouseInOutInfo.status = this.status
 				this.$api.doRequest('get', url, data).then(res => {
@@ -390,7 +390,7 @@
 							// 	_str.showRow = false
 							// }.split(' ')[0]
 							this.taskInfo[i].department = this.taskInfo[i].messageTitle
-							if(this.taskInfo[i].messageContent.split(' ').length > 1){
+							if (this.taskInfo[i].messageContent.split(' ').length > 1) {
 								this.taskInfo[i].messageContent = this.taskInfo[i].messageContent.split(' ')[1]
 							}
 							if (this.taskInfo[i].businessType == 'WAREHOUSE') {
@@ -434,11 +434,11 @@
 								if (this.taskInfo[i].businessCode == 'TRAN-TASK-APPROVE') {
 									this.taskInfo[i].messageTitle = '运费设置'
 								}
-							}else if (this.taskInfo[i].businessType == 'ACQ') {
+							} else if (this.taskInfo[i].businessType == 'ACQ') {
 								if (this.taskInfo[i].businessCode == 'ACQUISITION-SETTLEMENT-APPRPVE') {
 									this.taskInfo[i].messageTitle = '收购信息审核'
 								}
-							}else if (this.taskInfo[i].businessType == 'TRADE') {
+							} else if (this.taskInfo[i].businessType == 'TRADE') {
 								if (this.taskInfo[i].businessCode == 'TRADE-WAREHOUSE-REPORT') {
 									this.taskInfo[i].messageTitle = '贸易服务审核'
 								}
@@ -492,16 +492,15 @@
 					uni.navigateTo({
 						url: '/pages/task/audit/salecontract?id=' + item.businessId + "&isShowbtn=true"
 					})
-				} 
-				else if (item.businessCode == 'DAISHOU-CONTRACT-APPROVE') {
+				} else if (item.businessCode == 'DAISHOU-CONTRACT-APPROVE') {
 					uni.navigateTo({
 						url: '/pages/task/audit/daishou_details?id=' + item.businessId + "&isShowbtn=true"
 					})
-				}else if (item.businessCode == 'DAICHU-CONTRACT-APPROVE') {
+				} else if (item.businessCode == 'DAICHU-CONTRACT-APPROVE') {
 					uni.navigateTo({
 						url: '/pages/task/audit/daichu_details?id=' + item.businessId + "&isShowbtn=true"
 					})
-				}else if (item.businessCode == 'BUY-CONTRACT-APPROVE') {
+				} else if (item.businessCode == 'BUY-CONTRACT-APPROVE') {
 					uni.navigateTo({
 						url: '/pages/task/audit/purchasecontract?id=' + item.businessId + "&isShowbtn=true"
 					})
@@ -534,12 +533,13 @@
 				} else if (item.businessCode == 'PAYMENT-MANAGEMENT-APPROVE') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
-							url: `/pages/task/audit/acquisition_settlement_approval?vesselId=${item.vesselId}`
+							url: `/pages/task/audit/acquisition_settlement_approval?vesselId=${item.vesselId}&id=${item.businessId}`
 						})
 
 					} else {
 						uni.navigateTo({
-							url: '/pages/task/audit/acquisition_settlement_details?id=' + item.businessId +'&isShowbtn=true'
+							url: '/pages/task/audit/acquisition_settlement_details?id=' + item.businessId +
+								'&isShowbtn=true'
 						})
 					}
 				} else if (item.businessCode == 'INOUTTASK-TASK-APPROVE') {
@@ -592,7 +592,7 @@
 								"&isShowbtn=true"
 						})
 					}
-				}else if (item.businessCode == 'TRAN-TEAM-APPROVE') {
+				} else if (item.businessCode == 'TRAN-TEAM-APPROVE') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
 							url: `/pages/task/audit/freight_setting_approval?id=` + item.businessId +
@@ -604,20 +604,22 @@
 								"&isShowbtn=true"
 						})
 					}
-				}else if (item.businessCode == 'ACQUISITION-SETTLEMENT-APPRPVE') {
+				} else if (item.businessCode == 'ACQUISITION-SETTLEMENT-APPRPVE') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
-							url: `/pages/task/audit/acquisition_information_approval?id=` + item.businessId + "&isShowbtn=true"
+							url: `/pages/task/audit/acquisition_information_approval?id=` + item.businessId +
+								"&isShowbtn=true"
 						})
 					} else {
 						uni.navigateTo({
-							url: `/pages/task/audit/acquisition_information_details?id=` + item.businessId + "&isShowbtn=true"
+							url: `/pages/task/audit/acquisition_information_details?id=` + item.businessId +
+								"&isShowbtn=true"
 						})
 					}
-				}else if (item.businessCode == 'TRADE-WAREHOUSE-REPORT') {
+				} else if (item.businessCode == 'TRADE-WAREHOUSE-REPORT') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
-							url: `/pages/task/audit/tradeServices_audit?id=` + item.businessId 
+							url: `/pages/task/audit/tradeServices_audit?id=` + item.businessId
 						})
 					} else {
 						uni.navigateTo({
@@ -627,15 +629,17 @@
 				} else if (item.businessCode == 'COLLECTION-WAREHOUSING-RECORD') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
-							url: `/pages/task/audit/collection_business_approval?id=` + item.businessId + "&isShowbtn=true"
+							url: `/pages/task/audit/collection_business_approval?id=` + item.businessId +
+								"&isShowbtn=true"
 						})
 					} else {
 						uni.navigateTo({
-							url: `/pages/task/audit/collection_business_details?id=` + item.businessId + "&isShowbtn=true"
+							url: `/pages/task/audit/collection_business_details?id=` + item.businessId +
+								"&isShowbtn=true"
 						})
 					}
-				} 
-				
+				}
+
 				if (item.taskType == "入库任务") {
 
 					if (item.statusFlag == 3) {
@@ -664,6 +668,10 @@
 </script>
 
 <style lang="scss" scoped>
+	.content {
+		padding-bottom: 50rpx;
+	}
+
 	.tag {
 		background: #F5F6F9;
 		padding: 5px;
@@ -775,8 +783,8 @@
 
 	.title-row1 {
 		font-size: 34rpx;
-		font-weight:600;
-		
+		font-weight: 600;
+
 	}
 
 	.row2 {

pages/user/contractLook/inventoryCost.vue

@@ -155,7 +155,6 @@
 				this.isShowDetailBtn = true
 			},
 			init() {
-				debugger
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 				} else {

pages/user/report.vue

@@ -18,10 +18,10 @@
 			</view>
 			<view class="row3">
 				<view class="title">
-					总收入
+					{{moneyList[typeSelect].name}}
 				</view>
 				<view class="number">
-					核算中
+					{{moneyList[typeSelect].count}}元
 				</view>
 			</view>
 		</view>
@@ -78,7 +78,7 @@
 				</view>
 				<view class="row3" @click="goToPage(2)">
 					<view class="top">
-						合同总额
+						开票情况
 					</view>
 					<view class="bottom">
 						<view class="left">
@@ -116,7 +116,7 @@
 				</view>
 				<view class="row4" @click="goToPage(3)">
 					<view class="top">
-						合同总额
+						结算情况
 					</view>
 					<view class="bottom">
 						<view class="left">
@@ -142,11 +142,11 @@
 									已结算
 									<view class="number">{{dataObj2.percentage}}</view>
 								</view>
-								<view class="right-number">￥{{dataObj5.total}}</view>
+								<view class="right-number">￥{{dataObj2.total}}</view>
 							</view>
 							<view class="bottom">
 								<u-line-progress height="12" active-color="#5C75DF" :show-percent="false"
-									:striped="true" :percent="dataObj5.percent" :striped-active="true">
+									:striped="true" :percent="dataObj2.percent" :striped-active="true">
 								</u-line-progress>
 							</view>
 						</view>
@@ -274,8 +274,8 @@
 				inventoryTC: 0,
 				contractSelect: '0',
 				url: '',
-				nowDate: '2022年全年',
-				seachMoth: '2021',
+				nowDate: '2022年1月',
+				seachMoth: '2022',
 				background: {
 					backgroundColor: '#2E303A',
 				},
@@ -326,19 +326,13 @@
 					percentage: ''
 				},
 				dateList: [
-					[{
-							value: '1',
-							label: '2021年'
-						},
+					[
 						{
 							value: '2',
 							label: '2022年'
 						}
 					],
-					[{
-							value: '0',
-							label: '全年'
-						},
+					[
 						{
 							value: '01',
 							label: '1月'
@@ -387,6 +381,10 @@
 							value: '12',
 							label: '12月'
 						},
+						{
+							value: '0',
+							label: '全年'
+						},
 					]
 				],
 				ztList: [],
@@ -401,8 +399,8 @@
 				title: "数据加载中...",
 				mask: true
 			})
-			if (this.nowDate == '2022年全年') {
-				this.seachMoth = '2022'
+			if (this.nowDate == '2022年1月') {
+				this.seachMoth = '2022-01'
 			}
 			this.init()
 		},
@@ -785,7 +783,11 @@
 								obj.endName = obj.name.split('→')[1]
 							}
 							this.ztList = res.data.data[i].biViewInfoList
-							// this.prizeScroll();
+						}
+						else if (i == 10) {
+							uni.hideLoading()
+							this.moneyList = res.data.data[i].biViewInfoList
+							console.log('收入',this.moneyList)
 						}
 					}
 					this.chartlist = _list
@@ -824,6 +826,10 @@
 				}, 10)
 			},
 			confirm(e) {
+				uni.showLoading({
+					title:"加载中",
+					mask:true
+				})
 				console.log(e)
 				this.nowDate = e[0].label + e[1].label
 				let _year = e[0].label.substring(0, 4)
@@ -845,6 +851,7 @@
 			htClick(index) {
 				// this.itemSelect = index
 				this.contractSelect = index
+				
 			}
 		}
 	}

websocket_sdk.js

@@ -380,40 +380,40 @@ export default class Websocket {
 			var hour = new Date().getHours();
 			if((hour >= 9 && hour < 12) ||(hour >= 13 && hour < 15)){
 				var infoList = [];
-				uni.request({
-				    url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
-				    // url: "https://hq.sinajs.cn/list=C2109",
-				    header: {
-				        'content-type': 'application/x-www-form-urlencoded'
-				    },
-				    success: function(result) {
-				        // resolve调用后，即可传递到调用方使用then或者async+await同步方式进行处理逻辑
-						var tmp = result.data.split('"')
-						for(var i = 1; i<tmp.length;i=i+2){
-							var list = tmp[i].split(",")
-							var data = {
-								goodsName:list[0],
-								newPrice:list[6],
-								openPrice:list[2]
-							}
-							if(data.goodsName){
-								infoList.push(data)
-							}
-						}
-						let name = 'infoList';
-						let value = infoList;
-						store.commit('$uStore', {
-							name,
-							value
-						});
-						// console.log("infoList",infoList)
-				    },
-				    fail: function(e) {
-				        console.log('error in...')
-				        // reject调用后，即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
-				        reject(e)
-				    },
-				})
+				// uni.request({
+				//     url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
+				//     // url: "https://hq.sinajs.cn/list=C2109",
+				//     header: {
+				//         'content-type': 'application/x-www-form-urlencoded'
+				//     },
+				//     success: function(result) {
+				//         // resolve调用后，即可传递到调用方使用then或者async+await同步方式进行处理逻辑
+				// 		var tmp = result.data.split('"')
+				// 		for(var i = 1; i<tmp.length;i=i+2){
+				// 			var list = tmp[i].split(",")
+				// 			var data = {
+				// 				goodsName:list[0],
+				// 				newPrice:list[6],
+				// 				openPrice:list[2]
+				// 			}
+				// 			if(data.goodsName){
+				// 				infoList.push(data)
+				// 			}
+				// 		}
+				// 		let name = 'infoList';
+				// 		let value = infoList;
+				// 		store.commit('$uStore', {
+				// 			name,
+				// 			value
+				// 		});
+				// 		// console.log("infoList",infoList)
+				//     },
+				//     fail: function(e) {
+				//         console.log('error in...')
+				//         // reject调用后，即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
+				//         reject(e)
+				//     },
+				// })
 			}
 		})
 	}