ccj 2 yıl önce
ebeveyn
işleme
120fff297a

+ 1 - 0
public/static/weightCheck.html

@@ -589,6 +589,7 @@
             printBig() {},
         },
         mounted() {
+            debugger
             let _data = decodeURIComponent(this.getQueryVariable("tableData"))
             let _type = this.getQueryVariable("type")
             let _ew = this.getQueryVariable("selectEW")

+ 627 - 0
public/static/weightCheckOutNew.html

@@ -0,0 +1,627 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <link rel="stylesheet" href="../cdn/element-ui/2.13.2/theme-chalk/index.css">
+    <title></title>
+    <style>
+        table,
+        table tr th,
+        table tr td {
+            border: 2px solid #333333;
+            padding: 5px 0;
+            height: 37px;
+        }
+        
+        body {
+            margin: 0;
+        }
+        
+        #app {
+            /* height: 98vh;
+        position: relative; */
+        }
+        
+        .content {
+            width: 1000px;
+            padding: 30px 20px 20px 20px;
+            font-size: 18px;
+            height: 630px;
+            /* height: 570px; */
+            position: relative;
+        }
+        
+        .a5-content {
+            height: 130vh;
+        }
+        
+        table {
+            width: 100%;
+            text-align: center;
+            border-collapse: collapse;
+            border: 3px solid #333333;
+        }
+        
+        .col-bgc {
+            background: #f6f7fb;
+        }
+        
+        .bottom-row1 {
+            display: flex;
+            /* justify-content: space-between; */
+            margin-top: 5px 0;
+        }
+        
+        .bottom-row2 {
+            display: flex;
+        }
+        
+        img,
+        .left {
+            width: 120px;
+            height: 120px;
+            position: absolute;
+            left: 12px;
+            top: 10px;
+        }
+        
+        .config {
+            margin-top: 10px;
+            margin-right: 240px;
+        }
+        
+        .autograph {
+            margin-top: 10px;
+            margin-right: 170px;
+        }
+        
+        .bottom-row3 {
+            margin: 10px 0;
+        }
+        
+        .title {
+            text-align: center;
+            font-size: 36px;
+            font-weight: 500;
+            position: relative;
+            /* margin-top: 47px; */
+        }
+        
+        .number {
+            text-align: right;
+            margin-bottom: 10px;
+            margin-top: 30px;
+        }
+        
+        .small-row {
+            display: flex;
+        }
+        
+        .small-content {
+            width: 300px;
+            /* margin: 0 auto;
+        border: 1px solid #ccc;
+        padding: 20px 20px 160px 20px;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        margin: auto; */
+        }
+        
+        .small-title {
+            text-align: center;
+            font-size: 18px;
+            /* display: flex; */
+            justify-content: space-between;
+            align-items: center;
+        }
+        
+        .numberNo {
+            font-size: 36px;
+            margin: auto;
+        }
+        
+        .small-row {
+            display: flex;
+            justify-content: space-between;
+            margin: 10px;
+        }
+        
+        .small-img {
+            margin-right: 0;
+        }
+        
+        .sign {
+            margin-right: 100px;
+        }
+        
+        .small-code {
+            position: relative;
+            left: calc(50% - 55px)
+        }
+    </style>
+</head>
+
+<body>
+    <div id="app">
+        <div v-if="selectPrint">
+            <div v-for="(item,index) in tableData1" :key="index" v-if="!isDDPrint||isEWPrint">
+                <div class="content" :class="pageType=='A5'?'a5-content':''">
+                    <!-- <div class="title">{{item.compName}}</div> -->
+                    <div class="title">出库检斤单</div>
+                    <div class="left">
+                        <img :src="item.codeUrl" alt="">
+                    </div>
+                    <div class="number">{{item.number}}</div>
+                    <table class="table">
+                        <tr class="row">
+                            <td class="col col-bgc">发货单位</td>
+                            <td class="col" colspan="2">{{item.customer}}</td>
+                            <td class="col col-bgc">联系电话</td>
+                            <td class="col">{{item.customerPhone}}</td>
+                            <td class="col col-bgc">车牌号</td>
+                            <td class="col" colspan="2">{{item.carNumber}}</td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">收货单位</td>
+                            <td class="col" colspan="2">{{item.compName}}</td>
+                            <td class="col col-bgc">联系人</td>
+                            <td class="col">{{item.person}}</td>
+                            <td class="col col-bgc">联系电话</td>
+                            <td class="col" colspan="2">{{item.personPhone}}</td>
+                        </tr>
+                        
+                       
+                        <tr class="row">
+                            <td class="col col-bgc">货名</td>
+                            <td class="col">{{item.goodsName}}</td>
+                            <td class="col col-bgc">类型</td>
+                            <td class="col">{{item.type}}</td>
+                            <td class="col col-bgc">容量(克/升)</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
+                            </td>
+                            <td class="col col-bgc">不完善粒(%)</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
+                            </td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">等级</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
+                            <td class="col col-bgc">水分(%)</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.waterContent:''}}
+                            </td>
+                            <td class="col col-bgc">热损伤(%)</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.jiaorenli:''}}</td>
+                            <td class="col col-bgc">质检时间</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.qualityDate:''}}
+                            </td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">杂质(%)</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.impurity:''}}</td>
+                            <td class="col col-bgc">霉变粒(%)</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.mildewGrain:''}}
+                            </td>
+                            <td class="col col-bgc">扣杂</td>
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}</td>
+                            <td class="col " colspan="2"></td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">毛重(公斤)</td>
+                            <td class="col">{{item.grossWeight}}</td>
+                            <td class="col col-bgc">皮重(公斤)</td>
+                            <td class="col">{{item.tare}}</td>
+                            <td class="col col-bgc">扣重(公斤)</td>
+                            <td class="col">{{item.buckleMiscellaneous}}</td>
+                            <td class="col col-bgc">净重(公斤)</td>
+                            <td class="col">{{item.netWeight}}</td>
+                            <!-- <td class="col " colspan="2"></td> -->
+
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc" colspan="2">毛重检斤时间</td>
+                            <td class="col" colspan="2">{{item.grossDate}}</td>
+                            <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
+                            <td class="col" colspan="2">{{item.tareDate}}</td>
+                        </tr>
+                    </table>
+                    <div class="bottom">
+                        <div class="bottom-row1">
+                            <div>毛检:{{item.secretaryWeigher}}</div>
+                            <div style="margin-left:60px">皮检:{{item.skinInspector}}</div>
+                            <!-- <div>{{tableData.qualityDate}}</div> -->
+                        </div>
+                        <div class="bottom-row2">
+                            <!-- <div class="left">
+                <img :src="item.codeUrl" alt="">
+              </div> -->
+
+                            <div class="config" v-if="item.warehouseName!='白城补数据'">收货单位签名或盖章:</div>
+                            <div class="config" v-if="item.warehouseName=='白城补数据'">收货单位签名或盖章:黑龙江中天昊元贸易有限公司</div>
+                            <div class="autograph">客户签名:</div>
+                            <div class="autograph" v-if="item.warehouseName!='白城补数据'">司机签名:</div>
+                        </div>
+                        <!-- <div class="bottom-row3">扫一扫</div> -->
+                    </div>
+                </div>
+            </div>
+            <!-- 打印额外 -->
+            <div v-for="(item,index) in tableDataEW" :key="index" v-if="isDDPrint||isEWPrint">
+                <div class="content" :class="pageType=='A5'?'a5-content':''">
+                    <!-- <div class="title">{{item.customer}}</div> -->
+                    <div class="title">出库检斤单</div>
+                    <div class="left">
+                        <img :src="item.codeUrl" alt="">
+                    </div>
+                    <div class="number">{{item.number}}</div>
+                    <table class="table">
+                        <tr class="row">
+                            <td class="col col-bgc" >发货单位</td>
+                            <td class="col" colspan="2" >{{item.customer}}</td>
+                            <td class="col col-bgc" >联系电话</td>
+                            <td class="col" >{{item.contractManagement ? item.contractManagement.sellerPhone : ""}}</td>
+                            <td class="col col-bgc">车牌号</td>
+                            <td class="col" colspan="2">{{item.carNumber}}</td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">收货单位</td>
+                            <td class="col" colspan="2">{{item.compName}}</td>
+                            <td class="col col-bgc">联系人</td>
+                            <td class="col">{{item.person}}</td>
+                            <td class="col col-bgc">联系电话</td>
+                            <td class="col" colspan="2">{{item.personPhone}}</td>
+                        </tr>
+                        
+                        <tr class="row">
+                            <td class="col col-bgc">货名</td>
+                            <td class="col">{{item.goodsName}}</td>
+                            <td class="col col-bgc">类型</td>
+                            <td class="col">{{item.type}}</td>
+                            <td class="col col-bgc">容量(克/升)</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
+                            </td>
+                            <td class="col col-bgc">不完善粒(%)</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
+                            </td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">等级</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.grade:''}}</td>
+                            <td class="col col-bgc">水分(%)</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.waterContent:''}}
+                            </td>
+                            <td class="col col-bgc">热损伤(%)</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.jiaorenli:''}}</td>
+                            <td class="col col-bgc">质检时间</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.qualityDate:''}}
+                            </td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">杂质(%)</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.impurity:''}}</td>
+                            <td class="col col-bgc">霉变粒(%)</td>
+                            <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.mildewGrain:''}}
+                            </td>
+                            <td class="col col-bgc">扣杂</td>
+                            <td class="col">
+                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}</td>
+                            <td class="col " colspan="2"></td>
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc">毛重(公斤)</td>
+                            <td class="col">{{item.grossWeight}}</td>
+                            <td class="col col-bgc">皮重(公斤)</td>
+                            <td class="col">{{item.tare}}</td>
+                            <td class="col col-bgc">扣重(公斤)</td>
+                            <td class="col">{{item.buckleMiscellaneous}}</td>
+                            <td class="col col-bgc">净重(公斤)</td>
+                            <td class="col">{{item.netWeight}}</td>
+                            <!-- <td class="col " colspan="2"></td> -->
+
+                        </tr>
+                        <tr class="row">
+                            <td class="col col-bgc" colspan="2">毛重检斤时间</td>
+                            <td class="col" colspan="2">{{item.grossDate}}</td>
+                            <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
+                            <td class="col" colspan="2">{{item.tareDate}}</td>
+                        </tr>
+                    </table>
+                    <div class="bottom">
+                        <div class="bottom-row1">
+                            <div>毛检:{{item.secretaryWeigher}}</div>
+                            <div style="margin-left:60px">皮检:{{item.skinInspector}}</div>
+                            <!-- <div>{{tableData.qualityDate}}</div> -->
+                        </div>
+                        <div class="bottom-row2">
+                            <!-- <div class="left">
+                <img :src="item.codeUrl" alt="">
+              </div> -->
+                            <div class="config" v-if="item.warehouseName!='白城补数据'">收货单位签名或盖章:</div>
+                            <div class="config" v-if="item.warehouseName=='白城补数据'">收货单位签名或盖章:黑龙江中天昊元贸易有限公司</div>
+                            <div class="autograph">客户签名:</div>
+                            <div class="autograph" v-if="item.warehouseName!='白城补数据'">司机签名:</div>
+                        </div>
+                        <!-- <div class="bottom-row3">扫一扫</div> -->
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div v-else>
+            <div class="content" v-if="bigContent" v-for="(_item,index) in tableData ">
+                <!-- <div class="title">{{_item.compName}}</div> -->
+                <div class="title">出库检斤单</div>
+                <div class="left">
+                    <img :src="_item.codeUrl" alt="">
+                </div>
+                <div class="number">{{_item.number}}</div>
+                <table class="table">
+                    <tr class="row">
+                        <td class="col col-bgc">发货单位</td>
+                        <td class="col" colspan="2">{{_item.compName}}</td>
+                        <td class="col col-bgc">联系人</td>
+                        <td class="col">{{_item.person}}</td>
+                        <td class="col col-bgc">联系电话</td>
+                        <td class="col" colspan="2">{{_item.personPhone}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc" >收货单位</td>
+                        <td class="col" colspan="2" >{{_item.customer}}</td>
+                        <td class="col col-bgc" >联系电话</td>
+                        <td class="col" >{{_item.contractManagement ? _item.contractManagement.sellerPhone : ""}}</td>
+                        <td class="col col-bgc">车牌号</td>
+                        <td class="col" colspan="2">{{_item.carNumber}}</td>
+                    </tr>
+                   
+                    <tr class="row">
+                        <td class="col col-bgc">货名</td>
+                        <td class="col">{{_item.goodsName}}</td>
+                        <td class="col col-bgc">类型</td>
+                        <td class="col">{{_item.type}}</td>
+                        <td class="col col-bgc">容量(克/升)</td>
+                        <td class="col">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.bulkDensity:''}}</td>
+                        <td class="col col-bgc">不完善粒(%)</td>
+                        <td class="col">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.imperfectGrain:''}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">等级</td>
+                        <td class="col">{{_item.qualityInspectionManagement?_item.qualityInspectionManagement.grade:''}}
+                        </td>
+                        <td class="col col-bgc">水分(%)</td>
+                        <td class="col">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.waterContent:''}}</td>
+                        <td class="col col-bgc">热损伤(%)</td>
+                        <td class="col">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.jiaorenli:''}}</td>
+                        <td class="col col-bgc">质检时间</td>
+                        <td class="col">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.qualityDate:''}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">杂质(%)</td>
+                        <td class="col">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.impurity:''}}</td>
+                        <td class="col col-bgc">霉变粒(%)</td>
+                        <td class="col">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.mildewGrain:''}}</td>
+                        <td class="col col-bgc">扣杂</td>
+                        <td class="col">
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.buckleMiscellaneous:''}}
+                        </td>
+                        <td class="col " colspan="2"></td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">毛重(公斤)</td>
+                        <td class="col">{{_item.grossWeight}}</td>
+                        <td class="col col-bgc">皮重(公斤)</td>
+                        <td class="col">{{_item.tare}}</td>
+                        <td class="col col-bgc">扣重(公斤)</td>
+                        <td class="col">{{_item.buckleMiscellaneous}}</td>
+                        <td class="col col-bgc">净重(公斤)</td>
+                        <td class="col">{{_item.netWeight}}</td>
+                        <td class="col " colspan="2"></td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc" colspan="2">毛重检斤时间</td>
+                        <td class="col" colspan="2">{{_item.grossDate}}</td>
+                        <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
+                        <td class="col" colspan="2">{{_item.tareDate}}</td>
+                    </tr>
+                </table>
+                <div class="bottom">
+                    <div class="bottom-row1">
+                        <div>毛检:{{_item.secretaryWeigher}}</div>
+                        <div style="margin-left:60px">皮检:{{_item.skinInspector}}</div>
+                        <!-- <div>{{tableData.qualityDate}}</div> -->
+                    </div>
+                    <div class="bottom-row2">
+                        <!-- <div class="left">
+                <img :src="tableData.codeUrl" alt="">
+              </div> -->
+
+                        <div class="config" v-if="_item.warehouseName!='白城补数据'">收货单位签名或盖章:</div>
+                        <div class="config" v-if="_item.warehouseName=='白城补数据'">收货单位签名或盖章:黑龙江中天昊元贸易有限公司</div>
+                        <div class="autograph">客户签名:</div>
+                        <div class="autograph" v-if="_item.warehouseName!='白城补数据'">司机签名:</div>
+                    </div>
+                    <!-- <div class="bottom-row3">扫一扫</div> -->
+                </div>
+            </div>
+        </div>
+
+        <div class="small-content" v-if="smallContent">
+            <div class="small-title">
+                <div class="numberNo">{{tableData.number.substring(tableData.number.length - 3)}}</div>
+                <div style="margin: auto;">粮食检斤单</div>
+            </div>
+            <img :src="tableData.codeUrl" alt="" class="small-code">
+            <div class="small-row">
+                <div>业务编号</div>
+                <div>{{tableData.number}}</div>
+            </div>
+            <div class="small-row" v-if="tableData.serviceManagementType == 3">
+                <div>客户姓名</div>
+                <div>{{tableData.customer}}</div>
+            </div>
+            <div class="small-row" v-if="tableData.serviceManagementType == 3">
+                <div>客户电话</div>
+                <div>{{tableData.customerPhone}}</div>
+            </div>
+            <div class="small-row" v-if="tableData.serviceManagementType == 1">
+                <div>发货单位</div>
+                <div>{{tableData.contractManagement ? tableData.contractManagement.seller : ""}}</div>
+            </div>
+            <div class="small-row" v-if="tableData.serviceManagementType == 1">
+                <div>联系电话</div>
+                <div>{{tableData.contractManagement ? tableData.contractManagement.sellerPhone : ""}}</div>
+            </div>
+            <div class="small-row">
+                <div>车牌号</div>
+                <div>{{tableData.carNumber}}</div>
+            </div>
+            <div class="small-row">
+                <div>仓位号:</div>
+                <div>{{tableData.binNumber}}</div>
+            </div>
+            <div class="small-row">
+                <div>收货单位</div>
+                <div>{{tableData.compName}}</div>
+            </div>
+            <div class="small-row">
+                <div>联系人</div>
+                <div>{{tableData.person}}</div>
+            </div>
+            <div class="small-row">
+                <div>联系电话</div>
+                <div>{{tableData.personPhone}}</div>
+            </div>
+            <div class="small-row">
+                <div>货名</div>
+                <div>{{tableData.goodsName}}</div>
+            </div>
+            <div class="small-row">
+                <div>类型</div>
+                <div>{{tableData.type}}</div>
+            </div>
+            <div class="small-row">
+                <div>毛重(公斤)</div>
+                <div>{{tableData.grossWeight}}</div>
+            </div>
+            <div class="small-row">
+                <div>毛检时间</div>
+                <div>{{tableData.grossDate}}</div>
+            </div>
+            <div class="small-row">
+                <div>皮重(公斤)</div>
+                <div>{{tableData.tare}}</div>
+            </div>
+            <div class="small-row">
+                <div>皮检时间</div>
+                <div>{{tableData.tareDate}}</div>
+            </div>
+            <div class="small-row" v-if="tableData.qualityInspectionManagement.paramType == 2 || tableData.serviceManagementType == 1">
+                <div>扣重(公斤)</div>
+                <div>{{tableData.buckleMiscellaneous}}</div>
+            </div>
+            <div class="small-row">
+                <div>净重(公斤)</div>
+                <div>{{tableData.netWeight}}</div>
+            </div>
+            <div class="small-row">
+                <div>收货单位签名或盖章:</div>
+            </div>
+        </div>
+    </div>
+</body>
+<script src="../cdn/vue/2.6.10/vue.min.js"></script>
+<script src="../cdn/element-ui/2.13.2/index.js"></script>
+<script type="text/javascript">
+    new Vue({
+        el: '#app',
+        data: {
+            tableData: {
+                // qualityInspectionManagement:{}
+            },
+            tableData1: [],
+            tableDataEW: [],
+            selectPrint: false,
+            name: "",
+            bigContent: false,
+            smallContent: false,
+            pageType: '',
+            isDDPrint: false,
+            isEWPrint: false,
+        },
+        computed: {},
+        methods: {
+            tableRowClassName({
+                row,
+                rowIndex
+            }) {
+                if (rowIndex === 1) {
+                    return 'warning-row';
+                } else if (rowIndex === 3) {
+                    return 'success-row';
+                }
+                return '';
+            },
+            getQueryVariable(variable) {
+                var query = window.location.search.substring(1);
+                var vars = query.split("&");
+                for (var i = 0; i < vars.length; i++) {
+                    var pair = vars[i].split("=");
+                    if (pair[0] == variable) {
+                        return pair[1];
+                    }
+                }
+                return (false);
+            },
+            printSmall() {},
+            printBig() {},
+        },
+        mounted() {
+            let _data = decodeURIComponent(localStorage.getItem('print_out_data'))
+            let _type = this.getQueryVariable("type")
+            let _ew = this.getQueryVariable("selectEW")
+            let _ewdd = this.getQueryVariable("selectEWDD")
+            this.pageType = this.getQueryVariable("radioType")
+            if (_type == 2) {
+                this.bigContent = true
+                this.smallContent = false
+            } else {
+                this.smallContent = true
+                this.bigContent = false
+            }
+            if (_data == 'null') {
+                this.selectPrint = true;
+                this.tableData1 = JSON.parse(localStorage.getItem('selectPrint_jjSelectPrintList'))
+                if (_ew == 'true') {
+                    this.tableDataEW = JSON.parse(localStorage.getItem('selectPrint_EWjjSelectPrintList'))
+                    this.isEWPrint = true
+                }
+                if (_ewdd == 'true') {
+                    this.tableDataEW = JSON.parse(localStorage.getItem('selectPrint_EWjjSelectPrintList'))
+                    this.isDDPrint = true
+                }
+            } else {
+                this.tableData = JSON.parse(_data.replace(/baifenhao/g, '%'))
+            }
+            // sessionStorage.setItem('record_print', JSON.stringify(response))
+            // this.tableData = JSON.parse(sessionStorage.getItem("record_print"))
+
+            document.title = "粮食检斤单"
+            window.print()
+            window.onafterprint = function(event) {
+                window.history.back(-1)
+            };
+        },
+        watch: {}
+    })
+</script>
+
+</html>

