更新

public/static/payprint1.html

@@ -10,52 +10,52 @@
             border: 2px solid #333333;
             padding: 5px 0;
         }
-        
+
         #app {
             height: 88vh;
             position: relative;
         }
-        
+
         .simple {
             /* height: 120vh !important; */
         }
-        
+
         .simple2 {
             /* height: 99vh !important; */
         }
-        
+
         .content {
             width: 1000px;
             margin: auto;
         }
-        
+
         table {
             width: 100%;
             text-align: center;
             border-collapse: collapse;
         }
-        
+
         .col-bgc {
             background: #f6f7fb;
         }
-        
+
         .bottom-row1 {
             display: flex;
             justify-content: space-around;
             margin: 20px 0;
         }
-        
+
         .bottom-row2 {
             display: flex;
             margin: 10px 0;
         }
-        
+
         img {
             width: 80px;
             height: 80px;
             /* margin-right: 118px; */
         }
-        
+
         .leftimg {
             width: 80px;
             height: 80px;
@@ -63,35 +63,35 @@
             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;
@@ -105,7 +105,7 @@
             margin: auto;
             height: 650px;
         }
-        
+
         .small-title {
             text-align: center;
             font-size: 18px;
@@ -113,98 +113,99 @@
             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: 100%;
             height: 80vh;
         }
-        
+
         .sfcard-title {
             font-size: 28px;
             text-align: center;
         }
-        
+
         .center {
             page-break-after: always
         }
-        
+
         .part2 {
             page-break-after: always
-            /* background: red; */
+                /* background: red; */
         }
-        
+
         .part1 {
             page-break-after: always
-            /* background: red; */
+                /* background: red; */
         }
-        
+
         .bankcard {
             page-break-after: always
-            /* background: red; */
+                /* background: red; */
         }
-        
+
         .part5 {
             width: 100%
         }
-        
+
         .paymentScreenshot {
             width: 100%;
             height: 130vh
         }
+
         /* .onlypz-center{
         height: 130vh;
       } */
@@ -319,7 +320,8 @@
                                 </td>
                                 <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d' 
                                 && printData1[index].netWeight != null 
-                                && printData1[index].pureWeight != null ">{{printData1[index].netWeight-printData1[index].pureWeight}}</td>
+                                && printData1[index].pureWeight != null ">
+                                    {{printData1[index].netWeight-printData1[index].pureWeight}}</td>
                                 <td class="col">{{ printData1[index].netWeight}}</td>
                             </tr>
                             <tr class="row">
@@ -354,13 +356,27 @@
                                 <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].type=='潮粮'">{{ (printData1[index].qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
-                                <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData1[index].type=='潮粮'"></td>
-                                <td :colspan="printData1[index].type == '潮粮'?1:2" class="col ">{{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.binNumber:''}}</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].type=='潮粮'">{{
+                                    (printData1[index].qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
+                                <td class="col "
+                                    v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData1[index].type=='潮粮'">
+                                </td>
+                                <td :colspan="printData1[index].type == '潮粮'?1:2" class="col ">
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.binNumber:''}}
+                                </td>
                                 <!-- <td class="col ">{{ printData1[index].unloadDeduction}}</td> -->
                             </tr>
                             <tr class="row">
@@ -477,13 +493,17 @@
                                 <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 col-bgc">{{printData1[index].weighingManagement.goodsName ==
+                                    '大豆'?'蛋白':'容量（克/升）'}}</td>
                                 <td class="col">
-                                    {{printData1[index].weighingManagement.goodsName == '大豆'?printData1[index].qualityInspectionManagement.protein:printData1[index].qualityInspectionManagement.bulkDensity}}
+                                    {{printData1[index].weighingManagement.goodsName ==
+                                    '大豆'?printData1[index].qualityInspectionManagement.protein:printData1[index].qualityInspectionManagement.bulkDensity}}
                                 </td>
-                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName == '大豆'?'完整粒率（%）':'不完善粒（%）'}}</td>
+                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName ==
+                                    '大豆'?'完整粒率（%）':'不完善粒（%）'}}</td>
                                 <td class="col">
-                                    {{printData1[index].weighingManagement.goodsName == '大豆'?printData1[index].qualityInspectionManagement.completeGrain:printData1[index].qualityInspectionManagement.imperfectGrain}}
+                                    {{printData1[index].weighingManagement.goodsName ==
+                                    '大豆'?printData1[index].qualityInspectionManagement.completeGrain:printData1[index].qualityInspectionManagement.imperfectGrain}}
                                 </td>
                             </tr>
                             <tr class="row">
@@ -532,7 +552,8 @@
                                 </td>
                                 <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d' 
                                 && printData1[index].netWeight != null 
-                                && printData1[index].pureWeight != null ">{{printData1[index].netWeight-printData1[index].pureWeight}}</td>
+                                && 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>
@@ -567,7 +588,8 @@
                     <div class="part1" v-if="isShowPrintType1">
                         <div class="sfcard-content">
                             <div class="sfcard-title">
-                                {{ printData1[index].customerName}}{{printData1[index].identityAuthenticationInfo.customerNumberCard}}
+                                {{
+                                printData1[index].customerName}}{{printData1[index].identityAuthenticationInfo.customerNumberCard}}
                             </div>
                             <img :src="customerList1[index].imgURl.imageUrl1" class="avatar" />
                         </div>
