Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/paymentManagement.vue

@@ -120,7 +120,7 @@
             v-hasPermission="`acquisitionManagement.acquisitionPay.view`"
           >查看</el-button>
           <el-button
-            v-show="(scope.row.approveStatus || scope.row.status == '已驳回' || userJurisdiction)&&scope.row.status != '待结算'"
+            v-show="scope.row.approveStatus || (scope.row.status != '待结算'&& !scope.row.approveStatus) "
             @click="print(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.print`"
           >打印</el-button>

src/views/houseSelfCollect/settlement.vue

@@ -107,7 +107,7 @@
                disabled
               />
             </ws-form-item>
-            <ws-form-item label="容重(克/升)>=" span="1" prop="waterContent">
+            <ws-form-item label="容重(克/升)" span="1" prop="waterContent">
               <ws-input v-model="paymentList.qualityInspectionManagement.bulkDensity" placeholder="请输入容重" maxlength="100" size="small" disabled />
             </ws-form-item>
             <ws-form-item label="热损伤（%）" span="1" prop="waterContent">
@@ -398,7 +398,7 @@
     >
       <paymentPrint :printData="printData" ref="saveImg"></paymentPrint>
       <div style="text-align:center">
-        <el-button type="primary" @click="closeDialog">关闭</el-button>
+        <el-button type="primary" @click="closePrint">关闭</el-button>
         <!-- <el-button type="primary" @click="printSmall">打印小票</el-button> -->
         <el-button type="primary" @click="printBig">打印单据</el-button>
       </div>
@@ -453,7 +453,7 @@ export default {
       html2canvas(this.$refs.saveImg.$el).then((canvas) => {
         let dataURL = canvas.toDataURL('image/png')
         this.imgUrl = dataURL
-        if (this.imgUrl !== '') {
+        if (this.imgUrl !== '' ) {
           let b = this.dataURLtoFile(this.imgUrl, 'printImage')
           let formdata = new FormData()
           formdata.append('file', b)
@@ -497,7 +497,7 @@ export default {
           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(3)
+          this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
           if(!this.paymentList.dryGrainPrice){
             this.paymentList.dryGrainPrice=this.paymentList.qualityInspectionManagement.tidalGrainPrice/this.paymentList.base
           }
@@ -739,7 +739,9 @@ export default {
         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.solidGrainPrice = (Number(this.paymentList.grainMoney)/Number(this.paymentList.pureWeight)).toFixed(4)
         this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
+        
       }else{
          this.$message({
             message: '扣重比输入错误',
@@ -754,7 +756,6 @@ export default {
       this.$router.push({ path: 'paymentManagement' })
     },
     closePrint(){
-        this.paymentList = [] 
         this.isShowPrint = false
         this.$router.push({path:'paymentManagement'})
       },

src/views/houseSelfCollect/weightCheck.vue

@@ -259,7 +259,7 @@
           .then((response) => {
             for (let i = 0; i < response.records.length; i++) {
               if (response.records[i].paymentManagement) {
-                if (response.records[i].paymentManagement.status == '待结算') {
+                if (response.records[i].paymentManagement.status == '待结算' && !response.records[i].paymentManagement.approveStatus) {
                   response.records[i].allow = 1
                 } else {
                   response.records[i].allow = 2
@@ -452,9 +452,9 @@
           }
         })
         this.isShowPrint = false
-        this.$router.push({
-          path: 'weighingManagement'
-        })
+        // this.$router.push({
+        //   path: 'weighingManagement'
+        // })
       },
       closePrint() {
         this.isShowPrint = false