From 34c69d296b6c014da93d3d1c31c9acea1e1f1c79 Mon Sep 17 00:00:00 2001
From: itcast <hello@itcast.cn>
Date: Fri, 30 Jan 2026 15:17:32 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=9D=E6=9C=89=E9=87=8F=E5=BE=85?=
 =?UTF-8?q?=E4=BF=AE=E4=B8=8D=E8=B7=B3=E8=BD=AC=E7=BB=B4=E4=BF=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/stquery/deviceStatusRecord.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/material/stquery/deviceStatusRecord.vue b/src/views/material/stquery/deviceStatusRecord.vue
index 33730f04..76899160 100644
--- a/src/views/material/stquery/deviceStatusRecord.vue
+++ b/src/views/material/stquery/deviceStatusRecord.vue
@@ -413,10 +413,13 @@
           <el-table-column label="退料时间" align="center" prop="leaseTime" :show-overflow-tooltip="true"/>
           <el-table-column label="维修单号" align="center" prop="repairCode" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-                <span class="clickText" @click="jumpRepair(scope.row.repairCode)">
-                {{ scope.row.repairCode }}
+                <span
+                  :class="{clickText: dialogRepairQuery.type === 2}"
+                  @click="dialogRepairQuery.type === 2 && jumpRepair(scope.row.repairCode)"
+                >
+                      {{ scope.row.repairCode }}
                 </span>
-              </template>
+            </template>
           </el-table-column>
         </el-table>
 

From 1e23c3462ea45ce31cd384f2ed9085b72f7d0e9d Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Fri, 30 Jan 2026 15:51:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/report/goodsEntryReport.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/material/report/goodsEntryReport.vue b/src/views/material/report/goodsEntryReport.vue
index 1e9760f5..c5dc3f07 100644
--- a/src/views/material/report/goodsEntryReport.vue
+++ b/src/views/material/report/goodsEntryReport.vue
@@ -103,8 +103,8 @@
                     </span>
                 </template>
             </el-table-column>
-            <el-table-column label="采购价格(含税)" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
             <el-table-column label="采购价格(不含税)" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/>
+            <el-table-column label="采购价格(含税)" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
             <el-table-column label="物资厂家" align="center" prop="supplierName" :show-overflow-tooltip="true"/>
             <el-table-column label="到货时间" align="center" prop="purchaseTime" :show-overflow-tooltip="true"/>
             <el-table-column label="验收时间" align="center" prop="passTime" :show-overflow-tooltip="true"/>
@@ -170,8 +170,8 @@
                 <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
                 <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
                 <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/>
-                <el-table-column label="采购价格（含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
                 <el-table-column label="采购价格（不含税）" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/>
+                <el-table-column label="采购价格（含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
             </el-table>
             <pagination
                 v-show="dialogTotal > 0"
@@ -221,8 +221,8 @@
                 <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
                 <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
                 <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/>
-                <el-table-column label="采购价格（含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
                 <el-table-column label="采购价格（不含税）" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/>
+                <el-table-column label="采购价格（含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
             </el-table>
             <pagination
                 v-show="dialogTotal > 0"
@@ -272,8 +272,8 @@
                 <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
                 <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
                 <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/>
-                <el-table-column label="采购价格（含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
                 <el-table-column label="采购价格（不含税）" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/>
+                <el-table-column label="采购价格（含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
             </el-table>
             <pagination
                 v-show="dialogTotal > 0"
@@ -323,8 +323,8 @@
                 <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
                 <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
                 <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/>
-                <el-table-column label="采购价格（含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
                 <el-table-column label="采购价格（不含税）" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/>
+                <el-table-column label="采购价格（含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
             </el-table>
             <pagination
                 v-show="dialogTotal > 0"

From 233482b169208da3c30aa11992cb7d79184aeca6 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Fri, 30 Jan 2026 16:59:34 +0800
Subject: [PATCH 3/3] =?UTF-8?q?Revert=20"=E4=BC=98=E5=8C=96"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 1e23c3462ea45ce31cd384f2ed9085b72f7d0e9d.
---
 src/views/material/report/goodsEntryReport.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/material/report/goodsEntryReport.vue b/src/views/material/report/goodsEntryReport.vue
index c5dc3f07..1e9760f5 100644
--- a/src/views/material/report/goodsEntryReport.vue
+++ b/src/views/material/report/goodsEntryReport.vue
@@ -103,8 +103,8 @@
                     </span>
                 </template>
             </el-table-column>
-            <el-table-column label="采购价格(不含税)" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/>
             <el-table-column label="采购价格(含税)" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
+            <el-table-column label="采购价格(不含税)" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/>
             <el-table-column label="物资厂家" align="center" prop="supplierName" :show-overflow-tooltip="true"/>
             <el-table-column label="到货时间" align="center" prop="purchaseTime" :show-overflow-tooltip="true"/>
             <el-table-column label="验收时间" align="center" prop="passTime" :show-overflow-tooltip="true"/>
@@ -170,8 +170,8 @@
                 <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
                 <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
                 <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/>
-                <el-table-column label="采购价格（不含税）" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/>
                 <el-table-column label="采购价格（含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
+                <el-table-column label="采购价格（不含税）" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/>
             </el-table>
             <pagination
                 v-show="dialogTotal > 0"
@@ -221,8 +221,8 @@
                 <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
                 <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
                 <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/>
-                <el-table-column label="采购价格（不含税）" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/>
                 <el-table-column label="采购价格（含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
+                <el-table-column label="采购价格（不含税）" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/>
             </el-table>
             <pagination
                 v-show="dialogTotal > 0"
@@ -272,8 +272,8 @@
                 <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
                 <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
                 <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/>
-                <el-table-column label="采购价格（不含税）" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/>
                 <el-table-column label="采购价格（含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
+                <el-table-column label="采购价格（不含税）" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/>
             </el-table>
             <pagination
                 v-show="dialogTotal > 0"
@@ -323,8 +323,8 @@
                 <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
                 <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
                 <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/>
-                <el-table-column label="采购价格（不含税）" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/>
                 <el-table-column label="采购价格（含税）" align="center" prop="purchasePrice" :show-overflow-tooltip="true"/>
+                <el-table-column label="采购价格（不含税）" align="center" prop="purchasePriceNoTax" :show-overflow-tooltip="true"/>
             </el-table>
             <pagination
                 v-show="dialogTotal > 0"