+ 122 - 46
src/views/outboundManagement/weighingManagementNew.vue

@@ -307,18 +307,12 @@
         </el-row>
       </div>
     </div>
-      <div class="mask" v-show="isShowPrintType"></div>
+    <div class="mask" v-show="isShowPrintType"></div>
     <div class="print-type" v-show="isShowPrintType">
       <div class="print-type-content">
         <div class="print-type-title">请选择打印类型</div>
-        <div class="print-type-checkbox">
-          <!-- <el-radio-group v-model="radio">
-            <el-radio label="A4" class="label-width" @change="selectType">A4</el-radio>
-            <el-radio label="A5" class="label-width" @change="selectType">A5</el-radio>
-          </el-radio-group> -->
-        </div>
         <div class="shdw-style" v-if="checked||(!ddchecked&&!checked)">
-          <div>货单位:</div>
+          <div>我司发货单位:</div>
           <!-- <div>{{companyName}}</div> -->
           <el-select v-model="companyName" placeholder="请选择" style="width: 75%;">
             <el-option v-for="item in companyNameOptions" :key="item.value" :label="item.label" :value="item.value">
@@ -332,7 +326,7 @@
           </div>
           <div class="ew-print" v-if="printSeparately">
             <div class="row">
-              <div>额外客户姓名:</div>
+              <div>额外发货单位:</div>
               <!-- <div>{{companyName}}</div> -->
               <el-select v-model="ewCustomer" placeholder="请选择" style="width: 75%;">
                 <el-option v-for="item in ewCustomerOptions" :key="item.value" :label="item.label" :value="item.value">
