Преглед изворни кода

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

gjy пре 2 година
родитељ
комит
b233d7d17f

+ 7 - 4
public/static/payprint1.html

@@ -262,9 +262,8 @@
                             </tr>
                             <tr class="row">
                                 <td class="col col-bgc">收货仓库</td>
-                                <td class="col" colspan="3">
-                                    {{printData1[index].warehouseName}}
-                                </td>
+                                <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                                <td v-if="!pengyuPrint" class="col" colspan="3">{{printData1[index].warehouseName}}</td>
                                 <td class="col col-bgc">地址</td>
                                 <td class="col" colspan="4">
                                     {{printData1[index].identityAuthenticationInfo.compAddress}}
@@ -637,7 +636,8 @@
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">收货仓库</td>
-                        <td class="col" colspan="3">{{printData.warehouseName}}</td>
+                        <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                        <td v-if="!pengyuPrint" class="col" colspan="3">{{printData.warehouseName}}</td>
                         <td class="col col-bgc">地址</td>
                         <td class="col" colspan="4">
                             {{printData.identityAuthenticationInfo.compAddress}}
@@ -1192,6 +1192,9 @@
             }
             //公司id
             this.compId = localStorage.getItem('ws-pf_compId')
+            if(this.compId == '5d164edcef03476dba6630f86dc96496'){
+                this.compId = '6a713699e08c4cbc97a87f7648a95e3d'
+            }
             this.date = new Date().toLocaleString()
                 // let _data = decodeURIComponent(this.getQueryVariable('dataList'))
             let _data = {}

+ 1340 - 0
public/static/payprint3.html

