前端

src/views/statisticalReport/autoSettlementList.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" :span="12">
           <ws-button :type="searchType == 1 ? 'primary' : ''" @click="handlestatus(1)">待审核</ws-button>
           <ws-button :type="searchType == 2 ? 'primary' : ''" @click="handlestatus(2)">待结算</ws-button>
           <ws-button :type="searchType == 3 ? 'primary' : ''" @click="handlestatus(3)">已结算</ws-button>
@@ -19,7 +19,7 @@
           <ws-button type="primary" @click="editRecord">记录</ws-button>
           <!-- v-hasPermission="`report.transportationReport.payment`" -->
         </el-col>
-        <el-col style="text-align: right; line-height: 60px; padding-right: 10px" :span="8">
+        <el-col style="text-align: right; line-height: 60px; padding-right: 10px" :span="12">
           <el-select v-model="contractNo" placeholder="请选择合同" clearable filterable @change="contractchange"
             maxlength="500" type="input" class="findValue">
             <el-option v-if="item.reportStatus" v-for="item in options" :key="item.constKey"
@@ -27,6 +27,18 @@
             <el-option v-if="!item.reportStatus" v-for="item in options" :key="item.constKey" :label="item.contractNo"
               :value="item.contractNo" />
           </el-select>
+          <el-select v-model="warehouseName" filterable placeholder="" @change="warehouseNameChange" >
+            <el-option key="全部仓库" label="全部仓库" value="" style="color: #8890b1" />
+            <el-option v-for="item in warehouseList1" :key="item.id" :label="item.warehouseName" :value="item.warehouseName" style="color: #8890b1" />
+          </el-select>
+          <!-- <el-input v-model="startAddress" placeholder="可按照发货地进行查找" clearable maxlength="500" type="input"
+          class="findValue" @keyup.enter.native="find()"></el-input>
+        <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -8px;
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button> -->
         </el-col>
       </el-row>
       <el-row>
@@ -38,9 +50,11 @@
         <el-table-column :selectable="selectInit" type="selection" width="55"></el-table-column>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
         <el-table-column class="table_td" prop="contractNo" width="120" label="合同编号"></el-table-column>
-        <el-table-column width="120" class="table_td" prop="processNo" label="运输阶段"></el-table-column>
+        <el-table-column class="table_td" prop="startAddress" width="120" label="发货库"></el-table-column>
+        <el-table-column class="table_td" prop="createDate" width="120" label="发货时间"></el-table-column>
+        <!-- <el-table-column width="120" class="table_td" prop="processNo" label="运输阶段"></el-table-column>
         <el-table-column width="60" class="table_td" prop="name" label="姓名"></el-table-column>
-        <el-table-column width="120" class="table_td" prop="phone" label="电话"></el-table-column>
+        <el-table-column width="120" class="table_td" prop="phone" label="电话"></el-table-column> -->
         <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"><template slot-scope="scope">
             {{ scope.row.carNo }}({{ scope.row.tranCarNo }})
           </template></el-table-column>
@@ -310,6 +324,9 @@ import {
   // postaudit,
   //   getselectctcontractno,
 } from '@/model/statisticalReport/index'
+  import {
+    selectWarehouseSelf,
+  } from '@/model/outboundManagement/index'
 import {
   workflowcontent
 } from '@/model/houseSelfCollect/index'
