From d44320804a41ee26e1cb7d9db6829513a21f5beb Mon Sep 17 00:00:00 2001
From: wcy <761646706@qq.com>
Date: Wed, 25 Sep 2024 10:22:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/repairTest/repair/dialogTwoForm.vue |  2 +-
 src/views/repairTest/testExamine/index.vue    | 76 +++++++++++--------
 src/views/stquery/deviceStatusRecord.vue      |  2 +-
 .../warehouseManage/machinery/parts/index.vue |  2 +-
 4 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/src/views/repairTest/repair/dialogTwoForm.vue b/src/views/repairTest/repair/dialogTwoForm.vue
index 2fb4dfe..19dc3c8 100644
--- a/src/views/repairTest/repair/dialogTwoForm.vue
+++ b/src/views/repairTest/repair/dialogTwoForm.vue
@@ -113,7 +113,7 @@
                             label="配件数量："
                             :rules="{
                                 required: false,
-                                validator: numberIntegerValidator,
+                                // validator: numberIntegerValidator,
                                 trigger: 'blur',
                             }"
                         >
diff --git a/src/views/repairTest/testExamine/index.vue b/src/views/repairTest/testExamine/index.vue
index a8c16f8..7b54095 100644
--- a/src/views/repairTest/testExamine/index.vue
+++ b/src/views/repairTest/testExamine/index.vue
@@ -450,15 +450,14 @@
                             type="primary"
                             icon="el-icon-zoom-in"
                             @click="repairRecord(scope.row)"
-                            >维修记录</el-button
-                        >
-                        <el-button
+                            >维修记录</el-button>
+                        <!-- <el-button
                             size="mini"
                             type="warning"
                             icon="el-icon-circle-check"
                             @click="partRecord(scope.row)"
-                            >配件详情</el-button
-                        >
+                            >配件详情</el-button> -->
+                            
                     </template>
                 </el-table-column>
             </el-table>
@@ -570,24 +569,30 @@
                         <span v-if="scope.row.scrapType == '1'">人为报废</span>
                     </template>
                 </el-table-column>
-                <el-table-column
-                    label="配件名称"
-                    align="center"
-                    prop="partName"
-                    :show-overflow-tooltip="true"
-                />
+<!--                <el-table-column-->
+<!--                    label="配件名称"-->
+<!--                    align="center"-->
+<!--                    prop="partName"-->
+<!--                    :show-overflow-tooltip="true"-->
+<!--                />-->
                 <el-table-column
                     label="配件数量"
                     align="center"
                     prop="partNum"
-                    :show-overflow-tooltip="true"
-                />
-                <el-table-column
-                    label="配件单价"
-                    align="center"
-                    prop="partPrice"
-                    :show-overflow-tooltip="true"
-                />
+                    :show-overflow-tooltip="true">
+                    <template slot-scope="scope">
+                        <span @click="partRecord(scope.row)"
+                        style="color: blue;text-decoration: underline;">{{ scope.row.partNum }}</span>
+                    </template>
+                </el-table-column>
+               
+                
+<!--                <el-table-column-->
+<!--                    label="配件单价"-->
+<!--                    align="center"-->
+<!--                    prop="partPrice"-->
+<!--                    :show-overflow-tooltip="true"-->
+<!--                />-->
                 <el-table-column
                     label="类型"
                     align="center"
@@ -650,17 +655,17 @@
                     prop="partCost"
                     :show-overflow-tooltip="true"
                 />
-                <el-table-column
-                    label="类型"
-                    align="center"
-                    prop="partType"
-                    :show-overflow-tooltip="true"
-                >
-                    <template slot-scope="scope">
-                        <span v-if="scope.row.partType == '0'">不收费</span>
-                        <span v-if="scope.row.partType == '1'">收费</span>
-                    </template>
-                </el-table-column>
+<!--                <el-table-column-->
+<!--                    label="类型"-->
+<!--                    align="center"-->
+<!--                    prop="partType"-->
+<!--                    :show-overflow-tooltip="true"-->
+<!--                >-->
+<!--                    <template slot-scope="scope">-->
+<!--                        <span v-if="scope.row.partType == '0'">不收费</span>-->
+<!--                        <span v-if="scope.row.partType == '1'">收费</span>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
                 <el-table-column
                     label="备注"
                     align="center"
@@ -930,6 +935,7 @@ export default {
                         this.open = true
                         this.dialogList = response.rows
                         this.dialogTotal = response.total
+                        this.repairId = rows.repairId
                     }
                 })
                 .catch(() => {})
@@ -1122,6 +1128,7 @@ export default {
             this.repairRecordParams.pageNum = 1
             this.repairRecordParams.pageSize = 10
             this.repairId = row.repairId
+            console.log(this.repairId, 'repairId')
             this.getRepairRecordList()
         },
         getRepairRecordList() {
@@ -1143,8 +1150,12 @@ export default {
         partRecord(row) {
             this.partRecordParams.pageNum = 1
             this.partRecordParams.pageSize = 10
-            this.repairId = row.repairId
-            this.getPartRecordList()
+           
+            // this.repairId = row.repairId
+            // console.log(row, 'row===============')
+            console.log(this.repairId)
+            console.log(111111111111)
+            this.getPartRecordList(row)
         },
         getPartRecordList() {
             let params = {
@@ -1152,6 +1163,7 @@ export default {
                 pageNum: this.partRecordParams.pageNum,
                 pageSize: this.partRecordParams.pageSize,
             }
+            console.log(params)
             getPartRecord(params)
                 .then((res) => {
                     this.partRecordList = res.rows
diff --git a/src/views/stquery/deviceStatusRecord.vue b/src/views/stquery/deviceStatusRecord.vue
index 215d870..e7eaa00 100644
--- a/src/views/stquery/deviceStatusRecord.vue
+++ b/src/views/stquery/deviceStatusRecord.vue
@@ -331,7 +331,7 @@ export default {
         /** 导出按钮操作 */
         handleExport() {
             this.download(
-                'material/backRecord/export',
+                'material/storageStatus/export',
                 {
                     ...this.queryParams,
                 },
diff --git a/src/views/warehouseManage/machinery/parts/index.vue b/src/views/warehouseManage/machinery/parts/index.vue
index 7329f87..e89b1c9 100644
--- a/src/views/warehouseManage/machinery/parts/index.vue
+++ b/src/views/warehouseManage/machinery/parts/index.vue
@@ -468,7 +468,7 @@ export default {
         },
         /** 查询部门列表 */
         getList() {
-            console.log(this.queryParams)
+            console.log(this.queryParams,"wwwwwww")
             // this.loading = true;
             listPartType(this.queryParams)
                 .then((response) => {