浏览代码

解决打印页面冲突

mxx 3 年之前
父节点
当前提交
17bdfc8b0a

+ 0 - 1
public/static/inspection.html

@@ -311,7 +311,6 @@
         printBig() {},
       },
       mounted() {
-        debugger
         let _data = decodeURIComponent(this.getQueryVariable("dataList"))
         let _type = decodeURIComponent(this.getQueryVariable("type"))
         if (_type == 2) {

+ 251 - 46
public/static/payprint.html

@@ -19,7 +19,7 @@
 
       .content {
         width: 1000px;
-        height: 583px;
+        /* height: 583px; */
         margin: auto;
         position: absolute;
         top: 0;
@@ -109,43 +109,76 @@
       .small-img {
         margin-right: 0;
       }
-      .sign{
+
+      .sign {
         margin-right: 100px;
       }
+    .header{
+    display: flex;
+    justify-content: space-between;
+    font-size: 16px;
+    margin: 10px 0;
+  }
+  .header1{
+    font-size: 24px;
+    margin: 60px 60px 10px 60px;
+    display: flex;
+    justify-content: center;
+  }
+  .line{
+    height: 2px;
+    width: 410px;
+    margin: 3px auto;
+    background: black;
+  }
+  .line:nth-of-type(3){
+    margin-bottom: 30px;
+  }
+  .header-top{
+    display: flex;
+    justify-content: space-between;
+  }
     </style>
   </head>
   <body>
     <div id="app">
       <div class="content" v-if="bigContent">
         <div class="center">
+            <div class="header1">中天昊元粮食贸易有限公司结算凭证</div>
+            <div class="line"></div>
+            <div class="line"></div>
+          <div class="header">
+             <div>单位名称:黑龙江中天昊元粮食贸易有限公司</div>
+             <div>税务登记编号:91230230MA1BNL7Q93</div>
+          </div>
           <div class="header-top">
             <div>单位:公斤、元</div>
             <div>No.</div>
           </div>
           <div class="header-top">
-            <div>开票日期:{{printData.compName}}</div>
+            <div>开票日期:{{date}}</div>
             <div class="number">{{100000000000000}}</div>
           </div>
           <table class="table">
             <tr class="row">
               <td rowspan="4" class="col col-bgc">买方</td>
               <td class="col col-bgc">单位名称</td>
-              <td class="col" colspan="3">{{ printData.compName}}</td>
+              <td class="col" colspan="3">{{printData.compName}}</td>
               <td rowspan="4" class="col col-bgc">买方</td>
               <td class="col col-bgc">姓名</td>
-              <td class="col" colspan="3">{{ printData.customerName}}</td>
+              <td class="col" colspan="3">{{printData.customerName}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">税务登记号</td>
               <td class="col" colspan="3">{{ printData.taxRegistrationNo}}</td>
               <td class="col col-bgc">身份证号</td>
-              <td class="col" colspan="3">{{ printData.customerNumberCard}}</td>
+              <td class="col" colspan="3">{{printData.customerNumberCard}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">化验单号</td>
-              <td class="col" colspan="3">{{ printData.paymentNo}}</td>
+              <td class="col" colspan="3">{{printData.paymentNo}}</td>
               <td class="col col-bgc">卡号</td>
-              <td class="col" colspan="3">{{ printData. bankCard}}</td>
+              <td class="col" colspan="3">{{printData.bankCard}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">收货仓库</td>
@@ -166,16 +199,16 @@
               <td class="col col-bgc">纯重</td>
             </tr>
             <tr class="row">
-              <td class="col">{{ printData.goodsName}}</td>
-              <td class="col">{{ printData.type}}</td>
-              <td class="col">{{ printData.grade}}</td>
-              <td class="col">{{ printData.waterContent}}</td>
-              <td class="col">{{ printData.impurity}}</td>
-              <td class="col">{{ printData.grossWeight}}</td>
-              <td class="col">{{ printData.tare}}</td>
-              <td class="col">{{ printData.buckleMiscellaneous}}</td>
-              <td class="col">{{ printData.netWeight}}</td>
-              <td class="col">{{ printData.pureWeight}}</td>
+              <td class="col">{{printData.goodsName}}</td>
+              <td class="col">{{printData.type}}</td>
+              <td class="col">{{printData.grade}}</td>
+              <td class="col">{{printData.waterContent}}</td>
+              <td class="col">{{printData.impurity}}</td>
+              <td class="col">{{printData.grossWeight}}</td>
+              <td class="col">{{printData.tare}}</td>
+              <td class="col">{{printData.buckleMiscellaneous}}</td>
+              <td class="col">{{printData.netWeight}}</td>
+              <td class="col">{{printData.pureWeight}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">净重单价</td>
@@ -190,16 +223,16 @@
               <td class="col col-bgc">质量扣款</td>
             </tr>
             <tr class="row">
-              <td class="col ">{{ printData.tidalGrainPrice}}</td>
-              <td class="col ">{{ printData.grainMoney}}</td>
-              <td class="col ">{{ printData.weighingSubsidy}}</td>
-              <td class="col ">{{ printData.freightSubsidy}}</td>
-              <td class="col ">{{ printData.unloadSubsidy}}</td>
-              <td class="col ">{{ printData.otherSubsidy}}</td>
-              <td class="col ">{{ printData.weighingDeduction}}</td>
-              <td class="col ">{{ printData.freightDeduction}}</td>
-              <td class="col ">{{ printData.unloadDeduction}}</td>
-              <td class="col ">{{ printData.qualityDeduction}}</td>
+              <td class="col ">{{printData.tidalGrainPrice}}</td>
+              <td class="col ">{{printData.grainMoney}}</td>
+              <td class="col ">{{printData.weighingSubsidy}}</td>
+              <td class="col ">{{printData.freightSubsidy}}</td>
+              <td class="col ">{{printData.unloadSubsidy}}</td>
+              <td class="col ">{{printData.otherSubsidy}}</td>
+              <td class="col ">{{printData.weighingDeduction}}</td>
+              <td class="col ">{{printData.freightDeduction}}</td>
+              <td class="col ">{{printData.unloadDeduction}}</td>
+              <td class="col ">{{printData.qualityDeduction}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">其他扣款</td>
@@ -210,12 +243,12 @@
               <td class="col col-bgc" colspan="5">记事</td>
             </tr>
             <tr class="row">
-              <td class="col ">{{ printData.otherDeduction}}</td>
-              <td class="col ">{{ printData.solidGrainPrice}}</td>
-              <td class="col ">{{ printData.calculationPayable}}</td>
-              <td class="col ">{{ printData.natureOfGrainPurchase}}</td>
-              <td class="col ">{{ printData.carNo}}</td>
-              <td class="col " colspan="5">{{ printData.remarks}}</td>
+              <td class="col ">{{printData.otherDeduction}}</td>
+              <td class="col ">{{printData.solidGrainPrice}}</td>
+              <td class="col ">{{printData.calculationPayable}}</td>
+              <td class="col ">{{printData.natureOfGrainPurchase}}</td>
+              <td class="col ">{{printData.carNo}}</td>
+              <td class="col " colspan="5">{{printData.remarks}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">实付金额</td>
@@ -228,12 +261,12 @@
 
           <div class="bottom">
             <div class="bottom-row1">
-              <div>质检:{{ printData.qualityInspector}}</div>
-              <div>毛检:{{ printData.skinInspector}}</div>
-              <div>皮检:{{ printData.qualityInspector}}</div>
-              <div>结算:{{ printData.settlementClerk}}</div>
-              <div>付款:{{ printData.qualityInspector}}</div>
-              <div>复点:{{ printData.qualityInspector}}</div>
+              <div>质检:{{printData.qualityInspector}}</div>
+              <div>毛检:{{printData.secretaryWeigher}}</div>
+              <div>皮检:{{printData.skinInspector}}</div>
+              <div>结算:{{printData.settlementClerk}}</div>
+              <div>付款:{{printData.actualPayment}}</div>
+              <div>复点:{{}}</div>
             </div>
             <div class="bottom-row2">
               <div class="left">
@@ -246,13 +279,182 @@
           </div>
         </div>
       </div>
-    <div class="small-content" v-if="smallContent">
-<div class="small-title">
+      <div class="small-content" v-if="smallContent">
+        <div class="small-title">
           <div>
-中天昊元粮食贸易有限公司结算凭证</div>
+            中天昊元粮食贸易有限公司结算凭证</div>
           <img class="small-img" src="../img/add.png" alt="">
         </div>
-    </div>
+        <div class="small-row">
+          <div>开票日期</div>
+          <div>{{date}}</div>
+        </div>
+        <div class="small-row">
+          <div>买方单位名称</div>
+          <div>{{printData.compName}}</div>
+        </div>
+        <div class="small-row">
+          <div>买方姓名</div>
+          <div>{{printData.customerName}}</div>
+        </div>
+        <div class="small-row">
+          <div>税务登记号</div>
+          <div>{{printData.taxRegistrationNo}}</div>
+        </div>
+        <div class="small-row">
+          <div>身份证号</div>
+          <div>{{printData.customerNumberCard}}</div>
+        </div>
+        <div class="small-row">
+          <div>化验单号</div>
+          <div>{{printData.paymentNo}}</div>
+        </div>
+        <div class="small-row">
+          <div>卡号</div>
+          <div>{{printData.bankCard}}</div>
+        </div>
+        <div class="small-row">
+          <div>收货仓库</div>
+          <div>{{printData.warehouseName}}</div>
+        </div>
+        <div class="small-row">
+          <div>货名</div>
+          <div>{{printData.goodsName}}</div>
+        </div>
+        <div class="small-row">
+          <div>类型</div>
+          <div>{{printData.type}}</div>
+        </div>
+        <div class="small-row">
+          <div>等级</div>
+          <div>{{printData.grade}}</div>
+        </div>
+        <div class="small-row">
+          <div>水分%</div>
+          <div>{{printData.waterContent}}</div>
+        </div>
+        <div class="small-row">
+          <div>杂质%</div>
+          <div>{{printData.impurity}}</div>
+        </div>
+        <div class="small-row">
+          <div>毛重</div>
+          <div>{{printData.grossWeight}}</div>
+        </div>
+        <div class="small-row">
+          <div>皮重</div>
+          <div>{{printData.tare}}</div>
+        </div>
+        <div class="small-row">
+          <div>扣杂重</div>
+          <div>{{printData.buckleMiscellaneous}}</div>
+        </div>
+        <div class="small-row">
+          <div>净重</div>
+          <div>{{printData.netWeight}}</div>
+        </div>
+        <div class="small-row">
+          <div>纯重</div>
+          <div>{{printData.pureWeight}}</div>
+        </div>
+        <div class="small-row">
+          <div>净重单价</div>
+          <div>{{printData.tidalGrainPrice}}</div>
+        </div>
+        <div class="small-row">
+          <div>粮款</div>
+          <div>{{printData.grainMoney}}</div>
+        </div>
+        <div class="small-row">
+          <div>称重补助</div>
+          <div>{{printData.weighingSubsidy}}</div>
+        </div>
+        <div class="small-row">
+          <div>运费补助</div>
+          <div>{{printData.freightSubsidy}}</div>
+        </div>
+        <div class="small-row">
+          <div>卸车补助</div>
+          <div>{{printData.unloadSubsidy}}</div>
+        </div>
+        <div class="small-row">
+          <div>其他补助</div>
+          <div>{{printData.otherSubsidy}}</div>
+        </div>
+        <div class="small-row">
+          <div>称重扣款</div>
+          <div>{{printData.weighingDeduction}}</div>
+        </div>
+        <div class="small-row">
+          <div>运费扣款</div>
+          <div>{{printData.freightDeduction}}</div>
+        </div>
+        <div class="small-row">
+          <div>卸车扣款</div>
+          <div>{{printData.unloadDeduction}}</div>
+        </div>
+        <div class="small-row">
+          <div>质量扣款</div>
+          <div>{{printData.qualityDeduction}}</div>
+        </div>
+        <div class="small-row">
+          <div>其他扣款</div>
+          <div>{{printData.otherDeduction}}</div>
+        </div>
+        <div class="small-row">
+          <div>纯重单价</div>
+          <div>{{printData.solidGrainPrice}}</div>
+        </div>
+        <div class="small-row">
+          <div>合计应付</div>
+          <div>{{printData.calculationPayable}}</div>
+        </div>
+        <div class="small-row">
+          <div>购粮性质</div>
+          <div>{{printData.natureOfGrainPurchase}}</div>
+        </div>
+        <div class="small-row">
+          <div>车牌号</div>
+          <div>{{printData.carNo}}</div>
+        </div>
+        <div class="small-row">
+          <div>记事</div>
+          <div>{{printData.remarks}}</div>
+        </div>
+        <div class="small-row">
+          <div>实付金额</div>
+          <div>{{printData.actualPayment}}</div>
+        </div>
+        <div class="small-row">
+          <div>人民币(大写)</div>
+          <div>{{printData.capitalize}}</div>
+        </div>
+        <div class="small-row">
+          <div>质检</div>
+          <div>{{printData.qualityInspector}}</div>
+        </div>
+        <div class="small-row">
+          <div>毛检</div>
+          <div>{{printData.secretaryWeigher}}</div>
+        </div>
+        <div class="small-row">
+          <div>皮检</div>
+          <div>{{printData.skinInspector}}</div>
+        </div>
+        <div class="small-row">
+          <div>结算</div>
+          <div>{{printData.settlementClerk}}</div>
+        </div>
+        <div class="small-row">
+          <div>付款</div>
+          <div>{{printData.actualPayment}}</div>
+        </div>
+        <div class="small-row">
+          <div>复点</div>
+          <div>{{}}</div>
+        </div>
+
+      </div>
     </div>
   </body>
   <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
@@ -261,10 +463,11 @@
     new Vue({
       el: '#app',
       data: {
-        printData:[],
+        printData: [],
         name: "",
         bigContent: false,
-        smallContent: false
+        smallContent: false,
+        date: ""
       },
       computed: {},
       methods: {
@@ -294,6 +497,8 @@
         printBig() {},
       },
       mounted() {
+
+        this.date = new Date().toLocaleString()
         let _data = decodeURIComponent(this.getQueryVariable("dataList"))
         let _type = decodeURIComponent(this.getQueryVariable("type"))
         if (_type == 2) {

+ 2 - 30
public/static/print.html

@@ -39,33 +39,6 @@
   </head>
   <body>
     <div id="app">
-<<<<<<< HEAD
-      {{dataList}}
-       <el-button @click="visible = true">Button</el-button>
-    </div>
-  </body>
-  <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
-  <script src="https://unpkg.com/element-ui/lib/index.js"></script>
-  <script type="text/javascript">
-    new Vue({
-      el: '#app',
-      data: {
-        dataList: ""
-      },
-      computed: {},
-      methods: {
-
-      },
-      mounted() {debugger
-       let _data = localStorage.getItem("pricePrintList")
-        // var _data = decodeURIComponent(this.getQueryVariable("id"))
-        console.log(_data)
-        this.dataList = JSON.parse(_data)
-        // window.print()
-        // window.onafterprint = function(event) {
-        //   window.history.back(-1)
-        // };
-=======
       <div class="content">
         <div class="title">
           <div class="name">{{name}}价格对照表(按水分)</div>
@@ -123,7 +96,7 @@
         return (false);
       }
       },
-      mounted() {debugger
+      mounted() {
        let _data = localStorage.getItem("pricePrintList")
          this.name = decodeURIComponent(this.getQueryVariable("name"))
         console.log(_data)
@@ -132,11 +105,10 @@
         window.onafterprint = function(event) {
           window.history.back(-1)
         };
->>>>>>> 1d46949992a1fc8a79736807784052ab343c9846
       },
       watch: {
       }
     })
   </script>
 
-</html>
+</html>

+ 0 - 1
public/static/weightCheck.html

@@ -311,7 +311,6 @@
         printBig() {},
       },
       mounted() {
-        debugger
         let _data = decodeURIComponent(this.getQueryVariable("dialogData"))
         let _type = decodeURIComponent(this.getQueryVariable("type"))
         if (_type == 2) {

+ 0 - 3
src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -240,7 +240,6 @@
         })
         .toPromise()
         .then((response) => {
-          debugger
           let _list = []
           for (let i = 0; i < response.length; i++) {
             let _isAll = true
@@ -680,8 +679,6 @@ tableRowClassName ({ row, rowIndex }) {
       },
       // 提交
       submit() {
-        debugger
-
         this.makeTableList()
         this.makePriceDataList()
         this.baseInfoForm.goodsName = this.selectVal

+ 12 - 2
src/views/houseSelfCollect/component/paymentPrint.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="center">
+    <div class="header">
+       <div>单位名称:黑龙江中天昊元粮食贸易有限公司</div>
+       <div>税务登记编号:91230230MA1BNL7Q93</div>
+    </div>
     <div class="header-top">
       <div>单位:公斤、元</div>
       <div>No.</div>
@@ -127,7 +131,7 @@
       <div class="bottom-row3">扫一扫</div>
       <div class="bottom-row4">
         <el-button type="primary">关闭</el-button>
-        <el-button type="primary" @click="printSmall">打印小票</el-button>
+        <!-- <el-button type="primary" @click="printSmall">打印小票</el-button> -->
         <el-button type="primary" @click="printBig">打印单据</el-button>
       </div>
     </div>
@@ -155,7 +159,7 @@
           '../../../../../static/payprint.html?type=1&dataList=' +
           JSON.stringify(this.printData)
       },
-      printBig() {debugger
+      printBig() {
         window.location.href =
           '../../../../../static/payprint.html?type=2&dataList=' +
           JSON.stringify(this.printData)
@@ -221,6 +225,12 @@
     margin-top: 50px;
     text-align: center;
   }
+  .header{
+    display: flex;
+    justify-content: space-between;
+    font-size: 16px;
+    margin: 10px 0;
+  }
   .header-top{
     display: flex;
     justify-content: space-between;

+ 0 - 1
src/views/outboundManagement/weighing.vue

@@ -286,7 +286,6 @@ export default {
           type: 'warning',
         })
           .then(() => {
-            debugger
             if (this.types == 1) {
               this.weighingList.relationId = this.relationId
               grossWeight(this.weighingList)