From 070511242f069765c6aed4ecad238d013322f229 Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Mon, 20 May 2024 11:49:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=97=AE=E9=A2=98=E4=BB=B6?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DatePickerAdv/elDateAdvPicker.vue         |   1 +
 .../centralProblemInquiry.vue                 |  11 +-
 .../receivedProblemInquiries.vue              | 188 +++++++++---------
 .../registrationProblemInquiry.vue            | 188 +++++++++---------
 4 files changed, 199 insertions(+), 189 deletions(-)

diff --git a/src/components/DatePickerAdv/elDateAdvPicker.vue b/src/components/DatePickerAdv/elDateAdvPicker.vue
index 481085f9..c076203e 100644
--- a/src/components/DatePickerAdv/elDateAdvPicker.vue
+++ b/src/components/DatePickerAdv/elDateAdvPicker.vue
@@ -164,6 +164,7 @@ export default {
 	},
   watch: {
       value(newVal) {
+        debugger;
         this.datetimeRange = newVal;
       },
       datetimeRange(newVal, oldVal) {
diff --git a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
index b0bba2b8..59530351 100644
--- a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
@@ -234,7 +234,7 @@ export default {
         params:{
           queryOrderType:"1"
         },//扩展参数
-        dateTimeRange:{},
+        dateTimeRange:[],
         // scanSite:null,
         queryType:"1",// 选择运单类型，默认为 运单号：1,订单号：2
         // scanType:"",
@@ -357,6 +357,15 @@ export default {
       this.modifyParams.scanManCode=item.empCode;
       // this.modifyParams.scanManPhone=item.scanManPhone;
     },
+    onCountrySelect(item){
+      if(item){
+        this.form.countryName=item.name;
+        this.form.countryCode=item.code;
+      }else{
+        this.form.countryName=null;
+        this.form.countryCode=null;
+      }
+    },
     //删除
     clearSelectionBatch(){
       let newList =[];
diff --git a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
index 1f06fd79..efc0834b 100644
--- a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
+++ b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
@@ -1,40 +1,43 @@
+
+
+
+
+
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <search-form  :model="queryParams" ref="queryForm"   size="small" :maxShow="8"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+      <el-form ref="queryForm" size="mini"  :model="queryParams" label-width="80px">
+      <!-- <search-form  :model="queryParams" ref="queryForm"   size="small" :maxShow="8"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery"> -->
         <el-col :span="8">
-          <el-form-item prop="applySeq">
-            <el-col :span="8">
-              <el-select v-model="queryParams.queryType" >
-                <el-option :label="$t('运单号')" value="1"></el-option>
-                <el-option :label="$t('订单号')" value="2"></el-option>
-              </el-select>
-            </el-col>
-            <el-col :span="16">
-              <el-input
-                v-model="queryParams.billCode"
-                :placeholder="$t('多个流水号逗号或换行隔开')"
-                clearable
-                type="textarea"
-                rows="9"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-col>
+          <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-col :span="16">
-            <el-form-item label="签收时间" prop="dateTimeRange">
+            <el-form-item label="登记时间" prop="dateTimeRange" label-width="80px">
               <elDateAdvPicker clearable v-model="queryParams.dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="$t('录入网点')" prop="scanSiteCode" label-width="70px">
-              <EmisSiteSimplePicker v-model="queryParams.scanSiteCode"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
+            <el-form-item :label="$t('录入网点')" prop="registerSiteCode" label-width="80px">
+              <EmisSiteSimplePicker v-model="queryParams.registerSiteCode"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="$t('签收图片')" prop="isSignPic">
+            <el-form-item :label="$t('签收图片')" prop="isSignPic" label-width="80px">
               <el-select v-model="queryParams.isSignPic" :placeholder="$t('全部')" value="0">
                 <el-option :label="$t('未上传')" value="1"></el-option>
                 <el-option :label="$t('已上传')" value="2"></el-option>
@@ -42,18 +45,18 @@
             </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 :label="$t('派件员')" prop="dispatchManCode" label-width="80px">
+              <EmisUserSimplePicker v-model="queryParams.dispatchManCode" postCode="RSD" @onChange="onStaffSelect"  ></EmisUserSimplePicker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="$t('收件国家')" prop="countryCode" label-width="70px">
-              <CountryPicker v-model="queryParams.countryCode"  @onChange="onCountrySelect"  ></CountryPicker>
+            <el-form-item :label="$t('收件国家')" prop="receiveCountry" label-width="80px">
+              <CountryPicker v-model="queryParams.receiveCountry"  @onChange="onCountrySelect"  ></CountryPicker>
             </el-form-item>
           </el-col>
         </el-col>
-
-      </search-form>
+      </el-form>
+      <!-- </search-form> -->
     </el-row >
 
     <xd-table v-loading="loading"
@@ -70,6 +73,14 @@
            >
       <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"
@@ -88,19 +99,24 @@
           <span>{{scope.row.queryType=="1"?scope.row.billCode:scope.row.orderSN}}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('回复状态')" align="center" prop="reversionState" 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="blReversion" min-width="100" >
         <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.xxx) }}</span>
+              <span>{{ scope.row.blReversion ? "是" : "否" }}</span>
             </template>
         </el-table-column>
       </el-table-column>
-      <el-table-column :label="$t('问题件类型')" align="center" prop="xxx" min-width="100" />
-      <el-table-column :label="$t('登记人')" align="center" prop="registerMan" min-width="100" />
-      <el-table-column :label="$t('登记部门')" align="center" prop="registerDept" min-width="100" />
-      <el-table-column :label="$t('图片路径')" align="center" prop="picUrl" min-width="100"/> 
+      <el-table-column :label="$t('通知网点')" align="center" prop="xxx" min-width="100" />
+      <el-table-column :label="$t('登记网点')" align="center" prop="registerSiteCode" min-width="100" />
+      <el-table-column :label="$t('登记日期')" align="center" prop="registerDate" min-width="100">
+        <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.registerDate) }}</span>
+            </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column :label="$t('问题件类型')" align="center" prop="problemType" min-width="100" />
+      <el-table-column :label="$t('登记人')" align="center" prop="registerManCode" min-width="100" />
+      <el-table-column :label="$t('登记部门')" align="center" prop="registerManDept" min-width="100" />
+      <el-table-column :label="$t('图片路径')" align="center" prop="filePath" min-width="100"/> 
       <el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" min-width="100" />
       <el-table-column :label="$t('登记保存时间')" align="center" prop="registerSaveDate" min-width="100" />
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
@@ -110,11 +126,11 @@
       <el-table-column :label="$t('回复人')" align="center" prop="reversionMan" min-width="100" />
       <el-table-column :label="$t('回复日期')" align="center" prop="reversionDate" min-width="100" />
       <el-table-column :label="$t('回复网点')" align="center" prop="reversionManCode" min-width="100" />
