From 56b5f9021dba476854e9b2b7821accea5e6b7a92 Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Fri, 24 May 2024 14:49:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E2=80=9C=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=9D=83=E9=99=90=E2=80=9D=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=BD=95=E5=8D=95=E5=92=8C=E7=AD=BE=E6=94=B6=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E7=AE=A1=E7=90=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arrivalAndDispathScan.vue                 |   2 +-
 .../emis/emisTmsScanRecord/arrivalScan.vue    |   2 +-
 .../clearanceScanUnderDevelopment.vue         |   2 +-
 .../emisTmsScanRecord/coPackageScanning.vue   |   2 +-
 .../customsClearanceScanning.vue              |   2 +-
 .../emis/emisTmsScanRecord/deliveryScan.vue   |   2 +-
 .../emis/emisTmsScanRecord/loadingScan.vue    |   2 +-
 .../emis/emisTmsScanRecord/outgoingScan.vue   |   2 +-
 .../emisTmsScanRecord/positionScanning.vue    |   2 +-
 .../emis/emisTmsScanRecord/scanRecord.vue     |   2 +-
 .../emis/emisTmsScanRecord/signAndRecord.vue  |   2 +-
 .../transmitReceiveScanning.vue               |   2 +-
 .../emis/emisTmsScanRecord/unloadingScan.vue  |   2 +-
 .../emis/emisTmsScanRecord/unpackScan.vue     |   2 +-
 .../orderEntryAndReceiptPictureManagement.vue | 465 ++++++++++++++++++
 ...loadThePictureOfTheSendWaybillShipment.vue |   6 +-
 .../uploadThePictureOfTheWaybillSigning.vue   |   6 +-
 17 files changed, 485 insertions(+), 20 deletions(-)
 create mode 100644 src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue

diff --git a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
index 6f5f5adb..45e10c11 100644
--- a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
+++ b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
@@ -65,7 +65,7 @@
                   plain
                   size="mini"
                   @click="handleBatchScan"
-                  v-hasPermi="['emis:emisTmsScanRecord:add']"
+                  v-hasPermi="['emis:emisTmsScanRecord:batchScan']"
                 >批量扫描</el-button>
               </el-col>
           </el-row>
diff --git a/src/views/emis/emisTmsScanRecord/arrivalScan.vue b/src/views/emis/emisTmsScanRecord/arrivalScan.vue
index 245d8155..93ba8e91 100644
--- a/src/views/emis/emisTmsScanRecord/arrivalScan.vue
+++ b/src/views/emis/emisTmsScanRecord/arrivalScan.vue
@@ -53,7 +53,7 @@
                   plain
                   size="mini"
                   @click="handleBatchScan"
-                  v-hasPermi="['emis:emisTmsScanRecord:add']"
+                  v-hasPermi="['emis:emisTmsScanRecord:batchScan']"
                 >批量扫描</el-button>
               </el-col>
           </el-row>
diff --git a/src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue b/src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue
index f34b4f23..0d425468 100644
--- a/src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue
+++ b/src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue
@@ -58,7 +58,7 @@
                   plain
                   size="mini"
                   @click="handleBatchScan"
-                  v-hasPermi="['emis:emisTmsScanRecord:add']"
+                  v-hasPermi="['emis:emisTmsScanRecord:batchScan']"
                 >批量扫描</el-button>
               </el-col>
           </el-row>
diff --git a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue
index 6e600415..350639cd 100644
--- a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue
@@ -64,7 +64,7 @@
                   plain
                   size="mini"
                   @click="handleBatchScan"
-                  v-hasPermi="['emis:emisTmsScanRecord:add']"
+                  v-hasPermi="['emis:emisTmsScanRecord:batchScan']"
                 >批量扫描</el-button>
               </el-col>
           </el-row>
diff --git a/src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue b/src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue
index f302af9d..93d41d6e 100644
--- a/src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue
@@ -58,7 +58,7 @@
                   plain
                   size="mini"
                   @click="handleBatchScan"
-                  v-hasPermi="['emis:emisTmsScanRecord:add']"
+                  v-hasPermi="['emis:emisTmsScanRecord:batchScan']"
                 >批量扫描</el-button>
               </el-col>
           </el-row>
