Browse Source

11月14日 库存扣减更新

XMLWAN 3 years ago
parent
commit
df08d3d4c3

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

@@ -597,3 +597,4 @@ export function getPatientInfo(params) {
597 597
     params: params
598 598
   })
599 599
 }
600
+

+ 2 - 2
src/xt_pages/stock/detail/cancelStockDetail.vue View File

@@ -28,7 +28,7 @@
28 28
         style="width: 400px;"
29 29
         class="filter-item"
30 30
         v-model.trim="searchKey"
31
-        placeholder="单据编码/制单人/规格名称"
31
+        placeholder="单据编码/制单人/规格名称/耗材名称"
32 32
       />
33 33
       <el-button
34 34
         size="small"
@@ -352,7 +352,7 @@ export default {
352 352
         type: this.type,
353 353
         keywords: this.searchKey
354 354
       };
355
-      console.log("param2323232222332",params)
355
+     
356 356
       this.cancelStockDate = [];
357 357
       getStockDetail(Params).then(response => {
358 358
         if (response.data.state == 0) {

+ 1 - 1
src/xt_pages/stock/detail/stockInDetail.vue View File

@@ -31,7 +31,7 @@
31 31
         style="width: 400px;"
32 32
         class="filter-item"
33 33
         v-model.trim="searchKey"
34
-        placeholder="单据编码/制单人/规格名称"
34
+        placeholder="单据编码/制单人/规格名称/耗材名称"
35 35
       />
36 36
       <el-button
37 37
         size="small"

+ 1 - 1
src/xt_pages/stock/detail/stockOutDetail.vue View File

@@ -28,7 +28,7 @@
28 28
         style="width: 400px;"
29 29
         class="filter-item"
30 30
         v-model.trim="searchKey"
31
-        placeholder="单据编码/制单人/规格名称"
31
+        placeholder="单据编码/制单人/规格名称/耗材名称"
32 32
       />
33 33
       <el-button
34 34
         size="small"

+ 1 - 1
src/xt_pages/stock/drugs/components/drugCancelDetail.vue View File

@@ -28,7 +28,7 @@
28 28
         style="width: 400px;"
29 29
         class="filter-item"
30 30
         v-model.trim="searchKey"
31
-        placeholder="单据编码/制单人/规格名称"
31
+        placeholder="单据编码/制单人/药品名称"
32 32
       />
33 33
       <el-button
34 34
         size="small"

+ 27 - 19
src/xt_pages/user/hospitalSummary.vue View File

@@ -179,7 +179,7 @@
179 179
               </el-date-picker>   
180 180
             </div>
181 181
             <div class="cell clearfix" style="margin-top:10px">
182
-              <label class="title"><span class="name">病案号:</span> : </label>
182
+              <label class="title"><span class="name">病案号</span> : </label>
183 183
               <el-input v-model="form.sick_personnel" style="width:200px"></el-input>
184 184
             
185 185
               <label class="title"><span class="name">X线</span> : </label>
@@ -523,7 +523,7 @@
523 523
   import PatientSidebar from './components/PatientSidebar'
524 524
   import Editor from '@/components/Editor'
525 525
 
526
-  import { createHospitalSummary,getHospitalSummaryList,getHospitalSummaryDetail,updateHospitalSummary,deleteHospitalSummary } from '@/api/patient'
526
+  import { createHospitalSummary,getHospitalSummaryList,getHospitalSummaryDetail,updateHospitalSummary,deleteHospitalSummary,getPatientInfo } from '@/api/patient'
527 527
   import { parseTime } from '@/utils'
528 528
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
529 529
   import { uParseTime } from '@/utils/tools'
@@ -613,13 +613,13 @@
613 613
        doctorList:[],
614 614
        hosDetail:{},
615 615
        ids:"",
616
+       patient:{},
616 617
       }
617 618
     },
618 619
     created() {
619 620
      
620
- 
621 621
       this.patient_id = this.$route.params && this.$route.params.id
622
-      console.log("患者2332323",this.$store.getters.configlist.admitting_diagnosis)
622
+
623 623
       var now = new Date()
624 624
       this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
625 625
 
@@ -648,6 +648,7 @@
648 648
       
649 649
      this.getAllDoctorList()
650 650
      this.getlist()
651
+     this.getPatientSummaryById()
651 652
     },
652 653
     methods: {
653 654
       getTime(val) {
@@ -714,7 +715,7 @@
714 715
         this.form.discharge_advice = content
715 716
       },
716 717
       createAction(){
717
-         console.log("hh23h",this.templates)
718
+       
718 719
          var admitting_diagnosis_id = ""
719 720
          var discharge_diagnosis_id = ""
720 721
          var diagnosis_admission_id = ""
@@ -778,7 +779,7 @@
778 779
          if(this.form.dean == ""){
779 780
            this.form.dean = 0
780 781
          }
781
-         console.log("hhj232322323",this.form.admitting_diagnosis_id)
782
+        
782 783
          var params = {
783 784
           patient_id:parseInt(this.patient_id),
784 785
           title:this.form.title,
@@ -806,7 +807,7 @@
806 807
           ultrasound:this.form.ultrasound,
807 808
           pathology:this.form.pathology,
808 809
          }
809
-         console.log("oaram2322323",params)
810
+  
810 811
         
811 812
          createHospitalSummary(params).then(response=>{
812 813
             if(response.data.state == 1){
@@ -858,11 +859,9 @@
858 859
             end_time:this.end_time,
859 860
             patient_id:parseInt(this.patient_id),
860 861
           }
861
-         console.log("param2233223",params)
862 862
         getHospitalSummaryList(params).then(response=>{
863 863
            if(response.data.state ==1){
864 864
              var list =  response.data.data.list
865
-             console.log("list23232",list)
866 865
              this.tableData = list
867 866
            }
868 867
         })
@@ -889,7 +888,7 @@
889 888
         getHospitalSummaryDetail(id).then(response=>{
890 889
            if(response.data.state == 1){
891 890
              var detail = response.data.data.detail
892
-             console.log("detial323232232323322323",detail)
891
+  
893 892
              if(detail.doctor == 0){
894 893
                this.form.doctor = ""
895 894
              }
@@ -910,11 +909,11 @@
910 909
              this.form.admitting_diagnosis_id = detail.admitting_diagnosis_id
911 910
              this.form.admitting_diagnosis = detail.admitting_diagnosis
912 911
              this.form.discharge_diagnosis = detail.discharge_diagnosis
913
-             console.log("出院争端233232",detail.discharge_diagnosis_id)
912
+           
914 913
              this.form.discharge_diagnosis_id = detail.discharge_diagnosis_id
915 914
              this.form.diagnosis_admission_id = detail.diagnosis_admission_id
916 915
              this.form.diagnosis_admission = detail.diagnosis_admission
917
-             console.log("详情233232232323",this.form.diagnosis_admission)
916
+       
918 917
              this.form.treatment_id = detail.treatment_id
919 918
              this.form.treatment = detail.treatment
920 919
              this.form.illness_discharge_id = detail.illness_discharge_id
@@ -957,9 +956,7 @@
957 956
             }
958 957
           }
959 958
          }
960
-        console.log("6666666",this.form.diagnosis_admission_id)
961
-        console.log("777777777",this.templatesTwo)
962
-        console.log("8888888",this.$refs.editorSixty.content)
959
+   
963 960
          if(this.templatesTwo!=undefined){
964 961
           for(let i=0;i<this.templatesTwo.length;i++){
965 962
             if(this.form.diagnosis_admission_id == this.templatesTwo[i].content){
@@ -975,9 +972,7 @@
975 972
             }
976 973
          }
977 974
         }
978
-         console.log("99999999",this.templatesFour)
979
-         console.log("88888888",this.form.illness_discharge_id)
980
-         console.log("ffffffff",this.$refs.editorThirty.content)
975
+   
981 976
         if(this.templatesFour!=undefined){
982 977
             for(let i=0;i<this.templatesFour.length;i++){
983 978
            if(this.form.illness_discharge_id == this.templatesFour[i].content){
@@ -1071,7 +1066,7 @@
1071 1066
           pathology:this.form.pathology,
1072 1067
           record_date:this.form.record_date,
1073 1068
          }
1074
-        console.log("比你强2332322323232",params)
1069
+      
1075 1070
    
1076 1071
         updateHospitalSummary(params).then(response=>{
1077 1072
           if(response.data.state == 1){
@@ -1131,7 +1126,20 @@
1131 1126
         this.form.admission_time = this.getTime(new Date())
1132 1127
         this.form.admission_time = this.getTime(new Date()),
1133 1128
         this.form.discharge_time = this.getTime(new Date()),
1129
+        this.form.sick_personnel = this.patient.dialysis_no
1134 1130
         this.show_dialog = true
1131
+      },
1132
+      getPatientSummaryById(){
1133
+        var params = {
1134
+          patient_id:this.patient_id,
1135
+        }
1136
+        getPatientInfo(params).then(response=>{
1137
+          if(response.data.state == 1){
1138
+            var patient = response.data.data.patient
1139
+            this.patient = patient
1140
+          
1141
+          }
1142
+        })
1135 1143
       }
1136 1144
     },
1137 1145
     watch: {

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

@@ -390,7 +390,7 @@ export default {
390 390
     getTimeDay(start,end){
391 391
       var count = ""
392 392
       count = (end-start)/86400
393
-      return count
393
+      return count + 1
394 394
     }
395 395
   },
396 396
  

+ 0 - 5
src/xt_pages/workforce/appointment.vue View File

@@ -1227,11 +1227,6 @@
1227 1227
           }
1228 1228
         }
1229 1229
 
1230
-        console.log(is_system_zone)
1231
-        console.log(is_device_number)
1232
-        console.log("表头长度",headers.length)
1233
-
1234
-
1235 1230
         if (headers.length > 65 || !is_system_zone || !is_device_number) {
1236 1231
 
1237 1232