合并byll分支

Squashed commit of the following:

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

    图片上传数据结构修改

# Conflicts:
#	src/common/MultiLineInput.vue
#	src/components/TabPage.vue

build/webpack.dev.conf.js

@@ -33,8 +33,8 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     contentBase: false, // since we use CopyWebpackPlugin.
     compress: true,
     // host: HOST || config.dev.host,
-    host: '192.168.3.6',
-    // host: '192.168.3.126',
+    // host: '192.168.3.6',
+    host: '192.168.3.126',
     port: PORT || config.dev.port,
     open: config.dev.autoOpenBrowser,
     overlay: config.dev.errorOverlay

src/common/MultiLineInput.vue

@@ -3,7 +3,11 @@
     <span class="prefix" v-if="content.prefix">{{content.prefix}}</span>
     <div class="sticP" :style="{paddingRight:content.suffix?'1rem':'0'}">
         <div class="iptWrap">
-          <input class="contentVal" :type="content.type" :placeholder="content.placeholder" pattern="\d*" v-model.number="txt" @input="changeVal" @blur="blur" @click="handleClick">
+          <!-- <input class="contentVal" type="number" :placeholder="content.placeholder" pattern="\d*" v-model="txt" @input="changeVal" @blur="blur" @click="handleClick"> -->
+          <!-- <input ref="ipt" class="contentVal" :placeholder="content.placeholder" pattern="[0-9]*" v-model="txt" @input="changeVal" @blur="blur" @click="handleClick"> -->
+          <input ref="ipt" type="tel" class="contentVal" :placeholder="content.placeholder" v-model="txt" @input="changeVal" @blur="blur" @click="handleClick">
+          <!-- <input v-for="(item,index) in content.iptList" type="tel" class="contentVal" :placeholder="content.placeholder" v-model="txt" @input="changeVal" @blur="blur" @click="handleClick"> -->
+
         </div>
     </div>
     <span class="suffix" v-if="content.suffix">{{content.suffix}}</span>
