Parcourir la source

11月14日 库存扣减更新

XMLWAN il y a 3 ans
Parent
révision
0d3dc43e3f

+ 7 - 7
src/api/dialysis_record.js Voir le fichier

@@ -36,7 +36,7 @@ export function editMonitor(patient_id, schedule_date, data, mode) {
36 36
     schedule_date: schedule_date,
37 37
     mode: mode
38 38
   }
39
-  console.log('data=====', data)
39
+
40 40
   return request({
41 41
     url: '/api/dislysis/monitor/edit',
42 42
     method: 'post',
@@ -47,7 +47,7 @@ export function editMonitor(patient_id, schedule_date, data, mode) {
47 47
   })
48 48
 }
49 49
 
50
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode,washpipe_nurse,change_nurse,difficult_puncture_nurse,new_fistula_nurse) {
50
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse) {
51 51
   var params = {
52 52
     patient_id: patient_id,
53 53
     date: schedule_date,
@@ -58,12 +58,12 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
58 58
     lood_drawing: lood_drawing,
59 59
     schedual_type: schedual_type,
60 60
     mode: mode,
61
-    washpipe_nurse:washpipe_nurse,
62
-    change_nurse:change_nurse,
63
-    difficult_puncture_nurse:difficult_puncture_nurse,
64
-    new_fistula_nurse:new_fistula_nurse
61
+    washpipe_nurse: washpipe_nurse,
62
+    change_nurse: change_nurse,
63
+    difficult_puncture_nurse: difficult_puncture_nurse,
64
+    new_fistula_nurse: new_fistula_nurse
65 65
   }
66
-  console.log("params",params)
66
+  console.log('params', params)
67 67
   return request({
68 68
     url: '/api/dialysis/start_record',
69 69
     method: 'post',

+ 4 - 4
src/xt_pages/hospitalStation/components/deskPrescription.vue Voir le fichier

@@ -287,7 +287,7 @@
287 287
                     </el-table-column>
288 288
                     <el-table-column label="库存" width="60">
289 289
                       <template slot-scope="scope">
290
-                         <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
290
+                         <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 ">
291 291
                              <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
292 292
                              <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
293 293
                           </span>
@@ -383,7 +383,7 @@
383 383
                     </el-table-column>
384 384
                     <el-table-column label="库存" width="40">
385 385
                       <template slot-scope="scope">
386
-                         <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
386
+                         <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10088">
387 387
                             {{scope.row.stock_count}}
388 388
                         </span>
389 389
                        <span v-else> {{ scope.row.total }}</span>
@@ -2655,7 +2655,7 @@
2655 2655
         this.$refs.additionalCharges.show()
2656 2656
       },
2657 2657
       selectDrugs(selection, row) {
2658
-      if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919){
2658
+      if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id ==10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id ==10088 ){
2659 2659
             if (row.count <= 0) {
2660 2660
               if (selection) {
2661 2661
                 selection.forEach(row => {
@@ -2929,7 +2929,7 @@
2929 2929
       },
2930 2930
       selectChange(selection, row) {
2931 2931
         console.log('row', row)
2932
-          if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 || this.org_id == 9919 ){
2932
+          if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 || this.org_id == 9919 || this.org_id ==10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id ==10088){
2933 2933
            if (row.stock_count <= 0) {
2934 2934
             if (row.type == 3) {
2935 2935
               if (selection) {

+ 4 - 4
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Voir le fichier

@@ -286,7 +286,7 @@
286 286
                                         </el-table-column>
287 287
                                         <el-table-column label="库存" width="60">
288 288
                                             <template slot-scope="scope">
289
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
289
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10088">
290 290
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
291 291
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
292 292
                                               </span>
@@ -383,7 +383,7 @@
383 383
                                         </el-table-column>
384 384
                                         <el-table-column label="库存" width="40">
385 385
                                             <template slot-scope="scope">
386
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
386
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10088">
387 387
                                                    {{scope.row.stock_count}}
388 388
                                               </span>
389 389
                                               <span v-else> {{ scope.row.total }}</span>
@@ -2657,7 +2657,7 @@
2657 2657
       selectDrugs(selection, row) {
2658 2658
         console.log('selection', selection)
2659 2659
         console.log('row', row)
2660
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919){
2660
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10088){
2661 2661
             if (row.count <= 0) {
2662 2662
               if (selection) {
2663 2663
                 selection.forEach(row => {
@@ -2932,7 +2932,7 @@
2932 2932
       },
2933 2933
       selectChange(selection, row) {
2934 2934
         console.log('row', row)
2935
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 || this.org_id == 9919 ){
2935
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10088){
2936 2936
            if (row.stock_count <= 0) {
2937 2937
             if (row.type == 3) {
2938 2938
               if (selection) {

+ 10 - 7
src/xt_pages/stock/drugs/inventoryPrint.vue Voir le fichier

@@ -100,14 +100,17 @@ export default {
100 100
          }
101 101
       },
102 102
       getManufacturerName(id){
103
-        var name = ""
104
-        for(let i=0;i<this.manufacturerList.length;i++){
105
-          if(id == this.manufacturerList[i].id){
106
-             name = this.manufacturerList[i].manufacturer_name
107
-          }
108
-          return name
103
+       
104
+           var name = ""
105
+           for(let i=0;i<this.manufacturerList.length;i++){
106
+              if(id == this.manufacturerList[i].id){
107
+                  name = this.manufacturerList[i].manufacturer_name
108
+              }
109
+           }
110
+           return name
109 111
         }
110
-      }
112
+      
113
+      
111 114
      },
112 115
     created(){
113 116
       this.getlist()

+ 1 - 0
src/xt_pages/stock/inventoryPrint.vue Voir le fichier

@@ -96,6 +96,7 @@ export default {
96 96
          })
97 97
         },
98 98
         getManufacturerName(id){
99
+       
99 100
            var name = ""
100 101
            for(let i=0;i<this.manufacturerList.length;i++){
101 102
               if(id == this.manufacturerList[i].id){

+ 15 - 10
src/xt_pages/stock/stockQuery.vue Voir le fichier

@@ -108,7 +108,7 @@
108 108
        </el-table-column>
109 109
        <el-table-column label="出库数量" align="center" v-if="showOne">
110 110
          <template slot-scope="scope">
111
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779">
111
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id ==  10088">
112 112
             <span>
113 113
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
114 114
             </span>
@@ -125,7 +125,7 @@
125 125
 
126 126
        <el-table-column label="剩余库存量" align="center" v-if="showThree">
127 127
          <template slot-scope="scope">
128
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
128
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
129 129
           <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
130 130
          </template>
131 131
        </el-table-column>
@@ -358,18 +358,23 @@ export default {
358 358
            this.tableList[i].prodect_name = this.getManufacture(this.tableList[i].manufacturer)
359 359
            this.tableList[i].inCount =  this.getWareInfo(this.tableList[i].xt_warehouse_info)
360 360
 
361
-        
362
-          if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779){
363
-             this.tableList[i].outCount  = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverFlushInfo(this.tableList[i].xt_warehouse_info) + this.getCancelSotckInfo(this.tableList[i].cancel_stock_info) 
361
+          if(this.end_time == ""){
362
+            if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id ==  10088 ){
363
+              this.tableList[i].outCount  = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverFlushInfo(this.tableList[i].xt_warehouse_info) + this.getCancelSotckInfo(this.tableList[i].cancel_stock_info) 
364
+            }else{
365
+              this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
366
+            }
367
+            
368
+            if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id ==  10088 ){
369
+                this.tableList[i].overplus = this.getOverFlushInfo(this.tableList[i].xt_warehouse_info)
370
+            }else{
371
+              this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
372
+            }
364 373
           }else{
365 374
             this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
375
+            this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
366 376
           }
367 377
           
368
-           if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779){
369
-              this.tableList[i].overplus = this.getOverFlushInfo(this.tableList[i].xt_warehouse_info)
370
-           }else{
371
-             this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
372
-           }
373 378
 
374 379
          }
375 380
          const data = this.formatJson(filterVal, this.tableList)