-      <el-table-column :label="$t('处理状态')" align="center" prop="xxx" min-width="100" />
+      <el-table-column :label="$t('处理状态')" align="center" prop="status" min-width="100" />
       <el-table-column :label="$t('是否查看')" align="center" prop="blSee" min-width="100" />
       <el-table-column :label="$t('是否回复')" align="center" prop="blReversion" 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="problemTitle" 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" />
     </xd-table>
@@ -166,17 +182,13 @@
 </template>
 
 <script>
-import { listEmisElectronicPagApply, getEmisElectronicPagApply, delEmisElectronicPagApply, addEmisElectronicPagApply, updateEmisElectronicPagApply } from "@/api/emis/emisElectronicPagApply";
-import { listEmisTmsScanRecord, delEmisTmsScanRecord, updateEmisTmsScanRecord } from "@/api/emis/emisTmsScanRecord";
+import { listEmisWaybillProblemInfo } from "@/api/emis/emisWaybillProblemInfo";
+import { listEmisWaybill } from "@/api/emis/emisWaybill";
 
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
-// import emisElectronicPagApplyView from '@/views/emis/emisElectronicPagApply/emisElectronicPagApplyView';
-// import emisElectronicPagApplyForm from '@/views/emis/emisElectronicPagApply/emisElectronicPagApplyForm';
-
 import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
 import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
 import DestinationPicker from '@/views/emis/EmisBaseTools/DestinationPicker.vue';
