XMLWAN 2 yıl önce
ebeveyn
işleme
aa5fbbcad5

+ 8 - 0
src/api/drug/drug.js Dosyayı Görüntüle

@@ -627,3 +627,11 @@ export function getDrugOverCount(params) {
627 627
     params: params
628 628
   })
629 629
 }
630
+
631
+export function getDrugInventoryWarehouseInfoList(params) {
632
+  return request({
633
+    url: '/api/stock/getdruginfolist',
634
+    method: 'Get',
635
+    params: params
636
+  })
637
+}

+ 8 - 0
src/api/stock.js Dosyayı Görüntüle

@@ -1064,3 +1064,11 @@ export function getPrintList(params) {
1064 1064
     params: params
1065 1065
   })
1066 1066
 }
1067
+
1068
+export function getwarehouseinfolist(params) {
1069
+  return request({
1070
+    url: '/api/stock/getwarehouseinfolist',
1071
+    method: 'get',
1072
+    params: params
1073
+  })
1074
+}

+ 102 - 62
src/xt_pages/dialysis/details/consumable/dialysisDrug.vue Dosyayı Görüntüle

@@ -83,8 +83,8 @@
83 83
 
84 84
         <el-table-column label="推送医嘱" align="center" width="1280">
85 85
            <template slot-scope="scope">
86
-             {{getAdviceContent(scope.row.patient_id)}}
87
-             {{getHisAdviceContent(scope.row.patient_id)}}
86
+             <span v-if="config.is_open !=1">{{getAdviceContent(scope.row.patient_id)}}</span> 
87
+            <span v-if="config.is_open == 1"> {{getHisAdviceContent(scope.row.patient_id)}}</span>
88 88
            </template>
89 89
         </el-table-column>
90 90
      
@@ -233,10 +233,11 @@
233 233
         adviceList:[],
234 234
         templateList:[],
235 235
         startdialogVisible:false,
236
-        schedule_type:"",
237
-        partion_type:"",
236
+        schedule_type:0,
237
+        partion_type:0,
238 238
         druglist:[],
239 239
         tableList:[],
240
+        config:{},
240 241
       }
241 242
     },
242 243
     created() {
@@ -257,6 +258,9 @@
257 258
       this.getlist()
258 259
     },
