Merge branch 'btscroll' of http://192.168.2.236:10080/zhouna/preliminary into btscroll

拉取冲突
# Conflicts:
#	src/components/DiagTreat.vue
#	src/components/Others.vue
#	src/components/Symptom.vue

src/common/Label.vue

@@ -84,7 +84,6 @@ import {moduleCP} from '@utils/tools';
           return
         }
         this.showToast = true;
-        this.$emit("commitShowLabel",false)
         // 底部body不可滑动
         // const prehandler = function(e){e.preventDefault();}
         // document.body.addEventListener("touchmove",prehandler,false)
@@ -130,7 +129,6 @@ import {moduleCP} from '@utils/tools';
       cancelDel(){
         this.showToast = false;
         this.tempItem = {};
-        this.$emit("commitShowLabel",true)
       }
     }
   }

src/common/MultiLineInput.vue

@@ -12,14 +12,14 @@
               v-model="txt"
               :placeholder="item.placeholder"
               @input="changeVal($event,idx,content.type)" 
-              @blur="blur" 
+              @blur="blur"
               @click="handleClick">
             <input v-show="content.iptLis.length==1" class="contentVal" 
               :type="content.type=='number'?'tel':'text'" 
               :placeholder="content.placeholder" 
               v-model="txt" 
               @input="changeVal($event,idx,content.type)" 
-              @blur="blur" 
+              @blur="blur"
               @click="handleClick">
             <span v-if="idx == 0&&content.iptLis.length>1">/</span>
           </template>
@@ -52,7 +52,7 @@ export default {
     select:{ //是否选中
       default:false,
       type:Boolean
-    },
+    }
   },
   data(){
     return {
@@ -92,7 +92,7 @@ export default {
     },
     handleClick(e){
       // 点击输入框时不选中该项
-      document.activeElement.scrollIntoViewIfNeeded(true);
+      // document.activeElement.scrollIntoViewIfNeeded(true);
       e.stopPropagation();
     }
   },

src/components/AddContent.vue

@@ -70,7 +70,8 @@ export default {
       imgUrl:imageUrlPrefix,
       dataTrd: [],
       val: '',
-      allStr:''
+      allStr:'',
+      scroll:null
     }
   },
   created(){
@@ -78,10 +79,15 @@ export default {
   },
   mounted() {
     this.$nextTick(()=>{
-      this.scroll = setScroll(BScroll,true,'.addper')
+      let scroll = setScroll(BScroll,true,'.addper')
+      this.scroll = scroll
+      scroll.on('scroll', this.onScroll)
     })
   },
   methods: {
+    onScroll() {
+      document.activeElement.scrollIntoViewIfNeeded(true);        
+    },
     back() {
       this.$emit("back");
     },
@@ -121,6 +127,9 @@ export default {
       // console.log(allData.filter((item) => item.type == 52))
       this.allStr=getAllStr({data:tmpTrdData&&tmpTrdData[0].moduleDetailDTOList,type:this.allMoudles&&this.allMoudles.type}).allStr
       this.$store.commit('setDataAll',{data:data,idx:idx});
+      this.$nextTick(()=>{
+        this.scroll.refresh()
+      })
     },
   },
   components: {

src/components/DetailBox.vue

@@ -69,6 +69,7 @@
         setTimeout(() => {
           let scroll = setScroll(BScroll,true,'.viewPrew')
           this.scroll = scroll
+          scroll.on('scroll', this.onScroll)
         }, 400);
         // fixedKeyboard();//给Window绑定事件
       })
@@ -79,6 +80,9 @@
       // $('body').css({'height':'100%','overflow-y':'auto'})
     },
     methods:{
+      onScroll() {
+        document.activeElement.scrollIntoViewIfNeeded(true);        
+      },
       close(){
         // this.$emit("close");
         this.$store.commit('setDetail',{detail:{}})

src/components/DiagTreat.vue

@@ -87,16 +87,19 @@
         show:false,
         ppId:null,
         imgUrl:imageUrlPrefix,
+        scroll:null
       }
     },
     props:['datas','preName','nextName','modluesLen'],
     mounted(){
-      let scroll = setScroll(BScroll,true,'.treatper')
-      this.scroll = scroll
-      scroll.on('scroll', this.onScroll)
+      this.$nextTick(()=>{
+        let scroll = setScroll(BScroll,true,'.treatper')
+        this.scroll = scroll
+        scroll.on('scroll', this.onScroll)
+      })
     },
     methods:{
-      onScroll(pos) {
+      onScroll() {
         document.activeElement.scrollIntoViewIfNeeded(true);        
       },
       beBack(){
@@ -134,6 +137,9 @@
         }
         this.$store.commit('setDatas',{type:moduleCP['diagT'],data:data,pId:data.id,ppId:id});
         this.$store.commit('setText',{type:moduleCP['diagT'],text:data.value.replace(patt,'').replace(/\#\{/g,'').replace(/\}/g,''),textP:data.valueP.replace(patt,'').replace(/\#\{/g,'').replace(/\}/g,''),pId:data.id,flag:true}); 
+        this.$nextTick(()=>{
+          this.scroll.refresh()
+        })
       }
     },
     components:{

src/components/Others.vue

@@ -88,10 +88,16 @@
     props:['datas','preName','nextName','modluesLen'],
     created(){},
     mounted(){
-      let scroll = setScroll(BScroll,true,'.otherper')
-      this.scroll = scroll
+      this.$nextTick(()=>{
+        let scroll = setScroll(BScroll,true,'.otherper')
+        this.scroll = scroll
+        scroll.on('scroll', this.onScroll)
+      })
     },
     methods:{
+      onScroll() {
+        document.activeElement.scrollIntoViewIfNeeded(true);
+      },
       beBack(){
         this.$emit('back');
       },
@@ -119,6 +125,10 @@
         // this.$store.commit('setOrigin',{type:'3',data:data,pId:data.id});
         this.$store.commit('setDatas',{type:moduleCP['other'],data:data,pId:data.id,ppId:id});
         this.$store.commit('setText',{type:moduleCP['other'],text:data.value.replace(patt,'').replace(/\#\{/g,'').replace(/\}/g,''),textP:data.valueP.replace(patt,'').replace(/\#\{/g,'').replace(/\}/g,''),pId:data.id,flag:true}); 
+        
+        this.$nextTick(()=>{
+          this.scroll.refresh()
+        })
       },
       getText(){
         let textArr = this.checkText;

src/components/Symptom.vue

@@ -108,10 +108,16 @@ export default {
     }
   },
   mounted(){
-    let scroll = setScroll(BScroll,true,'.symper')
-    this.scroll = scroll
+    this.$nextTick(()=>{
+      let scroll = setScroll(BScroll,true,'.symper')
+      this.scroll = scroll
+      scroll.on('scroll', this.onScroll)
+    })
   },
   methods: {
+    onScroll() {
+      document.activeElement.scrollIntoViewIfNeeded(true);        
+    },
     searchVal(val) {
       console.log(val)
     },