Merge branch 'master' into referMaster

src/common/Dialog.vue

@@ -27,9 +27,6 @@ export default {
   data() {
     return {};
   },
-  created(){
-    console.log(this.item)
-  },
   computed:{
     hideAreaVal(){      //文本域修改时不要显示已填的值
       const {item,cancelNum,idx,num,extNum}=this;

src/common/MultSelect.vue

@@ -7,8 +7,8 @@
         :class="[{'liSelect':item.select,'noBorder':((item.description||item.name).indexOf('${'))!=-1}]"
         :key="item.id"
       >
-        <span v-if="((item.description||item.name).indexOf('${'))==-1">{{item.description||item.name}}</span>
-        <OptionInp v-else :item="item" @handleInp="inpVal" :inx="idx"/>
+        <span v-if="((item.description||item.name).indexOf('${'))==-1">{{item.description||item.name}}s</span>
+        <OptionInp v-else :item="item" @handleInp="inpVal" @handleSelect="selectResult(item,idx)" :inx="idx"/>
       </li>
     </ul>
     <div :class="sure?'realSure sure':'sure'" @click="makeSuer">
@@ -130,19 +130,19 @@ export default {
       this.$emit("updataResult", this.symptomResult,  {val:tmpResult.join('、'),valp:tmpResultp.join('、')},++number);
 
     },
-    /*selectResult(item,idx) {
+    selectResult(item,idx) {
       const { exclusion, select } = item;
       let result = JSON.parse(JSON.stringify(this.result));
       if (select) {//判断是否选中,选中的取消,关联id删除，未选中判断是否互斥
         for (let i = 0; i < result.length; i++) {
-          if(i == idx){
+          if(i == idx&&!result[i].value){
             result[i].select = false
           }
         }
       }else{
         if(+exclusion === 1){
           for (let i = 0; i < result.length; i++) {
-              if(i == idx){
+              if(i == idx&&result[i].value){
                 result[i].select = true
               }else{
                 result[i].select = false
@@ -153,7 +153,7 @@ export default {
             if(result[i].select&&+result[i].exclusion === 1){
               result[i].select=false
             }else{
-              if(i == idx){
+              if(i == idx&&result[i].value){
                 result[i].select = true
               }
             }
@@ -161,7 +161,7 @@ export default {
         }
       }
       this.result = result
-    }*/
+    }
   },
   components:{
     OptionInp

src/common/OptionInp.vue

@@ -6,14 +6,14 @@
       <input :type="msg.type=='number'?'number':'text'"
              :placeholder="placeholders[0]"
              :style="{'width':'45%'}"
-             :class="[{'cancel':item.select==0}]"
+             :class="[{'cancel':!item.select}]"
              v-model="ssyTxt"
              @click="handleCli"
              @input="(e)=>changeXyVal(e,'ssyTxt')"
       >/<input :type="msg.type=='number'?'number':'text'"
                :placeholder="placeholders[1]"
                :style="{'width':'45%'}"
-               :class="[{'cancel':item.select==0}]"
+               :class="[{'cancel':!item.select}]"
                v-model="szyTxt"
                @click="handleCli"
                @input="(e)=>changeXyVal(e,'szyTxt')"
@@ -72,13 +72,14 @@ import $ from 'jquery';
         if(this.msg.type=='number'){//数字键盘
           this[flag] = e.target.value=e.target.value.replace(/^\.$/,'')
         }
-        if(this.ssyTxt.match(/\S/g)&&this.szyTxt.match(/\S/g)){   //2个都填
+        if(this.ssyTxt.match(/\S/g)&&this.szyTxt.match(/\S/g)){//2个都填
           this.txt = this.ssyTxt+"/"+this.szyTxt;
-
         }else{
           this.txt ='';
         }
         this.$emit('handleInp',this.txt,this.inx);
+        
+        this.$emit("handleSelect")
       },
       changeVal(e){
         /*const val = e.target.value;

src/components/MainPage.vue

@@ -360,7 +360,7 @@ export default {
       }
       //console.log(this.$store.state);   //最后一题答完
       if(+num===this[moduleName].length||(noUpload&&+num===this[moduleName].length+1)){
-        if(this.activeTab===mkeys[mkeys.length-1]){   //最后一个模块时显示预览按钮
+        if(this.activeTab===mkeys[mkeys.length-1]||mkeys.length==1){   //最后一个模块时显示预览按钮
           this.showPreview=true;
           return;
         }

src/components/PathInfo.vue

@@ -46,6 +46,8 @@
       </div>
       <p class="explain">注：请核对您的挂号信息，如有错误请到窗口询问</p>
       <div class="btmContent" @click="getStart">确认并继续</div>
+      
+      <p class="jishu">朗通医疗提供技术支持</p>
       <!-- <div class="con">
         <p class="already" v-if="type !== 1">{{text[type]}}</p>
       </div> -->
@@ -385,7 +387,7 @@
       margin: 0 auto;
       border-radius: .44rem;
       position: absolute;
-      bottom: .68rem;
+      bottom: 1.2rem;
       transform: translateX(-50%);
       left: 50%;
     }
@@ -393,4 +395,13 @@
       height: 0.22rem;
     }
   }
+  .jishu {
+    position: absolute;
+    bottom: 0.4rem;
+    left: 50%;
+    text-align: center;
+    color: #cccccc;
+    font-size: 0.24rem;
+    transform: translateX(-50%);
+  }
 </style>