diff --git a/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
index 3e9d8a2a..f48fc8fb 100644
--- a/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
+++ b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
@@ -1,8 +1,10 @@
 <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">
+    <el-form ref="queryForm" size="mini"  :model="queryParams" :rules="rules" label-width="100px">
+      <el-row :gutter="20">
+      <!-- <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="8"  label-width="100px" v-show="showSearch" @search="getList" @reset="resetQuery"> -->
+        <el-col :span="8">
+          <el-form-item label="" prop="billCode"label-width="100px">
             <div slot="label">
               <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
                 <el-radio label="1">运单号</el-radio>
@@ -17,53 +19,60 @@
                         rows="2"
             />
           </el-form-item>
-        <!-- </el-col> -->
+        </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-col :span="8">
+          <el-form-item :label="$t('上传网点')" prop="createSite" label-width="100px">
+            <EmisSiteSimplePicker v-model="queryParams.createSite"  @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-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('图片类型')" prop="attachType" label-width="100px">
+            <el-select v-model="queryParams.params.attachType" :placeholder="$t('全部')" value="0">
+              <el-option :label="$t('自动寄件图片')" value="1"></el-option>
+              <el-option :label="$t('寄件图片')" value="2"></el-option>
+              <el-option :label="$t('签收图片')" value="3"></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-col>
+        <el-col  :span="8">
+          <el-form-item label="上传时间" prop="dateTimeRange" label-width="100px">
+            <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
           </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 >
-
+        </el-col>
+      <!-- </SearchForm> -->
+      </el-row >
+    </el-form>
     <xd-table v-loading="loading"
            border stripe
            size="small"
-           :data="tmsScanList"
+           :data="attachmentList"
            :showSearch.sync="showSearch"
            :queryParams="queryParams"
-           :total="total"
+           :total="attachmentList.length"
            @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="primary"
+                  plain
+                  size="mini"
+                  @click="handleDelete"
+                >删除</el-button>
+              </el-col>
               <el-col :span="1.5">
                 <el-button
                   type="primary"
@@ -77,66 +86,31 @@
 
       <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" >
+      <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="150" />
+      <el-table-column :label="$t('图片类型')" align="center" prop="attachType" min-width="100" />
+      <el-table-column :label="$t('图片URL')" align="center" prop="fileUrl" 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="createTime" min-width="170" >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.scanDate) }}</span>
+          <span>{{ parseTime(scope.row.createTime) }}</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"/> 
+      <el-table-column :label="$t('数据产生来源')" align="center" prop="dataFrom" min-width="100" />
     </xd-table>
   </div>
 </template>
 
 <script>
-import { listEmisTmsScanRecord } from "@/api/emis/emisTmsScanRecord";
+import { delEmisWaybillAttachment, listEmisWaybillAttachment } from "@/api/emis/emisWaybillAttachment";
 
 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';
 
-import { getDateTimeToString } from '@/utils/payutils'
 export default {
   name: "OrderEntryAndReceiptPictureManagement",
-  components: { EmisUserSimplePicker,elDateAdvPicker, EmisSiteSimplePicker, EmisGetNextSitePicker, CountryPicker },
+  components: { elDateAdvPicker, EmisSiteSimplePicker },
   dicts: ['emis_scan_type'],
   data() {
 
@@ -158,7 +132,7 @@ export default {
       // 总条数
       total: 0,
       // 网点电子面单申请表格数据
-      tmsScanList: [],
+      attachmentList: [],
 
       openForm: false,
       titleForm: "",
@@ -244,11 +218,11 @@ export default {
       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];
+        queryParams.params.beginCreateTime = this.dateTimeRange[0];
+        queryParams.params.endCreateTime = this.dateTimeRange[1];
       }else{
-        queryParams.params.beginSignDate = null;
-        queryParams.params.endSignDate = null;
+        queryParams.params.beginCreateTime = null;
+        queryParams.params.endCreateTime = null;
       }
       if(this.queryParams.params.queryOrderType == "1"){
         queryParams.orderSN=null;
@@ -257,8 +231,8 @@ export default {
         queryParams.billCode=null;
       }
 
-      listEmisTmsScanRecord(queryParams).then(response => {
-        this.tmsScanList = [];
+      listEmisWaybillAttachment(queryParams).then(response => {
+        this.attachmentList = [];
         this.loading = false;
         let rows = response.rows;
         this.total = response.total;
@@ -266,17 +240,35 @@ export default {
           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);
-        }
+        // for (let index = 0; index < rows.length; index++) {
+        //   let attItem = 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.attachmentList.push(attItem);
+        // }
+        this.attachmentList = response.rows;
       });
     },
+    handleDelete(){
+      if(!this.selection || this.selection.length==0){
+        this.$message.error("未选择数据")
+      }
+      this.selection.forEach(item => {
+        delEmisWaybillAttachment(item.id).then(response => {
+          if(!response || response.code != 200){
+            this.$message.error(response && response.msg || "未知错误")
+            return
+          }
+          this.attachmentList = this.attachmentList.filter(attItem =>{
+            return attItem.id != item.id;
+          })
+        })
+      });
+
+    },
     onStaffSelect(item){
       this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName;
       this.form.dispatchOrSendManCode=item.empCode || this.$store.getters.empCode;
@@ -286,8 +278,8 @@ export default {
       this.form.countryCode=item.code;
     },
     onScanSiteSelect(item){
-      this.queryParams.scanSite=item && item.siteName;
-      this.queryParams.scanSiteCode=item && item.siteCode;
+      this.queryParams.createSite=item && item.siteName;
+      // this.queryParams.createSiteCode=item && item.siteCode;
     },
     onPreOrNextSiteSelect(item){
       this.queryParams.preOrNextStation=item && item.siteName;
@@ -301,59 +293,16 @@ export default {
       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();
+      this.getList();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      this.selection = selection;
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -393,7 +342,7 @@ export default {
         //   record.queryType = this.queryParams.queryType;
         //   record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
         //   record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
-        //   this.tmsScanList.push(record);
+        //   this.attachmentList.push(record);
         // }
         if (response.code === 200) {
           const curList = []
diff --git a/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue b/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue
index 689088b8..a28f36f8 100644
--- a/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue
+++ b/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue
@@ -140,6 +140,7 @@ export default {
         record.remark = "";
         record.fileName="寄件底单";
         record.attachType="2";
+        record.dataFrom="pc";
         for(let name in size){
           if(name.indexOf(billCode) > -1){
             record.fileSiez = parseFloat((size[name]/1024).toFixed(2));
diff --git a/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue b/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue
index 366c2296..61b8a56f 100644
--- a/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue
+++ b/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue
@@ -140,6 +140,7 @@ export default {
         record.remark = "";
         record.fileName="签收底单";
         record.attachType="3";
+        record.dataFrom="pc";
         for(let name in size){
           if(name.indexOf(billCode) > -1){
             record.fileSiez = parseFloat((size[name]/1024).toFixed(2));