From 7a5d3773a94396bb4734460d6af24a9d26151a98 Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Thu, 16 May 2024 17:18:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../signForModificationAndDeletion.vue        | 135 ++++++++++--------
 .../signatureRecordQuery.vue                  |   2 +-
 2 files changed, 78 insertions(+), 59 deletions(-)

diff --git a/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue b/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue
index c2f925d1..44092f9b 100644
--- a/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue
+++ b/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue
@@ -1,69 +1,88 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="8"  label-width="100px" v-show="showSearch" @search="getList" @reset="resetQuery">
-          <el-form-item label="" prop="billCode">
-            <div slot="label">
-              <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
-                <el-radio label="1">运单号</el-radio>
-                <el-radio label="0">订单号</el-radio>
-              </el-radio-group>
-            </div>
-            <el-input
-              v-model="queryParams.billCode"
-              :placeholder="$t('多个流水号逗号或换行隔开')"
-              clearable
-                        type="textarea"
-                        rows="2"
-            />
-          </el-form-item>
-        <!-- </el-col> -->
-        <!-- <el-col :span="16"> -->
-          <el-form-item label="签收时间" prop="dateTimeRange">
-            <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
-          </el-form-item>
-        <!-- </el-col> -->
-        <!-- <el-col :span="8"> -->
-          <el-form-item :label="$t('录入网点')" prop="recordSiteCode" label-width="100px">
-            <EmisSiteSimplePicker v-model="queryParams.recordSiteCode"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
-          </el-form-item>
-        <!-- </el-col> -->
-        <!-- <el-col :span="8"> -->
-          <el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode" label-width="100px">
-            <EmisUserSimplePicker v-model="queryParams.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect"  ></EmisUserSimplePicker>
-          </el-form-item>
-        <!-- </el-col> -->
-          <el-form-item :label="$t('删除备注')" prop="delRemark" label-width="100px">
-            <el-checkbox v-model="queryParams.delChecked">删除后清空备注</el-checkbox>
-            <!-- <span>{{$t('删除备注')}}</span>
-            <div slot="label">
+      <!-- <search-form  :model="queryParams" ref="queryForm"   size="small" :maxShow="8"  label-width="100px" v-show="showSearch" @search="getList" @reset="resetQuery"> -->
+      <el-form ref="queryForm" size="mini"  :model="queryParams" :rules="rules" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="" prop="billCode">
+              <div slot="label">
+                <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
+                  <el-radio label="1">运单号</el-radio>
+                  <el-radio label="0">订单号</el-radio>
+                </el-radio-group>
+              </div>
+              <el-input
+                v-model="queryParams.billCode"
+                :placeholder="$t('多个流水号逗号或换行隔开')"
+                clearable
+                          type="textarea"
+                          rows="2"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="签收时间" prop="dateTimeRange">
+              <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item :label="$t('录入网点')" prop="recordSiteCode" label-width="100px">
+              <EmisSiteSimplePicker v-model="queryParams.recordSiteCode"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode" label-width="100px">
+              <EmisUserSimplePicker v-model="queryParams.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect"  ></EmisUserSimplePicker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item :label="$t('删除备注')" prop="delRemark" label-width="100px">
               <el-checkbox v-model="queryParams.delChecked">删除后清空备注</el-checkbox>
-            </div> -->
-            <el-input
-              v-model="queryParams.delRemark"
-              :placeholder="$t('请输入删除备注')"
-              clearable
-              type="textarea"
-              rows="2"
-            />
-          </el-form-item>
-      </SearchForm>
+              <!-- <span>{{$t('删除备注')}}</span>
+              <div slot="label">
+                <el-checkbox v-model="queryParams.delChecked">删除后清空备注</el-checkbox>
+              </div> -->
+              <el-input
+                v-model="queryParams.delRemark"
+                :placeholder="$t('请输入删除备注')"
+                clearable
+                type="textarea"
+                rows="2"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <!-- </search-form> -->
     </el-row >
 
     <xd-table v-loading="loading"
-           border stripe
-           size="small"
-           :data="emisElectronicPagApplyList"
-           :showSearch.sync="showSearch"
-           :queryParams="queryParams"
-           :total="total"
-           @queryTable="getList"
-           @selection-change="handleSelectionChange"
-           @sort-change="handleSortChange"
-           v-if="tableHeight" :max-height="tableHeight + 'px'"
-           >
+      ref="multipleTable"
+      border stripe
+      size="small"
+      :data="tmsScanList"
+      :showSearch.sync="showSearch"
+      :queryParams="queryParams"
+      :total="total"
+      @queryTable="getList"
+      @selection-change="handleSelectionChange"
+      v-if="tableHeight" :max-height="tableHeight + 'px'"
+      >
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              size="mini"
+              @click="getList"
+            >查询</el-button>
+          </el-col>
           <el-col :span="1.5">
             <el-button
               type="danger"
@@ -80,7 +99,7 @@
               type="primary"
               plain
               size="mini"
-              @click="getList"
+              @click="handleExport"
             >导出</el-button>
           </el-col>
         </el-row>
diff --git a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
index 36ddfc03..1b185f9a 100644
--- a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
+++ b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
@@ -69,7 +69,7 @@
                   type="primary"
                   plain
                   size="mini"
-                  @click="getList"
+                  @click="handleExport"
                 >导出</el-button>
               </el-col>
           </el-row>