diff --git a/src/views/emis/emisTmsScanRecord/deliveryScan.vue b/src/views/emis/emisTmsScanRecord/deliveryScan.vue
index 4e2ffddb..7b64d958 100644
--- a/src/views/emis/emisTmsScanRecord/deliveryScan.vue
+++ b/src/views/emis/emisTmsScanRecord/deliveryScan.vue
@@ -58,7 +58,7 @@
                   plain
                   size="mini"
                   @click="handleBatchScan"
-                  v-hasPermi="['emis:emisTmsScanRecord:add']"
+                  v-hasPermi="['emis:emisTmsScanRecord:batchScan']"
                 >批量扫描</el-button>
               </el-col>
           </el-row>
diff --git a/src/views/emis/emisTmsScanRecord/loadingScan.vue b/src/views/emis/emisTmsScanRecord/loadingScan.vue
index 17666970..d2e53afa 100644
--- a/src/views/emis/emisTmsScanRecord/loadingScan.vue
+++ b/src/views/emis/emisTmsScanRecord/loadingScan.vue
@@ -64,7 +64,7 @@
                   plain
                   size="mini"
                   @click="handleBatchScan"
-                  v-hasPermi="['emis:emisTmsScanRecord:add']"
+                  v-hasPermi="['emis:emisTmsScanRecord:batchScan']"
                 >批量扫描</el-button>
               </el-col>
           </el-row>
diff --git a/src/views/emis/emisTmsScanRecord/outgoingScan.vue b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
index af6c846a..7df0a966 100644
--- a/src/views/emis/emisTmsScanRecord/outgoingScan.vue
+++ b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
@@ -58,7 +58,7 @@
                   plain
                   size="mini"
                   @click="handleBatchScan"
-                  v-hasPermi="['emis:emisTmsScanRecord:add']"
+                  v-hasPermi="['emis:emisTmsScanRecord:batchScan']"
                 >批量扫描</el-button>
               </el-col>
           </el-row>
diff --git a/src/views/emis/emisTmsScanRecord/positionScanning.vue b/src/views/emis/emisTmsScanRecord/positionScanning.vue
index c84e972b..2675240e 100644
--- a/src/views/emis/emisTmsScanRecord/positionScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/positionScanning.vue
@@ -69,7 +69,7 @@
                   plain
                   size="mini"
                   @click="handleBatchScan"
-                  v-hasPermi="['emis:emisTmsScanRecord:add']"
+                  v-hasPermi="['emis:emisTmsScanRecord:batchScan']"
                 >批量扫描</el-button>
               </el-col>
           </el-row>
diff --git a/src/views/emis/emisTmsScanRecord/scanRecord.vue b/src/views/emis/emisTmsScanRecord/scanRecord.vue
index e645a3ae..324db6c6 100644
--- a/src/views/emis/emisTmsScanRecord/scanRecord.vue
+++ b/src/views/emis/emisTmsScanRecord/scanRecord.vue
@@ -58,7 +58,7 @@
                   plain
                   size="mini"
                   @click="handleBatchScan"
-                  v-hasPermi="['emis:emisTmsScanRecord:add']"
+                  v-hasPermi="['emis:emisTmsScanRecord:batchScan']"
                 >批量扫描</el-button>
               </el-col>
           </el-row>
diff --git a/src/views/emis/emisTmsScanRecord/signAndRecord.vue b/src/views/emis/emisTmsScanRecord/signAndRecord.vue
index 74cbed57..dcf820af 100644
--- a/src/views/emis/emisTmsScanRecord/signAndRecord.vue
+++ b/src/views/emis/emisTmsScanRecord/signAndRecord.vue
@@ -119,7 +119,7 @@
             plain
             size="mini"
             @click="handleBatchScan"
-            v-hasPermi="['emis:emisTmsScanRecord:add']"
+            v-hasPermi="['emis:emisTmsScanRecord:batchScan']"
           >批量扫描</el-button>
         </el-col>
       </el-row>
diff --git a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
index 8770896e..ec18ac82 100644
--- a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
@@ -105,7 +105,7 @@
                   plain
                   size="mini"
                   @click="handleBatchScan"
-                  v-hasPermi="['emis:emisTmsScanRecord:add']"
+                  v-hasPermi="['emis:emisTmsScanRecord:batchScan']"
                 >批量扫描</el-button>
               </el-col>
           </el-row>