@@ -355,12 +372,13 @@ export default {
       dialogFormVisible11: false,
       dialogFormVisible16: false,
       dialogVisible: false,
-
       form: {
         transactionPrice: '',
         transactionsNumber: '',
         basis: '',
       },
+      warehouseList:[],
+      warehouseName:'',
       currect: true,
       formLabelWidth: '120px',
       formLabelWidth1: '140px',
@@ -391,6 +409,7 @@ export default {
       manualFlag: '',
       searchTypeText: '未完成',
       searchKeyWord: '',
+      startAddress:'',
       driverPayeeList: {
         radio: '1',
       },
@@ -425,6 +444,7 @@ export default {
       paymentScreenshot1: [],
       amendlist: {},
       roleFlag: 1,
+      warehouseList1:[],
       alreadyInvoice1: 0,
       money: '',
       paymentDate: '',
@@ -452,10 +472,21 @@ export default {
     }
   },
   activated() {
+    console.log(11111111)
+      selectWarehouseSelf({
+            compId: localStorage.getItem('ws-pf_compId'),
+          })
+          .toPromise()
+          .then((response) => {
+            this.warehouseList1=response
+          })
     this.getList()
     this.showType = this.isShow
   },
   methods: {
+    find(){
+      this.getList()
+    },
     cur(status) {
       if (status == 0) {
         this.currect = true
@@ -1040,6 +1071,7 @@ export default {
         tranTypeKey: 1,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
+        startAddress:this.warehouseName,
         searchType: this.searchType,
         contractNo: this.contractNo,
         manualFlag: this.manualFlag,
@@ -1405,7 +1437,7 @@ export default {
 .el-col-12 {
   width: 50%;
   height: 60px;
-  background: #f6f7fc;
+  // background: #f6f7fc;
   border-radius: 4px 4px 1px 1px;
 }
 
@@ -1491,4 +1523,20 @@ hr {
   text-align: center;
   height: 40px;
 }
+ /deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: -10px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    border: 1px solid #5473e8;
+    color: #5473e8;
+  }
 </style>

src/views/statisticalReport/huoyunList.vue

@@ -3,7 +3,7 @@
   <div class="container">
     <el-scrollbar style="height: 100%">
       <el-row>
-        <el-col style="padding-left: 15px" :span="10">
+        <el-col style="padding-left: 15px" :span="8">
           <ws-button :type="searchType == 1 ? 'primary' : ''" @click="handlestatus(1)">待审核</ws-button>
           <ws-button :type="searchType == 2 ? 'primary' : ''" @click="handlestatus(2)">待结算</ws-button>
           <ws-button :type="searchType == 3 ? 'primary' : ''" @click="handlestatus(3)">已结算</ws-button>
@@ -42,6 +42,14 @@
             <el-option v-for="item in processNoList" :key="item.processNoKey" :label="item.processNoValue "
               :value="item.processNoValue" />
           </el-select>
+          <!-- <el-input v-model="startAddress" placeholder="可按照发货地进行查找" clearable maxlength="500" type="input"
+          class="findValue" @keyup.enter.native="find()"></el-input>
+        <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -8px;
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button> -->
         </el-col>
       </el-row>
 
@@ -303,6 +311,7 @@
         manualFlag: '',
         searchTypeText: '未完成',
         searchKeyWord: '',
+        startAddress:'',
         driverPayeeList: {
           radio: '1',
         },
@@ -379,6 +388,9 @@
       this.showType = this.isShow
     },
     methods: {
+      find(){
+        this.getList()
+      },
       editactual() {
         if (this.priceStatus == '已驳回' || this.priceStatus == '待审核') {
           this.textShow = true
@@ -992,6 +1004,7 @@
             contractNo: this.contractNo,
             manualFlag: this.manualFlag,
             taskNo: this.taskNo,
+            startAddress:this.startAddress,
             processNo: this.processNo
           })
           .toPromise()
@@ -1477,4 +1490,30 @@
     width: 200px;
     height: 200px;
   }
+   /deep/.find.el-button--primary {
+    width: 30px;
+    margin-left: -10px;
+    border-top-left-radius: 0px;
+    margin-top:0;
+    border-bottom-left-radius: 0px;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    border: 1px solid #5473e8;
+    color: #5473e8;
+  }
+  .findValue {
+    margin: 0 10px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
 </style>

src/views/statisticalReport/shippingList.vue

@@ -3,7 +3,7 @@
   <div class="container">
     <el-scrollbar style="height: 100%">
       <el-row>
-        <el-col style="padding-left: 15px" :span="10">
+        <el-col style="padding-left: 15px" :span="6">
           <ws-button :type="searchType == 1 ? 'primary' : ''" @click="handlestatus(1)">待审核</ws-button>
           <ws-button :type="searchType == 2 ? 'primary' : ''" @click="handlestatus(2)">待结算</ws-button>
           <ws-button :type="searchType == 3 ? 'primary' : ''" @click="handlestatus(3)">已结算</ws-button>
@@ -21,7 +21,7 @@
             >开发票</ws-button
           > -->
         </el-col>
-        <el-col style="text-align: right; line-height: 60px; padding-right: 10px" :span="14">
+        <el-col style="text-align: right; line-height: 60px; padding-right: 10px" :span="18">
           <el-select v-model="contractNo" placeholder="请选择合同" clearable filterable @change="contractchange"
             maxlength="500" type="input" class="findValue">
             <el-option v-for="item in options" :key="item.constKey" :label="item.contractNo" :value="item.contractNo" />
@@ -36,6 +36,14 @@
             <el-option v-for="item in processNoList" :key="item.processNoKey" :label="item.processNoValue"
               :value="item.processNoValue" />
           </el-select>
+           <!-- <el-input v-model="startAddress" placeholder="可按照发货地进行查找" clearable maxlength="500" type="input"
+          class="findValue" @keyup.enter.native="find()"></el-input>
+        <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -8px;
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button> -->
         </el-col>
       </el-row>
       <div class="freightSet" v-if="processNo">
@@ -302,6 +310,7 @@
         manualFlag: '',
         searchTypeText: '未完成',
         searchKeyWord: '',
+        startAddress:'',
         driverPayeeList: {
           radio: '1',
         },
@@ -378,6 +387,9 @@
       this.showType = this.isShow
     },
     methods: {
+      find(){
+      this.getList()
+    },
       fujian() {
         if (this.paymentScreenshotList.length == 0) {
           EventBus.$emit(
@@ -1013,6 +1025,7 @@
             contractNo: this.contractNo,
             manualFlag: this.manualFlag,
             taskNo: this.taskNo,
+            startAddress:this.startAddress,
             processNo: this.processNo,
           })
           .toPromise()
@@ -1466,7 +1479,7 @@
   }
 
   .findValue {
-    width: 300px;
+    width: 290px;
     margin-left: 5px;
   }
 
@@ -1474,13 +1487,31 @@
     width: 44%;
   }
 
-  .findValue {
-    width: 300px;
-    margin-left: 5px;
-  }
-
   .img_css {
     width: 200px;
     height: 200px;
   }
+  /deep/.find.el-button--primary {
+    width: 30px;
+    margin-left: -10px;
+    border-top-left-radius: 0px;
+    margin-top:0;
+    border-bottom-left-radius: 0px;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    border: 1px solid #5473e8;
+    color: #5473e8;
+  }
+
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
 </style>