From 2ba79631ce9ce3c7d7866af86ce3c5e394e26730 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 27 May 2024 08:13:48 +0800
Subject: [PATCH] md

---
 .../emis/emisWaybill/sendWaybillList.vue      | 236 ++++++++++--------
 1 file changed, 137 insertions(+), 99 deletions(-)

diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index f2ddb5a0..56e8c700 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -1,66 +1,61 @@
 <template>
   <XdPageContainer class="app-container">
-    <SearchForm  slot="pageHeader" :model="queryParams" ref="queryForm"   size="mini" :maxShow="8"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm  slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm"   size="mini" :maxShow="15"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
-      <el-form-item label="" prop="billCode">
-        <div slot="label">
-              <el-radio-group class="query-label" v-model="queryOrderType">
-                    <el-radio :key="1" label="1">运单号</el-radio>
-                    <el-radio :key="0" label="0">订单号</el-radio>
-                  </el-radio-group>
-              </div>
-              <XdTextareaInput
-                v-model="queryParams.billCode"
-                :placeholder="$t('多个流水号逗号或换行隔开')"
-                clearable
-                :rows="2"
-              />
-              <!-- @keyup.enter.native="handleQuery" -->
-            </el-form-item>
-            <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 :key="0" label="0">录单时间</el-radio>
-                        </el-radio-group>
-              </div>
-              <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
-            </el-form-item>
+      <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+        <el-col :span="8">
 
-            <el-form-item label="收件人" prop="receiveName">
-              <el-input
-                v-model="queryParams.receiveName"
-                :placeholder="$t('收件人')"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="收件电话" prop="receiveMobile">
-              <el-input
-                v-model="queryParams.receiveMobile"
-                :placeholder="$t('收件电话')"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="收件公司" prop="receiveCompany">
-              <el-input
-                v-model="queryParams.receiveCompany"
-                :placeholder="$t('收件公司')"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
+          <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+            <el-col :span="24">
+                <el-form-item label="" prop="billCode">
+                  <div slot="label">
+                      <el-radio-group class="query-label" v-model="queryOrderType">
+                        <el-radio :key="1" label="1">运单号</el-radio>
+                        <!-- <el-radio :key="0" label="0">订单号</el-radio> -->
+                      </el-radio-group>
+                  </div>
+                  <XdTextareaInput
+                    v-model="queryParams.billCode"
+                    :placeholder="$t('多个流水号逗号或换行隔开')"
+                    clearable
+                    :rows="10"
+                  />
+                        <!-- @keyup.enter.native="handleQuery" -->
+                </el-form-item>
+            </el-col>
+            <el-col :span="24">
 
 
-            <el-form-item label="寄件人" prop="sendName">
-              <el-input
-                v-model="queryParams.sendName"
-                :placeholder="$t('寄件人')"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
+            </el-col>
+          </el-row>
+        </el-col>
+
+        <el-col :span="16">
+          <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+            <el-col :span="12">
+              <el-form-item label="寄件网点" prop="productType">
+                <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode"  ></EmisSiteSimplePicker1>
+              </el-form-item>
+
+              <el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
+                <EmisSiteSimplePicker2  v-model="queryParams.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
+              </el-form-item>
+
+
+            <el-form-item label="月结客户" prop="custNo">
+              <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
             </el-form-item>
+
+            <el-form-item :label="$t('回款联系人')" prop="payee">
+            <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee"  ></PayeePicker>
+
+          </el-form-item>
+          <el-form-item :label="$t('销售联系人')" prop="salesmen">
+            <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></SalemanPicker>
+          </el-form-item>
+
+
+
             <el-form-item label="寄件人电话" prop="sendMobile">
               <el-input
                 v-model="queryParams.sendMobile"
@@ -78,6 +73,84 @@
               />
             </el-form-item>
 
