From b5472e8c5251aa6059bdc3957a9cdec3d3ba282b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 26 Mar 2024 14:27:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=94=80=E5=94=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E7=B1=BB=E6=AF=94=E9=87=87=E8=B4=AD=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/inm_statistics.vue      | 694 +++++++++++--------
 src/views/statistics/material_statistics.vue |  79 ++-
 2 files changed, 436 insertions(+), 337 deletions(-)

diff --git a/src/views/statistics/inm_statistics.vue b/src/views/statistics/inm_statistics.vue
index 7cbdc739..45c573b7 100644
--- a/src/views/statistics/inm_statistics.vue
+++ b/src/views/statistics/inm_statistics.vue
@@ -2,64 +2,109 @@
 	<el-container>
 		<el-header>
 			<div class="right-panel">
-				<el-select v-model="queryType" clearable @change="queryTypeChange">
-					<el-option v-for="item in typeOptions" 
-					:key="item" 
-					:label="item" 
-					:value="item"
+				<el-select v-model="queryType" @change="queryTypeChange">
+					<el-option
+						v-for="item in typeOptions"
+						:key="item"
+						:label="item"
+						:value="item"
 					>
 					</el-option>
 				</el-select>
 				<el-date-picker
-					v-if="queryType=='月'"
+					v-if="queryType == '月'"
 					v-model="queryDate"
 					type="month"
 					placeholder="查询月期"
 					value-format="YYYY-MM"
-					style="width:100%"
 				>
 				</el-date-picker>
 				<el-date-picker
-					v-if="queryType=='年'"
+					v-if="queryType == '年'"
 					v-model="queryDate"
 					type="year"
 					placeholder="查询年份"
 					value-format="YYYY"
-					style="width:100%"
 				>
 				</el-date-picker>
-				<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+				></el-button>
 			</div>
 		</el-header>
 		<el-main id="elMain">
 			<el-row :gutter="15">
 				<el-col :lg="12">
-					<el-card shadow="never" style="margin-bottom: 8px;">
+					<el-card shadow="never" style="margin-bottom: 8px">
 						<el-header>
 							<div class="right-panel">
-								<h2>棒管交付数</h2>
-								<!-- <el-select v-model="product" clearable @change="productChange">
-									<el-option v-for="item in inmData" 
-									:key="item.id" 
-									:label="item.material_.name" 
-									:value="item.id"
+								<h2>产品交付统计</h2>
+								<el-select
+									v-model="materialSale"
+									clearable
+									@change="materialSaleChange"
+								>
+									<el-option
+										v-for="item in inmData"
+										:key="item.id"
+										:label="item.material_.name"
+										:value="item.id"
 									>
 									</el-option>
-								</el-select> -->
+								</el-select>
 							</div>
 						</el-header>
 						<el-row>
 							<el-col>
-								<div id="bachart1" style="width:100%;height:300px;"></div>
-								<!-- <scEcharts height="300px" :option="option1"></scEcharts> -->
+								<div
+									id="bachart1"
+									style="width: 100%; height: 300px"
+								></div>
 							</el-col>
-							<el-card shadow="never" style="width: 100%;position: relative;margin-top: 20px;">
-								<el-button @click="handleExport('ZJ')" class="tables" type="primary">导出</el-button>
-								<el-table :data="tableData1" id="exportDivZJ" :height="tableHeight">
+							<el-card
+								shadow="never"
+								style="
+									width: 100%;
+									position: relative;
+									margin-top: 20px;
+								"
+							>
+								<el-button
+									@click="handleExport('1')"
+									class="tables"
+									type="primary"
+									>导出</el-button
+								>
+								<el-table
+									:data="tableData1"
+									id="exportDiv1"
+									:height="tableHeight"
+								>
 									<el-table-column type="index" width="50" />
-									<el-table-column label="日期" prop="date">
+									<el-table-column
+										label="年份"
+										prop="年"
+										width="80"
+									/>
+									<el-table-column
+										v-if="queryType == '月'"
+										width="50"
+										label="周"
+										prop="周"
+									/>
+									<el-table-column
+										v-else
+										width="50"
+										label="月份"
+										prop="月"
+									/>
+									<el-table-column label="名称" prop="物料名">
 									</el-table-column>
