Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

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

@@ -432,6 +432,7 @@
         // 质检是否是已确定状态
         // let _isGoweightCheck = this.isConfirmQuality(row)
         let _isGoweightCheck = true
+        console.log(row.qualityInspectionManagement)
         if (_isGoweightCheck) {
           this.$router.push({
             path: 'weightCheck',
@@ -447,6 +448,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,
@@ -475,10 +477,15 @@
         this.getList()
       },
       datechange() {
+        if(this.value2){
         this.startDate = this.value2[0]
         this.endDate = this.value2[1]
+        }
+        else{
+          this.startDate = ''
+          this.endDate = ''
+        }
         this.getList()
-
       },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)

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)
@@ -888,7 +1018,7 @@
 
   .ws-info-table {
     border: none;
-    height: 610px;
+    // height: 610px;
   }
 
   .ws-info-table .el-form-item {
@@ -1116,13 +1246,15 @@
       }
     }
 
-    .left,
+    .left{
+      width: 40%;
+    }
     .right {
-      width: 50%;
+      width: 60%;
     }
   }
 
   .car-right {
-    width: 50%;
+    width: 60%;
   }
 </style>

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -3,7 +3,7 @@
   <div class="container">
     <el-scrollbar style="height: 100%">
       <el-row>
-        <el-col style="padding-left: 15px" :span="16">
+        <el-col style="padding-left: 15px; width:48%" :span="16">
           <ws-button
             :type="searchType == 1 ? 'primary' : ''"
             @click="handlestatus(1)"
@@ -55,6 +55,11 @@
             >定金</ws-button
           >
         </el-col>
+        <el-col style="text-align: right; line-height: 60px;  width:300px" :span="8">
+        <el-date-picker style="margin: 0 10px 0 0" value-format='yyyy-MM-dd' v-model="value2" @change='datechange'
+          type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="起始时间"
+          end-placeholder="截止时间">
+        </el-date-picker></el-col>
         <el-col
           style="text-align: right; line-height: 60px; padding-right: 10px"
           :span="8"
@@ -485,7 +490,9 @@ export default {
       year: '',
       option: [],
       pickerOptions: {},
-      value2: '',
+      value2: [],
+      startDate: '',
+      endDate: '',
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
@@ -867,6 +874,17 @@ export default {
         })
       }
     },
+     datechange() {
+        if(this.value2){
+        this.startDate = this.value2[0]
+        this.endDate = this.value2[1]
+        }
+        else{
+          this.startDate = ''
+          this.endDate = ''
+        }
+        this.getList()
+      },
     //审核
     handleAudit() {
       var that = this
@@ -982,7 +1000,7 @@ export default {
         } else if (
           index === 12 ||
           index === 11 ||
-          index === 10 ||
+          index === 13 ||
           index === 9
         ) {
           const values = data.map((item) => Number(item[column.property]))
@@ -1002,10 +1020,10 @@ export default {
           sums[index] = '--'
         }
       })
-      sums[sums.length-3]=sums[sums.length-3].toFixed(2)
-      sums[sums.length-4]=sums[sums.length-4].toFixed(2)
-			sums[sums.length-5]=sums[sums.length-5].toFixed(2)
-      sums[sums.length-6]=sums[sums.length-6].toFixed(2)
+      // sums[sums.length-3]=sums[sums.length-3].toFixed(2)
+      // sums[sums.length-4]=sums[sums.length-4].toFixed(2)
+			// sums[sums.length-5]=sums[sums.length-5].toFixed(2)
+      // sums[sums.length-6]=sums[sums.length-6].toFixed(2)
       return sums
     },
     getList() {
@@ -1025,6 +1043,8 @@ export default {
         compId: localStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
+        startDate: this.startDate,
+        endDate: this.endDate,
         searchType: this.searchType,
         contractNo: this.contractNo,
         // roleFlag: this.roleFlag,

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -3,7 +3,7 @@
   <div class="">
     <div style="height: 100%" class="content">
       <el-row class="content1">
-        <el-col style="padding-left: 15px" :span="16">
+        <el-col style="padding-left: 15px; width:40%" :span="16">
           <ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.carry`" @click="adopt()">备注
           </ws-button>
           <ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.draw`" @click="depositbutton()">定金
@@ -13,6 +13,11 @@
           <ws-button type="primary" @click="handleinvoice()">开发票
           </ws-button>
         </el-col>
+        <el-col style="text-align: right; line-height: 60px;  width:400px" :span="8">
+        <el-date-picker style="margin: 0 10px 0 0" value-format='yyyy-MM-dd' v-model="value2" @change='datechange'
+          type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="起始时间"
+          end-placeholder="截止时间">
+        </el-date-picker></el-col>
         <el-col style="text-align: right; line-height: 60px; padding-right: 10px" :span="8">
           <el-select v-model="contractNo" placeholder="请选择合同" clearable filterable @change="contractchange"
             maxlength="500" type="input" class="findValue">
@@ -451,6 +456,9 @@
           id: '',
           invoiceType: '',
         },
+        value2: [],
+        startDate: '',
+        endDate: '',
         orderList: {},
         options: [],
         contractNoList: [],
@@ -534,6 +542,18 @@
                 })
               })
       },
+      datechange() {
+        if(this.value2){
+        this.startDate = this.value2[0]
+        this.endDate = this.value2[1]
+        }
+        else{
+          this.startDate = ''
+          this.endDate = ''
+        }
+        this.getList()
+      },
+
       handleinvoice(){
         if(this.modification.length==0){
           this.$message({
@@ -607,7 +627,6 @@
       },
       handleRowClick() {},
       handleClick(tab, event) {
-        console.log(tab);
         this.activeName = tab.name
         if (this.activeName == '退库') {
           this.tranType = '退库'
@@ -642,9 +661,8 @@
                 })
               }
             }
-            console.log(this.orderList.tranTaskInfoList)
-            this.activeName = this.tranProcessInfo[0].name
-            this.tranType = this.tranProcessInfo[0].tranType
+            this.activeName = this.tranProcessInfo.name
+            this.tranType = this.tranProcessInfo.tranType
             if (this.contractNoList[i].depositUrl) {
               this.addressUrlArray = this.contractNoList[i].depositUrl.split(',')
             } else {
@@ -1094,6 +1112,8 @@
           currentPage: this.currentPage,
           pageSize: this.pageSize,
           searchType: this.searchType,
+          startDate: this.startDate,
+          endDate: this.endDate,
           contractNo: this.contractNo,
         }
         if (type == 1) {