@@ -0,0 +1,1340 @@
+<!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 tr td {
+            border: 2px solid #333333;
+            padding: 5px 0;
+        }
+        
+        #app {
+            height: 88vh;
+            position: relative;
+        }
+        
+        .simple {
+            height: 120vh !important;
+        }
+        
+        .content {
+            width: 1000px;
+            margin: auto;
+            display: flex;
+        }
+        
+        table {
+            width: 100%;
+            text-align: center;
+            border-collapse: collapse;
+        }
+        
+        .col-bgc {
+            background: #f6f7fb;
+        }
+        
+        .bottom-row1 {
+            display: flex;
+            justify-content: space-between;
+            margin: 20px 0;
+        }
+        
+        .bottom-row2 {
+            display: flex;
+            margin: 10px 0;
+        }
+        
+        img {
+            width: 80px;
+            height: 80px;
+            /* margin-right: 118px; */
+        }
+        
+        .leftimg {
+            width: 80px;
+            height: 80px;
+            position: absolute;
+            right: 20px;
+            top: 3px;
+        }
+        
+        .config {
+            margin-right: 240px;
+        }
+        
+        .bottom-row3 {
+            margin: 10px 0;
+        }
+        
+        .title {
+            text-align: center;
+            font-size: 24px;
+        }
+        
+        .number {
+            text-align: right;
+            margin-bottom: 10px;
+        }
+        
+        .number1 {
+            text-align: right;
+            margin-bottom: 10px;
+            margin-top: 60px;
+        }
+        
+        .small-row {
+            display: flex;
+        }
+        
+        .small-content {
+            width: 400px;
+            margin: 0 auto;
+            border: 1px solid #ccc;
+            padding: 20px 20px 160px 20px;
+            position: absolute;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            margin: auto;
+            height: 650px;
+        }
+        
+        .small-title {
+            text-align: center;
+            font-size: 18px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+        }
+        
+        .small-row {
+            display: flex;
+            justify-content: space-between;
+            margin: 10px;
+        }
+        
+        .small-img {
+            margin-right: 0;
+        }
+        
+        .sign {
+            margin-right: 100px;
+        }
+        
+        .header {
+            display: flex;
+            justify-content: space-between;
+            font-size: 16px;
+            margin: 10px 0;
+        }
+        
+        .header1 {
+            font-size: 24px;
+            /* margin: 30px 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;
+        }
+        
+        .sfcard {
+            background: red;
+        }
+        
+        .sfcard-content {
+            /*        display: flex;
+        align-items: center;
+        justify-content: space-evenly; */
+        }
+        
+        .sfcard-content img {
+            width: 50vw;
+            height: 110vh;
+        }
+        
+        .sfcard-title {
+            font-size: 24px;
+            text-align: center;
+        }
+        
+        .center {
+            height: 99.5vh;
+        }
+        
+        .part2 {
+            /* background: red; */
+        }
+        
+        .part5 {
+            width: 100%
+        }
+        
+        .paymentScreenshot {
+            width: 100%;
+            height: 130vh
+        }
+        /* .onlypz-center{
+        height: 130vh;
+      } */
+    </style>
+</head>
+
+<body>
+    <div id="app">
+        <div v-if="selectPrint">
+            <div v-for="(item,index) in printData1" :key="index">
+                <div class="content">
+                    <!-- <div class="part5" v-if="isShowPrintType5">
+                        <div class="header1">
+                            付款回执单
+                        </div>
+                        <img :src="printData1[index].codeUrl" class="paymentScreenshot" />
+                    </div> -->
+                    <div class="center" v-if="isShowPrintType3">
+                        <div class="header1">{{ printData1[index].compName}}结算凭证</div>
+                        <div class="line"></div>
+                        <div class="line"></div>
+                        <div class="header">
+                            <div>单位名称:{{ printData1[index].compName}}</div>
+                            <!-- <div>税务登记编号:91230230MA1BNL7Q93</div> -->
+                        </div>
+                        <div class="header-top">
+                            <div>单位:公斤/元</div>
+                            <div>No.</div>
+                        </div>
+                        <div class="header-top">
+                            <div>开票日期:{{printData1[index].createDate}}</div>
+                            <!-- <div>开票日期:{{new Date(yyyy,mm,dd)}}</div> -->
+                            <div class="number">
+                                {{dealNo(printData1[index].paymentNo)}}
+                            </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">
+                                    {{ printData1[index].compName}}
+                                </td>
+                                <td rowspan="4" class="col col-bgc">卖方</td>
+                                <td class="col col-bgc">姓名</td>
+                                <td class="col" colspan="4">
+                                    {{ printData1[index].customerName}}
+                                </td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">税务登记号</td>
+                                <td class="col" colspan="3">
+                                    {{ printData1[index].taxRegistrationNo}}
+                                </td>
+                                <td class="col col-bgc">身份证号</td>
+                                <td class="col" colspan="4">
+                                    {{ printData1[index].identityAuthenticationInfo.customerNumberCard}}
+                                </td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">业务编号</td>
+                                <td class="col" colspan="3">
+                                    {{ printData1[index].paymentNo}}
+                                </td>
+                                <td class="col col-bgc">卡号</td>
+                                <td class="col" colspan="4">
+                                    {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
+                                </td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">收货仓库</td>
+                                <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                                <td v-if="!pengyuPrint" class="col" colspan="3">{{printData1[index].warehouseName}}</td>
+                                <td class="col col-bgc">地址</td>
+                                <td class="col" colspan="4">
+                                    {{printData1[index].identityAuthenticationInfo.compAddress}}
+                                </td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">货名</td>
+                                <td class="col col-bgc">类型</td>
+                                <td class="col col-bgc">等级</td>
+                                <td class="col col-bgc">水分%</td>
+                                <td class="col col-bgc">杂质%</td>
+                                <td class="col col-bgc">{{printData1[index].goodsName != '大豆'?'容重':'蛋白'}}</td>
+                                <td class="col col-bgc">毛重</td>
+                                <td class="col col-bgc">皮重</td>
+                                <td class="col col-bgc">扣重</td>
+                                <td class="col col-bgc">净重</td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col">{{ printData1[index].goodsName}}</td>
+                                <td class="col">{{ printData1[index].type}}</td>
+                                <td class="col">
+                                    {{ printData1[index].qualityInspectionManagement.grade}}
+                                </td>
+                                <td class="col">
+                                    {{ printData1[index].qualityInspectionManagement.waterContent}}
+                                </td>
+                                <td class="col">
+                                    {{ printData1[index].qualityInspectionManagement.impurity}}
+                                </td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
+                                </td>
+                                <td class="col">{{ printData1[index].grossWeight}}</td>
+                                <td class="col">{{ printData1[index].tare}}</td>
+                                <td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d' 
+                                ||  printData1[index].netWeight == null 
+                                ||  printData1[index].pureWeight == null">
+                                    {{printData1[index].weighingManagement?printData1[index].weighingManagement.buckleMiscellaneous:''}}
+                                </td>
+                                <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d' 
+                                && printData1[index].netWeight != null 
+                                && printData1[index].pureWeight != null ">{{printData1[index].netWeight-printData1[index].pureWeight}}</td>
+                                <td class="col">{{ printData1[index].netWeight}}</td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">纯重</td>
+                                <td class="col col-bgc">
+                                    单价
+                                </td>
+                                <td class="col col-bgc">扣单价</td>
+                                <td class="col col-bgc">粮款</td>
+                                <td class="col col-bgc">霉变粒</td>
+                                <td class="col col-bgc">热损伤</td>
+                                <td class="col col-bgc">不完善粒</td>
+                                <td class="col col-bgc">扣重比</td>
+                                <td class="col col-bgc">扣量%</td>
+                                <td class="col col-bgc"></td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col">{{ printData1[index].pureWeight}}</td>
+                                <td class="col " v-if="printData1[index].type == '潮粮' && !pengyuPrint">
+                                    {{printData1[index].tidalGrainPrice}}
+                                </td>
+                                <td class="col " v-if="printData1[index].type == '干粮' && !pengyuPrint">
+                                    {{printData1[index].qualityInspectionManagement.dryGrainPrice}}
+                                </td>
+                                <td class="col " v-if="pengyuPrint">
+                                    {{printData1[index].unitContractPrice/1000}}
+                                </td>
+                                <td class="col ">{{ printData1[index].unitDeduction}}</td>
+                                <td class="col " v-if="pengyuPrint">
+                                    {{Number(printData1[index].unitContractPrice/1000*printData1[index].pureWeight).toFixed(2)}}
+                                </td>
+                                <td class="col " v-if="!pengyuPrint">
+                                    {{printData1[index].grainMoney}}
+                                </td>
+                                <td class="col "> {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.mildewGrain:''}}</td>
+                                <td class="col "> {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.jiaorenli:''}}</td>
+                                <td class="col "> {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.imperfectGrain:''}}</td>
+                                <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData1[index].buckleWeightRatio}}</td>
+                                <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'">{{ (printData1[index].qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
+                                <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'"></td>
+                                <td class="col "></td>
+                                <!-- <td class="col ">{{ printData1[index].unloadDeduction}}</td> -->
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">卸车扣款</td>
+                                <td class="col col-bgc">质量扣款</td>
+                                <td class="col col-bgc">其他扣款</td>
+                                <!-- <td class="col col-bgc" v-if="printData.type == '潮粮'">
+                                    纯重单价
+                                </td> -->
+                                <td class="col col-bgc">合计应付</td>
+                                <td class="col col-bgc">购粮性质</td>
+                                <td class="col col-bgc">车牌号</td>
+                                <td class="col col-bgc" colspan="4">记事</td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col ">{{ printData1[index].unloadDeduction}}</td>
+                                <td class="col ">{{ printData1[index].qualityDeduction}}</td>
+                                <td class="col ">{{ printData1[index].otherDeduction}}</td>
+                                <!-- <td class="col " v-if="printData1[index].type == '潮粮'">
+                                    {{ printData1[index].solidGrainPrice}}
+                                </td> -->
+                                <td class="col " v-if="pengyuPrint">
+                                    {{Number(printData1[index].unitContractPrice/1000*printData1[index].pureWeight).toFixed(2)}}
+                                </td>
+                                <td class="col " v-if="!pengyuPrint">
+                                    {{printData1[index].calculationPayable}}
+                                </td>
+                                <td class="col ">
+                                    {{ printData1[index].qualityInspectionManagement.natureOfGrainPurchase}}
+                                </td>
+                                <td class="col ">{{ printData1[index].carNo}}</td>
+                                <td class="col " colspan="4">
+                                    {{ printData1[index].remarks}}
+                                </td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">实付金额</td>
+                                <td class="col " colspan="2">
+
+                                </td>
+                                <td class="col col-bgc" colspan="3">人民币(大写)</td>
+                                <td class="col " v-if="!pengyuPrint" colspan="4">
+                                    {{printData1[index].capitalize}}
+                                </td>
+                                <td class="col " v-if="pengyuPrint" colspan="4">
+
+                                </td>
+                            </tr>
+                        </table>
+
+                        <div class="bottom">
+                            <div class="bottom-row1">
+                                <div>
+                                    质检:{{ printData1[index].qualityInspectionManagement.qualityInspector}}
+                                </div>
+                                <div>
+                                    毛检:{{ printData1[index].weighingManagement.secretaryWeigher}}
+                                </div>
+                                <div>
+                                    皮检:{{ printData1[index].weighingManagement.skinInspector}}
+                                </div>
+                                <div>结算:{{ printData1[index].settlementClerk}}</div>
+                                <div>付款:{{ printData1[index].cashier}}</div>
+                                <div>复点:{{ }}</div>
+                                <div></div>
+                            </div>
+                            <div class="bottom-row2">
+                                <!-- <div class="left">
+                   <img src="../../../../public/img/add.png" alt="" />
+                 </div> -->
+                                <div class="config">收货单位签名或盖章</div>
+                                <div class="">客户签名</div>
+                            </div>
+                            <!-- <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="printBig">打印单据</el-button>
+               </div> -->
+                        </div>
+                    </div>
+                    <div v-if="isShowPrintType4" class="part2">
+                        <div style="height: 120px;">
+
+                            <div class="title">入库检斤单</div>
+                            <!-- <div class="leftimg">
+                                <img :src="printData1[index].weighingManagement.codeUrl" alt="">
+                            </div> -->
+                            <div class="number1">{{printData1[index].weighingManagement.number}}</div>
+                        </div>
+
+                        <table class="table">
+                            <tr class="row">
+                                <td class="col col-bgc">客户姓名</td>
+                                <td class="col" colspan="2">{{printData1[index].weighingManagement.customer}}</td>
+                                <td class="col col-bgc">客户电话</td>
+                                <td class="col">{{printData1[index].weighingManagement.customerPhone}}</td>
+                                <td class="col col-bgc">车牌号</td>
+                                <td class="col" colspan="2">{{printData1[index].weighingManagement.carNumber}}</td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">收货单位</td>
+                                <td class="col" colspan="2">{{printData1[index].weighingManagement.compName}}</td>
+                                <td class="col col-bgc">联系人</td>
+                                <td class="col">{{printData1[index].weighingManagement.person}}</td>
+                                <td class="col col-bgc">联系电话</td>
+                                <td class="col" colspan="2">{{printData1[index].weighingManagement.personPhone}}</td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">货名</td>
+                                <td class="col">{{printData1[index].weighingManagement.goodsName}}</td>
+                                <td class="col col-bgc">类型</td>
+                                <td class="col">{{printData1[index].weighingManagement.type}}</td>
+                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName != '大豆'?'容量(克/升)':'蛋白'}}</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
+                                </td>
+                                <td class="col col-bgc">不完善粒(%)</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.imperfectGrain:''}}
+                                </td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">等级</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.grade:''}}
+                                </td>
+                                <td class="col col-bgc">水分(%)</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.waterContent:''}}
+                                </td>
+                                <td class="col col-bgc">热损伤(%)</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.jiaorenli:''}}
+                                </td>
+                                <td class="col col-bgc">质检时间</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.qualityDate:''}}
+                                </td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">杂质(%)</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.impurity:''}}
+                                </td>
+                                <td class="col col-bgc">霉变粒(%)</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.mildewGrain:''}}
+                                </td>
+                                <td class="col col-bgc">扣杂</td>
+                                <td class="col">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.buckleMiscellaneous:''}}
+                                </td>
+                                <td class="col " colspan="2"></td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc">毛重(公斤)</td>
+                                <td class="col">{{printData1[index].weighingManagement.grossWeight}}</td>
+                                <td class="col col-bgc">皮重(公斤)</td>
+                                <td class="col">{{printData1[index].weighingManagement.tare}}</td>
+                                <td class="col col-bgc">扣重(公斤)</td>
+                                <td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d' 
+                                ||  printData1[index].netWeight == null 
+                                ||  printData1[index].pureWeight == null">
+                                    {{printData1[index].weighingManagement?printData1[index].weighingManagement.buckleMiscellaneous:''}}
+                                </td>
+                                <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d' 
+                                && printData1[index].netWeight != null 
+                                && printData1[index].pureWeight != null ">{{printData1[index].netWeight-printData1[index].pureWeight}}</td>
+                                <!-- <td class="col">{{printData1[index].weighingManagement.buckleMiscellaneous}}</td> -->
+                                <td class="col col-bgc">净重(公斤)</td>
+                                <td class="col">{{printData1[index].weighingManagement.netWeight}}</td>
+                            </tr>
+                            <tr class="row">
+                                <td class="col col-bgc" colspan="2">毛重检斤时间</td>
+                                <td class="col" colspan="2">{{printData1[index].weighingManagement.grossDate}}</td>
+                                <td class="col col-bgc" colspan="2">皮重检斤时间</td>
+                                <td class="col" colspan="2">{{printData1[index].weighingManagement.tareDate}}</td>
+                            </tr>
+                        </table>
+
+                        <div class="bottom">
+                            <div class="bottom-row1">
+                                <div>毛检:{{printData1[index].weighingManagement.secretaryWeigher}}</div>
+                                <div style="margin-left:60px">
+                                    皮检:{{printData1[index].weighingManagement.skinInspector}}
+                                </div>
+                                <!-- <div>{{tableData.qualityDate}}</div> -->
+                            </div>
+                            <div class="bottom-row2">
+                                <!-- <div class="leftimg">
+                    <img src="../img/add.png" alt="">
+                  </div> -->
+                                <div class="config">收货单位签名或盖章:</div>
+                                <div class="autograph">客户签名:</div>
+                            </div>
+                            <!-- <div class="bottom-row3">扫一扫</div> -->
+                        </div>
+                    </div>
+
+                    <div class="part1" v-if="isShowPrintType1">
+                        <div class="sfcard-content">
+                            <div class="sfcard-title">
+                                {{ printData1[index].customerName}}{{printData1[index].identityAuthenticationInfo.customerNumberCard}}
+                            </div>
+                            <img :src="customerList1[index].imgURl.imageUrl1" class="avatar" />
+                        </div>
+                        <!--     <div class="sfcard-content">
+                <div class="sfcard-title">
+                  {{
+                  printData1[index].customerName}}{{printData1[index].identityAuthenticationInfo.customerNumberCard}}
+                </div>
+                <img :src="customerList1[index].imgURl.imageUrl2" class="avatar" />
+              </div> -->
+                    </div>
+                    <div class="bankcard" v-if="isShowPrintType2">
+
+                        <div class="sfcard-content part2">
+                            <div class="sfcard-title">
+                                {{printData1[index].bankDeposit}}{{printData1[index].bankCard}}
+                            </div>
+                            <!-- <img :src="customerList1[index].imgURl.imageUrl3" class="avatar" /> -->
+                            <img v-if="printData1[index].imgURl" :src="printData1[index].imgURl.imageUrl3" class="avatar" />
+                            <img v-else class="avatar" />
+                            <!-- <img v-if="printData1[index].imgURl" :src="printData1[index].imgURl.imageUrl4" class="avatar" />
+                            <img v-else class="avatar" /> -->
+
+                        </div>
+                        <!--          <div class="sfcard-content part2">
+                <div class="sfcard-title">
+                  {{printData1[index].identityAuthenticationInfo.bankDeposit}}{{printData1[index].identityAuthenticationInfo.bankCard}}
+                </div>
+                <img :src="customerList1[index].imgURl.imageUrl4" class="avatar" />
+              </div> -->
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="content" v-else>
+            <!-- <div class="part5" v-if="isShowPrintType5">
+                <div class="header1">
+                    付款回执单
+                </div>
+                <img :src="printData.paymentScreenshot" class="paymentScreenshot" />
+            </div> -->
+            <div class="center part1" v-if="isShowPrintType3" :class="!selectPrint? 'simple':''">
+                <div class="header1">{{ printData.compName}}结算凭证</div>
+                <div class="line"></div>
+                <div class="line"></div>
+                <div class="header">
+                    <div>单位名称:{{ printData.compName}}</div>
+                    <!-- <div>税务登记编号:91230230MA1BNL7Q93</div> -->
+                </div>
+                <div class="header-top">
+                    <div>单位:公斤/元</div>
+                    <div>No.</div>
+                </div>
+                <div class="header-top">
+                    <div>开票日期:{{printData.createDate}}</div>
+                    <!-- <div>开票日期:{{new Date(yyyy,mm,dd)}}</div> -->
+                    <div class="number">{{dealNo(printData.paymentNo)}}</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 rowspan="4" class="col col-bgc">卖方</td>
+                        <td class="col col-bgc">姓名</td>
+                        <td class="col" colspan="4">{{ 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="4">
+                            {{ printData.identityAuthenticationInfo.customerNumberCard}}
+                        </td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">业务编号</td>
+                        <td class="col" colspan="3">{{ printData.paymentNo}}</td>
+                        <td class="col col-bgc">卡号</td>
+                        <td class="col" colspan="4">
+                            {{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}
+                        </td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">收货仓库</td>
+                        <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                        <td v-if="!pengyuPrint" class="col" colspan="3">{{printData.warehouseName}}</td>
+                        <td class="col col-bgc">地址</td>
+                        <td class="col" colspan="4">
+                            {{printData.identityAuthenticationInfo.compAddress}}
+                        </td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">货名</td>
+                        <td class="col col-bgc">类型</td>
+                        <td class="col col-bgc">等级</td>
+                        <td class="col col-bgc">水分%</td>
+                        <td class="col col-bgc">杂质%</td>
+                        <td class="col col-bgc">{{printData.goodsName!= '大豆'?'容重':'蛋白'}}</td>
+                        <td class="col col-bgc">毛重</td>
+                        <td class="col col-bgc">皮重</td>
+                        <td class="col col-bgc">扣重</td>
+                        <td class="col col-bgc">净重</td>
+                        <!-- <td class="col col-bgc">出库净重</td> -->
+                        <!-- <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.qualityInspectionManagement.grade}}
+                        </td>
+                        <td class="col">
+                            {{ printData.qualityInspectionManagement.waterContent}}
+                        </td>
+                        <td class="col">
+                            {{ printData.qualityInspectionManagement.impurity}}
+                        </td>
+                        <td class="col">{{printData.qualityInspectionManagement?printData.qualityInspectionManagement.bulkDensity:''}}</td>
+                        <td class="col">{{ printData.grossWeight}}</td>
+                        <td class="col">{{ printData.tare}}</td>
+                        <td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d' 
+                        ||  printData.netWeight == null 
+                        ||  printData.pureWeight == null">
+                            {{printData.weighingManagement?printData.weighingManagement.buckleMiscellaneous:''}}
+                        </td>
+                        <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d' 
+                        && printData.netWeight != null 
+                        && printData.pureWeight != null ">{{printData.netWeight-printData.pureWeight}}</td>
+                        <!-- <td class="col">
+                            {{ printData.weighingManagement.buckleMiscellaneous}}
+                        </td> -->
+                        <td class="col">{{ printData.netWeight}}</td>
+                        <!-- <td class="col">{{ printData.pureWeight}}</td> -->
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">纯重</td>
+                        <td class="col col-bgc">单价</td>
+                        <td class="col col-bgc">扣单价</td>
+                        <td class="col col-bgc">粮款</td>
+                        <td class="col col-bgc">霉变粒</td>
+                        <td class="col col-bgc">热损伤</td>
+                        <td class="col col-bgc">不完善粒</td>
+                        <td class="col col-bgc">扣重比</td>
+                        <td class="col col-bgc">扣量%</td>
+                        <td class="col col-bgc"></td>
+                        <!-- <td class="col col-bgc">1卸车扣款</td> -->
+                    </tr>
+                    <tr class="row">
+                        <td class="col">{{ printData.pureWeight}}</td>
+                        <td class="col " v-if="printData.type == '潮粮' && !pengyuPrint">
+                            {{printData.tidalGrainPrice}}
+                        </td>
+                        <td class="col " v-if="printData.type == '干粮' && !pengyuPrint">
+                            {{printData.qualityInspectionManagement.dryGrainPrice}}
+                        </td>
+                        <td class="col " v-if="pengyuPrint">
+                            {{printData.unitContractPrice/1000}}
+                        </td>
+                        <td class="col ">{{ printData.unitDeduction}}</td>
+                        <td class="col " v-if="pengyuPrint">
+                            {{Number(printData.unitContractPrice/1000*printData.pureWeight).toFixed(2)}}
+                        </td>
+                        <td class="col " v-if="!pengyuPrint">
+                            {{printData.grainMoney}}
+                        </td>
+                        <td class="col "> {{printData.qualityInspectionManagement.mildewGrain}}</td>
+                        <td class="col "> {{printData.qualityInspectionManagement.jiaorenli}}</td>
+                        <td class="col "> {{printData.qualityInspectionManagement.imperfectGrain}}</td>
+                        <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
+                        <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
+                        <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'"></td>
+                        <td class="col "></td>
+                        <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">卸车扣款</td>
+                        <td class="col col-bgc">质量扣款</td>
+                        <td class="col col-bgc">其他扣款</td>
+                        <!-- <td class="col col-bgc" v-if="printData.type == '潮粮'">
+                            纯重单价
+                        </td> -->
+                        <td class="col col-bgc">合计应付</td>
+                        <td class="col col-bgc">购粮性质</td>
+                        <td class="col col-bgc">车牌号</td>
+                        <td class="col col-bgc" colspan="4">记事</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col ">{{ printData.unloadDeduction}}</td>
+                        <td class="col ">{{ printData.qualityDeduction}}</td>
+                        <td class="col ">{{ printData.otherDeduction}}</td>
+                        <!-- <td class="col " v-if="printData.type == '潮粮'">
+                            {{ printData.solidGrainPrice}}
+                        </td> -->
+                        <td class="col " v-if="pengyuPrint">
+                            {{Number(printData.unitContractPrice/1000*printData.pureWeight).toFixed(2)}}
+                        </td>
+                        <td class="col " v-if="!pengyuPrint">
+                            {{printData.calculationPayable}}
+                        </td>
+                        <td class="col ">
+                            {{ printData.qualityInspectionManagement.natureOfGrainPurchase}}
+                        </td>
+                        <td class="col ">{{ printData.carNo}}</td>
+                        <td class="col " colspan="4">{{ printData.remarks}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">实付金额</td>
+                        <td class="col " colspan="2"></td>
+                        <td class="col col-bgc" colspan="3">人民币(大写)</td>
+                        <td class="col " v-if="!pengyuPrint" colspan="4">
+                            {{printData.capitalize}}
+                        </td>
+                        <td class="col " v-if="pengyuPrint" colspan="4">
+
+                        </td>
+                    </tr>
+                </table>
+                <div class="bottom">
+                    <div class="bottom-row1">
+                        <div>
+                            质检:{{ printData.qualityInspectionManagement.qualityInspector}}
+                        </div>
+                        <div>
+                            毛检:{{ printData.weighingManagement.secretaryWeigher}}
+                        </div>
+                        <div>皮检:{{ printData.weighingManagement.skinInspector}}</div>
+                        <div>结算:{{ printData.settlementClerk}}</div>
+                        <div>付款:{{ printData.cashier}}</div>
+                        <div>复点:{{ }}</div>
+                        <div></div>
+                    </div>
+                    <div class="bottom-row2">
+                        <!-- <div class="left">
+               <img src="../../../../public/img/add.png" alt="" />
+             </div> -->
+                        <div class="config">收货单位签名或盖章</div>
+                        <div class="">客户签名</div>
+                    </div>
+                    <!-- <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="printBig">打印单据</el-button>
+           </div> -->
+                </div>
+            </div>
+
+            <div v-if="isShowPrintType4" class="part2">
+                <div>
+
+                    <div class="title">入库检斤单</div>
+                    <!-- <div class="leftimg">
+                        <img :src="tableData.codeUrl" alt="">
+                    </div> -->
+                    <div class="number1">{{tableData.number}}</div>
+                </div>
+                <table class="table">
+                    <tr class="row">
+                        <td class="col col-bgc">客户姓名</td>
+                        <td class="col" colspan="2">{{tableData.customer}}</td>
+                        <td class="col col-bgc">客户电话</td>
+                        <td class="col">{{tableData.customerPhone}}</td>
+                        <td class="col col-bgc">车牌号</td>
+                        <td class="col" colspan="2">{{tableData.carNumber}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">收货单位</td>
+                        <td class="col" colspan="2">{{tableData.compName}}</td>
+                        <td class="col col-bgc">联系人</td>
+                        <td class="col">{{tableData.person}}</td>
+                        <td class="col col-bgc">联系电话</td>
+                        <td class="col" colspan="2">{{tableData.personPhone}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">货名</td>
+                        <td class="col">{{tableData.goodsName}}</td>
+                        <td class="col col-bgc">类型</td>
+                        <td class="col">{{tableData.type}}</td>
+                        <td class="col col-bgc">{{tableData.goodsName != '大豆'?'容量(克/升)':'蛋白'}}</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}
+                        </td>
+                        <td class="col col-bgc">不完善粒(%)</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.imperfectGrain:''}}
+                        </td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">等级</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.grade:''}}
+                        </td>
+                        <td class="col col-bgc">水分(%)</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.waterContent:''}}
+                        </td>
+                        <td class="col col-bgc">热损伤(%)</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.jiaorenli:''}}
+                        </td>
+                        <td class="col col-bgc">质检时间</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.qualityDate:''}}
+                        </td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">杂质(%)</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.impurity:''}}
+                        </td>
+                        <td class="col col-bgc">霉变粒(%)</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.mildewGrain:''}}
+                        </td>
+                        <td class="col col-bgc">扣杂</td>
+                        <td class="col">
+                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.buckleMiscellaneous:''}}
+                        </td>
+                        <td class="col " colspan="2"></td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc">毛重(公斤)</td>
+                        <td class="col">{{tableData.grossWeight}}</td>
+                        <td class="col col-bgc">皮重(公斤)</td>
+                        <td class="col">{{tableData.tare}}</td>
+                        <td class="col col-bgc">扣重(公斤)</td>
+                        <td class="col">{{tableData.buckleMiscellaneous}}</td>
+                        <td class="col col-bgc">净重(公斤)</td>
+                        <td class="col">{{tableData.netWeight}}</td>
+                    </tr>
+                    <tr class="row">
+                        <td class="col col-bgc" colspan="2">毛重检斤时间</td>
+                        <td class="col" colspan="2">{{tableData.grossDate}}</td>
+                        <td class="col col-bgc" colspan="2">皮重检斤时间</td>
+                        <td class="col" colspan="2">{{tableData.tareDate}}</td>
+                    </tr>
+                </table>
+
+                <div class="bottom">
+                    <div class="bottom-row1">
+                        <div>毛检:{{tableData.secretaryWeigher}}</div>
+                        <div style="margin-left:60px">
+                            皮检:{{tableData.skinInspector}}
+                        </div>
+                        <!-- <div>{{tableData.qualityDate}}</div> -->
+                    </div>
+                    <div class="bottom-row2">
+                        <!-- <div class="left">
+                <img src="../img/add.png" alt="">
+              </div> -->
+                        <div class="config">收货单位签名或盖章:</div>
+                        <div class="autograph">客户签名:</div>
+                    </div>
+                    <!-- <div class="bottom-row3">扫一扫</div> -->
+                </div>
+            </div>
+
+            <div class="sfcard part3" v-if="isShowPrintType1">
+                <div class="sfcard-content">
+                    <div class="sfcard-title">
+                        {{ printData.customerName}}{{ printData.identityAuthenticationInfo.customerNumberCard}}
+                    </div>
+                    <img :src="imageUrl1" class="avatar" />
+                </div>
+                <!-- <div class="sfcard-content">
+                    <div class="sfcard-title">
+                        {{ printData.customerName}}{{ printData.identityAuthenticationInfo.customerNumberCard}}
+                    </div>
+                    <img :src="imageUrl2" class="avatar" />
+                </div> -->
+            </div>
+
+            <div class="bankcard part4" v-if="isShowPrintType2">
+                <div class="sfcard-content">
+                    <div class="sfcard-title">
+                        {{printData.bankDeposit}}{{printData.bankCard}}
+                    </div>
+                    <img :src="imageUrl3" class="avatar" />
+                </div>
+                <!-- <div class="sfcard-content">
+                    <div class="sfcard-title">
+                        {{printData.bankDeposit}}{{printData.bankCard}}
+                    </div>
+                    <img :src="imageUrl4" class="avatar" />
+                </div> -->
+
+            </div>
+        </div>
+
+        <div class="small-content" v-if="smallContent">
+            <div class="small-title">
+                <div>
+                    {{printData.compName}}结算凭证
+                </div>
+                <img class="small-img" src="../img/add.png" alt="" />
+            </div>
+            <div class="small-row">
+                <div>开票日期</div>
+                <div>{{printData.createDate}}</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.weighingManagement.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>&nbsp;&nbsp;&nbsp;</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: {
+            isShowPrintType1: false,
+            isShowPrintType2: false,
+            isShowPrintType3: false,
+            isShowPrintType4: false,
+            isShowPrintType5: false,
+            showType: [],
+            printData: {},
+            printData1: [],
+            customerList: {},
+            customerList1: [],
+            name: '',
+            bigContent: false,
+            smallContent: false,
+            date: '',
+            imageUrl1: '',
+            imageUrl2: '',
+            imageUrl3: '',
+            imageUrl4: '',
+            identity: [],
+            bank: [],
+            selectPrint: false,
+            onlyShowPz: false,
+            tableData: [],
+            compId: '',
+            pengyuPrint: 'false'
+        },
+        computed: {},
+        methods: {
+            dealNo(str) {
+                return str.slice(4)
+            },
+            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() {
+            this.pengyuPrint = localStorage.getItem('pengyuPrint')
+            debugger
+            if (this.pengyuPrint == 'true') {
+                this.pengyuPrint = true
+            } else {
+                this.pengyuPrint = false
+            }
+            //公司id
+            this.compId = localStorage.getItem('ws-pf_compId')
+            if(this.compId == '5d164edcef03476dba6630f86dc96496'){
+                this.compId = '6a713699e08c4cbc97a87f7648a95e3d'
+            }
+            this.date = new Date().toLocaleString()
+                // let _data = decodeURIComponent(this.getQueryVariable('dataList'))
+            let _data = {}
+            if (localStorage.getItem('print_pay_data')) {
+                _data = localStorage.getItem('print_pay_data')
+            } else {
+                _data = decodeURIComponent(this.getQueryVariable("dataList"))
+            }
+            if (!_data || _data == 'false') {
+                this.selectPrint = true
+                this.printData1 = JSON.parse(
+                    localStorage.getItem('selectPrint_selectPrintList')
+                )
+                console.log("对象", this.printData1)
+                console.log("对象", this.printData)
+                for (let i = 0; i < this.printData1.length; i++) {
+                    if (!this.printData1[i].identityAuthenticationInfo.compAddress) this.printData1[i]
+                        .identityAuthenticationInfo.compAddress = ''
+                    if (this.printData1[i].identityAuthenticationInfo.compAddress.length > 24) {
+                        this.printData1[i].identityAuthenticationInfo.compAddress = this.printData1[i]
+                            .identityAuthenticationInfo
+                            .compAddress.substring(0, 24)
+                    }
+                }
+            } else {
+                debugger
+                this.printData = JSON.parse(_data)
+                    //地址过长截取
+                if (this.printData.identityAuthenticationInfo && this.printData.identityAuthenticationInfo.compAddress.length > 24) {
+                    this.printData.identityAuthenticationInfo.compAddress = this.printData.identityAuthenticationInfo
+                        .compAddress.substring(0, 24)
+                }
+                this.selectPrint = false
+            }
+            let _type = decodeURIComponent(this.getQueryVariable('type'))
+            this.showType = decodeURIComponent(
+                    this.getQueryVariable('printTypeList')
+                )
+                // this.pzList = this.showType.split(',')
+                // if((this.showType.indexOf('打印结算凭证')>-1)&&this.pzList.length==1){
+                //   this.onlyShowPz = true
+                // }
+                // this.pageType = decodeURIComponent(this.getQueryVariable('printTypeList'))
+            let _data1 = decodeURIComponent(this.getQueryVariable('customerList'))
+
+            var cwprint = localStorage.getItem('cwprint')
+            if (!_data1) {
+                this.customerList1 = JSON.parse(
+                    localStorage.getItem('selectPrint_selectCustomerList')
+                )
+            } else {
+                debugger
+                if (cwprint == 'true') {
+                    this.customerList = JSON.parse(localStorage.getItem('printData1'))
+                }
+
+            }
+            console.log(this.customerList)
+            console.log('cwprint', localStorage.getItem('cwprint'))
+            if (cwprint == 'true') {
+                if (this.selectPrint) {
+                    for (let i = 0; i < this.customerList1.length; i++) {
+                        let _url1 = this.customerList1[i].identityAuthenticationInfo.cardAddressUrl.split(',')
+                            // let _url2 = this.customerList1[i].payeeAddressUrl.split(',')
+                        this.customerList1[i].imgURl = {
+                            imageUrl1: _url1[0],
+                            imageUrl2: _url1[1],
+                            // imageUrl3: _url2[0],
+                            // imageUrl4: _url2[0]
+                        }
+                    }
+                    for (let i = 0; i < this.printData1.length; i++) {
+                        if (this.printData1[i].payeeAddressUrl) {
+                            let _url2 = this.printData1[i].payeeAddressUrl.split(',')
+                            this.printData1[i].imgURl = {
+                                imageUrl3: _url2[0],
+                                imageUrl4: _url2[1]
+                            }
+                        }
+
+                    }
+                } else {
+                    if (this.customerList.identityAuthenticationInfo.cardAddressUrl) {
+                        this.identity = this.customerList.identityAuthenticationInfo.cardAddressUrl.split(',')
+                        this.imageUrl1 = this.identity[0]
+                        this.imageUrl2 = this.identity[1]
+                    }
+                    if (this.customerList.payeeAddressUrl) {
+                        this.bank = this.customerList.payeeAddressUrl.split(',')
+                        this.imageUrl3 = this.bank[0]
+                        this.imageUrl4 = this.bank[1]
+                    }
+                    if (this.printData.payeeAddressUrl) {
+                        this.bank = this.printData.payeeAddressUrl.split(',')
+                        this.imageUrl3 = this.bank[0]
+                        this.imageUrl4 = this.bank[1]
+                    }
+
+                    this.tableData = this.printData.weighingManagement
+                }
+                let _lsit = this.showType.split(',')
+                for (let i = 0; i < _lsit.length; i++) {
+                    switch (_lsit[i]) {
+                        case '打印身份证':
+                            this.isShowPrintType1 = !this.isShowPrintType1
+                            break
+                        case '打印银行卡':
+                            this.isShowPrintType2 = !this.isShowPrintType2
+                            break
+                        case '打印结算凭证':
+                            this.isShowPrintType3 = !this.isShowPrintType3
+                            break
+                        case '打印检斤单':
+                            this.isShowPrintType4 = !this.isShowPrintType4
+                            break
+                        case '打印回执单':
+                            this.isShowPrintType5 = !this.isShowPrintType5
+                            break
+                    }
+                }
+            } else {
+                this.isShowPrintType3 = true
+            }
+            if (_type == 2) {
+                this.bigContent = true
+                this.smallContent = false
+            } else {
+                this.smallContent = true
+                this.bigContent = false
+            }
+            if (this.printData.compName == undefined) this.printData.compName = ''
+            document.title = this.printData.compName + '结算凭证'
+            window.print()
+                // sessionStorage.removeItem('selectPrint_selectPrintList');
+                // sessionStorage.removeItem('selectPrint_selectCustomerList');
+            window.onafterprint = function(event) {
+                window.history.back(-1)
+            }
+        },
+        watch: {}
+    })
+</script>
+
+</html>

