Bladeren bron

bug2928,2928,2932

luolei 5 jaren geleden
bovenliggende
commit
365493bda4
5 gewijzigde bestanden met toevoegingen van 38 en 17 verwijderingen
  1. 4 1
      src/common/CheckBox.vue
  2. 1 2
      src/common/Picker.vue
  3. 3 1
      src/common/Radio.vue
  4. 5 4
      src/components/PathInfo.vue
  5. 25 9
      src/components/Symptom.vue

+ 4 - 1
src/common/CheckBox.vue

@@ -204,15 +204,18 @@ import OptionInp from '../common/OptionInp.vue';
       line-height: .66rem;
       // min-width: 2rem;
       // text-align: center;
+      color: #7C828E;
       padding:0 .2rem;
       box-sizing: border-box;
       border-radius: .38rem;
-      background-color: #F1F1F1;
+      border: 1px solid #dfe0e4;
+      background-color: #ffffff;
     }
     
     .check{
       color: #fff;
       background-color: #6678FF;
+      border: 1px solid #6678FF;
     }
     .exclu{
       color:#colors[exclu];

+ 1 - 2
src/common/Picker.vue

@@ -106,9 +106,8 @@
       left: 0;
       box-sizing: border-box;
       border-radius: .2rem .2rem 0 0;
-      z-index: 1100;
+      z-index: 9999;
       font-size: .3rem;
-      overflow-y: hidden;
       .confBtn{
         height: 44px;
         line-height: 44px;

+ 3 - 1
src/common/Radio.vue

@@ -145,11 +145,13 @@ import OptionInp from '../common/OptionInp.vue';
         padding:0 .2rem;
         box-sizing: border-box;
         border-radius: .38rem;
-        background-color: #F1F1F1;
+        border: 1px solid #dfe0e4;
+        background-color: #ffffff;
       }
       .check{
         color: #fff;
         background-color: #6678FF;
+        border: 1px solid #6678FF;
       }
       .iptCheck {
         color: #colors[theme];

+ 5 - 4
src/components/PathInfo.vue

@@ -137,6 +137,7 @@
           'doctorCode':!hasQuery&&query.doctorCode||'',
           'patientCode':!hasQuery&&query.patientCode||'',
           'recordId':!hasQuery&&query.recordId||'',
+          'recordTime':!hasQuery&&query.recordTime||'',
           "sonHospitalCode": !hasQuery&&query.sonHospitalCode||''
         }
         if(!hasQuery&&query.scan){//扫码进入的
@@ -314,12 +315,12 @@
       top: -1.3rem;
       background-color: #fff;
       margin: 0 auto;
-      height: 6.2rem;
+      height: 6.4rem;
       .msg {
         font-size: .32rem;
-        padding-bottom: .28rem;
+        padding-bottom: .18rem;
         border-bottom: 1px solid #E6E6E6;
-        margin-bottom: .6rem;
+        margin-bottom: .4rem;
         .person {
           display: inline-block;
           width: .38rem;
@@ -337,7 +338,7 @@
       }
       .msgTitle {
         display: inline-block;
-        width: 1.2rem;
+        width: 1.3rem;
         color: #777777;
       }
       i {

+ 25 - 9
src/components/Symptom.vue

@@ -104,7 +104,7 @@ export default {
       symp: [], //症状
       labelDetail: {}, //明细
       questId: null, //id
-      delText: "是否删除该信息?",
+      delText: "是否删除该症状?",
       delIndex: null,
       showToast: false,
       tmpItem:{},//检索的症状
@@ -126,7 +126,8 @@ export default {
       failMsg: "无法选择症状,已超过最大个数",
       modluesLen:null,
       nameStr:'',
-      degNum:0
+      degNum:0,
+      startNum:0
     }
   },
   computed:{
@@ -221,14 +222,18 @@ export default {
         if(this.chooseSymp.length == 0){
           item.idx = 1
         }
-        this.common(item,flg);
+        if(this.startNum == 1){
+          this.common(item,flg);
+        }
+        this.startNum = 0
         this.slideTxt = '点击展开'
         this.degNum = 0
       }
       this.startTime = "";
     },
     touchstart(it){
-      this.start = this.$store.state.scroll
+      this.startNum = ++this.startNum;
+      this.start = this.$store.state.scroll;
       this.startTime = +new Date();
       const that = this;
       this.timer = setTimeout(function(){
@@ -322,11 +327,13 @@ export default {
               if(sign){
                 return
               }
+              let hasSymptom = this.hasSymptom
               this.$store.commit('setSearchShow', false);
-              this.chooseSymp.push(item);
+              hasSymptom&&this.chooseSymp.push(item);
             } else { 
+              let hasSymptom = this.hasSymptom
               this.$store.commit('setSearchShow', false);
-              this.chooseSymp.push(item);
+              hasSymptom&&this.chooseSymp.push(item);
             }
             result.data.questionMapping = mapping
             this.labelDetail = result.data;
@@ -351,6 +358,15 @@ export default {
         // this.checkText = this.$store.state.symptom.text;
       }
     },
+    hasSymptom(item){
+      let tmpLis = this.chooseSymp;
+      for(let i = 0;i<tmpLis.length;i++){
+        if(item.name == tmpLis[i].name){
+          return false;
+        }
+      }
+      return true;
+    },
     showDetil(item,flg) {//搜索点开的详情
       this.tmpItem=item
       this.isSearch=flg||false
@@ -410,13 +426,13 @@ export default {
       this.questId = item.questionId || item.id || item.conceptId;
       if (this.chooseSymp.length == 1) {
         if(item.idx != 1){
-          this.delText = "是否删除该信息?"
+          this.delText = "是否删除该症状?"
         }else{
           this.delText = "要删除症状,重新填写?"
         }
       }else{
         if(item.idx != 1){
-          this.delText = "是否删除该信息?"
+          this.delText = "是否删除该症状?"
         }else{
           this.delText = "要删除症状,重新填写?"
         }
@@ -452,7 +468,7 @@ export default {
       this.showToast = false;
       this.delIndex = null;
       this.questId = null;
-      this.delText = "是否删除该信息?<br/>(已填内容将清除)";
+      this.delText = "是否删除该症状?";
     },
     showChecked(item,i) {
       const origin = this.$store.state.symptom.origin;