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

config/index.js

@@ -3,7 +3,7 @@ const dev = {
 	// baseUrl: 'http://localhost:8080/',
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
-	// baseUrlNew: 'http://192.168.110.9:9888/',
+	baseUrlNew: 'http://192.168.110.9:9888/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	 baseUrlNew: 'http://192.168.110.82:8090/',

manifest.json

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

pages/reimbursement/request_funds.vue

@@ -233,7 +233,7 @@
 							// url: baseUrlNew+'appendix/api/uploadFiles', //仅为示例，非真实的接口地址
 							files: files,
 							formData: {
-								fileName: chooseImageRes.tempFiles[0],
+								// fileName: chooseImageRes.tempFiles[0],
 								companyId: "2710b21efc1e4393930c5dc800010dc4",
 								modelId: '',
 								vesselId: '',

pages/task/audit/salecontract.vue

@@ -38,20 +38,21 @@
 			<u-form-item label-width='260' :borderBottom="false" label="卖方电话">
 				<u-input v-model="list.sellerPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合营方" :borderBottom="false" v-if="list.seller">
+			<u-form-item label-width='260' label="合营方" :borderBottom="false" v-show="list.jointVentureParties">
 				<u-input v-model="list.jointVentureParties" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' label="合营方电话" :borderBottom="false" v-if="list.sellerPhone">
+			<u-form-item label-width='260' label="合营方电话" :borderBottom="false" v-show="list.jointPhone">
 				<u-input v-model="list.jointPhone" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="中转公司" v-if="list.transitCompany">
+			<u-form-item label-width='260' :borderBottom="false" label="中转公司">
 				<u-input v-model="list.transitCompany" input-align="right" placeholder="--" disabled />
-			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="交货日期（起 - 止）">
+			</u-form-item> 
+			<u-form-item label-width='260' :borderBottom="false" label="交货日期（起 - 止）" v-show="list.deliveryDateStart">
 			   <view class="textCss">
 			   	{{list.deliveryDateStart }} ~ {{list.deliveryDateEnd}}
 			   </view> 
 			</u-form-item>
+			
 			<!-- <u-form-item label-width='260' :borderBottom="false" label="交货日期（止）">
 				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="--" disabled />
 			</u-form-item> -->
@@ -64,47 +65,47 @@
 			<u-form-item label-width='260' :borderBottom="false" label="合同单价（元/吨）">
 				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="货源所在地区" v-if="list.sourceProvince">
+			<u-form-item label-width='260' :borderBottom="false" label="货源所在地区" v-show="list.sourceProvince">
 				<view class="textCss">
 					{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
 				</view>
 			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="货源详细地址" v-if="list.sourceGoods">
+			<u-form-item label-width='260' :borderBottom="false" label="货源详细地址" v-show="list.sourceGoods">
 				<u-input v-model="list.sourceGoods" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="交货地所在地区" v-if="list.deliveryProvince">
+			<u-form-item label-width='260' :borderBottom="false" label="交货地所在地区" v-show="list.deliveryProvince">
 				<view class="textCss">
 					{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
 				</view>
 			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="交货地详细地址" v-if="list.placeDelivery">
+			<u-form-item label-width='260' :borderBottom="false" label="交货地详细地址" v-show="list.placeDelivery">
 				<u-input v-model="list.placeDelivery" input-align="right" placeholder="--" disabled />
 			</u-form-item>
 			<u-form-item label-width='300' :borderBottom="false" label="最终实际交易量（吨）">
 				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='300' :borderBottom="false" label="结算单价（元/吨）" v-if="list.settlementPrice">
+			<u-form-item label-width='300' :borderBottom="false" label="结算单价（元/吨）" v-show="list.settlementPrice">
 				<u-input v-model="list.settlementPrice" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="合同收入（元）" v-if="list.contractProcessInfo.goodsNameKey">
+			<u-form-item label-width='260' :borderBottom="false" label="合同收入（元）" v-show="list.contractProcessInfo.goodsNameKey">
 				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="已开发票（元）" v-if="list.contractProcessInfo.goodsName">
+			<u-form-item label-width='260' :borderBottom="false" label="已开发票（元）" v-show="list.contractProcessInfo.goodsName">
 				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="费用支出（元）" v-if="list.contractProcessInfo.waterContent">
+			<u-form-item label-width='260' :borderBottom="false" label="费用支出（元）" v-show="list.contractProcessInfo.waterContent">
 				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="未开发票（元）" v-if="list.contractProcessInfo.impurity">
+			<u-form-item label-width='260' :borderBottom="false" label="未开发票（元）" v-show="list.contractProcessInfo.impurity">
 				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="未回款（元）" v-if="list.contractProcessInfo.mildewGrain">
+			<u-form-item label-width='260' :borderBottom="false" label="未回款（元）" v-show="list.contractProcessInfo.mildewGrain">
 				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="双章原件回收情况" v-if="list.contractProcessInfo.grade">
+			<u-form-item label-width='260' :borderBottom="false" label="双章原件回收情况" v-show="list.contractProcessInfo.grade">
 				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="--" disabled />
 			</u-form-item>
-			<u-form-item label-width='260' :borderBottom="false" label="备注信息" v-if="list.contractProcessInfo.grade">
+			<u-form-item label-width='260' :borderBottom="false" label="备注信息" v-show="list.contractProcessInfo.grade">
 			</u-form-item>
 			<!-- <view class="form_top">备注信息</view> -->
 			<u-form-item>

pages/task/audit/viewDetail.vue

@@ -20,10 +20,10 @@
 			<!-- </view> -->
 			<view class="data_top_css">
 				<u-row customStyle="margin-bottom: 10px" class="row_css">
-					<u-col span="3">
+					<u-col span="2">
 						<view class="demo-layout title_name">车牌号</view>
 					</u-col>
-					<u-col span="3">
+					<u-col span="4">
 						<view class="demo-layout value_css" >{{item.carNo?item.carNo:'--'}}</view>
 					</u-col>
 					<u-col span="3">

pages/task/audit/warehouse_warrant_detail.vue

@@ -61,7 +61,7 @@
 			<view class="title ">
 				支付明细
 			</view>
-			<view class="mx-content" v-for="item in auditInfo.warehousingOrderList">
+			<view class="mx-content" v-for="item in auditInfo.warehousingOrderList" @click="detailed">
 				<view class='flex align-center justify-between'>
 					<view class="name">
 						{{item.customer}}
@@ -247,6 +247,12 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			detailed(){
+				let obj = JSON.stringify(this.auditInfo.warehousingOrderList)
+					uni.navigateTo({
+						url: '/pages/task/audit/viewDetail?data='+obj
+					});
+			},
 			showcontent(item){
 				item.showflow=!item.showflow
 			},

pages/user/report.vue

@@ -26,7 +26,7 @@
 			</view>
 		</view>
 		<view class="move-content">
-			
+
 			<view class="content2 content-wrap">
 				<view class="row1">
 					<view class="left title">
@@ -213,7 +213,7 @@
 				<qiun-data-charts type="column" class='line-chart' :chartData="carChartData" :opts='ringoptions'
 					background="none" />
 			</view>
-			
+
 			<!-- <view class="content6 content-wrap">
 				<view class="title">库点流向分布</view>
 				<u-line color="#EEEEEE" class="u-line" />
@@ -326,14 +326,11 @@
 					percentage: ''
 				},
 				dateList: [
-					[
-						{
-							value: '2',
-							label: '2022年'
-						}
-					],
-					[
-						{
+					[{
+						value: '2',
+						label: '2022年'
+					}],
+					[{
 							value: '01',
 							label: '1月'
 						},
@@ -437,9 +434,9 @@
 			init() {
 				this.url = "https://liangxin.zthymaoyi.com/map_0105.html?id=" + uni.getStorageSync('pcUserInfo').compId +
 					'&seachMoth=' + this.seachMoth
-				this.$api.doRequest('get', '/biInfoController/selectBiInfo?compId=' + uni.getStorageSync('pcUserInfo')
+				this.$api.doRequest('get', '/biInfoController//selectBiInfoNew?compId=' + uni.getStorageSync('pcUserInfo')
 					.compId + '&seachMoth=' + this.seachMoth).then(res => {
-					// console.log(res)
+					console.log("数据报表", res)
 					uni.hideLoading()
 					let _list = []
 					this.dataList = res.data.data
@@ -451,43 +448,323 @@
 						let _name = ''
 						let _count = ''
 						let _data = []
+						let _x = []
+						let _y = []
 						if (i < 6) {
-							res.data.data[i].biViewInfoList[0].percent = Number(res.data.data[i].biViewInfoList[0]
-								.percentage.substring(0, res.data.data[i].biViewInfoList[0].percentage.length -
-									1)).toFixed(2)
-							res.data.data[i].biViewInfoList[0].percentage = Number(res.data.data[i].biViewInfoList[
-									0]
-								.percentage.substring(0, res.data.data[i].biViewInfoList[0].percentage.length -
-									1)).toFixed(2) + '%'
+							if (res.data.data[i].biViewInfoList[0].percentage) {
+								res.data.data[i].biViewInfoList[0].percent = Number(res.data.data[i]
+									.biViewInfoList[0]
+									.percentage.substring(0, res.data.data[i].biViewInfoList[0].percentage
+										.length -
+										1)).toFixed(2)
+								res.data.data[i].biViewInfoList[0].percentage = Number(res.data.data[i]
+									.biViewInfoList[
+										0]
+									.percentage.substring(0, res.data.data[i].biViewInfoList[0].percentage
+										.length -
+										1)).toFixed(2) + '%'
+
+							}
 							res.data.data[i].total = Number(res.data.data[i].total).toFixed(2)
 							switch (i) {
 								case 0:
-									this.dataObj0 = {
-										percentage: res.data.data[i].biViewInfoList[0].percentage,
-										total: res.data.data[i].total,
-										percent: Number(res.data.data[i].biViewInfoList[0].percent)
+									// this.dataObj0 = {
+									// 	percentage: res.data.data[i].biViewInfoList[0].percentage,
+									// 	total: res.data.data[i].total,
+									// 	percent: Number(res.data.data[i].biViewInfoList[0].percent)
+									// }
+									this.carCount1 = res.data.data[i].biViewInfoList[0] ? res.data.data[i]
+										.biViewInfoList[0].count : ""
+									this.carCount2 = res.data.data[i].biViewInfoList[1] ? res.data.data[i]
+										.biViewInfoList[1].count : ""
+									this.carCount3 = res.data.data[i].biViewInfoList[2] ? res.data.data[i]
+										.biViewInfoList[2].count : ""
+
+									
+									for (let k = 0; k < res.data.data[i].biViewInfoList.length; k++) {
+										_x.push(res.data.data[i].biViewInfoList[k].name)
+										_y.push(Number(res.data.data[i].biViewInfoList[k].count))
+									}
+									this.carChartData = {
+										categories: _x,
+										series: [{
+											"name": '车辆',
+											"data": _y
+										}]
+									}
+									this.ringoptions = {
+										"type": "column",
+										"canvasId": "",
+										"canvas2d": false,
+										"background": "none",
+										"animation": true,
+										"timing": "easeOut",
+										"duration": 1000,
+										"color": [
+											"#22C572"
+										],
+										"padding": [
+											15,
+											15,
+											0,
+											5
+										],
+										"rotate": false,
+										"errorReload": true,
+										"fontSize": 13,
+										"fontColor": "#666666",
+										"enableScroll": false,
+										"touchMoveLimit": 60,
+										"enableMarkLine": false,
+										"dataLabel": true,
+										"dataPointShape": true,
+										"dataPointShapeType": "solid",
+										"tapLegend": true,
+										"xAxis": {
+											"disabled": false,
+											"axisLine": false,
+											"axisLineColor": "#CCCCCC",
+											"calibration": false,
+											"fontColor": "#666666",
+											"fontSize": 13,
+											"rotateLabel": false,
+											"itemCount": 5,
+											"boundaryGap": "center",
+											"disableGrid": true,
+											"gridColor": "#CCCCCC",
+											"gridType": "solid",
+											"dashLength": 4,
+											"gridEval": 1,
+											"scrollShow": false,
+											"scrollAlign": "left",
+											"scrollColor": "#A6A6A6",
+											"scrollBackgroundColor": "#EFEBEF",
+											"format": ""
+										},
+										"yAxis": {
+											"disabled": true,
+											"disableGrid": true,
+											"splitNumber": 5,
+											"gridType": "solid",
+											"dashLength": 8,
+											"gridColor": "#CCCCCC",
+											"padding": 10,
+											"showTitle": false,
+											"data": []
+										},
+										"legend": {
+											"show": false,
+											"position": "bottom",
+											"float": "center",
+											"padding": 5,
+											"margin": 5,
+											"backgroundColor": "rgba(0,0,0,0)",
+											"borderColor": "rgba(0,0,0,0)",
+											"borderWidth": 0,
+											"fontSize": 13,
+											"fontColor": "#666666",
+											"lineHeight": 11,
+											"hiddenColor": "#CECECE",
+											"itemGap": 10
+										},
+										"extra": {
+											"column": {
+												"type": "group",
+												"width": 30,
+												"seriesGap": 2,
+												"categoryGap": 3,
+												"barBorderCircle": true,
+												"linearType": "none",
+												"linearOpacity": 1,
+												"colorStop": 0,
+												"meterBorder": 1,
+												"meterFillColor": "#FFFFFF",
+												"activeBgColor": "#000000",
+												"activeBgOpacity": 0.08,
+												"meterBorde": 1
+											},
+											"tooltip": {
+												"showBox": true,
+												"showArrow": true,
+												"showCategory": false,
+												"borderWidth": 0,
+												"borderRadius": 0,
+												"borderColor": "#000000",
+												"borderOpacity": 0.7,
+												"bgColor": "#000000",
+												"bgOpacity": 0.7,
+												"gridType": "solid",
+												"dashLength": 4,
+												"gridColor": "#CCCCCC",
+												"fontColor": "#FFFFFF",
+												"splitLine": true,
+												"horizentalLine": false,
+												"xAxisLabel": false,
+												"yAxisLabel": false,
+												"labelBgColor": "#FFFFFF",
+												"labelBgOpacity": 0.7,
+												"labelFontColor": "#666666"
+											},
+											"markLine": {
+												"type": "solid",
+												"dashLength": 4,
+												"data": []
+											}
+										}
 									}
 									break;
 								case 1:
-									this.dataObj1 = {
-										percentage: res.data.data[i].biViewInfoList[0].percentage,
-										total: Number(res.data.data[i].total),
-										percent: Number(res.data.data[i].biViewInfoList[0].percent)
-									}
+									// this.dataObj1 = {
+									// 	percentage: res.data.data[i].biViewInfoList[0].percentage,
+									// 	total: Number(res.data.data[i].total),
+									// 	percent: Number(res.data.data[i].biViewInfoList[0].percent)
+									// }
+									this.inventoryAct = Number(res.data.data[i].biViewInfoList[0].count).toFixed(2)
+									this.inventoryBuy = Number(res.data.data[i].biViewInfoList[1].count).toFixed(2)
+									this.inventorySale = Number(res.data.data[i].biViewInfoList[2].count).toFixed(2)
+									this.inventoryTC = Number(Number(this.inventoryAct) + Number(this.inventoryBuy) -
+										Number(this.inventorySale)).toFixed(2)
 									break;
 								case 2:
-									this.dataObj2 = {
-										percentage: res.data.data[i].biViewInfoList[0].percentage,
-										total: Number(res.data.data[i].total),
-										percent: Number(res.data.data[i].biViewInfoList[0].percent)
+									// this.dataObj2 = {
+									// 	percentage: res.data.data[i].biViewInfoList[0].percentage,
+									// 	total: Number(res.data.data[i].total),
+									// 	percent: Number(res.data.data[i].biViewInfoList[0].percent)
+									// }
+									// let _x = []
+									// let _y = []
+									if (res.data.data[i].biViewInfoList) {
+										for (let k = 0; k < res.data.data[i].biViewInfoList.length; k++) {
+											if (Number(res.data.data[i].biViewInfoList[k].count).toFixed(2) != 0) {
+												_x.push(res.data.data[i].biViewInfoList[k].name)
+												_y.push(Number(res.data.data[i].biViewInfoList[k].count).toFixed(2))
+											}
+										}
+									}
+									this.chartData = {
+										categories: _x,
+										series: [{
+											"name": '储量',
+											"data": _y
+										}]
+									}
+									this.zringoptions = {
+										"type": "line",
+										"canvasId": "",
+										"canvas2d": false,
+										"background": "none",
+										"animation": true,
+										"timing": "easeOut",
+										"duration": 1000,
+										"color": [
+											"#91CB74",
+										],
+										"padding": [
+											15,
+											10,
+											0,
+											15
+										],
+										"rotate": false,
+										"errorReload": true,
+										"fontSize": 13,
+										"fontColor": "#666666",
+										"enableScroll": true,
+										"touchMoveLimit": 60,
+										"enableMarkLine": true,
+										"dataLabel": true,
+										"dataPointShape": true,
+										"dataPointShapeType": "hollow",
+										"tapLegend": true,
+										"xAxis": {
+											"disabled": false,
+											"axisLine": false,
+											"axisLineColor": "#CCCCCC",
+											"calibration": false,
+											"fontColor": "#666666",
+											"fontSize": 13,
+											"rotateLabel": false,
+											"itemCount": 4,
+											"boundaryGap": "center",
+											"disableGrid": false,
+											"gridColor": "#CCCCCC",
+											"gridType": "dash",
+											"dashLength": 4,
+											"gridEval": 1,
+											"scrollShow": false,
+											"scrollAlign": "left",
+											"scrollColor": "#A6A6A6",
+											"scrollBackgroundColor": "#EFEBEF",
+											"format": ""
+										},
+										"yAxis": {
+											"disabled": true,
+											"disableGrid": true,
+											"splitNumber": 5,
+											"gridType": "dash",
+											"dashLength": 2,
+											"gridColor": "#CCCCCC",
+											"padding": 10,
+											"showTitle": false,
+											"data": []
+										},
+										"legend": {
+											"show": false,
+											"position": "bottom",
+											"float": "center",
+											"padding": 5,
+											"margin": 5,
+											"backgroundColor": "rgba(0,0,0,0)",
+											"borderColor": "rgba(0,0,0,0)",
+											"borderWidth": 0,
+											"fontSize": 13,
+											"fontColor": "#666666",
+											"lineHeight": 11,
+											"hiddenColor": "#CECECE",
+											"itemGap": 10
+										},
+										"extra": {
+											"line": {
+												"type": "straight",
+												"width": 2
+											},
+											"tooltip": {
+												"showBox": true,
+												"showArrow": true,
+												"showCategory": false,
+												"borderWidth": 0,
+												"borderRadius": 0,
+												"borderColor": "#000000",
+												"borderOpacity": 0.7,
+												"bgColor": "#000000",
+												"bgOpacity": 0.7,
+												"gridType": "dash",
+												"dashLength": 4,
+												"gridColor": "#22C572",
+												"fontColor": "#FFFFFF",
+												"splitLine": true,
+												"horizentalLine": false,
+												"xAxisLabel": false,
+												"yAxisLabel": false,
+												"labelBgColor": "#FFFFFF",
+												"labelBgOpacity": 0.7,
+												"labelFontColor": "#666666"
+											},
+											"markLine": {
+												"type": "solid",
+												"dashLength": 4,
+												"data": []
+											}
+										}
 									}
+									
 									break;
 								case 3:
-									this.dataObj3 = {
-										percentage: res.data.data[i].biViewInfoList[0].percentage,
-										total: Number(res.data.data[i].total),
-										percent: Number(res.data.data[i].biViewInfoList[0].percent)
-									}
+									// this.dataObj3 = {
+									// 	percentage: res.data.data[i].biViewInfoList[0].percentage,
+									// 	total: Number(res.data.data[i].total),
+									// 	percent: Number(res.data.data[i].biViewInfoList[0].percent)
+									// }
 									break;
 								case 4:
 									this.dataObj4 = {
@@ -504,291 +781,55 @@
 									}
 									break;
 							}
-						} else if (i == 6) {
-							this.carCount1 = res.data.data[i].biViewInfoList[0].count
-							this.carCount2 = res.data.data[i].biViewInfoList[1].count
-							this.carCount3 = res.data.data[i].biViewInfoList[2].count
-
-							let _x = []
-							let _y = []
-							for (let k = 0; k < res.data.data[i].biViewInfoList.length; k++) {
-								_x.push(res.data.data[i].biViewInfoList[k].name)
-								_y.push(Number(res.data.data[i].biViewInfoList[k].count))
-							}
-							this.carChartData = {
-								categories: _x,
-								series: [{
-									"name": '车辆',
-									"data": _y
-								}]
+						} else if (i == 10) { //销售已完成
+							uni.hideLoading()
+							this.dataObj0 = {
+								percentage: Number(res.data.data[i].biViewInfoList[0].count).toFixed(2),
+								total: Number(res.data.data[i].total).toFixed(2),
+								percent: Number(res.data.data[i].biViewInfoList[0].percentage)
 							}
-							this.ringoptions = {
-								"type": "column",
-								"canvasId": "",
-								"canvas2d": false,
-								"background": "none",
-								"animation": true,
-								"timing": "easeOut",
-								"duration": 1000,
-								"color": [
-									"#22C572"
-								],
-								"padding": [
-									15,
-									15,
-									0,
-									5
-								],
-								"rotate": false,
-								"errorReload": true,
-								"fontSize": 13,
-								"fontColor": "#666666",
-								"enableScroll": false,
-								"touchMoveLimit": 60,
-								"enableMarkLine": false,
-								"dataLabel": true,
-								"dataPointShape": true,
-								"dataPointShapeType": "solid",
-								"tapLegend": true,
-								"xAxis": {
-									"disabled": false,
-									"axisLine": false,
-									"axisLineColor": "#CCCCCC",
-									"calibration": false,
-									"fontColor": "#666666",
-									"fontSize": 13,
-									"rotateLabel": false,
-									"itemCount": 5,
-									"boundaryGap": "center",
-									"disableGrid": true,
-									"gridColor": "#CCCCCC",
-									"gridType": "solid",
-									"dashLength": 4,
-									"gridEval": 1,
-									"scrollShow": false,
-									"scrollAlign": "left",
-									"scrollColor": "#A6A6A6",
-									"scrollBackgroundColor": "#EFEBEF",
-									"format": ""
-								},
-								"yAxis": {
-									"disabled": true,
-									"disableGrid": true,
-									"splitNumber": 5,
-									"gridType": "solid",
-									"dashLength": 8,
-									"gridColor": "#CCCCCC",
-									"padding": 10,
-									"showTitle": false,
-									"data": []
-								},
-								"legend": {
-									"show": false,
-									"position": "bottom",
-									"float": "center",
-									"padding": 5,
-									"margin": 5,
-									"backgroundColor": "rgba(0,0,0,0)",
-									"borderColor": "rgba(0,0,0,0)",
-									"borderWidth": 0,
-									"fontSize": 13,
-									"fontColor": "#666666",
-									"lineHeight": 11,
-									"hiddenColor": "#CECECE",
-									"itemGap": 10
-								},
-								"extra": {
-									"column": {
-										"type": "group",
-										"width": 30,
-										"seriesGap": 2,
-										"categoryGap": 3,
-										"barBorderCircle": true,
-										"linearType": "none",
-										"linearOpacity": 1,
-										"colorStop": 0,
-										"meterBorder": 1,
-										"meterFillColor": "#FFFFFF",
-										"activeBgColor": "#000000",
-										"activeBgOpacity": 0.08,
-										"meterBorde": 1
-									},
-									"tooltip": {
-										"showBox": true,
-										"showArrow": true,
-										"showCategory": false,
-										"borderWidth": 0,
-										"borderRadius": 0,
-										"borderColor": "#000000",
-										"borderOpacity": 0.7,
-										"bgColor": "#000000",
-										"bgOpacity": 0.7,
-										"gridType": "solid",
-										"dashLength": 4,
-										"gridColor": "#CCCCCC",
-										"fontColor": "#FFFFFF",
-										"splitLine": true,
-										"horizentalLine": false,
-										"xAxisLabel": false,
-										"yAxisLabel": false,
-										"labelBgColor": "#FFFFFF",
-										"labelBgOpacity": 0.7,
-										"labelFontColor": "#666666"
-									},
-									"markLine": {
-										"type": "solid",
-										"dashLength": 4,
-										"data": []
-									}
-								}
+							
+						}else if (i == 11) { //销售已开票
+							uni.hideLoading()
+							this.dataObj1 = {
+								percentage: Number(res.data.data[i].biViewInfoList[0].count).toFixed(2),
+								total: Number(res.data.data[i].total).toFixed(),
+								percent:Number(res.data.data[i].biViewInfoList[0].percentage)
 							}
-
-						} else if (i == 7) {
-							this.inventoryAct = Number(res.data.data[i].biViewInfoList[0].count).toFixed(2)
-							this.inventoryBuy = Number(res.data.data[i].biViewInfoList[1].count).toFixed(2)
-							this.inventorySale = Number(res.data.data[i].biViewInfoList[2].count).toFixed(2)
-							this.inventoryTC =  Number(Number(this.inventoryAct)+Number(this.inventoryBuy)-Number(this.inventorySale)).toFixed(2)
-
-						} else if (i == 8) {
-							let _x = []
-							let _y = []
-							for (let k = 0; k < res.data.data[i].biViewInfoList.length; k++) {
-								if(Number(res.data.data[i].biViewInfoList[k].count).toFixed(2) != 0){
-									_x.push(res.data.data[i].biViewInfoList[k].name)
-									_y.push(Number(res.data.data[i].biViewInfoList[k].count).toFixed(2))
-								}
+							
+						}else if (i == 12) { //销售已结算
+							uni.hideLoading()
+							this.dataObj2 = {
+								percentage: Number(res.data.data[i].biViewInfoList[0].count).toFixed(2) ,
+								total: Number(res.data.data[i].total).toFixed(2),
+								percent: Number(res.data.data[i].biViewInfoList[0].percentage)
 							}
-							this.chartData = {
-								categories: _x,
-								series: [{
-									"name": '储量',
-									"data": _y
-								}]
+						}else if(i == 13){//采购已完成
+							uni.hideLoading()
+							this.dataObj3 = {
+								percentage: Number(res.data.data[i].biViewInfoList[0].count),
+								total: Number(res.data.data[i].total).toFixed(2),
+								percent: Number(res.data.data[i].biViewInfoList[0].percentage)
 							}
-							this.zringoptions = {
-								"type": "line",
-								"canvasId": "",
-								"canvas2d": false,
-								"background": "none",
-								"animation": true,
-								"timing": "easeOut",
-								"duration": 1000,
-								"color": [
-									"#91CB74",
-								],
-								"padding": [
-									15,
-									10,
-									0,
-									15
-								],
-								"rotate": false,
-								"errorReload": true,
-								"fontSize": 13,
-								"fontColor": "#666666",
-								"enableScroll": true,
-								"touchMoveLimit": 60,
-								"enableMarkLine": true,
-								"dataLabel": true,
-								"dataPointShape": true,
-								"dataPointShapeType": "hollow",
-								"tapLegend": true,
-								"xAxis": {
-									"disabled": false,
-									"axisLine": false,
-									"axisLineColor": "#CCCCCC",
-									"calibration": false,
-									"fontColor": "#666666",
-									"fontSize": 13,
-									"rotateLabel": false,
-									"itemCount": 4,
-									"boundaryGap": "center",
-									"disableGrid": false,
-									"gridColor": "#CCCCCC",
-									"gridType": "dash",
-									"dashLength": 4,
-									"gridEval": 1,
-									"scrollShow": false,
-									"scrollAlign": "left",
-									"scrollColor": "#A6A6A6",
-									"scrollBackgroundColor": "#EFEBEF",
-									"format": ""
-								},
-								"yAxis": {
-									"disabled": true,
-									"disableGrid": true,
-									"splitNumber": 5,
-									"gridType": "dash",
-									"dashLength": 2,
-									"gridColor": "#CCCCCC",
-									"padding": 10,
-									"showTitle": false,
-									"data": []
-								},
-								"legend": {
-									"show": false,
-									"position": "bottom",
-									"float": "center",
-									"padding": 5,
-									"margin": 5,
-									"backgroundColor": "rgba(0,0,0,0)",
-									"borderColor": "rgba(0,0,0,0)",
-									"borderWidth": 0,
-									"fontSize": 13,
-									"fontColor": "#666666",
-									"lineHeight": 11,
-									"hiddenColor": "#CECECE",
-									"itemGap": 10
-								},
-								"extra": {
-									"line": {
-										"type": "straight",
-										"width": 2
-									},
-									"tooltip": {
-										"showBox": true,
-										"showArrow": true,
-										"showCategory": false,
-										"borderWidth": 0,
-										"borderRadius": 0,
-										"borderColor": "#000000",
-										"borderOpacity": 0.7,
-										"bgColor": "#000000",
-										"bgOpacity": 0.7,
-										"gridType": "dash",
-										"dashLength": 4,
-										"gridColor": "#22C572",
-										"fontColor": "#FFFFFF",
-										"splitLine": true,
-										"horizentalLine": false,
-										"xAxisLabel": false,
-										"yAxisLabel": false,
-										"labelBgColor": "#FFFFFF",
-										"labelBgOpacity": 0.7,
-										"labelFontColor": "#666666"
-									},
-									"markLine": {
-										"type": "solid",
-										"dashLength": 4,
-										"data": []
-									}
-								}
+						}else if(i == 14){//采购已开票
+							uni.hideLoading()
+							this.dataObj4 = {
+								percentage: Number(res.data.data[i].biViewInfoList[0].count).toFixed(2),
+								total: Number(res.data.data[i].total).toFixed(2),
+								percent: Number(res.data.data[i].biViewInfoList[0].percentage)
 							}
-
-						} else if (i == 9) {
-							for (let k = 0; k < res.data.data[i].biViewInfoList.length; k++) {
-								var obj = res.data.data[i].biViewInfoList[k]
-								// obj.startName = obj.name.split('→')[0].substring(0, 5) + '...'
-								obj.startName = obj.name.split('→')[0]
-								obj.endName = obj.name.split('→')[1]
+						}else if(i == 15){//采购已结算
+							uni.hideLoading()
+							this.dataObj5 = {
+								percentage: Number(res.data.data[i].biViewInfoList[0].count).toFixed(2) ,
+								total: Number(res.data.data[i].total).toFixed(2),
+								percent: Number(res.data.data[i].biViewInfoList[0].percentage)
 							}
-							this.ztList = res.data.data[i].biViewInfoList
-						}
-						else if (i == 10) {
+						}else if (i == 16) {
 							uni.hideLoading()
 							this.moneyList = res.data.data[i].biViewInfoList
-							console.log('收入',this.moneyList)
-						}
+							console.log('收入', this.moneyList)
+						} 
 					}
 					this.chartlist = _list
 					// this.scroll()
@@ -827,8 +868,8 @@
 			},
 			confirm(e) {
 				uni.showLoading({
-					title:"加载中",
-					mask:true
+					title: "加载中",
+					mask: true
 				})
 				console.log(e)
 				this.nowDate = e[0].label + e[1].label
@@ -851,7 +892,7 @@
 			htClick(index) {
 				// this.itemSelect = index
 				this.contractSelect = index
-				
+
 			}
 		}
 	}