diff --git a/src/views/emis/emisWaybillProblemFaq/commentInfoForm.vue b/src/views/emis/emisWaybillProblemFaq/commentInfoForm.vue
index 99a5235d..2dfc4199 100644
--- a/src/views/emis/emisWaybillProblemFaq/commentInfoForm.vue
+++ b/src/views/emis/emisWaybillProblemFaq/commentInfoForm.vue
@@ -25,8 +25,8 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
       <el-scrollbar class="kr-designer-tool_con">
-        <panel class="control-panel" />
-        <CommentPanel  :billCode="billCode" ></CommentPanel>
+        <!-- <Panel class="control-panel" /> -->
+        <CommentPanel ref="comment" :billCode="billCode" ></CommentPanel>
       </el-scrollbar>
 
   </div>
@@ -35,6 +35,7 @@
 <script>
 import { listEmisWaybillProblemFaq, getEmisWaybillProblemFaq, delEmisWaybillProblemFaq, addEmisWaybillProblemFaq, updateEmisWaybillProblemFaq } from "@/api/emis/emisWaybillProblemFaq";
 import CommentPanel from '@/views/emis/emisWaybillProblemFaq/commentPanel.vue';
+import Panel from '@/components/PrintDesigner/base/panel/index.vue'
 import { parseTime } from "@/utils/custom";
 
 export default {
@@ -44,7 +45,7 @@ export default {
         type:Object
     },
   },
