Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/views/fleet/fleetStatistics/index.vue

@@ -8,6 +8,25 @@
     >
       <el-row>
         <el-col :span="6">
+          <el-form-item label-width="100px" label="结算单位" prop="tCorpId">
+            <el-select
+              v-model="queryParams.tCorpId"
+              placeholder="请选择结算单位"
+              clearable
+              size="small"
+              filterable
+              @keyup.enter.native="handleQuery"
+            >
+              <el-option
+                v-for="(dict, index) in corpsOptions"
+                :key="index.fId"
+                :label="dict.fCname"
+                :value="dict.fId"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label-width="100px" label="结算状态" prop="mblno">
             <el-select
               v-model="queryParams.stlStatus"
@@ -63,28 +82,29 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label-width="100px" label="接单时间">
-            <el-date-picker type="date" placeholder="选择日期">
+            <el-date-picker
+              style="width: 80%"
+              v-model="queryParams.acceptDateList"
+              type="daterange"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              :default-time="['00:00:00', '23:59:59']"
+              >      
             </el-date-picker>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="6">
-          <el-form-item label-width="100px" label="结算中心">
-            <el-select placeholder="请选择">
-              <!-- <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option> -->
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="6">
           <el-form-item label="对账时间">
-            <el-date-picker type="date" placeholder="选择日期">
+            <el-date-picker
+              style="width: 80%"
+              v-model="queryParams.accchkDateList"
+              type="daterange"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              :default-time="['00:00:00', '23:59:59']"
+            >
             </el-date-picker>
           </el-form-item>
         </el-col>
@@ -225,11 +245,12 @@
 </template>
 
 <script>
-import { addSet, select, resetModule } from "@/api/system/set";
+  import Cookies from "js-cookie";
+  import draggable from "vuedraggable";
+  import { listCorps } from "@/api/basicdata/corps";
+  import AddOrUpdate from "../scheduling/AddOrUpdate";
+  import { addSet, select, resetModule } from "@/api/system/set";
 import { queryLedgerList, ledgerListExport } from "@/api/fleet/fleetStatistics";
-import Cookies from "js-cookie";
-import draggable from "vuedraggable";
-import AddOrUpdate from "../scheduling/AddOrUpdate";
 
 export default {
   name: "plans",
@@ -275,9 +296,12 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        tCorpId: null,
         stlStatus: null,
-        accchkStatus: null,
         invStatus: null,
+        accchkStatus: null,
+        accchkDateList: null,
+        acceptDateList: null,
       },
       tableDate: [
         {
@@ -585,6 +609,7 @@ export default {
       setRowList: [],
       getRowList: [],
       tabularData: [],
+      corpsOptions: [],
       showSetting: false,
     };
   },
@@ -598,6 +623,9 @@ export default {
     this.getRowList = this.tableDate;
     this.getList();
     this.getRow();
+    listCorps().then((response) => {
+      this.corpsOptions = response.rows;
+    });
   },
   methods: {
     //列设置全选
@@ -677,6 +705,14 @@ export default {
     /** 查询订单主列表 */
     getList() {
       this.loading = true;
+      /*if (this.queryParams.acceptDateList) {
+        this.queryParams.acceptDateList[0] = this.queryParams.acceptDateList + ' 00:00:00'
+        this.queryParams.acceptDateList[1] = this.queryParams.acceptDateList + ' 23:59:59'
+      }
+      if (this.queryParams.accchkDateList) {
+        this.queryParams.accchkDateList[0] = this.queryParams.accchkDateList + ' 00:00:00'
+        this.queryParams.accchkDateList[1] = this.queryParams.accchkDateList + ' 23:59:59'
+      }*/
       queryLedgerList(this.queryParams).then((response) => {
         this.tabularData = response.rows;
         this.total = response.total;