Merge remote-tracking branch 'origin/dev' into dev

2 years ago · 3623348e50
2 changed files with 1 additions and 2 deletions
--- a/public/static/内部领物单.html
+++ b/public/static/内部领物单.html
@ -54,7 +54,7 @@
        }
        .neirtb>div{
            text-align: center;
-            height: 70px;
+            height: 110px;
            line-height: 30px;
            border-bottom: 2px solid #000000;
            border-right: 2px solid #000000;
--- a/src/views/accessrecords/statement/ProcessMaterialsDeliveryStatement.vue
+++ b/src/views/accessrecords/statement/ProcessMaterialsDeliveryStatement.vue
@ -55,7 +55,6 @@ name: "ProcessMaterialsDeliveryStatement",
  },
  activated() {
    this.sendMesFroIframe();
-    this.srcHtml = '../static/内部领物单.html';
  },
  mounted() {
    this.showSessionId = window.location.search;