From ff19bedf761092e39e57047c2f7006c312464ace Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 26 Mar 2024 13:51:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=87=E8=B4=AD=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qm/process.vue                     | 265 ++++++++++---------
 src/views/statistics/material_statistics.vue |  26 +-
 2 files changed, 160 insertions(+), 131 deletions(-)

diff --git a/src/views/qm/process.vue b/src/views/qm/process.vue
index b74ed97f..506b8453 100644
--- a/src/views/qm/process.vue
+++ b/src/views/qm/process.vue
@@ -1,125 +1,150 @@
 <template>
-    <el-container>
-        <el-header>
-            <div class="left-panel">
-            </div>
-            <div class="right-panel">
-                <el-select v-model="query.mgroup" clearable>
-                    <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-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">
-                <el-table-column type="index" width="50" />
-                <el-table-column label="物料" prop="material_out_name" show-overflow-tooltip>
-                </el-table-column>
-                <el-table-column label="工序" prop="mgroup_name">
-                </el-table-column>
-                <el-table-column label="生产数" prop="count_real">
-                </el-table-column>
-                <el-table-column label="合格数" prop="count_ok">
-                </el-table-column>
-                <el-table-column label="不合格数" prop="count_notok">
-                </el-table-column>
-                <el-table-column label="不合格原因" align="center">
-                    <el-table-column label="划伤" prop="count_n_hs">
-                    </el-table-column>
-                    <el-table-column label="挫伤" prop="count_n_zs">
-                    </el-table-column>
-                    <el-table-column label="杂质" prop="count_n_zz">
-                    </el-table-column>
-                    <el-table-column label="条纹" prop="count_n_tw">
-                    </el-table-column>
-                    <el-table-column label="短" prop="count_n_d">
-                    </el-table-column>
-                    <el-table-column label="锥度大" prop="count_n_zds">
-                    </el-table-column>
-                    <el-table-column label="气泡" prop="count_n_qp">
-                    </el-table-column>
-                    <el-table-column label="不亮" prop="count_n_bl">
-                    </el-table-column>
-                    <el-table-column label="横纹" prop="count_n_hw">
-                    </el-table-column>
-                    <el-table-column label="有皮" prop="count_n_yp">
-                    </el-table-column>
-                    <el-table-column label="爆皮" prop="count_n_bp">
-                    </el-table-column>
-                    <el-table-column label="色差" prop="count_n_sc">
-                    </el-table-column>
-                     <el-table-column label="炸纹" prop="count_n_zw">
-                    </el-table-column>
-                     <el-table-column label="弯曲" prop="count_n_wq">
-                    </el-table-column>
-                     <el-table-column label="断裂" prop="count_n_dl">
-                    </el-table-column>
-                     <el-table-column label="偏壁" prop="count_n_pb">
-                    </el-table-column>
-                     <el-table-column label="大小头" prop="count_n_dxt">
-                    </el-table-column>
-                     <el-table-column label="气线" prop="count_n_qx">
-                    </el-table-column>
-                     <el-table-column label="结石" prop="count_n_js">
-                    </el-table-column>
-                     <el-table-column label="椭圆度大" prop="count_n_tydd">
-                    </el-table-column>
-                    <el-table-column label="水雾" prop="count_n_sw">
-                    </el-table-column>
-                    <el-table-column label="壁厚偏差大" prop="count_n_bhpcd">
-                    </el-table-column>
-                </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>
-                <el-table-column label="操作时间" prop="handle_date">
-                </el-table-column>
-                <el-table-column label="处理人" prop="handle_user_name">
-                </el-table-column>
-            </scTable>
-        </el-main>
-    </el-container>
+	<el-container>
+		<el-header>
+			<div class="left-panel"></div>
+			<div class="right-panel">
+				<el-select v-model="query.mgroup" clearable>
+					<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-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"
+			>
+				<el-table-column type="index" width="50" />
+				<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>
+				<el-table-column label="生产数" prop="count_real">
+				</el-table-column>
+				<el-table-column label="合格数" prop="count_ok">
+				</el-table-column>
+				<el-table-column label="不合格数" prop="count_notok">
+				</el-table-column>
+				<el-table-column label="不合格原因" align="center">
+					<el-table-column label="划伤" prop="count_n_hs">
+					</el-table-column>
+					<el-table-column label="挫伤" prop="count_n_zs">
+					</el-table-column>
+					<el-table-column label="杂质" prop="count_n_zz">
+					</el-table-column>
+					<el-table-column label="条纹" prop="count_n_tw">
+					</el-table-column>
+					<el-table-column label="短" prop="count_n_d">
+					</el-table-column>
+					<el-table-column label="锥度大" prop="count_n_zds">
+					</el-table-column>
+					<el-table-column label="气泡" prop="count_n_qp">
+					</el-table-column>
+					<el-table-column label="不亮" prop="count_n_bl">
+					</el-table-column>
+					<el-table-column label="横纹" prop="count_n_hw">
+					</el-table-column>
+					<el-table-column label="有皮" prop="count_n_yp">
+					</el-table-column>
+					<el-table-column label="爆皮" prop="count_n_bp">
+					</el-table-column>
+					<el-table-column label="色差" prop="count_n_sc">
+					</el-table-column>
+					<el-table-column label="炸纹" prop="count_n_zw">
+					</el-table-column>
+					<el-table-column label="弯曲" prop="count_n_wq">
+					</el-table-column>
+					<el-table-column label="断裂" prop="count_n_dl">
+					</el-table-column>
+					<el-table-column label="偏壁" prop="count_n_pb">
+					</el-table-column>
+					<el-table-column label="大小头" prop="count_n_dxt">
+					</el-table-column>
+					<el-table-column label="气线" prop="count_n_qx">
+					</el-table-column>
+					<el-table-column label="结石" prop="count_n_js">
+					</el-table-column>
+					<el-table-column label="椭圆度大" prop="count_n_tydd">
+					</el-table-column>
+					<el-table-column label="水雾" prop="count_n_sw">
+					</el-table-column>
+					<el-table-column label="壁厚偏差大" prop="count_n_bhpcd">
+					</el-table-column>
+				</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>
+				<el-table-column label="操作时间" prop="handle_date">
+				</el-table-column>
+				<el-table-column label="处理人" prop="handle_user_name">
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
 </template>
 <script>
 export default {
-    name: "rparty",
-    data() {
-        return {
-            apiObj: this.$API.wpm.mlog.list,
-            query: {
-                page: 1,
-                page_size: 20
-            },
-            selection: [],
-            state_: {
-                10: '',
-                20: '',
-            },
-            mgroupOption:[],
-        };
-    },
-    mounted() {
-        this.getMgroup(); 
-    },
-    methods: {
-        getMgroup(){
-            this.$API.mtm.mgroup.list.req({page:0,}).then((res) => {
-                this.mgroupOption = res;
-            });
-        },
-        handleQuery() {
-            this.$refs.table.queryData(this.query)
-        },
-        resetQuery() {
-            this.query = {};
-        },
-    },
+	name: "rparty",
+	data() {
+		return {
+			apiObj: this.$API.wpm.mlog.list,
+			query: {
+				page: 1,
+				page_size: 20,
+			},
+			selection: [],
+			state_: {
+				10: "",
+				20: "",
+			},
+			mgroupOption: [],
+		};
+	},
+	mounted() {
+		this.getMgroup();
+	},
+	methods: {
+		getMgroup() {
+			this.$API.mtm.mgroup.list.req({ page: 0 }).then((res) => {
+				this.mgroupOption = res;
+			});
+		},
+		handleQuery() {
+			this.$refs.table.queryData(this.query);
+		},
+		resetQuery() {
+			this.query = {};
+		},
+	},
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/statistics/material_statistics.vue b/src/views/statistics/material_statistics.vue
index 6401ebb0..870c01a7 100644
--- a/src/views/statistics/material_statistics.vue
+++ b/src/views/statistics/material_statistics.vue
@@ -127,18 +127,22 @@
 									hideDo
 								>
 									<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="年" />
+									<el-table-column
+										v-if="queryType == '月'"
+										label="周"
+										prop="周"
+									/>
+									<el-table-column
+										v-else
+										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>