前端入库车牌号，实际损耗

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -281,7 +281,7 @@
                 </ws-form-item>
                 <ws-form-item v-if="serviceManagementType == 1&&deptBudgetList.outType == '汽运'" label="车牌号" span="1" prop="carNo">
                  <ws-input :disabled="disabled2"
-                    v-if="options2.length == 0 && serviceManagementType == 1&&deptBudgetList.inOutType!='移库入库' || serviceManagementType == 3 && carNumberList.length == 0"
+                    v-if="options2.length == 0 && serviceManagementType == 1&&deptBudgetList.inOutType!='移库入库'||statusTypetext!='初检' "
                     v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
                   <el-select :disabled="disabled2" v-if="carstatus && options2.length > 0 && serviceManagementType != 3||carstatus && options2.length == 0 && serviceManagementType != 3&&deptBudgetList.inOutType=='移库入库' "
                     filterable clearable v-model="deptBudgetList.carNo1" placeholder="请选择车牌号" class="typeselect"
@@ -2047,6 +2047,62 @@ export default {
     },
     statustypechange(status) {
       this.statusTypetext = status
+      this.deptBudgetList = {
+                      type: '',
+                      freight: 0,
+                      cost: '',
+                      addressUrl: '',
+                      tidalGrainPrice: 0,
+                      buckleWeightRatio: 0,
+                      natureOfGrainPurchase: '贸易粮',
+                      buckleMiscellaneous: 0,
+                      paramType: 1,
+                      warehouseInOutDetail: {
+                        grade: '',
+                        reGrade: '',
+                        imperfectGrain: '',
+                        reImperfectGrain: '',
+                        impurity: '',
+                        reImpurity: '',
+                        jiaorenli: '',
+                        reJiaorenli: '',
+                        bulkDensity: '',
+                        reBulkDensity: '',
+                        mildewGrain: '',
+                        reMildewGrain: '',
+                      },
+                      disablednotarize: false,
+                      deductionAmount: 0,
+                      deductionWeight: 0,
+                      grossWeight: 0,
+                      tare: 0,
+                      grade: '',
+                      inOutDate: '',
+                      netWeight: 0,
+                      pureWeight: 0,
+                      waterContent: '',
+                      reWaterContent: '',
+                      reGrade: '',
+                      imperfectGrain: '',
+                      reImperfectGrain: '',
+                      impurity: '',
+                      reImpurity: '',
+                      jiaorenli: '',
+                      reJiaorenli: '',
+                      bulkDensity: '',
+                      reBulkDensity: '',
+                      reMemo: '',
+                      storageTagNo: '',
+                      mildewGrain: '',
+                      reMildewGrain: '',
+                      boxNo: '',
+                      boxNoOther: '',
+                      titleNo: '',
+                      titleNoOther: '',
+                      carNo:'',
+                      inOutType: '',
+                      inOutTypeKey: 1
+                    }
       if (status == '初检') {
         this.disabled2 = false
         this.deptBudgetList.statusType = 1

src/views/statisticalReport/autoSettlementList.vue

@@ -107,8 +107,7 @@
               (scope.row.actualLosschange &&
                 scope.row.status == '已驳回')
             " class="iconfont icon-dui"></i>
-            <img v-if="
-              (!scope.row.actualLosschange &&
+            <img v-if="(!scope.row.actualLosschange &&
                 scope.row.status == '待请款') ||
               (!scope.row.actualLosschange &&
                 scope.row.status == '已驳回')

src/views/taskManagement/supplyofgoods.vue

@@ -353,7 +353,7 @@
               if(response.records[i].inType=='收购入库'){
                 response.records[i].surplusWeight=Number((response.records[i].surplusWeight).toFixed(3))
               }
-              
+              response.records[i].estimateOutWarehouseWeight=response.records[i].surplusWeight
             }
             var arr = response.records
             if(this.multipleSelection.length>0){

src/views/warehousenew/warehousingOrder.vue

@@ -1116,13 +1116,14 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
         var weight2=0
         for (let i = 0; i < arr1.length; i++) {
           console.log(arr1[i].surplusWeight)
-          weight+=arr1[i].surplusWeight
+          weight+=Number(arr1[i].surplusWeight)
         }
         // this.currectdata=item
         this.currectdata=arr1
+        console.log(this.currectdata)
         this.fieldrationsList.warehousingOrderList=this.currectdata
         this.fieldrationsList.baseId=this.currectdata[0].baseId
-        this.fieldrationsList.beforeWeight=weight
+        this.fieldrationsList.beforeWeight=weight.toFixed(2)
         getbyname({warehouseId:this.currectdata[0].baseId,goodsName:this.currectdata[0].goodsName}).toPromise()
           .then((response) => {
             if(response){
@@ -1130,8 +1131,10 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
                 var weightedMoisture=(this.currectdata[i].weightedMoisture-14)
                 var deductWeight=100-(weightedMoisture*response.deductWeight)
                 // console.log(deductWeight,111111111)
+                this.currectdata[i].afterWeight=((deductWeight/100)*this.currectdata[i].surplusWeight)
                 weight2+=((deductWeight/100)*this.currectdata[i].surplusWeight)
               }
+              console.log(this.currectdata)
               this.fieldrationsList.afterWeight=weight2.toFixed(2)
               this.fieldrationsshow=true
             }