111

src/view/customer/storequery.vue

@@ -61,6 +61,7 @@
 				</el-row>
 				
 			</el-form>
+			<total-block ref="totalBlock" style="margin-left: -25px;font-size: 13px;margin-left: 5px" v-bind:childParam="childParam" v-bind:childUrl = 'childUrl'></total-block>
 		</div>
 		<div class="tabledata-grid">
 			<el-table :data="tableData" height="100%"   border style="width: 97%;" v-loading="loading" ref="multipleTable"	@select="handleTableSelect"	 @selection-change="handleSelectionChange" @select-all = "selectAll">
@@ -263,6 +264,7 @@
 	import PopupOut from '@/components/PopupOut.vue'
 	import PopupIn from '@/components/PopupIn.vue'
 	import Export2Excel from '../../excel/Export2Excel.js'
+	import TotalBlock    from '@/components/TotalBlock.vue'
 	import {
 		mapState
 	} from 'vuex'
@@ -275,6 +277,7 @@
 			PopupDistribution,
 			PopupOut,
 			PopupIn,
+			TotalBlock
 		},
 		computed: {
 			// splitCount: function() {
@@ -354,7 +357,25 @@
 				newOrdno:'',
 				newReceiveaddress:'',
 				newProductionplace:'',
-				newPackno:''
+				newPackno:'',
+				childParam:{
+					wareName: '',
+					stackName: '',
+					model: '',
+					materialName: '',
+					standard: '',
+					customerName: '',
+					plateNo: [],
+					wareId:'',
+					ordNo:[],
+					contractNo:[],
+					packNo:[],
+					fkcustmerName:'',
+					remark1:'',
+					outFlag:'0',
+					inRecordDate:[]
+				},
+				childUrl:'WareStore/queryTotal.do',
 			};
 		},
 		mounted() {
@@ -573,14 +594,17 @@
 					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
 					contractNo: this.query.contractNo == 0 ? '' : this.query.contractNo.join(','),
 					packNo: this.query.packNo == 0 ? '' : this.query.packNo.join(','),
-					remark1: this.query.remark1
+					remark1: this.query.remark1,
+					outFlag:'0'
 				}