@@ -425,7 +419,6 @@
         inOutTypeList:[],
         positionInfos: [],
         searchKeyWord: '',
-        companyName:'',
         paramType: '',
         deptBudgetTotal: 0,
         monitorUrl1: '',
@@ -498,7 +491,10 @@
         ddchecked:false,
         checked:false,
         dialogDataList:[],
-        ewCustomerOptions: [{
+        ewCustomerOptions: [ {
+          value: '厦门建发物产有限公司',
+          label: '厦门建发物产有限公司'
+        },{
           value: '黑龙江利润元粮食贸易有限公司',
           label: '黑龙江利润元粮食贸易有限公司'
         }, {
@@ -511,7 +507,11 @@
           value: '黑龙江中天昊元贸易有限公司',
           label: '黑龙江中天昊元贸易有限公司'
         }],
-        companyNameOptions: [{
+       companyNameOptions: [
+         {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
           value: '黑龙江利润元粮食贸易有限公司',
           label: '黑龙江利润元粮食贸易有限公司'
         }, {
@@ -520,15 +520,30 @@
         }, {
           value: '黑龙江鑫满仓粮食贸易有限公司',
           label: '黑龙江鑫满仓粮食贸易有限公司'
-        }, {
+        }],
+        
+        companyName: '黑龙江中天昊元贸易有限公司',
+        companyNameEW: '黑龙江利润元粮食贸易有限公司',
+        companyNameEWOptions: [{
           value: '黑龙江中天昊元贸易有限公司',
           label: '黑龙江中天昊元贸易有限公司'
-        }, ],
-        companyNameEWOptions: [{
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
           value: '厦门建发物产有限公司',
           label: '厦门建发物产有限公司'
         }],
         idPrint: '',
+        
+        ewCustomer: '厦门建发物产有限公司',
+        ewradio: '',
         printSeparately: false,
         isShowPrintType:false,
         deptBudgetList: {},
@@ -549,6 +564,7 @@
             value: '3',
           },
         ],
+        jjSelectPrintList: [],
       }
     },
     beforeDestroy() {
@@ -580,28 +596,35 @@
           .toPromise()
           .then((response) => {
             this.dialogDataList = [] //点击确认时先清空要打印的数组
-            this.dialogData = response
-            if (response.compName == '黑龙江秋收有限公司') {
-              this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
-            }
-            if (this.checked) {
-              this.dialogDataList.push(this.dialogData)
-              var _datas = JSON.stringify(this.dialogData)
-              _datas = JSON.parse(_datas)
-              _datas.compName = this.companyNameEW;
-              _datas.customer = this.ewCustomer
-              this.dialogDataList.push(_datas)
-            } else if (this.ddchecked) {
-              _datas = this.dialogData
-              _datas.compName = this.companyNameEW;
-              _datas.customer = this.ewCustomer
-              this.dialogDataList.push(_datas)
-            } else {
-              this.dialogData.compName = this.companyName
-              this.dialogDataList.push(this.dialogData)
-            }
-            window.open('../../../../static/weightCheckOut.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
-            // this.printBig("", this.radio)
+              this.dialogData = response
+              if (response.compName == '黑龙江秋收有限公司') {
+                this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
+              }
+              if (this.checked) {
+                if(this.dialogData&&!this.dialogData.customer&&this.dialogData.contractManagement){
+                  this.dialogData.customer = this.dialogData.contractManagement.seller
+                }
+                this.dialogDataList.push(this.dialogData)
+                var _datas = JSON.stringify(this.dialogData)
+                _datas = JSON.parse(_datas)
+                _datas.compName =this.ewCustomer
+                _datas.customer =  this.companyNameEW
+                this.dialogDataList.push(_datas)
+                this.printBig('', this.radio)
+              } else if (this.ddchecked) {
+                _datas = this.dialogData
+                _datas.compName = this.companyNameEW;
+                _datas.customer = this.ewCustomer
+                this.dialogDataList.push(_datas)
+                this.printBig(1, this.radio)
+              } else {
+                this.dialogData.companyName = this.companyName
+                if(this.dialogData&&!this.dialogData.customer&&this.dialogData.contractManagement){
+                  this.dialogData.customer = this.dialogData.contractManagement.buyer
+                }
+                this.dialogDataList.push(this.dialogData)
+                this.printBig('', this.radio)
+              }
           })
           .catch((response) => {})
       },
@@ -753,10 +776,39 @@
         localStorage.setItem('ck_bd_printData1', JSON.stringify(this.inspect))
         window.open('../../../../static/outWeightPrint.html?type=1&other="true"')
       },
