Merge remote-tracking branch 'origin/master'

# Conflicts: # src/views/inout/IoCheckAuditOrder.vue
2 years ago · 948c1cf26f
parent 2cb7e20ca3 eed2047a2d
commit 948c1cf26f
1 changed files with 7 additions and 7 deletions
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@ -156,13 +156,13 @@
            >打印
            </el-button
            >
-            <el-button
-                type="text"
-                size="small"
-                @click.native="printOrderDetailPDF(scope.row)"
-            >报表打印
-            </el-button
-            >
+<!--            <el-button-->
+<!--                type="text"-->
+<!--                size="small"-->
+<!--                @click.native="printOrderDetailPDF(scope.row)"-->
+<!--            >报表打印-->
+<!--            </el-button-->
+<!--            >-->
            <el-button
              type="text"
              size="small"