diff --git a/src/views/emis/emisTmsScanRecord/unloadingScan.vue b/src/views/emis/emisTmsScanRecord/unloadingScan.vue
index 927dbe7c..14f57156 100644
--- a/src/views/emis/emisTmsScanRecord/unloadingScan.vue
+++ b/src/views/emis/emisTmsScanRecord/unloadingScan.vue
@@ -59,7 +59,7 @@
                   plain
                   size="mini"
                   @click="handleBatchScan"
-                  v-hasPermi="['emis:emisTmsScanRecord:add']"
+                  v-hasPermi="['emis:emisTmsScanRecord:batchScan']"
                 >批量扫描</el-button>
               </el-col>
           </el-row>
diff --git a/src/views/emis/emisTmsScanRecord/unpackScan.vue b/src/views/emis/emisTmsScanRecord/unpackScan.vue
index a86d4a1e..516b3d44 100644
--- a/src/views/emis/emisTmsScanRecord/unpackScan.vue
+++ b/src/views/emis/emisTmsScanRecord/unpackScan.vue
@@ -50,7 +50,7 @@
                   plain
                   size="mini"
                   @click="handleBatchScan"
-                  v-hasPermi="['emis:emisTmsScanRecord:add']"
+                  v-hasPermi="['emis:emisTmsScanRecord:batchScan']"
                 >批量扫描</el-button>
               </el-col>
           </el-row>