-									<el-table-column label="批次" prop="name">
+									<el-table-column label="规格" prop="规格">
+									</el-table-column>
+									<el-table-column label="型号" prop="型号">
 									</el-table-column>
 									<el-table-column label="数量" prop="count">
 									</el-table-column>
@@ -69,38 +114,56 @@
 					</el-card>
 				</el-col>
 				<el-col :lg="12">
-					<el-card shadow="never" style="margin-bottom: 8px;">
-						<el-header>
-							<div class="right-panel">
-								<h2>管交付数</h2>
-								<!-- <el-select v-model="product" clearable @change="productChange">
-									<el-option v-for="item in outData" 
-									:key="item.id" 
-									:label="item.material_.name" 
-									:value="item.id"
-									>
-									</el-option>
-								</el-select> -->
-							</div>
-						</el-header>
-						<el-row>
-							<el-col>
-								<div id="bachart2" style="width:100%;height:300px;"></div>
-								<!-- <scEcharts height="300px" :option="option2"></scEcharts> -->
-							</el-col>
-							<el-card shadow="never" style="width: 100%;position: relative;margin-top: 20px;">
-								<el-button @click="handleExport('ZB')" class="tables" type="primary">导出</el-button>
-								<el-table :data="tableData2" id="exportDivZB" :height="tableHeight">
+					<el-card shadow="never" style="margin-bottom: 8px">
+						<el-container>
+							<el-header>
+								<div class="right-panel">
+									<h2>交付统计总表</h2>
+								</div>
+							</el-header>
+							<el-main style="width: 100%; position: relative">
+								<el-button
+									@click="handleExport('2')"
+									class="tables"
+									type="primary"
+									>导出</el-button
+								>
+
+								<scTable
+									:data="tableData2"
+									id="exportDiv2"
+									:height="rightHeight"
+									hideDo
+								>
 									<el-table-column type="index" width="50" />
-									<el-table-column label="日期" prop="date">
+									<el-table-column
+										label="年份"
+										prop="年"
+										width="80"
+									/>
+									<el-table-column
+										v-if="queryType == '月'"
+										width="50"
+										label="周"
+										prop="周"
+									/>
+									<el-table-column
+										v-else
+										width="50"
+										label="月份"
+										prop="月"
+									/>
+									<el-table-column label="名称" prop="物料名">
 									</el-table-column>
-									<el-table-column label="批次" prop="name">
+									<el-table-column label="规格" prop="规格">
 									</el-table-column>
-									<el-table-column label="数量" prop="count">
+									<el-table-column label="型号" prop="型号">
 									</el-table-column>
-								</el-table>
-							</el-card>
-						</el-row>
+									<el-table-column label="数量" prop="数量">
+									</el-table-column>
+								</scTable>
+							</el-main>
+						</el-container>
 					</el-card>
 				</el-col>
 			</el-row>
@@ -109,266 +172,287 @@
 </template>
 
 <script>
