From 6d1f8fcbcbfa94c570a029928dd3ad743c9a41d5 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 9 Apr 2024 09:34:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=88=90=E5=93=81=E3=80=81=E5=8D=8A?=
 =?UTF-8?q?=E6=88=90=E5=93=81=E5=BA=93=E5=AD=98=E7=BB=9F=E8=AE=A1=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/widgets/index_photon.vue   | 39 ++++++++++++++-----
 src/views/statistics/stock_statistics.vue | 47 ++++++++++++++++++++++-
 2 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/src/views/home/widgets/index_photon.vue b/src/views/home/widgets/index_photon.vue
index c4913857..77c2eef4 100644
--- a/src/views/home/widgets/index_photon.vue
+++ b/src/views/home/widgets/index_photon.vue
@@ -376,15 +376,27 @@
 									style="width: 100%; height: 285px"
 								>
 									<el-table-column
-										prop="name"
+										prop="material_name"
 										label="产品名称"
 									/>
+									<el-table-column label="规格型号">
+										<template #default="scope">
+											{{ scope.row.material_model }}
+											<span
+												v-if="
+													scope.row.material_model &&
+													scope.row
+														.material_specification
+												"
+												>—</span
+											>
+											<span>{{
+												scope.row.material_specification
+											}}</span>
+										</template>
+									</el-table-column>
 									<el-table-column
-										prop="number"
-										label="规格型号"
-									/>
-									<el-table-column
-										prop="belong_dept_name"
+										prop="dept_name"
 										label="完成车间"
 									/>
 									<el-table-column
@@ -535,6 +547,7 @@ export default {
 		this.getMaterialList();
 		this.getProductStatistic();
 		this.getMaterialWarning();
+		this.getHalfProductList();
 	},
 	methods: {
 		// 动态绑定Class
@@ -561,9 +574,17 @@ export default {
 		},
 		//半成品数量统计
 		getHalfProductList() {
-			// this.$API.inm.halfProduct.list.req({ page: 0 }).then((res) => {
-			// 	this.halfProductList = res;
-			// });
+			let that = this;
+			let obj = {
+				query: {
+					material_types: "20",
+				},
+			};
+			that.$API.bi.dataset.exec.req("materialCount", obj).then((res) => {
+				if (res.data2.ds0) {
+					this.halfProductList = res.data2.ds0;
+				}
+			});
 		},
 		materialTypeChange() {
 			this.getMaterialList();
diff --git a/src/views/statistics/stock_statistics.vue b/src/views/statistics/stock_statistics.vue
index 41b72513..7dea40b6 100644
--- a/src/views/statistics/stock_statistics.vue
+++ b/src/views/statistics/stock_statistics.vue
@@ -32,6 +32,32 @@
 				</el-header>
 				<el-main>
 					<scTable
+						v-show="params.type == 10 || params.type == 20"
+						ref="tables1"
+						:data="tableData1"
+						id="exportDiv1"
+						stripe
+						hideDo
+						hidePagination
+					>
+						<el-table-column type="index" width="50" />
+						<el-table-column label="物料名" prop="material_name" />
+						<el-table-column label="型号" prop="material_model" />
+						<el-table-column
+							label="规格"
+							prop="material_specification"
+						/>
+						<el-table-column prop="dept_name" label="完成车间" />
+						<el-table-column label="库存总数" prop="count" />
+					</scTable>
+					<scTable
+						v-show="
+							params.type == 30 ||
+							params.type == 40 ||
+							params.type == 50 ||
+							params.type == 60 ||
+							params.type == 70
+						"
 						ref="tables1"
 						:apiObj="apiObj"
 						:params="params"
@@ -257,6 +283,7 @@ export default {
 			currentMonth: "",
 			currentLastDay: "",
 			tableData: [],
+			tableData1: [],
 			typeOptions: ["月", "年"],
 			materialTypeOptions: [
 				{ id: 10, name: "成品" },
@@ -282,13 +309,31 @@ export default {
 			that.currentYear + "-" + that.currentMonth + "-" + lastDay;
 		that.getTableData();
 		console.log(that.mio_type_name);
+		this.materialTypeChange();
 	},
 	methods: {
 		queryTypeChnge() {
 			this.query.queryDate = "";
 		},
 		materialTypeChange() {
-			this.$refs.tables1.refresh();
+			let that = this;
+			that.tableData1 = [];
+			if (that.params.type == 10 || that.params.type == 20) {
+				let obj = {
+					query: {
+						material_types: that.params.type,
+					},
+				};
+				that.$API.bi.dataset.exec
+					.req("materialCount", obj)
+					.then((res) => {
+						if (res.data2.ds0) {
+							that.tableData1 = res.data2.ds0;
+						}
+					});
+			} else {
+				that.$refs.tables1.refresh();
+			}
 		},
 		//更改周预估用量
 		weekcountChange(row) {