+            </el-col>
+            <el-col :span="12">
+
+              <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-form-item label="派送方式" prop="dispatchMethod" >
+                <el-select clearable v-model="queryParams.dispatchMethod" placeholder="请选择">
+                    <el-option
+                      v-for="dict in dict.type.emis_tab_dispatch_mode"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+              </el-form-item>
+
+              <el-form-item label="寄件人" prop="sendName">
+                <el-input
+                  v-model="queryParams.sendName"
+                  :placeholder="$t('寄件人')"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+
+            <el-form-item label="收件人" prop="receiveName">
+              <el-input
+                v-model="queryParams.receiveName"
+                :placeholder="$t('收件人')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+
+            </el-col>
+
+          </el-row>
+
+        </el-col>
+      </el-row>
+
+      <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 :key="0" label="0">录单时间</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="queryExpireNotSign" :true-label="'1'" :false-label="'0'">超时未签收</el-checkbox>
+              </el-form-item>
+
+            <el-form-item label="收件电话" prop="receiveMobile">
+              <el-input
+                v-model="queryParams.receiveMobile"
+                :placeholder="$t('收件电话')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="收件公司" prop="receiveCompany">
+              <el-input
+                v-model="queryParams.receiveCompany"
+                :placeholder="$t('收件公司')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
 
             <el-form-item label="发件国" prop="sendCountry">
               <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('发件国')" @onChange="handleQuery"></CountryPicker1>
@@ -91,14 +164,6 @@
               <ProvincePicker2  v-model="queryParams.receiveProvince" :countryCode="queryParams.receiveCountry"  style="margin-left:5px"  ></ProvincePicker2>
             </el-form-item>
 
-
-            <el-form-item label="月结客户" prop="custNo">
-              <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
-            </el-form-item>
-
-
-
-
             <el-form-item label="运单状态" prop="siteType">
               <el-select v-model="queryParams.waybillStatus" placeholder="运单状态" clearable filterable>
                     <el-option
@@ -142,41 +207,6 @@
                 </el-select>
             </el-form-item>
 
-            <el-form-item label="派送方式" prop="dispatchMethod" >
-              <el-select clearable v-model="queryParams.dispatchMethod" placeholder="请选择">
-                  <el-option
-                    v-for="dict in dict.type.emis_tab_dispatch_mode"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  ></el-option>
-                </el-select>
-            </el-form-item>
-
-          <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-form-item label="寄件网点" prop="productType">
-            <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode"  ></EmisSiteSimplePicker1>
-          </el-form-item>
-
-          <el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
-            <EmisSiteSimplePicker2  v-model="queryParams.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
-          </el-form-item>
-
-
-          <el-form-item :label="$t('回款联系人')" prop="payee">
-            <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee"  ></PayeePicker>
-
-          </el-form-item>
-          <el-form-item :label="$t('销售联系人')" prop="salesmen">
-            <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></SalemanPicker>
-          </el-form-item>
-
           <el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
             <EmisUserSimplePicker0  :placeholder="$t('操作员')" v-model="queryParams.operateEmployeeCode"></EmisUserSimplePicker0>
           </el-form-item>
@@ -185,6 +215,7 @@
             <EmisUserSimplePicker1  :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode"></EmisUserSimplePicker1>
           </el-form-item>
 
+
           <el-form-item label="是否问题件" prop="blIsQuestion" >
               <el-select clearable v-model="queryParams.blIsQuestion" placeholder="请选择">
                   <el-option :key="1" label="'1'" value="'1'">是</el-option>
@@ -212,6 +243,7 @@
           slot="pageContent"
           slot-scope="slotProps"
           :height="(slotProps.contentHeight)+'px'"
+
            v-loading="loading"
            border stripe
            size="mini"
@@ -541,6 +573,7 @@ export default {
 
       queryOrderType:null,
       queryOrderDateType:null,
+      queryExpireNotSign:null,
 
       // 弹出展示层
       id:null,
@@ -732,6 +765,7 @@ export default {
     this.getList();
     this.queryOrderType="1";
     this.queryOrderDateType="1";
+    this.queryExpireNotSign="1"
 
     // 调整表格的高度，不允许滚动
     this.$nextTick(function() {
@@ -939,4 +973,8 @@ export default {
     }
   }
 
+  .queryForm .el-form-item {
+    margin-bottom: 0px !important;
+}
+
 </style>