入库付款 修改

public/static/payprint.html

@@ -277,7 +277,6 @@
                   <td class="col col-bgc">皮重</td>
                   <td class="col col-bgc">扣杂重</td>
                   <td class="col col-bgc">净重</td>
-                  <!-- <td class="col col-bgc">纯重</td> -->
                 </tr>
                 <tr class="row">
                   <td class="col">{{ printData1[index].goodsName}}</td>
@@ -292,7 +291,6 @@
                     {{printData1[index].weighingManagement?printData1[index].weighingManagement.buckleMiscellaneous:''}}
                   </td>
                   <td class="col">{{ printData1[index].netWeight}}</td>
-                  <!-- <td class="col">{{ printData1[index].pureWeight}}</td> -->
                 </tr>
                 <tr class="row">
                   <td class="col col-bgc">纯重</td>
@@ -310,7 +308,6 @@
                   <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>
@@ -619,7 +616,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> -->
             </tr>
             <tr class="row">
               <td class="col">{{ printData.goodsName}}</td>
@@ -639,9 +637,11 @@
                 {{ printData.weighingManagement.buckleMiscellaneous}}
               </td>
               <td class="col">{{ printData.netWeight}}</td>
-              <td class="col">{{ printData.pureWeight}}</td>
+              <td class="col">{{printData.contractManagement ? printData.contractManagement.weight : "0"}}</td>
+              <!-- <td class="col">{{ printData.pureWeight}}</td> -->
             </tr>
             <tr class="row">
+              <td class="col col-bgc">纯重</td>
               <td class="col col-bgc" v-if="printData.type == '潮粮'">
                 净重单价
               </td>
@@ -654,9 +654,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">1卸车扣款</td> -->
             </tr>
             <tr class="row">
+              <td class="col">{{ printData.pureWeight}}</td>
               <td class="col " v-if="printData.type == '潮粮'">
                 {{printData.tidalGrainPrice}}
               </td>
@@ -671,9 +672,10 @@
               <td class="col ">{{ printData.otherSubsidy}}</td>
               <td class="col ">{{ printData.weighingDeduction}}</td>
               <td class="col ">{{ printData.freightDeduction}}</td>
-              <td class="col ">{{ printData.unloadDeduction}}</td>
+              <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
             </tr>
             <tr class="row">
+              <td class="col col-bgc">卸车扣款</td>
               <td class="col col-bgc">质量扣款</td>
               <td class="col col-bgc">其他扣款</td>
               <td class="col col-bgc" v-if="printData.type == '潮粮'">
@@ -682,9 +684,10 @@
               <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>
+              <td class="col col-bgc" colspan="4">记事</td>
             </tr>
             <tr class="row">
+              <td class="col ">{{ printData.unloadDeduction}}</td>
               <td class="col ">{{ printData.qualityDeduction}}</td>
               <td class="col ">{{ printData.otherDeduction}}</td>
               <td class="col " v-if="printData.type == '潮粮'">
@@ -695,7 +698,7 @@
                 {{ printData.qualityInspectionManagement.natureOfGrainPurchase}}
               </td>
               <td class="col ">{{ printData.carNo}}</td>
-              <td class="col " colspan="5">{{ printData.remarks}}</td>
+              <td class="col " colspan="4">{{ printData.remarks}}</td>
             </tr>
             <tr class="row">
               <td class="col col-bgc">实付金额</td>

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -52,7 +52,6 @@
         <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>
@@ -67,6 +66,7 @@
         <td class="col">{{ printData.netWeight}}</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" v-if="printData.type == '干粮'">单价</td>
@@ -77,10 +77,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> -->
       </tr>
       <tr class="row">
+        <td class="col">{{ printData.contractManagement ? printData.contractManagement.weight : "0"}}</td>
         <td class="col">{{ printData.pureWeight}}</td>
         <td class="col " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
         <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</td>
@@ -91,10 +91,10 @@
         <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> -->
+        <!-- <td class="col ">{{ printData.freightDeduction}}</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>
@@ -102,9 +102,10 @@
         <td class="col col-bgc">合计应付</td>
         <td class="col col-bgc">购粮性质</td>
         <td class="col col-bgc">车牌号</td>
-        <td class="col col-bgc" colspan="4">记事</td>
+        <td class="col col-bgc" colspan="3">记事</td>
       </tr>
       <tr class="row">
+        <td class="col ">{{ printData.freightDeduction}}</td>
         <td class="col ">{{ printData.unloadDeduction}}</td>
         <td class="col ">{{ printData.qualityDeduction}}</td>
         <td class="col ">{{ printData.otherDeduction}}</td>
@@ -112,7 +113,7 @@
         <td class="col ">{{ printData.calculationPayable}}</td>
         <td class="col ">{{ printData.qualityInspectionManagement.natureOfGrainPurchase}}</td>
         <td class="col ">{{ printData.carNo}}</td>
