瀏覽代碼

Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

csx 3 年之前
父節點
當前提交
e64c8e4b4c

+ 7 - 0
src/api/drug/drug.js 查看文件

@@ -484,3 +484,10 @@ export function getDamagedByDrugId(params) {
484 484
   })
485 485
 }
486 486
 
487
+export function getInventoryModeList(params) {
488
+  return request({
489
+    url: '/api/drug/getinventorymodelist',
490
+    method: 'get',
491
+    params: params
492
+  })
493
+}

+ 4 - 2
src/xt_pages/stock/drugs/inventoryDetails.vue 查看文件

@@ -18,6 +18,9 @@
18 18
                 >搜索</el-button
19 19
                 >
20 20
             </div>
21
+            <div>
22
+               <el-button size="small" type="primary" @click="print">盘点模版打印</el-button>
23
+            </div>
21 24
             <!-- <div>
22 25
                 <el-button size="small" type="primary" @click="print">打印</el-button>
23 26
                 <el-button size="small" type="primary">导出</el-button>
@@ -122,8 +125,7 @@ export default {
122 125
           this.getlist()
123 126
         },
124 127
         print(){
125
-            this.$router.push({path:'/stock/drugs/inventoryPrint'})
126
-            
128
+            this.$router.push({path:'/stock/drugs/inventoryPrint'}) 
127 129
         },
128 130
         handleSizeChange(val){
129 131
          this.limit = val

+ 53 - 40
src/xt_pages/stock/drugs/inventoryPrint.vue 查看文件

@@ -10,40 +10,34 @@
10 10
         </div>
11 11
         <div class="app-container" style="background-color: white;">
12 12
             <div id="print_content">
13
-                <div class="printTitle">库存盘点核单数</div>
14
-                <div style="float:right;">调价日期:</div>
13
+               
15 14
                 <table class="printTable" border="1">
16 15
                     <tr>
17 16
                         <td>序号</td>
18
-                        <td>药品名称</td>
17
+                        <td>名称</td>
19 18
                         <td>规格</td>
19
+                        <td>批号</td>
20
+                        <td>生产日期</td>
21
+                        <td>有效日期</td>
22
+                        <td>生产企业</td>
23
+                        <td>国药准字</td>
20 24
                         <td>单位</td>
21
-                        <td>零售价</td>
22
-                        <td>当前库存</td>
23
-                        <td>盘点数</td>
24
-                        <td>亏损金额</td>
25
+                        <td>库存量</td>
25 26
                     </tr>
26 27
                     <tr v-for="(item,index) in tableData" :key="index">
27 28
                         <td>{{index+1}}</td>
28 29
                         <td>{{item.drug_name}}</td>
29
-                        <td>{{item.warehouseing_unit}}</td>
30
-                        <td>{{item.retail_price}}</td>
31
-                        <td>{{item.total}}</td>
32
-                        <td>{{item.count}}</td>
33
-                        <td></td>       
30
+                        <td>{{item.specification_name}}</td>
31
+                        <td>{{item.batch_number}}</td>
32
+                        <td>{{getTime(item.product_date)}}</td>
33
+                        <td>{{getTime(item.product_date)}}</td>
34
+                        <td>{{getManufacturerName(item.manufacturer)}}</td>
35
+                        <td>{{item.number}}</td>
36
+                        <td>{{item.max_unit}}</td>  
37
+                        <td></td>     
34 38
                     </tr>
35 39
                 </table>
36
-                <div style="margin-top:10px;">
37
-                    <span>合计:库存金额</span>
38
-                    <span>    库存盘点金额:亏损总计</span>
39
-                </div>
40
-                <div style="display:flex;float:right;margin-top:10px;border-top:1px solid #000;padding-top:10px;width:100%;">
41
-                    <div style="width:80px;">审批:</div><div style="width:100px;"></div>
42
-                    <div style="width:100px;">药材主任:</div><div style="width:60px;"></div>
43
-                    <div style="width:50px;">会计:</div><div style="width:100px;"></div>
44
-                    <div style="width:50px;">审核:</div><div style="width:100px;"></div>
45
-                    <div style="width:70px;">制单人:</div><div style="width:100px;"></div>
46
-                </div>
40
+              
47 41
             </div>
48 42
         </div>
49 43
     </div>
@@ -53,7 +47,7 @@
53 47
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
54 48
 const moment = require('moment');
55 49
 import { uParseTime } from '@/utils/tools'
56
-import { getDrugInventoryPrintList } from "@/api/drug/drug"
50
+import { getInventoryModeList } from "@/api/drug/drug"
57 51
 export default {
58 52
     components:{
59 53
         BreadCrumb
@@ -66,7 +60,8 @@ export default {
66 60
             { path: false, name: '药品盘点打印' },
67 61
           ],
68 62
           ids:"",
69
-          tableData:[]
63
+          tableData:[],
64
+          manufacturerList:[],
70 65
         }
71 66
     },
72 67
     methods:{
@@ -80,24 +75,42 @@ export default {
80 75
             scanStyles: false
81 76
             })
82 77
         },
