Merge branch 'dev'

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-08-25 16:12:06
+ * @LastEditTime: 2023-08-25 16:39:06
 -->
 -->
 <template>
 <template>
   <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
   <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
@@ -170,10 +170,6 @@
         that.loadStatus = '1';
         that.loadStatus = '1';
         let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
         let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
         LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板
         LODOP.ADD_PRINT_DATA("ProgramData", this.ruleForm.tmpcontent); //装载模板
-        if (ruleForm.tmpno == 'zsdy') {
-          LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "B4");
-          ADD_PRINT_SETUP_BKIMG("<img border='0' src='http://192.168.2.38:9000/bdcdj/zhengshu_image/bdcqzs2.jpg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=KRMCXFVDPWMN0919UI1J%2F20230825%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20230825T080608Z&X-Amz-Expires=604800&X-Amz-Security-Token=eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJhY2Nlc3NLZXkiOiJLUk1DWEZWRFBXTU4wOTE5VUkxSiIsImV4cCI6MTY5Mjk1NDI1NiwicGFyZW50IjoibWluaW9hZG1pbiJ9.OOHyJOL0zk9n3pSdWC-uIMztKL2wwHM0DsFJr1sjhxTMlbSVnCWluQpf94D4fEq35c0Us2Mi7KKINDnojwox6A&X-Amz-SignedHeaders=host&versionId=null&X-Amz-Signature=67b9cea9b1e1386e3ec826ddd1e33e514715aabbb671be991df72f5e47b20c45'>")
-        }
         //窗口关闭后，回调函数中保存的设计代码
         //窗口关闭后，回调函数中保存的设计代码
         if (LODOP.CVERSION)
         if (LODOP.CVERSION)
           CLODOP.On_Return = function (TaskID, printList) {
           CLODOP.On_Return = function (TaskID, printList) {
@@ -187,6 +183,11 @@
             );
             );
             setTimeout(() => {
             setTimeout(() => {
               that.ruleForm.tmpcontent = document.getElementById("S1").value;
               that.ruleForm.tmpcontent = document.getElementById("S1").value;
+              if (that.ruleForm.tmpno == 'zsdy') {
+                LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src='http://192.168.2.38:9000/bdcdj/zhengshu_image/bdcqzs2.jpg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=KRMCXFVDPWMN0919UI1J%2F20230825%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20230825T080608Z&X-Amz-Expires=604800&X-Amz-Security-Token=eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJhY2Nlc3NLZXkiOiJLUk1DWEZWRFBXTU4wOTE5VUkxSiIsImV4cCI6MTY5Mjk1NDI1NiwicGFyZW50IjoibWluaW9hZG1pbiJ9.OOHyJOL0zk9n3pSdWC-uIMztKL2wwHM0DsFJr1sjhxTMlbSVnCWluQpf94D4fEq35c0Us2Mi7KKINDnojwox6A&X-Amz-SignedHeaders=host&versionId=null&X-Amz-Signature=67b9cea9b1e1386e3ec826ddd1e33e514715aabbb671be991df72f5e47b20c45'>");
+                LODOP.SET_SHOW_MODE("BKIMG_PRINT", 1);//打印包含背景图	
+                LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "B4");
+              }
               that.loadStatus = '2';
               that.loadStatus = '2';
             }, 1000);
             }, 1000);
           };
           };

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-08-25 14:43:39
+ * @LastEditTime: 2023-08-25 16:25:57
 -->
 -->
 <template>
 <template>
   <div>
   <div>