Merge branch 'main' of http://192.168.30.2:3000/bonus/nw-cqdevicemgt-ui

2024-10-15 17:07:09 +08:00 · 2024-10-15 17:07:09 +08:00 · 0a731bf59a
parent d9e72092a8 a55814fae7
commit 0a731bf59a
2 changed files with 2 additions and 2 deletions
--- a/src/views/repairTest/repair/index.vue
+++ b/src/views/repairTest/repair/index.vue
@ -249,7 +249,7 @@
                        size="mini"
                        type="text"
                        icon="el-icon-setting"
-                        v-if="scope.row.repairStatusCode == '43'"
+                        v-if="scope.row.repairStatusCode == '43'||scope.row.repairStatusCode == '42'"
                        @click="handleUpdate(scope.row, 'update')"
                    >
                        维修
--- a/src/views/warehouseManage/machinery/type/index.vue
+++ b/src/views/warehouseManage/machinery/type/index.vue
@ -524,7 +524,7 @@
                                    type="primary"
                                    icon="el-icon-upload"
                                    >点击上传</el-button
-                                >
+                                ><span>文件需小于20M</span>
                            </el-upload>
                        </el-form-item>
                    </el-col>