-	import * as echarts from "echarts";
-	import T from '@/components/scEcharts/echarts-theme-T.js';
-	echarts.registerTheme('T', T);
-	import scEcharts from '@/components/scEcharts';
-	function deepCopy(obj) {
-		return JSON.parse(JSON.stringify(obj));
-	}
-	export default {
-		name: 'chart',
-		components: {
-			scEcharts
-		},
-		data() {
-			return {
-				queryType:'月',
-				queryDate:'',
-				start_date:'',
-				end_date:'',
-				currentYear:'',
-				currentMonth:'',
-				xAxisOrigin:[],
-				xAxisData:[],
-				typeOptions:['月','年'],
-				basicOption: {
-					backgroundColor: 'transparent',
-					title: {
-						text: '',
-					},
-					grid: {
-						top: '80px'
-					},
-					tooltip: {
-						trigger: 'axis'
-					},
-					xAxis: {
-						type: 'category',
-						data: []
-					},
-					yAxis: {
-						type: 'value'
-					},
-					lenged:[],
-					series: [{
-						data: [0, 0, 0, 0, 0, 0, 0],
-						stack: 'Ad',
-						type: 'bar',
-						barWidth: '15px',
-					}]
+import * as echarts from "echarts";
+import T from "@/components/scEcharts/echarts-theme-T.js";
+echarts.registerTheme("T", T);
+function deepCopy(obj) {
+	return JSON.parse(JSON.stringify(obj));
+}
+export default {
+	name: "chart",
+	data() {
+		return {
+			queryType: "月",
+			queryDate: "",
+			start_date: "",
+			end_date: "",
+			currentYear: "",
+			currentMonth: "",
+			xAxisOrigin: [],
+			xAxisData: [],
+			typeOptions: ["月", "年"],
+			basicOption: {
+				backgroundColor: "transparent",
+				title: {
+					text: "",
 				},
-				// option1: {
-				// 	grid: {
-				// 		top: '80px'
-				// 	},
-				// 	tooltip: {
-				// 		trigger: 'axis'
-				// 	},
-				// 	xAxis: {
-				// 		type: 'category',
-				// 		data:xAxisData
-				// 	},
-				// 	yAxis: {
-				// 		type: 'value'
-				// 	},
-				// 	series: [{
-				// 		data: [120, 200, 150, 80, 70, 110, 130],
-				// 		type: 'bar',
-				// 		barWidth: '15px',
-				// 	}]
-				// },
-				// option2: {
-				// 	grid: {
-				// 		top: '80px'
-				// 	},
-				// 	tooltip: {
-				// 		trigger: 'axis'
-				// 	},
-				// 	xAxis: {
-				// 		type: 'category',
-				// 		data: xAxisData
-				// 	},
-				// 	yAxis: {
-				// 		type: 'value'
-				// 	},
-				// 	series: [{
-				// 		data: [120, 200, 150, 80, 70, 110, 130],
-				// 		type: 'bar',
-				// 		barWidth: '15px',
-				// 	}]
-				// },
-				tableHeight:0,
-				tableData:[
-					{id:1,date:'2023-12-11',name:'ZJ2-1',count:200},
-					{id:1,date:'2023-12-11',name:'ZJ2-2',count:200},
-					{id:1,date:'2023-12-11',name:'ZJ2-3',count:200},
-					{id:1,date:'2023-12-11',name:'ZJ2-4',count:200},
+				grid: {
+					top: "80px",
+				},
+				tooltip: {
+					trigger: "axis",
+				},
+				xAxis: {
+					type: "category",
+					data: [],
+				},
+				yAxis: {
+					type: "value",
+				},
+				lenged: [],
+				series: [
+					{
+						data: [0, 0, 0, 0, 0, 0, 0],
+						stack: "Ad",
+						type: "bar",
+						barWidth: "15px",
+					},
 				],
-				tableData1:[],
-				tableData2:[],
-				firstWeekNum:1,
-				endWeekNum:4,
-				monthList:['一月','二月','三月','四月','五月','六月','七月','八月','九月','十月','十一月','十二月']
+			},
+			materialSale: "",
+			saleOption: [],
+			tableHeight: 0,
+			rightHeight: 0,
+			tableData1: [],
+			tableData2: [],
+			firstWeekNum: 1,
+			endWeekNum: 4,
+			monthList: [
+				"一月",
+				"二月",
+				"三月",
+				"四月",
+				"五月",
+				"六月",
+				"七月",
+				"八月",
+				"九月",
+				"十月",
+				"十一月",
+				"十二月",
+			],
+		};
+	},
+	mounted() {
+		let that = this;
+		let date = new Date();
+		let year = date.getFullYear();
+		let month = date.getMonth() + 1;
+		let days = new Date(year, month, 0).getDate();
+		that.currentYear = year;
+		that.currentMonth = month;
+		that.start_date = year + "-" + month + "-01";
+		that.end_date =
+			year + "-" + month + "-" + new Date(year, month, 0).getDate();
+		let month1 = month;
+		if (month1 < 10) {
+			month1 = "0" + month1;
+		}
+		that.queryDate = year + "-" + month1;
+		that.firstWeekNum = that.getWeekOfYear(new Date(that.start_date));
+		that.endWeekNum = that.getWeekOfYear(new Date(that.end_date));
+		let duration = that.endWeekNum - that.firstWeekNum + 1;
+		for (let i = 1; i <= duration; i++) {
+			that.xAxisOrigin.push("第" + i + "周");
+		}
+		that.xAxisData = that.xAxisOrigin;
+		let height = document.getElementById("elMain").clientHeight;
+		let chartheight = document.getElementById("bachart1").clientHeight;
+		that.tableHeight = height - 140 - chartheight;
+		that.rightHeight = height - 115;
+		that.getTable();
+		that.setChart("bachart1", that.basicOption);
+		this.getSaleOption();
+	},
+	methods: {
+		setChart(name, option = null) {
+			// 根据name 渲染数据, option需填写，否则option为模拟数据
+			var myChart = echarts.getInstanceByDom(
+				document.getElementById(name)
+			);
+			if (myChart == undefined) {
+				myChart = echarts.init(document.getElementById(name), "T");
+			}
+			if (option == null) {
+				option = Object.assign({}, this.basicOption);
+			}
+			setTimeout(() => {
+				try {
+					myChart.setOption(option);
+				} catch (error) {}
+			}, 500);
+		},
+		queryTypeChange(value) {
+			console.log(value);
+			this.queryDate = "";
+		},
+		getWeekOfYear(date) {
+			var target = new Date(
+				date.getFullYear(),
+				date.getMonth(),
+				date.getDate()
+			); // 创建目标日期对象
+			var firstDayOfYear = new Date(target.getFullYear(), 0, 1); // 创建当前年份第一天的日期对象
+			if (target.getTime() == firstDayOfYear.getTime()) {
+				return 1;
+			} else {
+				return Math.ceil(
+					(target -
+						firstDayOfYear +
+						8 * (firstDayOfYear.getTimezoneOffset() / 480)) /
+						604800000
+				);
+			}
+			// 计算两者之间相隔的周数并返回结果
+		},
+		materialSaleChange() {
+			this.getSaleData();
+		},
+		//交付物料选项
+		getSaleOption() {
+			let that = this;
+			let obj = {};
+			obj.page = 0;
+			obj.type__in = "10";
+			that.$API.mtm.material.list.req(obj).then((res) => {
+				that.saleOption = res;
+			});
+		},
+		//交付物料
+		getSaleData() {
+			let that = this;
+			let option = deepCopy(that.basicOption);
+			option.xAxis.data = that.xAxisData;
+			let exec = that.queryType == "月" ? "saleOutWeek" : "saleOutMonth";
+			let obj = {
+				query: {
+					start_date: that.start_date,
+					end_date: that.end_date,
+					mio_type: "sale_out",
+					material_id: that.materialSale,
+				},
+			};
+			that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
+				console.log("getSaleData", res);
+				option.series.data = [];
+				if (res.data2.ds0) {
+					let data = res.data2.ds0;
+					that.tableData1 = data;
+					if (data.length > 0) {
+						let seriesData = [];
+						data.forEach((item) => {
+							if (that.queryType == "月") {
+								let index = item.周 - that.firstWeekNum;
+								seriesData[index] = item.数量;
+							} else {
+								let index = item.月 - 1;
+								seriesData[index] = item.数量;
+							}
+						});
+						option.series.data = seriesData;
+					}
+				}
+				that.setChart("bachart1", option);
+			});
+		},
+		getTable() {
+			let that = this;
+			let obj = {
+				query: {
+					start_date: that.start_date,
+					end_date: that.end_date,
+					mio_type: "sale_out",
+				},
+			};
+			let exec = that.queryType == "月" ? "saleOutWeek" : "saleOutMonth";
+			that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
+				that.tableData2 = [];
+				if (res.data2.ds0) {
+					let data = res.data2.ds0;
+					that.tableData2 = data;
+				}
+			});
+		},
+		handleQuery() {
+			let that = this;
+			if (this.queryType == "月") {
+				if (this.queryDate !== "" && this.queryDate !== null) {
+					this.start_date = this.queryDate + "-01";
+					let arr = this.queryDate.split("-");
+					this.end_date =
+						this.queryDate +
+						"-" +
+						new Date(arr[0], arr[1], 0).getDate();
+					this.firstWeekNum = this.getWeekOfYear(
+						new Date(this.start_date)
+					);
+					this.endWeekNum = this.getWeekOfYear(
+						new Date(this.end_date)
+					);
+					let duration = this.endWeekNum - this.firstWeekNum + 1;
+					let xAxisData = [];
+					for (let i = 1; i <= duration; i++) {
+						xAxisData.push("第" + i + "周");
+					}
+					that.xAxisData = xAxisData;
+				} else {
+					this.start_date =
+						this.currentYear + "-" + this.currentMonth + "-01";
+					this.end_date =
+						this.currentYear +
+						"-" +
+						this.currentMonth +
+						"-" +
+						new Date(
+							this.currentYear,
+							this.currentMonth,
+							0
+						).getDate();
+					let date = new Date(this.start_date);
+					this.firstWeekNum = this.getWeekOfYear(date);
+					this.xAxisData = this.xAxisOrigin;
+				}
+			} else {
+				if (this.queryDate !== "" && this.queryDate !== null) {
+					this.start_date = this.queryDate + "-01-01";
+					this.end_date = this.queryDate + "-12-31";
+				} else {
+					this.start_date = this.currentYear + "-01-01";
+					this.end_date = this.currentYear + "-12-31";
+				}
+				that.xAxisData = that.monthList;
+			}
+			that.getTable();
+			if (that.materialSale !== "" && that.materialSale !== null) {
+				that.getSaleData();
 			}
 		},
-		mounted(){
-			let that =this;
-			let date = new Date();
-			let year = date.getFullYear();
-			let month = date.getMonth()+1;
-			let days = new Date(year, month, 0).getDate();
-			that.currentYear = year;
-			that.currentMonth = month;
-			that.start_date =year+'-'+month+'-01';
-			that.end_date = year+'-'+month+'-'+new Date(year, month, 0).getDate();
-			let month1=month;
-			if(month1<10){month1='0'+month1}
-			that.queryDate = year+'-'+month1;
-			that.firstWeekNum = that.getWeekOfYear(new Date(that.start_date));
-			that.endWeekNum = that.getWeekOfYear(new Date(that.end_date));
-			let duration = that.endWeekNum - that.firstWeekNum + 1;
-			for(let i =1;i<=duration;i++ ){
-				that.xAxisOrigin.push('第'+i+'周');
-			}
-			that.xAxisData = that.xAxisOrigin;
-			let height= document.getElementById('elMain').clientHeight-140;
-			let chartheight= document.getElementById('bachart1').clientHeight;
-			that.tableHeight = height-chartheight;
-			this.getTableData();
-			// this.getTableData2();
+		handleExport(val) {
+			this.exportLoading = true;
+			let id = "#exportDiv" + val;
+			let name = val == "1" ? "交付统计" : "交付统计总表";
+			this.$XLSX(id, name);
+			this.exportLoading = false;
 		},
-		methods:{
-			setChart(name, option = null) {
-				// 根据name 渲染数据, option需填写，否则option为模拟数据
-				var myChart = echarts.getInstanceByDom(document.getElementById(name));
-				if (myChart == undefined) {
-					myChart = echarts.init(document.getElementById(name), 'T');
-				}
-				if (option == null) {
-					option = Object.assign({}, this.basicOption)
-				}
-				setTimeout(() => {
-					try {
-						myChart.setOption(option);
-					} catch (error) { }
-				}, 500)
-			},
-			queryTypeChange(value){
-				console.log(value)
-				this.queryDate = '';
-			},
-			getWeekOfYear(date) {
-				var target = new Date(date.getFullYear(), date.getMonth(), date.getDate()); // 创建目标日期对象
-				var firstDayOfYear = new Date(target.getFullYear(), 0, 1); // 创建当前年份第一天的日期对象
-				if(target.getTime()==firstDayOfYear.getTime()){
-					return 1;
-				}else{
-					return Math.ceil((target - firstDayOfYear + 8 * (firstDayOfYear.getTimezoneOffset() / 480)) / 604800000);
-				}
-				 // 计算两者之间相隔的周数并返回结果
-			},
-			getTableData(){
-				let that = this;
-				let option1 = deepCopy(that.basicOption);
-				let option2 = deepCopy(that.basicOption);
-				option1.xAxis.data = that.xAxisData;
-				option2.xAxis.data = that.xAxisData;
-				let exec = that.queryType=='月'?'saleOutWeek':'saleOutMonth';
-				let obj = {
-					query: { start_date: that.start_date, end_date: that.end_date,mio_type:'sale_out',material_id:'' },
-				};
-				that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
-					// console.log('交付数:',res);
-					if(res.length>0){
-						let data1 = [],data2 = [],seriesData1=[],seriesData2=[];
-						for(let i=0;i<res.length;i++){
-							if(res[i].物料名.indexOf('棒')){
-								data1.push(res[i]);
-							}else if(res[i].物料名.indexOf('管')){
-								data2.push(res[i]);
-							}
-						}
-						that.tableData1 = data1;
-						that.tableData2 = data2;
-						data1.forEach(item1=>{
-							let index =0;
-							if(that.queryType=='月'){
-								index = item1.月-1;
-							}else{
-								index = item1.周-that.firstWeekNum;
-							}
-							seriesData1[index]=item1.交付数;
-						})
-						data2.forEach(item2=>{
-							let index2 =0;
-							if(that.queryType=='月'){
-								index2 = item2.月-1;
-							}else{
-								index2 = item2.周-that.firstWeekNum;
-							}
-							seriesData2[index2]=item2.交付数;
-						})
-						option1.seriesData1 = seriesData1;
-						option2.seriesData2 = seriesData2;
-						that.setChart("bachart1", option1);
-						that.setChart("bachart2", option2);
-					}else{
-						that.setChart("bachart1", option1);
-						that.setChart("bachart2", option2);
-					}
-				})
-			},
-			handleQuery(){
-				let that = this;
-				if(this.queryType=='月'){
-					if(this.queryDate!==''&&this.queryDate!==null){
-						this.start_date =this.queryDate+'-01';
-						let arr = this.queryDate.split('-');
-						this.end_date = this.queryDate+'-'+new Date(arr[0], arr[1], 0).getDate();
-						this.firstWeekNum = this.getWeekOfYear(new Date(this.start_date));
-						this.endWeekNum = this.getWeekOfYear(new Date(this.end_date));
-						let duration = this.endWeekNum - this.firstWeekNum + 1;
-						let xAxisData = [];
-						for(let i =1;i<=duration;i++ ){
-							xAxisData.push('第'+i+'周');
-						}
-						that.xAxisData = xAxisData;
-					}else{
-						this.start_date =this.currentYear+'-'+this.currentMonth+'-01';
-						this.end_date = this.currentYear+'-'+this.currentMonth+'-'+new Date(this.currentYear, this.currentMonth, 0).getDate();
-						let date = new Date(this.start_date);
-						this.firstWeekNum = this.getWeekOfYear(date);
-						this.xAxisData = this.xAxisOrigin;
-					}
-				}else{
-					if(this.queryDate!==''&&this.queryDate!==null){
-						this.start_date = this.queryDate+'-01-01';
-						this.end_date = this.queryDate+'-12-31';
-					}else{
-						this.start_date = this.currentYear+'-01-01';
-						this.end_date = this.currentYear+'-12-31';
-					}
-					that.xAxisData = that.monthList;
-				}
-				this.getTableData();
-			},
-			handleExport(val) {
-				this.exportLoading = true;
-				let id = '#exportDiv' + val;
-				let name = val == 'ZJ' ? '棒交付统计' : '管交付统计';
-				this.$XLSX(id, name);
-				this.exportLoading = false;
-			},
-		},
-	}
+	},
+};
 </script>
 
 <style scoped>
 .tables {
-    position: absolute;
-    top: 4px;
-    right: 6px;
-    z-index: 10;
+	position: absolute;
+	top: 4px;
+	right: 6px;
+	z-index: 10;
 }
 </style>
