更新

src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -37,7 +37,8 @@
         <td class="col col-bgc">热损伤（%）</td>
         <td class="col">{{ printData.jiaorenli }}</td>
         <td class="col col-bgc">单价（元/公斤）</td>
-        <td class="col">{{ printData.tidalGrainPrice }}</td>
+        <td v-if="printData.type == '潮粮'" class="col">{{ printData.tidalGrainPrice }}</td>
+        <td v-else class="col">{{ printData.dryGrainPrice }}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">杂质（%）</td>

src/views/houseSelfCollect/inspectInfo.vue

@@ -255,7 +255,11 @@
             })
             this.dialogTableVisible = true;
           }
-        });
+        })
+        this.types = ""
+        // this.inspect = [] 
+        this.isShowPrint = false
+        this.$router.push({path:'inspectionManagement'})
       },
       typeChange(){
         if(this.inspect.type == "干粮" && this.inspect.goodsName){

src/views/houseSelfCollect/inspectionManagement.vue

@@ -72,7 +72,12 @@
         prop="tidalGrainPrice"
         label="单价（元/公斤）"
         width="120px"
-      ></el-table-column>
+      >
+      <template scope="scope">
+          <span v-if="scope.row.type == '潮粮'">{{ scope.row.tidalGrainPrice }}</span>
+          <span v-else>{{ scope.row.dryGrainPrice }}</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
       <el-table-column prop="qualityInspector" label="质检员"></el-table-column>

src/views/houseSelfCollect/paymentManagement.vue

@@ -88,12 +88,7 @@
       </el-table-column>
       <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="350">
         <template scope="scope">
-          <el-button
-            type="danger"
-            v-if="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
-            @click="del(scope.row)"
-            v-hasPermission="`acquisitionManagement.acquisitionPay.delete`"
-          >删除</el-button>
+          
           <el-button
             v-if="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
             @click="settlement(1, scope.row)"
@@ -109,6 +104,12 @@
             @click="print(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.print`"
           >打印</el-button>
+          <el-button
+            type="danger"
+            v-if="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
+            @click="del(scope.row)"
+            v-hasPermission="`acquisitionManagement.acquisitionPay.delete`"
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/houseSelfCollect/settlement.vue

@@ -459,9 +459,12 @@ export default {
               .then((response) => {})
           })
           this.dialogTableVisible = true
+          
         }
       })
-
+      this.paymentList = [] 
+      this.isShowPrint = false
+      this.$router.push({path:'paymentManagement'})
     },
     printSmall() {
       window.open('../../../../../static/payprint.html?type=1&dataList=' +JSON.stringify(this.printData))
@@ -481,8 +484,8 @@ export default {
          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)
-          if(!this.paymentList.solidGrainPrice){
-            this.paymentList.solidGrainPrice=this.paymentList.qualityInspectionManagement.tidalGrainPrice/this.paymentList.base
+          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.weighingManagement.netWeight
@@ -492,7 +495,7 @@ export default {
               this.paymentList.actualPayment = this.paymentList.calculationPayable
               this.actualPayment( this.paymentList.actualPayment)
           }else{
-            // this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.solidGrainPrice*this.paymentList.weighingManagement.netWeight
+            this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.dryGrainPrice*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

src/views/houseSelfCollect/weightCheck.vue

@@ -282,7 +282,7 @@
         console.log(this.common.commonWeighingList, "commonWeighingList")
         let _list = this.common.commonWeighingList
         for (let i = 0; i < _list.length; i++) {
-          if(_list[i].paymentManagement.status == '待结算'){
+          if(_list[i].allow == 2){
             continue
           }
           if (_list[i].status == '已质检' || _list[i].status == '已称毛重') {
@@ -292,28 +292,28 @@
           if ((_list[i].status == '已称皮重' || _list[i].status == '已称毛重')) {
             this.pList.push(_list[i])
           }
-        }
+        }debugger
         if (this.information == "毛重") {
           this.index = 0
           this.carList = this.mList
           if (this.mList.length != 0) {
-      let _list = this.mList.filter(function(val){
+      let _item = this.mList.filter(function(val){
         console.log(that.$route.query.id)
                 if(val.id==that.$route.query.id){
                   return val
                 }
             })
 
-            this.setCurrent(_list)
+            this.setCurrent(_item[0])
 
             this.carWeightInfo = {
-              carNumber: _list.carNumber,
+              carNumber: _item[0].carNumber,
               type: this.information,
               weight: this.weighingList.grossWeight
             }
             this.deptBudgetTotal =  this.mList.length
           }
-          this.weighingList = _list
+          this.weighingList = _item[0]
         } else {
           this.index = 1
           this.carList = this.pList
@@ -323,16 +323,16 @@
                   return val1
                 }
             })
-            this.setCurrent(_item)
+            this.setCurrent(_item[0])
 
             this.carWeightInfo = {
-              carNumber: _item.carNumber,
+              carNumber: _item[0].carNumber,
               type: this.information,
               weight: this.weighingList.tare
             }
              this.deptBudgetTotal =  this.pList.length
           }
-          this.weighingList = _item
+          this.weighingList = _item[0]
         }
       },
       tabClick(val) {
@@ -450,6 +450,10 @@
             this.dialogTableVisible = true
           }
         })
+        this.isShowPrint = false
+        this.$router.push({
+          path: 'weighingManagement'
+        })
       },
       closePrint() {
         this.isShowPrint = false