diff --git a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
index 436ebf1a..1a8754ba 100644
--- a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
@@ -37,7 +37,7 @@
           </el-col>
         <el-col :span="8">
           <el-form-item :label="$t('问题件类型')" prop="problemType" label-width="90px">
-            <ProblemTypePicker v-model="queryParams.problemId" :id="queryParams.problemId"  @onChange="onproblemTypeSelect"  ></ProblemTypePicker>
+            <ProblemTypePicker v-model="queryParams.problemType"  @onChange="onproblemTypeSelect"  ></ProblemTypePicker>
           </el-form-item>
         </el-col>
           <el-col :span="8">
@@ -115,17 +115,21 @@
           <span>{{ scope.row.blReversion == "1" ? "是" : "否" }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('通知网点')" align="center" prop="sendSiteCode" min-width="100" />
-      <el-table-column :label="$t('登记网点')" align="center" prop="registerSiteCode" min-width="100" />
+      <el-table-column :label="$t('通知网点')" align="center" prop="sendSiteName" min-width="100" />
+      <el-table-column :label="$t('登记网点')" align="center" prop="registerSiteName" min-width="100" />
       <el-table-column :label="$t('登记日期')" align="center" prop="registerDate" min-width="170">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.registerDate) }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('问题件类型')" align="center" prop="problemTypeName" min-width="100" />
-      <el-table-column :label="$t('登记人')" align="center" prop="registerManCode" min-width="150" />
+      <el-table-column :label="$t('登记人')" align="center" prop="registerManName" min-width="150" />
       <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="filePath" min-width="100">
+        <template slot-scope="scope">
+          <ImagePreview height="50px" v-for="pic in (scope.row.filePath||'').split(',')" :key="pic" :src="pic" ></ImagePreview>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" min-width="150">
         <template slot-scope="scope">
           <span class="ellipsis">{{ scope.row.problemCause }}</span>
