提单和条款模板

src/views/ecw/box/ladingBill/makeLadingBill.vue

@@ -174,7 +174,7 @@ export default {
     },
     createPdf(){
       let loading = this.$loading()
-      html2canvas(document.querySelector("#html2canvas-container"), {dpi:144}).then(canvas => {
+      html2canvas(document.querySelector("#html2canvas-container"), {dpi:144, useCORS: true}).then(canvas => {
         const doc = new jsPDF('p','pt','a4',true);
 
         const imgWidth = canvas.width
@@ -187,7 +187,8 @@ export default {
         }
         const _left = (595.28-_w)/2;
         doc.addImage(canvas, 'PNG', _left, 0, _w,_h, '', 'FAST');
-        // doc.save("a4.pdf");
+        doc.save("a4.pdf");
+        return Promise.reject()
         let form = new FormData()
         form.append('file', new File([doc.output('arraybuffer')], Date.now() + '.pdf', {type: 'application/pdf'}))
         return uploadFile(form)
@@ -253,6 +254,7 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep #html2canvas-container{
+  padding: 3rem;
   p{
     margin: 0;
   }

src/views/ecw/warehouse/index.vue

@@ -364,6 +364,8 @@
         </el-card>
 
         <el-form-item :label="$t('条款')" prop="contentZh">
+          <el-link type="primary" @click.native="setAgreementTpl('agreementSea')">海运模板</el-link> |
+          <el-link type="primary" @click.native="setAgreementTpl('agreementAir')">空运模板</el-link>
           <ueditor v-model="ladingform.contentZh" :min-height="192" style="width:960px"/>
         </el-form-item>
 
@@ -649,6 +651,9 @@ export default {
     setTpl(type){
       this.ladingform.titleZh = tpl[type]
     },
+    setAgreementTpl(type){
+      this.ladingform.contentZh = tpl[type]
+    },
     /** 查询列表 */
     getList() {
       this.loading = true;