搜索页面症状点击处理

package-lock.json

@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "@babel/runtime": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.0.tgz",
-      "integrity": "sha512-89eSBLJsxNxOERC0Op4vd+0Bqm6wRMqMbFtV3i0/fbaWw/mJ8Q3eBvgX0G4SyrOOLCtbu98HspF8o09MRT+KzQ==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.3.tgz",
+      "integrity": "sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA==",
       "requires": {
         "regenerator-runtime": "^0.13.2"
       },
@@ -26,9 +26,9 @@
       "dev": true
     },
     "@vant/icons": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.1.14.tgz",
-      "integrity": "sha512-KfH33dwTHZY1NDU2hTEwCUAcbkNuqvrY36hedVhWFZbQfGPV1Aywg3v/txh7+7NsACi5IOd4MD9S2ymFB7dUAg=="
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.1.15.tgz",
+      "integrity": "sha512-96tbJotfofrKpOrUGWKkiGLJsCFc0OX5pikWLW5yarD+EMhi0zCrQSDb95xGrp/HETAFm+nSTQu2e1zGsWN/7A=="
     },
     "@vue/babel-helper-vue-jsx-merge-props": {
       "version": "1.0.0",
@@ -11336,12 +11336,12 @@
       }
     },
     "vant": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/vant/-/vant-2.2.2.tgz",
-      "integrity": "sha512-PBtXf9BX4u+1znITgpv4A6g7aTS74zrovgRFLvlJ6iZnArCNfWZKznE5HQ2XETAeK4QcNy5YhhiAljTYYLV56w==",
+      "version": "2.2.10",
+      "resolved": "https://registry.npmjs.org/vant/-/vant-2.2.10.tgz",
+      "integrity": "sha512-O8HhrwMkqwA3fYFDwHLxFNh7ckAafao+4gF0hIdwSjypvEdbd6jgtPep0k3Z+CzPXkvPNUV5XCwR3fSH0AIgKw==",
       "requires": {
         "@babel/runtime": "7.x",
-        "@vant/icons": "1.1.14",
+        "@vant/icons": "1.1.15",
         "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
         "vue-lazyload": "1.2.3"
       }

package.json

@@ -19,7 +19,7 @@
     "less-loader": "^4.1.0",
     "lib-flexible": "^0.3.2",
     "portal-vue": "^2.1.6",
-    "vant": "^2.2.0",
+    "vant": "^2.2.10",
     "vue": "^2.5.2",
     "vue-photo-preview": "^1.1.3",
     "vue-router": "^3.0.1",

src/common/Picker.vue

@@ -45,7 +45,7 @@
         ],
         showTip:false,
         columIndx:[],
-        time:10
+        time:100
       }
     },
     props:['show','picIndex'],

src/common/UploadImg.vue

