Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/settlement.vue

@@ -395,7 +395,9 @@
         <!-- <el-button type="primary" @click="printSmall">打印小票</el-button> -->
         <el-button type="primary" @click="printBig">打印单据</el-button>
       </div>
+       
     </el-dialog>
+
   </div>
 </template>
 <script>
@@ -436,6 +438,7 @@ export default {
          this.information = '结算'   
     }
    this.getList()
+ 
   },
   methods: {
     closeDialog(){
@@ -460,6 +463,7 @@ export default {
           this.dialogTableVisible = true
         }
       })
+
     },
     printSmall() {
       window.open('../../../../../static/payprint.html?type=1&dataList=' +JSON.stringify(this.printData))
@@ -490,8 +494,7 @@ export default {
               this.paymentList.actualPayment = this.paymentList.calculationPayable
               this.actualPayment( this.paymentList.actualPayment)
           }else{
-            
-            this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.dryGrainPrice * this.paymentList.netWeight
+            // this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.solidGrainPrice*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
@@ -712,8 +715,6 @@ export default {
       postpaymentedit(this.paymentList).toPromise().then((response) => {
          getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {
              this.printData= response
-          let date = new Date()
-          this.printData.currentTime =  date.getFullYear() +  '年' + '月' +  date.getDate() + '日'
          })
          this.isShowPrint = true
         },

src/views/houseSelfCollect/weightCheck.vue

@@ -244,7 +244,7 @@ export default {
       pList:[],
       mList:[],
       index:0,
-      video1Src:'https://www.w3school.com.cn/i/movie.ogg',
+      video1Src:'',
       video2Src:'',
       carList: [],
       carWeightInfo:{