细节调整

Squashed commit of the following:

commit bf56d2648ef27325486b12aa765210af56eebb46
Author: Luolei <16657115156@163.com>
Date:   Thu Jul 25 09:40:47 2019 +0800

    添加value判断各模块显示与否

commit 13b89818b73d5f8458e754cc9a3cd25fd0213e28
Author: Luolei <16657115156@163.com>
Date:   Wed Jul 24 13:57:02 2019 +0800

    名字统一

commit d0a606ea470764a14d7229dbb7ba22bebbbcec80
Merge: f701c86 89d77a0
Author: Luolei <16657115156@163.com>
Date:   Wed Jul 24 13:33:37 2019 +0800

    Merge branch 'dev' into byll

commit f701c86e3403fe9d9fa6dbc863d92c6b1b901b65
Author: Luolei <16657115156@163.com>
Date:   Wed Jul 24 13:23:25 2019 +0800

    241

commit 4a52e161620cb9827b0b30431cd752bc2b6dbf44
Author: Luolei <16657115156@163.com>
Date:   Tue Jul 23 17:08:16 2019 +0800

    数据处理

commit 0f282a4005150b8b4234df99de1521fba5ec55e8
Merge: 6fc7207 a1ac90c
Author: Luolei <16657115156@163.com>
Date:   Tue Jul 23 15:47:37 2019 +0800

    Merge branch 'dev' into byll

    # Conflicts:
    #	config/index.js
    #	src/common/MultiLineInput.vue
    #	src/components/Symptom.vue
    #	src/components/TabPage.vue
    #	src/store.js
    #	src/utils/tools.js

commit 6fc720795865ba16ff3c9cd9cd8a2d1b0dbda978
Author: Luolei <16657115156@163.com>
Date:   Tue Jul 23 15:24:38 2019 +0800

    数字键盘弹起输入问题解决

commit 89f2791e4b36c0ee671c8dc87285b7c82cf35cfd
Author: Luolei <16657115156@163.com>
Date:   Tue Jul 23 10:27:55 2019 +0800

    类型修改

commit 55594b6e10078c5aff8ed95cd938c0fa07fb0125
Author: Luolei <16657115156@163.com>
Date:   Tue Jul 23 10:20:19 2019 +0800

    type类型改变

commit e9eeb458968371f579c6b61c7693438b99d18443
Merge: ada4e4e 1248f0c
Author: Luolei <16657115156@163.com>
Date:   Mon Jul 22 15:49:52 2019 +0800

    Merge branch 'dev' into byll

commit ada4e4e7216614e111914fc4a787609722b665cf
Author: Luolei <16657115156@163.com>
Date:   Mon Jul 22 15:39:22 2019 +0800

    模块配置

commit 1fe1910a2a54e5ece7a2b3ea8162cd9c7827059b
Merge: 7ef08db 3a8f52d
Author: Luolei <16657115156@163.com>
Date:   Thu Jul 18 16:39:19 2019 +0800

    Merge branch 'dev' into byll

commit 7ef08db55a456528a93b2ca8bb204b67a83daa80
Author: Luolei <16657115156@163.com>
Date:   Thu Jul 18 16:38:09 2019 +0800

    图片上传数据结构修改

src/common/Label.vue

@@ -1,9 +1,10 @@
 <template>
   <div class="label-wrap" v-if="item">
-    <span v-for="(it,index) in datas.questionMapping" :key="it.id" :class="['symp',{'check':it.select==1},{'exclu':exclusion !==999 && it.exclusionType !== exclusion}]" @click="handleClick(it,index)">
-      <i>{{it.name}}</i>
-      <i v-if="it.select==1" @click="deletSymp($event,it,index)"><img src="../images/delete.png" alt=""></i>
-    </span>
+    <p v-for="(it,index) in datas.questionMapping" :key="it.id" :class="['symp',{'check':it.select==1},{'exclu':exclusion !==999 && it.exclusionType !== exclusion}]" @click="handleClick(it,index)">
+      <span>{{it.name}}</span>
+      <!-- <span v-if="it.select==1" @click="deletSymp($event,it,index)"><img src="../images/delete.png" alt=""></span> -->
+      <span v-if="it.select==1" @click="deletSymp($event,it,index)"><img src="../images/del.png" alt=""></span>
+    </p>
     <Toast :message="delText" 
           :show="showToast"
           @comfirn="comfirnDel" 
