Merge remote-tracking branch 'origin/test'

src/views/system/print/pdfCodePrintSet.vue

@@ -474,7 +474,7 @@ export default {
       };
       this.moduleFormVisible = true;
       this.selectTemplateQuery = {
-        module: 2,
+        module: 3,
         busRlId: row.id,
         type: 1,
         name: "",

src/views/system/print/pdfTmpleateManage.vue

@@ -16,7 +16,8 @@
               <el-option label="全部" value=""></el-option>
               <el-option label="标签" value="0"></el-option>
               <el-option label="报表" value="1"></el-option>
-              <el-option label="单据" value="2"></el-option>
+              <el-option label="业务单据" value="2"></el-option>
+              <el-option label="扫码单据" value="3"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -374,7 +375,7 @@ export default {
       jrxmlFileList: [],
       uploadDisabled: false,
       moduleLoading: false,
-      moduleNameMap: {0: "标签", 1: "报表", 2: "单据"},
+      moduleNameMap: {0: "标签", 1: "报表", 2: "业务单据",3: "扫码单据"},
     };
   },
   methods: {