1

public/static/payprint1.html

@@ -276,10 +276,10 @@
                                 <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">
@@ -295,7 +295,7 @@
                                     {{ printData1[index].qualityInspectionManagement.impurity}}
                                 </td>
                                 <td class="col">
-                                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.bulkDensity:''}}
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
                                 </td>
                                 <td class="col">{{ printData1[index].grossWeight}}</td>
                                 <td class="col">{{ printData1[index].tare}}</td>
@@ -314,12 +314,12 @@
                                 </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">不完善粒</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>
@@ -331,12 +331,12 @@
                                 </td>
                                 <td class="col ">{{ printData1[index].unitDeduction}}</td>
                                 <td class="col ">{{ printData1[index].grainMoney}}</td>
-                                <td class="col ">{{ printData1[index].weighingSubsidy}}</td>
-                                <td class="col ">{{ printData1[index].freightSubsidy}}</td>
-                                <td class="col ">{{ printData1[index].unloadSubsidy}}</td>
-                                <td class="col ">{{ printData1[index].otherSubsidy}}</td>
-                                <td class="col ">{{ printData1[index].weighingDeduction}}</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 ">{{ printData1[index].freightDeduction}}</td>
+                                <td class="col "></td>
                                 <!-- <td class="col ">{{ printData1[index].unloadDeduction}}</td> -->
                             </tr>
                             <tr class="row">
@@ -626,9 +626,8 @@
                         <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>
@@ -650,7 +649,6 @@
                             {{ printData.weighingManagement.buckleMiscellaneous}}
                         </td>
                         <td class="col">{{ printData.netWeight}}</td>
-                        <td class="col"></td>
                         <!-- <td class="col">{{ printData.pureWeight}}</td> -->
                     </tr>
                     <tr class="row">
@@ -661,11 +659,10 @@
                         <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">运费补助</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>
@@ -679,11 +676,10 @@
                         </td>
                         <td class="col ">{{ printData.unitDeduction}}</td>
                         <td class="col ">{{ printData.grainMoney}}</td>
-                        <td class="col ">{{ printData.weighingSubsidy}}</td>
-                        <td class="col ">{{ printData.freightSubsidy}}</td>
-                        <td class="col ">{{ printData.unloadSubsidy}}</td>
-                        <td class="col ">{{ printData.otherSubsidy}}</td>
-                        <td class="col ">{{ printData.weighingDeduction}}</td>
+                        <td class="col "> {{printData.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 ">{{ printData.freightDeduction}}</td>
                         <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
                     </tr>
@@ -1098,7 +1094,8 @@
             bank: [],
             selectPrint: false,
             onlyShowPz: false,
-            tableData: []
+            tableData: [],
+            compId: ''
         },
         computed: {},
         methods: {
@@ -1131,6 +1128,8 @@
             printBig() {}
         },
         mounted() {
+            //公司id
+            this.compId = localStorage.getItem('ws-pf_compId')
             this.date = new Date().toLocaleString()
                 // let _data = decodeURIComponent(this.getQueryVariable('dataList'))
             let _data = {}
@@ -1156,6 +1155,7 @@
                     }
                 }
             } else {
+                debugger
                 this.printData = JSON.parse(_data)
                     //地址过长截取
                 if (this.printData.identityAuthenticationInfo && this.printData.identityAuthenticationInfo.compAddress.length > 24) {
@@ -1174,16 +1174,21 @@
                 // }
                 // 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 {
-                this.customerList =JSON.parse(localStorage.getItem('printData1'))
+                debugger
+                if (cwprint == 'true') {
+                    this.customerList = JSON.parse(localStorage.getItem('printData1'))
+                }
+
             }
             console.log(this.customerList)
             console.log('cwprint', localStorage.getItem('cwprint'))
-            var cwprint = localStorage.getItem('cwprint')
             if (cwprint == 'true') {
                 if (this.selectPrint) {
                     for (let i = 0; i < this.customerList1.length; i++) {