新的出团通知书

package.json

@@ -29,9 +29,10 @@
     "file-saver": "^2.0.0",
     "fs": "^0.0.1-security",
     "google-translate-api": "^2.3.0",
+    "html-to-image": "^1.11.13",
     "html2canvas": "^1.0.0-alpha.12",
     "js-md5": "^0.7.3",
-    "jspdf": "^2.5.1",
+    "jspdf": "^3.0.3",
     "lrz": "^4.9.40",
     "mapbox-gl": "^2.15.0",
     "moment": "^2.24.0",

src/App.vue

@@ -256,7 +256,7 @@
   body {
     margin: 0;
     padding: 0;
-    background: #f9f9f9 url(assets/img/img-bg.png) no-repeat bottom left/100% auto;
+    background: #f9f9f9 no-repeat bottom left/100% auto;/*url(assets/img/img-bg.png) */
     height: 100%;
   }
 

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -5448,6 +5448,16 @@
         });
       },
       toTrip: function (obj, TicketUnionId, GuestIds) {
+        this.$router.push({
+          name: 'TravelNoticeDownLoad',
+          params: {
+            id: obj.TCID,
+            orderId: obj.OrderId,
+            guestIds: GuestIds?GuestIds:'0',
+            unionfid: TicketUnionId?TicketUnionId:0
+          }
+        })
+        return
         this.tripObj.tcid = obj.TCID;
         this.tripObj.configId = obj.ConfigId;
         this.tripObj.orderId = obj.OrderId;
@@ -6930,10 +6940,22 @@
       },
       //出团通知书
       getOrderInfo() {
+        if(this.ConfigData.Config.OutNotice == 1) this.SetOutNotice()
+        else{
           this.getFlightInfo();
           this.getCombinTeam();
+        }
       },
       SetOutNotice() {
+        this.$router.push({
+          name: 'TravelNoticePreview',
+          params: {
+            id:this.ConfigData.Config.TCID,
+            tab: '出团通知书预览',
+            target:'y'
+          }
+        })
+        return
         var that = this;
         this.Confirm(
           this.$t('objFill.shifou') + "【" +

src/components/systemManagement/lineManagement.vue

@@ -463,6 +463,9 @@
                     <el-button type="primary" icon="el-icon-edit"
                       @click="isShowDIv = true,divTitle='修改线路',updateData(index)"></el-button>
                   </el-tooltip>
+                  <el-tooltip class="item" effect="dark" content="配置线路出团通知书模版" placement="top-start">
+                    <el-button icon="el-icon-s-flag" @click="handlerNoticeTemplate(item.lineID)"></el-button>
+                  </el-tooltip>
                   <el-tooltip class="item" effect="dark" :content="$t('system.btn_CtrlSet')" placement="top-start">
                     <el-button type="success" icon="el-icon-setting" @click="getBranchList(item.lineID)"></el-button>
                   </el-tooltip>
@@ -847,6 +850,9 @@
       };
     },
     methods: {
+      handlerNoticeTemplate(lineID) {
+        this.$router.push({ path: '/TravelNoticeConfig', query: { lineId: lineID, blank: 'y', tab: '出团通知书配置' } });
+      },
       handleChange3(file, fileList) {
         this.fileList3 = fileList.slice(-1);
       },

src/pages/travel-notice/ConfigManager.vue

@@ -118,6 +118,7 @@
             </div>
         </div>
         <div class="operate-btn">
+          <el-button v-if="state" size="small" @click="handleBack">返回</el-button>
           <el-button type="primary" size="small" @click="saveContent">保存</el-button>
         </div>
         <!-- 自定义预览弹窗 -->
@@ -272,7 +273,8 @@ export default {
             lineId:0,
             tcid:0,
             orderId:0,
-            loading:true
+            loading:true,
+            state:0
         }
     },
     mounted() {
@@ -293,6 +295,7 @@ export default {
         });
         if(this.$route.query.lineId) this.lineId = this.$route.query.lineId;
         else if(this.$route.query.tcid) this.tcid = this.$route.query.tcid;
+        if(this.$route.query.state) this.state = this.$route.query.state;
         if(this.lineId) this.loadLineNoticeInfo();
         else if(this.tcid) this.loadTravelNoticeInfo();
     },
@@ -307,6 +310,19 @@ export default {
                 this.handleClosePreview();
             }
         },
+        // 展开根节点
+        expandRootNode() {
+            this.$nextTick(() => {
+                if (this.$refs.tree && this.configList.length > 0) {
+                    this.$refs.tree.setCurrentKey(this.configList[0].id);
+                    // 展开根节点
+                    const rootNodeId = this.configList[0].id;
+                    if (this.$refs.tree.store.nodesMap[rootNodeId]) {
+                        this.$refs.tree.store.nodesMap[rootNodeId].expanded = true;
+                    }
+                }
+            });
+        },
         loadLineNoticeInfo() {
           if(!this.lineId) return
           this.apipost("travel_post_GetNoticeConfigList", {
@@ -315,6 +331,7 @@ export default {
               if(res.data.resultCode == 1 && res.data.data.length > 0) {
                 this.configList = JSON.parse(res.data.data[0].Content);
                 this.loading=false
+                this.expandRootNode()
               }else{
                 this.loadLine()
               }
@@ -328,6 +345,7 @@ export default {
               if(res.data.resultCode == 1 && res.data.data.Content !='') {
                 this.configList = JSON.parse(res.data.data.Content);
                 this.loading=false
+                this.expandRootNode()
               }else{
 
                 this.loadTravel()
@@ -360,6 +378,7 @@ export default {
                       this.configList = JSON.parse(res.data.data[0].Content);
                       this.resolverTravel(t)
                       this.loading=false
+                      this.expandRootNode()
                     }else{
                       this.$confirm('当前线路没有配置出团通知书模版，无法生存出团通知书，是否立即前往配置', '提示', {
                         confirmButtonText: '确定',
@@ -664,19 +683,13 @@ export default {
         },
 
         // 取消编辑
-        cancelEdit() {
-            this.$confirm('确定要取消编辑吗？未保存的内容将丢失。', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                // 清除选中状态
-                this.selectedNode = null;
-                this.$refs.tree.setCurrentKey(null);
-                this.$message.info('已取消编辑');
-            }).catch(() => {
-                // 取消操作
-            });
+        handleBack() {
+          this.$router.push({
+            name: 'TravelNoticePreview',
+            params: {
+              id:this.state
+            }
+          })
         },
 
         // 富文本编辑器内容变化

src/router/config.js

@@ -6864,5 +6864,21 @@ export default {
         title: '编辑报价单'
       }
     },
+    {
+      path: '/TravelNoticePreview/:id',
+      name: 'TravelNoticePreview',
+      component: resolve => require(['@/pages/travel-notice/PreviewNotice'], resolve),
+      meta: {
+        title: '出团通知书预览'
+      }
+    },
+    {
+      path: '/TravelNoticeDownLoad/:id/:orderId/:guestIds/:unionfid',
+      name: 'TravelNoticeDownLoad',
+      component: resolve => require(['@/pages/travel-notice/PreviewNotice'], resolve),
+      meta: {
+        title: '出团通知书下载'
+      }
+    }
   ]
 }