fix: 采购统计日期修正

src/views/qm/process.vue

@@ -1,25 +1,46 @@
 <template>
 	<el-container>
 		<el-header>
-            <div class="left-panel">
+			<div class="left-panel"></div>
-            </div>
 			<div class="right-panel">
 				<el-select v-model="query.mgroup" clearable>
-                    <el-option v-for="item in mgroupOption" 
+					<el-option
+						v-for="item in mgroupOption"
 						:key="item.id"
 						:label="item.name"
 						:value="item.id"
 					>
 					</el-option>
 				</el-select>
-                <el-date-picker v-model="query.handle_date" type="date" placeholder="选择日期" value-format="YYYY-MM-DD" />
+				<el-date-picker
-                <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
+					v-model="query.handle_date"
+					type="date"
+					placeholder="选择日期"
+					value-format="YYYY-MM-DD"
+				/>
+				<el-button
+					type="primary"
+					icon="el-icon-search"
+					@click="handleQuery"
+					>查询</el-button
+				>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
-            <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :query="query">
+			<scTable
+				ref="table"
+				:apiObj="apiObj"
+				row-key="id"
+				stripe
+				:query="query"
+			>
 				<el-table-column type="index" width="50" />
-                <el-table-column label="物料" prop="material_out_name" show-overflow-tooltip>
+				<el-table-column
+					label="物料"
+					prop="material_out_name"
+					show-overflow-tooltip
+					min-width="120"
+				>
 				</el-table-column>
 				<el-table-column label="工序" prop="mgroup_name">
 				</el-table-column>
@@ -77,7 +98,11 @@
 				</el-table-column>
 				<el-table-column label="班组" prop="shift_name">
 				</el-table-column>
-                <el-table-column label="所属车间" prop="belong_dept_name" show-overflow-tooltip>
+				<el-table-column
+					label="所属车间"
+					prop="belong_dept_name"
+					show-overflow-tooltip
+				>
 				</el-table-column>
 				<el-table-column label="操作时间" prop="handle_date">
 				</el-table-column>
@@ -95,27 +120,27 @@ export default {
 			apiObj: this.$API.wpm.mlog.list,
 			query: {
 				page: 1,
-                page_size: 20
+				page_size: 20,
 			},
 			selection: [],
 			state_: {
-                10: '',
+				10: "",
-                20: '',
+				20: "",
 			},
-            mgroupOption:[],
+			mgroupOption: [],
 		};
 	},
 	mounted() {
 		this.getMgroup();
 	},
 	methods: {
-        getMgroup(){
+		getMgroup() {
-            this.$API.mtm.mgroup.list.req({page:0,}).then((res) => {
+			this.$API.mtm.mgroup.list.req({ page: 0 }).then((res) => {
 				this.mgroupOption = res;
 			});
 		},
 		handleQuery() {
-            this.$refs.table.queryData(this.query)
+			this.$refs.table.queryData(this.query);
 		},
 		resetQuery() {
 			this.query = {};

src/views/statistics/material_statistics.vue

@@ -127,18 +127,22 @@
 									hideDo
 								>
 									<el-table-column type="index" width="50" />
-									<el-table-column label="日期" prop="date">
+									<el-table-column label="年份" prop="年" />
-										<template #default="scope">
+									<el-table-column
-											<span>{{ scope.row.年 }}-</span>
+										v-if="queryType == '月'"
-											<span v-if="scope.row.周">{{
+										label="周"
-												scope.row.周
+										prop="周"
-											}}</span>
+									/>
-											<span v-if="scope.row.月">{{
+									<el-table-column
-												scope.row.月
+										v-else
-											}}</span>
+										label="月份"
-										</template>
+										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>