前端

src/views/houseSelfCollect/customerManagement.vue

@@ -192,6 +192,7 @@
 
     .find {
       width: 32px;
+      margin-left:10px;
     }
 
     .search-left {

src/views/houseSelfCollect/inspectInfo.vue

@@ -102,7 +102,7 @@
                 <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" v-if="statusShow != '已复检'" />
                 <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" v-else disabled />
               </ws-form-item>
-               <ws-form-item label="车型" span="2" prop="dryGrainPrice" v-if="types==4&&warehouseName=='鲅鱼圈金信库'||types==1&&warehouseName=='鲅鱼圈金信库'">
+               <ws-form-item label="车型" span="2" prop="dryGrainPrice" v-if="types==4&&warehouseName=='鲅鱼圈金信库'||types==2&&warehouseName=='鲅鱼圈金信库'">
                 <el-select v-model="inspect.carModel" clearable filterable placeholder="请选择" class="typeselect"
                  :disabled="disabled3">
                 <el-option v-for="item in cartypeList" :key="item.constValue" :label="item.constValue" :value="item.constValue" />

src/views/houseSelfCollect/paymentManagement.vue

@@ -95,6 +95,7 @@
         </template>
       </el-table-column>
       <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
+      <el-table-column class="table_td" v-if='warehouseNameKey=="鲅鱼圈金信库"' width='140' prop="actualWeighingFee" label="卸车过磅费（元）"></el-table-column>
       <el-table-column class="table_td" prop="goodsName" width="70" label="货名"></el-table-column>
       <el-table-column class="table_td" prop="type" width="60" label="类型"></el-table-column>
       <el-table-column class="table_td" prop="tidalGrainPrice" width="140" label="净重单价（元/公斤）"></el-table-column>

src/views/houseSelfCollect/weighingManagement.vue

@@ -427,6 +427,7 @@
         // 质检是否是已确定状态
         // let _isGoweightCheck = this.isConfirmQuality(row)
         let _isGoweightCheck = true
+        console.log(row.qualityInspectionManagement)
         if (_isGoweightCheck) {
           this.$router.push({
             path: 'weightCheck',
@@ -442,6 +443,7 @@
               boxNoOther: row.qualityInspectionManagement.boxNoOther,
               titleNo: row.qualityInspectionManagement.titleNo,
               titleNoOther: row.qualityInspectionManagement.titleNoOther,
+              carModel:row.qualityInspectionManagement.carModel,
               goodsName: row.goodsName,
               grossWeight: row.grossWeight,
               tare: row.tare,

src/views/houseSelfCollect/weightCheck.vue

@@ -47,7 +47,6 @@
               <div class="tab-item" :class="index==0?'active':''" @click="tabClick(0)"> 待称毛重（{{mListTop.length}}）</div>
               <div class="tab-item" :class="index==1?'active':''" @click="tabClick(1)">待称皮重（{{pListTop.length}}）</div>
             </div>
-            <div class="title">基本信息</div>
             <ws-info-table>
               <ws-form-item label="编号" span="1" prop="number">
                 <ws-input v-model="weighingList.number" placeholder="请输入编号" maxlength="100" disabled size="small" />
@@ -82,7 +81,7 @@
               </ws-form-item>
               <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight">
                 <ws-input type="number" @mousewheel.native.prevent v-if="this.index == 0"
-                  v-model="weighingList.grossWeight" @input="calculation" placeholder="未获取到毛重" maxlength="100"
+                  v-model="weighingList.grossWeight" @input="calculation(status)" placeholder="未获取到毛重" maxlength="100"
                   size="small" :disabled="disabled" />
                 <ws-input type="number" @mousewheel.native.prevent v-else v-model="weighingList.grossWeight"
                   @input="calculation" placeholder="未获取到毛重" maxlength="100" size="small" disabled />
@@ -104,6 +103,14 @@
                   <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.netWeight"
                     placeholder="请输入净重" maxlength="100" size="small" disabled />
                 </ws-form-item>
+                <ws-form-item label="应收卸车过磅费（元）" span="1" prop="receivableWeighingFee" v-if="index==1">
+                  <ws-input type="number"  v-model="weighingList.receivableWeighingFee"
+                    placeholder="未获取到卸车过磅费金额" maxlength="100" size="small" disabled />
+                </ws-form-item>
+                <ws-form-item label="实收卸车过磅费（元）" span="1" prop="actualWeighingFee" v-if="index==1">
+                  <ws-input type="number"  v-model="weighingList.actualWeighingFee"
+                    placeholder="输入卸车过磅费" maxlength="100" size="small"/>
+                </ws-form-item>
               </div>
             </ws-info-table>
             <div class="but">
@@ -113,10 +120,12 @@
             </div>
           </div>
           <div class="car-right">
-            <el-button @click="cutstatus(1)"  :type="status==1?'primary':''">已称重</el-button>
-              <el-button @click="cutstatus(2)" :type="status==2?'primary':''">未称重</el-button>
+             <div class="tab-item" :class="status==1?'active':''" @click="cutstatus(1)"> 已称重</div>
+              <div class="tab-item" :class="status==2?'active':''" @click="cutstatus(2)">未称重</div>
+            <!-- <el-button   :type="status==1?'primary':''">已称重</el-button>
+              <el-button @click="cutstatus(2)" :type="status==2?'primary':''">未称重</el-button> -->
             <el-table ref="singleTable" :data="carList" highlight-current-row @current-change="handleCurrentChange"
-              style="width: 100%;overflow:auto;height:680px">
+              style="width: 100%;overflow:auto;height:640px">
               <el-table-column property="number" label="编号">
               </el-table-column>
               <el-table-column property="carNumber" label="车牌号">
@@ -221,7 +230,8 @@
           grossWeight: 0,
           tare: 0,
           buckleMiscellaneous: 0,
-          netWeight: 0
+          netWeight: 0,
+          receivableWeighingFee:'',
         },
         tpyeNo: 1,
         disabled: true,
@@ -264,6 +274,7 @@
       this.weighingList.carNumber = this.$route.query.carNumber
       this.weighingList.goodsName = this.$route.query.goodsName
       this.weighingList.id = this.$route.query.id
+      this.weighingList.carModel=this.$route.query.carModel
       // this.relationId = this.$route.query.relationId
       this.monitorUrl1 = this.$route.query.monitorUrl1
       this.monitorUrl2 = this.$route.query.monitorUrl2
@@ -273,6 +284,7 @@
       } else {
         this.weighingList.grossWeight = this.$route.query.grossWeight
       }
+     
       // this.purchasePriceList = this.$route.query.purchasePriceList
       // console.log(this.purchasePriceList, '上限')
       this.allowEdit = this.$route.query.allowEdit
@@ -290,7 +302,7 @@
       if(this.$route.query.automaticWeightAcquisition == '1'){
         this.openPort()
       }
-
+      console.log(this.weighingList)
     },
     deactivated() {
       // this.closePort()
@@ -453,6 +465,124 @@
 
             this.deptBudgetTotal = this.pList.length
           }
+          this.weighingList.carModel=this.weighingList.qualityInspectionManagement.carModel
+           if(this.weighingList.carModel=='单拖小柜'){
+        this.weighingList.receivableWeighingFee=80
+        this.weighingList.actualWeighingFee=80
+      }else if(this.weighingList.carModel=='双拖小柜'){
+        this.weighingList.receivableWeighingFee=160
+        this.weighingList.actualWeighingFee=160
+      }else if(this.weighingList.carModel=='大柜'){
+        if((this.weighingList.grossWeight/1000)<50){
+  this.$set(this.weighingList,'receivableWeighingFee',120)
+          this.weighingList.actualWeighingFee=120
+          this.$forceUpdate()
+        }else if((this.weighingList.grossWeight/1000)>50||(this.weighingList.grossWeight/1000)<65){
+          this.weighingList.receivableWeighingFee=150
+          this.weighingList.actualWeighingFee=150
+        }else if((this.weighingList.grossWeight/1000)>65||(this.weighingList.grossWeight/1000)<75){
+          this.weighingList.receivableWeighingFee=170
+          this.weighingList.actualWeighingFee=170
+        }else if((this.weighingList.grossWeight/1000)>75||(this.weighingList.grossWeight/1000)<80){
+          this.weighingList.receivableWeighingFee=190
+          this.weighingList.actualWeighingFee=190
+        }else if((this.weighingList.grossWeight/1000)>80||(this.weighingList.grossWeight/1000)<85){
+          this.weighingList.receivableWeighingFee=210
+          this.weighingList.actualWeighingFee=210
+        }else if((this.weighingList.grossWeight/1000)>85||(this.weighingList.grossWeight/1000)<95){
+          this.weighingList.receivableWeighingFee=240
+          this.weighingList.actualWeighingFee=240
+        }else if((this.weighingList.grossWeight/1000)>95||(this.weighingList.grossWeight/1000)<105){
+          this.weighingList.receivableWeighingFee=260
+          this.weighingList.actualWeighingFee=260
+        }else if((this.weighingList.grossWeight/1000)>105||(this.weighingList.grossWeight/1000)<150){
+          this.weighingList.receivableWeighingFee=300
+          this.weighingList.actualWeighingFee=300
+        }
+      }else if(this.weighingList.carModel=='挂车'){
+        if((this.weighingList.grossWeight/1000)<50){
+          this.weighingList.receivableWeighingFee=180
+          this.weighingList.actualWeighingFee=180
+        }else if((this.weighingList.grossWeight/1000)>50||(this.weighingList.grossWeight/1000)<65){
+          this.weighingList.receivableWeighingFee=200
+          this.weighingList.actualWeighingFee=200
+        }else if((this.weighingList.grossWeight/1000)>65||(this.weighingList.grossWeight/1000)<75){
+          this.weighingList.receivableWeighingFee=250
+          this.weighingList.actualWeighingFee=250
+        }else if((this.weighingList.grossWeight/1000)>75||(this.weighingList.grossWeight/1000)<85){
+          this.weighingList.receivableWeighingFee=350
+          this.weighingList.actualWeighingFee=350
+        }else if((this.weighingList.grossWeight/1000)>85||(this.weighingList.grossWeight/1000)<95){
+          this.weighingList.receivableWeighingFee=400
+          this.weighingList.actualWeighingFee=400
+        }else if((this.weighingList.grossWeight/1000)>95||(this.weighingList.grossWeight/1000)<105){
+          this.weighingList.receivableWeighingFee=450
+          this.weighingList.actualWeighingFee=450
+        }else if((this.weighingList.grossWeight/1000)>105||(this.weighingList.grossWeight/1000)<120){
+          this.weighingList.receivableWeighingFee=500
+          this.weighingList.actualWeighingFee=500
+        }else if((this.weighingList.grossWeight/1000)>120||(this.weighingList.grossWeight/1000)<130){
+          this.weighingList.receivableWeighingFee=550
+          this.weighingList.actualWeighingFee=550
+        }else if((this.weighingList.grossWeight/1000)>130||(this.weighingList.grossWeight/1000)<150){
+          this.weighingList.receivableWeighingFee=700
+          this.weighingList.actualWeighingFee=700
+        }
+      }else if(this.weighingList.carModel=='冷藏箱（不抠箱）'){
+        if((this.weighingList.grossWeight/1000)<50){
+          this.weighingList.receivableWeighingFee=120
+          this.weighingList.actualWeighingFee=120
+        }else if((this.weighingList.grossWeight/1000)>50||(this.weighingList.grossWeight/1000)<65){
+          this.weighingList.receivableWeighingFee=150
+          this.weighingList.actualWeighingFee=150
+        }else if((this.weighingList.grossWeight/1000)>65||(this.weighingList.grossWeight/1000)<75){
+          this.weighingList.receivableWeighingFee=170
+          this.weighingList.actualWeighingFee=170
+        }else if((this.weighingList.grossWeight/1000)>75||(this.weighingList.grossWeight/1000)<80){
+          this.weighingList.receivableWeighingFee=190
+          this.weighingList.actualWeighingFee=190
+        }else if((this.weighingList.grossWeight/1000)>80||(this.weighingList.grossWeight/1000)<85){
+          this.weighingList.receivableWeighingFee=210
+          this.weighingList.actualWeighingFee=210
+        }else if((this.weighingList.grossWeight/1000)>85||(this.weighingList.grossWeight/1000)<95){
+          this.weighingList.receivableWeighingFee=240
+          this.weighingList.actualWeighingFee=240
+        }else if((this.weighingList.grossWeight/1000)>95||(this.weighingList.grossWeight/1000)<105){
+          this.weighingList.receivableWeighingFee=260
+          this.weighingList.actualWeighingFee=260
+        }else if((this.weighingList.grossWeight/1000)>105||(this.weighingList.grossWeight/1000)<120){
+          this.weighingList.receivableWeighingFee=300
+          this.weighingList.actualWeighingFee=300
+        }
+      }else if(this.weighingList.carModel=='冷藏箱（抠箱）'){
+        if((this.weighingList.grossWeight/1000)<50){
+          this.weighingList.receivableWeighingFee=360
+          this.weighingList.actualWeighingFee=360
+        }else if((this.weighingList.grossWeight/1000)>50||(this.weighingList.grossWeight/1000)<65){
+          this.weighingList.receivableWeighingFee=390
+          this.weighingList.actualWeighingFee=390
+        }else if((this.weighingList.grossWeight/1000)>65||(this.weighingList.grossWeight/1000)<75){
+          this.weighingList.receivableWeighingFee=410
+          this.weighingList.actualWeighingFee=410
+        }else if((this.weighingList.grossWeight/1000)>75||(this.weighingList.grossWeight/1000)<80){
+          this.weighingList.receivableWeighingFee=430
+          this.weighingList.actualWeighingFee=430
+        }else if((this.weighingList.grossWeight/1000)>80||(this.weighingList.grossWeight/1000)<85){
+          this.weighingList.receivableWeighingFee=450
+          this.weighingList.actualWeighingFee=450
+        }else if((this.weighingList.grossWeight/1000)>85||(this.weighingList.grossWeight/1000)<95){
+          this.weighingList.receivableWeighingFee=480
+          this.weighingList.actualWeighingFee=480
+        }else if((this.weighingList.grossWeight/1000)>95||(this.weighingList.grossWeight/1000)<105){
+          this.weighingList.receivableWeighingFee=500
+          this.weighingList.actualWeighingFee=500
+        }else if((this.weighingList.grossWeight/1000)>105||(this.weighingList.grossWeight/1000)<120){
+          this.weighingList.receivableWeighingFee=540
+          this.weighingList.actualWeighingFee=540
+        }
+      }else {
+        this.weighingList.receivableWeighingFee=''
+      }
         }
       },
       tabClick(val) {
@@ -632,7 +762,7 @@
           path: 'weighingManagement'
         })
       },
-      calculation() {
+      calculation(status) {
         // if (this.weighingList.grossWeight && this.weighingList.tare) {
         //   this.weighingList.netWeight = this.weighingList.grossWeight - this.weighingList.tare - parseInt(this.weighingList.buckleMiscellaneous)
         //   this.weighingList.netWeight = this.weighingList.netWeight.toFixed(2)
@@ -884,7 +1014,7 @@
 
   .ws-info-table {
     border: none;
-    height: 610px;
+    // height: 610px;
   }
 
   .ws-info-table .el-form-item {
@@ -1112,13 +1242,15 @@
       }
     }
 
-    .left,
+    .left{
+      width: 40%;
+    }
     .right {
-      width: 50%;
+      width: 60%;
     }
   }
 
   .car-right {
-    width: 50%;
+    width: 60%;
   }
 </style>