-        <td class="col " colspan="4">{{ printData.remarks}}</td>
+        <td class="col " colspan="3">{{ printData.remarks}}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">实付金额</td>

src/views/houseSelfCollect/settlement.vue

@@ -56,10 +56,10 @@
               <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.unitDeduction" @input="grainMoney"
                 placeholder="请输入扣单价" maxlength="100" size="small" :disabled="disabled" />
             </ws-form-item>
-            <!-- <ws-form-item v-if='paymentList.contractManagement' label="出库净重（公斤）" span="1" prop="weight">
+            <ws-form-item v-if='paymentList.contractManagement && paymentList.contractManagement.settlementWeightMethod == 1 && this.paymentList.contractManagement.contractType == 2 && this.paymentList.contractManagement.deliverType == 1' label="出库净重（公斤）" span="1" prop="weight">
               <ws-input type="number" v-model="paymentList.contractManagement.weight" @input="grainMoney"
                 placeholder="自动获取，不可编辑" maxlength="100" size="small" disabled/>
-            </ws-form-item> -->
+            </ws-form-item>
           </ws-info-table>
           <div class="titles">质检数据</div>
           <ws-info-table>
@@ -177,22 +177,22 @@
 
           <div class="titles">结算金额（元）</div>
           <ws-info-table>
-            <ws-form-item v-if='paymentList.type=="潮粮"' label="粮款 = 净重 x (净重单价 - 扣单价) =" span="1" prop="waterContent"
+            <ws-form-item v-if='paymentList.type=="潮粮" && !paymentList.contractManagement' label="粮款 = 净重 x (净重单价 - 扣单价) =" span="1" prop="waterContent"
               class="formItem">
               <ws-input type="number" @mousewheel.native.prevent @input='grainMoney' v-model="paymentList.grainMoney"
                 placeholder="请输入粮款" maxlength="100" size="small" disabled />
             </ws-form-item>
-            <ws-form-item v-if='paymentList.type=="干粮"' label="粮款 = 净重 x  (干粮单价 - 扣单价)  =" span="1" prop="waterContent"
+            <ws-form-item v-if='paymentList.type=="干粮" && !paymentList.contractManagement' label="粮款 = 净重 x  (干粮单价 - 扣单价)  =" span="1" prop="waterContent"
               class="formItem">
               <ws-input type="number" @mousewheel.native.prevent @input='grainMoney' v-model="paymentList.grainMoney"
                 placeholder="请输入粮款" maxlength="100" size="small" disabled />
             </ws-form-item>
             <!-- 采购合同 自运 按合同的出库净重计算 -->
-            <!-- <ws-form-item v-if='paymentList.contractManagement.contractType == 2 && paymentList.contractManagement.deliverType == 1' label="粮款 = 出库净重 x  (干粮单价 - 扣单价)  =" span="1" prop="waterContent"
+            <ws-form-item v-if='paymentList.contractManagement' label="粮款 = 出库净重 x  (干粮单价 - 扣单价)  =" span="1" prop="waterContent"
               class="formItem">
               <ws-input type="number" @mousewheel.native.prevent @input='grainMoney' v-model="paymentList.grainMoney"
                 placeholder="请输入粮款" maxlength="100" size="small" disabled />
-            </ws-form-item> -->
+            </ws-form-item>
             <ws-form-item label="称重扣款" span="1" prop="waterContent">
               <ws-input type="number" @mousewheel.native.prevent @input='grainMoney' @focus="inputFocus($event)"
                 v-model="paymentList.weighingDeduction" placeholder="请输入称重扣款" maxlength="100" size="small"
@@ -429,25 +429,30 @@
         this.paymentList.capitalize = this.convertCurrency(e)
       },
       grainMoney() {
-        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)
+        if(this.paymentList.contractManagement && this.paymentList.contractManagement.settlementWeightMethod == 1 && this.paymentList.contractManagement.contractType == 2 && this.paymentList.contractManagement.deliverType == 1){//合同收购自运按出库重量结算 (条件：按出库结算&& 采购合同&&自运)
+          if(this.paymentList.type == '潮粮'){
+            this.paymentList.grainMoney = (this.paymentList.qualityInspectionManagement.tidalGrainPrice - this.paymentList.unitDeduction) * this.paymentList.contractManagement.weight
+          }else{
+            this.paymentList.grainMoney = (this.paymentList.qualityInspectionManagement.dryGrainPrice - this.paymentList.unitDeduction) * this.paymentList.contractManagement.weight
+          }
+          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 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) +
+        } else if(this.paymentList.type == '干粮') {
+          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)
@@ -655,6 +660,7 @@
         this.paymentList.id = this.$route.query.id
         this.paymentList.amountIngPayable = this.paymentList.actualPayment
         this.paymentList.settlementClerk = localStorage.getItem('ws-pf_staffName')
+        delete this.paymentList.contractManagement
         postpaymentedit(this.paymentList).toPromise().then((response) => {
           getpaymentexamine({
             id: this.$route.query.id