diff --git a/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
new file mode 100644
index 00000000..3e9d8a2a
--- /dev/null
+++ b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
@@ -0,0 +1,465 @@
+<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="70px">
+            <EmisSiteSimplePicker v-model="queryParams.recordSiteCode"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
+          </el-form-item>
+        <!-- </el-col> -->
+        <!-- <el-col :span="8"> -->
+          <el-form-item :label="$t('签收图片')" prop="isSignPic">
+            <el-select v-model="queryParams.params.isSignPic" :placeholder="$t('全部')" value="0">
+              <el-option :label="$t('未上传')" value="1"></el-option>
+              <el-option :label="$t('已上传')" value="2"></el-option>
+            </el-select>
+          </el-form-item>
+        <!-- </el-col> -->
+        <!-- <el-col :span="8"> -->
+          <el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode">
+            <EmisUserSimplePicker v-model="queryParams.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect"  ></EmisUserSimplePicker>
+          </el-form-item>
+        <!-- </el-col> -->
+
+        <!-- <el-col :span="8"> -->
+          <el-form-item :label="$t('收件国家')" prop="destCode" label-width="70px">
+            <CountryPicker v-model="queryParams.destCode"  @onChange="onCountrySelect"  ></CountryPicker>
+          </el-form-item>
+        <!-- </el-col> -->
+
+      </SearchForm>
+    </el-row >
+
+    <xd-table v-loading="loading"
+           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="handleExport"
+                >导出</el-button>
+              </el-col>
+          </el-row>
+      </div>
+
+      <el-table-column type="selection" width="55" align="center" />
+
+      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="150" />
+      <el-table-column :label="$t('签收状态')" align="center" prop="signState" min-width="100" />
+      <el-table-column :label="$t('签收地址')" align="center" prop="signAddress" min-width="100" />
+      <el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="100" />
+      <el-table-column :label="$t('签收时间')" align="center" prop="signDate" min-width="170" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.scanDate) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('派件员')" align="center" prop="dispatchOrSendMan" min-width="100" />
+      <el-table-column :label="$t('寄件日期')" align="center" prop="xxx" min-width="170" >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.xxx) }}</span>
+          </template>
+      </el-table-column>
+      <el-table-column :label="$t('预计到达时间')" align="center" prop="xxx" min-width="170" >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.xxx) }}</span>
+          </template>
+      </el-table-column>
+      <el-table-column :label="$t('线路')" align="center" prop="xxx" min-width="100" />
+      <el-table-column :label="$t('产品类型')" align="center" prop="xxx" min-width="100" />
+      <el-table-column :label="$t('时效')" align="center" prop="xxx" min-width="100" />
+      <el-table-column :label="$t('录入人')" align="center" prop="recordMan" min-width="100" />
+      <el-table-column :label="$t('录入网点')" align="center" prop="recordSiteCode" min-width="100" />
+      <el-table-column :label="$t('录入时间')" align="center" prop="xxx" min-width="170" >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.xxx) }}</span>
+          </template>
+      </el-table-column>
+      <el-table-column :label="$t('录入网点所属省份')" align="center" prop="xxx" min-width="100" />
+      <el-table-column :label="$t('签收网点')" align="center" prop="signSite" min-width="100" />
+      <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
+      <el-table-column :label="$t('到付款')" align="center" prop="xxx" min-width="100" />
+      <el-table-column :label="$t('代收付款')" align="center" prop="xxx" min-width="100" />
+      <el-table-column :label="$t('机器码/PDA编号')" align="center" prop="xxx" min-width="100" />
+      <el-table-column :label="$t('数据推送标识')" align="center" prop="xxx" min-width="100" />
+      <el-table-column :label="$t('数据插入时间')" align="center" prop="xxx" min-width="100" />
+      <el-table-column :label="$t('数据产生来源')" align="center" prop="xxx" min-width="100" />
+      <el-table-column :label="$t('签收信息备注')" align="center" prop="remark" min-width="100" />
+      <el-table-column :label="$t('收件国家')" align="center" prop="xxx" min-width="100" />
+      <el-table-column :label="$t('收件省份')" align="center" prop="xxx" min-width="100" />
+      <el-table-column :label="$t('签收图片')" align="center" prop="picUrl" min-width="100"/> 
+    </xd-table>
+  </div>
+</template>
+
+<script>
+import { listEmisTmsScanRecord } from "@/api/emis/emisTmsScanRecord";
+
+import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
+import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
+import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+
+import { getDateTimeToString } from '@/utils/payutils'
+export default {
+  name: "OrderEntryAndReceiptPictureManagement",
+  components: { EmisUserSimplePicker,elDateAdvPicker, EmisSiteSimplePicker, EmisGetNextSitePicker, CountryPicker },
+  dicts: ['emis_scan_type'],
+  data() {
+
+    return {
+      // 调整表格的高度，不允许滚动
+      tableHeight: 200,
+      // 遮罩层
+      loading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 创建时间搜索
+      dateTimeRange:[],
+      // 总条数
+      total: 0,
+      // 网点电子面单申请表格数据
+      tmsScanList: [],
+
+      openForm: false,
+      titleForm: "",
+
+      titleEmisElectronicPagApply: "",
+      openEmisElectronicPagApply: false,
+
+      // 显示编辑框更多
+      moreInputVisible: false,
+
+      dataMap:new Map(),
+
+      // 弹出展示层
+      currentId:null,
+      id:null,
+      titleView:"",
+      openView: false,
+      // 备注时间范围
+      daterangeApplyDate: [],
+      // 备注时间范围
+      daterangeCreateTime: [],
+      // 备注时间范围
+      daterangeUpdateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        orderSN:null,
+        billCode: null,
+        scanType: null,
+        scanDate: null,
+        scanManCode: null,
+        scanManPhone: null,
+        scanMan: null,
+        scanSite: null,
+        scanSiteCode: null,
+        scanSitePhone: null,
+        scanWeight: null,
+        weight: null,
+        dispatchOrSendMan: null,
+        dispatchOrSendManCode: null,
+        dispatchOrSendManPhone: null,
+        signDate: null,
+        signMan: null,
+        signSite: null,
+        signSiteCode: null,
+        recordMan: null,
+        recordManCode: null,
+        recordManPhone: null,
+        recordSiteCode: null,
+        truckMan: null,
+        truckCode: null,
+        dataFrom: null,
+        picUrl: null,
+        status: null,
+        delFlag: null,
+        remark: null,
+        params:{
+          queryOrderType:"1"
+        },//扩展参数
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "id不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.$nextTick(function() {
+      let queryFormEl = this.$refs.queryForm.$el;
+      let tableH = queryFormEl.offsetHeight+190;
+      this.tableHeight = window.innerHeight - tableH;
+    });
+  },
+  methods: {
+    /** 查询扫描记录列表 */
+    getList() {
+      this.loading = true;
+      console.log("---->this.queryParams,", this.queryParams);
+      let queryParams = Object.assign({},this.queryParams);
+      if (null != this.dateTimeRange && '' != this.dateTimeRange) {
+        queryParams.params.beginSignDate = this.dateTimeRange[0];
+        queryParams.params.endSignDate = this.dateTimeRange[1];
+      }else{
+        queryParams.params.beginSignDate = null;
+        queryParams.params.endSignDate = null;
+      }
+      if(this.queryParams.params.queryOrderType == "1"){
+        queryParams.orderSN=null;
+      }else if(this.queryParams.params.queryOrderType == "0"){
+        queryParams.orderSN=this.queryParams.billCode;
+        queryParams.billCode=null;
+      }
+
+      listEmisTmsScanRecord(queryParams).then(response => {
+        this.tmsScanList = [];
+        this.loading = false;
+        let rows = response.rows;
+        this.total = response.total;
+        if(!rows || rows.length == 0){
+          this.$message.error("未查到单号");
+          return;
+        }
+        for (let index = 0; index < rows.length; index++) {
+          let scanRstItem = rows[index];
+          console.log(scanRstItem);
+          let record =Object.assign({}, scanRstItem)
+          record.queryType = this.queryParams.queryType;
+          record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
+          record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
+          this.tmsScanList.push(record);
+        }
+      });
+    },
+    onStaffSelect(item){
+      this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName;
+      this.form.dispatchOrSendManCode=item.empCode || this.$store.getters.empCode;
+    },
+    onCountrySelect(item){
+      this.form.countryName=item.name;
+      this.form.countryCode=item.code;
+    },
+    onScanSiteSelect(item){
+      this.queryParams.scanSite=item && item.siteName;
+      this.queryParams.scanSiteCode=item && item.siteCode;
+    },
+    onPreOrNextSiteSelect(item){
+      this.queryParams.preOrNextStation=item && item.siteName;
+      this.queryParams.preOrNextStationCode=item && item.siteCode;
+    },
+    onDestinationSelect(item){
+      this.queryParams.destCode=item && item.destCode;
+      this.queryParams.destName=item && item.destName;
+    },
+    onDateSelect(value){
+      console.log("date picker---->", value)
+      this.dateTimeRange=value;
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        applySeq: null,
+        applyDate: getDateTimeToString(new Date()),
+        provideType: null,
+        applyName: null,
+        applyMan: null,
+        applyManCode: null,
+        applySite: null,
+        applySiteCode: null,
+        unitMoney: null,
+        applyCount: null,
+        sumMoney: null,
+        blSend: null,
+        sendDate: null,
+        sendMan: null,
+        sendManCode: null,
+        sendSite: null,
+        sendSiteCode: null,
+        blCancel: null,
+        cancelMan: null,
+        cancelManCode: null,
+        cancelDate: null,
+        cancelSite: null,
+        cancelSiteCode: null,
+        userSite: null,
+        userSiteCode: null,
+        startNo: null,
+        endNo: null,
+        curStartNo: null,
+        hasBillCount: null,
+        blAllowAllocate: null,
+        createSiteCode: null,
+        modifySiteCode: null,
+        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+     const loadingInstance = this.$loading({
+            text: '正在导出...'
+        })
+      let queryParams = Object.assign({},this.queryParams);
+      queryParams.pageNum=1;
+      queryParams.pageSize=5000;
+      if (null != this.dateTimeRange && '' != this.dateTimeRange) {
+        queryParams.params.beginSignDate = this.dateTimeRange[0];
+        queryParams.params.endSignDate = this.dateTimeRange[1];
+      }else{
+        queryParams.params.beginSignDate = null;
+        queryParams.params.endSignDate = null;
+      }
+      if(this.queryParams.params.queryOrderType == "1"){
+        queryParams.orderSN=null;
+      }else if(this.queryParams.params.queryOrderType == "0"){
+        queryParams.orderSN=this.queryParams.billCode;
+        queryParams.billCode=null;
+      }
+      listEmisTmsScanRecord(queryParams).then(response => {
+        this.downloadLoading = false
+        let rows = response.rows;
+        this.total = response.total;
+        if(!rows || rows.length == 0){
+          this.$message.error("未查到单号");
+          return;
+        }
+        // for (let index = 0; index < rows.length; index++) {
+        //   let scanRstItem = rows[index];
+        //   console.log(scanRstItem);
+        //   let record =Object.assign({}, scanRstItem)
+        //   record.queryType = this.queryParams.queryType;
+        //   record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
+        //   record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
+        //   this.tmsScanList.push(record);
+        // }
+        if (response.code === 200) {
+          const curList = []
+          for (let index = 0; index < response.rows.length; index++) {
+            let scanRstItem = response.rows[index];
+            let record =Object.assign({}, scanRstItem)
+            record.orderType = this.queryParams.orderType;
+            record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
+            record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
+            curList.push(record);
+          }
+          import('@/vendor/Export2Excel').then(excel => {
+            const tHeader = ['id','单号','单号类型','车牌号','扫描时间','扫描类型','扫描网点','上/下一网点','扫描员','录入时间','扫描重量'];
+            const filterVal = ['id','billCode','orderType','carNo','scanDate','scanType','scanSite','preOrNextStation','scanMan','createTime','scanWeight'];
+            const data = this.formatJson(filterVal, curList, curList)
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: '签收记录',
+              autoWidth: true
+            })
+            loadingInstance.close()
+          })
+        }
+      });
+    },
+    formatJson(filterVal, jsonData, resData) {
+      let index = 0
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'index') {
+          return ++index
+        }
+        if (j === 'status') {
+          var statusStr='xxx'
+          if(v[j] == 10){
+              statusStr='xxx'
+          }
+          return statusStr;
+        }
+        return v[j]
+      }))
+    },
+    /** 列索引函数  */
+    getIndex($index) {
+          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+    },
+  }
+};
+</script>
+
+<style scoped>
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+  .query-label {
+    .el-radio{
+        display: block;
+        line-height: 23px;
+        white-space: normal;
+        margin-right: 0;
+    }
+  }
+</style>
diff --git a/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue b/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue
index 08ffcbe5..689088b8 100644
--- a/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue
+++ b/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue
@@ -49,7 +49,7 @@
 
       <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="150" />
       <el-table-column :label="$t('图片URL')" align="center" prop="fileUrl" min-width="100" />
