Pārlūkot izejas kodu

11月7日 库存扣减更新

XMLWAN 3 gadus atpakaļ
vecāks
revīzija
3763a09eb9

+ 4 - 4
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Parādīt failu

@@ -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">
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">
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">
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">
387 387
                                                    {{scope.row.stock_count}}
388 388
                                               </span>
389 389
                                               <span v-else> {{ scope.row.total }}</span>
@@ -2652,7 +2652,7 @@
2652 2652
       selectDrugs(selection, row) {
2653 2653
         console.log('selection', selection)
2654 2654
         console.log('row', row)
2655
-        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 ){
2655
+        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 ){
2656 2656
             if (row.count <= 0) {
2657 2657
               if (selection) {
2658 2658
                 selection.forEach(row => {
@@ -2927,7 +2927,7 @@
2927 2927
       },
2928 2928
       selectChange(selection, row) {
2929 2929
         console.log('row', row)
2930
-        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 ){
2930
+        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 ){
2931 2931
            if (row.stock_count <= 0) {
2932 2932
             if (row.type == 3) {
2933 2933
               if (selection) {

+ 37 - 4
src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue Parādīt failu

@@ -3,8 +3,7 @@
3 3
     <div class="cell clearfix">
4 4
       <el-form :inline="true" :model="listQuery">
5 5
         <el-form-item label>
6
-          <!-- <el-input v-model.trim="listQuery.search" placeholder="姓名/透析号" style="width:150px"></el-input>
7
-          <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button> -->
6
+         
8 7
            <el-autocomplete
9 8
              class="checkSearch"
10 9
              popper-class="my-autocomplete"
@@ -70,6 +69,7 @@
70 69
       </div>
71 70
       <div style="padding-left:10px;flex:1">
72 71
         <div class="tableTitle">统计表</div>
72
+        <div><el-button type="primary" @click="exportList">导出</el-button></div>
73 73
         <el-table :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }" 
74 74
         :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
75 75
         >
@@ -280,7 +280,7 @@ export default {
280 280
             }
281 281
           })
282 282
           let list = Object.values(dataInfo)
283
-          // console.log("arr",list)    
283
+             
284 284
           list.map(item => {
285 285
             for (let i = 0; i < prescriptionList.length; i++) {
286 286
               if (item.patient_id === prescriptionList[i].patient_id) {
@@ -462,7 +462,40 @@ export default {
462 462
         var strs = str.substring(0, str.length - 1)
463 463
        
464 464
         return strs
465
-      }
465
+      },
466
+      exportList(){
467
+        console.log("DialysisData",this.DialysisData)
468
+       for(let i=0;i<this.DialysisData.length;i++){
469
+         this.DialysisData[i].index = i+1
470
+         this.DialysisData[i].dialysis_mode = this.getModeIdCount(this.DialysisData[i].patient_id)
471
+         this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
472
+       }
473
+       import('@/vendor/Export2Excel').then(excel => {
474
+        const tHeader = ['序号','姓名', '年龄', '透析号','透析模式','透析总次数']
475
+        const filterVal = ['index','name', 'age', 'dialysis_no','dialysis_mode','total_dialysis']
476
+        
477
+        const data = this.formatJson(filterVal, this.DialysisData)
478
+       
479
+        excel.export_json_to_excel({
480
+           header: tHeader,
481
+           data,
482
+           filename: '透析详情'
483
+         })
484
+          this.downloadLoading = false
485
+        })
486
+      },
487
+      formatJson(filterVal, jsonData) {
488
+        return jsonData.map(v =>
489
+          filterVal.map(j => {
490
+            if (j === "timestamp") {
491
+              return parseTime(v[j]);
492
+            } else {
493
+              return v[j];
494
+            }
495
+          })
496
+       );
497
+     }
498
+
466 499
   },
467 500
   created(){
468 501
     var nowDate = new Date();

+ 2 - 2
src/xt_pages/stock/detail/cancelStockDetail.vue Parādīt failu

@@ -45,7 +45,7 @@
45 45
           v-model="start_time"
46 46
           prefix-icon="el-icon-date"
47 47
           :editable="false"
48
-          style="width: 196px;"
48
+          style="width: 150px;"
49 49
           type="date"
50 50
           placeholder="选择日期时间"
51 51
           align="right"
@@ -59,7 +59,7 @@
59 59
           v-model="end_time"
60 60
           prefix-icon="el-icon-date"
61 61
           :editable="false"
62
-          style="width: 196px;"
62
+          style="width: 150px;"
63 63
           type="date"
64 64
           placeholder="选择日期时间"
65 65
           align="right"

+ 1 - 1
src/xt_pages/stock/drugs/drugStockInOrder.vue Parādīt failu

@@ -212,7 +212,7 @@
212 212
         </el-table-column>
213 213
         <el-table-column label="生产厂家" align="center">
214 214
           <template slot-scope="scope">
215
-            {{getManufacturer(scope.row.drug.manufacturer)}}
215
+            {{getManufacturer(scope.row.manufacturer)}}
216 216
           </template>
217 217
         </el-table-column>
218 218
        <el-table-column label="生产日期" align="center">

+ 2 - 2
src/xt_pages/stock/drugs/query.vue Parādīt failu

@@ -112,7 +112,7 @@
112 112
         </el-table-column>
113 113
         <el-table-column prop="drug_name" label="出库数量" align="center">
114 114
            <template slot-scope="scope">
115
-             <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877">
115
+             <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id ==10028 || org_id == 10243">
116 116
                 <span> 
117 117
                  {{getOutFlush(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
118 118
                 </span> 
@@ -123,7 +123,7 @@
123 123
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
124 124
            <template slot-scope="scope">
125 125
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
126
-               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877">
126
+               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id == 10028 || org_id == 10243">
127 127
                 {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
128 128
                </span>
129 129
                

+ 1 - 1
src/xt_pages/stock/stockInOrder.vue Parādīt failu

@@ -215,7 +215,7 @@
215 215
         </el-table-column>
216 216
         <el-table-column label="生产厂家" align="center">
217 217
           <template slot-scope="scope">
218
-            {{ getManufactuerName(scope.row.GoodInfo.manufacturer)}}
218
+            {{ getManufactuerName(scope.row.manufacturer)}}
219 219
           </template>
220 220
         </el-table-column>
221 221
         <el-table-column label="生产日期" align="center">

+ 2 - 2
src/xt_pages/stock/stockQuery.vue Parādīt failu

@@ -108,7 +108,7 @@
108 108
        </el-table-column>
109 109
        <el-table-column label="出库数量" align="center">
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">
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">
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>
@@ -119,7 +119,7 @@
119 119
 
120 120
        <el-table-column label="剩余库存量" align="center">
121 121
          <template slot-scope="scope">
122
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
122
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
123 123
           <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span> 
124 124
          </template>
125 125
        </el-table-column>