Merge remote-tracking branch 'origin/main'

src/views/warehouseManage/machinery/coding-nw/index.vue

@@ -132,6 +132,7 @@
                     size="mini"
                     @click="handlePush"
                     :disabled="ids.length == 0"
+                    v-if="ENV === 'development-nw' || ENV === 'production-nw'"
                     >推送租赁平台</el-button
                 >
             </el-col>
@@ -582,6 +583,7 @@ export default {
                 typeId: '',
                 maCode: '',
             },
+            ENV: process.env.VUE_APP_ENV,
             // 遮罩层
             loading: true,
             // 选中数组

src/views/warehouseManage/machinery/type/index.vue

@@ -524,7 +524,7 @@
                                     type="primary"
                                     icon="el-icon-upload"
                                     >点击上传</el-button
-                                ><span style="color: red">文件需小于20M</span>
+                                ><span style="color: red; margin-left: 10px">文件需小于20M</span>
                             </el-upload>
                         </el-form-item>
                     </el-col>