Merge branch 'feature/distribution' into test

src/pages/Groupmeal/orderManagement/index.vue

@@ -540,7 +540,7 @@ export default {
       }
 
       let res = await this.printOrderMet(false);
-
+      console.log(res.code);
       if (res.code === 0) {
         this.$message({
           type: "success",
@@ -550,19 +550,28 @@ export default {
       }
 
       if (res.code !== 10) {
-        this.$message.error(res.reason);
+        if (res.reason) {
+          this.$message.error(res.reason);
+        } else {
+          this.$message.error("打印失败");
+        }
         return;
       }
 
-      try {
-        await this.$confirm(res.reason, "打印", {
-          cancelButtonText: "取消",
-          confirmButtonText: "确定",
-        });
-      } catch (e) {
-        // 取消
-        return;
+      if (res.reason) {
+        try {
+          await this.$confirm(res.reason, "打印", {
+            cancelButtonText: "取消",
+            confirmButtonText: "确定",
+          });
+        } catch (e) {
+          // 取消
+          return;
+        }
+      } else {
+        this.$message.error("打印失败");
       }
+
       res = await this.printOrderMet(true);
 
       // if (res.code !== 0) {