259 260
     methods: {
261
+      open(){
262
+
263
+      },
260 264
       getlist(){
261 265
         getDialysisAdviceTemplateList(this.query).then(response=>{
262 266
           if(response.data.state == 1){
@@ -267,7 +271,20 @@
267 271
             var adviceList = response.data.data.adviceList
268 272
             this.adviceList = adviceList
269 273
             var templateList = response.data.data.templateList
274
+            var druglist = response.data.data.drugList
275
+            for(let i=0;i<templateList.length;i++){
276
+              templateList[i].advice_desc = ""
277
+             for(let j=0;j<druglist.length;j++){
278
+               if(templateList[i].drug_id == druglist[j].id){
279
+                 templateList[i].advice_desc = druglist[j].dose + druglist[j].dose_unit +"*"+druglist[j].min_unit +druglist[j].min_number+"/"+druglist[j].max_unit
280
+               }
281
+             }
282
+            }
283
+            console.log("医嘱模版",templateList)
270 284
             this.templateList = templateList
285
+           
286
+            this.config = response.data.data.config
287
+            
271 288
           }
272 289
         })
273 290
       },
@@ -355,68 +372,90 @@
355 372
              console.log("listwo222222",list)
356 373
              var adviceList = response.data.data.adviceList
357 374
              console.log("adviceList",adviceList)
358
-             if(adviceList!=null && adviceList.length > 0){
359
-               let dataInfo = {}
360
-                adviceList.forEach((item, index) => {
361
-                let { advice_name } = item
362
-                if (!dataInfo[advice_name]) {
363
-                  dataInfo[advice_name] = {
364
-                    advice_name:item.advice_name,
365
-                    child: [],
366
-                    count:0,
367
-                    drug_id:item.drug_id,
368
-                    specification_name:item.advice_desc,
375
+             var config = response.data.data.config
376
+             console.log("config",config)
377
+             if(config.is_open!=1){
378
+               if(adviceList!=null && adviceList.length > 0){
379
+                let dataInfo = {}
380
+                  adviceList.forEach((item, index) => {
381
+                  let { advice_name } = item
382
+                  if (!dataInfo[advice_name]) {
383
+                    dataInfo[advice_name] = {
384
+                      advice_name:item.advice_name,
385
+                      child: [],
386
+                      count:0,
387
+                      drug_id:item.drug_id,
388
+                      specification_name:item.advice_desc,
389
+                      patient_id:item.patient_id,
390
+                    }
391
+                  }
392
+                })
393
+                let arr = Object.values(dataInfo)
394
+                if(arr.length > 0){
395
+                  for(let i=0;i<adviceList.length;i++){
396
+                    for(let j=0;j<arr.length;j++){
397
+                      if(adviceList[i].advice_name == arr[j].advice_name){
398
+                          arr[j].child.push(adviceList[i])
399
+                      }
400
+                    }
369 401
                   }
370 402
                 }
371
-              })
372
-              let arr = Object.values(dataInfo)
373
-               if(arr.length > 0){
374
-                 for(let i=0;i<adviceList.length;i++){
403
+               
404
+                this.tableList = []
405
+                for(let i=0;i<list.length;i++){
375 406
                   for(let j=0;j<arr.length;j++){
376
-                     if(adviceList[i].advice_name == arr[j].advice_name){
377
-                        arr[j].child.push(adviceList[i])
378
-                     }
407
+                    if(list[i].patient_id == arr[j].patient_id){
408
+                      this.tableList.push(arr[j])
409
+                    }
379 410
                   }
380
-                 }
381
-               }
382
-              console.log("xinar232323232",arr)
383
-              this.tableList = []
384
-              this.tableList = arr
411
+                }
412
+               
413
+              }
385 414
              }
415
+          
386 416
            
387 417
 
388 418
 
389 419
              var templateList = response.data.data.templateList
390
-           
391
-              console.log("templateList",templateList)
392
-             if(templateList!=null && templateList.length > 0){
393
-                let dataInfoOne = {}
394
-                adviceList.forEach((item, index) => {
395
-                let { advice_name } = item
396
-                if (!dataInfoOne[advice_name]) {
397
-                  dataInfoOne[advice_name] = {
398
-                    advice_name:item.advice_name,
399
-                    child: [],
400
-                    count:0,
401
-                    specification_name:this.getSpecification(item.drug_id),
402
-                    drug_id:item.drug_id,
420
+             console.log("templatelist",templateList)
421
+             if(config.is_open == 1){
422
+               if(templateList!=null && templateList.length > 0){
423
+                  let dataInfoOne = {}
424
+                  templateList.forEach((item, index) => {
425
+                  let { advice_name } = item
426
+                  if (!dataInfoOne[advice_name]) {
427
+                    dataInfoOne[advice_name] = {
428
+                      advice_name:item.advice_name,
429
+                      child: [],
430
+                      count:0,
431
+                      specification_name:this.getSpecification(item.drug_id),
432
+                      drug_id:item.drug_id,
433
+                      patient_id:item.patient_id,
434
+                    }
435
+                  }
436
+                })
437
+                let hisarr = Object.values(dataInfoOne)
438
+                if(hisarr.length > 0){
439
+                  for(let i=0;i<templateList.length;i++){
440
+                    for(let j=0;j<hisarr.length;j++){
441
+                      if(templateList[i].drug_id == hisarr[j].drug_id){
442
+                          hisarr[j].child.push(templateList[i])
443
+                      }
444
+                    }
403 445
                   }
404 446
                 }
405
-              })
406
-              let hisarr = Object.values(dataInfoOne)
407
-               if(hisarr.length > 0){
408
-                 for(let i=0;i<templateList.length;i++){
447
+                console.log("hisarr",hisarr)
448
+                this.tableList = []
449
+                 for(let i=0;i<list.length;i++){
409 450
                   for(let j=0;j<hisarr.length;j++){
410
-                     if(templateList[i].advice_name == hisarr[j].advice_name){
411
-                        hisarr[j].child.push(templateList[i])
412
-                     }
451
+                    if(list[i].patient_id == hisarr[j].patient_id){
452
+                      this.tableList.push(hisarr[j])
453
+                    }
413 454
                   }
414
-                 }
415
-               }
416
-              this.tableList = []
417
-              console.log("hisarrw22222222",hisarr)
418
-              this.tableList = hisarr
455
+                }
456
+              }
419 457
              }
458
+     
420 459
            
421 460
            
422 461
             
@@ -465,34 +504,35 @@
465 504
       formatJson(filterVal, jsonData) {
466 505
         return jsonData.map(v => filterVal.map(j => v[j]));
467 506
       },
507
+   
468 508
       getAdviceContent(patient_id){
469 509
         var newArr = []
470 510
         var his_str = ""
471
-        if(this.templateList!=null && this.templateList.length > 0){
472
-          for(let i=0;i<this.templateList.length;i++){
473
-            if(patient_id == this.templateList[i].patient_id){
474
-              newArr.push(this.templateList[i])
511
+        if(this.adviceList!=null && this.adviceList.length > 0){
512
+          for(let i=0;i<this.adviceList.length;i++){
513
+            if(patient_id == this.adviceList[i].patient_id){
514
+              newArr.push(this.adviceList[i])
475 515
             }
476 516
           }
477 517
         }
478 518
         if(newArr!=null && newArr.length > 0){
479 519
           for(let i=0;i<newArr.length;i++){
480
-            his_str += newArr[i].advice_name +''+newArr[i].advice_desc +''+ newArr[i].prescribing_number +''+newArr[i].prescribing_number_unit + "。"
520
+            his_str += newArr[i].advice_name +' '+newArr[i].advice_desc +' '+ newArr[i].prescribing_number +' '+newArr[i].prescribing_number_unit + "。"
481 521
           }
482 522
         }
483 523
         return his_str
484 524
       },
485 525
       getHisAdviceContent(patient_id){
486 526
         var arr = []
487
-        for(let i=0;i<this.adviceList.length;i++){
488
-          if(patient_id == this.adviceList[i].patient_id){
489
-             arr.push(this.adviceList[i])
527
+        for(let i=0;i<this.templateList.length;i++){
528
+          if(patient_id == this.templateList[i].patient_id){
529
+             arr.push(this.templateList[i])
490 530
           }
491 531
         } 
492 532
         var str = ""
493 533
         if(arr!=null && arr.length > 0){
494 534
           for(let i=0;i<arr.length;i++){
495
-            str += arr[i].advice_name +''+ arr[i].advice_desc+'' + arr[i].prescribing_number+'' + arr[i].prescribing_number_unit +  "。"
535
+            str += arr[i].advice_name +' '+ arr[i].advice_desc+' ' + arr[i].prescribing_number+' ' + arr[i].prescribing_number_unit +  "。"
496 536
           }
497 537
         }
498 538
         return str 
@@ -501,7 +541,7 @@
501 541
         var specification_name = ""
502 542
         for(let i=0;i<this.druglist.length;i++){
503 543
           if(id == this.druglist[i].id){
504
-            specification_name = this.druglist[i].dose+this.druglist[i].dose_unit +"*"+this.druglist[i].min_nubmer +this.druglist[i].min_unit +"/"+this.druglist[i].max_unt
544
+            specification_name = this.druglist[i].dose+this.druglist[i].dose_unit +"*"+this.druglist[i].min_number+this.druglist[i].min_unit +"/"+this.druglist[i].max_unit
505 545
           }
506 546
         }
507 547
         return specification_name

+ 52 - 24
src/xt_pages/dialysis/details/consumable/dialysisGood.vue Dosyayı Görüntüle

@@ -43,6 +43,7 @@
43 43
         </div>
44 44
       </div>
45 45
       <div>
46
+        <el-button size="small" icon="el-icon-printer" @click="exportList" type="primary">打印</el-button>
46 47
         <el-button size="small" icon="el-icon-printer" @click="exportList" type="primary">导出</el-button>
47 48
         <el-button size="small" type="primary" @click="statistics">统计表</el-button>
48 49
       </div>
@@ -279,23 +280,6 @@
279 280
       }
280 281
     },
281 282
     created() {
282
-      this.dialysate_formulation =  getDataConfig(  
283
-          'hemodialysis',
284
-          'dialysate_formulation'
285
-      )
286
-      this.body_fluid_option = this.$store.getters.body_fluid
287
-      this.displace_liqui_part_option = this.$store.getters.displace_liqui
288
-      this.blood_access_option = this.$store.getters.blood_access
289
-      this.blood_access_option = getDataConfig('hemodialysis', 'vascular_access_desc')
290
-      this.hemodialysisPipelinesOptions = getDataConfig('hemodialysis', 'hemodialysis_pipelines')
291
-      var filedList = this.$store.getters.xt_user.fileds
292
-      for (let i = 0; i < filedList.length; i++) {
293
-        if ( filedList[i].module == 1 && filedList[i].is_show == 1 && (filedList[i].filed_name_cn == '透析器/灌流器' || filedList[i].filed_name_cn == '透析器' || filedList[i].filed_name_cn == '灌流器'  || filedList[i].filed_name_cn == '钾' || filedList[i].filed_name_cn == '钠' || filedList[i].filed_name_cn == '钙' || filedList[i].filed_name_cn == '葡萄糖'  || filedList[i].filed_name_cn == '穿刺针'  || filedList[i].filed_name_cn == '穿刺针支数')) {
294
-          this.rowList.push(filedList[i])
295
-        }
296
-      }
297
-      console.log("行33333333333333",this.rowList)
298
-      this.getAllZone()
299 283
       let date = uParseTime(new Date(), "{y}-{m}-{d}")
300 284
       var newDate = new Date();
301 285
       var y = newDate.getFullYear();
@@ -309,22 +293,39 @@
309 293
       this.query.schedule_type = 0
310 294
       this.query.partition_id = 0
311 295
       this.query.page = 1
296
+      this.getAllZone()
297
+      this.dialysate_formulation =  getDataConfig(  
298
+            'hemodialysis',
299
+            'dialysate_formulation'
300
+      )
301
+      this.body_fluid_option = this.$store.getters.body_fluid
302
+      this.displace_liqui_part_option = this.$store.getters.displace_liqui
303
+      this.blood_access_option = this.$store.getters.blood_access
304
+      this.blood_access_option = getDataConfig('hemodialysis', 'vascular_access_desc')
305
+      this.hemodialysisPipelinesOptions = getDataConfig('hemodialysis', 'hemodialysis_pipelines')
306
+      var filedList = this.$store.getters.xt_user.fileds
307
+      for (let i = 0; i < filedList.length; i++) {
308
+        if ( filedList[i].module == 1 && filedList[i].is_show == 1 && (filedList[i].filed_name_cn == '透析器/灌流器' || filedList[i].filed_name_cn == '透析器' || filedList[i].filed_name_cn == '灌流器'  || filedList[i].filed_name_cn == '钾' || filedList[i].filed_name_cn == '钠' || filedList[i].filed_name_cn == '钙' || filedList[i].filed_name_cn == '葡萄糖'  || filedList[i].filed_name_cn == '穿刺针'  || filedList[i].filed_name_cn == '穿刺针支数')) {
309
+          this.rowList.push(filedList[i])
310
+        }
311
+      }
312 312
       this.getlist()
313 313
     },
314 314
     methods: {
315
+      open(){
316
+       this.getlist()
317
+      },
315 318
       getlist(){
316 319
         getPatientDialysisSolutionGroupList(this.query).then(response=>{
317 320
            if(response.data.state == 1){
318 321
              var list = response.data.data.list
319
-             console.log("list23322323ow",list)
320
-             console.log("rowlist22222wode",this.rowList)
321 322
              if(list!=null){
322 323
                for(let i=0;i<list.length;i++){
323 324
                  list[i].rowList = []
324 325
                  list[i].rowList = this.rowList
325 326
                }
326 327
              }
327
-             console.log("h哈哈哈哈哈哈哈",list)
328
+             this.list= []
328 329
              this.list = list
329 330
              var total = response.data.data.total
330 331
              this.total = total
@@ -399,7 +400,7 @@
399 400
           partion_type:this.partion_type,
400 401
           selected_date:this.query.schedule_date,
401 402
         }
402
-        console.log("params2332232wo",params)
403
+        // console.log("params2332232wo",params)
403 404
        getDialysisGoodTotalCount(params).then(response=>{
404 405
           if(response.data.state == 1){
405 406
             this.startDialogVisible = true
@@ -415,6 +416,7 @@
415 416
                  list[i].dialysis_dialyszers_arr = []
416 417
                  list[i].dialyzer_perfusion_apparatus_arr = []
417 418
                  list[i].dialysis_irrigation_arr = []
419
+                 list[i].puncture_needle_arr = []
418 420
                  if(list[i].dialysis_solution.dialysis_dialyszers!=""){
419 421
                    list[i].dialysis_dialyszers_arr = list[i].dialysis_solution.dialysis_dialyszers.split(",")
420 422
                  }
@@ -424,6 +426,9 @@
424 426
                  if(list[i].dialysis_solution.dialysis_irrigation!=""){
425 427
                    list[i].dialysis_irrigation_arr = list[i].dialysis_solution.dialysis_irrigation.split(",")
426 428
                  }
429
+                 if(list[i].dialysis_solution.puncture_needle!="" ){
430
+                    list[i].puncture_needle_arr = list[i].dialysis_solution.puncture_needle.split(",")
431
+                 }
427 432
                  kaliumCount += parseInt(list[i].dialysis_solution.kalium) 
428 433
                  sodiumCount += parseInt(list[i].dialysis_solution.sodium)
429 434
                  calciumCount +=parseInt(list[i].dialysis_solution.calcium)
@@ -435,9 +440,10 @@
435 440
             var dialysisDialyszersArr = []
436 441
             var dialyzerPerfusionApparaArr = []
437 442
             var dialysisIrrigationArr = []
443
+            var punctureNeedleArr = []
438 444
             for(let i=0;i<list.length;i++){
439 445
              for(let j=0;j<list[i].dialysis_dialyszers_arr.length;j++){
440
-              console.log("list23323232",list[i].dialysis_dialyszers_arr[j])
446
+             
441 447
                dialysisDialyszersArr.push(list[i].dialysis_dialyszers_arr[j])  
442 448
              }
443 449
              for(let z=0;z<list[i].dialyzer_perfusion_apparatus_arr.length;z++){
@@ -446,14 +452,18 @@
446 452
              for(let y=0;y<list[i].dialysis_irrigation_arr.length;y++){
447 453
               dialysisIrrigationArr.push(list[i].dialysis_irrigation_arr[y])
448 454
              }
455
+             for(let h=0;h<list[i].puncture_needle_arr.length;h++){
456
+               punctureNeedleArr.push(list[i].puncture_needle_arr[h])   
457
+             }
449 458
             }
450 459
             console.log("透析器",dialysisDialyszersArr)
451 460
             console.log("透析器/灌流器",dialyzerPerfusionApparaArr)
452 461
             console.log("灌流器",dialysisIrrigationArr)
453
-             
462
+            console.log("穿刺针",punctureNeedleArr)  
454 463
            let obj = {}
455 464
            let objOne = {}
456 465
            let objTwo = {}
466
+           let objThree = {}
457 467
            for(let i = 0 ; i < dialysisDialyszersArr.length; i++){
458 468
             if(obj[dialysisDialyszersArr[i]]){
459 469
                obj[dialysisDialyszersArr[i]] +=1
@@ -505,6 +515,24 @@
505 515
               Arr.push(a);
506 516
             }
507 517
             console.log("newa",Arr)
518
+          
519
+          for(let i = 0 ; i < punctureNeedleArr.length; i++){
520
+            if(objThree[punctureNeedleArr[i]]){
521
+               objThree[punctureNeedleArr[i]] +=1
522
+            }else{
523
+              objThree[punctureNeedleArr[i]] = 1
524
+            }
525
+           }
526
+           for (let i in objThree) {
527
+              let a = {};
528
+              a[i] = objThree[i];
529
+              a.name = "穿刺针"
530
+              a.count = objThree[i]
531
+              a.specification_name = i
532
+              Arr.push(a);
533
+            }
534
+            
535
+
508 536
            var objfive = {name:"钾(mmol/L)",specification_name:"2.0",count:""}
509 537
            var objsix =  {name:"钠(mmol/L)",specification_name:"1.25",count:""}
510 538
            var objseven = {name:"钙(mmol/L)",specification_name:"1.5",count:""}
@@ -525,7 +553,7 @@
525 553
 
526 554
               this.tableList.push(Arr[i])
527 555
             }
528
-            // this.tableList = Arr
556
+            
529 557
            
530 558
           }
531 559
        })

+ 6 - 6
src/xt_pages/dialysis/details/consumable/index.vue Dosyayı Görüntüle

@@ -7,13 +7,13 @@
7 7
      <div class="app-container ">
8 8
         <el-tabs v-model="activeName" @tab-click="handleClick">
9 9
             <el-tab-pane label="透析耗材" name="first">
10
-              <DialysisGood></DialysisGood>
10
+              <DialysisGood ref="mychild"></DialysisGood>
11 11
             </el-tab-pane>
12 12
             <el-tab-pane label="药品" name="second">
13
-               <DialysisDrug ref="mychild"></DialysisDrug>
13
+               <DialysisDrug ref="mychildOne"></DialysisDrug>
14 14
            </el-tab-pane>
15 15
             <el-tab-pane label="透析参数" name="third">
16
-               <DialysisParameter ref="mychildOne"></DialysisParameter>
16
+               <DialysisParameter ref="mychildtwo"></DialysisParameter>
17 17
             </el-tab-pane>
18 18
         
19 19
         </el-tabs>
@@ -49,13 +49,13 @@ export default {
49 49
   },
50 50
   methods:{
51 51
     handleClick(val){
52
-      if(val.name == "second"){
52
+      if(val.name == "first"){
53 53
        this.$refs.mychild.open()
54 54
       }   
55
-      if(val.name == "third"){
55
+      if(val.name == "second"){
56 56
        this.$refs.mychildOne.open()
57 57
       }
58
-      if(val.name == "fourth"){
58
+      if(val.name == "third"){
59 59
         this.$refs.mychildtwo.open()
60 60
       }
61 61
     }

+ 1 - 1
src/xt_pages/hospitalStation/chargeDetailManagement.vue Dosyayı Görüntüle

@@ -1345,7 +1345,7 @@ export default {
1345 1345
                 price: prescription.project[b].price,
1346 1346
                 remark: prescription.project[b].remark,
1347 1347
                 // medical_code: prescription.project[b].project.medical_code,
1348
-                unit: prescription.project[b].project.unit,
1348
+                unit: prescription.project[b].unit,
1349 1349
                 type: prescription.project[b].type,
1350 1350
                 det_item_fee_sumamt: prescription.project[b].order_info.det_item_fee_sumamt,
1351 1351
                 fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,

+ 1 - 1
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Dosyayı Görüntüle

@@ -2883,7 +2883,7 @@ export default {
2883 2883
             obj['settle_accounts_type'] = 2
2884 2884
           }
2885 2885
           var that = this
2886
-          axios.get("127.0.0.1:9532"  + '/coordinate/settleAccount', {
2886
+          axios.get("http://127.0.0.1:9532"  + '/coordinate/settleAccount', {
2887 2887
             params: obj
2888 2888
           })
2889 2889
               .then(function(response) {

+ 3 - 1
src/xt_pages/stock/drugs/components/drugQuery.vue Dosyayı Görüntüle

@@ -96,7 +96,7 @@
96 96
             </el-table-column>
97 97
             <el-table-column label="批准文号" align="center">
98 98
               <template slot-scope="scope">
99
-                {{scope.row.medical_insurance_number}}
99
+                {{scope.row.number}}
100 100
               </template>
101 101
             </el-table-column>
102 102
             <el-table-column label="国家编码" align="center">
@@ -1079,6 +1079,7 @@ export default {
1079 1079
           "药品名称",
1080 1080
           "规格&单位",
1081 1081
           "生产厂商",
1082
+          "批准文号",
1082 1083
           "国家编码",
1083 1084
           "入库数量",
1084 1085
           "出库数量",
@@ -1093,6 +1094,7 @@ export default {
1093 1094
           "drug_name",
1094 1095
           "specification_name",
1095 1096
           "manufacturer_name",
1097
+          "number",
1096 1098
           "medical_insurance_number",
1097 1099
           "stock_in_count",
1098 1100
           "stock_out_count",

+ 1 - 1
src/xt_pages/stock/drugs/components/drugQueryPrint.vue Dosyayı Görüntüle

@@ -60,7 +60,7 @@
60 60
                     {{ getManufacturName(item.manufacturer) }}
61 61
                   </td>
62 62
                   <!-- 批准文号 -->
63
-                   <td ></td>
63
+                   <td >{{item.number}}</td>
64 64
                   <td >{{ item.medical_insurance_number }}</td>
65 65
                   <!-- 仓库名称   -->
66 66
                   <td style="padding: 0;text-align:center;">

+ 1 - 1
src/xt_pages/stock/drugs/components/purchaseDrugQuery.vue Dosyayı Görüntüle

@@ -1005,7 +1005,7 @@ export default {
1005 1005
   },
1006 1006
    open(){
1007 1007
     this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
1008
-    this.end_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
1008
+    this.end_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
1009 1009
     this.houseList= []
1010 1010
     this.drugTypeList = []
1011 1011
     this.getStorehouseList()

+ 1 - 1
src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue Dosyayı Görüntüle

@@ -1017,7 +1017,7 @@ export default {
1017 1017
    open(){
1018 1018
    
1019 1019
     this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
1020
-    this.end_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
1020
+    this.end_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
1021 1021
     this.houseList= []
1022 1022
     this.drugTypeList = []
1023 1023
     this.getStorehouseList()

+ 7 - 2
src/xt_pages/stock/drugs/drugInventory.vue Dosyayı Görüntüle

@@ -12,8 +12,11 @@
12 12
         style="height: 100%; display: flex; flex-direction: column"
13 13
         @tab-click="handleClick"
14 14
       >
15
-        <el-tab-pane label="药品盘点" name="first" v-if="first">
15
+       <!-- <el-tab-pane label="药品盘点" name="first" v-if="first">
16 16
           <drug-inventory></drug-inventory>
17
+        </el-tab-pane> -->
18
+         <el-tab-pane label="药品盘点" name="four">
19
+          <drug-new-inventory></drug-new-inventory>
17 20
         </el-tab-pane>
18 21
         <el-tab-pane label="盘点列表" name="second" v-if="second">
19 22
           <inventory-details ref="child"></inventory-details>
@@ -30,6 +33,7 @@
30 33
 <script>
31 34
 import BreadCrumb from "../../components/bread-crumb";
32 35
 import drugInventory from "./inventory";
36
+import drugNewInventory from "./newDrugInventory"
33 37
 import inventoryDetails from "./inventoryDetails";
34 38
 import drugDamaged from "./drugDamaged.vue";
35 39
 export default {
@@ -39,6 +43,7 @@ export default {
39 43
     drugInventory,
40 44
     inventoryDetails,
41 45
     drugDamaged,
46
+    drugNewInventory,
42 47
   },
43 48
   data() {
44 49
     return {
@@ -47,7 +52,7 @@ export default {
47 52
         { path: false, name: "药品管理" },
48 53
         { path: false, name: "药品盘点" },
49 54
       ],
50
-      activeName: "first",
55
+      activeName: "four",
51 56
       first: true,
52 57
       second: true,
53 58
       three: true,

+ 2 - 2
src/xt_pages/stock/drugs/drugNewQuery.vue Dosyayı Görüntüle

@@ -10,9 +10,9 @@
10 10
               <DrugQuery></DrugQuery>
11 11
             </el-tab-pane>
12 12
           
13
-            <el-tab-pane label="进销存查询" name="second">
13
+           <el-tab-pane label="进销存查询" name="second">
14 14
               <PurchaseDrugQuery ref="mychild"></PurchaseDrugQuery>
15
-            </el-tab-pane>
15
+            </el-tab-pane> 
16 16
 
17 17
              <!-- <el-tab-pane label="进销存查询" name="five">
18 18
                <PurchaseNewDrugQuery ref="mychildfive"></PurchaseNewDrugQuery>

+ 3 - 3
src/xt_pages/stock/query/goodNewQuery.vue Dosyayı Görüntüle

@@ -70,7 +70,7 @@
70 70
             </el-table-column>
71 71
             <el-table-column label="批准文号" align="center">
72 72
               <template slot-scope="scope">
73
-                  {{getManufacturName(scope.row.manufacturer)}}
73
+                 {{scope.row.number}}
74 74
               </template>
75 75
             </el-table-column>
76 76
             <el-table-column label="国家编码" align="center">
@@ -790,8 +790,8 @@ export default {
790 790
           }
791 791
          }
792 792
          
793
-         const tHeader = ['序号','耗材类型', '耗材名称', '规格&单位','生产厂商','国家编码','入库数量','出库数量','退库数量','实际出库','剩余库存','总库存']
794
-         const filterVal = ['index','type_name', 'good_name', 'spec','manufacturer_name','social_security_directory_code','stock_in_count','act_out_count','stock_cancel_count','stock_out_count','over_count','sum_count']
793
+         const tHeader = ['序号','耗材类型', '耗材名称', '规格&单位','生产厂商','批准文号','国家编码','入库数量','出库数量','退库数量','实际出库','剩余库存','总库存']
794
+         const filterVal = ['index','type_name', 'good_name', 'spec','manufacturer_name','number','social_security_directory_code','stock_in_count','act_out_count','stock_cancel_count','stock_out_count','over_count','sum_count']
795 795
         
796 796
          const data = this.formatJson(filterVal, this.tableList)
797 797
          excel.export_json_to_excel({

+ 1 - 1
src/xt_pages/stock/query/goodNewQueryPrint.vue Dosyayı Görüntüle

@@ -66,7 +66,7 @@
66 66
                   </td>
67 67
                    <!--  批准文号-->
68 68
                   <td>
69
-                    {{ getManufacturName(item.manufacturer) }}
69
+                    {{item.number}}
70 70
                   </td>
71 71
                   <!-- 国家编码 -->
72 72
                   <td>{{ item.social_security_directory_code }}</td>

+ 2 - 2
src/xt_pages/stock/query/purchaseNewStockQuery.vue Dosyayı Görüntüle

@@ -268,7 +268,7 @@ export default {
268 268
               // list[i].stockOutprice = this.stockOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
269 269
               // list[i].saleOutMoney = this.getSaleStockMony(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
270 270
               list[i].stockOutprice = "/"
271
-              list[i].saleOutprice = "/"
271
+              list[i].saleOutMoney = "/"
272 272
               // list[i].overStock= this.getEndWarehouseInfo(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
273 273
               // list[i].overPrice= this.getEndOverPrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
274 274
               // list[i].overMoney = this.getEndSalePrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
@@ -683,7 +683,7 @@ export default {
683 683
    },
684 684
    open(){
685 685
     this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
686
-    this.end_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
686
+    this.end_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
687 687
     this.houseList = []
688 688
     this.goodTypeList= []
689 689
     this.getStorehouseList()

+ 1 - 1
src/xt_pages/stock/query/purchaseStockQuery.vue Dosyayı Görüntüle

@@ -673,7 +673,7 @@ export default {
673 673
    },
674 674
    open(){
675 675
     this.start_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
676
-    this.end_time = moment().year(2022).month(10).date(1).format('YYYY-MM-DD')
676
+    this.end_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
677 677
     this.houseList = []
678 678
     this.goodTypeList= []
679 679
     this.getStorehouseList()

+ 8 - 3
src/xt_pages/stock/stockInventory.vue Dosyayı Görüntüle

@@ -5,8 +5,11 @@
5 5
     </div>
6 6
     <div class="app-container">
7 7
         <el-tabs v-model="activeName" @tab-click="handleClick">
8
-            <el-tab-pane label="耗材盘点" name="first">
8
+            <!-- <el-tab-pane label="耗材盘点" name="first">
9 9
                 <inventory></inventory>
10
+            </el-tab-pane> -->
11
+            <el-tab-pane label="耗材盘点" name="four">
12
+                <new-inventory></new-inventory>
10 13
             </el-tab-pane>
11 14
             <el-tab-pane label="盘点列表" name="second">
12 15
                 <inventory-details ref="child"></inventory-details>
@@ -25,6 +28,7 @@
25 28
 <script>
26 29
 import BreadCrumb from "../components/bread-crumb";
27 30
 import inventory from './inventory.vue'
31
+import newInventory from './newInventory.vue'
28 32
 import inventoryDetails from './inventoryDetails.vue'
29 33
 import stockDamaged from "./stockDamaged.vue"
30 34
 export default {
@@ -33,7 +37,8 @@ export default {
33 37
         BreadCrumb,
34 38
         inventory,
35 39
         inventoryDetails,
36
-        stockDamaged
40
+        stockDamaged,
41
+        newInventory
37 42
     },
38 43
     data() {
39 44
         return{
@@ -42,7 +47,7 @@ export default {
42 47
                 { path: false, name: "耗材管理" },
43 48
                 { path: false, name: "耗材盘点" }
44 49
             ],
45
-            activeName:'first'
50
+            activeName:'four'
46 51
         }
47 52
     },
48 53
     methods:{

+ 2 - 2
src/xt_pages/stock/stockNewQuery.vue Dosyayı Görüntüle

@@ -13,8 +13,8 @@
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">
16
+<!-- 
17
+             <el-tab-pane label="进销存查询" name="five">
18 18
                <PurchaseNewStockQuery ref="mychildfive"></PurchaseNewStockQuery>
19 19
             </el-tab-pane> -->
20 20