新分支

src/api/datastore.js

@@ -17,3 +17,12 @@ export function getDictionaryConfigList(params) {
     data: params
   })
 }
+
+export function getManageConfigList(params){
+  
+  return request({
+    url:"/api/dictionary/getmanageconfiglist",
+    method:"get",
+    data:params,
+  })
+}

src/api/patient.js

@@ -255,7 +255,7 @@ export function EditLapseto(patient_id, data,start_time,end_time,address) {
 }
 
 export function PostSearch(keyword) {
-  console.log('keyword2222222', keyword)
+  
   return request({
     url: '/api/patients/search?keyword=' + keyword,
     method: 'post'

src/store/getters.js

@@ -20,6 +20,7 @@ const getters = {
   configlist: state => state.data.configlist,
 
   dictionary_configlist: state => state.data.dictionary_configlist,
+  manage_configlist:state => state.data.manage_configlist,
   pagedata:state => state.pagedata,
 
   xt_permission: state => state.xt_permission,

src/store/modules/data.js

@@ -1,19 +1,23 @@
-import { getConfigList,getDictionaryConfigList } from '@/api/datastore'
-import { getDataConfigList, setDataConfigList,getDataDictionaryConfigList,setDataDictionaryConfigList } from '@/utils/data_config' // getConfigList from sessionStorage
+import { getConfigList,getDictionaryConfigList,getManageConfigList } from '@/api/datastore'
+import { getDataConfigList, setDataConfigList,getDataDictionaryConfigList,setDataDictionaryConfigList,setDataManageConfigList } from '@/utils/data_config' // getConfigList from sessionStorage
 
 const data = {
   state: {
     configlist: '',
     dictionary_configlist:'',
+    manage_configlist:''
   },
 
   mutations: {
     SET_CONFIGLIST: (state, configlist) => {
       state.configlist = configlist
-    }, SET_DICTIONARY_CONFIGLIST: (state, configlist) => {
+    }, 
+    SET_DICTIONARY_CONFIGLIST: (state, configlist) => {
       state.dictionary_configlist = configlist
-    }
-
+    },
+    SET_Manage_CONFIGLIST: (state, configlist) => {
+      state.manage_configlist = configlist
+    },
   },
 
   actions: {
@@ -57,6 +61,26 @@ const data = {
           reject(error)
         })
 
+
+        getManageConfigList().then(response => {
+          if (!response.data) { // 由于mockjs 不支持自定义状态码只能这样hack
+            reject('error')
+          }
+          const list = response.data.data
+         
+          console.log('请求返回的数据：', list)
+          if (list) { // 验证返回的configlist是否是一个非空数组
+            // console.log('转换的configlist为：', list.configlist)
+            commit('SET_Manage_CONFIGLIST', list.configlist)
+            setDataManageConfigList(JSON.stringify(list.configlist))
+            resolve()
+          } else {
+            reject('getInfo: configlist must be a non-null array !')
+          }
+        }).catch(error => {
+          reject(error)
+        })
+
       })
     },
     updateConfigList({ commit }, configArr) {
@@ -162,6 +186,7 @@ const data = {
         }
         infoJSON[module].push(configArr)
         commit('SET_DICTIONARY_CONFIGLIST', infoJSON)
+
         setDataDictionaryConfigList(JSON.stringify(infoJSON))
         resolve()
       })

src/utils/data.js

@@ -73,3 +73,44 @@ export function getDictionaryDataConfig(module, field) {
     }
   }
 }
+
+
+export function getManageMentDataConfig(module, field) {
+  var storeConfigList = store.getters.manage_configlist
+  console.log("storeConfigListwwowowowowwo",storeConfigList)
+  var moduleConfig = storeConfigList[module]
+  if (moduleConfig == undefined) {
+    return false
+  }
+  if (module === 'summary') {
+    console.log("哈哈哈hhhwowowowoo")
+    var Aresult = []
+    for (var j = 0; j < moduleConfig.length; j++) {
+      var Atemp = []
+      var Aconfig = moduleConfig[j]
+      Atemp['id'] = Aconfig.value
+      Atemp['value'] = Aconfig.content
+      Atemp['text'] = Aconfig.title
+      Aresult.push(Atemp)
+    }
+    // console.log("Aresultwoowowowowow",Aresult)
+    return Aresult
+  } else {
+    for (var i = 0; i < moduleConfig.length; i++) {
+      var newConfig = moduleConfig[i]
+      if (newConfig.field_name === field) {
+        var result = []
+        if (newConfig.childs != null) {
+          for (var j = 0; j < newConfig.childs.length; j++) {
+            var tempconfig = newConfig.childs[j]
+            var temp = []
+            temp['id'] = tempconfig.value
+            temp['name'] = tempconfig.name
+            result.push(temp)
+          }
+        }
+        return result
+      }
+    }
+  }
+}