-      <el-table-column :label="$t('上传网点')" align="center" prop="scanSite" min-width="100" />
+      <el-table-column :label="$t('上传网点')" align="center" prop="createSite" min-width="100" />
       <el-table-column :label="$t('上传人')" align="center" prop="createBy" min-width="100" />
       <el-table-column :label="$t('大小')" align="center" prop="volumeWeight" min-width="100">
         <template slot-scope="scope">
@@ -132,8 +132,8 @@ export default {
         let record = {};
         record.billCode=billCode;
         record.fileUrl=item;
-        record.scanSiteCode=this.$store.getters.ownerSiteCode;
-        record.scanSite=this.$store.getters.ownerSiteName;
+        record.createSiteCode=this.$store.getters.ownerSiteCode;
+        record.createSite=this.$store.getters.ownerSiteName;
         record.createBy=this.$store.getters.empName;
         record.signManCode=this.$store.getters.empCode;
         record.createTime=getDateTimeToString(new Date());
diff --git a/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue b/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue
index 954efcb4..366c2296 100644
--- a/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue
+++ b/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue
@@ -49,7 +49,7 @@
 
       <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="150" />
       <el-table-column :label="$t('图片URL')" align="center" prop="fileUrl" min-width="100" />
-      <el-table-column :label="$t('上传网点')" align="center" prop="scanSite" min-width="100" />
+      <el-table-column :label="$t('上传网点')" align="center" prop="createSite" min-width="100" />
       <el-table-column :label="$t('上传人')" align="center" prop="createBy" min-width="100" />
       <el-table-column :label="$t('大小')" align="center" prop="volumeWeight" min-width="100">
         <template slot-scope="scope">
@@ -132,8 +132,8 @@ export default {
         let record = {};
         record.billCode=billCode;
         record.fileUrl=item;
-        record.scanSiteCode=this.$store.getters.ownerSiteCode;
-        record.scanSite=this.$store.getters.ownerSiteName;
+        // record.createSiteCode=this.$store.getters.ownerSiteCode;
+        record.createSite=this.$store.getters.ownerSiteName;
         record.createBy=this.$store.getters.empName;
         record.signManCode=this.$store.getters.empCode;
         record.createTime=getDateTimeToString(new Date());