+ 1 - 1
public/static/weightCheckOutNew.html

@@ -291,7 +291,7 @@
                             <td class="col col-bgc">发货单位</td>
                             <td class="col" colspan="2">{{item.customer}}</td>
                             <td class="col col-bgc">联系电话</td>
-                            <td class="col">{{kehu}}</td>
+                            <td class="col">{{kehuphone}}</td>
                             <!-- <td class="col">{{item.contractManagement ? item.contractManagement.sellerPhone : ""}}</td> -->
                             <td class="col col-bgc">货名</td>
                             <td class="col" colspan="2">{{item.goodsName}}</td>

+ 5 - 2
src/components/balanceAlert.vue

@@ -64,7 +64,9 @@ export default {
             this.param = 1200
           } else if (this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库') {
             this.param = 2400
-          }  else {
+          } else if(this.deptBudgetList.warehouseName == '大庆朝阳沟库' ){
+            this.param = 4800
+          } else {
             this.param = 9600
           }
           console.log(this.param)
@@ -196,7 +198,8 @@ export default {
           if (
             this.deptBudgetList.warehouseName &&
             (this.deptBudgetList.warehouseName == '顺诚粮库' ||
-              this.deptBudgetList.warehouseName == '鲅鱼圈金信库')
+              this.deptBudgetList.warehouseName == '鲅鱼圈金信库'|
+              this.deptBudgetList.warehouseName == '大庆朝阳沟库')
           ) {
             for (var i = value.length - 1; i >= 0; i--) {
               var tmp = String.fromCharCode(value[i])

+ 10 - 3
src/layout/index/top/index.vue

@@ -44,6 +44,8 @@
               <el-button v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`" 
                 v-if="btnStatus.status5" @click="goToPage(6)" class="btn_css">去称皮重
               </el-button>
+              <!-- <el-button @click="goToPage(6)" class="btn_css">去称皮重
+              </el-button> -->
               <el-button v-hasPermission="`acquisitionManagement.acquisitionPay.add`" v-if="btnStatus.status6"
                 @click="goToPage(5)" class="btn_css">去结算</el-button>
               
@@ -606,7 +608,7 @@
       async getQRCodeData(tmp) {
         await getQRCodeData(tmp)
           .toPromise()
-          .then((response) => { 
+          .then((response) => { debugger
             this.toPageData = response
             // 处理按钮显示状态
             // this.btnStatus 
@@ -631,9 +633,10 @@
             if ( this.toPageData.qualityInspectionManagement.confirm != '0' &&  (_status1 == '已称毛重' || _status1 == '已称皮重') && _status3 == '') {
               this.btnStatus.status5 = true
             } 
-            if ( this.toPageData.qualityInspectionManagement.confirm != '0' &&   _status1 == '已称皮重' && _status3 == '待结算')  {
+            if (this.toPageData.qualityInspectionManagement.confirm != '0' &&   _status1 == '已称皮重' && _status3 == '待结算')  {
               this.btnStatus.status6 = true
             }
+           
             if (_status3 == '已结算') {
               this.$message.error('业务已完结');
             } else {
@@ -691,6 +694,8 @@
            _saomadata.monitorUrl2 = this.toPageData.warehouseBaseInfo.monitorUrl2
            _saomadata.allowEdit = this.toPageData.warehouseBaseInfo.allowEdit
            _saomadata.number = this.toPageData.number
+           //入库状态
+           
             localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
              this.$router.push({
             name: 'newWeighingManagement',query: {  id:this.index++ }
@@ -709,9 +714,11 @@
            _saomadata.monitorUrl1 = this.toPageData.warehouseBaseInfo.monitorUrl1
            _saomadata.monitorUrl2 = this.toPageData.warehouseBaseInfo.monitorUrl2
            _saomadata.allowEdit = this.toPageData.warehouseBaseInfo.allowEdit
+           _saomadata.number = this.toPageData.number
             localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
            this.$router.push({
-            name: 'newWeighingManagement',
+            name: 'newWeighingManagement'
+            ,query: {  id:this.index++ }
           })
         }
         this.smAlert = false

+ 2 - 2
src/views/contractManagement/inspectInfo.vue

@@ -113,8 +113,8 @@
             </ws-form-item>
           </ws-info-table>
 
-          <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; </div>
-          <!-- <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; <el-checkbox v-if='types==1||types==3' v-model="checked">补录</el-checkbox></div> -->
+          <!-- <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; </div> -->
+          <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; <el-checkbox v-if='types==1||types==3' v-model="checked">补录</el-checkbox></div>
           <ws-info-table>
             <ws-form-item label="等级" span="1" prop="grade">
               <ws-select v-model="inspect.grade" placeholder="请输入等级" class="typeselect" :disabled="disabled"

+ 234 - 234
src/views/houseSelfCollect/component/routers/route.js

@@ -1,245 +1,245 @@
 import Layout from '@/layout/index';
 
 const houseSelfCollectRouter = {
-  path: '/houseSelfCollect',
-  component: Layout,
-  redirect: '/houseSelfCollect',
-  name: 'houseSelfCollect',
-  alwaysShow: true, // will always show the root menu
-  meta: {
-    title: 'houseSelfCollect',
-    module: 'acquisitionManagement',
-    icon: '-a-4-shougoubeifen'
-  },
-  children: [
-    // 客户管理
-    {
-      path: 'customerManagement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/customerManagement'),
-      name: 'customerManagement',
-      meta: {
-        title: 'customerManagement',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionCustomer.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'入库管理客户管理'
-      }
+    path: '/houseSelfCollect',
+    component: Layout,
+    redirect: '/houseSelfCollect',
+    name: 'houseSelfCollect',
+    alwaysShow: true, // will always show the root menu
+    meta: {
+        title: 'houseSelfCollect',
+        module: 'acquisitionManagement',
+        icon: '-a-4-shougoubeifen'
     },
+    children: [
+        // 客户管理
+        {
+            path: 'customerManagement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/customerManagement'),
+            name: 'customerManagement',
+            meta: {
+                title: 'customerManagement',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionCustomer.view',
+                permissicon: [],
+                keepAlive: true,
+                _title: '入库管理客户管理'
+            }
+        },
         //客户管理添加
         {
-          path: 'customerManagementAdd',
-          component: () =>
-            import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/customerManagementAdd'),
-          name: 'customerManagementAdd',
-          meta: {
-            title: 'customerManagementAdd',
-            shortcutEntrance: 'houseSelfCollect',
-            module: 'acquisitionManagement.acquisitionCustomer.add',
-            permissicon: [],
-            keepAlive: true,
-            _title:'客户管理添加'
-          },
-          hidden: true
+            path: 'customerManagementAdd',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/customerManagementAdd'),
+            name: 'customerManagementAdd',
+            meta: {
+                title: 'customerManagementAdd',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionCustomer.add',
+                permissicon: [],
+                keepAlive: true,
+                _title: '客户管理添加'
+            },
+            hidden: true
+        },
+        //收购管理
+        {
+            path: 'acquisitionManagement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/acquisitionManagement'),
+            name: 'acquisitionManagement',
+            meta: {
+                title: 'acquisitionManagement',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisition.view',
+                permissicon: [],
+                keepAlive: true,
+                _title: '入库管理仓库设置'
+            }
+        },
+        //收购新增
+        {
+            path: 'acquisitionManagementAdd',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/acquisitionManagementAdd'),
+            name: 'acquisitionManagementAdd',
+            meta: {
+                title: 'acquisitionManagementAdd',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisition.add',
+                permissicon: [],
+                keepAlive: true,
+                _title: '收购管理新增'
+            },
+            hidden: true
+        },
+        // // 质检管理
+        // {
+        //   path: 'inspectionManagement',
+        //   component: () =>
+        //     import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagement'),
+        //   name: 'inspectionManagement',
+        //   meta: {
+        //     title: 'inspectionManagement',
+        //     shortcutEntrance: 'houseSelfCollect',
+        //     module: 'acquisitionManagement.acquisitionQuality.view',
+        //     permissicon: [],
+        //     keepAlive: true
+        //   }
+        // },
+        // // 质检管理记录
+        {
+            path: 'inspectionManagementrecord',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagementrecord'),
+            name: 'inspectionManagementrecord',
+            meta: {
+                title: 'inspectionManagementrecord',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionQuality.view',
+                permissicon: [],
+                _title: '质检管理记录'
+                    // keepAlive:true
+            },
+            hidden: true
+        },
+        {
+            path: 'inspectionManagement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagementNew'),
+            name: 'inspectionManagementNew',
+            meta: {
+                title: 'inspectionManagement',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionQuality.view',
+                permissicon: [],
+                _title: '入库管理质检管理'
+                    // keepAlive:true
+            }
+        },
+        // // 检斤管理
+        // {
+        //   path: 'weighingManagement',
+        //   component: () =>
+        //     import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weighingManagement'),
+        //   name: 'weighingManagement',
+        //   meta: {
+        //     title: 'weighingManagement',
+        //     shortcutEntrance: 'houseSelfCollect',
+        //     module: 'acquisitionManagement.acquisitionWeight.view',
+        //     permissicon: [],
+        //     keepAlive: true
+        //   }
+        // },
+        // 新检斤管理
+        {
+            path: 'newWeighingManagement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/newWeighingManagement'),
+            name: 'newWeighingManagement',
+            meta: {
+                title: 'newWeighingManagement',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionWeight.view',
+                permissicon: [],
+                _title: '入库管理检斤管理',
+                keepAlive: false
+            }
+        },
+        // 付款管理
+        {
+            path: 'paymentManagement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/paymentManagement'),
+            name: 'paymentManagement',
+            meta: {
+                title: 'paymentManagement',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionPay',
+                permissicon: [],
+                _title: '付款管理'
+                    // keepAlive: true
+            }
+        },
+        {
+            path: 'settlement',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/settlement'),
+            name: 'settlement',
+            meta: {
+                title: 'settlement',
+                shortcutEntrance: 'settlement',
+                module: 'acquisitionManagement.acquisitionPay.view',
+                permissicon: [],
+                keepAlive: false,
+                _title: '入库管理结算'
+            },
+            hidden: true
+        },
+        {
+            path: 'inspectInfolook',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectInfoLook'),
+            name: 'inspectInfo',
+            meta: {
+                title: 'inspectInfo',
+                shortcutEntrance: 'inspectInfo',
+                module: 'acquisitionManagement.acquisitionQuality.view',
+                permissicon: [],
+                keepAlive: true,
+                _title: '查看质检信息'
+            },
+            hidden: true
+        },
+        {
+            path: 'inspectInfo',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectInfo'),
+            name: 'inspectInfo',
+            meta: {
+                title: 'inspectInfo',
+                shortcutEntrance: 'inspectInfo',
+                module: 'acquisitionManagement.acquisitionQuality.view',
+                permissicon: [],
+                keepAlive: true,
+                _title: '质检信息'
+            },
+            hidden: true
+        },
+        {
+            path: 'weightCheck',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weightCheck'),
+            name: 'weightCheck',
+            meta: {
+                title: 'weightCheck',
+                shortcutEntrance: 'weightCheck',
+                module: 'acquisitionManagement.acquisitionWeight.view',
+                permissicon: [],
+                keepAlive: true
+            },
+            hidden: true
         },
-    //收购管理
-    {
-      path: 'acquisitionManagement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/acquisitionManagement'),
-      name: 'acquisitionManagement',
-      meta: {
-        title: 'acquisitionManagement',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisition.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'入库管理仓库设置'
-      }
-    },
-    //收购新增
-    {
-      path: 'acquisitionManagementAdd',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/acquisitionManagementAdd'),
-      name: 'acquisitionManagementAdd',
-      meta: {
-        title: 'acquisitionManagementAdd',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisition.add',
-        permissicon: [],
-        keepAlive: true,
-        _title:'收购管理新增'
-      },
-        hidden: true
-    },
-    // // 质检管理
-    // {
-    //   path: 'inspectionManagement',
-    //   component: () =>
-    //     import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagement'),
-    //   name: 'inspectionManagement',
-    //   meta: {
-    //     title: 'inspectionManagement',
-    //     shortcutEntrance: 'houseSelfCollect',
-    //     module: 'acquisitionManagement.acquisitionQuality.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //   }
-    // },
-    // // 质检管理记录
-    {
-      path: 'inspectionManagementrecord',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagementrecord'),
-      name: 'inspectionManagementrecord',
-      meta: {
-        title: 'inspectionManagementrecord',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionQuality.view',
-        permissicon: [],
-        _title:'质检管理记录'
-        // keepAlive:true
-      },
-      hidden: true
-    },
-    {
-      path: 'inspectionManagement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagementNew'),
-      name: 'inspectionManagementNew',
-      meta: {
-        title: 'inspectionManagement',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionQuality.view',
-        permissicon: [],
-        _title:'入库管理质检管理'
-        // keepAlive:true
-      }
-    },
-    // // 检斤管理
-    // {
-    //   path: 'weighingManagement',
-    //   component: () =>
-    //     import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weighingManagement'),
-    //   name: 'weighingManagement',
-    //   meta: {
-    //     title: 'weighingManagement',
-    //     shortcutEntrance: 'houseSelfCollect',
-    //     module: 'acquisitionManagement.acquisitionWeight.view',
-    //     permissicon: [],
-    //     keepAlive: true
-    //   }
-    // },
-     // 新检斤管理
-     {
-      path: 'newWeighingManagement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/newWeighingManagement'),
-      name: 'newWeighingManagement',
-      meta: {
-        title: 'newWeighingManagement',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionWeight.view',
-        permissicon: [],
-        _title:'入库管理检斤管理'
-        // keepAlive: true
-      }
-    },
-    // 付款管理
-    {
-      path: 'paymentManagement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/paymentManagement'),
-      name: 'paymentManagement',
-      meta: {
-        title: 'paymentManagement',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionPay',
-        permissicon: [],
-        _title:'付款管理'
-        // keepAlive: true
-      }
-    },
-    {
-      path: 'settlement',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/settlement'),
-      name: 'settlement',
-      meta: {
-        title: 'settlement',
-        shortcutEntrance: 'settlement',
-        module: 'acquisitionManagement.acquisitionPay.view',
-        permissicon: [],
-        keepAlive: false,
-        _title:'入库管理结算'
-      },
-      hidden: true
-    },
-    {
-      path: 'inspectInfolook',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectInfoLook'),
-      name: 'inspectInfo',
-      meta: {
-        title: 'inspectInfo',
-        shortcutEntrance: 'inspectInfo',
-        module: 'acquisitionManagement.acquisitionQuality.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'查看质检信息'
-      },
-      hidden: true
-    },
-    {
-      path: 'inspectInfo',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectInfo'),
-      name: 'inspectInfo',
-      meta: {
-        title: 'inspectInfo',
-        shortcutEntrance: 'inspectInfo',
-        module: 'acquisitionManagement.acquisitionQuality.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'质检信息'
-      },
-      hidden: true
-    },
-    {
-      path: 'weightCheck',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weightCheck'),
-      name: 'weightCheck',
-      meta: {
-        title: 'weightCheck',
-        shortcutEntrance: 'weightCheck',
-        module: 'acquisitionManagement.acquisitionWeight.view',
-        permissicon: [],
-        keepAlive: true
-      },
-      hidden: true
-    },
 
-    // 记录
-    {
-      path: 'weightCheckRecord',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weightCheckRecord'),
-      name: 'weightCheckRecord',
-      meta: {
-        title: 'weightCheckRecord',
-        shortcutEntrance: 'houseSelfCollect',
-        module: 'acquisitionManagement.acquisitionWeight.view',
-        permissicon: [],
-        keepAlive: true,
-        _title:'检斤管理记录'
-      },
-      hidden: true
-    },
-  ],
+        // 记录
+        {
+            path: 'weightCheckRecord',
+            component: () =>
+                import ( /* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weightCheckRecord'),
+            name: 'weightCheckRecord',
+            meta: {
+                title: 'weightCheckRecord',
+                shortcutEntrance: 'houseSelfCollect',
+                module: 'acquisitionManagement.acquisitionWeight.view',
+                permissicon: [],
+                keepAlive: true,
+                _title: '检斤管理记录'
+            },
+            hidden: true
+        },
+    ],
 
 };
 
-export default houseSelfCollectRouter;
+export default houseSelfCollectRouter;

+ 2 - 2
src/views/houseSelfCollect/inspectInfo.vue

@@ -113,8 +113,8 @@
             </ws-form-item>
           </ws-info-table>
 
-          <!-- <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; <el-checkbox v-if='types==1||types==3' v-model="checked">补录</el-checkbox></div> -->
-          <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; </div>
+          <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; <el-checkbox v-if='types==1||types==3' v-model="checked">补录</el-checkbox></div>
+          <!-- <div class="title">质检数据&nbsp;&nbsp;&nbsp;&nbsp; </div> -->
           <ws-info-table>
             <ws-form-item label="等级" span="1" prop="grade">
               <ws-select v-model="inspect.grade" placeholder="请输入等级" class="typeselect" :disabled="disabled"

+ 76 - 4
src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -364,12 +364,12 @@
 
               </ws-info-table>
 
-              <!-- <div class="title" v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">质检数据 <span class="bulu">补录:</span>
+              <div class="title" v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">质检数据 <span class="bulu">补录:</span>
                 <el-switch v-model="value1"></el-switch>
-              </div> -->
-              <div class="title" v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">质检数据 
-               
               </div>
+              <!-- <div class="title" v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">质检数据  -->
+               
+              <!-- </div> -->
               <ws-info-table v-if="serviceManagementType == 3 &zjJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检' || serviceManagementType == 1">
                 <ws-form-item label="等级" span="1" prop="outType">
                   <ws-select v-if='statusTypetext != "复检"' v-model="deptBudgetList.grade"
@@ -1669,6 +1669,78 @@ export default {
     },
     //确认初检信息
     checkOk() {
+      // this.deptBudgetList.warehouseInOutDetail.reWaterContent =
+      //       this.deptBudgetList.reWaterContent
+      //     if (!this.deptBudgetList.reWaterContent) {
+      //       this.$message({
+      //         message: '请输入水分',
+      //         type: 'warning',
+      //       })
+      //       return
+      //     }
+      //     if (isNaN(this.deptBudgetList.reWaterContent)) {
+      //       this.$message({
+      //         message: '水分(%)非数字!',
+      //         type: 'warning',
+      //       })
+      //       return
+      //     }
+      //     if (
+      //       this.deptBudgetList.reWaterContent < 0 ||
+      //       this.deptBudgetList.reWaterContent > 40 ||
+      //       (String(this.deptBudgetList.reWaterContent).indexOf('.') != -1 &&
+      //         String(this.deptBudgetList.reWaterContent).length -
+      //         (String(this.deptBudgetList.reWaterContent).indexOf('.') + 1) >
+      //         2)
+      //     ) {
+      //       this.$message({
+      //         message: '水分(%)输入错误! 取值范围0-40之间且可以保留2小数',
+      //         type: 'warning',
+      //       })
+      //       return
+      //     }
+      //     if(!this.deptBudgetList.waterContent){
+      //       this.deptBudgetList.waterContent =this.deptBudgetList.reWaterContent
+      //        this.deptBudgetList.warehouseInOutDetail.waterContent =this.deptBudgetList.reWaterContent
+      //     }
+      //     //容重
+      //     this.deptBudgetList.warehouseInOutDetail.reBulkDensity =
+      //       this.deptBudgetList.reBulkDensity
+      //     if (!this.deptBudgetList.reBulkDensity) {
+      //       if(this.deptBudgetList.goodsName!='大豆'){
+      //         this.$message({
+      //           message: '请输入容重!',
+      //           type: 'warning',
+      //         })
+      //         return
+      //       }else{
+      //         this.$message({
+      //           message: '请输入蛋白!',
+      //           type: 'warning',
+      //         })
+      //         return
+      //       }
+            
+      //     }
+      //     if (isNaN(this.deptBudgetList.reBulkDensity)) {
+      //       if(this.deptBudgetList.goodsName!='大豆'){
+      //         this.$message({
+      //         message: '容重(克/升)非数字!',
+      //         type: 'warning',
+      //       })
+      //       return
+      //       }else{
+      //         this.$message({
+      //         message: '蛋白非数字!',
+      //         type: 'warning',
+      //       })
+      //       return
+      //       }
+      //     }
+      //     if(!this.deptBudgetList.bulkDensity){
+      //       this.deptBudgetList.bulkDensity =this.deptBudgetList.reBulkDensity
+      //       this.deptBudgetList.warehouseInOutDetail.bulkDensity =this.deptBudgetList.reBulkDensity
+      //     }
       if (!this.deptBudgetList.binNumber) {
         this.$message({
           message: '请选择仓位号',

Разлика између датотеке није приказан због своје велике величине
+ 500 - 392
src/views/houseSelfCollect/newWeighingManagement.vue


+ 15 - 2
src/views/houseSelfCollect/paymentManagement.vue

@@ -84,6 +84,9 @@
         <ws-button type="primary" @click="selectPrint(2)"
           v-hasPermission="`acquisitionManagement.acquisitionPay.yeda`">业务批量打印
         </ws-button>
+        <ws-button type="primary" @click="selectPrint(3)"
+          v-hasPermission="`acquisitionManagement.acquisitionPay.yeda`">身份证银行卡打印
+        </ws-button>
         <ws-button type="primary" @click="agreementPrint()"
           v-hasPermission="`acquisitionManagement.acquisitionPay.dow`">下载结算单
         </ws-button>
@@ -180,7 +183,7 @@
             " @click="print(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">打印</el-button>
           <el-button v-show="
               (scope.row.approveStatus ||
-              (scope.row.status != '待结算' && !scope.row.approveStatus))&&compId=='6a713699e08c4cbc97a87f7648a95e3d'
+              (scope.row.status != '待结算' && !scope.row.approveStatus))&&(compId=='6a713699e08c4cbc97a87f7648a95e3d'||compId=='5d164edcef03476dba6630f86dc96496')
             " @click="printPY(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">三方打印</el-button>
           <el-button v-show="
               scope.row.approveStatus ||
@@ -736,6 +739,8 @@
       selectPrint(num) {
         if(num == 2){
           this.printTips = 2
+        }else if(num==3){
+          this.printTips = 3
         }
         this.printType = 1
         this.isShowPrintType = true
@@ -1319,7 +1324,15 @@
               this.ruleForm.type,
               '结算凭证'
             )
-          }else{
+          } else if(this.printTips == 3){
+            window.open(
+              '../../../../../static/payprint3.html?type=2&customerList=' +
+              _list2 +
+              '&printTypeList=' +
+              this.ruleForm.type,
+              '结算凭证'
+            )
+          } else{
             window.open(
               '../../../../../static/payprint1.html?type=2&customerList=' +
               _list2 +

+ 10 - 7
src/views/houseSelfCollect/settlement.vue

@@ -383,11 +383,11 @@
         })
       },
       printSmall() {
-        window.open('../../../../../static/payprint.html?type=1&dataList=' + JSON.stringify(this.printData))
+        window.open('../../../../../static/payprint1.html?type=1&dataList=' + JSON.stringify(this.printData))
       },
       printBig() {
         localStorage.setItem('print_pay_data',JSON.stringify(this.printData))
-        window.open('../../../../../static/payprint.html?type=2')
+        window.open('../../../../../static/payprint1.html?type=2')
       },
       getList() {
         getpaymentexamine({
@@ -397,21 +397,24 @@
           if (!this.paymentList.unitDeduction) {
             this.paymentList.unitDeduction = 0
           }
+          if(this.paymentList.warehouseName =='杜尔伯特家禾库' && this.types == 1){
+            this.paymentList.unloadDeduction = (Number(this.paymentList.netWeight)/1000*5).toFixed(0)
+          }
           let compIdTmp  = localStorage.getItem('ws-pf_compId')
-          //白城市鹏羽粮食贸易有限公司 扣重比1.25 干粮水分15
-          if(compIdTmp == '6a713699e08c4cbc97a87f7648a95e3d'){
+          //白城市鹏羽粮食贸易有限公司 扣重比1.25 干粮水分14.5
+          if(compIdTmp == '6a713699e08c4cbc97a87f7648a95e3d' || compIdTmp == '5d164edcef03476dba6630f86dc96496'){
             // this.paymentList.buckleWeightRatio = this.paymentList.qualityInspectionManagement.buckleWeightRatio
             this.paymentList.buckleWeightRatio = 1.25
             this.ganwater = 14.5
             this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(4)
             if (this.paymentList.qualityInspectionManagement.paramType == '2') {
               this.paymentList.qualityInspectionManagement.weightDeduction = (this.paymentList
-                  .qualityInspectionManagement.waterContent - 15) *
+                  .qualityInspectionManagement.waterContent - this.ganwater) *
                 this.paymentList.buckleWeightRatio
               this.paymentList.qualityInspectionManagement.weightDeduction = this.paymentList
-                .qualityInspectionManagement.weightDeduction.toFixed(2)
+                .qualityInspectionManagement.weightDeduction.toFixed(5)
               this.paymentList.base = (100 - this.paymentList.qualityInspectionManagement.weightDeduction) / 100
-              this.paymentList.base = this.paymentList.base.toFixed(3)
+              this.paymentList.base = this.paymentList.base.toFixed(5)
               if (this.paymentList.type == '潮粮') {
                 if(this.paymentList.base > 1){
                   this.paymentList.base = 1

+ 3 - 3
src/views/houseSelfCollect/weighingManagement.vue

@@ -136,7 +136,7 @@
         <div class="shdw-style" v-if="checked||(!ddchecked&&!checked)">
           <div>收货单位:</div>
           <!-- <div>{{companyName}}</div> -->
-          <el-select v-model="companyName" placeholder="请选择" style="width: 75%;" v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
+          <el-select v-model="companyName" placeholder="请选择" style="width: 75%;" v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='杜尔伯特家禾库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
             <el-option v-for="item in companyNameOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
           </el-select>
           <el-select v-model="companyName1" placeholder="请选择" style="width: 75%;" v-else>
@@ -144,7 +144,7 @@
             </el-option>
           </el-select>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
+        <div v-if="warehouseName=='鲅鱼圈金信库'||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>
@@ -550,7 +550,7 @@
                 this.dialogDataList.push(_datas)
              }else{
               // this.dialogData.compName = this.companyName
-               if(this.warehouseName == '白城内陆港' || this.warehouseName == '鲅鱼圈金信库'|| this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库'){
+               if(this.warehouseName == '白城内陆港' || this.warehouseName == '鲅鱼圈金信库'|| this.warehouseName == '杜尔伯特家禾库'|| this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库'){
                  this.dialogData.companyName = this.companyName
                }else{
                  this.dialogData.companyName = this.companyName1

+ 1 - 1
src/views/houseSelfCollect/weightCheck.vue

@@ -200,7 +200,7 @@
             </el-option>
           </el-select>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||this.warehouseName=='山东园丰库'">
+        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='杜尔伯特家禾库'||warehouseName=='哈尔滨依兰库'||this.warehouseName=='山东园丰库'">
           <div class="print-type-ew">
             <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
             <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>

+ 128 - 11
src/views/houseSelfCollect/weightCheckRecord.vue

@@ -110,7 +110,7 @@
             </el-option>
           </el-select>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
+        <div v-if="warehouseName=='鲅鱼圈金信库'||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>
@@ -256,6 +256,9 @@
         title: '',
         modification: [],
         ewCustomerOptions: [{
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
           value: '黑龙江中天昊元贸易有限公司',
           label: '黑龙江中天昊元贸易有限公司'
         }, {
@@ -315,6 +318,9 @@
           label: '黑龙江启兴粮食贸易有限公司'
         }],
         companyNameEWOptions: [{
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
           value: '厦门建发物产有限公司',
           label: '厦门建发物产有限公司'
         }],
@@ -344,6 +350,7 @@
       console.log(localStorage.getItem('compNameoptions'))
       if(localStorage.getItem('compNameoptions')){
         var company=JSON.parse(localStorage.getItem('compNameoptions'))
+        
         var extra=company.filter((item)=>{
           return item!='黑龙江中天昊元贸易有限公司'
           &&item!='黑龙江利润元粮食贸易有限公司'
@@ -356,12 +363,115 @@
           &&item!='黑龙江启兴粮食贸易有限公司'
         })
         if(extra.length>0){
-          this.ewCustomerOptions=[]
-          this.companyNameOptions=[]
-          this.companyNameEWOptions=[]
-          this.companyName=extra[0]
-          this.companyNameEW=extra[0]
-          this.ewCustomer=extra[0]
+          this.companyNameOptions=[
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+        
+          this.ewCustomerOptions= [
+          {
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+          this.companyNameEWOptions=[
+          {
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+           if(localStorage.getItem('print_company_name')){
+            this.companyName=localStorage.getItem('print_company_name')
+          }else{
+            this.companyName=extra[0]
+          }
+          if(localStorage.getItem('print_company_name_ew')){
+            this.companyNameEW=localStorage.getItem('print_company_name_ew')
+          }else{
+            this.companyNameEW=extra[0]
+          }
+          if(localStorage.getItem('print_customer_name_ew')){
+            this.ewCustomer=localStorage.getItem('print_customer_name_ew')
+          }else{
+            this.ewCustomer=extra[0]
+          }
           for (let i = 0; i < extra.length; i++) {
             this.ewCustomerOptions.push({value: extra[i],label:extra[i]})
             this.companyNameOptions.push({value: extra[i],label:extra[i]})
@@ -668,6 +778,9 @@
         this.$router.go(-1)
       },
       async typePrintClick(type) {
+        localStorage.setItem('print_company_name',this.companyName)
+        localStorage.setItem('print_company_name_ew',this.companyNameEW)
+        localStorage.setItem('print_customer_name_ew',this.ewCustomer)
         if (this.onePrint) { //判断是否是单个打印
           getPrint({
               id: this.idPrint
@@ -678,7 +791,10 @@
               this.dialogData = response
               if (response.compName == '黑龙江秋收有限公司') {
                 this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
+              }else{
+                this.dialogData.compName = this.companyName
               }
+              debugger
               if (this.checked) {
                 if(this.dialogData&&!this.dialogData.customer&&this.dialogData.contractManagement){
                   this.dialogData.customer = this.dialogData.contractManagement.seller
@@ -695,7 +811,7 @@
                 _datas.customer = this.ewCustomer
                 this.dialogDataList.push(_datas)
               } else {
-                this.dialogData.companyName = this.companyName
+                this.dialogData.compName = this.companyName
                 if(this.dialogData&&this.dialogData.contractManagement&& this.warehousingType != 3){
                   this.dialogData.customer = this.dialogData.contractManagement.seller
                 }
@@ -770,7 +886,7 @@
             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].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库'|| 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
@@ -789,7 +905,7 @@
           }
           this.isShowPrintType = true
         } else {
-          if (row.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
+          if (row.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
             if (row.seller && row.buyer) {
               let cang = {}
               cang.value = row.seller
@@ -832,7 +948,8 @@
           console.log(this.dialogDataList)
           
           localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
-          window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
+          // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
+          window.open('../../../../static/weightCheck.html?type=2&tableData=' )
         }
       },
       warehouseNameChange() {

+ 93 - 6
src/views/outboundManagement/weighingManagementNew.vue

@@ -347,7 +347,7 @@
             </el-select>
           </div>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
+        <div v-if="warehouseName=='鲅鱼圈金信库'||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>
@@ -657,9 +657,94 @@
           &&item!='黑龙江启兴粮食贸易有限公司'
         })
         if(extra.length>0){
-          this.ewCustomerOptions=[]
-          this.companyNameOptions=[]
-          this.companyNameEWOptions=[]
+          this.companyNameOptions=[
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+        
+          this.ewCustomerOptions= [
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+          this.companyNameEWOptions=[
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
           this.companyName=extra[0]
           this.companyNameEW=extra[0]
           this.ewCustomer=extra[0]
@@ -1584,7 +1669,8 @@
                         this
                         .warehouseName == '哈尔滨依兰库' || this
                         .warehouseName == '白城内陆港'|| this
-                        .warehouseName == '山东园丰库'){
+                        .warehouseName == '山东园丰库'|| this
+                        .warehouseName == '杜尔伯特家禾库'){
                           if(this.weighingList.contractManagement){
                             let cang = {}
                             cang.value = this.weighingList.contractManagement.seller
@@ -1666,7 +1752,8 @@
                         this
                         .warehouseName == '哈尔滨依兰库' || this
                         .warehouseName == '白城内陆港'|| this
-                        .warehouseName == '山东园丰库'){
+                        .warehouseName == '山东园丰库'|| this
+                        .warehouseName == '杜尔伯特家禾库'){
                           this.weighingList = response
                       this.inspect = JSON.parse(
                         JSON.stringify(this.weighingList)

+ 91 - 6
src/views/outboundManagement/weighingManagementrecord.vue

@@ -124,7 +124,7 @@
             </el-select>
           </div>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
+        <div v-if="warehouseName=='鲅鱼圈金信库'||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>
@@ -355,9 +355,94 @@
           &&item!='黑龙江启兴粮食贸易有限公司'
         })
         if(extra.length>0){
-          this.ewCustomerOptions=[]
-          this.companyNameOptions=[]
-          this.companyNameEWOptions=[]
+          this.companyNameOptions=[
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+        
+          this.ewCustomerOptions= [
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+          this.companyNameEWOptions=[
+          {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
           this.companyName=extra[0]
           this.companyNameEW=extra[0]
           this.ewCustomer=extra[0]
@@ -470,7 +555,7 @@
             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].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || 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
@@ -489,7 +574,7 @@
           }
           this.isShowPrintType = true
         } else {
-          if (row.serviceManagementType == '2' && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
+          if (row.serviceManagementType == '2' && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'|| this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
             if (row.seller && row.buyer) {
               let cang = {}
               cang.value = row.seller

+ 5 - 1
src/views/platformAudit/tradeInformation.vue

@@ -245,7 +245,11 @@
           if (this.searchTypeList[i].value == e) {
             if(e=='全部'){
               this.status =''
-            }else{
+            }
+            else if(e=='已通过'){
+              this.status ='审核通过'
+            }
+            else{
               this.status = this.searchTypeList[i].value
             }
             

+ 1 - 1
src/views/statisticalReport/stockSaleOutReportList.vue

@@ -145,7 +145,7 @@
             </div>
 
             <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
-              v-if="scope.row.identification3 == 'true'" @click="weightClick(scope.row,2)"></i>
+              v-if="scope.row.identification1 == 'true'" @click="weightClick(scope.row,2)"></i>
           </template>
         </el-table-column>
         <el-table-column  width='130' class="table_td"  prop="amountIngReceivable" label="应收金额(元)">

+ 1 - 1
src/views/warehouse/warehouseManagementRecord.vue

@@ -303,7 +303,7 @@
           </el-select>
         </div>
         <!-- <div v-if="deptBudgetList.warehouseName=='鲅鱼圈金信库'||deptBudgetList.warehouseName=='白城内陆港'||deptBudgetList.warehouseName=='哈尔滨依兰库'||this.warehouseName=='山东园丰库'"> -->
-        <div v-if="deptBudgetList.warehouseName=='鲅鱼圈金信库'||deptBudgetList.warehouseName=='白城内陆港'">
+        <div v-if="deptBudgetList.warehouseName=='鲅鱼圈金信库'||deptBudgetList.warehouseName=='白城内陆港'||deptBudgetList.warehouseName=='杜尔伯特家禾库'">
           <div class="print-type-ew">
             <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
             <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>

Неке датотеке нису приказане због велике количине промена