83
-        getDrugInventoryPrintList(ids){
84
-             var params = {
85
-                 ids:ids,
78
+        getlist(){
79
+          getInventoryModeList().then(response=>{
80
+             if(response.data.state == 1){
81
+               var list = response.data.data.list
82
+               console.log("list23232323",list)
83
+               this.manufacturerList = response.data.data.manufacturerList
84
+               for(let i=0;i<list.length;i++){
85
+                 list[i].specification_name = ""
86
+                 list[i].specification_name = list[i].dose +list[i].dose_unit+"*"+list[i].min_number+ list[i].min_unit+"/"+list[i].max_unit
87
+               }
88
+               this.tableData = list
86 89
              }
87
-          console.log("parasm2232",params)
88
-          getDrugInventoryPrintList(params).then(response=>{
89
-              if(response.data.state == 1){
90
-
91
-                 this.tableData = response.data.data.list
92
-                 console.log("表格333333",this.tableData)
93
-              }
94
-          })    
90
+          })
91
+        },
92
+     getTime(val) {
93
+         if(val < 0){
94
+           return ""
95
+         }
96
+         if(val == ""){
97
+          return ""
98
+         }else {
99
+          return uParseTime(val, '{y}-{m}-{d}')
100
+         }
101
+      },
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].name
107
+          }
108
+          return name
95 109
         }
96
-
97
-    },
110
+      }
111
+     },
98 112
     created(){
99
-      this.ids = this.$route.query.ids
100
-      this.getDrugInventoryPrintList(this.ids)
113
+      this.getlist()
101 114
     }
102 115
 }
103 116
 </script>

+ 2 - 2
src/xt_pages/workforce/components/nextTableWeeks.vue 查看文件

@@ -148,10 +148,10 @@
148 148
           <span v-if="org_id!=9987" >
149 149
              <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus!=''">
150 150
                 <span v-if="org_id!=10131&& org_id !=10215">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
151
-                <span v-if="org_id==10131 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id,scope.row.mode_id,scope.row.solution)  }}</span>
151
+                <span v-if="org_id==10131 || org_id == 10215">{{scope.row.dialysissolution.dialyzer_perfusion_apparatus}}</span>
152 152
               
153 153
               </span>
154
-             <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ getDialysisDialyszerPerfusion(scope.row.patient_id) }}</span>
154
+             <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ scope.row.dialysissolution.dialysis_dialyszers}}</span>
155 155
           </span>
156 156
           {{scope.row.dialysissolution.dialysis_dialyszers}}
157 157
          <span v-if="scope.row.dialysissolution.dialysis_dialyszers!='' && scope.row.dialysissolution.dialysis_irrigation!=''">/</span>

+ 2 - 2
src/xt_pages/workforce/components/tableWeeks.vue 查看文件

@@ -224,9 +224,9 @@
224 224
                 <span>{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
225 225
           </span>
226 226
 
227
-          <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.id > 0 ">{{getDialysisDialyszerPerfusion(scope.row.patient_id)}}</span>
227
+          <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.id > 0 ">{{scope.row.dialysissolution.dialysis_dialyszers}}</span>
228 228
           </span>
229
-                    <span v-if="org_id==10131 || org_id == 10215 || org_id == 10233">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id,scope.row.mode_id,scope.row.solution)}}</span>
229
+                    <span v-if="org_id==10131 || org_id == 10215 || org_id == 10233">{{scope.row.dialysissolution.dialyzer_perfusion_apparatus}}</span>
230 230
                     {{scope.row.prescription.dialysis_dialyszers}}
231 231
                     <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
232 232
                     <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>

+ 2 - 2
src/xt_pages/workforce/next_remind_print.vue 查看文件

@@ -64,9 +64,9 @@
64 64
                  <span v-if="org_id!=9987">
65 65
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''">
66 66
                         <span v-if="org_id!=10131 && org_id!=10215">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
67
-                         <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(main_collection.patient_id,main_collection.mode_id,main_collection.solution)  }}</span>
67
+                         <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus }}</span>
68 68
                      </span>
69
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span>
69
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
70 70
                   </span>
71 71
                   {{main_collection.prescription.dialysis_dialyszers}}
72 72
                   <span v-if="main_collection.prescription.dialysis_dialyszers!='' && main_collection.prescription.dialysis_irrigation!=''">/</span>

+ 2 - 2
src/xt_pages/workforce/remind_print.vue 查看文件

@@ -65,9 +65,9 @@
65 65
                      <span > 
66 66
                        <span v-if="org_id!=10131 && org_id!=10215 && org_id!=10233 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
67 67
                      
68
-                       <span v-if="org_id==10131 || org_id==9671 || org_id == 10215 || org_id == 10233">{{getDialysisDialyszerPerfusionOne(main_collection.patient_id,main_collection.mode_id,main_collection.solution)}}</span>
68
+                       <span v-if="org_id==10131 || org_id==9671 || org_id == 10215 || org_id == 10233">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
69 69
                       </span>
70
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
70
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span> 
71 71
                   </span>
72 72
                     {{main_collection.prescription.dialysis_dialyszers}}
73 73
                   <span v-if="main_collection.prescription.dialysis_dialyszers!=''&& main_collection.prescription.dialysis_irrigation!='' ">/</span>