diff --git a/src/components/common/PopupQuesResult.vue b/src/components/common/PopupQuesResult.vue
index 6ad428fd5..782a63e2d 100644
--- a/src/components/common/PopupQuesResult.vue
+++ b/src/components/common/PopupQuesResult.vue
@@ -26,17 +26,17 @@
         <div class='tips'>建议您充分考察该产品的特征，自行做出投保决定，请您确保您的决定是独立、自主、真实的。</div>
       </div>
       <!-- 未测评过底部按钮 -->
-      <div class="bottom-btn bg-white flex" v-if="showNoTested">
-        <van-button type="danger" square size="large" plain v-no-more-click="1000" @click="reTest">重新测评</van-button>
+      <div class="bottom-btn bg-white flex">
+        <van-button type="danger" square size="large" plain v-no-more-click="1000" @click="reTest" v-if="showRetest">重新测评</van-button>
         <van-button type="danger" square size="large"  v-no-more-click="1000"  @click="toInsure">我已知晓，继续投保</van-button>
       </div>
 
       <!-- 已测评过底部按钮 -->
-      <div class="bottom-btn bg-white flex testBtn" v-if="showHasTested">
+      <!-- <div class="bottom-btn bg-white flex testBtn" v-if="showHasTested">
         <van-button type="danger" square size="large" plain v-no-more-click="1000" @click="goBack">上一步</van-button>
         <van-button type="danger" square size="large" class="btn"   v-no-more-click="1000"  @click="goNext">已知晓，继续投保</van-button>
         <van-button type="danger" square size="large"  v-no-more-click="1000"  @click="reStart">重新评估</van-button>
-      </div>
+      </div> -->
   
     </van-popup>
   </div>
@@ -49,11 +49,7 @@ export default {
       type: Boolean,
       default: false
     },
-    showNoTested: {  //未测评过
-      type: Boolean,
-      default: false
-    },
-    showHasTested: {  //已测评过
+    showRetest: {  //展示重新测评
       type: Boolean,
       default: false
     },
@@ -91,24 +87,11 @@ export default {
     reTest(){
       this.$emit('reTestHandler')
     },
+    
     //1.2 我已知晓，继续投保
     toInsure(){
       this.$emit('toInsureHandler')
     },
-  
-    //2.已测评过弹窗按钮
-    //2.1 上一步
-    goBack(){
-      this.$emit('goBackHandler')
-    },
-    //2.2 下一步
-    goNext(){
-      this.$emit('goNextHandler')
-    },
-    //2.3 重新评估
-    reStart(){
-      this.$emit('reStartHandler')
-    }
   }
 }
 </script>
diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue
index f88e2f2f4..6c75bd7e0 100644
--- a/src/views/ebiz/common/SelectedProduct.vue
+++ b/src/views/ebiz/common/SelectedProduct.vue
@@ -141,16 +141,7 @@
         </div>
       </van-submit-bar>
     </div>
-    <PopupQuesResult 
-      @goBackHandler="goBack"
-      @goNextHandler="goNext"
-      @reStartHandler="reStart"
-      @clickOverlayHandler="clickOverlay"
-      :showResultPopup="showResultPopup" 
-      :showHasTested = "showHasTested"
-      :resultRiskType = 'resultRiskType'
-      :appntInfo="saleInsuredInfo"     
-    />
+
   </div>
 </template>
 <script>
@@ -163,7 +154,6 @@
   import utilsAge from '@/assets/js/utils/age'
   import IndexBar from '@/components/ebiz/sale/IndexBar'
   import riskRules from './risk-rules'
