更新

public/static/payprint.html

@@ -144,149 +144,156 @@
     <div id="app">
       <div class="content" v-if="bigContent">
         <div class="center">
-            <div class="header1">中天昊元粮食贸易有限公司结算凭证</div>
-            <div class="line"></div>
-            <div class="line"></div>
-          <div class="header">
-             <div>单位名称：黑龙江中天昊元粮食贸易有限公司</div>
-             <div>税务登记编号：91230230MA1BNL7Q93</div>
-          </div>
-          <div class="header-top">
-            <div>单位：公斤、元</div>
-            <div>No.</div>
-          </div>
-          <div class="header-top">
-            <div>开票日期：{{printData.currentTime}}</div>
-            <div class="number">{{100000000000000}}</div>
-          </div>
-          <table class="table">
-            <tr class="row">
-              <td rowspan="4" class="col col-bgc">买方</td>
-              <td class="col col-bgc">单位名称</td>
-              <td class="col" colspan="3">{{printData.compName}}</td>
-              <td rowspan="4" class="col col-bgc">卖方</td>
-              <td class="col col-bgc">姓名</td>
-              <td class="col" colspan="3">{{printData.customerName}}</td>
-            </tr>
-            <tr class="row">
-              <td class="col col-bgc">税务登记号</td>
-              <td class="col" colspan="3">{{ printData.taxRegistrationNo}}</td>
-              <td class="col col-bgc">身份证号</td>
-              <td class="col" colspan="3">{{printData.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="3">{{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}</td>
-            </tr>
-            <tr class="row">
-              <td class="col col-bgc">收货仓库</td>
-              <td class="col" colspan="3">{{printData.warehouseName}}</td>
-              <td class="col col-bgc">地址</td>
-              <td class="col" colspan="3">{{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">毛重</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.grossWeight}}</td>
-              <td class="col">{{printData.tare}}</td>
-              <td class="col">{{printData.qualityInspectionManagement.buckleWeightRatio}}</td>
-              <td class="col">{{printData.netWeight}}</td>
-              <td class="col">{{printData.pureWeight}}</td>
-            </tr>
-            <tr class="row">
-              <td class="col col-bgc" v-if="printData.type == '潮粮'">净重单价</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">运费补助</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 " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
-              <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</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.freightDeduction}}</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" 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="5">记事</td>
-            </tr>
-            <tr class="row">
-              <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 ">{{printData.calculationPayable}}</td>
-              <td class="col ">{{printData.qualityInspectionManagement.natureOfGrainPurchase}}</td>
-              <td class="col ">{{printData.carNo}}</td>
-              <td class="col " colspan="5">{{printData.remarks}}</td>
-            </tr>
-            <tr class="row">
-              <td class="col col-bgc">实付金额</td>
-              <td class="col " colspan="2">{{printData.actualPayment}}</td>
-              <td class="col col-bgc" colspan="3">人民币（大写）</td>
-              <td class="col " colspan="4">{{printData.capitalize}}</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>复点：{{printData.qualityInspector}}</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>
+        <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.currentTime}}</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 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">毛重</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.grossWeight}}</td>
+             <td class="col">{{ printData.tare}}</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"  v-if="printData.type == '潮粮'">净重单价</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">运费补助</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 " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
+             <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</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.freightDeduction}}</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" 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="5">记事</td>
+           </tr>
+           <tr class="row">
+             <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 ">{{ printData.calculationPayable}}</td>
+             <td class="col ">{{ printData.qualityInspectionManagement.natureOfGrainPurchase}}</td>
+             <td class="col ">{{ printData.carNo}}</td>
+             <td class="col " colspan="5">{{ printData.remarks}}</td>
+           </tr>
+           <tr class="row">
+             <td class="col col-bgc">实付金额</td>
+             <td class="col " colspan="2">{{printData.actualPayment}}</td>
+             <td class="col col-bgc" colspan="3">人民币（大写）</td>
+             <td class="col " colspan="4">{{printData.capitalize}}</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>
       <div class="small-content" v-if="smallContent">
         <div class="small-title">
           <div>
-            中天昊元粮食贸易有限公司结算凭证</div>
+            {{printData.compName}}结算凭证</div>
           <img class="small-img" src="../img/add.png" alt="">
         </div>
         <div class="small-row">
@@ -351,7 +358,7 @@
         </div>
         <div class="small-row">
           <div>扣杂重</div>
-          <div>{{printData.buckleMiscellaneous}}</div>
+          <div>{{printData.weighingManagement.buckleMiscellaneous}}</div>
         </div>
         <div class="small-row">
           <div>净重</div>
