From f71b8d26fc970c5e10803506bf1ef2ddd4df0912 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 21 Feb 2025 16:47:35 +0800
Subject: [PATCH] md

---
 .../panel/BigBatchListPanel.vue               | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
index 134d2598..9d07a71f 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
@@ -1,6 +1,6 @@
 <template>
   <XdPageContainer>
-    <SearchForm  slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm"   size="mini" :maxShow="9" label-width="100px"   v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm  slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm"   size="mini" :maxShow="30" label-width="100px"   v-show="showSearch" @search="handleQuery" @reset="resetQuery">
       <el-row  :gutter="0" style="display: flex;flex-wrap: wrap;">
         <el-col :span="8">
           <el-form-item label="" prop="queryOrderType">
@@ -18,6 +18,16 @@
             />
           </el-form-item>
           <el-form-item label="创建时间" prop="dateTimeRange">
+            <div slot="label">
+              <el-radio-group class="query-label" v-model="querETDType">
+                <el-radio label="1">创建时间</el-radio>
+                <el-radio label="2">发出时间</el-radio>
+              </el-radio-group>
+              <!-- <el-select v-model="querETDType" placeholder="" filterable >
+                    <el-option :key="1" label="创建时间" value="1"/>
+                    <el-option :key="2" label="发出时间" value="2"/>
+              </el-select> -->
+            </div>
             <elDateAdvPicker clearable v-model="dateTimeRange" style="width:260px" ></elDateAdvPicker>
           </el-form-item>
         </el-col>
@@ -59,6 +69,9 @@
           <el-form-item label="供应商" prop="supplierCode">
             <EmisSupplierPicker :placeholder="$t('请选择')"  v-model="queryParams.supplierCode"  ></EmisSupplierPicker>
           </el-form-item>
+          <el-form-item label="操作员" prop="createBy">
+                <SysUserSimplePicker v-model="queryParams.createBy"  ></SysUserSimplePicker>
+           </el-form-item>
         </el-col>
       </el-row>
     </SearchForm>
@@ -143,7 +156,6 @@
                   style="margin-right: 5px;"
                   type="warning"
                   plain
-                   :disabled="multiple"
                   icon="el-icon-download"
                   size="mini"
                   @click="handleExport"
@@ -239,6 +251,8 @@ import { listEmisTmsSiteBatchDtl} from "@/api/emis/emisTmsSiteBatchDtl";
 import PackListView from '@/views/emis/emisTmsSiteBatch/packListView';
 import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker';
 
+import SysUserSimplePicker from '@/views/emis/EmisBaseTools/SysUserSimplePicker.vue';
+
 import BatchImportSiteBatch from '@/views/emis/emisTmsSiteBatch/panel/BatchImportSiteBatch.vue';
 
 
@@ -247,7 +261,7 @@ export default {
   name: "CenterGenBatchMgnt",
   components: { EmisGetNextSitePicker, CountryPicker,
      EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker,
-     TransProductPicker, PackListView,
+     TransProductPicker, PackListView,SysUserSimplePicker,
      EmisSupplierPicker,BatchImportSiteBatch
     },
   dicts: [
@@ -322,6 +336,7 @@ export default {
       openForm: false,
       titleForm: "",
       queryOrderType:'1',
+      querETDType:'1',
 
       titleWayBill:null,
       openWayBillForm:false,
@@ -425,7 +440,11 @@ export default {
           rqParams.params.billCode=null;
         }
       }else{
-        rqParams=this.addDateRange(rqParams, this.dateTimeRange,"createTime");
+        if(this.queryETDType=='2'){
+          rqParams=this.addDateRange(rqParams, this.dateTimeRange,"etd");
+        }else{
+          rqParams=this.addDateRange(rqParams, this.dateTimeRange,"createTime");
+        }
       }
       listEmisTmsSiteBatch(rqParams).then(response => {
         this.emisTmsBatchList = response.rows;
@@ -435,7 +454,11 @@ export default {
     },
 
     initQueryParams(){
-      this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"createTime");
+      if(this.queryETDType=='2'){
+        this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"etd");
+      }else{
+          this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"createTime");
+      }
       return this.queryParams;
     },
 
@@ -501,7 +524,6 @@ export default {
       this.openForm = false;
     },
 
-
      /** 导出按钮操作 */
      handleExport() {
       const loadingInstance = this.$loading({