5 years ago · 196289f93d
--- a/src/common/Label.vue
+++ b/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;
			
 
				     }
			
 
				   }
			
 
				   
			
--- a/src/common/UploadImg.vue
+++ b/src/common/UploadImg.vue
@@ -13,7 +13,6 @@
 
				             @change="addImg"
			
 
				             accept="image/*"
			
 
				             ref="inp"
			
 
				-            multiple
			
 
				             style="display:none"
			
 
				           />
			
 
				           <img src="../images/upload.png">
			
@@ -68,7 +67,7 @@ export default {
 
				     addImg() {
			
 
				       // 上传图片进行压缩，压缩后超过4M则不允许上传
			
 
				       let fileTag = this.$refs.inp;
			
 
				-      let img = this.$refs.img;
			
 
				+      // let img = this.$refs.img;
			
 
				       let file = fileTag.files[0];
			
 
				       const that = this;
			
 
				       this.imgBase64(file, function (image, canvas) {
			
@@ -98,6 +97,8 @@ export default {
 
				           that.$store.commit('setImgSrc', { key: key, src: uploadSrc, type: that.moduleType })
			
 
				           that.$previewRefresh(); //异步获取的图片需要刷新下
			
 
				         }
			
 
				+        // that.$refs.inp.value = '';
			
 
				+        fileTag.value = '';
			
 
				       });
			
 
				     },
			
 
				     imgBase64(file, callback) {
			
--- a/src/components/AddContent.vue
+++ b/src/components/AddContent.vue
@@ -41,7 +41,7 @@
 
				       </div>
			
 
				       <div class="thanks">
			
 
				         <p>感谢您的回答，您的病历已经自动生成。</p>
			
 
				-        <p>您可以点击预览并提交病历按钮预览病历。</p>
			
 
				+        <p>您可以点击预览并提交病历按钮预览病历，</p>
			
 
				         <p>如果没有需要修改的内容，请点击提交，医生便能看到您的病历。</p>
			
 
				       </div>
			
 
				     </div>
			
--- a/src/components/DiagTreat.vue
+++ b/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>
			
--- a/src/components/Others.vue
+++ b/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>
			
--- a/src/components/PathInfo.vue
+++ b/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">
			
@@ -156,7 +174,7 @@
 
				 </script>
			
 
				 <style lang="less" scoped>
			
 
				   .path-wrap{
			
 
				-    padding-top: .7rem;
			
 
				+    padding-top: .5rem;
			
 
				     font-size: .28rem;
			
 
				     box-sizing: border-box;
			
 
				     .info{
			
@@ -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;
			
--- a/src/components/Preview.vue
+++ b/src/components/Preview.vue
@@ -4,12 +4,14 @@
 
				       <p class="baseMsg">{{pathInfo.patientName}}&nbsp;&nbsp;&nbsp;&nbsp;{{pathInfo.patientSex}}&nbsp;&nbsp;&nbsp;&nbsp;{{pathInfo.patientAge}}岁</p>
			
 
				       <table>
			
 
				         <tr>
			
 
				-          <td class="fst">挂号科室：{{pathInfo.selfDeptName}}</td>
			
 
				-          <td class="sec">门诊号：{{pathInfo.recordId}}</td>
			
 
				+          <td colspan="2">挂号科室：{{pathInfo.selfDeptName}}</td>
			
 
				         </tr>
			
 
				         <tr>
			
 
				-          <td class="fst">预约医生：{{pathInfo.doctorName}}</td>
			
 
				-          <td class="sec">就诊时间：{{pathInfo.systemTime}}</td>
			
 
				+          <td>门诊号：{{pathInfo.recordId}}</td>
			
 
				+          <td>预约医生：{{pathInfo.doctorName}}</td>
			
 
				+        </tr>
			
 
				+        <tr>
			
 
				+          <td colspan="2">就诊时间：{{pathInfo.systemTime}}</td>
			
 
				         </tr>
			
 
				       </table>
			
 
				       <div class="line"></div>
			
@@ -325,12 +327,10 @@ export default {
 
				     color: #333333;
			
 
				     letter-spacing: 0;
			
 
				     text-align: justify;
			
 
				-    line-height: 0.44rem /* 44/100 */;
			
 
				-    td.fst {
			
 
				-      width: 40%;
			
 
				-    }
			
 
				-    td.sec {
			
 
				-      width: 60%;
			
 
				+    margin-top: .2rem;
			
 
				+    tr {
			
 
				+      padding: .2rem 0;
			
 
				+      line-height: .5rem;
			
 
				     }
			
 
				   }
			
 
				   .line {
			
--- a/src/components/Search.vue
+++ b/src/components/Search.vue
@@ -47,7 +47,8 @@ export default {
 
				   data() {
			
 
				     return {
			
 
				       searchVal: '',
			
 
				-      searchLis: []
			
 
				+      searchLis: [],
			
 
				+      tmpItem:{}
			
 
				     }
			
 
				   },
			
 
				   watch:{
			
@@ -64,7 +65,15 @@ export default {
 
				   },
			
 
				   methods: {
			
 
				     showDetil(item) {
			
 
				-      this.$emit('showDetil', item,true)
			
 
				+      let flg = false;
			
 
				+      if(JSON.stringify(this.tmpItem)==JSON.stringify(item)){//eg:重复点击胸痛bug
			
 
				+        flg = true
			
 
				+      }
			
 
				+      this.tmpItem = item
			
 
				+      let timer = setTimeout(() => {
			
 
				+        this.$emit('showDetil',item,flg)
			
 
				+        clearTimeout(timer)
			
 
				+      }, 250);
			
 
				       // this.$emit('search', false)
			
 
				     },
			
 
				     search() {
			
--- a/src/components/Symptom.vue
+++ b/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"
			
@@ -148,12 +148,8 @@ export default {
 
				 
			
 
				     },
			
 
				     showDetil(item,flg) {
			
 
				-      if(!flg){
			
 
				-        this.chooseSymp.push(item);
			
 
				-      }else{
			
 
				-        this.tmpItem=item
			
 
				-        this.isSearch=flg
			
 
				-      }
			
 
				+      this.tmpItem=item
			
 
				+      this.isSearch=flg||false
			
 
				       this.questId = item.questionId || item.id || item.conceptId;
			
 
				       const id = item.questionId || item.id; //常见症状questionId，推送id,两者均有可能没有
			
 
				       //将选中的name存到store中的text
			
@@ -172,13 +168,21 @@ export default {
 
				             this.$store.commit('setOrigin', { type: moduleCP['symp'], data: result.data });
			
 
				             if (mapping && mapping.length > 0) {
			
 
				               this.show = true;
			
 
				+              if(flg){
			
 
				+                return
			
 
				+              }
			
 
				+              this.chooseSymp.push(item);
			
 
				             } else { //没有详情,推送
			
 
				               const sympText = this.getSympText();
			
 
				               this.getPush(sympText);
			
 
				+              this.chooseSymp.push(item);
			
 
				+              this.searchShow = false
			
 
				+              // this.complete()
			
 
				             }
			
 
				           }
			
 
				         })
			
 
				       } else {//没有questionId或id 则直接调推送
			
 
				+        this.chooseSymp.push(item);
			
 
				         const sympText = this.getSympText();
			
 
				         this.getPush(sympText);
			
 
				         this.checkText = this.$store.state.symptom.text;
			
@@ -224,9 +228,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();
			
@@ -243,11 +248,7 @@ export default {
 
				       this.delText = "是否删除该信息？<br/>（已填内容将清除）";
			
 
				     },
			
 
				     complete() {//明细填写完成
			
 
				-      if(this.isSearch){
			
 
				-        this.chooseSymp.push(this.tmpItem);
			
 
				-        this.searchShow = false
			
 
				-      }
			
 
				-      this.isSearch = false; //重置，否则每次点开都会叠加
			
 
				+      this.searchShow = false;
			
 
				       this.checkText = this.$store.state.symptom.text;
			
 
				       this.show = false;
			
 
				       this.questId = null;
			
@@ -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;
			
--- a/src/components/TabPage.vue
+++ b/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>
			
--- a/src/images/del.png
+++ b/src/images/del.png
--- a/src/less/base.less
+++ b/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;
			
 
				   }
			
--- a/src/less/index.less
+++ b/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;
			
--- a/src/store.js
+++ b/src/store.js
@@ -61,7 +61,6 @@ const store = new Vuex.Store({
 
				       }
			
 
				     },
			
 
				     setDataAll(state,param){
			
 
				-      console.log(state,moduleCP['suplement'],param,1111)
			
 
				       let res = state.allMoudles
			
 
				       for(let i = 0;i<res.length;i++){
			
 
				         if(res[i].type == moduleCP['suplement']){
			
--- a/src/utils/tools.js
+++ b/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])
			
 
				       }
			
 
				     }