XMLWAN vor 2 Jahren
Ursprung
Commit
92f6933bdd

+ 16 - 0
src/api/drug/drug.js Datei anzeigen

@@ -595,3 +595,19 @@ export function toSendGoodInfomation(params) {
595 595
     params: params
596 596
   })
597 597
 }
598
+
599
+export function getNewPurchaseStockQuery(params) {
600
+  return request({
601
+    url: '/api/stock/getnewpurchasestockquery',
602
+    method: 'Get',
603
+    params: params
604
+  })
605
+}
606
+
607
+export function getPurchaseNewDrugQuery(params) {
608
+  return request({
609
+    url: '/api/stock/getpurchasenewdrugquery',
610
+    method: 'get',
611
+    params: params
612
+  })
613
+}

+ 8 - 0
src/router/modules/stock.js Datei anzeigen

@@ -421,6 +421,14 @@ export default {
421 421
       is_menu: false,
422 422
       meta: { title: 'purchaseStockQueryPrint', noCache: true }
423 423
     },
424
+    {
425
+      path: '/purchase/new/stock/query/print',
426
+      component: () => import('@/xt_pages/stock/query/purchaseNewStockQueryPrint'),
427
+      name: 'purchaseNewStockQueryPrint',
428
+      hidden: true,
429
+      is_menu: false,
430
+      meta: { title: 'purchaseNewStockQueryPrint', noCache: true }
431
+    },
424 432
     {
425 433
       path: '/expiry/date/query/print',
426 434
       component: () => import('@/xt_pages/stock/query/expiryDateQueryPrint'),

+ 1 - 1
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Datei anzeigen

@@ -93,7 +93,7 @@
93 93
 
94 94
 
95 95
                     <el-col :span="8"
96
-                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249">
96
+                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395">
97 97
                         <el-form-item label="目标超滤量(L):">
98 98
                             <el-input
99 99
                                     type="number"

+ 1 - 1
src/xt_pages/hospitalStation/index.vue Datei anzeigen

@@ -84,7 +84,7 @@
84 84
             </el-select>
85 85
           </el-form-item>
86 86
 
87
-          <el-form-item class="specialFormItem" label="医保卡号:" v-if="this.$store.getters.xt_user.org_id == 10265">
87
+          <el-form-item class="specialFormItem" label="医保卡号:">
88 88
             <div style="display:flex;">
89 89
               <el-input v-model="form.medicalInsuranceCard"></el-input>
90 90
               <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>

Datei-Diff unterdrückt, da er zu groß ist
+ 1239 - 0
src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue


+ 0 - 0
src/xt_pages/stock/drugs/components/purchaseNewDrugQueryPrint.vue Datei anzeigen


+ 10 - 1
src/xt_pages/stock/drugs/drugNewQuery.vue Datei anzeigen

@@ -13,6 +13,10 @@
13 13
             <el-tab-pane label="进销存查询" name="second">
14 14
               <PurchaseDrugQuery ref="mychild"></PurchaseDrugQuery>
15 15
             </el-tab-pane>
16
+
17
+             <!-- <el-tab-pane label="进销存查询" name="five">
18
+               <PurchaseNewDrugQuery ref="mychildfive"></PurchaseNewDrugQuery>
19
+            </el-tab-pane> -->
16 20
         
17 21
             <el-tab-pane label="有效期查询" name="third">
18 22
                 <ExpiryDateDrugQuery ref="mychildOne"></ExpiryDateDrugQuery>
@@ -31,6 +35,7 @@ import DrugQuery from "@/xt_pages/stock/drugs/components/drugQuery"
31 35
 import ExpiryDateDrugQuery from "@/xt_pages/stock/drugs/components/expiryDateDrugQuery"
32 36
 import PurchaseDrugQuery from "@/xt_pages/stock/drugs/components/purchaseDrugQuery"
33 37
 import DrugPatientQuery from "@/xt_pages/stock/drugs/components/drugPatientQuery"
38
+import PurchaseNewDrugQuery from "@/xt_pages/stock/drugs/components/purchaseNewDrugQuery"
34 39
 export default {
35 40
   name: "stockNewQuery",
36 41
   
@@ -39,7 +44,8 @@ export default {
39 44
     DrugQuery,
40 45
     ExpiryDateDrugQuery,
41 46
     PurchaseDrugQuery,
42
-    DrugPatientQuery
47
+    DrugPatientQuery,
48
+    PurchaseNewDrugQuery
43 49
   },
44 50
   data() {
45 51
     return {
@@ -64,6 +70,9 @@ export default {
64 70
       if(val.name == "fourth"){
65 71
         this.$refs.mychildtwo.open()
66 72
       }
73
+      if(val.name =="five"){
74
+       this.$refs.mychildfive.open()
75
+      }
67 76
     }
68 77
   },
69 78
   created(){

+ 1 - 1
src/xt_pages/stock/inventory.vue Datei anzeigen

@@ -579,7 +579,7 @@ export default {
579 579
          tableData:arr,
580 580
          storehouse_id:this.storehouse_id,
581 581
        }
582
-      console.log("param23323232323232323",params)
582
+      // console.log("param23323232323232323",params)
583 583
       saveStockInentoryList(params).then(response=>{
584 584
         if(response.data.state == 1){
585 585
            var inventory = response.data.data.inventory

Datei-Diff unterdrückt, da er zu groß ist
+ 1017 - 0
src/xt_pages/stock/query/purchaseNewStockQuery.vue


+ 793 - 0
src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue Datei anzeigen

@@ -0,0 +1,793 @@
1
+<template>
2
+    <div class="main-contain">
3
+        <div class="position">
4
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
5
+        <el-row style="float:right;">
6
+            <el-col :span="24">
7
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
8
+            </el-col>
9
+        </el-row>
10
+        </div>
11
+        <div class="app-container" style="background-color: white;" v-loading="loading">
12
+            <div id="print_content">
13
+                <div class="print_main_content">
14
+                    <div class="order_title_panl">
15
+                        <span class="main_title">药品进销存查询表</span>
16
+                    </div>
17
+                    <div style="text-align:left;margin-bottom:20px;font-size: 14px;margin-bottom:-30px">
18
+                      <span class="time_p">查询日期:{{start_time}} ~</span><span class="time_p">{{end_time}}</span> 
19
+                    </div>
20
+                    <div style="text-align:right;margin-bottom:20px;font-size: 14px;">
21
+                      <span class="time_p"> 打印时间:{{time_now}}</span>
22
+                    </div>
23
+                    <div class="table_panel">
24
+                        <table class="table">
25
+                            <thead>
26
+                                <tr>
27
+                                  <td rowspan="2" width="80">序号</td>
28
+                                  <td rowspan="2" width="80">耗材类型</td>
29
+                                  <td rowspan="2" width="80">规格&单位</td>
30
+                                  <td rowspan="2" width="80">生产厂商</td>
31
+                                  <td width="80" colspan="3">期初结余</td>    
32
+                                  <td width="80" colspan="3">本期增加</td>   
33
+                                  <td width="80" colspan="3">本期减少</td>  
34
+                                  <td width="80" colspan="3">期末结余</td>                                             
35
+                                </tr>
36
+                                <tr>
37
+                                  <td>数量</td>   
38
+                                  <td>进货金额</td> 
39
+                                  <td>销售金额</td>   
40
+                                  <td>数量</td>   
41
+                                  <td>进货金额</td> 
42
+                                  <td>销售金额</td> 
43
+                                  <td>数量</td>   
44
+                                  <td>进货金额</td> 
45
+                                  <td>销售金额</td> 
46
+                                  <td>数量</td>   
47
+                                  <td>进货金额</td> 
48
+                                  <td>销售金额</td>    
49
+                                </tr>
50
+                               
51
+                            </thead>
52
+                            <tbody>
53
+                                <tr v-for="(item,index) in this.tableList" :key="index">
54
+                                 <td>{{index + 1}}</td>
55
+                                 <td>{{getGoodTypeName(item.good_type_id)}}</td>
56
+                                 <td>{{item.specification_name}}</td>
57
+                                 <td> {{getManufacturName(item.manufacturer)}}</td>
58
+                                 <td>{{item.stockIn}}</td>   
59
+                                 <td>{{item.stock_in_price}}</td> 
60
+                                 <td>{{item.stockMoney}}</td>   
61
+                                 <td>{{item.stockAdd}}</td>   
62
+                                 <td>{{item.addStockMoney}}</td> 
63
+                                 <td>{{item.saleStockMoney}}</td> 
64
+                                 <td>{{item.outStock}}</td>   
65
+                                 <td>{{item.stockOutprice}}</td> 
66
+                                 <td>{{item.saleOutMoney}}</td> 
67
+                                 <td>{{item.overStock}}</td>   
68
+                                 <td>{{item.overPrice}}</td> 
69
+                                 <td>{{item.overMoney}}</td>    
70
+                                </tr>  
71
+                            </tbody>
72
+                        </table>
73
+                    </div>
74
+                </div>
75
+            </div>
76
+        </div>
77
+    </div>
78
+</template>
79
+
80
+<script>
81
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
82
+import { getStorehouseList,getNewPurchaseStockQuery } from "@/api/drug/drug"
83
+import {
84
+  getStockDrugCount
85
+} from "@/api/stock";
86
+import print from 'print-js'
87
+const moment = require('moment')
88
+export default {
89
+    components:{
90
+        BreadCrumb
91
+    },
92
+    data(){
93
+        return{
94
+          crumbs: [
95
+            { path: false, name: '库存管理' },
96
+            { path: false, name: '库存查询' },
97
+            { path: false, name: '库存查询打印' },
98
+          ],
99
+          start_time:"",
100
+          end_time:"",
101
+          drug_name:"",
102
+          drug_spec:"",
103
+          keyword:"",
104
+          tableData:[],
105
+          time_now:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
106
+          type_name:"",
107
+          limit:"",
108
+          page:"",
109
+          loading: false,
110
+          warehouseInfoDate: [],
111
+          tableList:[],
112
+          good_type:[],
113
+          manufacturerList:[],
114
+          countList:[],
115
+          outCountList:[],
116
+          autoCountList:[],
117
+          cancelCountList:[],
118
+          org_id:0,
119
+          goodTypeList:[],
120
+        }
121
+    },
122
+    methods:{
123
+      printAction: function() {
124
+          const style = '@media print { .print_main_content { background-color: white; width:1500px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .time_p{font-size:16px;} .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
125
+          printJS({
126
+          printable: 'print_content',
127
+          type: 'html',
128
+          documentTitle: '  ',
129
+          style: style,
130
+          scanStyles: false
131
+          })
132
+      },
133
+      getStorehouseList(){
134
+        getStorehouseList().then(response=>{
135
+            if(response.data.state == 1){
136
+           
137
+            this.manufacturerList = response.data.data.manufacturerList
138
+            var obj = {id:0,type_name:"全部"}
139
+            this.goodTypeList.push(obj)
140
+            var goodTypeList = response.data.data.goodTypeList
141
+            for(let i=0;i<goodTypeList.length;i++){
142
+                this.goodTypeList.push(goodTypeList[i])
143
+                }
144
+            }
145
+        })
146
+        },
147
+        getlist(){
148
+            this.loading = true
149
+            var params = {
150
+            good_type:this.good_type,
151
+            keyword:this.keyword,
152
+            page:this.page,
153
+            limit:this.limit,
154
+            start_time:this.start_time,
155
+            end_time:this.end_time,
156
+            }
157
+        getNewPurchaseStockQuery(params).then(response=>{
158
+            if(response.data.state == 1){
159
+                var list = response.data.data.list
160
+                this.loading = false
161
+                for(let i=0;i<list.length;i++){
162
+                    list[i].stockIn = list[i].GoodStartFlowInfo.over_count
163
+                    list[i].stock_in_price = "/"
164
+                    list[i].stockMoney = "/"
165
+                    // list[i].stockIn = this.getWarehouseInfoStart(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo) //期初结余
166
+                    // list[i].stock_in_price = this.getWarehouseInfoStartPrice(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo)
167
+                    // list[i].stockMoney = this.getWarehouseInfoStartMoney(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo)
168
+                    
169
+                    list[i].stockAdd = this.getWarehouseInfoOne(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)//期间增加
170
+                    // list[i].addStockMoney = this.getAddStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
171
+                    // list[i].saleStockMoney = this.getSaleStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
172
+                    list[i].addStockMoney = "/"
173
+                    list[i].saleStockMoney = "/"
174
+
175
+                    list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
176
+                    // list[i].stockOutprice = this.stockOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
177
+                    // list[i].saleOutMoney = this.getSaleStockMony(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
178
+                    list[i].stockOutprice = "/"
179
+                    list[i].saleOutprice = "/"
180
+                    // list[i].overStock= this.getEndWarehouseInfo(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
181
+                    // list[i].overPrice= this.getEndOverPrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
182
+                    // list[i].overMoney = this.getEndSalePrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
183
+                    list[i].overStock = list[i].GoodEndFlowInfo.over_count
184
+                    list[i].overPrice = "/"
185
+                    list[i].overMoney = "/"
186
+                
187
+                }
188
+                this.tableList = list
189
+
190
+               this.manufacturerList = response.data.data.manufacturerList
191
+            
192
+            }
193
+        })
194
+       },  
195
+   getWarehouseInfoStartMoney(arr,arr1,arr2,arr3,arr4){
196
+     var total_price = 0
197
+     var total_price_one = 0
198
+     var total_price_two = 0
199
+     var total_price_three = 0
200
+     var total_price_four = 0
201
+     var total_price_all = 0
202
+     if(arr!=null && arr.length >0){
203
+       for(let i=0;i<arr.length;i++){
204
+         total_price +=arr[i].count * arr[i].price
205
+       }
206
+     }
207
+     if(arr1!=null && arr1.length > 0){
208
+      for(let i=0;i<arr1.length;i++){
209
+        total_price_one +=arr1[i].count * arr1[i].price
210
+      }
211
+      
212
+     }
213
+     if(arr2!=null && arr2.length > 0){
214
+      for(let i=0;i<arr2.length;i++){
215
+       total_price_two +=arr2[i].count * arr2[i].price
216
+      }
217
+     
218
+     }
219
+    if(arr3!=null && arr3.length > 0){
220
+      for(let i=0;i<arr3.length;i++){
221
+        total_price_three +=arr3[i].count * arr3[i].price
222
+      }
223
+     
224
+     }
225
+    if(arr4!=null && arr4.length > 0){
226
+      for(let i=0;i<arr4.length;i++){
227
+        total_price_four +=arr4[i].count * arr4[i].price
228
+      }
229
+     
230
+     }
231
+     total_price_all = total_price - total_price_one + total_price_two - total_price_three + total_price_four
232
+    if (total_price_all > 0) {
233
+       return total_price_all.toFixed(2)
234
+     }else{
235
+      return  "0.00"
236
+     }
237
+   },
238
+    getWarehosueOutInfo(val,val2,val3){
239
+     var count = 0
240
+     var count_one = 0
241
+     var all_count = 0
242
+     var count_two = 0
243
+     if(val!=null && val.length >0){
244
+       for(let i=0;i<val.length;i++){
245
+         count +=val[i].count
246
+       }
247
+     }
248
+     if(val2!=null && val2.length > 0){
249
+      for(let i=0;i<val2.length;i++){
250
+        count_one +=val2[i].count
251
+      }
252
+     }
253
+     if(val3!=null && val3.length > 0){
254
+      for(let i=0;i<val3.length;i++){
255
+        count_two +=val3[i].count
256
+      }
257
+     }
258
+     all_count = count +count_one - count_two
259
+     if(all_count >0){
260
+       return all_count
261
+     }else{
262
+      return 0
263
+     }
264
+   },
265
+   stockOutprice(val,val2,val3){
266
+     var total_price = 0
267
+     var total_price_one = 0
268
+     var total_price_two = 0
269
+     var all_price = 0
270
+     if(val!=null && val.length >0){
271
+       for(let i=0;i<val.length;i++){
272
+         total_price +=val[i].count * val[i].buy_price
273
+       }
274
+     }
275
+     if(val2!=null && val2.length > 0){
276
+      for(let i=0;i<val2.length;i++){
277
+        total_price_one +=val2[i].count * val2[i].buy_price
278
+      }
279
+     }
280
+    if(val3!=null && val3.length > 0){
281
+      for(let i=0;i<val3.length;i++){
282
+        total_price_two +=val3[i].count * val3[i].buy_price
283
+      }
284
+     }
285
+     all_price = total_price + total_price_one - total_price_two
286
+     if(all_price >0){
287
+       return all_price.toFixed(2)
288
+     }else{
289
+      return "0.00"
290
+     }
291
+   },
292
+     saleOutprice(val,val2,val3){
293
+     var total_price = 0
294
+     var total_price_one = 0
295
+     var all_price = 0
296
+     var total_price_two = 0
297
+     if(val!=null && val.length >0){
298
+       for(let i=0;i<val.length;i++){
299
+         total_price +=val[i].count * val[i].xt_warehouse_info.packing_price
300
+       }
301
+     }
302
+     if(val2!=null && val2.length > 0){
303
+       for(let i=0;i<val2.length;i++){
304
+         total_price_one +=val2[i].count * val2[i].price
305
+       }
306
+     }
307
+     if(val3!=null && val3.length > 0){
308
+       for(let i=0;i<val3.length;i++){
309
+         total_price_two +=val3[i].count * val3[i].price
310
+       }
311
+     }
312
+     all_price = total_price + total_price_one - total_price_two
313
+     if(all_price >0){
314
+       return all_price.toFixed(2)
315
+     }else{
316
+      return "0.00"
317
+     }
318
+   },
319
+   getEndWarehouseInfo(val,val3,val1,val2,val4){
320
+     var count = 0
321
+     var count_one = 0
322
+     var count_two = 0
323
+     var count_three =0
324
+     var count_four = 0
325
+     var all_count = 0
326
+     if(val!=null && val.length >0){
327
+       for(let i=0;i<val.length;i++){
328
+         count +=val[i].count 
329
+       }
330
+     }
331
+     if(val1!=null&&val1.length >0){
332
+       for(let i=0;i<val1.length;i++){
333
+         count_one +=val1[i].count
334
+       }
335
+     }
336
+     if(val3!=null&& val3.length > 0){
337
+      for(let i=0;i<val3.length;i++){
338
+         count_three +=val3[i].count
339
+       }
340
+     }
341
+     if(val2!=null&&val2.length >0){
342
+       for(let i=0;i<val2.length;i++){
343
+         count_two +=val2[i].count
344
+       }
345
+     }
346
+     if(val4!=null&&val4.length >0){
347
+       for(let i=0;i<val4.length;i++){
348
+         count_four +=val4[i].count
349
+       }
350
+     }
351
+     all_count = count- count_three + count_one - count_two + count_four
352
+     if(all_count >0){
353
+       return all_count
354
+     }else{
355
+      return 0
356
+     }
357
+   },
358
+   getEndWarehouseInfo(val,val3,val1,val2,val4){
359
+     var count = 0
360
+     var count_one = 0
361
+     var count_two = 0
362
+     var count_three =0
363
+     var count_four = 0
364
+     var all_count = 0
365
+     if(val!=null && val.length >0){
366
+       for(let i=0;i<val.length;i++){
367
+         count +=val[i].count 
368
+       }
369
+     }
370
+     if(val1!=null&&val1.length >0){
371
+       for(let i=0;i<val1.length;i++){
372
+         count_one +=val1[i].count
373
+       }
374
+     }
375
+     if(val3!=null&& val3.length > 0){
376
+      for(let i=0;i<val3.length;i++){
377
+         count_three +=val3[i].count
378
+       }
379
+     }
380
+     if(val2!=null&&val2.length >0){
381
+       for(let i=0;i<val2.length;i++){
382
+         count_two +=val2[i].count
383
+       }
384
+     }
385
+     if(val4!=null&&val4.length >0){
386
+       for(let i=0;i<val4.length;i++){
387
+         count_four +=val4[i].count
388
+       }
389
+     }
390
+     all_count = count- count_three + count_one - count_two + count_four
391
+     if(all_count >0){
392
+       return all_count
393
+     }else{
394
+      return 0
395
+     }
396
+   },
397
+   getEndSalePrice(val,val3,val1,val2,val4){
398
+     var total_price = 0
399
+     var total_price_one = 0
400
+     var total_price_two = 0
401
+     var total_price_three = 0
402
+     var total_price_four = 0
403
+     var all_price= 0
404
+     if(val!=null && val.length >0){
405
+       for(let i=0;i<val.length;i++){
406
+         total_price +=val[i].count * val[i].price
407
+       }
408
+     }
409
+     if(val1!=null && val1.length >0){
410
+       for(let i=0;i<val1.length;i++){
411
+         total_price_one +=val1[i].count * val1[i].price
412
+       }
413
+     }
414
+    if(val3!=null && val3.length >0){
415
+       for(let i=0;i<val3.length;i++){
416
+         total_price_three +=val3[i].count * val3[i].price
417
+       }
418
+     }
419
+      if(val2!=null && val2.length >0){
420
+       for(let i=0;i<val2.length;i++){
421
+         total_price_two +=val2[i].count * val2[i].price
422
+       }
423
+     }
424
+       if(val4!=null && val4.length >0){
425
+       for(let i=0;i<val4.length;i++){
426
+         total_price_four +=val4[i].count * val4[i].price
427
+       }
428
+     }
429
+     var all_price = total_price-total_price_three + total_price_one - total_price_two + total_price_four
430
+     if(all_price >0){
431
+       return all_price.toFixed(2)
432
+     }else{
433
+      return "0.00"
434
+     }
435
+   },
436
+   getEndSalePrice(val,val3,val1,val2,val4){
437
+     var total_price = 0
438
+     var total_price_one = 0
439
+     var total_price_two = 0
440
+     var total_price_three = 0
441
+     var total_price_four = 0
442
+     var all_price= 0
443
+     if(val!=null && val.length >0){
444
+       for(let i=0;i<val.length;i++){
445
+         total_price +=val[i].count * val[i].price
446
+       }
447
+     }
448
+     if(val1!=null && val1.length >0){
449
+       for(let i=0;i<val1.length;i++){
450
+         total_price_one +=val1[i].count * val1[i].price
451
+       }
452
+     }
453
+    if(val3!=null && val3.length >0){
454
+       for(let i=0;i<val3.length;i++){
455
+         total_price_three +=val3[i].count * val3[i].price
456
+       }
457
+     }
458
+      if(val2!=null && val2.length >0){
459
+       for(let i=0;i<val2.length;i++){
460
+         total_price_two +=val2[i].count * val2[i].price
461
+       }
462
+     }
463
+       if(val4!=null && val4.length >0){
464
+       for(let i=0;i<val4.length;i++){
465
+         total_price_four +=val4[i].count * val4[i].price
466
+       }
467
+     }
468
+     var all_price = total_price-total_price_three + total_price_one - total_price_two + total_price_four
469
+     if(all_price >0){
470
+       return all_price.toFixed(2)
471
+     }else{
472
+      return 0
473
+     }
474
+   },
475
+       getGoodTypeName(id){
476
+        var type_name = ""
477
+        for(let i=0;i<this.goodTypeList.length;i++){
478
+        if(id == this.goodTypeList[i].id){
479
+            type_name = this.goodTypeList[i].type_name
480
+        }
481
+        }
482
+        return type_name
483
+       },
484
+    getWarehouseInfoStart(arr1,arr2,arr3,arr4,arr5){
485
+      var count =0
486
+      var countOne =0 
487
+      var countTwo= 0
488
+      var countthree = 0 //期初
489
+      var countfour = 0
490
+      var countfive = 0
491
+      if(arr1!=null && arr1.length > 0){
492
+        for(let i=0;i<arr1.length;i++){
493
+        countOne +=arr1[i].count
494
+        }
495
+      }
496
+      if(arr2!=null && arr2.length > 0){
497
+        for(let i=0;i<arr2.length;i++){
498
+          countTwo +=arr2[i].count
499
+        }
500
+      }
501
+      if(arr3!=null && arr3.length > 0){
502
+        for(let i=0;i<arr3.length;i++){
503
+          countthree +=arr3[i].count
504
+        }
505
+      }
506
+      if(arr4!=null && arr4.length > 0){
507
+        for(let i=0;i<arr4.length;i++){
508
+          countfour +=arr4[i].count
509
+        }
510
+      }
511
+      if(arr5!=null && arr5.length > 0){
512
+        for(let i=0;i<arr5.length;i++){
513
+          countfive +=arr5[i].count
514
+        }
515
+      }
516
+      console.log("countOne",countOne)
517
+      console.log("countTwo",countTwo)
518
+      console.log("countthree",countthree)
519
+      console.log("countfour",countfour)
520
+      console.log("*********************")
521
+      count = countOne - countTwo + countthree - countfour + countfive
522
+      if(count > 0 ){
523
+        return count
524
+      }else{
525
+        return 0
526
+      }
527
+    },
528
+    getWarehouseInfoStartPrice(arr,arr1,arr2,arr3,arr4){
529
+     var total_price = 0
530
+     var total_price_one = 0
531
+     var total_price_two = 0
532
+     var total_price_three = 0
533
+     var total_price_four = 0
534
+     var total_price_all = 0
535
+     if(arr!=null&&arr.length > 0){
536
+      for(let i=0;i<arr.length;i++){
537
+        total_price += arr[i].count * arr[i].buy_price
538
+      }
539
+     }
540
+     if(arr1!=null && arr1.length > 0){
541
+      for(let i=0;i<arr1.length;i++){
542
+        total_price_one +=arr1[i].count * arr1[i].buy_price
543
+      }
544
+      
545
+     }
546
+     if(arr2!=null && arr2.length > 0){
547
+      for(let i=0;i<arr2.length;i++){
548
+       total_price_two +=arr2[i].count * arr2[i].buy_price
549
+      }
550
+     
551
+     }
552
+    if(arr3!=null && arr3.length > 0){
553
+      for(let i=0;i<arr3.length;i++){
554
+        total_price_three +=arr3[i].count * arr3[i].buy_price
555
+      }
556
+     
557
+     }
558
+     if(arr4!=null && arr4.length > 0){
559
+      for(let i=0;i<arr4.length;i++){
560
+        total_price_three +=arr4[i].count * arr4[i].buy_price
561
+      }
562
+     
563
+     }
564
+     total_price_all = total_price - total_price_one + total_price_two - total_price_three + total_price_four
565
+     if (total_price_all > 0) {
566
+       return total_price_all.toFixed(2)
567
+     }else{
568
+      return  "0.00"
569
+     }
570
+   },
571
+  getWarehouseInfoOne(val,val2){
572
+    var count =0 
573
+    var countOne = 0
574
+    var all_count = 0
575
+    if(val!=null && val.length >0){
576
+     for(let i=0;i<val.length;i++){
577
+      count +=val[i].count
578
+     }
579
+    }
580
+    if(val2!=null && val2.length > 0){
581
+     for(let i=0;i<val2.length;i++){
582
+       countOne +=val2[i].count
583
+     }
584
+    }
585
+    all_count = count + countOne
586
+    console.log("count2332323223232o2222222222wide",count)
587
+    console.log("countONE23232322323323223",countOne)
588
+    console.log("all_count9999999999999wode",all_count)
589
+    console.log("-------------------------------------------")
590
+    if(all_count > 0 ){
591
+      return all_count
592
+    }else{
593
+      return 0
594
+    }
595
+  },
596
+  getAddStockMony(val,val2){
597
+    var total_price =0 
598
+    var total_price_one = 0
599
+    var all_price = 0
600
+    if(val!=null && val.length >0){
601
+     for(let i=0;i<val.length;i++){
602
+      total_price +=val[i].count * val[i].buy_price
603
+     }
604
+    }
605
+    if(val2!=null && val2.length > 0){
606
+      for(let i=0;i<val2.length;i++){
607
+       total_price_one +=val2[i].count * val2[i].price
608
+      }
609
+    }
610
+  all_price = total_price + total_price_one
611
+   if(all_price >0 ){
612
+    return total_price.toFixed(2)
613
+   }else{
614
+    return "0.00"
615
+   }
616
+  },
617
+   getSaleStockMony(val,val2){
618
+    var total_price =0 
619
+    var total_price_one = 0
620
+    var all_price = 0
621
+    if(val!=null && val.length >0){
622
+     for(let i=0;i<val.length;i++){
623
+      total_price +=val[i].count * val[i].price
624
+     }
625
+    }
626
+   if(val2!=null && val2.length > 0){
627
+     for(let i=0;i<val2.length;i++){
628
+      total_price_one +=val2[i].count * val2[i].price
629
+     }
630
+   }
631
+   all_price = total_price + total_price_one
632
+   if(all_price >0 ){
633
+    return all_price.toFixed(2)
634
+   }else{
635
+    return "0.00"
636
+   }
637
+  },
638
+    getWarehouseOut(val){
639
+        var count = 0
640
+        for(let i=0;i<val.length;i++){
641
+        count +=val[i].count
642
+        }
643
+        if(count >0){
644
+        return count
645
+        }else{
646
+        return 0
647
+        }
648
+    },
649
+    getManufacturName(id){
650
+      var manufacturer_name = ""
651
+      for(let i=0;i<this.manufacturerList.length;i++){
652
+        if(id == this.manufacturerList[i].id){
653
+           manufacturer_name = this.manufacturerList[i].manufacturer_name
654
+        }
655
+      }
656
+      return manufacturer_name
657
+    },
658
+    getEndOverPrice(val,val3,val1,val2,val4){
659
+     var total_price = 0
660
+     var total_price_one = 0
661
+     var total_price_two = 0
662
+     var total_price_three = 0
663
+     var total_price_four =0
664
+     var all_price = 0
665
+     if(val!=null && val.length >0){
666
+       for(let i=0;i<val.length;i++){
667
+         total_price +=val[i].count * val[i].buy_price
668
+       }
669
+     }
670
+     if(val1!=null && val1.length > 0){
671
+       for(let i=0;i<val1.length;i++){
672
+         total_price_one +=val1[i].count * val1[i].buy_price
673
+       }
674
+     }
675
+     if(val3!=null && val3.length > 0){
676
+       for(let i=0;i<val3.length;i++){
677
+         total_price_three +=val3[i].count * val3[i].buy_price
678
+       }
679
+     }
680
+    if(val2!=null && val2.length > 0){
681
+       for(let i=0;i<val2.length;i++){
682
+         total_price_two +=val2[i].count * val2[i].buy_price
683
+       }
684
+     }
685
+      if(val4!=null && val4.length > 0){
686
+       for(let i=0;i<val4.length;i++){
687
+         total_price_four +=val4[i].count * val4[i].buy_price
688
+       }
689
+     }
690
+    //  console.log("total_price",total_price)
691
+    //  console.log("total_price_three",total_price_three)
692
+    //  console.log("total_price_two",total_price_two)
693
+    //  console.log("total_price_one",total_price_one)
694
+    //  console.log("total_price_four",total_price_four)
695
+     all_price = total_price- total_price_three +total_price_one - total_price_two + total_price_four
696
+     console.log("arrll_price",all_price)
697
+     if(all_price >0){
698
+       return all_price.toFixed(2)
699
+     }else{
700
+      return "0.00"
701
+     }
702
+   },
703
+   },
704
+    created(){
705
+      this.org_id =  this.$store.getters.xt_user.org_id
706
+     
707
+      var starttime =  this.$route.query.start_time
708
+      this.start_time = starttime
709
+      var endtime =  this.$route.query.end_time
710
+      this.end_time = endtime
711
+      var good_type = parseInt(this.$route.query.good_type)
712
+      this.good_type = good_type
713
+      var keyword = this.$route.query.keyword
714
+      this.keyword = keyword
715
+      this.page = parseInt(this.$route.query.page)
716
+      this.limit = parseInt(this.$route.query.limit)
717
+      this.getStorehouseList()
718
+      this.getlist()
719
+    
720
+
721
+    }
722
+}
723
+</script>
724
+
725
+
726
+<style rel="stylesheet/scss" lang="scss" scoped>
727
+.print_main_content {
728
+  background-color: white;
729
+  max-width: 1500px;
730
+  margin: 0 auto;
731
+  padding: 0 0 20px 0;
732
+
733
+  .order_title_panl {
734
+    text-align: center;
735
+
736
+    .main_title {
737
+      font-size: 18px;
738
+      line-height: 40px;
739
+      font-weight: 500;
740
+    }
741
+  }
742
+  .table_panel {
743
+    .table {
744
+      width: 100%;
745
+      border: 1px solid;
746
+      border-collapse: collapse;
747
+      padding: 2px;
748
+      
749
+
750
+      thead {
751
+        tr {
752
+          td {
753
+            border: 1px solid;
754
+            text-align: center;
755
+            font-size: 14px;
756
+            padding: 15px 5px;
757
+          }
758
+        }
759
+      }
760
+      tbody {
761
+        tr {
762
+          td {
763
+            border: 1px solid;
764
+            text-align: center;
765
+            font-size: 14px;
766
+            padding: 10px 5px;
767
+            white-space: pre-line;
768
+            .proj {
769
+              padding: 5px 0;
770
+              text-align: left;
771
+
772
+              .proj_title {
773
+                font-size: 16px;
774
+                font-weight: 500;
775
+                line-height: 25px;
776
+              }
777
+
778
+              .proj_item {
779
+                font-size: 15px;
780
+                line-height: 20px;
781
+
782
+                .zone_name {
783
+                  font-weight: 500;
784
+                }
785
+              }
786
+            }
787
+          }
788
+        }
789
+      }
790
+    }
791
+  }
792
+}
793
+</style>

+ 11 - 1
src/xt_pages/stock/stockNewQuery.vue Datei anzeigen

@@ -13,6 +13,10 @@
13 13
             <el-tab-pane label="进销存查询" name="second">
14 14
                <PurchaseStockQuery ref="mychild"></PurchaseStockQuery>
15 15
             </el-tab-pane>
16
+
17
+             <!-- <el-tab-pane label="进销存查询" name="five">
18
+               <PurchaseNewStockQuery ref="mychildfive"></PurchaseNewStockQuery>
19
+            </el-tab-pane> -->
16 20
          
17 21
             <el-tab-pane label="有效期查询" name="third">
18 22
                 <expiryDateQuery ref="mychildone"></expiryDateQuery>
@@ -30,6 +34,7 @@ import BreadCrumb from "@/xt_pages/components/bread-crumb";
30 34
 import GoodNewQuery from "@/xt_pages/stock/query/goodNewQuery"
31 35
 import ExpiryDateQuery from "@/xt_pages/stock/query/expiryDateQuery"
32 36
 import PurchaseStockQuery from "@/xt_pages/stock/query/purchaseStockQuery"
37
+import PurchaseNewStockQuery from "@/xt_pages/stock/query/purchaseNewStockQuery"
33 38
 import PatientQuery from "@/xt_pages/stock/query/patientQuery"
34 39
 export default {
35 40
   name: "stockNewQuery",
@@ -39,7 +44,8 @@ export default {
39 44
     GoodNewQuery,
40 45
     ExpiryDateQuery,
41 46
     PurchaseStockQuery,
42
-    PatientQuery
47
+    PatientQuery,
48
+    PurchaseNewStockQuery,
43 49
   },
44 50
   data() {
45 51
     return {
@@ -64,6 +70,10 @@ export default {
64 70
       if(val.name =="fourth"){
65 71
        this.$refs.mychildtwo.open()
66 72
       }
73
+      if(val.name == "five"){
74
+        this.$refs.mychildfive.open()  
75
+      }
76
+
67 77
     }
68 78
   },
69 79
   created(){