-      printBig() {
-        localStorage.setItem('ck_bd_printData1', JSON.stringify(this.inspect))
-        window.open('../../../../static/outWeightPrint.html?type=2&other="true"')
-        // window.open('../../../static/weightChecknew.html?type=2&dataList=' + JSON.stringify(this.inspect))
+      printBig(type, radioType) {
+          //  localStorage.setItem('ck_bd_printData1',JSON.stringify(this.inspect))
+          //  window.open('../../../../static/outWeightPrint.html?type=2')
+          // 打印额外
+          if (this.checked || this.ddchecked) {
+            this.makeEWjjSelectPrintList()
+            //  this.selectEW = true;
+          }
+          localStorage.removeItem('print_out_data')
+          localStorage.removeItem('selectPrint_EWjjSelectPrintList')
+          localStorage.removeItem('selectPrint_jjSelectPrintList')
+          if (type == 1) {
+            localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.dialogDataList))
+            window.open('../../../../static/weightCheckOutNew.html?type=2&radioType=' + radioType + '&selectEW=' + this
+              .checked + '&selectEWDD=' + this.ddchecked)
+          } else if (type == 2) {
+            localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
+            window.open('../../../../static/weightCheckOutNew.html?type=2&radioType=' + radioType)
+          } else {
+            console.log(this.dialogDataList)
+            localStorage.setItem('print_out_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
+            window.open('../../../../static/weightCheckOutNew.html?type=2' )
+          }
+      },
+    
+      makeEWjjSelectPrintList() {
+        let _selectPrint_EWjjSelectPrintList = JSON.parse(JSON.stringify(this.dialogDataList));
+        for (let i = 0; i < _selectPrint_EWjjSelectPrintList.length; i++) {
+          let _data = _selectPrint_EWjjSelectPrintList[i];
+          _data.compName = this.companyNameEW;
+          _data.customer = this.ewCustomer
+        }
+        localStorage.setItem('selectPrint_EWjjSelectPrintList', JSON.stringify(_selectPrint_EWjjSelectPrintList))
       },
       opendBtn() {
         html2canvas(this.$refs.saveImg.$el).then((canvas) => {
@@ -1313,7 +1365,8 @@
                         this.inspect = JSON.parse(
                           JSON.stringify(this.weighingList)
                         )
-                        this.isShowPrint = true
+                        // this.isShowPrint = true
+                        this.isShowPrintType = true
                         this.weighingList = {
                           grossWeight: 0,
                           tare: 0,
@@ -1399,7 +1452,7 @@
                           }
                           this.isShowPrintType = true
                         }else{
-                          this.isShowPrint = true
+                          this.isShowPrintType = true
                         }
                         this.weighingList = {
                           grossWeight: 0,
@@ -1453,6 +1506,7 @@
               newSubmit(weighingList1)
                 .toPromise()
                 .then((response) => {
+                  this.idPrint=response
                   getweighing({
                       id: response
                     })
@@ -1461,7 +1515,29 @@
                       this.inspect = JSON.parse(
                         JSON.stringify(this.weighingList)
                       )
-                      this.isShowPrint = true
+                       if(this.warehouseName == '鲅鱼圈金信库' ||
+                        this
+                        .warehouseName == '哈尔滨依兰库' || this
+                        .warehouseName == '白城内陆港'|| this
+                        .warehouseName == '山东园丰库'){
+                          
+                          console.log(11111111111111111111)
+                          let cang = {}
+                          cang.value = this.weighingList.seller
+                          cang.label = this.weighingList.seller
+                         if (this.check(this.weighingList.seller, 1)) {
+                          this.ewCustomerOptions.push(cang)
+                          }
+                          let cang1 = {}
+                          cang1.value = this.weighingList.buyer
+                          cang1.label = this.weighingList.buyer
+                          if (this.check(this.weighingList.buyer, 2)) {
+                            this.companyNameEWOptions.push(cang1)
+                          }
+                          this.isShowPrintType = true
+                        }else{
+                          this.isShowPrintType = true
+                        }
 
                     })
                   if (this.reader) {
@@ -1478,7 +1554,7 @@
                   })
                   this.inspect = JSON.parse(JSON.stringify(this.weighingList))
 
-                  this.isShowPrint = true
+                  // this.isShowPrint = true
                   this.weighingList = {
                     grossWeight: 0,
                     selfLoading: 0,
@@ -2472,7 +2548,7 @@
     height: 320px;
     background: white;
     border-radius: 10px;
-    z-index: 999;
+    z-index: 9999;
   }
 
   /deep/.el-radio-group {

+ 382 - 23
src/views/outboundManagement/weighingManagementrecord.vue

@@ -20,10 +20,10 @@
       </template>
       <!-- <template slot="left"> </template> -->
       <template slot="right">
-        <ws-select class='select' v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType">
-          <ws-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
+        <el-select class='select' filterable  v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType">
+          <el-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
-        </ws-select>
+        </el-select>
         <ws-input class='findinput' @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="可按业务编号、合同编号、车牌号查找"
           clearable maxlength="500" type="input">
         </ws-input>
@@ -85,7 +85,7 @@
             v-hasPermission="`outbound.acquisitionWeightOut.mao`">毛重</el-button>
           <el-button @click="weighing(scope.row, 2)" v-if="scope.row.status == '已称皮重'"
             v-hasPermission="`outbound.acquisitionWeightOut.weight`"> 皮重</el-button> -->
-            <el-button @click="dayin(scope.row)"
+            <el-button @click="print(scope.row)"
             v-hasPermission="`outbound.acquisitionWeightOut.view`">打印</el-button>
           <el-button @click="del(scope.row)" v-if="scope.row.status == '已称皮重'"
             v-hasPermission="`outbound.acquisitionWeightOut.view`">删除</el-button>
@@ -105,6 +105,49 @@
       <ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
+    <div class="mask" v-show="isShowPrintType"></div>
+    <div class="print-type" v-show="isShowPrintType">
+      <div class="print-type-content">
+        <div class="print-type-title">请选择打印类型</div>
+        <div class="shdw-style" v-if="checked||(!ddchecked&&!checked)">
+          <div>我司发货单位:</div>
+          <!-- <div>{{companyName}}</div> -->
+          <el-select v-model="companyName" placeholder="请选择" style="width: 75%;">
+            <el-option v-for="item in companyNameOptions" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
+        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
+          <div class="print-type-ew">
+            <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
+            <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
+          </div>
+          <div class="ew-print" v-if="printSeparately">
+            <div class="row">
+              <div>额外发货单位:</div>
+              <!-- <div>{{companyName}}</div> -->
+              <el-select v-model="ewCustomer" placeholder="请选择" style="width: 75%;">
+                <el-option v-for="item in ewCustomerOptions" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+            <div class="row">
+              <div>额外收货单位:</div>
+              <!-- <div>{{companyNameEW}}</div> -->
+              <el-select v-model="companyNameEW" placeholder="请选择" style="width: 75%;">
+                <el-option v-for="item in companyNameEWOptions" :key="item.value" :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bottom-btn">
+        <el-button @click="typePrintClick">确定</el-button>
+        <el-button @click="typePrintCannelClick">取消</el-button>
+      </div>
+    </div>
     <el-dialog
       width="70%"
       class="title_css"
@@ -181,6 +224,7 @@
         searchKeyWord: '',
         searchType: [],
         warehouseName: '',
+        isShowPrintType: false,
         value1: '', //选择时间
         warehouseList: [],
         warehouseId: '',
@@ -189,11 +233,68 @@
         addressUrls: [],
         compId: localStorage.getItem('ws-pf_compId'),
         dialogVisible:false,
-        binNumber:"",
+        binNumber:'',
         binnumberList:[],
-        cangweiNum:"",
-        positionId:"",
-        warehouseList1:[]
+        cangweiNum:'',
+        positionId:'',
+        warehouseList1:[],
+        
+        ewCustomerOptions: [{
+          value: '厦门建发物产有限公司',
+          label: '厦门建发物产有限公司'
+        },{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        }],
+        companyNameOptions: [
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        }],
+        companyNameEWOptions: [{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '厦门建发物产有限公司',
+          label: '厦门建发物产有限公司'
+        }],
+        companyName: '黑龙江中天昊元贸易有限公司',
+        companyNameEW: '黑龙江利润元粮食贸易有限公司',
+        ewCustomer: '厦门建发物产有限公司',
+        ewradio: '',
+        ddchecked: false,
+        checked: false,
+        
+        printSeparately: false,
+        
+        jjSelectPrintList: [],
       }
     },
     activated() {
@@ -201,7 +302,165 @@
       this.showType = this.isShow
     },
     methods: {
-            importClick(file, fileList) {
+      changeEw(e) {
+        this.ddchecked = false
+        if (e) {
+          this.printSeparately = true
+        } else {
+          this.printSeparately = false
+        }
+      },
+      changeEwDD(e) {
+        this.checked = false
+        if (e) {
+          this.printSeparately = true
+        } else {
+          this.printSeparately = false
+        }
+      },
+      typePrintCannelClick() {
+        this.onePrint = false //单个打印标识
+        this.dialogDataList = [] //打个打印取消时数组至空
+        this.isShowPrintType = false
+      },
+      async typePrintClick(type) {
+        if (this.onePrint) { //判断是否是单个打印
+          getweighing({
+              id: this.idPrint
+            })
+            .toPromise()
+            .then((response) => {
+              this.dialogDataList = [] //点击确认时先清空要打印的数组
+              this.dialogData = response
+              if (response.compName == '黑龙江秋收有限公司') {
+                this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
+              }
+              if (this.checked) {
+                if(this.dialogData&&!this.dialogData.customer&&this.dialogData.contractManagement){
+                  this.dialogData.customer = this.dialogData.contractManagement.seller
+                }
+                this.dialogDataList.push(this.dialogData)
+                var _datas = JSON.stringify(this.dialogData)
+                _datas = JSON.parse(_datas)
+                _datas.compName =this.ewCustomer
+                _datas.customer =  this.companyNameEW
+                this.dialogDataList.push(_datas)
+                this.printBig('', this.radio)
+              } else if (this.ddchecked) {
+                _datas = this.dialogData
+                _datas.compName = this.companyNameEW;
+                _datas.customer = this.ewCustomer
+                this.dialogDataList.push(_datas)
+                this.printBig(1, this.radio)
+              } else {
+                this.dialogData.companyName = this.companyName
+                if(this.dialogData&&!this.dialogData.customer&&this.dialogData.contractManagement){
+                  this.dialogData.customer = this.dialogData.contractManagement.buyer
+                }
+                this.dialogDataList.push(this.dialogData)
+                this.printBig('', this.radio)
+              }
+            })
+            .catch((response) => {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            })
+        } else {
+          //   if (this.isExcelPrint) {
+          //   this.printBig(2, this.radio)
+          //   this.isExcelPrint = false
+          // } else {
+          this.jjSelectPrintList = []
+          let index1 = 0;
+          for (let i = 0; i < this.modification.length; i++) {
+            await getweighing({
+                id: this.modification[i].id
+              })
+              .toPromise()
+              .then((response) => {
+                index1++;
+                response.compName = this.companyName
+                if (response.compName == '黑龙江秋收有限公司') {
+                  response.compName = '黑龙江中天昊元贸易有限公司'
+                }
+                this.jjSelectPrintList.push(response)
+                if (index1 == this.modification.length) {
+                  this.printBig(1, this.radio)
+                }
+              })
+              .catch((response) => {})
+          }
+          // }
+        }
+      },
+      print(row, type, pageType) {
+        //打印
+        if (type == 1) { //
+          if (this.modification.length == 0) {
+            this.$message.error('请选择批量打印的条目!')
+            return
+          }
+          for (let _num = 0; _num < this.modification.length; _num++) {
+            if (this.modification[_num].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
+              if (this.modification[_num].seller && this.modification[_num].buyer) {
+                let cang = {}
+                cang.value = this.modification[_num].seller
+                cang.label = this.modification[_num].seller
+                if (this.check(this.modification[_num].seller, 1)) {
+                  this.ewCustomerOptions.push(cang)
+                }
+                let cang1 = {}
+                cang1.value = this.modification[_num].buyer
+                cang1.label = this.modification[_num].buyer
+                if (this.check(this.modification[_num].buyer, 2)) {
+                  this.companyNameEWOptions.push(cang1)
+                }
+              }
+            }
+          }
+          this.isShowPrintType = true
+        } else {
+          if (row.serviceManagementType == '2' && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
+            if (row.seller && row.buyer) {
+              let cang = {}
+              cang.value = row.seller
+              cang.label = row.seller
+              if (this.check(row.seller, 1)) {
+                this.ewCustomerOptions.push(cang)
+              }
+              let cang1 = {}
+              cang1.value = row.buyer
+              cang1.label = row.buyer
+              if (this.check(row.buyer, 2)) {
+                this.companyNameEWOptions.push(cang1)
+              }
+            }
+          }
+          this.idPrint = row.id
+          this.isShowPrintType = true
+          this.onePrint = true //单个打印标识
+        }
+
+      },
+      check(name, type) {
+        if (type == 1) {
+          for (var _tmp = 0; _tmp < this.ewCustomerOptions.length; _tmp++) {
+            if (this.ewCustomerOptions[_tmp].label == name) {
+              return false
+            }
+          }
+          return true
+        } else if (type == 2) {
+          for (var _tmp = 0; _tmp < this.companyNameEWOptions.length; _tmp++) {
+            if (this.companyNameEWOptions[_tmp].label == name) {
+              return false
+            }
+          }
+          return true
+
+        }
+
+      },
+      importClick(file, fileList) {
         this.fileTemp = file.raw
         let fileName = file.raw.name
         let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
@@ -457,7 +716,7 @@
        },
        dialogVisibleconfirm(){
         if(this.binNumber == this.cangweiNum){
-          this.$message.error("已是该仓位无需修改")
+          this.$message.error('已是该仓位无需修改')
           return
         }
         this.$confirm(`确定修改仓位?`, {
@@ -520,16 +779,16 @@
       find() {
         this.getList()
       },
-      dayin(row){
-        getweighing({
-          id: row.id
-          })
-          .toPromise()
-          .then((response) => {
-            this.inspect=response
-            this.isShowPrint=true
-          })
-      },
+      // dayin(row){
+      //   getweighing({
+      //     id: row.id
+      //     })
+      //     .toPromise()
+      //     .then((response) => {
+      //       this.inspect=response
+      //       this.isShowPrint=true
+      //     })
+      // },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)
         this.pageSize = val
@@ -544,9 +803,39 @@
          localStorage.setItem('ck_bd_printData1',JSON.stringify(this.inspect))
          window.open('../../../../static/outWeightPrint.html?type=1')
     },
-    printBig() {
-         localStorage.setItem('ck_bd_printData1',JSON.stringify(this.inspect))
-         window.open('../../../../static/outWeightPrint.html?type=2')
+    printBig(type, radioType) {
+        //  localStorage.setItem('ck_bd_printData1',JSON.stringify(this.inspect))
+        //  window.open('../../../../static/outWeightPrint.html?type=2')
+         // 打印额外
+        if (this.checked || this.ddchecked) {
+          this.makeEWjjSelectPrintList()
+          //  this.selectEW = true;
+        }
+        localStorage.removeItem('print_out_data')
+        localStorage.removeItem('selectPrint_EWjjSelectPrintList')
+        localStorage.removeItem('selectPrint_jjSelectPrintList')
+        if (type == 1) {
+          localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.dialogDataList))
+          window.open('../../../../static/weightCheckOutNew.html?type=2&radioType=' + radioType + '&selectEW=' + this
+            .checked + '&selectEWDD=' + this.ddchecked)
+        } else if (type == 2) {
+          localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
+          window.open('../../../../static/weightCheckOutNew.html?type=2&radioType=' + radioType)
+        } else {
+          console.log(this.dialogDataList)
+          localStorage.setItem('print_out_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
+          window.open('../../../../static/weightCheckOutNew.html?type=2' )
+        }
+    },
+  
+    makeEWjjSelectPrintList() {
+      let _selectPrint_EWjjSelectPrintList = JSON.parse(JSON.stringify(this.dialogDataList));
+      for (let i = 0; i < _selectPrint_EWjjSelectPrintList.length; i++) {
+        let _data = _selectPrint_EWjjSelectPrintList[i];
+        _data.compName = this.companyNameEW;
+        _data.customer = this.ewCustomer
+      }
+      localStorage.setItem('selectPrint_EWjjSelectPrintList', JSON.stringify(_selectPrint_EWjjSelectPrintList))
     },
     opendBtn() {
       // html2canvas(this.$refs.saveImg.$el).then((canvas) => {
@@ -721,6 +1010,46 @@
     border: none;
   }
 
+  .mask {
+    background: black;
+    width: 100vw;
+    height: 100vh;
+    position: fixed;
+    top: 0;
+    z-index: 99;
+    opacity: 0.3;
+  }
+
+  .print-type-title {
+    text-align: center;
+    font-size: 18px;
+    margin: 20px;
+  }
+
+  .bottom-btn {
+    display: flex;
+    margin-top: 20px;
+    justify-content: space-around;
+  }
+
+  .print-type-checkbox {
+    // padding-left: 20px;
+  }
+
+  .print-type {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: 440px;
+    height: 320px;
+    background: white;
+    border-radius: 10px;
+    z-index: 999;
+  }
+
   /deep/.ws-info-table .el-form-item .el-form-item__label {
     width: 30%;
     text-align: center;
@@ -763,4 +1092,34 @@
   .select{
     width:400px;
   }
+  .shdw-style {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 20px;
+    margin-top: 20px;
+  }
+   .ew-print {
+    padding: 0 20px;
+    margin-top: 10px;
+
+    // display: flex;
+    // justify-content: space-between;
+    // align-content: center;
+    .row {
+      display: flex;
+      margin-top: 10px;
+      align-items: center;
+    }
+  }
+
+  .sh-address {
+    display: flex;
+  }
+
+  .print-type-ew {
+    display: flex;
+    justify-content: space-between;
+    padding: 0 20px;
+  }
 </style>

+ 16 - 16
src/views/profitable/component/routers/route.js

@@ -246,22 +246,22 @@ const profitableRouter = {
       hidden:true,
     },  
     // 费用管理请款审核
-    {
-      path: 'cashoutaduitNQ',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/cashoutaduitNQ'),
-      name: 'cashoutaduitNQ',
-      meta: {
-        title: 'cashoutaduit',
-        shortcutEntrance: 'profitable',
-        module: 'lirunhesuan.feiyongguanli.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'费用管理请款审核'
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden:true,
-    }, 
+    // {
+    //   path: 'cashoutaduitNQ',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/profitable/cashoutaduitNQ'),
+    //   name: 'cashoutaduitNQ',
+    //   meta: {
+    //     title: 'cashoutaduit',
+    //     shortcutEntrance: 'profitable',
+    //     module: 'lirunhesuan.feiyongguanli.view',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'费用管理请款审核'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true,
+    // }, 
     // 费用管理收款
     {
       path: 'receipt',