From 02475672d79a3867e947ce8f1ab1fcf68e59b863 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 24 May 2024 15:27:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=BA=93=E5=AD=98=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=8F=AA=E7=AE=97=E4=BB=93=E5=BA=93=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/stock_statistics.vue | 52 +++++++++++++++--------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/views/statistics/stock_statistics.vue b/src/views/statistics/stock_statistics.vue
index 7dea40b6..04c161f9 100644
--- a/src/views/statistics/stock_statistics.vue
+++ b/src/views/statistics/stock_statistics.vue
@@ -68,16 +68,28 @@
 						<el-table-column type="index" width="50" />
 						<el-table-column
 							label="物料名"
-							prop="name"
-						></el-table-column>
-						<el-table-column
-							label="型号"
-							prop="model"
-						></el-table-column>
-						<el-table-column
-							label="规格"
-							prop="specification"
+							prop="material_name"
 						></el-table-column>
+						<el-table-column label="型号">
+							<template #default="scope">
+								<span
+									v-if="scope.row.material_"
+									style="color: #999999"
+									>({{ scope.row.material_.model }})</span
+								>
+							</template>
+						</el-table-column>
+						<el-table-column label="规格">
+							<template #default="scope">
+								<span
+									v-if="scope.row.material_"
+									style="color: #999999"
+									>({{
+										scope.row.material_.specification
+									}})</span
+								>
+							</template>
+						</el-table-column>
 						<el-table-column
 							label="库存总数"
 							prop="count"
@@ -88,7 +100,10 @@
 						>
 							<template #default="scope">
 								<el-input
-									v-model="scope.row.week_esitimate_consume"
+									v-model="
+										scope.row.material_
+											.week_esitimate_consume
+									"
 									@blur="weekcountChange(scope.row)"
 								></el-input>
 							</template>
@@ -100,15 +115,16 @@
 							<template #default="scope">
 								<span
 									v-if="
-										scope.row.week_esitimate_consume &&
-										scope.row.week_esitimate_consume !==
-											null
+										scope.row.material_ &&
+										scope.row.material_
+											.week_esitimate_consume !== null
 									"
 								>
 									{{
 										Math.floor(
 											scope.row.count /
-												scope.row.week_esitimate_consume
+												scope.row.material_
+													.week_esitimate_consume
 										) * 7
 									}}
 								</span>
@@ -268,7 +284,7 @@ export default {
 	data() {
 		return {
 			mioTypeEnum,
-			apiObj: this.$API.mtm.material.list,
+			apiObj: this.$API.inm.warehouse.batch,
 			materialType: "",
 			params: { is_hidden: false, type: 10, count__gte: 1 },
 			query: {
@@ -337,9 +353,11 @@ export default {
 		},
 		//更改周预估用量
 		weekcountChange(row) {
-			let obj = { week_esitimate_consume: row.week_esitimate_consume };
+			let obj = {
+				week_esitimate_consume: row.material_.week_esitimate_consume,
+			};
 			this.$API.mtm.material.setWeekConsume
-				.req(row.id, obj)
+				.req(row.material_.id, obj)
 				.then((res) => {
 					console.log(res);
 					this.$refs.tables1.refresh();