@@ -455,9 +462,8 @@
         </div>
         <div class="small-row">
           <div>复点</div>
-          <div>{{}}</div>
+          <div>&nbsp;&nbsp;&nbsp;</div>
         </div>
-
       </div>
     </div>
   </body>
@@ -475,6 +481,9 @@
       },
       computed: {},
       methods: {
+        dealNo(str){
+         return str.slice(4)
+        },
         tableRowClassName({
           row,
           rowIndex
@@ -515,7 +524,7 @@
         // console.log(_data)
         this.printData = JSON.parse(_data)
         // console.log(this.tableData)
-        document.title="中天昊元粮食贸易有限公司结算凭证"
+        document.title=printData.compName+"结算凭证"
         window.print()
         window.onafterprint = function(event) {
           window.history.back(-1)

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="center">
     <div class="header">
-       <div>单位名称：黑龙江中天昊元粮食贸易有限公司</div>
-       <div>税务登记编号：91230230MA1BNL7Q93</div>
+       <div>单位名称：{{ printData.compName}}</div>
+       <!-- <div>税务登记编号：91230230MA1BNL7Q93</div> -->
     </div>
     <div class="header-top">
       <div>单位：公斤、元</div>
@@ -11,7 +11,7 @@
     <div class="header-top">
       <div>开票日期：{{printData.currentTime}}</div>
       <!-- <div>开票日期：{{new Date(yyyy,mm,dd)}}</div> -->
-      <div class="number">{{100000000000000}}</div>
+      <div class="number">{{dealNo(printData.paymentNo)}}</div>
     </div>
     <table class="table">
       <tr class="row">
@@ -20,25 +20,25 @@
         <td class="col" colspan="3">{{ printData.compName}}</td>
         <td rowspan="4" class="col col-bgc">卖方</td>
         <td class="col col-bgc">姓名</td>
-        <td class="col" colspan="3">{{ printData.customerName}}</td>
+        <td class="col" colspan="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="3">{{ printData.identityAuthenticationInfo.customerNumberCard}}</td>
+        <td class="col" colspan="4">{{ printData.identityAuthenticationInfo.customerNumberCard}}</td>
       </tr>
       <tr class="row">
-        <td class="col col-bgc">化验单号</td>
+        <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.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}</td>
+        <td class="col" colspan="4">{{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">收货仓库</td>
         <td class="col" colspan="3">{{printData.warehouseName}}</td>
         <td class="col col-bgc">地址</td>
-        <td class="col" colspan="3">{{printData.identityAuthenticationInfo.compAddress}}</td>
+        <td class="col" colspan="4">{{printData.identityAuthenticationInfo.compAddress}}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">货名</td>
@@ -60,7 +60,7 @@
         <td class="col">{{ printData.qualityInspectionManagement.impurity}}</td>
         <td class="col">{{ printData.grossWeight}}</td>
         <td class="col">{{ printData.tare}}</td>
-        <td class="col">{{ printData.qualityInspectionManagement.buckleWeightRatio}}</td>
+        <td class="col">{{ printData.weighingManagement.buckleMiscellaneous}}</td>
         <td class="col">{{ printData.netWeight}}</td>
         <td class="col">{{ printData.pureWeight}}</td>
       </tr>
@@ -76,12 +76,11 @@
         <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 " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
         <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</td>
-        <td class="col ">{{ printData.qualityInspectionManagement.unitDeduction}}</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>
@@ -90,23 +89,24 @@
         <td class="col ">{{ printData.weighingDeduction}}</td>
         <td class="col ">{{ printData.freightDeduction}}</td>
         <td class="col ">{{ printData.unloadDeduction}}</td>
-        <td class="col ">{{ printData.qualityDeduction}}</td>
       </tr>
       <tr class="row">
+        <td class="col col-bgc">质量扣款</td>
         <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="6">记事</td>
+        <td class="col col-bgc" colspan="5">记事</td>
       </tr>
       <tr class="row">
+        <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 ">{{ printData.calculationPayable}}</td>
         <td class="col ">{{ printData.qualityInspectionManagement.natureOfGrainPurchase}}</td>
         <td class="col ">{{ printData.carNo}}</td>
-        <td class="col " colspan="6">{{ printData.remarks}}</td>
+        <td class="col " colspan="5">{{ printData.remarks}}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">实付金额</td>
@@ -124,7 +124,8 @@
         <div>皮检：{{ printData.weighingManagement.skinInspector}}</div>
         <div>结算：{{ printData.settlementClerk}}</div>
         <div>付款：{{ printData.cashier}}</div>
-        <div>复点：{{ printData.qualityInspector}}</div>
+        <div>复点：{{ }}</div>
+        <div></div>
       </div>
       <div class="bottom-row2">
         <!-- <div class="left">
@@ -158,10 +159,12 @@
     },
     activated() {
       let date = new Date()
-     
       console.log( date.getFullYear())
     },
     methods: {
+      dealNo(str){
+        return str.slice(4)
+      },
       date(){
         let date = new Date()
        let datas = date.getDate

src/views/houseSelfCollect/paymentManagement.vue

@@ -193,7 +193,7 @@
         class="table-content"
         center
         :visible.sync="isShowPrint"
-        title="中天昊元粮食贸易有限公司结算凭证"
+        :title="printData.compName+'结算凭证'"
       >
         <paymentPrint :printData="printData"></paymentPrint>
         <div style="text-align: center">
@@ -565,6 +565,9 @@ export default {
         .then(response => {
           this.isShowPrint = true
           this.printData = response
+          // if(this.printData.solidGrainPrice){
+          //   this.printData.solidGrainPrice = (this.printData.tidalGrainPrice * this.printData.netWeight)/this.printData.pureWeight
+          // }
           let date = new Date()
           this.printData.currentTime = date.getFullYear() + '年' + Number(date.getMonth() + 1) + '月' + date.getDate() + '日'
         })

src/views/houseSelfCollect/settlement.vue

@@ -68,17 +68,11 @@
             <ws-form-item label="购粮性质" span="1" prop="waterContent">
                 <ws-input v-model="paymentList.qualityInspectionManagement.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="100" size="small" disabled />
             </ws-form-item>
-            <!-- <ws-form-item v-if='paymentList.type=="干粮"' label="干粮单价" span="1" prop="waterContent">
-                <ws-input v-model="paymentList.solidGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" :disabled='disabled' />
-            </ws-form-item> -->
-             <!-- <ws-form-item v-if='paymentList.type=="潮粮"' label="纯重单价（元/公斤）" span="1" prop="tidalGrainPrice">
-                <ws-input v-model="paymentList.tidalGrainPrice" placeholder="请输入纯重单价" maxlength="100" size="small" disabled />
-            </ws-form-item> -->
              <ws-form-item v-if='paymentList.type=="干粮"' label="干粮单价（元/公斤）" span="1" prop="waterContent">
                 <ws-input v-model="paymentList.qualityInspectionManagement.dryGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" disabled />
             </ws-form-item>
              <ws-form-item v-if='paymentList.type=="干粮"' label="净重（公斤）" span="1" prop="waterContent">
-                <ws-input v-model="paymentList.netWeight" placeholder="请输入干粮单价" maxlength="100" size="small" disabled />
+                <ws-input v-model="paymentList.netWeight" placeholder="请输入净重" maxlength="100" size="small" disabled />
             </ws-form-item>
           </ws-info-table>
           <div class="titles">质检数据</div>
@@ -201,7 +195,7 @@
               <ws-input v-model="paymentList.weighingManagement.buckleMiscellaneous" placeholder="请输入扣杂" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item  label="扣单价（元/公斤）" span="1" prop="unitDeduction">
-              <ws-input v-model="paymentList.unitDeduction" placeholder="请输入扣单价" maxlength="100" size="small" :disabled="disabled"/>
+              <ws-input v-model="paymentList.unitDeduction" @input="grainMoney" placeholder="请输入扣单价" maxlength="100" size="small" :disabled="disabled"/>
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"'
               label="纯重单价（元/公斤）"
@@ -210,7 +204,7 @@
             >
               <!-- v-model="paymentList.solidGrainPrice" -->
               <ws-input
-              v-model="paymentList.tidalGrainPrice"
+              v-model="paymentList.solidGrainPrice"
                 placeholder="请输入纯重单价"
                 maxlength="100"
                 size="small"
@@ -398,7 +392,7 @@
       class="table-content"
       center
       :visible.sync="isShowPrint"
-      title="中天昊元粮食贸易有限公司结算凭证"
+      :title="printData.compName+'结算凭证'"
        @close="closeDialog"
        :modal-append-to-body = "false"
     >
@@ -497,32 +491,18 @@ export default {
             this.paymentList.unitDeduction = 0
           } 
           this.paymentList.buckleWeightRatio = this.paymentList.qualityInspectionManagement.buckleWeightRatio
-          this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(2)
+          this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(4)
           this.paymentList.qualityInspectionManagement.waterMin=this.$route.query.waterMin
           this.paymentList.qualityInspectionManagement.weightDeduction=(this.paymentList.qualityInspectionManagement.waterContent-this.paymentList.qualityInspectionManagement.waterMin)*this.paymentList.buckleWeightRatio
-        this.paymentList.qualityInspectionManagement.weightDeduction=this.paymentList.qualityInspectionManagement.weightDeduction.toFixed(2)
-         this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
-         this.paymentList.base = this.paymentList.base.toFixed(2)
+          this.paymentList.qualityInspectionManagement.weightDeduction=this.paymentList.qualityInspectionManagement.weightDeduction.toFixed(2)
+          this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
+          this.paymentList.base = this.paymentList.base.toFixed(3)
           this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
-           this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
+          this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
           if(!this.paymentList.dryGrainPrice){
             this.paymentList.dryGrainPrice=this.paymentList.qualityInspectionManagement.tidalGrainPrice/this.paymentList.base
           }
-          if(this.paymentList.type =='潮粮'){
-            this.paymentList.grainMoney=(this.paymentList.qualityInspectionManagement.tidalGrainPrice - this.paymentList.unitDeduction)*this.paymentList.weighingManagement.netWeight
-            this.paymentList.calculationPayable=Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy)-Number(this.paymentList.weighingDeduction)-this.paymentList.freightDeduction-Number(this.paymentList.unloadDeduction)-Number(this.paymentList.otherDeduction)-Number(this.paymentList.qualityDeduction)
-            this.paymentList.calculationPayable =  this.paymentList.calculationPayable.toFixed(2)
-      
-              this.paymentList.actualPayment = this.paymentList.calculationPayable
-              this.actualPayment( this.paymentList.actualPayment)
-          }else{
-            this.paymentList.grainMoney=(this.paymentList.qualityInspectionManagement.dryGrainPrice - this.paymentList.unitDeduction)*this.paymentList.weighingManagement.netWeight
-             this.paymentList.calculationPayable=Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy)-Number(this.paymentList.weighingDeduction)-this.paymentList.freightDeduction-Number(this.paymentList.unloadDeduction)-Number(this.paymentList.otherDeduction)-Number(this.paymentList.qualityDeduction)
-              this.paymentList.calculationPayable =  this.paymentList.calculationPayable.toFixed(2)
-                this.paymentList.actualPayment = this.paymentList.calculationPayable
-                this.actualPayment( this.paymentList.actualPayment)
-          }
-           this.paymentList.grainMoney = this.paymentList.grainMoney.toFixed(2)
+          this.grainMoney()
         })
           
     },
@@ -530,11 +510,22 @@ export default {
      this.paymentList.capitalize=this.convertCurrency(e)
     },
     grainMoney(){
-       this.paymentList.calculationPayable=Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy)-Number(this.paymentList.weighingDeduction)-this.paymentList.freightDeduction-Number(this.paymentList.unloadDeduction)-Number(this.paymentList.otherDeduction)-Number(this.paymentList.qualityDeduction)
-       this.paymentList.calculationPayable =  this.paymentList.calculationPayable.toFixed(2)
-      this.paymentList.actualPayment = this.paymentList.calculationPayable
-      this.actualPayment( this.paymentList.actualPayment)
-      // this.paymentList.calculationPayable=num.toFixed(2)
+      if(this.paymentList.type =='潮粮'){
+        this.paymentList.grainMoney=(this.paymentList.qualityInspectionManagement.tidalGrainPrice - this.paymentList.unitDeduction)*this.paymentList.weighingManagement.netWeight
+        this.paymentList.solidGrainPrice = (Number(this.paymentList.grainMoney)/Number(this.paymentList.pureWeight)).toFixed(4)
+        this.paymentList.calculationPayable=Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy)-Number(this.paymentList.weighingDeduction)-this.paymentList.freightDeduction-Number(this.paymentList.unloadDeduction)-Number(this.paymentList.otherDeduction)-Number(this.paymentList.qualityDeduction)
+        this.paymentList.calculationPayable =  this.paymentList.calculationPayable.toFixed(2)
+  
+        this.paymentList.actualPayment = this.paymentList.calculationPayable
+        this.actualPayment( this.paymentList.actualPayment)
+      }else{
+        this.paymentList.grainMoney=(this.paymentList.qualityInspectionManagement.dryGrainPrice - this.paymentList.unitDeduction)*this.paymentList.weighingManagement.netWeight
+        this.paymentList.calculationPayable=Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy)-Number(this.paymentList.weighingDeduction)-this.paymentList.freightDeduction-Number(this.paymentList.unloadDeduction)-Number(this.paymentList.otherDeduction)-Number(this.paymentList.qualityDeduction)
+        this.paymentList.calculationPayable =  this.paymentList.calculationPayable.toFixed(2)
+        this.paymentList.actualPayment = this.paymentList.calculationPayable
+        this.actualPayment( this.paymentList.actualPayment)
+      }
+      this.paymentList.grainMoney = this.paymentList.grainMoney.toFixed(2)
     },
      /**
          * 将金额数字转为汉字大写
@@ -746,11 +737,10 @@ export default {
       if(this.paymentList.buckleWeightRatio >= 0 && this.paymentList.buckleWeightRatio <= 2){
         this.paymentList.qualityInspectionManagement.weightDeduction=(this.paymentList.qualityInspectionManagement.waterContent-this.paymentList.qualityInspectionManagement.waterMin)*this.paymentList.buckleWeightRatio
         this.paymentList.qualityInspectionManagement.weightDeduction = this.paymentList.qualityInspectionManagement.weightDeduction.toFixed(2)
-      this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
-      this.paymentList.base = this.paymentList.base.toFixed(2)
-      this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
-       this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
-
+        this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
+        this.paymentList.base = this.paymentList.base.toFixed(3)
+        this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
+        this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
       }else{
          this.$message({
             message: '扣重比输入错误',

src/views/houseSelfCollect/weighingManagement.vue

@@ -158,6 +158,7 @@ export default {
       value1: '', //选择时间
       warehouseList: [],
       warehouseId: '',
+      cangid: '',
       isShowPrint:false,//打印弹出
       dialogData:{
         qualityInspectionManagement:{},
@@ -196,13 +197,15 @@ export default {
       for (let i = 0; i < this.warehouseList.length; i++) {
         if (this.warehouseList[i].value == e) {
           this.warehouseId = this.warehouseList[i].warehouseId
-         this.purchasePriceList = this.warehouseList[i].warehouseList
+          this.cangid = this.warehouseList[i].warehouseId
+          this.purchasePriceList = this.warehouseList[i].warehouseList
           this.allowEdit = this.warehouseList[i].allowEdit
-            this.WAREHOUSE[2].payname = this.warehouseList[i].value
-             this.common.name  =  this.warehouseList[0].value
-            sessionStorage.setItem('ck',e)
+          this.WAREHOUSE[2].payname = this.warehouseList[i].value
+          this.common.name  =  this.warehouseList[0].value
+          sessionStorage.setItem('ck',e)
         }
       }
+
       this.getList()
     },
     weightCheck(row, num) {
@@ -254,17 +257,23 @@ export default {
               warehouseList:response[i].purchasePriceList,
               allowEdit:response[i].allowEdit
             })
+            if (this.cangid&&this.cangid == response[i].id) {
+              this.warehouseName = response[i].warehouseName
+              this.allowEdit = response[i].allowEdit
+              this.common.name = response[i].warehouseName
+              this.warehouseId =  response[i].id
+              this.warehouseNo =  response[i].commonWarehouseNo
+              this.purchasePriceList =  response[i].purchasePriceList
+            }
           }
-          this.warehouseName =  this.warehouseList[0].value
-             if (this.warehouseId) {
-            this.warehouseName = this.WAREHOUSE[2].payname
-          } else {
-            this.WAREHOUSE[2].payname = this.warehouseList[0].value
+           if(this.warehouseList.length > 0 && !this.cangid){
+            this.warehouseName = this.warehouseList[0].value
+            this.cangid =  this.warehouseList[0].warehouseId
+            this.warehouseId =  this.warehouseList[0].warehouseId
+            this.purchasePriceList =  this.warehouseList[0].purchasePriceList
+            this.WAREHOUSE[1].payname = this.warehouseList[0].value
+            this.common.name  =  this.warehouseList[0].value
           }
-          this.allowEdit = this.warehouseList[0].allowEdit
-          this.warehouseId = this.warehouseList[0].warehouseId
-          this.purchasePriceList = this.warehouseList[0].warehouseList
-           this.common.name  =  this.warehouseList[0].value
            sessionStorage.setItem('ck',this.common.name)
          this.getList()
         })

vue.config.js

@@ -141,7 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.120:8090/',
+        target: 'http://192.168.1.122:8090/',
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',