diff --git a/src/views/statistics/material_statistics.vue b/src/views/statistics/material_statistics.vue
index 870c01a7..eb8ad266 100644
--- a/src/views/statistics/material_statistics.vue
+++ b/src/views/statistics/material_statistics.vue
@@ -84,18 +84,28 @@
 									:height="tableHeight"
 								>
 									<el-table-column type="index" width="50" />
-									<el-table-column label="日期" prop="date">
-										<template #default="scope">
-											<span>{{ scope.row.年 }}-</span>
-											<span v-if="scope.row.周">{{
-												scope.row.周
-											}}</span>
-											<span v-if="scope.row.月">{{
-												scope.row.月
-											}}</span>
-										</template>
+									<el-table-column
+										label="年份"
+										prop="年"
+										width="80"
+									/>
+									<el-table-column
+										v-if="queryType == '月'"
+										width="50"
+										label="周"
+										prop="周"
+									/>
+									<el-table-column
+										v-else
+										width="50"
+										label="月份"
+										prop="月"
+									/>
+									<el-table-column label="名称" prop="物料名">
 									</el-table-column>
-									<el-table-column label="名称" prop="物料">
+									<el-table-column label="规格" prop="规格">
+									</el-table-column>
+									<el-table-column label="型号" prop="型号">
 									</el-table-column>
 									<el-table-column label="数量" prop="数量">
 									</el-table-column>
