liucf 5 years ago
parent
commit
0545a51ad2

+ 2 - 1
config/index.js

@@ -4,7 +4,8 @@
 
 
 const path = require('path')
 const path = require('path')
 // const proxy_path = 'http://192.168.2.236:80';
 // const proxy_path = 'http://192.168.2.236:80';
-const proxy_path = 'http://192.168.2.236:5050';
+// const proxy_path = 'http://192.168.2.236:5050';
+const proxy_path = 'http://192.168.2.241:5050';
 
 
 module.exports = {
 module.exports = {
   dev: {
   dev: {

+ 5 - 1
src/components/DiagTreat.vue

@@ -55,6 +55,8 @@
   import UploadImg from '../common/UploadImg.vue';
   import UploadImg from '../common/UploadImg.vue';
   import Label from '../common/Label.vue';
   import Label from '../common/Label.vue';
   import DetailBox from './DetailBox.vue';
   import DetailBox from './DetailBox.vue';
+  import Input from '../common/Input.vue';
+  import ComTextArea from '../common/ComTextArea.vue';
   export default {
   export default {
     name:'DiagTreat',
     name:'DiagTreat',
     data(){
     data(){
@@ -120,7 +122,9 @@
     components:{
     components:{
       UploadImg,
       UploadImg,
       Label,
       Label,
-      DetailBox
+      DetailBox,
+      Input,
+      ComTextArea
     },
     },
     /*watch:{
     /*watch:{
       dtoList:{
       dtoList:{

+ 3 - 1
src/components/Others.vue

@@ -48,6 +48,7 @@
   import DetailBox from './DetailBox.vue';
   import DetailBox from './DetailBox.vue';
   import Toast from '../common/Toast.vue';
   import Toast from '../common/Toast.vue';
   import Input from '../common/Input.vue';
   import Input from '../common/Input.vue';
+  import ComTextArea from '../common/ComTextArea.vue';
   export default {
   export default {
     name:'Others',
     name:'Others',
     data(){
     data(){
@@ -119,7 +120,8 @@
       UploadImg,
       UploadImg,
       Label,
       Label,
       DetailBox,
       DetailBox,
-      Input
+      Input,
+      ComTextArea
     },
     },
     /*watch:{
     /*watch:{
       dtoList:{
       dtoList:{

+ 4 - 4
src/components/TabPage.vue

@@ -23,7 +23,7 @@
         />
         />
       
       
         <DiagTreat
         <DiagTreat
-          v-if="flag==2&&item.type==2&&moduleShow"
+          v-if="flag==51&&item.type==51&&moduleShow"
           :datas="item"
           :datas="item"
           :preName="modlues[0]&&modlues[0].name"
           :preName="modlues[0]&&modlues[0].name"
           :modluesLen="modluesLen"
           :modluesLen="modluesLen"
@@ -41,7 +41,7 @@
           @back="beBack"
           @back="beBack"
         />
         />
         <AddContent
         <AddContent
-          v-show="flag == 4&&item.type==4&&moduleShow"
+          v-show="flag == 52&&item.type==52&&moduleShow"
           :modluesLen="modluesLen"
           :modluesLen="modluesLen"
           :allMoudles="item"
           :allMoudles="item"
           :preName="modlues[idx-1]&&modlues[idx-1].name"
           :preName="modlues[idx-1]&&modlues[idx-1].name"
@@ -76,9 +76,9 @@ export default {
       modluesLen: allMoudles.len,
       modluesLen: allMoudles.len,
       type: {
       type: {
         "1": sysConfig.length > 0 && sysConfig.filter(item => item.code == "symptoms_show")[0].value,
         "1": sysConfig.length > 0 && sysConfig.filter(item => item.code == "symptoms_show")[0].value,
-        "2": sysConfig.length > 0 && sysConfig.filter(item => item.code == "diagnosis_show")[0].value,
+        "51": sysConfig.length > 0 && sysConfig.filter(item => item.code == "diagnosis_show")[0].value,
         "3": sysConfig.length > 0 && sysConfig.filter(item => item.code == "omhistory_show")[0].value,
         "3": sysConfig.length > 0 && sysConfig.filter(item => item.code == "omhistory_show")[0].value,
-        "4": sysConfig.length > 0 && sysConfig.filter(item => item.code == "replenish_show")[0].value,
+        "52": sysConfig.length > 0 && sysConfig.filter(item => item.code == "replenish_show")[0].value,
       },
       },
       flag: allMoudles.order,
       flag: allMoudles.order,
       moduleShow:true,
       moduleShow:true,

+ 1 - 1
src/store.js

@@ -74,7 +74,7 @@ const store = new Vuex.Store({
     saveAll(state,param){
     saveAll(state,param){
       state.allMoudles = param;
       state.allMoudles = param;
       for(let k in param){
       for(let k in param){
-        if(param[k].type == 2){
+        if(param[k].type == 51){
           state.diagnose.origin = JSON.parse(JSON.stringify(param[k].moduleDetailDTOList))
           state.diagnose.origin = JSON.parse(JSON.stringify(param[k].moduleDetailDTOList))
           state.diagnose.datas = JSON.parse(JSON.stringify(param[k].moduleDetailDTOList))
           state.diagnose.datas = JSON.parse(JSON.stringify(param[k].moduleDetailDTOList))
         }else if(param[k].type == 3){
         }else if(param[k].type == 3){

+ 9 - 0
src/utils/config.js

@@ -0,0 +1,9 @@
+// 通用配置信息
+export default {
+  moduleType:{
+    'symp':'1',
+    'diagT':'51',
+    'other':'3',
+    'suplement':'52',
+  }
+}

+ 2 - 2
src/utils/tools.js

@@ -67,11 +67,11 @@ const moduleConfig = (config,modules) => {
       let tmpType = modules[j].type
       let tmpType = modules[j].type
       if(tmpCode=="symptoms_show"&&tmpType==1){
       if(tmpCode=="symptoms_show"&&tmpType==1){
         activeModule.push(modules[j])
         activeModule.push(modules[j])
-      }else if(tmpCode=="diagnosis_show"&&tmpType==2){
+      }else if(tmpCode=="diagnosis_show"&&tmpType==51){
         activeModule.push(modules[j])
         activeModule.push(modules[j])
       }else if(tmpCode=="omhistory_show"&&tmpType==3){
       }else if(tmpCode=="omhistory_show"&&tmpType==3){
         activeModule.push(modules[j])
         activeModule.push(modules[j])
-      }else if(tmpCode=="replenish_show"&&tmpType==4){
+      }else if(tmpCode=="replenish_show"&&tmpType==52){
         activeModule.push(modules[j])
         activeModule.push(modules[j])
       }
       }
     }
     }