From ebb2a830ff8ef014f74d22caa644d5348e273790 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 6 May 2025 11:33:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=85=89=E5=AD=90=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E4=B8=A4=E4=B8=AA=E6=95=B0=E7=9A=84=E6=96=87=E6=A1=88?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=8C=E5=8D=8A=E6=88=90=E5=93=81=E5=BA=93?=
 =?UTF-8?q?=E4=B8=AD=E5=8E=BB=E6=8E=89=E6=9C=89=E6=95=88=E6=9C=9F=EF=BC=8C?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=A3=80=E9=AA=8C=E6=8C=89=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_photon.vue    | 22 +++++++---------------
 src/views/inm/halfgood.vue              |  4 ++--
 src/views/qm/income.vue                 |  3 ++-
 src/views/statistics/inm_statistics.vue |  2 +-
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/views/bigScreen/index_photon.vue b/src/views/bigScreen/index_photon.vue
index f73d30a5..2fa120d2 100644
--- a/src/views/bigScreen/index_photon.vue
+++ b/src/views/bigScreen/index_photon.vue
@@ -48,21 +48,13 @@
 							<div class="totalNumContnier">
 								<div class="totalNumWrap totalNumWrap_green">
 									<img src="img/number_bg_green.png" />
-									<span class="totalNumText"
-										>预制棒合格数</span
-									>
-									<div class="totalNumber">
-										{{ countOk_dept7 }}
-									</div>
+									<span class="totalNumText">本周预制棒合格数</span>
+									<div class="totalNumber">{{ countOk_dept7 }}</div>
 								</div>
 								<div class="totalNumWrap totalNum_blue">
 									<img src="img/number_bg_blue.png" />
-									<span class="totalNumText"
-										>预制管合格数</span
-									>
-									<div class="totalNumber">
-										{{ countOk_dept10 }}
-									</div>
+									<span class="totalNumText">本周预制管合格数</span>
+									<div class="totalNumber">{{ countOk_dept10 }}</div>
 								</div>
 							</div>
 						</div>
@@ -573,7 +565,7 @@ export default {
 		this.getPlanRate();
 		this.getMaterialList();
 		},
-		//本周6车间交付数----棒管交付数
+		//本周棒管交付数
 		getsaleOut() {
 			let that = this;
 			let obj = {
@@ -2160,7 +2152,7 @@ export default {
 }
 
 .totalNumWrap > img {
-	width: 10vw;
+	width: 12vw;
 }
 
 .totalNumWrap_green > .totalNumber {
@@ -2176,7 +2168,7 @@ export default {
 }
 
 .totalNumber {
-	font-size: 25px;
+	font-size: 2vw;
 	font-weight: bold;
 	position: absolute;
 	left: 50%;
diff --git a/src/views/inm/halfgood.vue b/src/views/inm/halfgood.vue
index 491be73a..b43971ad 100644
--- a/src/views/inm/halfgood.vue
+++ b/src/views/inm/halfgood.vue
@@ -66,8 +66,8 @@
 						</el-table-column>
 						<el-table-column label="物料存量" prop="count">
 						</el-table-column>
-						<el-table-column label="有效期" prop="expiration_date">
-						</el-table-column>
+						<!-- <el-table-column label="有效期" prop="expiration_date">
+						</el-table-column> -->
 						<el-table-column label="更新时间" prop="update_time">
 						</el-table-column>
 						<el-table-column width="90">
diff --git a/src/views/qm/income.vue b/src/views/qm/income.vue
index 63ddfcfa..831610bb 100644
--- a/src/views/qm/income.vue
+++ b/src/views/qm/income.vue
@@ -89,8 +89,9 @@ export default {
             apiObj: this.$API.inm.mioitem.list,
             query: {
                 test_date: '',
+                ordering: '-test_date'
             },
-            params: { type: 20, mio__type: 'pur_in' },
+            params: { type: 20, mio__type: 'pur_in',ordering: '-test_date'},
             selection: [],
             state_: {
                 10: '',
diff --git a/src/views/statistics/inm_statistics.vue b/src/views/statistics/inm_statistics.vue
index f8f9ced8..e0481640 100644
--- a/src/views/statistics/inm_statistics.vue
+++ b/src/views/statistics/inm_statistics.vue
@@ -120,7 +120,7 @@
 									</el-table-column>
 									<el-table-column label="型号" prop="型号">
 									</el-table-column>
-									<el-table-column label="数量" prop="count">
+									<el-table-column label="数量" prop="数量">
 									</el-table-column>
 								</el-table>
 							</el-card>