@@ -51,7 +55,7 @@ export default {
     blur(){
       // 如果该项未选中，则不存值
       const select = this.part.select;
-      if(!select){return}
+      // if(!select){return}
       const newData = Object.assign({},this.part,{value:this.txt,controlType:3});
       this.$emit("updata",newData);
       this.$emit('handleInp',this.txt);
@@ -74,7 +78,7 @@ export default {
 <style lang="less" scoped>
   .multipIpt {
     width: 100%;
-    height: .74rem /* 74/100 */;
+    // height: .74rem /* 74/100 */;
     line-height: .74rem /* 74/100 */;
     // border: 1px solid #DFE0E4;
     // border-radius: .08rem /* 8/100 */;
@@ -117,11 +121,12 @@ export default {
   }
   .suffix {
     position: absolute;
-    right: .12rem;
-    top: 0;
+    right: .1rem;
+    top: .1rem;
     width: 1rem;
     text-align: right;
     text-align: left;
+    line-height: .36rem;
   }
   .sticP {
     width: 100%;
@@ -132,6 +137,7 @@ export default {
       // width: 100%;
       position: relative;
       overflow: hidden;
+      min-width: 1rem;
     }
   }
   .check{

src/components/AddContent.vue

@@ -75,7 +75,7 @@ export default {
       this.val = value
     },
     next(){
-      this.$store.commit('setText',{data:this.dataTrd,type:4});
+      this.$store.commit('setText',{data:this.dataTrd,type:this.allMoudles&&this.allMoudles.type});
       this.$emit('next','preview')
     },
     setDetail(obj){

src/components/DiagTreat.vue

@@ -8,8 +8,8 @@
         <Label v-if="it.controlType==0" 
               :item="it" 
               :indx="i" 
-              :ppId="it.id" 
-              :moduleType="datas.type" 
+              :ppId="it.id"
+              :moduleType="datas.type"
               @setDetail="setDetail"/>
         <!-- 上传图片 -->
         <UploadImg v-if="it.controlType==4" 
@@ -42,12 +42,12 @@
       <span class="next" @click="toNext">{{'进入'+ nextName}}</span>
     </div>
     <div class="detail" v-if="show">
-      <DetailBox @close="closeDetal" 
-              :data="labelDetail" 
-              :moduleType="datas.type"
-              :ppId="ppId"
-              v-if="labelDetail.questionMapping&&labelDetail.questionMapping.length>0"
-              @pComplete="complete"/>
+    <DetailBox @close="closeDetal" 
+            :data="labelDetail" 
+            :moduleType="datas.type"
+            :ppId="ppId"
+            v-if="labelDetail.questionMapping&&labelDetail.questionMapping.length>0"
+            @pComplete="complete"/>
     </div>
   </div>
 </template>

src/components/PathInfo.vue

@@ -199,6 +199,7 @@
       white-space: nowrap;
       overflow-x: auto;
       padding:0 .15rem .15rem 0;
+      -webkit-overflow-scrolling: touch;  
     }
     .emery,.child{
       display: inline-block;

src/components/TabPage.vue

@@ -5,8 +5,7 @@
       <p v-for="(it,index) in modlues"
         :style="{'width':1/modlues.length*100+'%'}"
         :key="it.id">
-        <span :class="{current:index==number,comp:finish[it.type]}"
-          v-if="type[it.type]==1">
+        <span :class="{current:index==number,comp:finish[it.type]}" v-if="type[it.type]==1">
           <!-- <i>{{it.type}}</i> -->
           <i>{{index+1}}</i>
           {{it.name}}
@@ -31,6 +30,7 @@
           @next="toNext"
           @back="beBack"
         />
+
         <Others
           v-if="flag==3&&item.type==3&&moduleShow"
           :modluesLen="modluesLen"
@@ -84,9 +84,9 @@ export default {
       moduleShow:true,
       finish:{ //标识已填
         "1":true,
-        "2":false,
+        "51":false,
         "3":false,
-        "4":false
+        "52":false
       },
       number:0
     }
@@ -131,7 +131,6 @@ export default {
         return
       }
       let flag = parseInt(this.flag),num=this.number;
-      // this.finish[flag] = true;
       this.number = ++num;
       
       for(let j in this.finish){

src/store.js

@@ -90,7 +90,7 @@ const store = new Vuex.Store({
         case 1: //症状情况
           state.symptom.origin = Object.assign({},state.symptom.origin,{[data.id]:data});
           break;
-        case 2: //诊疗情况
+        case 51: //诊疗情况
           let diagData = state.diagnose.origin;
           for(let i in diagData){
             if(diagData[i].id == param.pId){
@@ -116,7 +116,7 @@ const store = new Vuex.Store({
             }
           }
           break;
-        case 4:
+        case 52:
           
           break;
         default:
@@ -132,7 +132,7 @@ const store = new Vuex.Store({
         case 1:
           state.symptom.datas = Object.assign({},state.symptom.datas,{[param.pId]:data});
           break;
-        case 2: //诊疗情况
+        case 51: //诊疗情况
           let diagData = state.diagnose.datas;
           for(let i in diagData){
             if(diagData[i].id == ppId){
@@ -159,7 +159,7 @@ const store = new Vuex.Store({
             }
           }
           break;
-        case 4:
+        case 52:
 
           break;
         default:
@@ -189,7 +189,7 @@ const store = new Vuex.Store({
             text.push(param);
           }
           break;
-        case 2: //诊疗情况
+        case 51: //诊疗情况
           let diaText = state.diagnose.text;
           if(diaText.length > 0){
             for(let i in diaText){
@@ -221,7 +221,7 @@ const store = new Vuex.Store({
             otherText.push(param);
           }
           break;
-        case 4:
+        case 52:
           let addText = state.addContent.txt
           state.addContent.origin = param.data
           state.addContent.txt = getAllStr(param)
@@ -241,7 +241,7 @@ const store = new Vuex.Store({
             }
           }
           break;
-        case 2: //诊疗情况
+        case 51: //诊疗情况
           let diaText = state.diagnose.text;
           for(let i in diaText){
             if(diaText[i].pId==param.pId){
@@ -257,7 +257,7 @@ const store = new Vuex.Store({
             }
           }
           break;
-        case 4:
+        case 52:
 
           break;
         default:
@@ -273,13 +273,13 @@ const store = new Vuex.Store({
         case 1:
 
           break;
-        case 2: //诊疗情况
+        case 51: //诊疗情况
           state.diagnose.imgFile.push(param);
           break;
         case 3:
 
           break;
-        case 4:
+        case 52:
 
           break;
         default:
@@ -295,13 +295,13 @@ const store = new Vuex.Store({
         case 1:
 
           break;
-        case 2:
+        case 51:
           state.diagnose.imgSrc = Object.assign({},state.diagnose.imgSrc,{[key]:src});
           break;
         case 3:
 
           break;
-        case 4:
+        case 52:
 
           break;
         default:
@@ -316,7 +316,7 @@ const store = new Vuex.Store({
         case 1:
 
           break;
-        case 2:
+        case 51:
           let data = state.diagnose.imgFile;
           for(let i=0; i<data.length;i++){
             if(data[i].key==key){
@@ -327,7 +327,7 @@ const store = new Vuex.Store({
         case 3:
 
           break;
-        case 4:
+        case 52:
 
           break;
         default:
@@ -342,7 +342,7 @@ const store = new Vuex.Store({
         case 1:
 
           break;
-        case 2:
+        case 51:
           let data = state.diagnose.imgFile;
           let obj = state.diagnose.imgSrc;
           delete(obj[key]);
@@ -351,7 +351,7 @@ const store = new Vuex.Store({
         case 3:
 
           break;
-        case 4:
+        case 52:
 
           break;
         default:

src/utils/tools.js

@@ -20,11 +20,22 @@ const getModelExpStr = (str) =>{
   let result = {}
   if(str.match(/\${number_(.*})/)){//数字输入框
     let matchStr = str.match(/\${number_(.*})/)[0]
+    let tmpHolder = matchStr.split('${number_')[1].split('}')[0]
+    let iptLis = [],join='',pre='',next=''
+    if(tmpHolder.indexOf('/') != -1){
+      pre = tmpHolder.split('/')[0]
+      next = tmpHolder.split('/')[1]
+      join = '/'
+      iptLis.push(pre,next)
+    }
     result = {
       type:'number',
-      placeholder:matchStr.split('${number_')[1].split('}')[0],
+      placeholder:tmpHolder,
+      pre:pre||'',
+      next:next||'',
+      join:join,
       prefix:str.split(matchStr)[0]||'',
-      suffix:str.split(matchStr)[1]||''
+      suffix:str.split(matchStr)[1]||'',
     }
   }else if(str.match(/\${input_(.*})/)){
     let matchStr = str.match(/\${input_(.*})/)[0]