Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

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/api/role/admin.js

@@ -282,4 +282,4 @@ export function UploadPrintOrder(data){
     method:"Post",
     data:data,
   })
-}
+}

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/outpatientCharges/summary.vue

@@ -124,10 +124,10 @@
           <!--          </el-button-->
           <!--          >-->
 
-           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
+<!--           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
-           <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>
+<!--           <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
           <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
 
@@ -2677,6 +2677,7 @@ export default {
               治疗费:0,
               材料费:0,
               中成药费:0,
+              护理费:0,
               备注: "就诊日期:" + this.getTimes(order.settle_accounts_date) + " 医保报销: "+order.fund_pay_sumamt + " 现金:"+order.psn_cash_pay,
             }
             let xiyaoPrice = 0
@@ -2685,6 +2686,8 @@ export default {
             let zhiLiaoPrice = 0
             let cailiaoPrice = 0
             let zhongchengyaoPrice = 0
+            let huliPrice = 0
+
 
               for (let b = 0; b < order.info.length; b++) {
                 if(order.info[b].med_chrgitm_type ==  '09'){
@@ -2705,6 +2708,10 @@ export default {
                 if(order.info[b].med_chrgitm_type ==  '11'){
                   zhongchengyaoPrice = zhongchengyaoPrice + order.info[b].det_item_fee_sumamt
                 }
+
+                if(order.info[b].med_chrgitm_type ==  '07'){
+                  huliPrice = huliPrice + order.info[b].det_item_fee_sumamt
+                }
               }
             obj.西药费 = xiyaoPrice
             obj.化验费 = huaYanPrice
@@ -2712,6 +2719,8 @@ export default {
             obj.治疗费 = zhiLiaoPrice
             obj.材料费 = cailiaoPrice
             obj.中成药费 = zhongchengyaoPrice
+            obj.护理费 = huliPrice
+
 
 
             list.push(obj)
@@ -2727,6 +2736,8 @@ export default {
               "治疗费",
               "材料费",
               "中成药费",
+              "护理费",
+
               "备注",
             ];
             const filterVal = [
@@ -2738,6 +2749,7 @@ export default {
               "治疗费",
               "材料费",
               "中成药费",
+              "护理费",
               "备注",
             ];
             const data = this.formatJson(filterVal, list);

src/xt_pages/role/admin.vue

@@ -177,7 +177,7 @@
           style="float:left"
           @click="toEnd">结束签署</el-button> -->
            
-         
+       
           
      </div>
     
@@ -1013,7 +1013,8 @@ export default {
           this.$message.success("保存成功")
         }
       })
-    }
+    },
+   
   },
   watch: {
     should_update_admins(should_change) {

src/xt_pages/user/Sitemap.vue

@@ -58,11 +58,11 @@
 
 
             <!-- 穿刺文字 @mousedown="mousedown($event)"   active  @mousedown="startDrag"   @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)" left:text_left+'px',top:text_top+'px',-->
-            <!-- <div   
+            <!-- <div
             >  width:(item.width + 10)+'px',-->
               <div v-for="(item,index) in text_arr" :key="index" class="add-mark-text-wrap active text" id="text" @mousedown="mousedown($event)"
               :style="{width: 'fit-content',left:item.left+'px',top:item.top+'px','font-size':14+'px', position: 'absolute'}"
-              > 
+              >
               <!-- <el-input v-model="item.text" class="inputStyle">
                 <template slot="prefix">
                   {{ item.text }}
@@ -265,10 +265,10 @@
                 <div style="width: 200px;">住院(门诊)号：{{ patients.admission_number }}</div>
                 <div style="width: 200px;">打印时间：{{date}}</div>
               </div>
-              
+
               <div style="width: 530px;margin: 20px auto;">
                 <img :src="imgUrls" alt="" srcset="">
-                
+
               </div>
             <!-- </div> -->
           </div>
@@ -301,7 +301,7 @@ export default{
       shiyituDialogVisible:false,
       dayinDialogVisible:false,
       imgUrl:[],
-      
+
       fangxiangA:[{markNum:'',left:'',top:''}],//a端进针方向的数组
       fangxiangA_num:1,//控制a端进针方向是否显示
       fangxiangA_left:400,//A端进针方向X
@@ -312,7 +312,7 @@ export default{
       fangxiangV_left:100,//v端进针方向X
       fangxiangV_top:78,//v端进针方向Y
 
-      
+
       fuzhuA:[{a_markNum:0,a_left:0,a_top:0}],//助辅工具a的数组
       fuzhuA_num:1,//控制a端辅助工具是否显示
       xuanzhuan_a:0,//点击旋转角度a
@@ -343,8 +343,8 @@ export default{
 
       av_bkx:0,
       av_bky:0,
-      
-      fileList:[],//上传图片
+
+      fileList:[],
       uploadData: { token: '', key: '' },
       qiniuDomain: 'https://images.shengws.com/',
       puncture_text:[{text:'穿刺角度',width:70},{text:'卡夫距导管出口距离cm',width:158},{text:'动脉端向心穿刺',width:116},{text:'动脉端离心穿刺',width:116},
@@ -378,10 +378,10 @@ export default{
     }
   },
   created(){
-    
+
     const id = this.$route.params && this.$route.params.id;
     this.patientID = parseInt(id);
-   
+
     // this.getPatientSitemap(this.patientID)
   },
   mounted(){
@@ -408,7 +408,7 @@ export default{
     open(){
       this.imgDialogVisible = true
     },
-   
+
     a_item(e,val){
       console.log('asdfasdf222',this.Aarr);
      for(let i=0;i<this.Aarr.length;i++){
@@ -450,7 +450,7 @@ export default{
       // }
      }
     },
-    
+
     A_mousedow(e){
       console.log('7777',e);
       // console.log('8888',val);
@@ -773,12 +773,12 @@ export default{
         this.imgUrls = canvas.toDataURL("image/png");
         // console.log('123424534',this.imgUrls)
       });
-     
-      
+
+
     },
     // 打印
     dayin(){
-      
+
       const style='@media print{.parint_content{width:960px;} #ossPointMarkImg {width: 520px;min-height: 600px;height: auto;border-radius: 2px;pointer-events: none;} .mark-target-a{background: #E73535;top: 40px; left: 40px;} .mark-line{background: #E73535;} .mark-target-v{background: rgb(53,162,231);.mark-line{background: #35A2E7;}}  .mark-target-a,.mark-target-v {position: absolute;z-index: 1001;width: 26px;border-radius: 13px;height: 26px;text-align: center;line-height: 26px;font-size: 18px;cursor: move;color: rgb(255,255,255);.mark-line {transform: rotate(160deg);transform-origin: left bottom;}.mark-line {display: inline-block;position: absolute;left: 50%;top: 50%;width: 86px;height: 1px;cursor: default;z-index: -1;}}'
       printJS({
         printable: "print_img",
@@ -1011,22 +1011,26 @@ export default{
         for(let i=0;i<this.Aarr.length;i++){
             this.Aarr[i].mark_num = parseInt(this.Aarr[i].markNum)?parseInt(this.Aarr[i].markNum):0
             this.Aarr[i].is_status = parseInt(this.Aarr[i].status)?parseInt(this.Aarr[i].status):0
-            this.Aarr[i].left = parseInt(this.Aarr[i].left)?parseInt(this.Aarr[i].left):0 
-            this.Aarr[i].top = parseInt(this.Aarr[i].top)?parseInt(this.Aarr[i].top):0 
+            this.Aarr[i].left = parseInt(this.Aarr[i].left)?parseInt(this.Aarr[i].left):0
+            this.Aarr[i].top = parseInt(this.Aarr[i].top)?parseInt(this.Aarr[i].top):0
         }
       }
 
       if(this.Varr!=null && this.Varr.length>0){
-        
+
         for(let i=0;i<this.Varr.length;i++){
             this.Varr[i].mark_num = parseInt(this.Varr[i].markNum)?parseInt(this.Varr[i].markNum):0
             this.Varr[i].is_status = parseInt(this.Varr[i].status)?parseInt(this.Varr[i].status):0
-            this.Varr[i].left = parseInt(this.Varr[i].left)?parseInt(this.Varr[i].left):0 
-            this.Varr[i].top = parseInt(this.Varr[i].top)?parseInt(this.Varr[i].top):0 
+            this.Varr[i].left = parseInt(this.Varr[i].left)?parseInt(this.Varr[i].left):0
+            this.Varr[i].top = parseInt(this.Varr[i].top)?parseInt(this.Varr[i].top):0
         }
       }
-   
 
+
+       var img_url = ""
+       if(this.fileList!=null && this.fileList.length>0){
+          img_url = this.fileList[0].img_url
+       }
        var params = {
          id:this.id,
          is_append:is_append,
@@ -1068,6 +1072,7 @@ export default{
          left_v:0,
          aarr:this.Aarr,
          varr:this.Varr,
+         img_url:img_url,
        }
        console.log("paramswowwo",params)
 
@@ -1075,7 +1080,7 @@ export default{
           if(response.data.state == 1){
             var deviceValsualMap =  response.data.data.deviceValsualMap
             this.$message.success("保存成功!")
-            
+
             this.append =false
             this.getPatientSitemap(this.patientID)
           }
@@ -1130,31 +1135,31 @@ export default{
             this.text_num =sitemap.text_num
             this.text_top = sitemap.text_top
             this.v_num =sitemap.v_num
-         
+
             this.xuanzhuan_a = sitemap.xuanzhuan_a
             this.xuanzhuan_v = sitemap.xuanzhuan_v
-            
+
             this.A_right = []
-            
+
             if(sitemap.DeviceValsualALeft!=null && sitemap.DeviceValsualALeft.length>0){
               for(let i=0;i<sitemap.DeviceValsualALeft.length;i++){
-             
+
                 sitemap.DeviceValsualALeft[i].markNum =  sitemap.DeviceValsualALeft[i].mark_num
 
                 this.A_right.push(sitemap.DeviceValsualALeft[i])
              }
             }
-          
-            this.V_right = []          
+
+            this.V_right = []
             if(sitemap.DeviceValsualALeft!=null && sitemap.DeviceValsualALeft.length>0){
               for(let i=0;i<sitemap.DeviceValsualALeft.length;i++){
-             
+
                 sitemap.XtDeviceValsualVLeft[i].markNum =  sitemap.XtDeviceValsualVLeft[i].mark_num
 
                 this.V_right.push(sitemap.XtDeviceValsualVLeft[i])
               }
             }
-           
+
             this.fuzhuA = []
             if(sitemap.DeviceValsualFuzhuA!=null && sitemap.DeviceValsualFuzhuA.length>0){
               for(let i=0;i<sitemap.DeviceValsualFuzhuA.length;i++){
@@ -1162,7 +1167,7 @@ export default{
               this.fuzhuA.push( sitemap.DeviceValsualFuzhuA[i])
             }
             }
-           
+
             this.fuzhuV = []
             if(sitemap.DeviceValsualFuzhuV!=null && sitemap.DeviceValsualFuzhuV.length>0){
               for(let i=0;i<sitemap.DeviceValsualFuzhuV.length;i++){
@@ -1170,7 +1175,7 @@ export default{
               this.fuzhuV.push( sitemap.DeviceValsualFuzhuV[i])
              }
             }
-                
+
              this.fangxiangA = []
              if(sitemap.DeviceValsualMapFangxiangA!=null && sitemap.DeviceValsualMapFangxiangA.length>0){
                for(let i=0;i<sitemap.DeviceValsualMapFangxiangA.length;i++){
@@ -1186,16 +1191,16 @@ export default{
                 sitemap.DeviceValsualMapFangxiangV[i].markNum = sitemap.DeviceValsualMapFangxiangV[i].mark_num
                 this.fangxiangV.push(sitemap.DeviceValsualMapFangxiangV[i])
               }
-             } 
+             }
              console.log('222222222222',this.fangxiangV);
-             
+
              this.text_arr = []
              if(sitemap.DeviceValsualTextArr!=null && sitemap.DeviceValsualTextArr.length>0){
               for(let i=0;i<sitemap.DeviceValsualTextArr.length;i++){
                this.text_arr.push(sitemap.DeviceValsualTextArr[i])
               }
              }
-            
+
 
              this.Aarr = []
              if(sitemap.DeviceValusalMapArr!=null && sitemap.DeviceValusalMapArr.length>0){
@@ -1205,7 +1210,7 @@ export default{
                 this.Aarr.push(sitemap.DeviceValusalMapArr[i])
               }
              }
-             
+
 
              this.Varr = []
              if(sitemap.DeviceValusalMapVrr!=null && sitemap.DeviceValusalMapVrr.length>0){
@@ -1215,14 +1220,14 @@ export default{
                this.Varr.push(sitemap.DeviceValusalMapVrr[i])
               }
              }
-          
-             
+
+             this.fileList[0].img_url =  sitemap.img_url
             }
 
          }
       })
     },
-    
+
     chakan(){
       console.log('22222',);
       this.shiyituDialogVisible=true
@@ -1242,7 +1247,7 @@ export default{
       // let input = document.getElementById("inpu");
       // const l = input.value.length;
       // this.widthtext=(l+1) * 15 + "px"
-      // input.style.width = (l+1) * 15 + "px"; 
+      // input.style.width = (l+1) * 15 + "px";
     }
   },
   created(){

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

src/xt_pages/workforce/Patientshift.vue

@@ -600,12 +600,12 @@ export default {
      // 替换
      coverSch(){
       this.tipDialogVisible=false
-      this.currentData={
-        currentData_id:this.cur_drag_info.id,
-        currentData_name:this.cur_drag_info.name,
-        currentData_quhao:this.cur_drag_info.quhao,
-        currentData_chaung:this.cur_drag_info.chaung,
-      }
+      // this.currentData={
+      //   currentData_id:this.cur_drag_info.id,
+      //   currentData_name:this.cur_drag_info.name,
+      //   currentData_quhao:this.cur_drag_info.quhao,
+      //   currentData_chaung:this.cur_drag_info.chaung,
+      // }
       let params={
         id_one:this.cur_drag_info.id,
         id_two:this.currentData.currentData_id
@@ -619,7 +619,7 @@ export default {
           this.$message.success("替换成功");
           this.tipDialogVisible = false
           this.tipDialogVisibleTwo = false
-          this.getSchedulesOne();
+          this.getlist();
         }
       });
     },