@@ -124,37 +125,46 @@ import {moduleCP} from '@utils/tools';
 <style lang="less" scoped>
   .label-wrap{
     font-size: .3rem;
-    .symp{
-      position: relative;
-    }
-    img{
-      width:.56rem;
-      height: .70rem;
-      vertical-align: top;
-      z-index: 22;
-      position: absolute;
-      top:0;
-      right: 0;
-    }
-    i{
+     .symp{
+      // position: relative;
       display: inline-block;
-      vertical-align: top;
-    }
-    i:first-child{
-      min-width:1.34rem;
+      min-width:1.9rem;
       height: .72rem;
-      line-height: .72rem;
-      text-align: center;
+      span{
+        display: inline-block;
+        vertical-align: top;
+      }
+      span:first-child{
+        // min-width:1.34rem;
+        min-width:1.42rem;
+        height: .72rem;
+        line-height: .72rem;
+        text-align: center;
+      }
+      img{
+        // width:.56rem;
+        width:.48rem;
+        height: .70rem;
+        vertical-align: top;
+        z-index: 22;
+        // position: absolute;
+        // top:0;
+        // right: 0;
+      }
+    }
+    .symp:last-child{
+      margin-right: 0;
     }
     .check{
       color: #fff;
       // background: linear-gradient(-270deg, #4F4FFF, #4F8BFF);
       background: linear-gradient(-270deg, #3638EE, #4E72FF);
       box-shadow: 0 .08rem .16rem 0 rgba(79,129,255,0.40);
-      padding-right: 0.57rem;
+      // padding-right: 0.57rem;
     }
     .exclu{
-      background:#f0f1f5;
+      // background:#f0f1f5;
+      background:#E3E4E8;
     }
   }
   

src/common/UploadImg.vue

@@ -13,7 +13,6 @@
             @change="addImg"
             accept="image/*"
             ref="inp"
-            multiple
             style="display:none"
           />
           <img src="../images/upload.png">
@@ -98,6 +97,7 @@ export default {
           that.$store.commit('setImgSrc', { key: key, src: uploadSrc, type: that.moduleType })
           that.$previewRefresh(); //异步获取的图片需要刷新下
         }
+        that.$refs.inp.value = '';
       });
     },
     imgBase64(file, callback) {

src/components/DiagTreat.vue

@@ -43,7 +43,7 @@
 
     <div class="foot" v-if="modluesLen==2">
       <span class="back" @click="beBack">{{'返回'+ preName}}</span>
-      <span class="next" @click="toNext">{{'预览'}}</span>
+      <span class="next" @click="toNext">{{'预览并提交病历'}}</span>
     </div>
     <div class="foot" v-else>
       <span class="back" @click="beBack">{{'返回'+ preName}}</span>

src/components/Others.vue

@@ -47,7 +47,7 @@
     </div>
     <div class="foot" v-if="modluesLen==3&&!nextName||modluesLen==2">
       <span class="back" @click="beBack">{{'返回'+ preName}}</span>
-      <span class="next" @click="toNext">{{'预览'}}</span>
+      <span class="next" @click="toNext">{{'预览并提交病历'}}</span>
     </div>
     <div class="foot" v-else>
       <span class="back" @click="beBack">{{'返回'+ preName}}</span>

src/components/PathInfo.vue

@@ -7,7 +7,25 @@
         <span>{{pathInfo.patientSex}}</span>|
         <span>{{pathInfo.patientAge}}岁</span>
       </p>
+      <p>
+        <span>挂号科室：</span>
+        <span>{{pathInfo.selfDeptName}}</span>
+      </p>
       <div class="dept">
+        <p>
+          <span>门诊号：</span>
+          <span>{{pathInfo.recordId}}</span>
+        </p>
+        <p>
+          <span>预约医生：</span>
+          <span>{{pathInfo.doctorName}}</span>
+        </p>
+      </div>
+      <p>
+        <span>预约时间：</span>
+        <span>{{pathInfo.systemTime}}</span>
+      </p>
+      <!-- <div class="dept">
         <p>
           <span>挂号科室：</span>
           <span>{{pathInfo.selfDeptName}}</span>
@@ -26,7 +44,7 @@
           <span>预约时间：</span>
           <span>{{pathInfo.systemTime}}</span>
         </p>
-      </div>
+      </div> -->
       <p class="already" v-if="type !== 1">{{text[type]}}</p>
     </div>
     <div class="out-box">
@@ -169,6 +187,10 @@
     .con{
       margin-left: .6rem;
       position: relative;
+      >p{
+        color: #7C828E;
+        margin-top: .27rem;
+      }
       .name{
         color: #7C828E;
         margin-top: .27rem;
@@ -176,9 +198,22 @@
           margin-right: .08rem;
         }
       }
-      .dept,.doct{
+      .dept{
+        p{
+          display: inline-block;
+          margin-top: .27rem;
+          span{
+            color: #7C828E;
+          }
+        }
+        p:first-child{
+          margin-right: .25rem;
+        }
+      }
+      /* .dept,.doct{
         display: inline-block;
         p{
+          display: inline-block;
           margin-top: .27rem;
           span{
             color: #7C828E;
@@ -187,7 +222,7 @@
       }
       .doct{
         margin-left: .26rem;
-      }
+      } */
       .already{
         position: absolute;
         left: 0;

src/components/Symptom.vue

@@ -11,7 +11,7 @@
       >
         <span @click="showChecked(v)">{{v.name}}</span>
         <span @click="deletSymp(v,i)"><img
-            src="../images/delete.png"
+            src="../images/del.png"
             alt=""
           ></span>
       </p>
@@ -44,7 +44,7 @@
     <div v-if="modluesLen==1"
       :class="['footer',{'nofoot':chooseSymp.length==0}]"
       @click="toNext"
-    >预览</div>
+    >预览并提交病历</div>
     <div
       class="detail"
       v-if="show"
@@ -224,9 +224,10 @@ export default {
     },
     comfirnDel() {
       this.chooseSymp.splice(this.delIndex, 1);
-      // delete(this.checkText[this.questId]);
       this.checkText.splice(this.delIndex, 1);
       this.$store.commit('delText', { type: moduleCP['symp'], pId: this.questId })
+      // 删除setDatas数据,防止回读
+      this.$store.commit('setDatas', { type: moduleCP['symp'], pId: this.questId ,data:''})
       // 删除完-常见；其他-推送
       if (this.chooseSymp.length > 0) {
         const sympText = this.getSympText();
@@ -285,6 +286,7 @@ export default {
     color: #000;
     margin-bottom: 0.36rem;
     font-weight: 700;
+    padding-right: .3rem;
     .searchImg {
       width: 0.44rem;
       height: 0.44rem;
@@ -296,34 +298,42 @@ export default {
   padding-bottom: .2rem;
   .choo-symp{
       display: inline-block;
-      width:1.9rem;
+      min-width:1.9rem;
+      // min-width:1.42rem;
       height: .74rem;
       // background: linear-gradient(-270deg, #4F4FFF, #4F8BFF);
       background: linear-gradient(-270deg, #3638EE, #4E72FF);
       box-shadow: 0 .08rem .16rem 0 rgba(79,129,255,0.40);
       border-radius: .08rem;
       white-space: nowrap;
-      margin: 0 .3rem .3rem 0;
+      // margin: 0 .3rem .3rem 0;
+      margin: 0 .25rem .3rem 0;
       span{
         display: inline-block;
         vertical-align: top;
       }
       span:first-child{
-        min-width:1.34rem;
+        // min-width:1.34rem;
+        min-width:1.42rem;
         height: .74rem;
         line-height: .74rem;
         text-align: center;
         color: #fff;
       }
       img{
-        width:.56rem;
+        // width:.56rem;
+        width:.48rem;
         height: .74rem;
       }
     }
+    .choo-symp:last-child{
+      margin-right: 0;
+    }
   .label{
     .label;
   }
   .result{
+    padding-right: .3rem;
     .title{
       color: #4F50FF;
       padding-left: .1rem;

src/components/TabPage.vue

@@ -230,7 +230,8 @@ export default {
   .content {
     font-size: 0.3rem;
     // padding: 0.45rem 0.6rem;
-    padding: 0.45rem 0.3rem 0.45rem 0.6rem;
+    // padding: 0.45rem 0.3rem 0.45rem 0.6rem;
+    padding: 0.45rem 0 0.45rem 0.3rem;
   }
 }
 </style>

src/less/base.less

@@ -27,8 +27,11 @@
   position: fixed;
   bottom: 0;
   left: 0;
-  background: #F2F2F5;
+  // background: #F2F2F5;
+  background: #e5ecfc;
   z-index: 66;
+  display: flex;
+  justify-content: space-between;
   .back,.next{
     display: inline-block;
     height: .88rem;
@@ -37,13 +40,15 @@
     vertical-align: top;
   }
   .back{
-    width: 2.5rem;
-    color: #7C828E;
-    // background: #F2F2F5;
+    // width: 2.5rem;
+    width: 40%;
+    // color: #7C828E;
+    color: #0043E8;
   }
   .next{
     // width: 5rem;
-    width: 4.91rem;
+    // width: 4.91rem;
+    width: 58%;
     color: #fff;
     background: linear-gradient(-270deg, #4F4FFF,#4F8BFF);
   }
@@ -63,8 +68,8 @@
     border-radius: .08rem;
     text-align: center;
     color: #7C828E;
-    // margin: 0 0 .3rem .3rem;
-    margin: 0 .3rem .3rem 0;
+    // margin: 0 .3rem .3rem 0;
+    margin: 0 .25rem .3rem 0;
     padding: 0 .05rem;
     box-sizing: border-box;
   }

src/less/index.less

@@ -6,6 +6,8 @@ body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, input, textarea, p, t
   color: #323232;
   // -webkit-text-size-adjust:100%;
   -webkit-text-size-adjust:auto;
+  -webkit-tap-highlight-color: rgba(0,0,0,0);
+  -webkit-tap-highlight-color: transparent;
 }
 input, textarea{
   outline: none;

src/utils/tools.js

@@ -134,15 +134,16 @@ const moduleConfig = (config,modules) => {
   let activeModule = []
   for(let i = 0;i < config.length;i++){
     let tmpCode = config[i].code
+    let tmpVal = config[i].value
     for(let j = 0;j < modules.length;j++){
       let tmpType = modules[j].type
-      if(tmpCode=="symptoms_show"&&tmpType==moduleCP['symp']){
+      if(tmpCode=="symptoms_show"&&tmpType==moduleCP['symp']&&tmpVal==1){
         activeModule.push(modules[j])
-      }else if(tmpCode=="diagnosis_show"&&tmpType==moduleCP['diagT']){
+      }else if(tmpCode=="diagnosis_show"&&tmpType==moduleCP['diagT']&&tmpVal==1){
         activeModule.push(modules[j])
-      }else if(tmpCode=="omhistory_show"&&tmpType==moduleCP['other']){
+      }else if(tmpCode=="omhistory_show"&&tmpType==moduleCP['other']&&tmpVal==1){
         activeModule.push(modules[j])
-      }else if(tmpCode=="replenish_show"&&tmpType==moduleCP['suplement']){
+      }else if(tmpCode=="replenish_show"&&tmpType==moduleCP['suplement']&&tmpVal==1){
         activeModule.push(modules[j])
       }
     }