@@ -136,7 +140,6 @@
           <span>{{ parseTime(scope.row.registerSaveDate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
       <el-table-column :label="$t('所属业务员')" align="center" prop="salesmen" min-width="150" />
       <el-table-column :label="$t('业务员编号')" align="center" prop="xxx" min-width="150" />
       <el-table-column :label="$t('问题件回复')" align="center" prop="reversionStr" min-width="150" />
@@ -148,8 +151,16 @@
       </el-table-column>
       <el-table-column :label="$t('回复网点')" align="center" prop="reversionManCode" 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="blSee" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.blSee == "1" ? "是" : "否" }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('是否回复')" align="center" prop="blReversion" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.blReversion == "1" ? "是" : "否" }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('问题件路径')" align="center" prop="problemCause" 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="150">
@@ -174,6 +185,7 @@ import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicke
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
 import { parseTime, dateToStr } from "@/utils/custom";
+import { formatSearchStr } from '@/utils/index'
 
 import { getDateTimeToString } from '@/utils/payutils'
 export default {
@@ -265,7 +277,7 @@ export default {
         params:{
           queryOrderType:"1"
         },//扩展参数
-        dateTimeRange:[],
+        // dateTimeRange:[],
         // scanSite:null,
         queryType:"1",// 选择运单类型，默认为 运单号：1,订单号：2
         // scanType:"",
@@ -326,8 +338,9 @@ export default {
       let queryType = this.queryParams.queryType;
       if(queryType == "1"){
         this.queryParams.orderSN=null;
+        this.queryParams.billCode=formatSearchStr(this.queryParams.billCode);
       }else if(queryType == "2"){
-        this.queryParams.orderSN=this.queryParams.billCode;
+        this.queryParams.orderSN=formatSearchStr(this.queryParams.billCode);
         this.queryParams.billCode=null;
       }
       // listEmisTmsScanRecord(this.queryParams).then(response => {
@@ -372,8 +385,8 @@ export default {
         this.form.problemId = null;
         return;
       }
-      this.queryParams.problemType = item.typeName;
-      this.queryParams.problemId=item.id;
+      this.queryParams.problemType = item.id;
+      // this.queryParams.problemId=item.id;
     },
     onPreOrNextSiteSelect(item){
       this.queryParams.preOrNextStation=item && item.siteName;
@@ -385,7 +398,7 @@ export default {
     },
     onDateSelect(value){
       // console.log("date picker---->", value)
-      this.queryParams.dateTimeRange=value;
+      // this.queryParams.dateTimeRange=value;
       // scanDate
     },
     // onStaffSelect(item){
diff --git a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
index 50b15c93..be0aa75a 100644
--- a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
+++ b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
@@ -107,24 +107,27 @@
           <span>{{ scope.row.blReversion ? "是" : "否" }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('通知网点')" align="center" prop="sendSiteCode" min-width="100" />
-      <el-table-column :label="$t('登记网点')" align="center" prop="registerSiteCode" min-width="100" />
+      <el-table-column :label="$t('通知网点')" align="center" prop="sendSiteName" min-width="100" />
+      <el-table-column :label="$t('登记网点')" align="center" prop="registerSiteName" min-width="100" />
       <el-table-column :label="$t('登记日期')" align="center" prop="registerDate" min-width="170">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.registerDate) }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('问题件类型')" align="center" prop="problemTypeName" min-width="150" />
-      <el-table-column :label="$t('登记人')" align="center" prop="registerManCode" min-width="100" />
+      <el-table-column :label="$t('登记人')" align="center" prop="registerManName" 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="filePath" min-width="100">
+        <template slot-scope="scope">
+          <ImagePreview height="50px" v-for="pic in (scope.row.filePath||'').split(',')" :key="pic" :src="pic" ></ImagePreview>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" min-width="100" />
       <el-table-column :label="$t('登记保存时间')" align="center" prop="registerSaveDate" min-width="170">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.registerSaveDate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
       <el-table-column :label="$t('所属业务员')" align="center" prop="salesmen" min-width="150" />
       <el-table-column :label="$t('业务员编号')" align="center" prop="xxx" min-width="150" />
       <el-table-column :label="$t('问题件回复')" align="center" prop="reversionStr" min-width="150">
@@ -140,8 +143,16 @@
       </el-table-column>
       <el-table-column :label="$t('回复网点')" align="center" prop="reversionManCode" 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="blSee" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.blSee == "1" ? "是" : "否" }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('是否回复')" align="center" prop="blReversion" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.blReversion == "1" ? "是" : "否" }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('问题件路径')" align="center" prop="problemCause" min-width="150" />
       <el-table-column :label="$t('问题件主题')" align="center" prop="problemTitle" min-width="150" />
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100">
@@ -251,6 +262,7 @@ import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicke
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import Comments from '@/views/emis/EmisBaseTools/Comments.vue';
 import { parseTime, dateToStr } from "@/utils/custom";
+import { formatSearchStr } from '@/utils/index'
 
 import { getDateTimeToString } from '@/utils/payutils'
 export default {
@@ -373,6 +385,7 @@ export default {
   },
   created() {
     // this.getList();
+    this.queryParams.sendSiteCode = this.$store.getters.ownerSiteCode;
     this.$nextTick(function() {
       let queryFormEl = this.$refs.queryForm.$el;
       let tableH = queryFormEl.offsetHeight+260;
@@ -405,9 +418,10 @@ export default {
       let queryType = this.queryParams.queryType;
       if(queryType == "1"){
         this.queryParams.orderSN=null;
+        this.queryParams.billCode=formatSearchStr(this.queryParams.billCode);
       }else if(queryType == "2"){
-        this.queryParams.orderSN=this.queryParams.billCode;
-        this.queryParams.billCode="";
+        this.queryParams.orderSN=formatSearchStr(this.queryParams.billCode);
+        this.queryParams.billCode=null;
       }
       // listEmisTmsScanRecord(this.queryParams).then(response => {
       // (this.queryParams).then(response => {
diff --git a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
index 9713d2b7..f09a63f3 100644
--- a/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
@@ -107,17 +107,21 @@
           <span>{{ scope.row.blReversion ? "是" : "否" }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('通知网点')" align="center" prop="sendSiteCode" min-width="100" />
-      <el-table-column :label="$t('登记网点')" align="center" prop="registerSiteCode" min-width="100" />
+      <el-table-column :label="$t('通知网点')" align="center" prop="sendSiteName" min-width="100" />
+      <el-table-column :label="$t('登记网点')" align="center" prop="registerSiteName" min-width="100" />
       <el-table-column :label="$t('登记日期')" align="center" prop="registerDate" min-width="170">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.registerDate) }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('问题件类型')" align="center" prop="problemTypeName" min-width="150" />
-      <el-table-column :label="$t('登记人')" align="center" prop="registerManCode" min-width="150" />
+      <el-table-column :label="$t('登记人')" align="center" prop="registerManName" min-width="150" />
       <el-table-column :label="$t('登记部门')" align="center" prop="registerManDept" min-width="150" />
-      <el-table-column :label="$t('图片路径')" align="center" prop="filePath" min-width="100"/> 
+      <el-table-column :label="$t('图片路径')" align="center" prop="filePath" min-width="100">
+        <template slot-scope="scope">
+          <ImagePreview height="50px" v-for="pic in (scope.row.filePath||'').split(',')" :key="pic" :src="pic" ></ImagePreview>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" min-width="150">
         <template slot-scope="scope">
           <span class="ellipsis">{{ scope.row.problemCause }}</span>
@@ -128,7 +132,6 @@
           <span>{{ parseTime(scope.row.registerSaveDate) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
       <el-table-column :label="$t('所属业务员')" align="center" prop="salesmen" min-width="150" />
       <el-table-column :label="$t('业务员编号')" align="center" prop="xxx" min-width="150" />
       <el-table-column :label="$t('问题件回复')" align="center" prop="reversionStr" min-width="150" />
@@ -140,8 +143,16 @@
       </el-table-column>
       <el-table-column :label="$t('回复网点')" align="center" prop="reversionManCode" 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="blSee" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.blSee == "1" ? "是" : "否" }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('是否回复')" align="center" prop="blReversion" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.blReversion == "1" ? "是" : "否" }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('问题件路径')" align="center" prop="problemCause" min-width="150" />
       <el-table-column :label="$t('问题件主题')" align="center" prop="problemTitle" min-width="150" />
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100">
@@ -207,6 +218,7 @@ import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicke
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import Comments from '@/views/emis/EmisBaseTools/Comments.vue';
 import { parseTime, dateToStr } from "@/utils/custom";
+import { formatSearchStr } from '@/utils/index'
 
 import { getDateTimeToString } from '@/utils/payutils'
 export default {
@@ -329,6 +341,7 @@ export default {
   },
   created() {
     // this.getList();
+    this.queryParams.registerSiteCode = this.$store.getters.ownerSiteCode;
     this.$nextTick(function() {
       let queryFormEl = this.$refs.queryForm.$el;
       let tableH = queryFormEl.offsetHeight+260;
@@ -361,9 +374,10 @@ export default {
       let queryType = this.queryParams.queryType;
       if(queryType == "1"){
         this.queryParams.orderSN=null;
+        this.queryParams.billCode=formatSearchStr(this.queryParams.billCode);
       }else if(queryType == "2"){
-        this.queryParams.orderSN=this.queryParams.billCode;
-        this.queryParams.billCode="";
+        this.queryParams.orderSN=formatSearchStr(this.queryParams.billCode);
+        this.queryParams.billCode=null;
       }
       // listEmisTmsScanRecord(this.queryParams).then(response => {
       listEmisWaybillProblemInfo(this.queryParams).then(response => {
@@ -419,7 +433,7 @@ export default {
     },
     onDateSelect(value){
       // console.log("date picker---->", value)
-      this.queryParams.dateTimeRange=value;
+      // this.dateTimeRange=value;
       // scanDate
     },
     onStaffSelect(item){