@@ -586,7 +608,8 @@
                                 {{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-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" /> -->
@@ -602,7 +625,8 @@
                     <div class="bankcard" v-if="isShowPrintType7&&printData1[index].selfCertificateURL">
 
                         <div class="sfcard-content part2">
-                            <img v-if="printData1[index].selfCertificateURL" :src="printData1[index].selfCertificateURL" class="avatar" />
+                            <img v-if="printData1[index].selfCertificateURL" :src="printData1[index].selfCertificateURL"
+                                class="avatar" />
 
                         </div>
                     </div>
@@ -616,8 +640,9 @@
                 </div>
                 <img :src="printData.paymentScreenshot" class="paymentScreenshot" />
             </div> -->
-            <div class="center part1" v-if="isShowPrintType3&&!isShowPrintType6" :class="printData.extra2? 'simple2':!selectPrint? 'simple':''">
-                <div class="header1">{{ printData.compName}}粮食收购检斤结算单</div>
+            <div class="center part1" v-if="isShowPrintType3&&!isShowPrintType6"
+                :class="printData.extra2? 'simple2':!selectPrint? 'simple':''">
+                <div class="header1">{{ printData.compName}}（{{printData.warehouseName}}）检斤结算单</div>
                 <div class="line"></div>
                 <div class="line"></div>
                 <div class="header">
@@ -642,40 +667,48 @@
                         <td class="col col-bgc" v-if="!printData.extra1">姓名</td>
                         <td class="col col-bgc" v-else>单位名称</td>
                         <td class="col" colspan="4" v-if="!printData.extra1">{{ printData.customerName}}</td>
-                        <td class="col" colspan="4" v-else>{{ print_company_name}}</td>
+                        <td class="col" colspan="4" v-else>{{ printData.contractManagement.seller}}</td>
                     </tr>
                     <tr class="row">
-                        <td class="col col-bgc">税务登记号</td>
-                        <td class="col" colspan="3">{{ printData.taxRegistrationNo}}</td>
+                        <td class="col col-bgc">联系人</td>
+                        <td class="col" colspan="3">{{ printData.person}}</td>
                         <td v-if="!printData.extra1" class="col col-bgc">身份证号</td>
                         <td v-else class="col col-bgc">联系人</td>
                         <td v-if="!printData.extra1" class="col" colspan="4">
                             {{ printData.identityAuthenticationInfo.customerNumberCard}}
                         </td>
+                        <td v-else-if="printData.contractManagement.seller == '富裕县人和晟粮食商贸有限公司'" class="col" colspan="4">
+                            郭传亮
+                        </td>
                         <td v-else class="col" colspan="4">
                             {{ printData.customerName}}
                         </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="3">{{ printData.personPhone}}</td>
                         <td v-if="!printData.extra1" class="col col-bgc">卡号</td>
                         <td v-else class="col col-bgc">联系电话</td>
                         <td v-if="!printData.extra1" class="col" colspan="4">
                             {{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}
                         </td>
+                        <td v-else-if="printData.contractManagement.seller == '富裕县人和晟粮食商贸有限公司'" class="col" colspan="4">
+                            15174590000
+                        </td>
                         <td v-else class="col" colspan="4">
                             {{printData.customerPhone}}
                         </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">
+                        <td v-if="!printData.extra1" class="col" colspan="3">{{printData.warehouseName}}</td>
+                        <td v-else class="col" colspan="3">依安县先锋粮库有限公司新屯分公司</td>
+                        <td v-if="!printData.extra1" class="col col-bgc">地址</td>
+                        <td v-else class="col col-bgc"></td>
+                        <td v-if="!printData.extra1" class="col" colspan="4">
                             {{printData.identityAuthenticationInfo.compAddress}}
                         </td>
+                        <td v-else class="col" colspan="4"></td>
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">货名</td>
@@ -703,7 +736,9 @@
                         <td class="col">
                             {{ printData.qualityInspectionManagement.impurity}}
                         </td>
-                        <td class="col">{{printData.goodsName== '大豆'?printData.qualityInspectionManagement.protein:printData.qualityInspectionManagement.bulkDensity}}</td>
+                        <td class="col">{{printData.goodsName==
+                            '大豆'?printData.qualityInspectionManagement.protein:printData.qualityInspectionManagement.bulkDensity}}
+                        </td>
                         <td class="col">{{ printData.grossWeight}}</td>
                         <td class="col">{{ printData.tare}}</td>
                         <td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d' 
@@ -735,29 +770,34 @@
                     </tr>
                     <tr class="row">
                         <td class="col">{{ printData.pureWeight}}</td>
-                        <td class="col " v-if="printData.type == '潮粮' && !pengyuPrint">
+                        <td class="col " v-if="printData.type == '潮粮' && !printData.extra1">
                             {{printData.tidalGrainPrice}}
                         </td>
-                        <td class="col " v-if="printData.type == '干粮' && !pengyuPrint">
+                        <td class="col " v-if="printData.type == '干粮' && !printData.extra1">
                             {{printData.qualityInspectionManagement.dryGrainPrice}}
                         </td>
-                        <td class="col " v-if="pengyuPrint">
-                            {{Number(printData.unitContractPrice/1000).toFixed(3)}}
-                        </td>
-                        <td class="col ">{{ printData.unitDeduction}}</td>
-                        <td class="col " v-if="pengyuPrint">
-                            {{Number(printData.unitContractPrice/1000*printData.pureWeight).toFixed(2)}}
+                        <td class="col " v-if="printData.extra1">
+                            0
                         </td>
-                        <td class="col " v-if="!pengyuPrint">
+                        <td class="col " v-if="!printData.extra1">{{ printData.unitDeduction}}</td>
+                        <td class="col " v-else>0</td>
+                        <td class="col " v-if="!printData.extra1">
                             {{printData.grainMoney}}
                         </td>
+                        <td class="col " v-else>0</td>
+
                         <td class="col "> {{printData.qualityInspectionManagement.mildewGrain}}</td>
                         <td class="col "> {{printData.qualityInspectionManagement.jiaorenli}}</td>
-                        <td class="col "> {{printData.goodsName== '大豆'?printData.qualityInspectionManagement.completeGrain:printData.qualityInspectionManagement.imperfectGrain}}</td>
-                        <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
-                        <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type == '潮粮'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
+                        <td class="col "> {{printData.goodsName==
+                            '大豆'?printData.qualityInspectionManagement.completeGrain:printData.qualityInspectionManagement.imperfectGrain}}
+                        </td>
+                        <td class="col ">
+                            {{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
+                        <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type == '潮粮'">{{
+                            (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
                         <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type == '潮粮'"></td>
-                        <td :colspan="printData.type == '潮粮'?1:2" class="col ">{{printData.qualityInspectionManagement.binNumber}}</td>
+                        <td :colspan="printData.type == '潮粮'?1:2" class="col ">
+                            {{printData.qualityInspectionManagement.binNumber}}</td>
                         <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
                     </tr>
                     <tr class="row">
@@ -779,30 +819,27 @@
                         <!-- <td class="col " v-if="printData.type == '潮粮'">
                             {{ printData.solidGrainPrice}}
                         </td> -->
-                        <td class="col " v-if="pengyuPrint&&printData.type == '潮粮'">
-                            {{Number(printData.unitContractPrice/1000*printData.pureWeight).toFixed(2)}}
-                        </td>
-                        <td class="col " v-if="pengyuPrint&&printData.type != '潮粮'">
-                            {{Number(printData.unitContractPrice/1000*printData.weighingManagement.netWeight).toFixed(2)}}
-                        </td>
-
-                        <td class="col " v-if="!pengyuPrint">
+                        <td class="col " v-if="!printData.extra1">
                             {{printData.calculationPayable}}
                         </td>
+                        <td class="col " v-else>
+                            0
+                        </td>
                         <td class="col ">
                             {{ printData.qualityInspectionManagement.natureOfGrainPurchase}}
                         </td>
                         <td class="col ">{{ printData.carNo}}</td>
-                        <td class="col " colspan="4">质权所有人: 吉林银行</td>
+                        <td class="col " v-if="printData.extra1" colspan="4">货权所有人: {{ printData.compName}}</td>
+                        <td class="col " v-else colspan="4">质权所有人: 吉林银行</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">
+                        <td class="col " v-if="!printData.extra1" colspan="4">
                             {{printData.capitalize}}
                         </td>
-                        <td class="col " v-if="pengyuPrint" colspan="4">
+                        <td class="col " v-else colspan="4">
 
                         </td>
                     </tr>
@@ -810,18 +847,19 @@
                 <div class="bottom">
                     <div class="bottom-row1">
                         <div>
-                            质检员：{{ printData.qualityInspectionManagement.qualityInspector}}
+                            质检员：
                         </div>
                         <div>
-                            检斤员：{{ printData.weighingManagement.secretaryWeigher}}
+                            检斤员：
                         </div>
-                        <div>监管方：</div>
-                        <div>仓储方：</div>
+                        <div>买方：</div>
+                        <div>卖方：</div>
                     </div>
                 </div>
             </div>
 
-            <div class="center part1" v-if="isShowPrintType3&&printData.extra2||isShowPrintType6" :class="printData.extra2? 'simple2':!selectPrint? 'simple':''">
+            <div class="center part1" v-if="isShowPrintType3&&printData.extra2||isShowPrintType6"
+                :class="printData.extra2? 'simple2':!selectPrint? 'simple':''">
                 <div class="header1">{{ print_company_name_ew}}粮食收购检斤结算单</div>
                 <div class="line"></div>
                 <div class="line"></div>
@@ -849,7 +887,8 @@
                     <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=='洮南新友谊兴旺库'?'建发农产品-洮南安定自管仓':printData.warehouseName}}</td>
+                        <td v-if="!pengyuPrint" class="col" colspan="3">
+                            {{printData.warehouseName=='洮南新友谊兴旺库'?'建发农产品-洮南安定自管仓':printData.warehouseName}}</td>
                         <td class="col col-bgc">身份证号</td>
                         <td class="col" colspan="4">
                             {{ printData.identityAuthenticationInfo.customerNumberCard}}
@@ -898,7 +937,9 @@
                         <td class="col">
                             {{ printData.qualityInspectionManagement.impurity}}
                         </td>
-                        <td class="col">{{printData.goodsName== '大豆'?printData.qualityInspectionManagement.protein:printData.qualityInspectionManagement.bulkDensity}}</td>
+                        <td class="col">{{printData.goodsName==
+                            '大豆'?printData.qualityInspectionManagement.protein:printData.qualityInspectionManagement.bulkDensity}}
+                        </td>
                         <td class="col">{{ printData.grossWeight}}</td>
                         <td class="col">{{ printData.tare}}</td>
                         <td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d' 
@@ -948,11 +989,16 @@
                         </td>
                         <td class="col "> {{printData.qualityInspectionManagement.mildewGrain}}</td>
                         <td class="col "> {{printData.qualityInspectionManagement.jiaorenli}}</td>
-                        <td class="col "> {{printData.goodsName== '大豆'?printData.qualityInspectionManagement.completeGrain:printData.qualityInspectionManagement.imperfectGrain}}</td>
-                        <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
-                        <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type != '潮粮'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
+                        <td class="col "> {{printData.goodsName==
+                            '大豆'?printData.qualityInspectionManagement.completeGrain:printData.qualityInspectionManagement.imperfectGrain}}
+                        </td>
+                        <td class="col ">
+                            {{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
+                        <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type != '潮粮'">{{
+                            (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
                         <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type != '潮粮'"></td>
-                        <td :colspan="printData.type == '潮粮'?1:2" class="col ">{{printData.qualityInspectionManagement.binNumber}}</td>
+                        <td :colspan="printData.type == '潮粮'?1:2" class="col ">
+                            {{printData.qualityInspectionManagement.binNumber}}</td>
                         <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
                     </tr>
                     <tr class="row">
@@ -1065,11 +1111,13 @@
                         <td class="col">{{tableData.type}}</td>
                         <td class="col col-bgc">{{tableData.goodsName == '大豆'?'蛋白':'容量（克/升）'}}</td>
                         <td class="col">
-                            {{tableData.goodsName == '大豆'?tableData.qualityInspectionManagement.protein:tableData.qualityInspectionManagement.bulkDensity}}
+                            {{tableData.goodsName ==
+                            '大豆'?tableData.qualityInspectionManagement.protein:tableData.qualityInspectionManagement.bulkDensity}}
                         </td>
                         <td class="col col-bgc">{{tableData.goodsName == '大豆'?'完整粒率（%）':'不完善粒（%）'}}</td>
                         <td class="col">
-                            {{tableData.goodsName == '大豆'?tableData.qualityInspectionManagement.completeGrain:tableData.qualityInspectionManagement.imperfectGrain}}
+                            {{tableData.goodsName ==
+                            '大豆'?tableData.qualityInspectionManagement.completeGrain:tableData.qualityInspectionManagement.imperfectGrain}}
                         </td>
                     </tr>
                     <tr class="row">
@@ -1416,8 +1464,8 @@
                 }
                 return false
             },
-            printSmall() {},
-            printBig() {}
+            printSmall() { },
+            printBig() { }
         },
         mounted() {
             this.pengyuPrint = localStorage.getItem('pengyuPrint')
@@ -1442,7 +1490,7 @@
             }
 
             this.date = new Date().toLocaleString()
-                // let _data = decodeURIComponent(this.getQueryVariable('dataList'))
+            // let _data = decodeURIComponent(this.getQueryVariable('dataList'))
             let _data = {}
             if (localStorage.getItem('print_pay_data')) {
                 _data = localStorage.getItem('print_pay_data')
@@ -1467,7 +1515,7 @@
                 }
             } else {
                 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)
@@ -1476,13 +1524,13 @@
             }
             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'))
+                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')
@@ -1503,7 +1551,7 @@
                 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(',')
+                        // let _url2 = this.customerList1[i].payeeAddressUrl.split(',')
                         this.customerList1[i].imgURl = {
                             imageUrl1: _url1[0],
                             imageUrl2: _url1[1],
@@ -1577,11 +1625,11 @@
                 this.bigContent = false
             }
             if (this.printData.compName == undefined) this.printData.compName = ''
-            document.title = this.printData.compName + '粮食收购检斤结算单'
+            document.title = this.printData.compName + "(" + this.printData.warehouseName + ")" + '检斤结算单'
             window.print()
-                // sessionStorage.removeItem('selectPrint_selectPrintList');
-                // sessionStorage.removeItem('selectPrint_selectCustomerList');
-            window.onafterprint = function(event) {
+            // sessionStorage.removeItem('selectPrint_selectPrintList');
+            // sessionStorage.removeItem('selectPrint_selectCustomerList');
+            window.onafterprint = function (event) {
                 window.history.back(-1)
             }
         },

public/static/weightCheck.html

@@ -64,17 +64,17 @@
             height: 120px;
             position: absolute;
             left: 12px;
-            top: 10px;
+            top: 9px;
         }
 
         .config {
             margin-top: 10px;
-            margin-right: 240px;
+            margin-right: 160px;
         }
 
         .autograph {
             margin-top: 10px;
-            margin-right: 170px;
+            margin-right: 160px;
         }
 
         .bottom-row3 {
@@ -83,9 +83,10 @@
 
         .title {
             text-align: center;
-            font-size: 36px;
+            font-size: 26px;
             font-weight: 500;
             position: relative;
+            margin-left: 50px;
             /* margin-top: 47px; */
         }
 
@@ -167,7 +168,7 @@
                             <td class="col" colspan="2">{{item.carNumber}}</td>
                         </tr>
                         <tr class="row">
-                            <td  class="col col-bgc">收货单位</td>
+                            <td class="col col-bgc">收货单位</td>
                             <td class="col" colspan="2">{{item.compName}}</td>
                             <td class="col col-bgc">联系人</td>
                             <td class="col">{{item.person}}</td>
@@ -185,7 +186,8 @@
                             </td>
                             <td class="col col-bgc">{{item.goodsName == '大豆' ? '完善粒率（%）' : '不完善粒（%）'}}</td>
                             <td class="col">
-                                {{item.goodsName == '大豆'?item.qualityInspectionManagement.completeGrain:item.qualityInspectionManagement.imperfectGrain}}
+                                {{item.goodsName ==
+                                '大豆'?item.qualityInspectionManagement.completeGrain:item.qualityInspectionManagement.imperfectGrain}}
                             </td>
                         </tr>
                         <tr class="row">
@@ -217,7 +219,8 @@
                                 {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}
                             </td>
                             <td class="col col-bgc">仓位号</td>
-                            <td class="col">{{item.binNumber.indexOf("托盘") != -1?item.binNumber.replace("托盘",""):item.binNumber}}</td>
+                            <td class="col">{{item.binNumber.indexOf("托盘") !=
+                                -1?item.binNumber.replace("托盘",""):item.binNumber}}</td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">毛重（公斤）</td>
@@ -300,7 +303,8 @@
                             </td>
                             <td class="col col-bgc">{{item.goodsName == '大豆' ? '完善粒率（%）' : '不完善粒（%）'}}</td>
                             <td class="col">
-                                {{item.goodsName == '大豆'?item.qualityInspectionManagement.completeGrain:item.qualityInspectionManagement.imperfectGrain}}
+                                {{item.goodsName ==
+                                '大豆'?item.qualityInspectionManagement.completeGrain:item.qualityInspectionManagement.imperfectGrain}}
                             </td>
                         </tr>
                         <tr class="row">
@@ -332,7 +336,8 @@
                                 {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}
                             </td>
                             <td class="col col-bgc">仓位号</td>
-                            <td class="col">{{item.binNumber.indexOf("托盘") != -1?item.binNumber.replace("托盘",""):item.binNumber}}</td>
+                            <td class="col">{{item.binNumber.indexOf("托盘") !=
+                                -1?item.binNumber.replace("托盘",""):item.binNumber}}</td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">毛重（公斤）</td>
@@ -343,7 +348,7 @@
                             <td class="col">{{item.buckleMiscellaneous}}</td>
                             <td class="col col-bgc">净重（公斤）</td>
                             <td class="col">{{item.netWeight}}</td>
-                            <!-- <td class="col " colspan="2"></td> --> 
+                            <!-- <td class="col " colspan="2"></td> -->
 
                         </tr>
                         <tr class="row">
@@ -377,36 +382,40 @@
             <div class="content" v-if="bigContent" v-for="(_item,index) in tableData">
                 <!-- //单个打印 -->
                 <!-- <div class="title">{{_item.compName}}</div> -->
-                <div v-if="!_item.printtype" class="title">入库检斤单</div>
-                <div v-if="_item.printtype" class="title">出库检斤单</div>
+                <div v-if="!_item.printtype" class="title">{{_item.compName}}({{_item.warehouseName}})入库检斤单</div>
+                <div v-if="_item.printtype" class="title">{{_item.compName}}({{_item.warehouseName}})出库检斤单</div>
                 <div class="left">
                     <img :src="_item.codeUrl" alt="">
                 </div>
-                <div v-if="!_item.printtype" class="number">{{_item.number}}</div>
+                <div v-if="!_item.printtype" class="number">
+                    <div>单位：公斤/元</div>{{_item.number}}
+                </div>
+
                 <table :style="!_item.printtype?'margin-top:20px;':'margin-top:80px;'" class="table">
                     <tr class="row">
                         <td class="col col-bgc" v-if="_item.serviceManagementType == 3">客户姓名</td>
-                        <td class="col" colspan="2" v-if="_item.serviceManagementType == 3">{{_item.customer}}</td>
+                        <td class="col" colspan="3" v-if="_item.serviceManagementType == 3">{{_item.customer}}</td>
                         <td class="col col-bgc" v-if="_item.serviceManagementType == 1">发货单位</td>
-                        <td class="col" colspan="2" v-if="_item.serviceManagementType == 1">{{_item.customer}}</td>
+                        <td class="col" colspan="3" v-if="_item.serviceManagementType == 1">{{_item.customer}}</td>
                         <td class="col col-bgc" v-if="_item.serviceManagementType == 3">客户电话</td>
                         <td class="col" v-if="_item.serviceManagementType == 3">{{_item.customerPhone}}</td>
                         <td class="col col-bgc" v-if="_item.serviceManagementType == 1">联系电话</td>
                         <td class="col" v-if="_item.serviceManagementType == 1">{{_item.contractManagement ?
                             _item.contractManagement.sellerPhone : ""}}</td>
                         <td class="col col-bgc">车牌号</td>
-                        <td class="col" colspan="2">{{_item.carNumber}}</td>
+                        <td class="col" colspan="1">{{_item.carNumber}}</td>
                     </tr>
                     <tr class="row">
                         <!-- <td class="col col-bgc">收货单位</td>
                         <td class="col" colspan="2">{{_item.compName}}</td> -->
                         <td v-if='_item.customer!="白城市鹏羽粮食贸易有限公司"' class="col col-bgc">收货单位</td>
                         <td v-else class="col col-bgc">收货仓库</td>
-                        <td class="col" colspan="2">{{_item.customer!="白城市鹏羽粮食贸易有限公司"?_item.compName:'北京天维康油脂调销中心有限公司'}}</td>
+                        <td class="col" colspan="3">{{_item.customer!="白城市鹏羽粮食贸易有限公司"?_item.compName:'北京天维康油脂调销中心有限公司'}}
+                        </td>
                         <td class="col col-bgc">联系人</td>
                         <td class="col">{{_item.person}}</td>
                         <td class="col col-bgc">联系电话</td>
-                        <td class="col" colspan="2">{{_item.personPhone}}</td>
+                        <td class="col" colspan="1">{{_item.personPhone}}</td>
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">货名</td>
@@ -414,13 +423,14 @@
                         <td class="col col-bgc">类型</td>
                         <td class="col">{{_item.type}}</td>
                         <td class="col col-bgc">{{_item.goodsName == '大豆' ? '蛋白' : '容重（克/升）'}}</td>
-                            <td class="col">
-                                {{_item.goodsName=='大豆'?_item.qualityInspectionManagement.protein:_item.qualityInspectionManagement.bulkDensity}}
-                            </td>
-                            <td class="col col-bgc">{{_item.goodsName == '大豆' ? '完善粒率（%）' : '不完善粒（%）'}}</td>
-                            <td class="col">
-                                {{_item.goodsName == '大豆'?_item.qualityInspectionManagement.completeGrain:_item.qualityInspectionManagement.imperfectGrain}}
-                            </td>
+                        <td class="col">
+                            {{_item.goodsName=='大豆'?_item.qualityInspectionManagement.protein:_item.qualityInspectionManagement.bulkDensity}}
+                        </td>
+                        <td class="col col-bgc">{{_item.goodsName == '大豆' ? '完善粒率（%）' : '不完善粒（%）'}}</td>
+                        <td class="col">
+                            {{_item.goodsName ==
+                            '大豆'?_item.qualityInspectionManagement.completeGrain:_item.qualityInspectionManagement.imperfectGrain}}
+                        </td>
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">等级</td>
@@ -448,41 +458,43 @@
                             {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.buckleMiscellaneous:''}}
                         </td>
                         <td class="col col-bgc">仓位号</td>
-                        <td class="col">{{_item.binNumber.indexOf("托盘") != -1?_item.binNumber.replace("托盘",""):_item.binNumber}}</td>
+                        <td class="col">{{_item.binNumber.indexOf("托盘") !=
+                            -1?_item.binNumber.replace("托盘",""):_item.binNumber}}</td>
                     </tr>
                     <tr class="row">
-                        <td class="col col-bgc">毛重（公斤）</td>
+                        <td class="col col-bgc">毛重</td>
                         <td class="col">{{_item.grossWeight}}</td>
-                        <td class="col col-bgc">皮重（公斤）</td>
+                        <td class="col col-bgc">皮重</td>
                         <td class="col">{{_item.tare}}</td>
-                        <td class="col col-bgc">扣重（公斤）</td>
+                        <td class="col col-bgc">扣重</td>
                         <td class="col">{{_item.buckleMiscellaneous}}</td>
-                        <td class="col col-bgc">净重（公斤）</td>
+                        <td class="col col-bgc">净重</td>
                         <td class="col">{{_item.netWeight}}</td>
                         <td class="col " colspan="2"></td>
                     </tr>
                     <tr class="row">
-                        <td class="col col-bgc" colspan="2">毛重检斤时间</td>
-                        <td class="col" colspan="2">{{_item.grossDate}}</td>
-                        <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
-                        <td class="col" colspan="2">{{_item.tareDate}}</td>
+                        <td class="col col-bgc" colspan="1">毛检时间</td>
+                        <td class="col" colspan="1">{{_item.grossDate}}</td>
+                        <td class="col col-bgc" colspan="1"> 皮检时间</td>
+                        <td class="col" colspan="1">{{_item.tareDate}}</td>
+                        <td class="col col-bgc" colspan="1"> 记事</td>
+                        <td class="col" colspan="3">货权所有人：{{_item.compName}}</td>
                     </tr>
                 </table>
                 <div class="bottom">
-                    <div class="bottom-row1">
+                    <!-- <div class="bottom-row1">
                         <div>毛检：{{_item.secretaryWeigher}}</div>
                         <div style="margin-left:60px">皮检：{{_item.skinInspector}}</div>
-                        <!-- <div>{{tableData.qualityDate}}</div> -->
-                    </div>
+                    </div> -->
                     <div class="bottom-row2">
                         <!-- <div class="left">
                 <img :src="tableData.codeUrl" alt="">
               </div> -->
 
-                        <div class="config" v-if="_item.warehouseName!='白城补数据'">收货单位签名或盖章：</div>
-                        <div class="config" v-if="_item.warehouseName=='白城补数据'">收货单位签名或盖章：黑龙江中天昊元贸易有限公司</div>
-                        <div class="autograph">客户签名：</div>
-                        <div class="autograph" v-if="_item.warehouseName!='白城补数据'">司机签名：</div>
+                        <div class="config">质检员：</div>
+                        <div class="autograph">检斤员：</div>
+                        <div class="autograph">发货单位：</div>
+                        <div class="autograph">司机签名：</div>
                     </div>
                     <!-- <div class="bottom-row3">扫一扫</div> -->
                 </div>
@@ -521,7 +533,8 @@
             </div>
             <div class="small-row">
                 <div>仓位号：</div>
-                <div>{{tableData.binNumber.indexOf("托盘")!= -1?tableData.binNumber.replace("托盘",""):tableData.binNumber}}</div> 
+                <div>{{tableData.binNumber.indexOf("托盘")!= -1?tableData.binNumber.replace("托盘",""):tableData.binNumber}}
+                </div>
             </div>
             <div class="small-row">
                 <div>收货单位</div>
@@ -580,8 +593,8 @@
 <script type="text/javascript" src="../static/html2canvas.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
 <script type="text/javascript">
-    
-// import  API_CONFIG from "../../../vue.config.js"
+
+    // import  API_CONFIG from "../../../vue.config.js"
     new Vue({
         el: '#app',
         data: {
@@ -630,7 +643,7 @@
                 } else {
                     that.serverIp = localStorage.getItem("serverIp")
                 }
-                if (that.tableData&&that.tableData.length == 1) {//this.tableData  条数为1 认为单个打印
+                if (that.tableData && that.tableData.length == 1) {//this.tableData  条数为1 认为单个打印
                     html2canvas(document.querySelector("#saveImg"), { foreignObjectRendering: true, allowTaint: true }).then((canvas) => {
                         let dataURL = canvas.toDataURL('image/png')
                         that.imgUrl = dataURL

src/components/balanceAlert.vue

@@ -197,8 +197,8 @@ export default {
           if (
             this.deptBudgetList.warehouseName &&
             (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])

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -2223,19 +2223,14 @@ export default {
                       })
                       this.idPrint = response
 
-                      if (this.weighingList.serviceManagementType == 1) {
-                        if (
-                          this.weighingList.seller &&
-                          this.weighingList.buyer
-                        ) {
-                          let cang = {}
-                          cang.value = this.weighingList.buyer
-                          cang.label = this.weighingList.buyer
-                          if (this.check(this.weighingList.buyer, 3)) {
-                            this.companyNameOptions.push(cang)
-                          }
-                          this.companyName = this.weighingList.buyer
+                      if (this.weighingList.seller && this.weighingList.buyer) {
+                        let cang = {}
+                        cang.value = this.weighingList.buyer
+                        cang.label = this.weighingList.buyer
+                        if (this.check(this.weighingList.buyer, 3)) {
+                          this.companyNameOptions.push(cang)
                         }
+                        this.companyName = this.weighingList.buyer
                       }
                       this.isShowPrintType = true
                       this.getList()
@@ -2314,46 +2309,19 @@ export default {
                               label: this.weighingList.seller,
                               value: this.weighingList.seller
                             })
-                            this.customer = this.weighingList.customer
+                            this.customer = this.weighingList.seller
                           }
                           if (
-                            this.weighingList.serviceManagementType == 1 &&
-                            (this.warehouseName == '鲅鱼圈金信库' ||
-                              this.warehouseName == '洮南向阳乡金昊' ||
-                              this.warehouseName == '白城内陆港' ||
-                              this.warehouseName == '山东园丰库' ||
-                              this.warehouseName == '杜尔伯特家禾库' ||
-                              this.warehouseName == '甘南宏旗库' ||
-                              this.warehouseName == '洮南新友谊兴旺库' ||
-                              this.warehouseName == '佳屹农仓储库')
+                            this.weighingList.seller &&
+                            this.weighingList.buyer
                           ) {
-                            if (
-                              this.weighingList.seller &&
-                              this.weighingList.buyer
-                            ) {
-                              let cang = {}
-                              cang.value = this.weighingList.seller
-                              cang.label = this.weighingList.seller
-                              // if (this.check(this.weighingList.seller, 1)) {
-                              //   this.ewCustomerOptions.push(cang)
-                              // }
-                              if (this.warehouseName == '佳屹农仓储库') {
-                                if (this.check(this.weighingList.seller, 3)) {
-                                  this.companyNameOptions.push(cang)
-                                  this.companyName = this.weighingList.seller
-                                }
-                              } else {
-                                if (this.check(this.weighingList.seller, 1)) {
-                                  this.ewCustomerOptions.push(cang)
-                                }
-                              }
-                              let cang1 = {}
-                              cang1.value = this.weighingList.buyer
-                              cang1.label = this.weighingList.buyer
-                              if (this.check(this.weighingList.buyer, 2)) {
-                                this.companyNameEWOptions.push(cang1)
-                              }
+                            let cang = {}
+                            cang.value = this.weighingList.buyer
+                            cang.label = this.weighingList.buyer
+                            if (this.check(this.weighingList.buyer, 3)) {
+                              this.companyNameOptions.push(cang)
                             }
+                            this.companyName = this.weighingList.buyer
                           }
                           this.isShowPrintType = true
                           this.getList()

src/views/houseSelfCollect/paymentManagement.vue

@@ -1066,7 +1066,11 @@ export default {
       )
     },
     printBig1(type, radioType) {
-      this.printData.extra1 = true
+      if (this.printData.warehouseName == '先锋新屯分库') {
+        this.printData.extra1 = false
+      } else {
+        this.printData.extra1 = true
+      }
       localStorage.setItem('print_company_name', this.companyName)
       localStorage.setItem('print_company_name_ew', this.companyNameEW)
       localStorage.setItem('print_customer_name_ew', this.ewCustomer)
@@ -1918,6 +1922,11 @@ export default {
       this.isShowPrintTypeBills = true
     },
     printBig() {
+      if (this.printData.warehouseName == '先锋新屯分库') {
+        this.printData.extra1 = true
+      } else {
+        this.printData.extra1 = false
+      }
       localStorage.setItem('print_alone_extra', false)
       let _list1 = []
       let _list2 = []

src/views/houseSelfCollect/settlement.vue

@@ -1078,7 +1078,11 @@ export default {
       )
     },
     printBig1(type, radioType) {
-      this.printData.extra1 = true
+      if (this.printData.warehouseName == '先锋新屯分库') {
+        this.printData.extra1 = false
+      } else {
+        this.printData.extra1 = true
+      }
       localStorage.setItem('print_company_name', this.companyName)
       localStorage.setItem('print_company_name_ew', this.companyNameEW)
       localStorage.setItem('print_customer_name_ew', this.ewCustomer)
@@ -1189,6 +1193,11 @@ export default {
       )
     },
     printBig() {
+      if (this.printData.warehouseName == '先锋新屯分库') {
+        this.printData.extra1 = true
+      } else {
+        this.printData.extra1 = false
+      }
       localStorage.setItem('print_alone_extra', false)
       localStorage.setItem('print_pay_data', JSON.stringify(this.printData))
       window.open('../../../../../static/payprint1.html?type=2')
@@ -1213,13 +1222,19 @@ export default {
             ).toFixed(0)
           }
           let compIdTmp = localStorage.getItem('ws-pf_compId')
-          //白城市鹏羽粮食贸易有限公司 扣重比1.25 干粮水分14.5
-          if (
-            compIdTmp == '6a713699e08c4cbc97a87f7648a95e3d' ||
-            compIdTmp == '5d164edcef03476dba6630f86dc96496'
-          ) {
+          if (this.paymentList.warehouseName == '先锋新屯分库') {
+            debugger
             // this.paymentList.buckleWeightRatio = this.paymentList.qualityInspectionManagement.buckleWeightRatio
             this.paymentList.buckleWeightRatio = 1.25
+            if (
+              this.paymentList.qualityInspectionManagement.waterContent > 35
+            ) {
+              this.paymentList.buckleWeightRatio = 1.3
+            } else if (
+              this.paymentList.qualityInspectionManagement.waterContent < 28
+            ) {
+              this.paymentList.buckleWeightRatio = 1.2
+            }
             this.ganwater = 14.5
             this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(
               4

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -776,7 +776,13 @@ export default {
     })
       .toPromise()
       .then(res => {
-        this.compNameoptions = res
+        if (res.length > 0)
+          this.companyNameOptions = [
+            {
+              label: res[0],
+              value: res[0]
+            }
+          ]
       })
     selectWarehouseSelf({
       compId: localStorage.getItem('ws-pf_compId')
@@ -1392,46 +1398,13 @@ export default {
             })
             this.customer = this.modification[_num].customer
           }
-          if (
-            this.modification[_num].serviceManagementType == 1 &&
-            (this.warehouseName == '鲅鱼圈金信库' ||
-              this.warehouseName == '杜尔伯特家禾库' ||
-              this.warehouseName == '洮南新友谊兴旺库' ||
-              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
-              cang.label = this.modification[_num].seller
-              let cang1 = {}
-              cang1.value = this.modification[_num].buyer
-              cang1.label = this.modification[_num].buyer
-              // if (this.check(this.modification[_num].seller, 1)) {
-              //   this.ewCustomerOptions.push(cang)
-              // }
-
-              if (this.warehouseName == '佳屹农仓储库') {
-                if (this.check(this.modification[_num].buyer, 3)) {
-                  this.companyNameOptions.push(cang1)
-                  this.companyName = this.modification[_num].buyer
-                }
-              } else {
-                if (this.check(this.modification[_num].buyer, 2)) {
-                  this.ewCustomerOptions.push(cang1)
-                }
-              }
-
-              if (this.check(this.modification[_num].seller, 1)) {
-                this.companyNameEWOptions.push(cang)
-              }
-            }
+          debugger
+          let cang1 = {}
+          cang1.value = this.modification[_num].buyer
+          cang1.label = this.modification[_num].buyer
+          if (this.check(this.modification[_num].buyer, 3)) {
+            this.companyNameOptions.push(cang1)
+            this.companyName = this.modification[_num].buyer
           }
         }
 
@@ -1444,43 +1417,14 @@ export default {
           this.customer = row.customer
           console.log(this.customerOptions, this.customer, 222222)
         }
-        if (
-          row.serviceManagementType == 1 &&
-          (this.warehouseName == '鲅鱼圈金信库' ||
-            this.warehouseName == '杜尔伯特家禾库' ||
-            this.warehouseName == '洮南新友谊兴旺库' ||
-            this.warehouseName == '甘南宏旗库' ||
-            this.warehouseName == '白城内陆港' ||
-            this.warehouseName == '洮南向阳乡金昊' ||
-            this.warehouseName == '山东园丰库' ||
-            this.warehouseName == '佳屹农仓储库')
-        ) {
-          if (row.seller && row.buyer) {
-            let cang = {}
-            cang.value = row.seller
-            cang.label = row.seller
-            // if (this.check(row.seller, 1)) {
-            //   this.ewCustomerOptions.push(cang)
-            // }
-            let cang1 = {}
-            cang1.value = row.buyer
-            cang1.label = row.buyer
-
-            if (this.warehouseName == '佳屹农仓储库') {
-              if (this.check(row.buyer, 3)) {
-                this.companyNameOptions.push(cang1)
-                this.companyName = row.buyer
-              }
-            } else {
-              if (this.check(row.buyer, 2)) {
-                this.companyNameEWOptions.push(cang1)
-              }
-            }
-            if (this.check(row.seller, 1)) {
-              this.ewCustomerOptions.push(cang)
-            }
-          }
+        let cang1 = {}
+        cang1.value = row.buyer
+        cang1.label = row.buyer
+        if (this.check(row.buyer, 3)) {
+          this.companyNameOptions.push(cang1)
+          this.companyName = row.buyer
         }
+
         this.idPrint = row.id
         if (type == 2 && this.warehouseName == '鲅鱼圈金信库') {
           var data = await getbinNumber({ id: row.warehouseId }).toPromise()