@@ -127,14 +137,20 @@
 									hideDo
 								>
 									<el-table-column type="index" width="50" />
-									<el-table-column label="年份" prop="年" />
+									<el-table-column
+										label="年份"
+										prop="年"
+										width="80"
+									/>
 									<el-table-column
 										v-if="queryType == '月'"
+										width="50"
 										label="周"
 										prop="周"
 									/>
 									<el-table-column
 										v-else
+										width="50"
 										label="月份"
 										prop="月"
 									/>
@@ -343,25 +359,25 @@ export default {
 			};
 			that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
 				console.log("getInmData", res);
-				let data = res.data2.ds0;
-				that.tableData1 = data;
-				if (data.length > 0) {
-					option.series.data = [];
-					let seriesData = [];
-					data.forEach((item) => {
-						if (that.queryType == "月") {
-							let index = item.周 - that.firstWeekNum;
-							seriesData[index] = item.数量;
-						} else {
-							let index = item.月 - 1;
-							seriesData[index] = item.数量;
-						}
-					});
-					option.series.data = seriesData;
-					that.setChart("bachart1", option);
-				} else {
-					that.setChart("bachart1", option);
+				option.series.data = [];
+				if (res.data2.ds0) {
+					let data = res.data2.ds0;
+					that.tableData1 = data;
+					if (data.length > 0) {
+						let seriesData = [];
+						data.forEach((item) => {
+							if (that.queryType == "月") {
+								let index = item.周 - that.firstWeekNum;
+								seriesData[index] = item.数量;
+							} else {
+								let index = item.月 - 1;
+								seriesData[index] = item.数量;
+							}
+						});
+						option.series.data = seriesData;
+					}
 				}
+				that.setChart("bachart1", option);
 			});
 		},
 		getTable() {
@@ -375,11 +391,10 @@ export default {
 			};
 			let exec = that.queryType == "月" ? "saleOutWeek" : "saleOutMonth";
 			that.$API.bi.dataset.exec.req(exec, obj).then((res) => {
+				that.tableData2 = [];
 				if (res.data2.ds0) {
 					let data = res.data2.ds0;
 					that.tableData2 = data;
-				} else {
-					that.tableData2 = [];
 				}
 			});
 		},