@@ -89,17 +89,17 @@ export default {
       let file = fileTag.files[0];
       const that = this;
       this.imgBase64(file, function (image, canvas) {
-        var maxSize = 4 * 1024; // 4M
+        var maxSize = 0.5 * 1024; // 4M
         var fileSize = file.size / 1024; //kb 图片大小
         var uploadSrc;
         var uploadFile;
         // console.log(fileSize,'大小')
         if (fileSize > maxSize) { // 如果图片大小大于4m，进行压缩
-          uploadSrc = canvas.toDataURL(file.type, maxSize / fileSize);
+          uploadSrc = canvas.toDataURL(file.type, 0.1);
           uploadFile = that.dataURLtoFile(uploadSrc, file.name.split('.')[0]); // 转成file文件
           // uploadFile = that.convertBase64UrlToBlob(uploadSrc); // 转成blob
         } else {
-          uploadSrc = image.src; 
+          uploadSrc = image.src;
           uploadFile = file;
         }
 

src/components/Detail.vue

@@ -3,7 +3,7 @@
     <!-- <div v-for="(item,index) in datas"> -->
     <div class="preQuestion" v-for="(item,index) in checkDatas.questionMapping">
       <div class="quest" @click="slideToggle(index)">
-        <span class="sign">{{item.required==1?'*':''}}</span>
+        <img class="sign" v-if="item.required==1" src="../images/important.svg" alt="">
         <p class="title clearfix">{{index + 1 +'.'+(item.description || item.name)}}{{item.controlType==1?'(单选)':item.controlType==2?'(多选)':''}}</p>
         <p class="result" v-if="item.valueP&&item.slide!=1">{{item.valueP}}</p>
         <i :class="[{'slideT':item.slide}]"></i>
@@ -178,7 +178,7 @@ import {patt,trimDots,imageUrlPrefix} from '@utils/tools.js'
         }
         // 更新完成样式
         let checkReq = this.checkReq();
-        if(checkReq){
+        if(true){
           this.$emit('checkReq',true)
         }else{
           this.$emit('checkReq',false)
@@ -327,8 +327,8 @@ import {patt,trimDots,imageUrlPrefix} from '@utils/tools.js'
         display: inline-block;
         position: absolute;
         left: 0.16rem;
-        top: 0.5rem;
-        width: 0.1rem;
+        top: 0.52rem;
+        width: 0.15rem;
         color: red;
       }
       .order {

src/components/DetailBox.vue

@@ -26,7 +26,8 @@
     <!-- <div :class="['foot',{'noCheck':!checkF}]" @click="complete">完成</div> -->
     <div style="position:absolute" class="foot">
       <div class="slide" @click="slideAll()">{{btnTxt}}</div>
-      <div class="nextBtn compete" :class="{'noCheck':!checkF || !reqFinish}" @click="complete">完成</div>
+      <!-- <div class="nextBtn compete" :class="{'noCheck':!checkF || !reqFinish}" @click="complete">完成</div> -->
+      <div class="nextBtn compete" @click="complete">完成</div>
     </div>
     <Toast :message="clearTxt" 
           :show="showToast"
@@ -64,7 +65,7 @@
       this.$nextTick(()=>{
         // 校验是否有已填项，有--弹窗；无--return
         let hasCheck = this.$refs.detail.check();
-        let checkReq = this.$refs.detail.checkReq();
+        let checkReq = true || this.$refs.detail.checkReq();
         if(hasCheck){
           this.checkF = true;
         }
@@ -101,8 +102,8 @@
             for(let i in list){
               // if(list[i].required==1 && !list[i].value){
               if(list[i].required==1){
-                this.$store.commit('delChoose', {id: this.privateData.id })
-                this.$store.commit('delText', { type: moduleCP['symp'], pId: this.privateData.id })
+                // this.$store.commit('delChoose', {id: this.privateData.id })
+                // this.$store.commit('delText', { type: moduleCP['symp'], pId: this.privateData.id })
               }
             }
           }
@@ -114,10 +115,12 @@
       //有选中内容才可以点完成#1919
         // if(this.checkF){
       //必填项都填完了才可以点完成
-        if(this.reqFinish && this.checkF){
-          this.$refs.detail.saveData();
-          this.$store.commit('setSearchShow', false);
-        }
+        // if(this.reqFinish && this.checkF){
+        //   this.$refs.detail.saveData();
+        //   this.$store.commit('setSearchShow', false);
+        // }
+        this.$refs.detail.saveData();
+        this.$store.commit('setSearchShow', false);
       },
       changeCheck(flag){//是否有选中项
         this.checkF = flag;
@@ -151,7 +154,6 @@
           const data = read[id];
           this.$store.commit('setDetail',{detail:data,ppId:null,moduleType:moduleCP['symp']})
         }
-        
       },
     },
     components:{

src/components/Login.vue

@@ -114,7 +114,7 @@ export default {
     changeName() {
       document.activeElement.scrollIntoViewIfNeeded(true);
       const { patName } = this;
-      this.patName = patName.replace(/[0-9]*$/,'').replace(/[`~!@#$%^&)(*_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im,'')
+      this.patName = patName.replace(/[`~!@#$%^&)(*_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im,'')
     },
     changeVal() {
       document.activeElement.scrollIntoViewIfNeeded(true);
@@ -144,22 +144,17 @@ export default {
         this.allow = false
         let timer = setTimeout(() => {
           if (type == 103) {
-            if (!phoneTest.test(value)) {
-              //验证不通过
+            if (!phoneTest.test(value)) {//验证不通过
               this.defaultWaring("输入信息格式有误");
               return;
             }
-          } else if (type == 101) {
-            //身份证
-            if (!identify.test(value)) {
-              //验证不通过
+          } else if (type == 101) {//身份证
+            if (!identify.test(value)) {//验证不通过
               this.defaultWaring("输入信息格式有误");
               return;
             }
-          } else if (type == 104) {
-            //病历号只能输入数字字母
-            if (!jgpattern.test(value)) {
-              //验证不通过
+          } else if (type == 104) {//病历号只能输入数字字母
+            if (!jgpattern.test(value)) {//验证不通过
               this.defaultWaring("输入信息格式有误");
               return;
             }

src/components/PathInfo.vue

@@ -4,7 +4,7 @@
       <div class="topContent">
         <p class="hospitalName">{{pathInfo.hospitalName}}</p>
         <h2>智能预问诊</h2>
-        <p class="explain">该系统通过智能引导式问诊，帮助医生规范、全面的采集患者的症状、体征、病史等信息，从而实现诊疗流程的优化和配置。</p>
+        <p class="explain">请认真填写以下内容，以便就诊时医生可以更好的了解病情，感谢您的配合！</p>
       </div>
       <div class="minContent">
         <p class="msg"><i class="person"></i>挂号信息</p>
@@ -32,9 +32,9 @@
         </p>
       </div>
       <div class="btmContent" @click="getStart">开始</div>
-      <div class="con">
+      <!-- <div class="con">
         <p class="already" v-if="type !== 1">{{text[type]}}</p>
-      </div>
+      </div> -->
     </div>
     
     <Toast
@@ -156,8 +156,7 @@
           const result = res.data;
           if(result.code==0){
             let type = result.data.type;
-              this.goNext()
-            if(type == 3||type == 6){
+            if(type == 3||type == 6){//有预问诊信息
               this.showToast = true
             }else{
               this.goNext()

src/components/Search.vue

@@ -74,6 +74,10 @@ export default {
         flg = true
       }
       this.tmpItem = item
+      
+      if(this.chooseSymp.length == 0){
+        item.idx = 1
+      }
       let timer = setTimeout(() => {
         this.$emit('showDetil',item,flg)
         clearTimeout(timer)

src/components/Symptom.vue

@@ -10,7 +10,7 @@
           class="choo-symp"
           v-for="(v,i) in chooseSymp"
         >
-          <span @click="showChecked(v)">{{v.description || v.name}}</span>
+          <span @click="showChecked(v,i)">{{v.description || v.name}}</span>
           <span @click="deletSymp(v,i)"><img
               src="../images/del.png"
               alt=""
@@ -24,21 +24,16 @@
             src="../images/search.png"
             alt=""
           ></p>
-        <!-- <span
-          class="symp"
-          v-for="(it,ind) in symp"
-          :key="it.conceptId"
-          @click="showDetil(it)"
-        >{{it.description || it.name}}</span> -->
-        <!-- 暂时隐藏长按显示功能 -->
-        <span
-          class="symp"
-          v-for="(it,ind) in symp"
-          :key="it.conceptId"
-          @touchstart.prevent="touchstart(it)"
-          @touchend.prevent="touchend(it)"
-        >{{it.description || it.name}}</span>
-        <p class="tip" v-show="chooseSymp.length==0">长按症状按钮可显示症状解释说明</p>
+        <div class="showHide" ref="showHide">
+          <span
+            class="symp"
+            v-for="(it,ind) in symp"
+            :key="it.conceptId"
+            @touchstart.prevent="touchstart(it)"
+            @touchend.prevent="touchend(it)"
+          >{{it.description || it.name}}</span>
+        </div>
+        <p class="tip" v-show="chooseSymp.length==0">长按症状按钮可显示症状解释说明 <span @click="slideToggle" v-show="slide">{{slideTxt}}</span></p>
       </div>
       <div
         class="result"
@@ -81,7 +76,6 @@
 </template>
 <script type="text/javascript">
 import api from '@utils/api.js';
-import DetailBox from './DetailBox.vue';
 import Toast from '../common/Toast.vue';
 import Tiptoast from '../common/Tiptoast.vue';
 import Search from './Search.vue';
@@ -92,7 +86,7 @@ export default {
   name: 'Symptom',
   props:['modluesLen','nameStr'],
   data() {
-    let { datas, pathInfo,searchShow,scroll } = this.$store.state;
+    let { datas, pathInfo,searchShow } = this.$store.state;
     const { choose, text } = this.$store.state.symptom;
     return {
       age: pathInfo.patientAge,
@@ -119,9 +113,10 @@ export default {
         title:'',
         text:''
       },
-      position:scroll,
       start:{},
       end:{},
+      slide:false,
+      slideTxt:'展开全部'
     }
   },
   created() {
@@ -142,6 +137,16 @@ export default {
     })
   },
   methods: {
+    slideToggle(){
+      let flg = this.slideTxt
+      if(flg == '展开全部'){
+        this.$refs.showHide.style.height = 'auto'
+        this.slideTxt = '收起'
+      }else{
+        this.$refs.showHide.style.height = '3.12rem'
+        this.slideTxt = '展开全部'
+      }
+    },  
     touchend(item,flg) {//症状点开详情
       clearTimeout(this.timer);
       this.end = this.$store.state.scroll
@@ -194,6 +199,11 @@ export default {
         const result = res.data;
         if (result.code == 0) {
           this.symp = result.data;
+          if(result.data.length>9){
+            this.slide = true
+          }else{
+            this.slide = false
+          }
         }
       })
     },
@@ -213,7 +223,6 @@ export default {
       const id = item.questionId || item.id; //常见症状questionId，推送id,两者均有可能没有
       //将选中的name存到store中的text
       this.$store.commit('setText', { type: moduleCP['symp'], text: item.name,textP: item.description||item.name, pId: this.questId });
-      
       if (id) {
         const param = {
           "age": this.age,
@@ -225,12 +234,16 @@ export default {
           if (result.code == 0) {
             const mapping = result.data.questionMapping;
             this.labelDetail = result.data;
+            if(this.chooseSymp.length == 0){
+              result.data.idx = 1
+            }
             this.$store.commit('setOrigin', { type: moduleCP['symp'], data: result.data });
             if (mapping && mapping.length > 0) {
-              this.$store.commit('setDetail',{detail:result.data,ppId:null,moduleType:moduleCP['symp']})
+              this.$store.commit('setDetail',{detail:result.data,ppId:null,moduleType:moduleCP['symp'],sign:1,idx:this.chooseSymp.length})
               if(flg){
                 return
               }
+              this.$store.commit('setSearchShow', false);
               this.chooseSymp.push(item);
             } else { 
               this.chooseSymp.push(item);
@@ -246,7 +259,7 @@ export default {
     showDetil(item,flg) {//搜索点开的详情
       this.tmpItem=item
       this.isSearch=flg||false
-      this.common(item,flg);
+      this.common(item,flg,this.chooseSymp);
     },
     getSympText() {//推送使用医生端信息
       const text = this.$store.state.symptom.text;
@@ -269,6 +282,7 @@ export default {
         const result = res.data;
         if (result.code == 0) {
           this.symp = result.data.symptom;
+          this.$refs.showHide.style.height = 'auto'
         }
       })
     },
@@ -309,17 +323,16 @@ export default {
       this.questId = null;
       this.delText = "是否删除该信息？<br/>（已填内容将清除）";
     },
-    showChecked(item) {
+    showChecked(item,i) {
       const origin = this.$store.state.symptom.origin;
       const read = this.$store.state.symptom.datas;
       const data = read[(item.questionId||item.id)] || origin[(item.questionId||item.id)];
       if (data&&data.questionMapping && data.questionMapping.length > 0) {
-        this.$store.commit('setDetail',{detail:data,ppId:null,moduleType:moduleCP['symp']})       
+        this.$store.commit('setDetail',{detail:data,ppId:null,moduleType:moduleCP['symp'],sign:1,idx:i})       
       }
     },
   },
   components: {
-    DetailBox,
     Toast,
     Search,
     Tiptoast
@@ -343,7 +356,14 @@ export default {
 </script>
 <style lang="less" scoped>
 @import "../less/base.less";
-
+.showHide {
+  overflow: hidden;
+  height: 3.12rem;
+}
+.tip span {
+  color: #colors[theme];
+  float: right;
+}
 .symp-wrap {
   font-size: 0.3rem;
   // .btscroll;

src/components/TabPage.vue

@@ -60,7 +60,7 @@
     </div>
     <!-- 详情页 -->
     <div class="detail" v-if="this.$store.state.detailShow">
-    <DetailBox />
+      <DetailBox />
     </div>
   </div>
 </template>

src/store.js

@@ -72,8 +72,17 @@ const store = new Vuex.Store({
       if(JSON.stringify(detail)=='{}'){
         state.detailShow = false;
       }else{
-        state.detailInfo = Object.assign({},param);
-        state.detailShow = true;
+        if(param.sign!=1){
+          state.detailInfo = Object.assign({},param);
+          state.detailShow = true;
+        }else{
+          if(param.idx == 0&&detail.idx == 1){
+            state.detailInfo = Object.assign({},param);
+            state.detailShow = true;
+          }else{
+            state.detailShow = false;
+          }
+        }
       }
     },
     setSearchShow(state,flg){//搜索显示与否