-  components: { CommentPanel },
+  components: { CommentPanel, Panel },
   dicts: [
   ],
   data() {
@@ -52,11 +53,12 @@ export default {
       emisWaybillProblemFaqOptions: [],
       // 遮罩层
       loading: true,
-
+      changed: false,
       // 表单参数
       form: {
         // status: "2"
       },
+      billCode: '',
       // 表单校验
       rules: {
         id: [
@@ -75,9 +77,10 @@ export default {
     };
   },
    watch: {
-      "id": {
+      "promInfo": {
         handler (newValue, oldValue) {
-          this.id = newValue;
+          this.promInfo = newValue;
+          this.billCode = this.promInfo.billCode;
           this.initData();
         },
         deep: true
@@ -107,7 +110,12 @@ export default {
     // 取消按钮
     cancel() {
       this.reset();
-      this.$emit("on-cancel");
+      // if(this.changed){
+      //   this.$emit("on-changed");
+      // }else{
+      //   this.$emit("on-cancel");
+      // }
+      this.$emit("on-changed");
     },
     // 表单重置
     reset() {
@@ -155,14 +163,10 @@ export default {
             createSite: this.$store.getters.ownerSiteName,//创建站点
           }
           let response = await addEmisWaybillProblemFaq(reply);
-          console.log(commentList)
           if(response && response.code == 200){
-            // commentList.getList();
-            // this.reversion = {
-            //   status:'',
-            //   content:''
-            // }
-            this.$emit("on-changed");
+            // this.$emit("on-changed");
+            this.changed = true;
+            this.$refs.comment.getList();
           }else{
             this.$message.error(response & response.msg || "未知错误")
           }
diff --git a/src/views/emis/emisWaybillProblemFaq/commentPanel.vue b/src/views/emis/emisWaybillProblemFaq/commentPanel.vue
index 3fca271c..cd39d177 100644
--- a/src/views/emis/emisWaybillProblemFaq/commentPanel.vue
+++ b/src/views/emis/emisWaybillProblemFaq/commentPanel.vue
@@ -2,12 +2,16 @@
   <div>
       <div v-for="(item,index) in emisWaybillProblemFaqList" :key="index" class="author-title reply-father">
           <div class="author-info">
-              <span class="author-name">{{item.name}}</span>
-              <span class="author-time">{{item.time}}</span>
+              <span class="author-name">
+                {{ item.createByName }}
+                <span class="author-status" v-if="item.status=='2'">{{ $t('[处理完毕]') }}</span>
+                <span class="author-time">{{ item.createTime }}</span>
+              </span>
           </div>
           <div class="talk-box">
               <p>
-                  <span class="reply">{{item.content}}</span>
+                <span class="author-content">{{ $t('回复内容：') }}</span>
+                <span class="reply">{{item.content}}</span>
               </p>
           </div>
       </div>
@@ -47,10 +51,25 @@ export default {
         },
       }
   },
+  watch: {
+    "billCode": {
+        handler (newValue, oldValue) {
+          this.billCode = newValue;
+          this.queryParams = {
+            pageNum: 1,
+            pageSize: 20,
+            billCode: newValue
+          }
+          this.getList();
+        },
+        deep: true
+      }
+  },
+  mounted(){
+    this.getList();
+  },
   methods: {
     getList() {
-
-
       listEmisWaybillProblemFaq(this.queryParams).then(response => {
         this.emisWaybillProblemFaqList = response.rows;
       });
@@ -139,10 +158,24 @@ padding: 10px;
     color: #000;
     font-size: 13px;
     font-weight: bold;
+    // margin-right: 10px;
+  }
+  .author-status {
+    color: #000;
+    font-size: 13px;
+    font-weight: normal;
+    background-color: #f0e68c;
+    margin-left: 10px;
+    margin-right: 10px;
   }
-
   .author-time {
-    font-size: 12px;
+    font-size: 13px;
+    font-weight: normal;
+  }
+  .author-content{
+    color: #000;
+    font-size: 13px;
+    font-weight: bold;
   }
 }
 .icon-btn {
diff --git a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
index c8ef2a1e..64de66c8 100644
--- a/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
@@ -78,6 +78,7 @@
            :showSearch.sync="showSearch"
            :queryParams="queryParams"
            :total="total"
+           :row-class-name="disabledRow"
            @queryTable="getList"
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
@@ -405,6 +406,12 @@ export default {
         }
       });
     },
+    disabledRow({ row }) {
+      if ( row.blReversion =='1' ) {
+        return 'disabled-row';
+      }
+      return '';
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -554,9 +561,14 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = [];
+      for(let i = 0; i< selection.length; i++){
+        if(selection[i].blReversion != "1"){
+          this.ids.push(selection[i].id)
+        }
+      }
+      this.single = this.ids.length!==1
+      this.multiple = !this.ids.length
     },
     // 排序 查询字段是表格中字段名字 动态取值排序顺序
     handleSortChange(column) {
@@ -808,4 +820,15 @@ export default {
   .isSeeNoDeal{
     background-color: rgb(220, 220, 220);
   }
+  
+  :deep .el-table .disabled-row .el-checkbox__inner {
+    display: none; /* 隐藏checkbox */
+  }
+  :deep .el-table .disabled-row .cell::after {
+    content: '';
+    display: block;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(255, 255, 255, 0.6); /* 添加一个遮盖层 */
+  }
 </style>
diff --git a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
index 66d23902..07dd0efb 100644
--- a/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
+++ b/src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
@@ -61,10 +61,8 @@
     </el-row >
 
     <xd-table v-loading="loading"
-
            :row-class-name="tableRowClassName"
-
-           border
+           border 
            ref="singleSelectTable"
            size="small"
            :data="emisElectronicPagApplyList"
@@ -206,8 +204,8 @@
     <el-divider class="divider"></el-divider>
 
     <!-- 评论 -->
-    <el-drawer title="问题件回复" width="50%" :visible.sync="openComment" direction="rtl" @close="handleClose">
-        <CommentInfoForm :promInfo="selData"> </CommentInfoForm>
+    <el-drawer title="问题件回复" width="50%" :visible.sync="openComment" @close="commentDone" direction="rtl">
+        <CommentInfoForm :promInfo="selData" @on-changed="commentDone" @on-cancel="commentCancel"> </CommentInfoForm>
     </el-drawer>
 
   </div>
@@ -397,7 +395,14 @@ export default {
 
       this.openComment=true;
     },
-
+    commentDone(){
+      // this.selData = val;
+      this.openComment=false;
+      this.getList();
+    },
+    commentCancel(){
+      this.openComment=false;
+    },
     /** 查询扫描记录列表 */
     getList() {
       this.loading = true;