-// import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 
@@ -221,7 +233,7 @@ export default {
       // 显示编辑框更多
       moreInputVisible: false,
 
-      
+      reversion:{},
 
       // 弹出展示层
       currentId:null,
@@ -234,10 +246,6 @@ export default {
       daterangeCreateTime: [],
       // 备注时间范围
       daterangeUpdateTime: [],
-      // 问题件回复信息
-      reversion:{
-
-      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -272,13 +280,14 @@ export default {
         status: null,
         delFlag: null,
         remark: null,
-        params:{},//扩展参数
-
-        dateTimeRange:{},
+        params:{
+          queryOrderType:"1"
+        },//扩展参数
+        dateTimeRange:[],
         // scanSite:null,
         queryType:"1",// 选择运单类型，默认为 运单号：1,订单号：2
         // scanType:"",
-        isSubBill:""
+        isSubBill:"",
       },
       // 修改参数
       modifyParams:{
@@ -314,20 +323,16 @@ export default {
     /** 查询扫描记录列表 */
     getList() {
       this.loading = true;
-      // this.queryParams.params = {};
       console.log("---->this.queryParams,", this.queryParams);
-      // debugger;
       if (null != this.dateTimeRange && '' != this.dateTimeRange) {
-        // this.queryParams.params["beginScanDate"] = this.dateTimeRange[0];
-        // this.queryParams.params["endScanDate"] = this.dateTimeRange[1];
-        this.queryParams.params.beginScanDate = this.dateTimeRange[0];
-        this.queryParams.params.endScanDate = this.dateTimeRange[1];
+        this.queryParams.params.beginRegisterDate = this.dateTimeRange[0];
+        this.queryParams.params.endRegisterDate = this.dateTimeRange[1];
       }else{
-        this.queryParams.params.beginScanDate = null;
-        this.queryParams.params.endScanDate = null;
+        this.queryParams.params.beginRegisterDate = null;
+        this.queryParams.params.endRegisterDate = null;
       }
-      this.queryParams.params.queryType = this.queryParams.queryType;//1：yd;2：dd;
-      this.queryParams.params.isSubBill = this.queryParams.isSubBill;//1：子单；0：主单
+      // this.queryParams.params.queryType = this.queryParams.queryType;//1：yd;2：dd;
+      // this.queryParams.params.isSubBill = this.queryParams.isSubBill;//1：子单；0：主单
 
       let queryType = this.queryParams.queryType;
       if(queryType == "1"){
@@ -336,19 +341,9 @@ export default {
         this.queryParams.orderSN=this.queryParams.billCode;
         this.queryParams.billCode=null;
       }
-      // if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-      //   this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-      //   this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      // }
-      // if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-      //   this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-      //   this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      // }
-      // console.log(this.addDateRange(this.queryParams, this.dateTimeRange))
-      // listEmisTmsScanRecord(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
-      listEmisTmsScanRecord(this.queryParams).then(response => {
-        // this.emisElectronicPagApplyList = response.rows;
-        // this.loading = false;
+      // listEmisTmsScanRecord(this.queryParams).then(response => {
+      // listEmisWaybillProblemInfo(this.queryParams).then(response => {
+      listEmisWaybill(this.queryParams).then(response => {
         this.emisElectronicPagApplyList = [];
         // this.total = 0;
         this.loading = false;
@@ -363,21 +358,9 @@ export default {
           console.log(scanRstItem);
 
           let record =Object.assign({}, scanRstItem)
-          // record.carNo=scanRstItem.carNo;
-          // record.scanData=scanRstItem.scanData;
-          // record.scanType=scanRstItem.scanType;
-          // if(queryType == "1"){
-          //   this.queryParams.orderSN=null;
-          // }
           record.queryType = this.queryParams.queryType;
           record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
           record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
-          // record.createTime=scanRstItem.createTime;
-          // record.scanWeight=scanRstItem.scanWeight;
-          // console.log(record)
-          // let indexBillCode=record.billCode;
-          // this.dataMap[indexBillCode]=record;
-          // this.emisTmsScanRecordList.push(record);
           this.emisElectronicPagApplyList.push(record);
         }
       });
@@ -388,8 +371,8 @@ export default {
       this.resetModifyParams();
     },
     onScanSiteSelect(item){
-      this.queryParams.scanSite=item && item.siteName;
-      this.queryParams.scanSiteCode=item && item.siteCode;
+      // this.queryParams.scanSite=item && item.siteName;
+      this.queryParams.registerSiteCode=item && item.siteCode;
     },
     onPreOrNextSiteSelect(item){
       this.queryParams.preOrNextStation=item && item.siteName;
@@ -400,13 +383,13 @@ export default {
       this.queryParams.destName=item && item.destName;
     },
     onDateSelect(value){
-      console.log("date picker---->", value)
+      // console.log("date picker---->", value)
       this.queryParams.dateTimeRange=value;
       // scanDate
     },
     onStaffSelect(item){
-        this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName;
-        this.form.dispatchOrSendManCode=item.empCode || this.$store.getters.empCode;
+        // this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName;
+        this.form.dispatchManCode=item && item.empCode || null;
     },
     onModifyScanSiteSelect(item){
       this.modifyParams.scanSite=item.siteName;
@@ -423,6 +406,15 @@ export default {
       this.modifyParams.scanManCode=item.empCode;
       // this.modifyParams.scanManPhone=item.scanManPhone;
     },
+    onCountrySelect(item){
+      if(item){
+        this.form.countryName=item.name;
+        this.form.countryCode=item.code;
+      }else{
+        this.form.countryName=null;
+        this.form.countryCode=null;
+      }
+    },
     //删除
     clearSelectionBatch(){
       let newList =[];
@@ -718,6 +710,14 @@ export default {
     color: #0955ee;
     cursor: pointer;
   }
+  .query-label {
+    .el-radio{
+        display: block;
+        line-height: 23px;
+        white-space: normal;
+        margin-right: 0;
+    }
+  }
   .reversion{
     margin-left: 0px;
     margin-right: 0px;
diff --git a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
index b4130d33..d6bb523b 100644
--- a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
@@ -1,40 +1,43 @@
+
+
+
+
+
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <search-form  :model="queryParams" ref="queryForm"   size="small" :maxShow="8"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+      <el-form ref="queryForm" size="mini"  :model="queryParams" label-width="80px">
+      <!-- <search-form  :model="queryParams" ref="queryForm"   size="small" :maxShow="8"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery"> -->
         <el-col :span="8">
-          <el-form-item prop="applySeq">
-            <el-col :span="8">
-              <el-select v-model="queryParams.queryType" >
-                <el-option :label="$t('运单号')" value="1"></el-option>
-                <el-option :label="$t('订单号')" value="2"></el-option>
-              </el-select>
-            </el-col>
-            <el-col :span="16">
-              <el-input
-                v-model="queryParams.billCode"
-                :placeholder="$t('多个流水号逗号或换行隔开')"
-                clearable
-                type="textarea"
-                rows="9"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-col>
+          <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-col :span="16">
-            <el-form-item label="签收时间" prop="dateTimeRange">
+            <el-form-item label="登记时间" prop="dateTimeRange" label-width="80px">
               <elDateAdvPicker clearable v-model="queryParams.dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="$t('录入网点')" prop="scanSiteCode" label-width="70px">
-              <EmisSiteSimplePicker v-model="queryParams.scanSiteCode"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
+            <el-form-item :label="$t('录入网点')" prop="registerSiteCode" label-width="80px">
+              <EmisSiteSimplePicker v-model="queryParams.registerSiteCode"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="$t('签收图片')" prop="isSignPic">
+            <el-form-item :label="$t('签收图片')" prop="isSignPic" label-width="80px">
               <el-select v-model="queryParams.isSignPic" :placeholder="$t('全部')" value="0">
                 <el-option :label="$t('未上传')" value="1"></el-option>
                 <el-option :label="$t('已上传')" value="2"></el-option>
@@ -42,18 +45,18 @@
             </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 :label="$t('派件员')" prop="dispatchManCode" label-width="80px">
+              <EmisUserSimplePicker v-model="queryParams.dispatchManCode" postCode="RSD" @onChange="onStaffSelect"  ></EmisUserSimplePicker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="$t('收件国家')" prop="countryCode" label-width="70px">
-              <CountryPicker v-model="queryParams.countryCode"  @onChange="onCountrySelect"  ></CountryPicker>
+            <el-form-item :label="$t('收件国家')" prop="receiveCountry" label-width="80px">
+              <CountryPicker v-model="queryParams.receiveCountry"  @onChange="onCountrySelect"  ></CountryPicker>
             </el-form-item>
           </el-col>
         </el-col>
-
-      </search-form>
+      </el-form>
+      <!-- </search-form> -->
     </el-row >
 
     <xd-table v-loading="loading"
@@ -70,6 +73,14 @@
            >
       <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"
@@ -88,19 +99,24 @@
           <span>{{scope.row.queryType=="1"?scope.row.billCode:scope.row.orderSN}}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('回复状态')" align="center" prop="reversionState" 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="blReversion" min-width="100" >
         <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.xxx) }}</span>
+              <span>{{ scope.row.blReversion ? "是" : "否" }}</span>
             </template>
         </el-table-column>
       </el-table-column>
-      <el-table-column :label="$t('问题件类型')" align="center" prop="xxx" min-width="100" />
-      <el-table-column :label="$t('登记人')" align="center" prop="registerMan" min-width="100" />
-      <el-table-column :label="$t('登记部门')" align="center" prop="registerDept" min-width="100" />
-      <el-table-column :label="$t('图片路径')" align="center" prop="picUrl" min-width="100"/> 
+      <el-table-column :label="$t('通知网点')" align="center" prop="xxx" min-width="100" />
+      <el-table-column :label="$t('登记网点')" align="center" prop="registerSiteCode" min-width="100" />
+      <el-table-column :label="$t('登记日期')" align="center" prop="registerDate" min-width="100">
+        <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.registerDate) }}</span>
+            </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column :label="$t('问题件类型')" align="center" prop="problemType" min-width="100" />
+      <el-table-column :label="$t('登记人')" align="center" prop="registerManCode" min-width="100" />
+      <el-table-column :label="$t('登记部门')" align="center" prop="registerManDept" min-width="100" />
+      <el-table-column :label="$t('图片路径')" align="center" prop="filePath" min-width="100"/> 
       <el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" min-width="100" />
       <el-table-column :label="$t('登记保存时间')" align="center" prop="registerSaveDate" min-width="100" />
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
@@ -110,11 +126,11 @@
       <el-table-column :label="$t('回复人')" align="center" prop="reversionMan" min-width="100" />
       <el-table-column :label="$t('回复日期')" align="center" prop="reversionDate" min-width="100" />
       <el-table-column :label="$t('回复网点')" align="center" prop="reversionManCode" min-width="100" />
-      <el-table-column :label="$t('处理状态')" align="center" prop="xxx" min-width="100" />
+      <el-table-column :label="$t('处理状态')" align="center" prop="status" min-width="100" />
       <el-table-column :label="$t('是否查看')" align="center" prop="blSee" min-width="100" />
       <el-table-column :label="$t('是否回复')" align="center" prop="blReversion" 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="problemTitle" 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" />
     </xd-table>
@@ -166,17 +182,13 @@
 </template>
 
 <script>
-import { listEmisElectronicPagApply, getEmisElectronicPagApply, delEmisElectronicPagApply, addEmisElectronicPagApply, updateEmisElectronicPagApply } from "@/api/emis/emisElectronicPagApply";
-import { listEmisTmsScanRecord, delEmisTmsScanRecord, updateEmisTmsScanRecord } from "@/api/emis/emisTmsScanRecord";
+import { listEmisWaybillProblemInfo } from "@/api/emis/emisWaybillProblemInfo";
+import { listEmisWaybill } from "@/api/emis/emisWaybill";
 
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
-// import emisElectronicPagApplyView from '@/views/emis/emisElectronicPagApply/emisElectronicPagApplyView';
-// import emisElectronicPagApplyForm from '@/views/emis/emisElectronicPagApply/emisElectronicPagApplyForm';
-
 import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
 import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
 import DestinationPicker from '@/views/emis/EmisBaseTools/DestinationPicker.vue';
-// import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 
@@ -221,7 +233,7 @@ export default {
       // 显示编辑框更多
       moreInputVisible: false,
 
-      
+      reversion:{},
 
       // 弹出展示层
       currentId:null,
@@ -234,10 +246,6 @@ export default {
       daterangeCreateTime: [],
       // 备注时间范围
       daterangeUpdateTime: [],
-      // 问题件回复信息
-      reversion:{
-
-      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -272,13 +280,14 @@ export default {
         status: null,
         delFlag: null,
         remark: null,
-        params:{},//扩展参数
-
-        dateTimeRange:{},
+        params:{
+          queryOrderType:"1"
+        },//扩展参数
+        dateTimeRange:[],
         // scanSite:null,
         queryType:"1",// 选择运单类型，默认为 运单号：1,订单号：2
         // scanType:"",
-        isSubBill:""
+        isSubBill:"",
       },
       // 修改参数
       modifyParams:{
@@ -314,20 +323,16 @@ export default {
     /** 查询扫描记录列表 */
     getList() {
       this.loading = true;
-      // this.queryParams.params = {};
       console.log("---->this.queryParams,", this.queryParams);
-      // debugger;
       if (null != this.dateTimeRange && '' != this.dateTimeRange) {
-        // this.queryParams.params["beginScanDate"] = this.dateTimeRange[0];
-        // this.queryParams.params["endScanDate"] = this.dateTimeRange[1];
-        this.queryParams.params.beginScanDate = this.dateTimeRange[0];
-        this.queryParams.params.endScanDate = this.dateTimeRange[1];
+        this.queryParams.params.beginRegisterDate = this.dateTimeRange[0];
+        this.queryParams.params.endRegisterDate = this.dateTimeRange[1];
       }else{
-        this.queryParams.params.beginScanDate = null;
-        this.queryParams.params.endScanDate = null;
+        this.queryParams.params.beginRegisterDate = null;
+        this.queryParams.params.endRegisterDate = null;
       }
-      this.queryParams.params.queryType = this.queryParams.queryType;//1：yd;2：dd;
-      this.queryParams.params.isSubBill = this.queryParams.isSubBill;//1：子单；0：主单
+      // this.queryParams.params.queryType = this.queryParams.queryType;//1：yd;2：dd;
+      // this.queryParams.params.isSubBill = this.queryParams.isSubBill;//1：子单；0：主单
 
       let queryType = this.queryParams.queryType;
       if(queryType == "1"){
@@ -336,19 +341,9 @@ export default {
         this.queryParams.orderSN=this.queryParams.billCode;
         this.queryParams.billCode=null;
       }
-      // if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-      //   this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-      //   this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      // }
-      // if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-      //   this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-      //   this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      // }
-      // console.log(this.addDateRange(this.queryParams, this.dateTimeRange))
-      // listEmisTmsScanRecord(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
-      listEmisTmsScanRecord(this.queryParams).then(response => {
-        // this.emisElectronicPagApplyList = response.rows;
-        // this.loading = false;
+      // listEmisTmsScanRecord(this.queryParams).then(response => {
+      // listEmisWaybillProblemInfo(this.queryParams).then(response => {
+      listEmisWaybill(this.queryParams).then(response => {
         this.emisElectronicPagApplyList = [];
         // this.total = 0;
         this.loading = false;
@@ -363,21 +358,9 @@ export default {
           console.log(scanRstItem);
 
           let record =Object.assign({}, scanRstItem)
-          // record.carNo=scanRstItem.carNo;
-          // record.scanData=scanRstItem.scanData;
-          // record.scanType=scanRstItem.scanType;
-          // if(queryType == "1"){
-          //   this.queryParams.orderSN=null;
-          // }
           record.queryType = this.queryParams.queryType;
           record.scanSiteName = this.queryParams.scanSiteName || record.scanSiteName;
           record.preOrNextStation = this.queryParams.preOrNextStation || scanRstItem.preOrNextStation;
-          // record.createTime=scanRstItem.createTime;
-          // record.scanWeight=scanRstItem.scanWeight;
-          // console.log(record)
-          // let indexBillCode=record.billCode;
-          // this.dataMap[indexBillCode]=record;
-          // this.emisTmsScanRecordList.push(record);
           this.emisElectronicPagApplyList.push(record);
         }
       });
@@ -388,8 +371,8 @@ export default {
       this.resetModifyParams();
     },
     onScanSiteSelect(item){
-      this.queryParams.scanSite=item && item.siteName;
-      this.queryParams.scanSiteCode=item && item.siteCode;
+      // this.queryParams.scanSite=item && item.siteName;
+      this.queryParams.registerSiteCode=item && item.siteCode;
     },
     onPreOrNextSiteSelect(item){
       this.queryParams.preOrNextStation=item && item.siteName;
@@ -400,13 +383,13 @@ export default {
       this.queryParams.destName=item && item.destName;
     },
     onDateSelect(value){
-      console.log("date picker---->", value)
+      // console.log("date picker---->", value)
       this.queryParams.dateTimeRange=value;
       // scanDate
     },
     onStaffSelect(item){
-        this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName;
-        this.form.dispatchOrSendManCode=item.empCode || this.$store.getters.empCode;
+        // this.form.dispatchOrSendMan=item.empName || this.$store.getters.empName;
+        this.form.dispatchManCode=item && item.empCode || null;
     },
     onModifyScanSiteSelect(item){
       this.modifyParams.scanSite=item.siteName;
@@ -423,6 +406,15 @@ export default {
       this.modifyParams.scanManCode=item.empCode;
       // this.modifyParams.scanManPhone=item.scanManPhone;
     },
+    onCountrySelect(item){
+      if(item){
+        this.form.countryName=item.name;
+        this.form.countryCode=item.code;
+      }else{
+        this.form.countryName=null;
+        this.form.countryCode=null;
+      }
+    },
     //删除
     clearSelectionBatch(){
       let newList =[];
@@ -718,6 +710,14 @@ export default {
     color: #0955ee;
     cursor: pointer;
   }
+  .query-label {
+    .el-radio{
+        display: block;
+        line-height: 23px;
+        white-space: normal;
+        margin-right: 0;
+    }
+  }
   .reversion{
     margin-left: 0px;
     margin-right: 0px;