From 13eb12434fc5b2b194f749d3779afaa6b040dbef Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 28 May 2024 14:56:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=BA=93=E5=AD=98=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/stock_statistics.vue | 76 ++++++++---------------
 1 file changed, 25 insertions(+), 51 deletions(-)

diff --git a/src/views/statistics/stock_statistics.vue b/src/views/statistics/stock_statistics.vue
index 24b72d3c..823fdfc6 100644
--- a/src/views/statistics/stock_statistics.vue
+++ b/src/views/statistics/stock_statistics.vue
@@ -8,7 +8,7 @@
 					</div>
 					<div class="right-panel">
 						<el-select
-							v-model="params.material__type"
+							v-model="params.type"
 							clearable
 							@change="materialTypeChange"
 						>
@@ -32,10 +32,7 @@
 				</el-header>
 				<el-main>
 					<scTable
-						v-show="
-							params.material__type == 10 ||
-							params.material__type == 20
-						"
+						v-show="params.type == 10 || params.type == 20"
 						ref="tables1"
 						:data="tableData1"
 						id="exportDiv1"
@@ -55,11 +52,11 @@
 					</scTable>
 					<scTable
 						v-show="
-							params.material__type == 30 ||
-							params.material__type == 40 ||
-							params.material__type == 50 ||
-							params.material__type == 60 ||
-							params.material__type == 70
+							params.type == 30 ||
+							params.type == 40 ||
+							params.type == 50 ||
+							params.type == 60 ||
+							params.type == 70
 						"
 						ref="tables1"
 						:apiObj="apiObj"
@@ -71,63 +68,43 @@
 						<el-table-column type="index" width="50" />
 						<el-table-column
 							label="物料名"
-							prop="material_name"
+							prop="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 label="型号" prop="model">
 						</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 label="规格" prop="specification">
 						</el-table-column>
 						<el-table-column
 							label="库存总数"
-							prop="count"
+							prop="count_mb"
 						></el-table-column>
 						<el-table-column
 							label="周预估值"
-							v-if="params.material__type == 30"
+							v-if="params.type == 30"
 						>
 							<template #default="scope">
 								<el-input
-									v-model="
-										scope.row.material_
-											.week_esitimate_consume
-									"
+									v-model="scope.row.week_esitimate_consume"
 									@blur="weekcountChange(scope.row)"
 								></el-input>
 							</template>
 						</el-table-column>
 						<el-table-column
 							label="可用天数"
-							v-if="params.material__type == 30"
+							v-if="params.type == 30"
 						>
 							<template #default="scope">
 								<span
 									v-if="
-										scope.row.material_ &&
-										scope.row.material_
-											.week_esitimate_consume !== null
+										scope.row.week_esitimate_consume &&
+										scope.row.week_esitimate_consume !==
+											null
 									"
 								>
 									{{
 										Math.floor(
-											scope.row.count /
-												scope.row.material_
-													.week_esitimate_consume
+											scope.row.count_mb /
+												scope.row.week_esitimate_consume
 										) * 7
 									}}
 								</span>
@@ -287,9 +264,9 @@ export default {
 	data() {
 		return {
 			mioTypeEnum,
-			apiObj: this.$API.inm.warehouse.batch,
+			apiObj: this.$API.mtm.material.list,
 			materialType: "",
-			params: { is_hidden: false, material__type: 10, count__gte: 1 },
+			params: { is_hidden: false, type: 10, count__gte: 1 },
 			query: {
 				mio_type: mioTypeEnum.values[0].key,
 			},
@@ -337,13 +314,10 @@ export default {
 		materialTypeChange() {
 			let that = this;
 			that.tableData1 = [];
-			if (
-				that.params.material__type == 10 ||
-				that.params.material__type == 20
-			) {
+			if (that.params.type == 10 || that.params.type == 20) {
 				let obj = {
 					query: {
-						material_types: that.params.material__type,
+						material_types: that.params.type,
 					},
 				};
 				that.$API.bi.dataset.exec
@@ -360,10 +334,10 @@ export default {
 		//更改周预估用量
 		weekcountChange(row) {
 			let obj = {
-				week_esitimate_consume: row.material_.week_esitimate_consume,
+				week_esitimate_consume: row.week_esitimate_consume,
 			};
 			this.$API.mtm.material.setWeekConsume
-				.req(row.material_.id, obj)
+				.req(row.id, obj)
 				.then((res) => {
 					console.log(res);
 					this.$refs.tables1.refresh();