+				this.childParam = param;
 				//console.log(param);
 				axios.get(url, param).then(response => {
 					if (response.data.code == 0) {
 						//console.log(response.data.data.list);
 						this.tableData = response.data.data.list
 						this.totalRows = response.data.data.total
+						this.$refs.totalBlock.getTotalData();
 					} else {
 						this.$message({
 							type: 'error',
@@ -923,7 +947,8 @@
 					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
 					contractNo: this.query.contractNo == 0 ? '' : this.query.contractNo.join(','),
 					packNo: this.query.packNo == 0 ? '' : this.query.packNo.join(','),
-					remark1: this.query.remark1
+					remark1: this.query.remark1,
+					outFlag:'0'
 				}
 
 

src/view/system/main.vue

@@ -23,9 +23,17 @@
 	</div>
 </template>
 <script>
+	import axios from '@/axios'
 	export default {
 		data() {
 			return {
+				drawLine1_date1:[],
+				drawLine1_date2:[],
+				drawLine2_date1:[],
+				drawLine3_date1:[],
+				drawLine3_date2:[],
+				drawLine3_date3:[],
+				drawLine4_value:''
 
 			}
 		},
@@ -38,290 +46,311 @@
 		},
 		methods: {
 			drawLine1() {
-				let myChart1 = this.$echarts.init(document.getElementById('myChart1'), 'default')
-				myChart1.setOption({
-					title: {
-						text: '年度总收入',
-						// subtext: '纯属虚构'
-					},
-					tooltip: {
-						trigger: 'axis'
-					},
-					legend: {
-						data: ['库存费用']
-					},
-					// toolbox: {
-					// 	show: true,
-					// 	feature: {
-					// 		mark: {
-					// 			show: true
-					// 		},
-					// 		dataView: {
-					// 			show: true,
-					// 			readOnly: false
-					// 		},
-					// 		magicType: {
-					// 			show: true,
-					// 			type: ['line', 'bar']
-					// 		},
-					// 		restore: {
-					// 			show: true
-					// 		},
-					// 		saveAsImage: {
-					// 			show: true
-					// 		}
-					// 	}
-					// },
-					calculable: true,
-					xAxis: [{
-						type: 'category',
-						boundaryGap: false,
-						data: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12']
-					}],
-					yAxis: [{
-						type: 'value',
-						axisLabel: {
-							formatter: '{value}'
+				var url = 'Home/querydrawLine1.do'
+				var param = {
+				}
+				axios.get(url, param).then(response => {
+					if (response.data.code == 0) {
+						console.log(response.data.data[0].value1)
+						for (let i = 0; i < response.data.data.length; i++) {
+							this.drawLine1_date1.push(response.data.data[i].value1)
+							this.drawLine1_date2.push(response.data.data[i].value2)
 						}
-					}],
-					series: [{
-							name: '收入',
-							type: 'line',
-							data: [11, 11, 15, 13, 12, 13, 10, 8, 16, 15, 12, 14],
-							markPoint: {
-								data: [{
-										type: 'max',
-										name: '最大值'
+						console.log(this.drawLine1_date1);
+						let myChart1 = this.$echarts.init(document.getElementById('myChart1'), 'default')
+						myChart1.setOption({
+							title: {
+								text: '年度出入量',
+								// subtext: '纯属虚构'
+							},
+							tooltip: {
+								trigger: 'axis'
+							},
+							legend: {
+								data: ['出入量']
+							},
+							calculable: true,
+							xAxis: [{
+								type: 'category',
+								boundaryGap: false,
+								data: this.drawLine1_date1
+							}],
+							yAxis: [{
+								type: 'value',
+								axisLabel: {
+									formatter: '{value}'
+								}
+							}],
+							series: [{
+									name: '出入库',
+									type: 'line',
+									data: this.drawLine1_date2,
+									markPoint: {
+										data: [{
+												type: 'max',
+												name: '最大值'
+											},
+											{
+												type: 'min',
+												name: '最小值'
+											}
+										]
 									},
-									{
-										type: 'min',
-										name: '最小值'
+									markLine: {
+										data: [{
+											type: 'average',
+											name: '平均值'
+										}]
 									}
-								]
-							},
-							markLine: {
-								data: [{
-									type: 'average',
-									name: '平均值'
-								}]
-							}
-						},
+								},
 
-					]
-				});
+							]
+						});
+			
+					} else {
+						this.$message({
+							type: 'error',
+							message: '保存失败' + response.data.msg,
+						});
+					}
+				})
 			},
 
 
 			drawLine2() {
-				let myChart2 = this.$echarts.init(document.getElementById('myChart2'), 'default')
-				myChart2.setOption({
+				var url = 'Home/querydrawLine2.do'
+				var param = {
+				}
+				var all_weight=0
+				axios.get(url, param).then(response => {
+					if (response.data.code == 0) {
+						console.log(response.data.data[0].value1)
+						for (let i = 0; i < response.data.data.length; i++) {
+							this.drawLine2_date1.push({name:response.data.data[i].value1,value:response.data.data[i].value2})
+							all_weight = parseFloat(all_weight) + parseFloat(response.data.data[i].value2);
+						}
+						console.log(this.drawLine2_date1);
+						console.log(all_weight);
+						let myChart2 = this.$echarts.init(document.getElementById('myChart2'), 'default')
+						myChart2.setOption({
 
-					title: {
-						text: '当前库存',
-						subtext: ' ',
-						x: 'center'
-					},
-					tooltip: {
-						trigger: 'item',
-						formatter: "{a} <br/>{b} : {c} ({d}%)"
-					},
-					// legend: {
-					// 	orient: 'vertical',
-					// 	x: 'left',
-					// 	data: ['钢板', '钢卷', '螺纹', '盘螺']
-					// },
-					toolbox: {
-						show: true,
-						feature: {
-							mark: {
-								show: true
+							title: {
+								text: '当前库存',
+								subtext: ' ',
+								x: 'center'
 							},
-							dataView: {
-								show: true,
-								readOnly: false
+							tooltip: {
+								trigger: 'item',
+								formatter: "{a} <br/>{b} : {c} ({d}%)"
 							},
-							magicType: {
+							toolbox: {
 								show: true,
-								type: ['pie', 'funnel'],
-								option: {
-									funnel: {
-										x: '25%',
-										width: '50%',
-										funnelAlign: 'left',
-										max: 1548
+								feature: {
+									mark: {
+										show: true
+									},
+									dataView: {
+										show: true,
+										readOnly: false
+									},
+									magicType: {
+										show: true,
+										type: ['pie', 'funnel'],
+										option: {
+											funnel: {
+												x: '25%',
+												width: '50%',
+												funnelAlign: 'left',
+												max: 1548
+											}
+										}
+									},
+									restore: {
+										show: true
+									},
+									saveAsImage: {
+										show: true
 									}
 								}
 							},
-							restore: {
-								show: true
-							},
-							saveAsImage: {
-								show: true
-							}
-						}
-					},
-					calculable: true,
-					series: [{
-						name: '访问来源',
-						type: 'pie',
-						radius: '55%',
-						center: ['50%', '60%'],
-						data: [{
-								value: 335,
-								name: '钢板'
-							},
-							{
-								value: 310,
-								name: '钢卷'
-							},
-							{
-								value: 234,
-								name: '螺纹'
-							},
-							{
-								value: 135,
-								name: '盘螺'
-							}
-						]
-					}]
+							calculable: true,
+							series: [{
+								name: '访问来源',
+								type: 'pie',
+								radius: '55%',
+								center: ['50%', '60%'],
+								data: this.drawLine2_date1
+							}]
 
 
-				});
+						});
+			
+			
+					} else {
+						this.$message({
+							type: 'error',
+							message: '保存失败' + response.data.msg,
+						});
+					}
+				})
 			},
+
 			drawLine3() {
-				let myChart3 = this.$echarts.init(document.getElementById('myChart3'), 'default')
-				myChart3.setOption({
-					title: {
-						text: '年入库量和出库量',
-						subtext: ''
-					},
-					tooltip: {
-						trigger: 'axis'
-					},
-					legend: {
-						data: ['入库量', '出库量']
-					},
-					toolbox: {
-						show: true,
-						feature: {
-							mark: {
-								show: true
-							},
-							dataView: {
-								show: true,
-								readOnly: false
+
+				var url = 'Home/querydrawLine3.do'
+				var param = {
+				}
+				axios.get(url, param).then(response => {
+					if (response.data.code == 0) {
+						console.log(response.data.data[0].value1)
+						for (let i = 0; i < response.data.data.length; i++) {
+							this.drawLine3_date1.push(response.data.data[i].value1)
+							this.drawLine3_date2.push(response.data.data[i].value2)
+							this.drawLine3_date3.push(response.data.data[i].value3)
+						}
+						console.log(this.drawLine3_date1);
+						let myChart3 = this.$echarts.init(document.getElementById('myChart3'), 'default')
+						myChart3.setOption({
+							title: {
+								text: '年入库量和出库量',
+								subtext: ''
 							},
-							magicType: {
-								show: true,
-								type: ['line', 'bar']
+							tooltip: {
+								trigger: 'axis'
 							},
-							restore: {
-								show: true
+							legend: {
+								data: ['入库量', '出库量']
 							},
-							saveAsImage: {
-								show: true
-							}
-						}
-					},
-					calculable: true,
-					xAxis: [{
-						type: 'category',
-						data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
-					}],
-					yAxis: [{
-						type: 'value'
-					}],
-					series: [{
-							name: '入库量',
-							type: 'bar',
-							data: [2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3],
-							markPoint: {
-								data: [{
-										type: 'max',
-										name: '最大值'
+							toolbox: {
+								show: true,
+								feature: {
+									mark: {
+										show: true
+									},
+									dataView: {
+										show: true,
+										readOnly: false
+									},
+									magicType: {
+										show: true,
+										type: ['line', 'bar']
 									},
-									{
-										type: 'min',
-										name: '最小值'
+									restore: {
+										show: true
+									},
+									saveAsImage: {
+										show: true
 									}
-								]
+								}
 							},
-							markLine: {
-								data: [{
-									type: 'average',
-									name: '平均值'
-								}]
-							}
-						},
-						{
-							name: '出库量',
-							type: 'bar',
-							data: [2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3],
-							markPoint: {
-								data: [{
-										name: '年最高',
-										value: 182.2,
-										xAxis: 7,
-										yAxis: 183,
-										symbolSize: 18
+							calculable: true,
+							xAxis: [{
+								type: 'category',
+								data: this.drawLine3_date1
+							}],
+							yAxis: [{
+								type: 'value'
+							}],
+							series: [{
+									name: '入库量',
+									type: 'bar',
+									data: this.drawLine3_date2,
+									markPoint: {
+										data: [{
+												type: 'max',
+												name: '最大值'
+											},
+											{
+												type: 'min',
+												name: '最小值'
+											}
+										]
 									},
-									{
-										name: '年最低',
-										value: 2.3,
-										xAxis: 11,
-										yAxis: 3
+									markLine: {
+										data: [{
+											type: 'average',
+											name: '平均值'
+										}]
 									}
-								]
-							},
-							markLine: {
-								data: [{
-									type: 'average',
-									name: '平均值'
-								}]
-							}
-						}
-					]
+								},
+								{
+									name: '出库量',
+									type: 'bar',
+									data: this.drawLine3_date3,
+									markLine: {
+										data: [{
+											type: 'average',
+											name: '平均值'
+										}]
+									}
+								}
+							]
 
-				});
+						});
+			
+			
+					} else {
+						this.$message({
+							type: 'error',
+							message: '保存失败' + response.data.msg,
+						});
+					}
+				})
+				
 			},
 
-
-
-
 			drawLine4() {
-				let myChart4 = this.$echarts.init(document.getElementById('myChart4'), 'default')
-				myChart4.setOption({
+				var url = 'Home/querydrawLine4.do'
+				var param = {
+				}
+				axios.get(url, param).then(response => {
+					if (response.data.code == 0) {
+						console.log(response.data.data)
+						this.drawLine4_value = response.data.data.value1
+						let myChart4 = this.$echarts.init(document.getElementById('myChart4'), 'default')
+						
+						myChart4.setOption({
 
-					tooltip: {
-						formatter: "{a} <br/>{b} : {c}%"
-					},
-					toolbox: {
-						show: true,
-						feature: {
-							mark: {
-								show: true
+							tooltip: {
+								formatter: "{a} <br/>{b} : {c}%"
 							},
-							restore: {
-								show: true
+							toolbox: {
+								show: true,
+								feature: {
+									mark: {
+										show: true
+									},
+									restore: {
+										show: true
+									},
+									saveAsImage: {
+										show: true
+									}
+								}
 							},
-							saveAsImage: {
-								show: true
-							}
-						}
-					},
-					series: [{
-						name: '业务指标',
-						type: 'gauge',
-						detail: {
-							formatter: '{value}%'
-						},
-						data: [{
-							value: 50,
-							name: '库存占用率'
-						}]
-					}]
+							series: [{
+								name: '业务指标',
+								type: 'gauge',
+								detail: {
+									formatter: '{value}%'
+								},
+								data: [{
+									value: parseFloat(this.drawLine4_value).toFixed(2),
+									name: '垛位占用率'
+								}]
+							}]
 
-				});
+						});
+			
+			
+					} else {
+						this.$message({
+							type: 'error',
+							message: '保存失败' + response.data.msg,
+						});
+					}
+				})
+				
 			},
 
 

src/view/ware/storechange.vue

@@ -100,6 +100,7 @@
 				</el-row>
 				
 			</el-form>
+			<total-block ref="totalBlock" style="margin-left: -25px;font-size: 13px;margin-left: 5px" v-bind:childParam="childParam" v-bind:childUrl = 'childUrl'></total-block>
 		</div>
 		<div class="tabledata-grid">
 			<el-table :data="tableData" height="100%"   border style="width: 97%;" v-loading="loading" ref="multipleTable"	@select="handleTableSelect"	 @selection-change="handleSelectionChange" @select-all = "selectAll" 
@@ -312,6 +313,7 @@
 	import PopupOut from '@/components/PopupOut.vue'
 	import PopupIn from '@/components/PopupIn.vue'
 	import Export2Excel from '../../excel/Export2Excel.js'
+	import TotalBlock    from '@/components/TotalBlock.vue'
 	import {
 		mapState
 	} from 'vuex'
@@ -324,6 +326,7 @@
 			PopupDistribution,
 			PopupOut,
 			PopupIn,
+			TotalBlock
 		},
 		computed: {
 			// splitCount: function() {
@@ -417,6 +420,24 @@
 					value: '1',
 					label: '已出库'
 				}],
+				childParam:{
+					wareName: '',
+					stackName: '',
+					model: '',
+					materialName: '',
+					standard: '',
+					customerName: '',
+					plateNo: [],
+					wareId:'',
+					ordNo:[],
+					contractNo:[],
+					packNo:[],
+					fkcustmerName:'',
+					remark1:'',
+					outFlag:'0',
+					inRecordDate:[]
+				},
+				childUrl:'WareStore/queryTotal.do',
 			};
 		},
 		mounted() {
@@ -666,12 +687,15 @@
 					toDate  :(!this.query.inRecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") :this.query.inRecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
 
 				}
+
+				this.childParam = param;
 				//console.log(param);
 				axios.get(url, param).then(response => {
 					if (response.data.code == 0) {
 						//console.log(response.data.data.list);
 						this.tableData = response.data.data.list
 						this.totalRows = response.data.data.total
+						this.$refs.totalBlock.getTotalData();
 					} else {
 						this.$message({
 							type: 'error',
@@ -1004,7 +1028,10 @@
 					ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
 					contractNo: this.query.contractNo == 0 ? '' : this.query.contractNo.join(','),
 					packNo: this.query.packNo == 0 ? '' : this.query.packNo.join(','),
-					remark1: this.query.remark1
+					remark1: this.query.remark1,
+					outFlag: this.query.outFlag,
+					fromDate:(!this.query.inRecordDate[0]) ? "1970-01-01 00:00:00" : this.query.inRecordDate[0].Format("yyyy-MM-dd HH:mm:ss"),		//date类型
+					toDate  :(!this.query.inRecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") :this.query.inRecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
 				}