更新

public/static/weightCheck.html

@@ -20,7 +20,7 @@
 
       .content {
         width: 1000px;
-        padding: 50px 20px 20px 20px;
+        padding: 70px 20px 20px 20px;
         font-size: 18px;
         position: absolute;
         top: 0;
@@ -76,6 +76,7 @@
       .number {
         text-align: right;
         margin-bottom: 10px;
+        margin-top: 20px;
       }
 
       .small-row {
@@ -122,6 +123,7 @@
     <div id="app">
       <div class="content" v-if="bigContent">
         <div class="title">{{tableData.compName}}粮食检斤单</div>
+        <div class="title">入库检斤单</div>
         <div class="number">{{tableData.number}}</div>
         <table class="table">
           <tr class="row">
@@ -157,7 +159,8 @@
             <td class="col">{{tableData.qualityInspectionManagement.waterContent}}</td>
             <td class="col col-bgc">热损伤（%）</td>
             <td class="col">{{tableData.qualityInspectionManagement.jiaorenli}}</td>
-            <td class="col col-bgc" colspan="2">质检&nbsp;&nbsp;{{tableData.qualityInspectionManagement.qualityDate}}</td>
+            <td class="col col-bgc" colspan="1">质检时间</td>
+            <td class="col" colspan="1">{{tableData.qualityInspectionManagement.qualityDate}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">杂质（%）</td>

src/views/houseSelfCollect/inspectInfo.vue

@@ -713,11 +713,14 @@
 
       waterContentChange(type) {
         if (this.inspect.goodsName&&type!='water') {
-          getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
-          .toPromise()
-          .then((response) => { 
-            this.$set(this.inspect,'dryGrainPrice',response)
-          })
+          if(!this.inspect.dryGrainPrice||this.inspect.dryGrainPrice == 0){
+            getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
+            .toPromise()
+            .then((response) => { 
+              this.$set(this.inspect,'dryGrainPrice',response)
+            })
+          }
+          
           for (var i = 0; i < this.purchasePriceList.length; i++) {
             if (this.purchasePriceList[i].goodsName == this.inspect.goodsName) {
               this.$set(this.inspect,'buckleWeightRatio',this.purchasePriceList[i].deductWeight)

src/views/houseSelfCollect/settlement.vue

@@ -69,7 +69,7 @@
                 <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 type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.dryGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" />
+                <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.dryGrainPrice" disabled placeholder="请输入干粮单价" maxlength="100" size="small" />
             </ws-form-item>
              <ws-form-item v-if='paymentList.type=="干粮"' label="净重（公斤）" span="1" prop="waterContent">
                 <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.netWeight" placeholder="请输入净重" maxlength="100" size="small" disabled />

src/views/houseSelfCollect/weightCheck.vue

@@ -229,7 +229,9 @@
       if (!this.$route.query.grossWeight) {
         this.$route.query.grossWeight = 0
       }
-      this.weighingList.grossWeight = this.$route.query.grossWeight
+      else{
+        this.weighingList.grossWeight = this.$route.query.grossWeight
+      }
       // this.purchasePriceList = this.$route.query.purchasePriceList
       // console.log(this.purchasePriceList, '上限')
       this.allowEdit = this.$route.query.allowEdit
@@ -420,9 +422,13 @@
               }
             }
             if (this.tpyeNo != 2) {
-              this.weighingList.grossWeight = parseInt(result)
+              if(parseInt(result)){
+                this.weighingList.grossWeight = parseInt(result)
+              }
             } else {
-              this.weighingList.tare = parseInt(result)
+              if(parseInt(result)){
+                this.weighingList.tare = parseInt(result)
+              }
             }
             setTimeout(1000)
             // value 是一个 Uint8Array