Merge remote-tracking branch 'origin/master'

zkqy-custom-business/src/main/java/com/zkqy/business/controller/MaterielController.java

@@ -148,7 +148,6 @@ public class MaterielController extends BaseController
     public AjaxResult queryMaterielAllList(){
         return AjaxResult.success(materielService.queryMaterielAllList());
     }
-
     /**
      * 查询母粒管理信息列表
      */

zkqy-ui/src/views/orderMange/codeListManage/printIndex.vue

@@ -814,11 +814,11 @@ export default {
       let msg = this.isEdit ? "编辑" : "新增";
       if (res.code == 200) {
         // 后端打印
-        // await this.newPrintHandler();
-        // this.tableData = [];
-        // this.$message.success(`总码单打印成功!`);
+         await this.newPrintHandler();
+         this.tableData = [];
+         this.$message.success(`总码单打印成功!`);
         // 前端打印
-        codeListPrint(this.printTableData, "printDom");
+        //codeListPrint(this.printTableData, "printDom");
 
         // 更新总码单id
         this.summertId = new Date().getTime(); //总码单id重新生成
@@ -1370,12 +1370,12 @@ export default {
             let msg = this.isEdit ? "编辑" : "新增";
             if (res.code == 200) {
               // 后端打印
-              // await this.newPrintHandler();
+               await this.newPrintHandler();
               // 前端打印
-              codeListPrint(this.printTableData, "printDom");
-              if (this.excuteType == 1) {
-                this.tableData.push(this.printTableData[0]);
-              }
+              //codeListPrint(this.printTableData, "printDom");
+              // if (this.excuteType == 1) {
+              //   this.tableData.push(this.printTableData[0]);
+              // }
             } else {
               this.$message.error(`${msg}箱单失败`);
             }