Browse Source

新分支

28169 1 year ago
parent
commit
7b046a475c

+ 9 - 0
src/api/datastore.js View File

17
     data: params
17
     data: params
18
   })
18
   })
19
 }
19
 }
20
+
21
+export function getManageConfigList(params){
22
+  
23
+  return request({
24
+    url:"/api/dictionary/getmanageconfiglist",
25
+    method:"get",
26
+    data:params,
27
+  })
28
+}

+ 1 - 1
src/api/patient.js View File

255
 }
255
 }
256
 
256
 
257
 export function PostSearch(keyword) {
257
 export function PostSearch(keyword) {
258
-  console.log('keyword2222222', keyword)
258
+  
259
   return request({
259
   return request({
260
     url: '/api/patients/search?keyword=' + keyword,
260
     url: '/api/patients/search?keyword=' + keyword,
261
     method: 'post'
261
     method: 'post'

+ 1 - 0
src/store/getters.js View File

20
   configlist: state => state.data.configlist,
20
   configlist: state => state.data.configlist,
21
 
21
 
22
   dictionary_configlist: state => state.data.dictionary_configlist,
22
   dictionary_configlist: state => state.data.dictionary_configlist,
23
+  manage_configlist:state => state.data.manage_configlist,
23
   pagedata:state => state.pagedata,
24
   pagedata:state => state.pagedata,
24
 
25
 
25
   xt_permission: state => state.xt_permission,
26
   xt_permission: state => state.xt_permission,

+ 30 - 5
src/store/modules/data.js View File

1
-import { getConfigList,getDictionaryConfigList } from '@/api/datastore'
2
-import { getDataConfigList, setDataConfigList,getDataDictionaryConfigList,setDataDictionaryConfigList } from '@/utils/data_config' // getConfigList from sessionStorage
1
+import { getConfigList,getDictionaryConfigList,getManageConfigList } from '@/api/datastore'
2
+import { getDataConfigList, setDataConfigList,getDataDictionaryConfigList,setDataDictionaryConfigList,setDataManageConfigList } from '@/utils/data_config' // getConfigList from sessionStorage
3
 
3
 
4
 const data = {
4
 const data = {
5
   state: {
5
   state: {
6
     configlist: '',
6
     configlist: '',
7
     dictionary_configlist:'',
7
     dictionary_configlist:'',
8
+    manage_configlist:''
8
   },
9
   },
9
 
10
 
10
   mutations: {
11
   mutations: {
11
     SET_CONFIGLIST: (state, configlist) => {
12
     SET_CONFIGLIST: (state, configlist) => {
12
       state.configlist = configlist
13
       state.configlist = configlist
13
-    }, SET_DICTIONARY_CONFIGLIST: (state, configlist) => {
14
+    }, 
15
+    SET_DICTIONARY_CONFIGLIST: (state, configlist) => {
14
       state.dictionary_configlist = configlist
16
       state.dictionary_configlist = configlist
15
-    }
16
-
17
+    },
18
+    SET_Manage_CONFIGLIST: (state, configlist) => {
19
+      state.manage_configlist = configlist
20
+    },
17
   },
21
   },
18
 
22
 
19
   actions: {
23
   actions: {
57
           reject(error)
61
           reject(error)
58
         })
62
         })
59
 
63
 
64
+
65
+        getManageConfigList().then(response => {
66
+          if (!response.data) { // 由于mockjs 不支持自定义状态码只能这样hack
67
+            reject('error')
68
+          }
69
+          const list = response.data.data
70
+         
71
+          console.log('请求返回的数据:', list)
72
+          if (list) { // 验证返回的configlist是否是一个非空数组
73
+            // console.log('转换的configlist为:', list.configlist)
74
+            commit('SET_Manage_CONFIGLIST', list.configlist)
75
+            setDataManageConfigList(JSON.stringify(list.configlist))
76
+            resolve()
77
+          } else {
78
+            reject('getInfo: configlist must be a non-null array !')
79
+          }
80
+        }).catch(error => {
81
+          reject(error)
82
+        })
83
+
60
       })
84
       })
61
     },
85
     },
62
     updateConfigList({ commit }, configArr) {
86
     updateConfigList({ commit }, configArr) {
162
         }
186
         }
163
         infoJSON[module].push(configArr)
187
         infoJSON[module].push(configArr)
164
         commit('SET_DICTIONARY_CONFIGLIST', infoJSON)
188
         commit('SET_DICTIONARY_CONFIGLIST', infoJSON)
189
+
165
         setDataDictionaryConfigList(JSON.stringify(infoJSON))