src/utils/data_config.js

@@ -5,6 +5,9 @@ const filedConfigKey = 'filed_config_list'
 const dataDictionaryConfigKey = 'data_dictionary_config_list'
 
 
+const manageDictionaryConfigKey ="manage_dictionary_config_list"
+
+
 
 
 export function getDataConfigList() {
@@ -15,6 +18,8 @@ export function setDataConfigList(infoJSONStr) {
   window.sessionStorage.setItem(dataConfigKey, infoJSONStr)
 }
 
+
+
 export function removeDataConfigList() {
   window.sessionStorage.removeItem(dataConfigKey)
 }
@@ -48,3 +53,15 @@ export function removeDataDictionaryConfigList() {
   window.sessionStorage.removeItem(dataDictionaryConfigKey)
 }
 
+
+export function getDataManageConfigList() {
+  return window.sessionStorage.getItem(manageDictionaryConfigKey)
+}
+
+export function setDataManageConfigList(infoJSONStr){
+  window.sessionStorage.setItem(manageDictionaryConfigKey, infoJSONStr)
+}
+
+export function removeManageConfigList() {
+  window.sessionStorage.removeItem(manageDictionaryConfigKey)
+}

src/xt_pages/device/airDisinfect.vue

@@ -298,6 +298,7 @@
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getManageMentDataConfig } from '@/utils/data'
   import { getAllDoctorList,saveAirDisinfect,getAirList,getAirDisinfectDetail,updateAirDisinfect,deleteAirDisinfect } from "@/api/device"
   import { uParseTime } from '@/utils/tools'
   const moment = require('moment')
@@ -356,6 +357,8 @@
       }
     },
     created(){
+      this.disinfection_fluid = getManageMentDataConfig('management', 'disinfection_fluid')
+      console.log("disinfection_fluid",this.disinfection_fluid)
       this.getlist()
       this.getAirList()
     },
@@ -387,7 +390,7 @@
                    check_out:parseInt(this.form.check_out),
                    modifications:parseInt(this.form.modifications),
                  }
-                //  console.log("params",params)
+              console.log("params",params)
                 
                saveAirDisinfect(params).then(response=>{
                   if(response.data.state == 1){

src/xt_pages/device/airDisinfectTwo.vue

@@ -843,6 +843,7 @@
     import { getAllDoctorList,saveNewAirDisinfect,getNewAirDisinfectList,getNewAirDisinfectByIdList,updateNewAirDisinfect,deleteNewAirDisInfect,getAirDisinfectLongTime} from "@/api/device"
     import { uParseTime } from '@/utils/tools'
     const moment = require('moment')
+    import { getManageMentDataConfig } from '@/utils/data'
     export default {
       name: 'airDisinfect',
       components: {
@@ -943,7 +944,8 @@
         }
       },
       created(){
-       
+        this.disinfection_fluid = getManageMentDataConfig('management', 'disinfection_fluid')
+        console.log("disinfection_fluid",this.disinfection_fluid)
         this.getAllDoctorList()
         this.getNewAirDisinfectList()
         var time=moment(this.form.first_start_time).format("HH:mm");

src/xt_pages/user/patients.vue

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

src/xt_pages/user/vascularAccess.vue

@@ -459,7 +459,7 @@
         <el-button type="primary" @click="updatedVasularAccess('form')">保存</el-button>
      </span>
      </el-dialog>
-     <!-- <sitemap> </sitemap> -->
+     <sitemap> </sitemap>
     </div>
 
      <multi-select-box