修改功能bug修改3232

src/common/Dialog.vue

@@ -37,11 +37,12 @@ export default {
       extArr.length=cancelTab!==-1?+cancelTab:0;
       cancelExt=getNSum(extArr);
       const  realCNum = ((cancelExt+1)||1)+cancelNum;   //第一个问题不在计数中，所以+1
-      const realNum = ((realExt+1)||1)+num;
+      const realNum = 1+num;
       const realIdx = ((realExt+1)||1)+idx;
       //console.log("cancelNum:",cancelNum,"idx:",idx,"num:",num,"extNum:",extNum,"cancelTab:",cancelTab,"isLast:",isLast);
       //console.log(this.item," realCNum:",realCNum,"realNum:",realNum,"realIdx:",realIdx);
-      if((realCNum<realIdx&&realIdx===realNum-1)||(num===0&&isLast&&cancelNum!==idx)){console.log('true');
+      if((realCNum<realIdx&&realIdx===realNum-1)||(num===0&&isLast&&cancelNum!==idx)){
+        //console.log('true');
         return true;
       }
       return false;

src/components/MainPage.vue

@@ -37,16 +37,16 @@
           <span v-if="!canceledSym&&num<1" class="edit" @click="cancelSymptom">修改</span>
         </div>
         <div v-for="(item,idx) in symptomQasList" :key="'0'+item.id" v-if="activeTab">
-          <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="num" :cancelNum="canceledQa" :extNum ="[]" :cancelTab="cancelTab" :isLast="idx===symptomQasList.length-1"/>
+          <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="activeNum" :cancelNum="canceledQa" :extNum ="[]" :cancelTab="cancelTab" :isLast="idx===symptomQasList.length-1"/>
         </div>
         <div v-for="(item,idx) in diagnoseQasList" :key="'1'+item.id" v-if="activeTab==moduleKeys[1]||activeTab==moduleKeys[2]||activeTab==moduleKeys[3]">
-          <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="num" :extNum ="[symptomQasList.length]" :cancelNum="canceledQa" :cancelTab="cancelTab" :isLast="idx===diagnoseQasList.length-1"/>
+          <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="activeNum" :extNum ="[symptomQasList.length]" :cancelNum="canceledQa" :cancelTab="cancelTab" :isLast="idx===diagnoseQasList.length-1"/>
         </div>
         <div v-for="(item,idx) in othersQasList" :key="'2'+item.id" v-if="activeTab==moduleKeys[2]||activeTab==moduleKeys[3]">
-          <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="num" :extNum ="[symptomQasList.length,diagnoseQasList.length]" :cancelNum="canceledQa" :cancelTab="cancelTab" :isLast="idx===othersQasList.length-1"/>
+          <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="activeNum" :extNum ="[symptomQasList.length,diagnoseQasList.length]" :cancelNum="canceledQa" :cancelTab="cancelTab" :isLast="idx===othersQasList.length-1"/>
         </div>
         <div v-for="(item,idx) in addContentQasList" :key="'3'+item.id" v-if="activeTab==moduleKeys[3]">
-          <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="num" :extNum ="[symptomQasList.length,diagnoseQasList.length,othersQasList.length]" :cancelNum="canceledQa" :cancelTab="cancelTab"/>
+          <Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="activeNum" :extNum ="[symptomQasList.length,diagnoseQasList.length,othersQasList.length]" :cancelNum="canceledQa" :cancelTab="cancelTab"/>
         </div>
       </div>
     </div>
@@ -102,7 +102,7 @@ import MultSelect from '../common/MultSelect.vue';
 import TipWarning from '../common/TipWarning.vue';
 import api from "../utils/api.js";
 import {mapState} from 'vuex';
-import {moduleCP,moduleConfig,getValuesArr} from '@utils/tools'
+import {moduleCP,moduleConfig,getValuesArr,getNSum} from '@utils/tools'
 
 export default {
   name:'MainPage',
@@ -113,6 +113,7 @@ export default {
       allMoudles:[],
       showUsual:false,    //常用症状显示
       activeTab:1,      //当前模块
+      activeNum:0,    //当前问题的index,整体顺序
       scroll:null,
       canceledSym:false,    //是否已修改过主症状
       canceledQa:-1,
@@ -183,6 +184,19 @@ export default {
       return precent*100+"%";
     }
   },
+  watch:{
+    num:function(){
+      let n=0;
+      let numArr=this.moduleKeys.map((i,index)=>{
+        if(this.activeTab!=-1&&i==this.activeTab){
+          n=index;
+        }
+        return this[this.moduleMap[i]+'QasList'].length;
+      });
+      numArr.length=n;
+      this.activeNum = getNSum(numArr)+this.num;
+    }
+  },
   methods:{
     getColumns(){
       return getValuesArr(this.symptomResult.questionDetailList);