From 692f2b35f05880f42c05e609b5802789bcd23fd5 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 6 Jun 2024 14:57:33 +0800
Subject: [PATCH] md

---
 src/assets/styles/custom.scss                 |  2 +-
 .../DatePickerAdv/elDateAdvPicker.vue         | 41 +++++----
 src/utils/custom.js                           |  1 +
 .../EmisBaseTools/EmisSiteSimplePicker.vue    | 10 ++-
 .../emis/emisWaybill/dispatchWaybillList.vue  | 89 +++++++------------
 .../emis/emisWaybill/sendWaybillList.vue      | 67 +++++++-------
 6 files changed, 96 insertions(+), 114 deletions(-)

diff --git a/src/assets/styles/custom.scss b/src/assets/styles/custom.scss
index 1d487303..1742456a 100644
--- a/src/assets/styles/custom.scss
+++ b/src/assets/styles/custom.scss
@@ -318,7 +318,7 @@
 
 
 
-.el-textarea__inner, .el-input__inner {
+.el-textarea__inner, .el-input__inner,.el-range-input {
   // $placeholder: #636363;
   // $placeholder: #e6e6e6;
   color: #000000!important;
diff --git a/src/components/DatePickerAdv/elDateAdvPicker.vue b/src/components/DatePickerAdv/elDateAdvPicker.vue
index bd44da91..18693ae8 100644
--- a/src/components/DatePickerAdv/elDateAdvPicker.vue
+++ b/src/components/DatePickerAdv/elDateAdvPicker.vue
@@ -1,8 +1,7 @@
 <template>
   <div class="date-box">
-    <!-- range-separator="-" -->
     <el-date-picker
-         v-show="true"
+        :default-time="['00:00:00', '23:59:59']"
         v-model="datetimeRange"
         type="datetimerange"
         start-placeholder="开始日期"
@@ -18,23 +17,22 @@
 </template>
 <script>
 import {dateToStr} from '@/utils/custom'
-
 export default {
   name: "elDateAdvPicker",
-  model: {
-      prop: 'value',
-      event: 'dateTimeChange'
-  },
   props: {
       value: {
-        type: [String,Array],
+        type: [Array],
         required: false
       },
+      isDefaultCurrentDay:{
+        type: [Boolean],
+        default: false
+      }
   },
 	data() {
 		return {
       selectType: '1', // 时间选择器当前选择
-      datetimeRange: [],
+      datetimeRange: null,
       pickerOptions: {
         shortcuts: [
            {
@@ -166,20 +164,31 @@ export default {
   watch: {
       value(newVal) {
         this.datetimeRange = newVal;
-        console.log(this.datetimeRange)
       },
-
+  },
+  created() {
+    if(this.isDefaultCurrentDay){
+      const end = new Date()
+      const start = new Date()
+      start.setHours(0,0,0,0)
+      end.setHours(23,59,59,0)
+      this.datetimeRange=[start, end]
+      this.formatThisDate();
+      this.$emit("input", this.datetimeRange);
+    }
   },
 	methods: {
 		dateTimeChange(value) {
-      // if(this.datetimeRange&&this.datetimeRange.length==2){
-      //   this.datetimeRange[0]=dateToStr(this.datetimeRange[0]);
-      //   this.datetimeRange[1]=dateToStr(this.datetimeRange[1]);
-      // }
-      // this.datetimeRange
+      this.formatThisDate();
       this.$emit("input", this.datetimeRange);
       this.$emit('dateTimeChange', this.datetimeRange)
 		},
+    formatThisDate(){
+      if(this.datetimeRange&&this.datetimeRange.length==2){
+        this.datetimeRange[0]=dateToStr(this.datetimeRange[0]);
+        this.datetimeRange[1]=dateToStr(this.datetimeRange[1]);
+      }
+    }
 	}
 }
 </script>
diff --git a/src/utils/custom.js b/src/utils/custom.js
index 775b8ea1..bab7fa7f 100644
--- a/src/utils/custom.js
+++ b/src/utils/custom.js
@@ -65,6 +65,7 @@ export function addDateRange(params, dateRange, propName) {
     search.params['beginTime'] = dateRange[0];
     search.params['endTime'] = dateRange[1];
   } else {
+    propName = propName.replace(propName[0],propName[0].toUpperCase());
     search.params['begin' + propName] = dateRange[0];
     search.params['end' + propName] = dateRange[1];
   }
diff --git a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
index d61e79be..438937f4 100644
--- a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
@@ -107,10 +107,12 @@
     watch: {
       value(newVal,oldVal) {
         // 逻辑 有初始值先查询初值
-        if(this.value!=null){
-          this.svalue=this.value;
-          this.queryData(null,this.svalue);
-        }
+        // if(this.value!=null){
+        //   this.svalue=this.value;
+        //   this.queryData(null,this.svalue);
+        // }
+        this.svalue=this.value;
+        this.queryData(null,this.svalue);
       },
       siteType(newVal, oldVal) {
         if(newVal!=oldVal){
diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue
index 92a23106..c7485e29 100644
--- a/src/views/emis/emisWaybill/dispatchWaybillList.vue
+++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue
@@ -1,9 +1,9 @@
 <template>
   <XdPageContainer class="app-container">
-    <SearchForm  slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm"   size="mini" :maxShow="10" label-width="100px"   v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm  slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm"   size="mini" :maxShow="9" label-width="100px"   v-show="showSearch" @search="handleQuery" @reset="resetQuery">
       <!-- label-width="100px" -->
       <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-        <el-col :span="6">
+        <el-col :span="9">
           <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
             <el-col :span="24">
                 <el-form-item label="" prop="billCode">
@@ -19,23 +19,33 @@
                     clearable
                     :rows="4"
                   />
-                        <!-- @keyup.enter.native="handleQuery" -->
                 </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="查询时间范围" prop="dateTimeRange">
+                  <div slot="label">
+                        <el-radio-group  class="query-label" v-model="queryOrderDateType">
+                              <el-radio :key="1" label="1">发货时间</el-radio>
+                        </el-radio-group>
+                  </div>
+                  <elDateAdvPicker clearable v-model="dateTimeRange" :isDefaultCurrentDay="false" ></elDateAdvPicker>
+              </el-form-item>
+              <el-form-item label="" prop="queryExpireNotSign">
+                <el-checkbox style="font-size:400;margin-right:10px;" v-model="queryParams.params.expireNotSign" :true-label="'1'" :false-label="'0'">超时未签收</el-checkbox>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-col>
 
-        <el-col :span="6">
+        <el-col :span="5">
               <el-form-item label="派件网点" prop="dispatchSiteCode">
                 <EmisSiteSimplePicker2  v-model="queryParams.dispatchSiteCode"  ></EmisSiteSimplePicker2>
               </el-form-item>
               <el-form-item :label="$t('派件员')" prop="dispatchManCode">
                 <EmisUserSimplePicker2  :placeholder="$t('派件员')" v-model="queryParams.dispatchManCode"></EmisUserSimplePicker2>
               </el-form-item>
-
-
             </el-col>
-            <el-col :span="6">
+            <el-col :span="5">
               <el-form-item label="月结客户" prop="custNo">
                 <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
               </el-form-item>
@@ -51,37 +61,14 @@
             </el-form-item>
 
             </el-col>
-            <el-col :span="6">
+            <el-col :span="5">
                   <el-form-item label="线路" prop="transLineType">
                     <TransLinePicker v-model="queryParams.transLineType"  isInitiated="true"  @onChange="handleQuery"></TransLinePicker>
                   </el-form-item>
                   <el-form-item label="产品类型" prop="productType">
                     <TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" @onChange="handleQuery"></TransProductPicker>
                   </el-form-item>
-
-
             </el-col>
-
-
-      </el-row>
-
-      <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-        <el-col :span="10">
-              <el-form-item label="查询时间范围" prop="dateTimeRange">
-                  <div slot="label">
-
-                          <el-radio-group  class="query-label" v-model="queryOrderDateType">
-                              <el-radio :key="1" label="1">发货时间</el-radio>
-                        </el-radio-group>
-
-                  </div>
-                  <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
-              </el-form-item>
-              <el-form-item label="" prop="queryExpireNotSign">
-                <el-checkbox style="font-size:400;margin-right:10px;" v-model="queryParams.params.expireNotSign" :true-label="'1'" :false-label="'0'">超时未签收</el-checkbox>
-              </el-form-item>
-        </el-col>
-
       </el-row>
 
       <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
@@ -633,7 +620,7 @@ export default {
       // 显示搜索条件
       showSearch: true,
       // 创建时间搜索
-      dateTimeRange:[],
+      dateTimeRange:null,
       // 总条数
       total: 0,
       // 运单列表表格数据
@@ -831,25 +818,15 @@ export default {
     };
   },
   created() {
-    const end = new Date()
-    const start = new Date()
-    start.setHours(0,0,0,0)
-    end.setHours(23,59,59,0)
-    this.dateTimeRange=[start,end];
-
     this.queryParams.dispatchSiteCode=this.$store.getters.ownerSiteCode;
-
-    this.getList();
     this.queryOrderType="1";
     this.queryOrderDateType="1";
-    // this.queryExpireNotSign="1"
+        // this.queryExpireNotSign="1"
+
+    this.getList();
+
+
 
-    // 调整表格的高度，不允许滚动
-    this.$nextTick(function() {
-      let queryFormEl = this.$refs.queryForm.$el;
-      let tableH = queryFormEl.offsetHeight+190;
-      this.tableHeight = window.innerHeight - tableH;
-    });
   },
   mounted() {
 
@@ -872,8 +849,6 @@ export default {
       this.loading = true;
       this.queryParams.params = {};
 
-    //   this.queryOrderType="1";
-    // this.queryOrderDateType="1";
       if(this.queryParams.billCode){
         if(this.queryOrderType != "1"){
             this.queryParams.orderSn=this.queryParams.billCode+"";
@@ -895,18 +870,10 @@ export default {
         }
       }
       if(this.dateTimeRange&&this.dateTimeRange.length==2){
-
-        let startDate = new Date(this.dateTimeRange[0]);
-        let endDate= new Date(this.dateTimeRange[1]);
-        startDate=dateToStr(startDate);
-        endDate=dateToStr(endDate)
-
         if(this.queryOrderDateType != "1"){
-          this.queryParams.params["beginCreateTime"] = startDate;
-          this.queryParams.params["endCreateTime"] =  endDate;
+          this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"createTime");
         }else{
-          this.queryParams.params["beginSendDate"] = startDate;
-          this.queryParams.params["endSendDate"] = endDate;
+          this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate");
         }
       }
 
@@ -1073,4 +1040,8 @@ export default {
     color: #f51f1f !important;
   }
 
+  :deep .el-form-item__label {
+    text-align: left;
+  }
+
 </style>
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 807a953b..d146bc34 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -5,7 +5,7 @@
 
       <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
         <!-- :span="6" -->
-        <el-col  :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
+        <el-col :span="9">
           <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
             <el-col :span="24">
                 <el-form-item label="" prop="billCode">
@@ -24,10 +24,23 @@
                         <!-- @keyup.enter.native="handleQuery" -->
                 </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="查询时间范围" prop="dateTimeRange">
+                  <div slot="label">
+                        <el-radio-group  class="query-label" v-model="queryOrderDateType">
+                              <el-radio :key="1" label="1">发货时间</el-radio>
+                        </el-radio-group>
+                  </div>
+                  <elDateAdvPicker clearable v-model="dateTimeRange" :isDefaultCurrentDay="false" ></elDateAdvPicker>
+              </el-form-item>
+              <el-form-item label="" prop="queryExpireNotSign">
+                <el-checkbox style="font-size:400;margin-right:10px;" v-model="queryParams.params.expireNotSign" :true-label="'1'" :false-label="'0'">超时未签收</el-checkbox>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-col>
 
-        <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
+        <el-col :span="5">
           <el-form-item label="寄件网点" prop="productType">
             <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode"  ></EmisSiteSimplePicker1>
           </el-form-item>
@@ -35,7 +48,7 @@
             <EmisSiteSimplePicker2  v-model="queryParams.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
             <el-form-item label="月结客户" prop="custNo">
               <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
             </el-form-item>
@@ -51,16 +64,14 @@
             </el-form-item>
         </el-col>
 
-            <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
-                  <el-form-item label="线路" prop="transLineType">
-                    <TransLinePicker v-model="queryParams.transLineType"  isInitiated="true"  @onChange="handleQuery"></TransLinePicker>
-                  </el-form-item>
-                  <el-form-item label="产品类型" prop="productType">
-                    <TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" @onChange="handleQuery"></TransProductPicker>
-                  </el-form-item>
-
-
-            </el-col>
+        <el-col :span="5">
+            <el-form-item label="线路" prop="transLineType">
+              <TransLinePicker v-model="queryParams.transLineType"  isInitiated="true"  @onChange="handleQuery"></TransLinePicker>
+            </el-form-item>
+            <el-form-item label="产品类型" prop="productType">
+              <TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" @onChange="handleQuery"></TransProductPicker>
+            </el-form-item>
+        </el-col>
       </el-row>
 
       <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
@@ -318,7 +329,7 @@
            @queryTable="getList"
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
-       
+
            >
 
       <div slot="toolbar">
@@ -830,14 +841,7 @@ export default {
     };
   },
   created() {
-    const end = new Date()
-    const start = new Date()
-    start.setHours(0,0,0,0)
-    end.setHours(23,59,59,0)
-    this.dateTimeRange=[start,end];
     this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
-
-    
     this.queryOrderType="1";
     this.queryOrderDateType="1";
     // this.queryExpireNotSign="1"
@@ -845,17 +849,17 @@ export default {
     this.getList();
   },
   mounted() {
-  
+
   },
   methods: {
       //标红table指定行
     tableRowClassName({row, rowIndex}) {
       if (row.blIsQuestion=='1') {
         return 'warning-row';
-      } 
+      }
       else if (row.waybillStatus=='50') {
         return 'success-row';
-      } 
+      }
 
       return '';
     },
@@ -889,18 +893,10 @@ export default {
         }
       }
       if(this.dateTimeRange&&this.dateTimeRange.length==2){
-
-        let startDate = new Date(this.dateTimeRange[0]);
-        let endDate= new Date(this.dateTimeRange[1]);
-        startDate=dateToStr(startDate);
-        endDate=dateToStr(endDate)
-
         if(this.queryOrderDateType != "1"){
-          queryParams.params["beginCreateTime"] = startDate;
-          queryParams.params["endCreateTime"] =  endDate;
+          this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"createTime");
         }else{
-          queryParams.params["beginSendDate"] = startDate;
-          queryParams.params["endSendDate"] = endDate;
+          this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"sendDate");
         }
       }
 
@@ -1068,4 +1064,7 @@ export default {
     color: #f51f1f !important;
   }
 
+  :deep .el-form-item__label {
+    text-align: left;
+  }
 </style>