Merge remote-tracking branch 'origin/new' into tempMaster

src/common/Input.vue

@@ -5,6 +5,7 @@
           :class="{'change':borColor}" 
           v-model="val" 
           @input="changeVal" 
+          @focus="focus"
           @blur="blur">
   </div>
 </template>
@@ -38,6 +39,9 @@
         // this.borColor = false;
         // const newData = Object.assign({},this.item,{value:this.val,valueP:this.val});
         // this.$emit("updata",newData);
+      },
+      focus(e){
+        this.$emit('focusPosition',e)
       }
     },
     watch:{

src/common/RadioSelect.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="radio-wrap radioSelect" v-if="item">
     <p v-for="(it,index) in datas.questionDetailList" :key="it.id" class="list">
-      <img @click="handleClick(it,index,true,1)" :src="it.select==1?check:defaultPic"> 有&nbsp;&nbsp;&nbsp;&nbsp;
-      <img @click="handleClick(it,index,true,2)" :src="it.select==2?check:defaultPic"> 无
+      <img @click="handleClick(it,index,true,1)" :src="it.select==1?check:defaultPic"> <i @click="handleClick(it,index,true,1)">有</i>&nbsp;&nbsp;&nbsp;&nbsp;
+      <img @click="handleClick(it,index,true,2)" :src="it.select==2?check:defaultPic"> <i @click="handleClick(it,index,true,2)">无</i>
       <span v-if="((it.description||it.name).indexOf('${'))==-1" :class="{'check':it.select==1||it.select==2}">{{it.description||it.name}}</span>
     </p>
   </div>

src/common/UploadImg.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="img-wrap">
     <div class="box">
+      
       <ul class="upload-imgs">
         <li
           v-show="imgLen<6"
           class="uploadBox"
-          @click="handleUpload"
         >
           <input
             type="file"
@@ -13,7 +13,6 @@
             @change="addImg"
             accept="image/*"
             ref="inp"
-            style="display:none"
           />
           <img src="../images/upload.png">
           <p>点击上传</p>
@@ -37,7 +36,7 @@
   </div>
 </template>
 <script type="text/javascript">
-import {isIos,isWX} from '@utils/tools';
+import {isIos,isWX,isQQ} from '@utils/tools';
 import $ from 'jquery';
 export default {
   name: 'UploadImg',
@@ -54,12 +53,17 @@ export default {
     this.imgs = this.imgList; //回读
     this.imgLen = Object.keys(this.imgList).length;
     this.$previewRefresh();//预览刷新
-    if(isIos()){
+    /*if(isIos()){
       $('.upload').removeAttr("capture")
     }else if(!isWX()){ 
     // 微信端添加这个属性直接调拍照
     //安卓手机且非微信端添加相机属性，否则QQ浏览器打不开相机
       $('.upload').attr("capture","camera")
+    }*/
+    if(isQQ() && !isIos()){
+      $('.upload').attr("capture","camera")
+    }else{
+      $('.upload').removeAttr("capture")
     }
   },
   methods: {
@@ -188,6 +192,14 @@ export default {
   font-size: 0.3rem;
   .upload-imgs {
     margin-bottom: 0.2rem;
+    .upload{
+      width: 1.86rem;
+      height: 100%;
+      position: absolute;
+      left: 0;
+      z-index: 66;
+      opacity: 0;
+    }
     .uploadBox {
       border: 1px solid #dfe0e4;
       box-sizing: border-box;

src/components/Department.vue

@@ -2,12 +2,13 @@
     <div class="department">
         <div class="departmentView">
             <div class="content">
-                <div class="list" v-for="(item,index) in departmentLis" @click="goStart(index,item.recordTime)" :key="item.recordTime">
+                <div class="list" v-for="(item,index) in departmentLis" @click="goStart(index,item.recordTime)" :key="item.hospitalDeptName">
                     <div class="top">
                         <p>挂号科室：{{item.hospitalDeptName}} <img src="../images/right.png" alt=""></p>
                     </div>
                     <div class="main">
                         <p>预约时间：{{item.recordTime}}</p>
+                        <p>姓名：{{item.patientName}}</p>
                         <p>病历号：{{item.recordId}}</p>
                         <p>挂号信息：{{item.registerNum}}</p>
                         <p v-if="item.dided">您已完成过一次预问诊，是否再次录入</p>

src/components/DetailBox.vue

@@ -23,7 +23,7 @@
       </div>
     </div>
     <!-- <div :class="['foot',{'noCheck':!checkF}]" @click="complete">完成</div> -->
-    <div :class="['foot',{'noCheck':!reqFinish}]" @click="complete">完成</div>
+    <div :class="['foot',{'noCheck':!checkF || !reqFinish}]" @click="complete">完成</div>
     <Toast :message="clearTxt" 
           :show="showToast"
           @comfirn="comfirnDel" 
@@ -100,7 +100,7 @@
       //有选中内容才可以点完成#1919
         // if(this.checkF){
       //必填项都填完了才可以点完成
-        if(this.reqFinish){
+        if(this.reqFinish && this.checkF){
           this.$refs.detail.saveData();
           this.$store.commit('setSearchShow', false);
         }

src/components/DiagTreat.vue

@@ -21,6 +21,7 @@
         <Input v-if="it.controlType==6 || it.controlType==7"
             :item="it"
             :key="it.id"
+            @focusPosition="focusPosition"
             @updata="updataData($event,it.id,i)"/>
         <!-- 文本域 -->
         <ComTextArea v-if="it.controlType == 5"
@@ -99,6 +100,9 @@
       })
     },
     methods:{
+      focusPosition(e){
+        // this.scroll.scrollToElement(e.target,100,0,-40);
+      },
       onScroll(data) {
         this.$store.commit('setScroll', data);
         document.activeElement.scrollIntoViewIfNeeded(true);

src/components/Login.vue

@@ -229,7 +229,7 @@ export default {
 .login {
   height: 100%;
   width: 100%;
-  position: fixed;
+  position: absolute;
   background: linear-gradient(
     180deg,
     rgba(79, 79, 255, 1) 0%,

src/utils/tools.js

@@ -210,6 +210,17 @@ function isWX(){
   }
 }
 
+// 是否QQ浏览器
+function isQQ(){
+  let us = navigator.userAgent.toLowerCase();
+  // if(us.indexOf(' qq')>-1 && us.indexOf('mqqbrowser') <0){
+  if(us.indexOf(' qq')>-1){
+    return true;
+  }else{
+    return false;
+  }
+}
+
 // 监听键盘是否弹起
 function fixedKeyboard() {
   var win_h = $(window).height();
@@ -361,7 +372,8 @@ module.exports =  {
   jgpattern,
   compare,
   dateParser,
-  name
+  name,
+  isQQ
 }