190
         setDataDictionaryConfigList(JSON.stringify(infoJSON))
166
         resolve()
191
         resolve()
167
       })
192
       })

+ 41 - 0
src/utils/data.js View File

73
     }
73
     }
74
   }
74
   }
75
 }
75
 }
76
+
77
+
78
+export function getManageMentDataConfig(module, field) {
79
+  var storeConfigList = store.getters.manage_configlist
80
+  console.log("storeConfigListwwowowowowwo",storeConfigList)
81
+  var moduleConfig = storeConfigList[module]
82
+  if (moduleConfig == undefined) {
83
+    return false
84
+  }
85
+  if (module === 'summary') {
86
+    console.log("哈哈哈hhhwowowowoo")
87
+    var Aresult = []
88
+    for (var j = 0; j < moduleConfig.length; j++) {
89
+      var Atemp = []
90
+      var Aconfig = moduleConfig[j]
91
+      Atemp['id'] = Aconfig.value
92
+      Atemp['value'] = Aconfig.content
93
+      Atemp['text'] = Aconfig.title
94
+      Aresult.push(Atemp)
95
+    }
96
+    // console.log("Aresultwoowowowowow",Aresult)
97
+    return Aresult
98
+  } else {
99
+    for (var i = 0; i < moduleConfig.length; i++) {
100
+      var newConfig = moduleConfig[i]
101
+      if (newConfig.field_name === field) {
102
+        var result = []
103
+        if (newConfig.childs != null) {
104
+          for (var j = 0; j < newConfig.childs.length; j++) {
105
+            var tempconfig = newConfig.childs[j]
106
+            var temp = []
107
+            temp['id'] = tempconfig.value
108
+            temp['name'] = tempconfig.name
109
+            result.push(temp)
110
+          }
111
+        }
112
+        return result
113
+      }
114
+    }
115
+  }
116
+}

+ 17 - 0
src/utils/data_config.js View File

5
 const dataDictionaryConfigKey = 'data_dictionary_config_list'
5
 const dataDictionaryConfigKey = 'data_dictionary_config_list'
6
 
6
 
7
 
7
 
8
+const manageDictionaryConfigKey ="manage_dictionary_config_list"
9
+
10
+
8
 
11
 
9
 
12
 
10
 export function getDataConfigList() {
13
 export function getDataConfigList() {
15
   window.sessionStorage.setItem(dataConfigKey, infoJSONStr)
18
   window.sessionStorage.setItem(dataConfigKey, infoJSONStr)
16
 }
19
 }
17
 
20
 
21
+
22
+
18
 export function removeDataConfigList() {
23
 export function removeDataConfigList() {
19
   window.sessionStorage.removeItem(dataConfigKey)
24
   window.sessionStorage.removeItem(dataConfigKey)
20
 }
25
 }
48
   window.sessionStorage.removeItem(dataDictionaryConfigKey)
53
   window.sessionStorage.removeItem(dataDictionaryConfigKey)
49
 }
54
 }
50
 
55
 
56
+
57
+export function getDataManageConfigList() {
58
+  return window.sessionStorage.getItem(manageDictionaryConfigKey)
59
+}
60
+
61
+export function setDataManageConfigList(infoJSONStr){
62
+  window.sessionStorage.setItem(manageDictionaryConfigKey, infoJSONStr)
63
+}
64
+
65
+export function removeManageConfigList() {
66
+  window.sessionStorage.removeItem(manageDictionaryConfigKey)
67
+}

+ 4 - 1
src/xt_pages/device/airDisinfect.vue View File

298
 
298
 
299
 <script>
299
 <script>
300
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
300
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
301
+  import { getManageMentDataConfig } from '@/utils/data'
301
   import { getAllDoctorList,saveAirDisinfect,getAirList,getAirDisinfectDetail,updateAirDisinfect,deleteAirDisinfect } from "@/api/device"
302
   import { getAllDoctorList,saveAirDisinfect,getAirList,getAirDisinfectDetail,updateAirDisinfect,deleteAirDisinfect } from "@/api/device"
302
   import { uParseTime } from '@/utils/tools'
303
   import { uParseTime } from '@/utils/tools'
303
   const moment = require('moment')
304
   const moment = require('moment')
356
       }
357
       }
357
     },
358
     },
358
     created(){
359
     created(){
360
+      this.disinfection_fluid = getManageMentDataConfig('management', 'disinfection_fluid')
361
+      console.log("disinfection_fluid",this.disinfection_fluid)
359
       this.getlist()
362
       this.getlist()
360
       this.getAirList()
363
       this.getAirList()
361
     },
364
     },