-  import PopupQuesResult from '@/components/common/PopupQuesResult'
 
   export default {
     name: 'selectedProduct',
@@ -195,10 +185,7 @@
 
 
         saleInsuredInfo: {},   //投保人信息
-        showResultPopup:false, //测评弹窗弹窗
-        showHasTested:false,  //已经测评过
         assessFlag:"", //是否需要填写适应性问卷
-        resultRiskType:'', //评估结果
       }
     },
     components: {
@@ -210,7 +197,6 @@
       [RadioGroup.name]: RadioGroup,
       [Radio.name]: Radio,
       [Image.name]: Image,
-      [PopupQuesResult.name]: PopupQuesResult
     },
     async mounted() {
       this.$jump({
@@ -1053,8 +1039,7 @@
                   this.resultRiskType = res.orderDTO.orderInfoDTO.resultRiskType
                   console.log('this.assessFlag',this.assessFlag)
                   //return
-                  if(this.assessFlag === '0'){ //需要填写问卷
-                    localStorage.setItem('evalateFrom', 'toEvaluate')  //通过该字段确定跳回几层
+                  if(this.assessFlag === '0'||this.assessFlag === '2'){ //需要填写问卷
                     this.$jump({
                       flag: 'h5',
                       extra: {
@@ -1064,14 +1049,10 @@
                         path:`/sale/questionEvaluate?orderNo=${this.$route.query.orderNo}`
                       }
                     }) 
-                  }else if( this.assessFlag === '3'){ //3.不需要填写，已有有效期的问卷，需展示结论
-                    localStorage.setItem('evalateFrom', 'toResult')
-                    this.showResultPopup = true
-                    this.showHasTested = true
-                  }else{
-                    if(this.assessFlag === '2'){
-                      this.$toast('已超过评估次数限制，无法重新评估')
-                    }
+                  } else{
+                    // if(this.assessFlag === '2'){
+                    //   this.$toast('已超过评估次数限制，无法重新评估')
+                    // }
                     this.$jump({
                       flag: 'h5',
                       extra: {
@@ -1106,10 +1087,7 @@
           })
         }
       },
-      //做过测评，点击上一步
-      goBack(){
-        this.showResultPopup = false
-      },
+
       goNext(){
         this.$jump({
           flag: 'h5',
@@ -1133,9 +1111,6 @@
             path: `/sale/questionEvaluate?orderNo=${this.$route.query.orderNo}`
           }
         })
-      },
-      clickOverlay(){
-        this.showResultPopup = false
       }
     }
   }
diff --git a/src/views/ebiz/sale/questionEvaluate.vue b/src/views/ebiz/sale/questionEvaluate.vue
index 5ba8a26af..26e773c31 100644
--- a/src/views/ebiz/sale/questionEvaluate.vue
+++ b/src/views/ebiz/sale/questionEvaluate.vue
@@ -25,8 +25,9 @@
           <!-- 单选框 -->
           <div v-if="item.type=='radio'">
             <p style="margin:2vh 0">{{ item.title }}</p>
-            <van-radio-group  class="mb15" v-model="answerList[idx]" @change="handlerRadio($event,item,idx)">
+            <van-radio-group  :disabled='disableEdit' class="mb15" v-model="answerList[idx]" @change="handlerRadio($event,item,idx)">
               <van-radio 
+                @click="clickHandler"
                 class="mb15"
                 v-for="(itemRadio,idxRadio) in item.options" 
                 :name="itemRadio.option"
@@ -40,11 +41,13 @@
           <div v-if="item.type=='checkbox'">
             <p style="margin:2vh 0">{{ item.title }}</p>
             <van-checkbox-group 
-              v-model="answerList[idx]"   
+              :disabled='disableEdit'
+              v-model="answerList[idx]"                
               @change="handlerCheckbox($event,item,idx)"
             > 
               <van-checkbox 
                 class="mb15"
+                @click="clickHandler"
                 v-for="(itemCheckbox,idxCheckbox) in item.options" 
                 :name="itemCheckbox.option" 
                 :key="idxCheckbox"
@@ -54,8 +57,9 @@
                 {{itemCheckbox.item}}
                 <div class="question-detail-checkbox" v-if="showPurpose&&idxCheckbox==1" @click.stop>
                   <p class="c-link mt10 mb10 fs12">除本次投保外，您是否已为被保险人投保过类似损失补偿型保险产品（如百万医疗险等以报销住院费用为保障的产品）且保单目前仍在有效中？</p>
-                  <van-radio-group v-model="CheckBoxExtraRadio" class="extraRadio flex pb10 fs10" direction="horizontal" @click.stop>
+                  <van-radio-group  :disabled='disableEdit' v-model="CheckBoxExtraRadio" class="extraRadio flex pb10 fs10" direction="horizontal" @click.stop>
                     <van-radio 
+                      @click="clickHandler"
                       :name="part.option" 
                       @click.stop v-for="(part,partIdx) in itemCheckbox.parts[0].options"
                     >
@@ -63,7 +67,7 @@
                   </van-radio>
                   </van-radio-group>
           
-                  <van-field class="extraInput" label-width="0" v-model="CheckBoxExtraDesc" placeholder="请说明险种名称、保额："  v-if="CheckBoxExtraRadio === 'Y'" @click.stop/>
+                  <van-field class="extraInput"  :readonly='disableEdit' label-width="0" v-model="CheckBoxExtraDesc" placeholder="请说明险种名称、保额："  v-if="CheckBoxExtraRadio === 'Y'" @click.stop="clickHandler"/>
                 </div>
               </van-checkbox>
             </van-checkbox-group>
@@ -77,9 +81,12 @@
                 {{ segment }}
                 <!-- 除了最后一个片段外，每个文本片段后都添加输入框 -->
                 <input
+                  :readonly='disableEdit'
                   v-if="index < item.title.split(/\___/).length - 1"
                   type="number"
+                  @click="clickHandler"
                   @input="handlerInput($event,item,idx,index)"
+                  :value="answerList[idx] && answerList[idx][index] ? answerList[idx][index] : ''"
                   step="0.01"
                   min="0"
                   class="budget-input"
@@ -100,8 +107,7 @@
       @clickOverlayHandler="clickOverlay"
       :resultRiskType = "resultRiskType"
       :showResultPopup="showResultPopup" 
-      :showHasTested = "showHasTested"
-      :showNoTested="showNoTested" 
+      :showRetest = "showRetest"
       :appntInfo="saleInsuredInfo"
     />
   </div>
@@ -127,10 +133,15 @@ export default {
       questionInfo:{},
       questionList:[],
       assessQuestionnaireDtoList:[],
+      originalAssessQuestionnaireDtoList: [], // 存储原始数据，用于比较是否有修改
       CheckBoxExtraRadio:'',
       CheckBoxExtraDesc:'',
       disabled:true,
       assessFlag:null,
+      updateFlag:'1', // 默认为未修改状态
+      showRetest:true,
+      assessUpdateLimitFlag :null,
+      disableEdit:false,  //禁用选项框
     }
   },
   watch: {
@@ -148,16 +159,20 @@ export default {
               Array.from(newVal)[3].chooseDesc.split(',').some(item=>!item)||
               !Array.from(newVal)[4].chooseDesc
             ){
+              console.log('检测到了有空值1')
               this.disabled = true
             }else if(Array.from(newVal)[1].choose.length==0){
+              console.log('检测到了有空值2')
               this.disabled = true
             }else if(Array.from(newVal)[1].choose.length>0&&Array.from(newVal)[1].choose.includes('B')){
               console.log('检测到了B', Array.from(newVal)[1])
               if(Array.from(newVal)[1].subOption=='Y' && !Array.from(newVal)[1].subOptionContent){
+                console.log('检测到了有空值3')
                 this.disabled = true
               }else if(Array.from(newVal)[1].subOption=='N'){
                 this.disabled = false
               }else if(!Array.from(newVal)[1].subOption){
+                console.log('检测到了有空值4')
                 this.disabled = true
               }
               else{
@@ -171,6 +186,7 @@ export default {
         },
       deep: true
     },
+    
     CheckBoxExtraRadio: {
       handler(newVal) {
         if(!!newVal&&this.answerList[1].includes('B')) {
@@ -239,28 +255,7 @@ export default {
     }
     window.appCallBack = this.appCallBack
     document.body.style.backgroundColor = '#fff'
-    const orderNo = this.$route.query.orderNo
-
-    getOrderDetail({ orderNo: this.$route.query.orderNo,userAssessLogic:true }).then(res => {
-      if (res.result == 0) {
-        //是否做过测评及是否超出限制
-        this.assessFlag = res.orderDTO.orderInfoDTO.assessFlag
-        this.questionInfo = res.orderDTO.orderInfoDTO.assessQuestionnaireDto
-        this.questionList =  res.orderDTO.orderInfoDTO.assessQuestionnaireDto.questionList
-        this.ageList = res.orderDTO.orderInfoDTO.assessQuestionnaireDto.questionList[0].options.map(item=>item.item)
-        if (this.$CacheUtils.getLocItem('saleInsuredInfo')) {
-          this.saleInsuredInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo'))
-           
-        }else{
-          this.saleInsuredInfo = res.orderDTO.appntDTO
-        } 
-        console.log('投保人信息',this.saleInsuredInfo)  
-        this.handlerFirstQuestion()
-        console.log('this.ageList',this.ageList,this.questionList)
-      } else {
-        this.$toast(res.resultMessage)
-      }
-    })
+    this.getDetailInfo() 
   },
   methods: {
     appCallBack(data) {
@@ -291,9 +286,200 @@ export default {
               return
             })
         }
-      },
+    },
+    getDetailInfo(){
+      const orderNo = this.$route.query.orderNo
+      getOrderDetail({ orderNo: this.$route.query.orderNo,userAssessLogic:true }).then(res => {
+        if (res.result == 0) {
+          //是否做过测评及是否超出限制
+          this.assessUpdateLimitFlag = res.orderDTO.orderInfoDTO.assessUpdateLimitFlag
+          this.assessFlag = res.orderDTO.orderInfoDTO.assessFlag
+          this.questionInfo = res.orderDTO.orderInfoDTO.assessQuestionnaireDto
+          this.questionList =  res.orderDTO.orderInfoDTO.assessQuestionnaireDto.questionList
+          this.ageList = res.orderDTO.orderInfoDTO.assessQuestionnaireDto.questionList[0].options.map(item=>item.item)
+          if(this.assessUpdateLimitFlag==='0'||this.assessFlag==='2'){
+            this.disableEdit  = true
+          }      
+          // 标记是否有历史评估数据
+          const hasHistoryData = res.orderDTO.orderInfoDTO.assessQuestionnaireDtoList && 
+                              res.orderDTO.orderInfoDTO.assessQuestionnaireDtoList.length > 0
+
+
+          //获取测评结果，对数据进行回显
+          if(hasHistoryData){
+          // const hasHistoryData = [
+          //     {
+          //     "orderNo": "8186270000128527",
+          //     "questionNo": "7",
+          //     "questionContent": "7.您能够并愿意为购买保险支付保费的最长年期为？",
+          //     "choose": "E",
+          //     "chooseContent": "超过20年",
+          //     "subOption": null,
+          //     "subOptionContent": null,
+          //     "score": "10",
+          //     "chooseDesc": null,
+          //     "appntIdNo": "130626198012270019",
+          //     "appntName": "腊月二七",
+          //     "appntIsFirst": "0",
+          //     "assessDate": "2025-11-06T03:52:30.000+0000"
+          //   },
+            
+          //   {
+          //     "orderNo": "8186270000128527",
+          //     "questionNo": "2",
+          //     "questionContent": "2.您购买保险产品的目的？（可多选）",
+          //     "choose": "A,B,C,D,E",
+          //     "chooseContent": "为应对不时之需提供财务保障（死亡、意外、伤残、重大疾病等）;为支付或补偿门诊、住院等医疗、保健的费用支出;为未来生活规划所需的资金，保单利益确定（养老、子女教育、退休收入等）;可获利一定的浮动收益（例如：有分红、有最低保证利率的产品等）;其他",
+          //     "subOption": "Y",
+          //     "subOptionContent": "uuuu",
+          //     "score": "20",
+          //     "chooseDesc": null,
+          //     "appntIdNo": "130626198012270019",
+          //     "appntName": "腊月二七",
+          //     "appntIsFirst": "0",
+          //     "assessDate": "2025-11-06T03:52:30.000+0000"
+          //   },
+
+          //   {
+          //     "orderNo": "8186270000128527",
+          //     "questionNo": "4",
+          //     "questionContent": "4.您本次购买保险的保费预算是:一次性交清预算：___万元；期交预算（每期保费*总交费期数)：___万元。",
+          //     "choose": null,
+          //     "chooseContent": null,
+          //     "subOption": null,
+          //     "subOptionContent": null,
+          //     "score": null,
+          //     "chooseDesc": "8888,888",
+          //     "appntIdNo": "130626198012270019",
+          //     "appntName": "腊月二七",
+          //     "appntIsFirst": "0",
+          //     "assessDate": "2025-11-06T03:52:30.000+0000"
+          //   },
+          //   {
+          //     "orderNo": "8186270000128527",
+          //     "questionNo": "5",
+          //     "questionContent": "5.您的家庭年收入约为（折合人民币）：___万元。",
+          //     "choose": null,
+          //     "chooseContent": null,
+          //     "subOption": null,
+          //     "subOptionContent": null,
+          //     "score": null,
+          //     "chooseDesc": "888",
+          //     "appntIdNo": "130626198012270019",
+          //     "appntName": "腊月二七",
+          //     "appntIsFirst": "0",
+          //     "assessDate": "2025-11-06T03:52:30.000+0000"
+          //   },
+            
+          //   {
+          //     "orderNo": "8186270000128527",
+          //     "questionNo": "6",
+          //     "questionContent": "6.您能够并愿意为购买保险支付的期交保费之和占家庭年收入的比例是：",
+          //     "choose": "D",
+          //     "chooseContent": "70%以上",
+          //     "subOption": null,
+          //     "subOptionContent": null,
+          //     "score": "10",
+          //     "chooseDesc": null,
+          //     "appntIdNo": "130626198012270019",
+          //     "appntName": "腊月二七",
+          //     "appntIsFirst": "0",
+          //     "assessDate": "2025-11-06T03:52:30.000+0000"
+          //   }  ,    
+          //   {
+          //     "orderNo": "8186270000128527",
+          //     "questionNo": "3",
+          //     "questionContent": "3.您希望享有最长保障或投资期限为多久？",
+          //     "choose": "B",
+          //     "chooseContent": "1-5年",
+          //     "subOption": null,
+          //     "subOptionContent": null,
+          //     "score": "4",
+          //     "chooseDesc": null,
+          //     "appntIdNo": "130626198012270019",
+          //     "appntName": "腊月二七",
+          //     "appntIsFirst": "0",
+          //     "assessDate": "2025-11-06T03:52:30.000+0000"
+          // },   
+          //    {
+          //     "orderNo": "8186270000128527",
+          //     "questionNo": "1",
+          //     "questionContent": "1.您的年龄是？",
+          //     "choose": "E",
+          //     "chooseContent": "高于65岁",
+          //     "subOption": null,
+          //     "subOptionContent": null,
+          //     "score": "-15",
+          //     "chooseDesc": null,
+          //     "appntIdNo": "130626198012270019",
+          //     "appntName": "腊月二七",
+          //     "appntIsFirst": "0",
+          //     "assessDate": "2025-11-06T03:52:30.000+0000"
+          //   },
+          // ]
+
+            // 将返回数组的每一项的orderNo替换为路由携带的，然后赋值给assessQuestionnaireDtoList
+            const processedData = res.orderDTO.orderInfoDTO.assessQuestionnaireDtoList
+              .sort((a, b) => parseInt(a.questionNo) - parseInt(b.questionNo))
+              .map(item => {
+                return {
+                  ...item,
+                  orderNo: this.$route.query.orderNo
+                }
+              }) 
+            // 设置当前数据
+            this.assessQuestionnaireDtoList = processedData
+            console.log('后端返回processedData',processedData)
+            console.log('后端返回assessQuestionnaireDtoList',this.assessQuestionnaireDtoList)     
+          }
+          if (this.$CacheUtils.getLocItem('saleInsuredInfo')) {
+            this.saleInsuredInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo')) 
+          }else{
+            this.saleInsuredInfo = res.orderDTO.appntDTO
+          } 
+          console.log('投保人信息',this.saleInsuredInfo,this.assessQuestionnaireDtoList)  
+          console.log('this.ageList',this.ageList,this.questionList)
+          
+          // 先处理第一个问题（年龄自动填充）
+          this.handlerFirstQuestion()
+          
+          // 如果有后端返回的评估数据，进行回显，并保存原始数据
+          if(hasHistoryData) {
+            this.initFormDataFromAssessment()
+            
+            // 所有数据初始化完成后，立即（同步）保存原始数据副本
+            // 使用同步方式而非 $nextTick，确保在用户操作前完成
+            this.originalAssessQuestionnaireDtoList = JSON.parse(JSON.stringify(this.assessQuestionnaireDtoList))
+            this.updateFlag = '1'  // 有历史数据且未修改
+            console.log('原始数据已保存，updateFlag设置为1（未修改）')
+          } else {
+            // 没有历史数据，这是新填写的问卷
+            // 保存第一题填充后的数据作为"原始数据"（因为第一题是自动填充的，不算用户修改）
+            if (this.assessQuestionnaireDtoList.length > 0) {
+              this.originalAssessQuestionnaireDtoList = JSON.parse(JSON.stringify(this.assessQuestionnaireDtoList))
+              console.log('新问卷-保存第一题自动填充后的数据作为原始数据')
+            }
+            this.updateFlag = '0'  // 新问卷，标记为已修改（需要保存）
+            console.log('新问卷，updateFlag设置为0（需要保存）')
+          }
+      
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      })
+    },
+
+    clickHandler(){
+      if(this.assessFlag==='2'){
+        return this.$toast('已超过评估次数限制，无法重新评估')
+      }else{
+        if(this.assessUpdateLimitFlag==='0'){
+          return this.$toast('已超过当日修改次数限制，无法重新修改')
+        }
+      }
+    },
     //单选框处理数据
-    handlerRadio(e,item, idx) {
+    handlerRadio(e,item, idx) {     
       this.$set(this.assessQuestionnaireDtoList,idx,{
         orderNo:this.$route.query.orderNo,
           questionNo:item.questionNo,
@@ -380,8 +566,7 @@ export default {
           subOptionContent:this.CheckBoxExtraDesc?this.CheckBoxExtraDesc:null,
 
       })
-      console.log('answerList',this.answerList)
-      console.log('this.assessQuestionnaireDtoList',this.assessQuestionnaireDtoList)
+      console.log('answerList,assessQuestionnaireDtoList',this.assessQuestionnaireDtoList)
     },
     filterCheckBoxElement(el,e,item){
       let filterEl =  item.options.filter(cur=>e.includes(cur.option))
@@ -406,6 +591,13 @@ export default {
 
     //处理第一个单选框并自动回显：根据投保人年龄区间，回显对应的选项，并组装数据；
     handlerFirstQuestion(){
+        let no1 = this.assessQuestionnaireDtoList.findIndex(item=>item.questionNo=='1')
+        // 如果已经有第一题的数据（从后端回显的），则只更新answerList用于显示，不修改assessQuestionnaireDtoList
+        const hasFirstQuestionData = this.assessQuestionnaireDtoList && 
+                                     this.assessQuestionnaireDtoList.length > 0 && 
+                                     this.assessQuestionnaireDtoList[no1] && 
+                                     this.assessQuestionnaireDtoList[no1].choose
+        
         let age = this.saleInsuredInfo.age
         console.log('投保人年龄',age)
         let answer;
@@ -422,25 +614,31 @@ export default {
         }else{
           answer = "E"
         }
-        this.answerList[0] = answer  //单选框自动回显
-        let firstChoice = this.questionList[0].options.filter(item=>item.option==answer)
-        console.log('res',firstChoice,this.questionList[0],this.questionList[0].options)
-        this.$set(this.assessQuestionnaireDtoList,0,{
-            orderNo:this.$route.query.orderNo,
-            questionNo:this.questionList[0].questionNo,
-            questionContent:this.questionList[0].title,
-            choose:answer,
-            chooseContent:this.filterRadioElement('content',answer,this.questionList[0]),
-            subOption:null,
-            subOptionContent:null,
-            score:this.filterRadioElement('score',answer,this.questionList[0]),
-            chooseDesc:null, 
-
-        })
-
+        
+        // 始终设置answerList用于页面显示
+        this.answerList[0] = hasFirstQuestionData ? this.assessQuestionnaireDtoList[no1].choose : answer
+        
+        // 只有在没有回显数据时，才创建新的第一题数据
+        if (!hasFirstQuestionData) {
+          let firstChoice = this.questionList[0].options.filter(item=>item.option==answer)
+          this.$set(this.assessQuestionnaireDtoList,0,{
+              orderNo:this.$route.query.orderNo,
+              questionNo:this.questionList[0].questionNo,
+              questionContent:this.questionList[0].title,
+              choose:answer,
+              chooseContent:this.filterRadioElement('content',answer,this.questionList[0]),
+              subOption:null,
+              subOptionContent:null,
+              score:this.filterRadioElement('score',answer,this.questionList[0]),
+              chooseDesc:null, 
+          })
+        } else {
+          console.log('第一题已有回显数据，不重新创建')
+        }
     },
     clickOverlay(){
       this.showResultPopup = false
+      this.getDetailInfo()
     },
     submitAnswer(){
       if(this.answerList.length !=this.questionList.length){
@@ -463,14 +661,12 @@ export default {
 
         }
       }
-      let regex = /^([1-9]\d{0,3}|10000)$/;
+      let regex = /^(0|[1-9]\d{0,3}|10000)$/;
       if(Array.from(this.answerList[3]).some(item=>{return !regex.test(item)})
         || !regex.test(this.answerList[4][0])){
         return this.$toast('请填写1-10000之间的整数')
-      }
-      if(this.assessFlag === '2'){
-        return this.$toast('已超过评估次数限制，无法重新评估')
-      }
+      } 
+      this.checkDataChanged()
       this.getEvaluateResult()
     },
 
@@ -482,13 +678,39 @@ export default {
         loadingType: 'spinner',
         message: '加载中……'
       })
-      saveEvalateAnswer({assessQuestionnaireDtoList:this.assessQuestionnaireDtoList})
+     
+      saveEvalateAnswer({
+        assessQuestionnaireDtoList: this.assessQuestionnaireDtoList,
+        updateFlag: this.updateFlag // 0修改，1未修改
+      })
       .then(res =>{
         this.$toast.clear()
         if(res.result== '0'){
-          this.resultRiskType = res.content
-          this.showResultPopup = true
-          this.showNoTested = true
+          // 提交成功后，更新原始数据为当前数据
+          // 这样下次比较时就以这次提交的数据为基准
+          this.originalAssessQuestionnaireDtoList = JSON.parse(JSON.stringify(this.assessQuestionnaireDtoList))
+          this.updateFlag = '1' // 重置为未修改状态
+          console.log('提交成功，原始数据已更新为当前提交的数据')
+          
+          getOrderDetail({ orderNo: this.$route.query.orderNo,userAssessLogic:true }).then(resp=>{
+            if(resp.result=='0'){
+              this.assessFlag = resp.orderDTO.orderInfoDTO.assessFlag  //评估次数
+              this.assessUpdateLimitFlag = resp.orderDTO.orderInfoDTO.assessUpdateLimitFlag //0置灰，其他情况可以点击，不能修改，重新评估按钮隐藏
+              if(this.assessUpdateLimitFlag==='0'||this.assessFlag==='2'){
+                this.disableEdit  = true
+                this.showRetest = false
+                //隐藏测评按钮
+              }else{
+                this.showRetest = true
+              }
+              this.resultRiskType = res.content
+              this.showResultPopup = true
+              this.showNoTested = true
+            }else{
+              this.$toast(resp.resultMessage)
+            }
+          })
+
         }else{
           this.$toast(res.resultMessage)
         }
@@ -500,9 +722,196 @@ export default {
     },
     //未测评过，测评成功后重新测评
     reTest(){
-      window.location.reload()
+        if(this.assessFlag==='2'){
+          return this.$toast('已超过评估次数限制，无法重新评估')
+        }else{
+          if(this.assessUpdateLimitFlag==='0'){
+            return this.$toast('已超过当日修改次数限制，无法重新修改')
+          }else{
+            window.location.reload()
+          }
+        }
     },
 
+    // 根据assessQuestionnaireDtoList回显表单数据
+    initFormDataFromAssessment() {
+      if (!this.assessQuestionnaireDtoList || this.assessQuestionnaireDtoList.length === 0) return
+      
+      // 遍历assessQuestionnaireDtoList，根据问题编号回显数据
+      this.assessQuestionnaireDtoList.forEach((item, index) => {
+        // 找到对应的问题
+        const questionIndex = this.questionList.findIndex(q => q.questionNo === item.questionNo)
+        console.log('questionIndex',questionIndex )
+        if (questionIndex === -1) return
+        if (questionIndex === 0) return 
+        const question = this.questionList[questionIndex]
+        console.log('question',question )     
+        // 根据问题类型进行不同的回显处理
+        switch (question.type) {
+          case 'radio':
+            // 单选框回显
+            this.$set(this.answerList, questionIndex, item.choose)
+            break
+            
+          case 'checkbox':
+            // 多选框回显
+            if (item.choose) {
+              // 将逗号分隔的选项转为数组
+              const chooseArray = item.choose.split(',')
+              console.log('chooseArray',chooseArray)
+              this.$set(this.answerList, questionIndex, chooseArray)
+              
+              // 如果选择了B选项，回显子选项
+              if (chooseArray.includes('B')) {
+                this.showPurpose = true
+                this.CheckBoxExtraRadio = item.subOption || ''
+                this.CheckBoxExtraDesc = item.subOptionContent || ''
+              }
+            }
+            break
+            
+          case 'input':
+            // 输入框回显
+            if (item.chooseDesc) {
+              // 初始化answerList对应位置为数组
+              if (!this.answerList[questionIndex]) {
+                this.$set(this.answerList, questionIndex, [])
+              }
+              
+              // 第四题和第五题特殊处理
+              if (questionIndex === 3) { // 第四题
+                // 第四题有两个输入框，chooseDesc格式为"值1,值2"
+                const values = item.chooseDesc.split(',')
+                if (values.length >= 2) {
+                  this.$set(this.answerList[questionIndex], 0, values[0])
+                  this.$set(this.answerList[questionIndex], 1, values[1])
+                  
+                  // 更新DOM中的输入框值
+                  this.$nextTick(() => {
+                    const inputs = document.querySelectorAll(`div[v-if="item.type=='input'"] input`)
+                    if (inputs && inputs.length >= 2) {
+                      inputs[0].value = values[0]
+                      inputs[1].value = values[1]
+                    }
+                  })
+                }
+              } else if (questionIndex === 4) { // 第五题
+                // 第五题只有一个输入框，chooseDesc直接就是值
+                this.$set(this.answerList[questionIndex], 0, item.chooseDesc)
+                
+                // 更新DOM中的输入框值
+                this.$nextTick(() => {
+                  const inputs = document.querySelectorAll(`div[v-if="item.type=='input'"] input`)
+                  if (inputs && inputs.length >= 3) { // 第三个输入框是第五题的
+                    inputs[2].value = item.chooseDesc
+                  }
+                })
+              } else {
+                // 其他输入框的通用处理
+                const values = item.chooseDesc.split(',')
+                values.forEach((val, idx) => {
+                  this.$set(this.answerList[questionIndex], idx, val)
+                })
+              }
+            }
+            break
+        }
+      })
+      
+      console.log('表单数据回显完成', this.answerList)
+    },
+    
+    // 检测数据是否发生变化
+    checkDataChanged() {
+      // 如果没有原始数据，不修改 updateFlag，保持之前设置的值（应该是 '0'）
+      if (!this.originalAssessQuestionnaireDtoList || this.originalAssessQuestionnaireDtoList.length === 0) {
+        console.log('没有原始数据，保持 updateFlag 为:', this.updateFlag)
+        return
+      }
+      
+      // 如果数据长度不一致，返回修改状态
+      if (this.assessQuestionnaireDtoList.length !== this.originalAssessQuestionnaireDtoList.length) {
+        console.log('数据长度不一致', {
+          current: this.assessQuestionnaireDtoList.length,
+          original: this.originalAssessQuestionnaireDtoList.length
+        })
+        this.updateFlag = '0'
+        return
+      }
+      
+      console.log('========== 开始比较数据 ==========')
+      // 比较每一项数据
+      let isChanged = false
+      const changedDetails = []
+      
+      for (let i = 0; i < this.assessQuestionnaireDtoList.length; i++) {
+        const current = this.assessQuestionnaireDtoList[i]
+        const original = this.originalAssessQuestionnaireDtoList[i]
+        
+        // 详细比较每个字段
+        const fieldChanges = {
+          questionIndex: i,
+          questionNo: current.questionNo,
+          changes: {}
+        }
+        
+        if (this.isValueChanged(current.choose, original.choose)) {
+          fieldChanges.changes.choose = { current: current.choose, original: original.choose }
+        }
+        if (this.isValueChanged(current.chooseContent, original.chooseContent)) {
+          fieldChanges.changes.chooseContent = { current: current.chooseContent, original: original.chooseContent }
+        }
+        if (this.isValueChanged(current.subOption, original.subOption)) {
+          fieldChanges.changes.subOption = { current: current.subOption, original: original.subOption }
+        }
+        if (this.isValueChanged(current.subOptionContent, original.subOptionContent)) {
+          fieldChanges.changes.subOptionContent = { current: current.subOptionContent, original: original.subOptionContent }
+        }
+        if (this.isValueChanged(current.chooseDesc, original.chooseDesc)) {
+          fieldChanges.changes.chooseDesc = { current: current.chooseDesc, original: original.chooseDesc }
+        }
+        if (this.isValueChanged(current.score, original.score)) {
+          fieldChanges.changes.score = { current: current.score, original: original.score }
+        }
+        
+        if (Object.keys(fieldChanges.changes).length > 0) {
+          changedDetails.push(fieldChanges)
+          isChanged = true
+        }
+      }
+      
+      // 只有在数据真正发生变化时才修改 updateFlag
+      // 如果数据未变化，保持原来的值不变
+      if (isChanged) {
+        this.updateFlag = '0'  // 数据已修改
+        console.log('检测到数据变化，详细信息:', changedDetails)
+        console.log('updateFlag 设置为 0（已修改）')
+      } else {
+        console.log('数据未发生变化，updateFlag 保持不变:', this.updateFlag)
+      }
+      console.log('========== 比较数据结束 ==========')
+    },
+    
+    // 辅助函数：判断两个值是否发生变化（处理null、undefined、空字符串、类型转换等情况）
+    isValueChanged(currentValue, originalValue) {
+      // 将null、undefined、空字符串都视为"空值"
+      const normalizeValue = (val) => {
+        if (val === null || val === undefined || val === '') {
+          return null
+        }
+        // 统一转换为字符串进行比较，避免类型不一致导致的误判
+        return String(val)
+      }
+      
+      const normalizedCurrent = normalizeValue(currentValue)
+      const normalizedOriginal = normalizeValue(originalValue)
+      
+      // 比较标准化后的值
+      const isChanged = normalizedCurrent !== normalizedOriginal
+      
+      return isChanged
+    },
+    
     //继续投保，跳转至评估结果页
     toInsure(){  
       this.$jump({