Browse Source

foot层级

liucf 5 years ago
parent
commit
1cd0e62c90

+ 1 - 1
src/common/Submit.vue

@@ -40,7 +40,7 @@ export default {
   // },
   methods: {
     goStart() {
-      this.$store.commit('initAllData')
+      // this.$store.commit('initAllData') //已在患者页进行初始化
       this.$router.push("/")
     }
   }

+ 1 - 5
src/common/UploadImg.vue

@@ -171,11 +171,6 @@ export default {
 <style lang="less" scoped>
 .img-wrap {
   font-size: 0.3rem;
-  /* .name {
-    color: #000;
-    margin-bottom: 0.36rem;
-    font-weight: 700;
-  } */
   .upload-imgs {
     margin-bottom: 0.2rem;
     .uploadBox {
@@ -190,6 +185,7 @@ export default {
     li {
       width: 1.86rem;
       height: 1.9rem;
+      border: 1px solid #dfe0e4;
       display: inline-block;
       position: relative;
       vertical-align: top;

+ 21 - 1
src/components/DiagTreat.vue

@@ -11,11 +11,21 @@
               :ppId="it.id" 
               :moduleType="datas.type" 
               @setDetail="setDetail"/>
-      <UploadImg v-if="it.controlType==4" 
+        <!-- 上传图片 -->
+        <UploadImg v-if="it.controlType==4" 
             :item="it" 
             :moduleType="datas.type"
             :imgList="imgs"
             />
+        <!-- 输入框 -->
+        <Input v-if="it.controlType==6 || it.controlType==7"
+            :item="it"
+            :key="it.id"
+            @updata="updataData($event,it.id)"/>
+        <!-- 文本域 -->
+        <ComTextArea v-if="it.controlType == 5"
+            :item="it"
+            @updata="updataData($event,it.id)"/>
     </div>
     <div class="result" v-if="checkText.length>0">
       <p class="title">治疗情况</p>
@@ -86,6 +96,16 @@
           msg += textArr[k].text + ';'
         }
         return msg;
+      },
+      updataData(data,id){//输入框存值
+        let list = this.dtoList;
+        for(let i in list){
+          if(list[i].id==data.id){
+            list.splice(i,1,data)
+          }
+        }
+        this.$store.commit('setDatas',{type:'2',data:data,pId:data.id,ppId:id});
+        this.$store.commit('setText',{type:'2',text:data.value,pId:data.id,flag:true}); 
       }
     },
     components:{

+ 4 - 1
src/components/Others.vue

@@ -15,10 +15,13 @@
             :item="it"
             :key="it.id"
             @updata="updataData($event,it.id)"/>
+        <!-- 文本域 -->
+        <ComTextArea v-if="it.controlType == 5"
+            :item="it"
+            @updata="updataData($event,it.id)"/>
     </div>
     <div class="result" v-if="checkText.length>0">
       <p class="title">其他病史</p>
-      <!-- <p v-for="(v,i) in checkText">{{v.text}}</p> -->
       <p>{{getText()}}</p>
     </div>
     <div class="foot">

+ 1 - 0
src/components/PathInfo.vue

@@ -75,6 +75,7 @@
       // this.ifWX();
       this.getPathInfo();
       this.getSysConfig();
+      this.$store.commit('initAllData');//初始化store数据
     },
     methods:{
       getPathInfo(){

+ 1 - 0
src/less/base.less

@@ -28,6 +28,7 @@
   bottom: 0;
   left: 0;
   background: #F2F2F5;
+  z-index: 66;
   .back,.next{
     display: inline-block;
     height: .88rem;