387
                    check_out:parseInt(this.form.check_out),
390
                    check_out:parseInt(this.form.check_out),
388
                    modifications:parseInt(this.form.modifications),
391
                    modifications:parseInt(this.form.modifications),
389
                  }
392
                  }
390
-                //  console.log("params",params)
393
+              console.log("params",params)
391
                 
394
                 
392
                saveAirDisinfect(params).then(response=>{
395
                saveAirDisinfect(params).then(response=>{
393
                   if(response.data.state == 1){
396
                   if(response.data.state == 1){

+ 3 - 1
src/xt_pages/device/airDisinfectTwo.vue View File

843
     import { getAllDoctorList,saveNewAirDisinfect,getNewAirDisinfectList,getNewAirDisinfectByIdList,updateNewAirDisinfect,deleteNewAirDisInfect,getAirDisinfectLongTime} from "@/api/device"
843
     import { getAllDoctorList,saveNewAirDisinfect,getNewAirDisinfectList,getNewAirDisinfectByIdList,updateNewAirDisinfect,deleteNewAirDisInfect,getAirDisinfectLongTime} from "@/api/device"
844
     import { uParseTime } from '@/utils/tools'
844
     import { uParseTime } from '@/utils/tools'
845
     const moment = require('moment')
845
     const moment = require('moment')
846
+    import { getManageMentDataConfig } from '@/utils/data'
846
     export default {
847
     export default {
847
       name: 'airDisinfect',
848
       name: 'airDisinfect',
848
       components: {
849
       components: {
943
         }
944
         }
944
       },
945
       },
945
       created(){
946
       created(){
946
-       
947
+        this.disinfection_fluid = getManageMentDataConfig('management', 'disinfection_fluid')
948
+        console.log("disinfection_fluid",this.disinfection_fluid)
947
         this.getAllDoctorList()
949
         this.getAllDoctorList()
948
         this.getNewAirDisinfectList()
950
         this.getNewAirDisinfectList()
949
         var time=moment(this.form.first_start_time).format("HH:mm");
951
         var time=moment(this.form.first_start_time).format("HH:mm");

+ 4 - 3
src/xt_pages/user/patients.vue View File

528
           <el-form-item label="转归(死亡)时间 :" prop="lapseto_time" required v-if="lapsetoForm.lapseto_type == 2 || lapsetoForm.lapseto_type == 3"> 
528
           <el-form-item label="转归(死亡)时间 :" prop="lapseto_time" required v-if="lapsetoForm.lapseto_type == 2 || lapsetoForm.lapseto_type == 3"> 
529
             <el-date-picker
529
             <el-date-picker
530
               v-model="lapsetoForm.lapseto_time"
530
               v-model="lapsetoForm.lapseto_time"
531
-              type="datetime"
532
-              format="yyyy-MM-dd HH:mm:ss"
533
-              value-format="yyyy-MM-dd HH:mm:ss"
531
+              type="date"
532
+              format="yyyy-MM-dd"
533
+              value-format="yyyy-MM-dd"
534
               placeholder="选择日期时间"
534
               placeholder="选择日期时间"
535
               default-time="12:00:00"
535
               default-time="12:00:00"
536
             >
536
             >
1347
         //   this.lapsetoForm.lapseto_type = 3
1347
         //   this.lapsetoForm.lapseto_type = 3
1348
         //  }
1348
         //  }
1349
         console.log("22222",this.lapsetoForm)
1349
         console.log("22222",this.lapsetoForm)
1350
+       
1350
         EditLapseto(this.lapsetoForm.patient_id, this.lapsetoForm,this.form.patient_start_time,this.form.patient_end_time,this.form.patient_address).then(
1351
         EditLapseto(this.lapsetoForm.patient_id, this.lapsetoForm,this.form.patient_start_time,this.form.patient_end_time,this.form.patient_address).then(
1351
           response => {
1352
           response => {
1352
             if (response.data.state === 1) {
1353
             if (response.data.state === 1) {

+ 1 - 1
src/xt_pages/user/vascularAccess.vue View File

459
         <el-button type="primary" @click="updatedVasularAccess('form')">保存</el-button>
459
         <el-button type="primary" @click="updatedVasularAccess('form')">保存</el-button>
460
      </span>
460
      </span>
461
      </el-dialog>
461
      </el-dialog>
462
-     <!-- <sitemap> </sitemap> -->
462
+     <sitemap> </sitemap>
463
     </div>
463
     </div>
464
 
464
 
465
      <multi-select-box
465
      <multi-select-box