瀏覽代碼

新分支

28169 1 年之前
父節點
當前提交
70b5eb231c

+ 56 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_twentySeven.vue 查看文件

1549
                           <tbody>
1549
                           <tbody>
1550
                             <tr>
1550
                             <tr>
1551
                               <td width="70">抗凝方式:</td>
1551
                               <td width="70">抗凝方式:</td>
1552
+                              <td width="80">
1553
+                                  <label-box :isChecked="record.prescription.anticoagulant == '8' ? true : false" showValue="依诺肝素"></label-box>
1554
+                              </td>
1555
+                              <td width="80">
1556
+                                  <label-box :isChecked="record.prescription.anticoagulant == '4' ? true : false" showValue="阿加曲班"></label-box>
1557
+                              </td>
1558
+                              <td width="80">
1559
+                                  <label-box :isChecked="record.prescription.anticoagulant == '2' ? true : false" showValue="普通肝素"></label-box>
1560
+                              </td>
1561
+                              <td width="80">
1562
+                                  <label-box :isChecked="record.prescription.anticoagulant == '1' ? true : false" showValue="无肝素"></label-box>
1563
+                              </td>
1564
+                              <td width="90">
1565
+                                  <label-box :isChecked="(record.prescription.anticoagulant == '低分子肝素' || record.prescription.anticoagulant == '低分子肝素钙' || record.prescription.anticoagulant == '低分子肝素钠') ? true : false" showValue="低分子肝素"></label-box>
1566
+                              </td>
1567
+
1568
+                              <td width="50">首剂量</td>
1569
+                              <td width="60">
1570
+                                {{record.prescription.anticoagulant_shouji ? record.prescription.anticoagulant_shouji : ""}}
1571
+                                    <span v-if="record.prescription.anticoagulant == 5">iu</span>
1572
+                                    <span v-if="record.prescription.anticoagulant == 6">iu</span>
1573
+                                    <span v-if="record.prescription.anticoagulant == 7">iu</span>
1574
+                                    <span v-if="record.prescription.anticoagulant == 8">iu</span>
1575
+                                    <span v-if="record.prescription.anticoagulant == 4">mg</span>
1576
+                                    <span v-if="record.prescription.anticoagulant == 3">iu</span>
1577
+                                    <span v-if="record.prescription.anticoagulant == 2">mg</span>
1578
+                                    <span v-if="record.prescription.anticoagulant == 1">mg</span>
1579
+                              </td>
1580
+
1581
+                              <td width="30">维持</td>
1582
+                              <td width="60">
1583
+                                {{record.prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : ""}}
1584
+                                <span v-if="record.prescription.anticoagulant == 6">iu</span>
1585
+                                <span v-if="record.prescription.anticoagulant == 7">iu</span>
1586
+                                <span v-if="record.prescription.anticoagulant == 8">iu</span>
1587
+                                <span v-if="record.prescription.anticoagulant == 5">ml/h</span>
1588
+                                <span v-if="record.prescription.anticoagulant == 4">mg/h</span>
1589
+                                <span v-if="record.prescription.anticoagulant == 3">iu/h</span>
1590
+                                <span v-if="record.prescription.anticoagulant == 2">mg/h</span>
1591
+                                <span v-if="record.prescription.anticoagulant == 1">mg/h</span>
1592
+                              </td>
1593
+
1594
+                              <td width="30">总量</td>
1595
+                              <td width="60">
1596
+                                {{record.prescription.anticoagulant_zongliang ?record.prescription.anticoagulant_zongliang : ""}}
1597
+                                <span v-if="record.prescription.anticoagulant == 5">iu</span>
1598
+                                  <span v-if="record.prescription.anticoagulant == 6">iu</span>
1599
+                                  <span v-if="record.prescription.anticoagulant == 7">iu</span>
1600
+                                  <span v-if="record.prescription.anticoagulant == 8">iu</span>
1601
+                                  <span v-if="record.prescription.anticoagulant == 4">mg</span>
1602
+                                  <span v-if="record.prescription.anticoagulant == 3">iu</span>
1603
+                                  <span v-if="record.prescription.anticoagulant == 2">mg</span>
1604
+                                  <span v-if="record.prescription.anticoagulant == 1">mg</span>
1605
+                              </td>
1606
+                              <!-- <td width="70">抗凝方式:</td>
1552
                               <td width="120">
1607
                               <td width="120">
1553
                                 <label-box
1608
                                 <label-box
1554
                                   :isChecked="(record.prescription.anticoagulant == 8)
1609
                                   :isChecked="(record.prescription.anticoagulant == 8)
1736
                                   "
1791
                                   "
1737
                                   showValue="无肝素"
1792
                                   showValue="无肝素"
1738
                                 ></label-box>
1793
                                 ></label-box>
1739
-                              </td>
1794
+                              </td> -->
1740
                             </tr>
1795
                             </tr>
1741
                           </tbody>
1796
                           </tbody>
1742
                         </table>
1797
                         </table>

+ 65 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue 查看文件

668
                   <tbody>
668
                   <tbody>
669
                     <tr>
669
                     <tr>
670
                       <td width="70">抗凝方式:</td>
670
                       <td width="70">抗凝方式:</td>
671
-                      <td width="120">
671
+                      <td width="80">
672
                           <label-box :isChecked="prescription.anticoagulant == '依诺肝素' ? true : false" showValue="依诺肝素"></label-box>
672
                           <label-box :isChecked="prescription.anticoagulant == '依诺肝素' ? true : false" showValue="依诺肝素"></label-box>
673
                       </td>
673
                       </td>
674
+                      <td width="80">
675
+                          <label-box :isChecked="prescription.anticoagulant == '阿加曲班' ? true : false" showValue="阿加曲班"></label-box>
676
+                      </td>
677
+                      <td width="80">
678
+                          <label-box :isChecked="prescription.anticoagulant == '普通肝素' ? true : false" showValue="普通肝素"></label-box>
679
+                      </td>
680
+                      <td width="80">
681
+                          <label-box :isChecked="prescription.anticoagulant == '无肝素' ? true : false" showValue="无肝素"></label-box>
682
+                      </td>
683
+                      <td width="90">
684
+                          <label-box :isChecked="(prescription.anticoagulant == '低分子肝素' || prescription.anticoagulant == '低分子肝素钙' || prescription.anticoagulant == '低分子肝素钠') ? true : false" showValue="低分子肝素"></label-box>
685
+                      </td>
686
+
687
+                      <td width="40">首剂量</td>
688
+                      <td width="60">
689
+                        {{prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : ""}}
690
+                        <span v-if="prescription.anticoagulant == '枸橼酸钠'">ml</span>
691
+                        <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
692
+                        <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>
693
+                        <span v-if="prescription.anticoagulant == '依诺肝素'">iu</span>
694
+                        <span v-if="prescription.anticoagulant == '达肝素'">iu</span>
695
+                        <span v-if="prescription.anticoagulant == '体外抗凝'">iu</span>
696
+                        <span v-if="prescription.anticoagulant == '那屈肝素'">iu</span>
697
+                        <span v-if="prescription.anticoagulant == '那屈肝素钙'">iu</span>
698
+                        <span v-if="prescription.anticoagulant == '阿加曲班'">mg</span>
699
+                        <span v-if="prescription.anticoagulant == '低分子肝素'">iu</span>
700
+                        <span v-if="prescription.anticoagulant == '普通肝素'">mg</span>
701
+                        <span v-if="prescription.anticoagulant == '无肝素'">mg</span>
702
+                      </td>
703
+
704
+                      <td width="30">维持</td>
674
                       <td width="60">
705
                       <td width="60">
706
+                        {{prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : ""}}
707
+                        <span v-if="prescription.anticoagulant == '阿加曲班'">iu</span>
708
+                        <span v-if="prescription.anticoagulant == '低分子肝素'">iu</span>
709
+                        <span v-if="prescription.anticoagulant == '普通肝素'">mg</span>
710
+                        <span v-if="prescription.anticoagulant == '枸橼酸钠'">ml</span>
711
+                        <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
712
+                        <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>
713
+                        <span v-if="prescription.anticoagulant == '依诺肝素'">iu</span>
714
+                        <span v-if="prescription.anticoagulant == '达肝素'">iu</span>
715
+                        <span v-if="prescription.anticoagulant == '体外抗凝'">iu</span>
716
+                        <span v-if="prescription.anticoagulant == '那屈肝素'">iu</span>
717
+                        <span v-if="prescription.anticoagulant == '那屈肝素钙'">iu</span>
718
+                      </td>
719
+
720
+                      <td width="30">总量</td>
721
+                      <td width="60">
722
+                        {{prescription.anticoagulant_zongliang ?prescription.anticoagulant_zongliang : ""}}
723
+                        <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu/h</span>
724
+                        <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu/h</span>
725
+                        <span v-if="prescription.anticoagulant == '依诺肝素'">iu/h</span>
726
+                        <span v-if="prescription.anticoagulant == '达肝素'">iu/h</span>
727
+                        <span v-if="prescription.anticoagulant == '体外抗凝'">iu/h</span>
728
+                        <span v-if="prescription.anticoagulant == '那屈肝素'">iu/h</span>
729
+                        <span v-if="prescription.anticoagulant == '那屈肝素钙'">iu/h</span>
730
+                        <span v-if="prescription.anticoagulant == '枸橼酸钠'">ml/h</span>
731
+                        <span v-if="prescription.anticoagulant == '阿加曲班'">mg/h</span>
732
+                        <span v-if="prescription.anticoagulant == '低分子肝素'">iu/h</span>
733
+                        <span v-if="prescription.anticoagulant == '普通肝素'">mg/h</span>
734
+                        <span v-if="prescription.anticoagulant == '无肝素'">mg/h</span>
735
+                      </td>
736
+
737
+                      <!-- <td width="60">
675
                           <div class="under-line">&nbsp;{{ prescription.anticoagulant == '依诺肝素' && prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : ""}}</div>
738
                           <div class="under-line">&nbsp;{{ prescription.anticoagulant == '依诺肝素' && prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : ""}}</div>
676
                       </td>
739
                       </td>
677
                       <td width="10">iu</td>
740
                       <td width="10">iu</td>
702
                       <td width="100">
765
                       <td width="100">
703
                           <label-box :isChecked="prescription.anticoagulant == '无肝素' ? true : false" showValue="无肝素"></label-box>
766
                           <label-box :isChecked="prescription.anticoagulant == '无肝素' ? true : false" showValue="无肝素"></label-box>
704
                       </td>
767
                       </td>
705
-                      <td></td>
768
+                      <td></td> -->
706
                     </tr>
769
                     </tr>
707
                   </tbody>
770
                   </tbody>
708
                 </table>
771
                 </table>

+ 10 - 2
src/xt_pages/outpatientDoctorStation/components/dialysishistory.vue 查看文件

290
     }
290
     }
291
   },
291
   },
292
   methods:{
292
   methods:{
293
+    show(patient_id){
294
+   
295
+     this.queryParams.patient_id = 0
296
+     this.queryParams.patient_id = patient_id
297
+     this.getPatientDialysisRecords()
298
+    },
293
     changeSearch(){
299
     changeSearch(){
294
 
300
 
295
     },
301
     },
313
 
319
 
314
     },
320
     },
315
     getPatientDialysisRecords() {
321
     getPatientDialysisRecords() {
316
-      console.log("prams",this.queryParams)
322
+      console.log("prams--------------------",this.queryParams)
317
       getPatientDialysisRecords(this.queryParams).then(response => {
323
       getPatientDialysisRecords(this.queryParams).then(response => {
318
         if (response.data.state == 1) {
324
         if (response.data.state == 1) {
319
           this.total = response.data.data.total;
325
           this.total = response.data.data.total;
326
+          this.recordData = []
320
           this.recordData = response.data.data.records;
327
           this.recordData = response.data.data.records;
321
-          console.log("郭23232323232232323",this.recordData)
328
+         
322
         }
329
         }
323
       });
330
       });
324
     },
331
     },
387
   },
394
   },
388
   created(){
395
   created(){
389
     this.modeOptions = this.$store.getters.treatment_mode;
396
     this.modeOptions = this.$store.getters.treatment_mode;
397
+    console.log("patinetid----",this.patientid)
390
     this.queryParams.patient_id = this.patientid
398
     this.queryParams.patient_id = this.patientid
391
     this.getPatientDialysisRecords()
399
     this.getPatientDialysisRecords()
392
 
400
 

+ 12 - 1
src/xt_pages/outpatientDoctorStation/doctorDesk.vue 查看文件

190
         <dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'
190
         <dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'
191
                         :dialysisShow="dialysisShow"></dialysis-index>
191
                         :dialysisShow="dialysisShow"></dialysis-index>
192
 
192
 
193
-        <dialysishistory v-if="titleType == '透析历史'" :patientid='patientid'></dialysishistory>
193
+        <dialysishistory v-if="titleType == '透析历史'" :patientid='patientid' ref="childOne"></dialysishistory>
194
       </div>
194
       </div>
195
 
195
 
196
     </div>
196
     </div>
568
       advices_template: [],
568
       advices_template: [],
569
       sick: [],
569
       sick: [],
570
       diagnoses: [],
570
       diagnoses: [],
571
+      diagnosis:[],
571
       additions: [],
572
       additions: [],
572
       doctors: [],
573
       doctors: [],
573
       department: [],
574
       department: [],
2734
                     //   }
2735
                     //   }
2735
                   }
2736
                   }
2736
                 }
2737
                 }
2738
+                console.log("jin2")
2737
                 this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
2739
                 this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
2738
                 this.$refs.child.watchSign = 0
2740
                 this.$refs.child.watchSign = 0
2739
               }
2741
               }
3269
                     // }
3271
                     // }
3270
                   }
3272
                   }
3271
                 }
3273
                 }
3274
+                console.log("jin3")
3272
                 this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
3275
                 this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
3273
                 this.$refs.child.watchSign = 0
3276
                 this.$refs.child.watchSign = 0
3274
               }
3277
               }
3792
                   // }
3795
                   // }
3793
                 }
3796
                 }
3794
               }
3797
               }
3798
+              console.log("jin4")
3795
               this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
3799
               this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
3796
               this.$refs.child.watchSign = 0
3800
               this.$refs.child.watchSign = 0
3797
             }
3801
             }
3798
           })
3802
           })
3799
           this.$refs.child.watchSign = 0
3803
           this.$refs.child.watchSign = 0
3800
         }
3804
         }
3805
+      }else if(this.titleType == '透析历史'){
3806
+        
3807
+         this.$refs.childOne.show(this.patientid)
3801
       } else {
3808
       } else {
3809
+      
3802
         this.patientid = val.id
3810
         this.patientid = val.id
3803
         var nowDate = new Date()
3811
         var nowDate = new Date()
3804
         var nowYear = nowDate.getFullYear()
3812
         var nowYear = nowDate.getFullYear()
4457
                     // }
4465
                     // }
4458
                   }
4466
                   }
4459
                 }
4467
                 }
4468
+                console.log("jin5")
4460
                 this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
4469
                 this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
4461
               }
4470
               }
4462
             })
4471
             })
5028
 
5037
 
5029
                   }
5038
                   }
5030
                 }
5039
                 }
5040
+              
5031
                 this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
5041
                 this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis, this.patient_diagnoses)
5032
               }
5042
               }
5033
             })
5043
             })
5146
       }
5156
       }
5147
     },
5157
     },
5148
     currentChange(currentRow, oldCurrentRow) {
5158
     currentChange(currentRow, oldCurrentRow) {
5159
+
5149
       if (oldCurrentRow) {
5160
       if (oldCurrentRow) {
5150
         this.newPatientId = oldCurrentRow.id
5161
         this.newPatientId = oldCurrentRow.id
5151
         this.patientid = oldCurrentRow.id
5162
         this.patientid = oldCurrentRow.id

+ 2 - 2
src/xt_pages/role/admin.vue 查看文件

25
         >医药师登记</el-button>
25
         >医药师登记</el-button>
26
 
26
 
27
 
27
 
28
-        <el-button
28
+        <!-- <el-button
29
           type="primary"
29
           type="primary"
30
           size="small"
30
           size="small"
31
           icon="el-icon-circle-plus-outline"
31
           icon="el-icon-circle-plus-outline"
32
           style="float:left"
32
           style="float:left"
33
-          @click="toJiaBan">首拼</el-button> 
33
+          @click="toJiaBan">首拼</el-button>  -->
34
 
34
 
35
           
35
           
36
 
36
 

+ 167 - 15
src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue 查看文件

387
                 }
387
                 }
388
                }
388
                }
389
              }
389
              }
390
+
391
+
392
+            //  新版
393
+             if(list[i].new_drug_in_flow_info!=null && list[i].new_drug_in_flow_info.length>0){
394
+                for(let j=0;j<list[i].new_drug_in_flow_info.length;j++){
395
+                   if(list[i].max_unit == list[i].new_drug_in_flow_info[j].max_unit){
396
+                        list[i].new_drug_in_flow_info[j].count = list[i].new_drug_in_flow_info[j].count * list[i].min_number
397
+                   }
398
+                }
399
+             }
400
+
401
+             if(list[i].new_drug_cancel_flow_info!=null && list[i].new_drug_cancel_flow_info.length>0){
402
+                for(let j=0;j<list[i].new_drug_cancel_flow_info.length;j++){
403
+                   if(list[i].max_unit == list[i].new_drug_cancel_flow_info[j].max_unit){
404
+                        list[i].new_drug_cancel_flow_info[j].count = list[i].new_drug_cancel_flow_info[j].count * list[i].min_number
405
+                   }
406
+                }
407
+             }
408
+
409
+             if(list[i].new_drug_no_profit_flow_info!=null && list[i].new_drug_no_profit_flow_info.length>0){
410
+                for(let j=0;j<list[i].new_drug_no_profit_flow_info.length;j++){
411
+                   if(list[i].max_unit == list[i].new_drug_no_profit_flow_info[j].max_unit){
412
+                        list[i].new_drug_no_profit_flow_info[j].count = list[i].new_drug_no_profit_flow_info[j].count * list[i].min_number
413
+                   }
414
+                }
415
+             }
416
+
417
+             if(list[i].new_drug_out_flow_info!=null && list[i].new_drug_out_flow_info.length>0){
418
+                for(let j=0;j<list[i].new_drug_out_flow_info.length;j++){
419
+                   if(list[i].max_unit == list[i].new_drug_out_flow_info[j].max_unit){
420
+                        list[i].new_drug_out_flow_info[j].count = list[i].new_drug_out_flow_info[j].count * list[i].min_number
421
+                   }
422
+                }
423
+             }
424
+
425
+             if(list[i].new_drug_profit_flow_info!=null && list[i].new_drug_profit_flow_info.length>0){
426
+                for(let j=0;j<list[i].new_drug_profit_flow_info.length;j++){
427
+                   if(list[i].max_unit == list[i].new_drug_profit_flow_info[j].max_unit){
428
+                        list[i].new_drug_profit_flow_info[j].count = list[i].new_drug_profit_flow_info[j].count * list[i].min_number
429
+                   }
430
+                }
431
+             }
432
+
390
             }
433
             }
391
 
434
 
392
             console.log("list23323223322332232323322323wode",list)
435
             console.log("list23323223322332232323322323wode",list)
394
               list[i].last_price_in = 0
437
               list[i].last_price_in = 0
395
               list[i].drugAddOne= 0
438
               list[i].drugAddOne= 0
396
               list[i].drugOutOne =0
439
               list[i].drugOutOne =0
397
-              list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
398
-            //   list[i].drugIn = this.getDrugWarehouseInfoOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
399
-            //   list[i].drugInMoney = this.getDrugInMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
400
-            //   list[i].drugSaleMoney = this.getSaleMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
440
+              
441
+              // list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
442
+
443
+              list[i].drugIn = this.GetInitStartFlow(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
444
+              list[i].over_count_one = this.GetInitStartFlowOne(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit) 
401
               list[i].drugInMoney = list[i].last_price
445
               list[i].drugInMoney = list[i].last_price
402
               list[i].drugSaleMoney = "/"
446
               list[i].drugSaleMoney = "/"
403
 
447
 
404
               list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
448
               list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
405
               list[i].drugAddOne = this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
449
               list[i].drugAddOne = this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
406
-            //   list[i].drugAddPrice = this.getdrugAddPrice(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
407
-            //   list[i].drugAddSalePrice = this.drugAddSalePrice(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
450
+           
408
               list[i].drugAddPrice = "/"
451
               list[i].drugAddPrice = "/"
409
               list[i].drugAddSalePrice = "/"
452
               list[i].drugAddSalePrice = "/"
410
 
453
 
411
               list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
454
               list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
412
               list[i].drugOutOne =this.getDrugOutOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
455
               list[i].drugOutOne =this.getDrugOutOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
413
-            //   list[i].drugOutPrice = this.getDrugOutPrice(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
414
-            //   list[i].drugOutSalePrice = this.getDrugOutSaleprice(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
456
+           
415
               list[i].drugOutPrice = "/"
457
               list[i].drugOutPrice = "/"
416
               list[i].drugOutSalePrice = "/"
458
               list[i].drugOutSalePrice = "/"
417
 
459
 
418
-            //   list[i].overDrug = this.getDrugWarehouseInfo(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
419
-            //   list[i].overDrugPrice =  this.getDrugInMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
420
-            //   list[i].oveDrugSaleMoney =  this.getSaleMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
460
+         
421
             if(this.org_id == 10265){
461
             if(this.org_id == 10265){
422
               list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
462
               list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
423
             }else{
463
             }else{
424
-              list[i].overDrug = this.GetDrugOver(list[i].DrugStatFlow.over_count,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
464
+              list[i].overDrug = this.GetDrugOver(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
425
             }
465
             }
426
             
466
             
427
              list[i].overDrugPrice = "/"
467
              list[i].overDrugPrice = "/"
1395
       var min_str = ""
1435
       var min_str = ""
1396
       var max_str = ""  
1436
       var max_str = ""  
1397
        total = totalone + totaltwo - totalthree
1437
        total = totalone + totaltwo - totalthree
1398
-       console.log("totoalone---------------",totalone)
1399
-       console.log("totaltwo------------",totaltwo)
1400
-       console.log("totalthree----------",totalthree)
1438
+      //  console.log("totoalone---------------",totalone)
1439
+      //  console.log("totaltwo------------",totaltwo)
1440
+      //  console.log("totalthree----------",totalthree)
1401
         if (total < min_number) {
1441
         if (total < min_number) {
1402
           min_str = total + min_unit;
1442
           min_str = total + min_unit;
1403
         }
1443
         }
1418
       }else{
1458
       }else{
1419
         return max_str + min_str;
1459
         return max_str + min_str;
1420
       }
1460
       }
1461
+    },
1462
+    GetInitStartFlow(val1,val2,val3,val4,val5,min_number,min_unit,max_unit){
1463
+      var total_one =0
1464
+      var total_two = 0
1465
+      var total_three =0
1466
+      var total_four =0
1467
+      var total_five = 0
1468
+      var total =0
1469
+      var min_str = ""
1470
+      var max_str = ""  
1471
+      if(val1!=null && val1.length>0){
1472
+         for(let i=0;i<val1.length;i++){
1473
+           total_one +=val1[i].count
1474
+         }
1475
+      }  
1476
+
1477
+      if(val2!=null && val2.length>0){
1478
+         for(let i=0;i<val2.length;i++){
1479
+          total_two +=val2[i].count
1480
+         }
1481
+      }  
1482
+    
1483
+      console.log("val3",val3)
1484
+      if(val3!=null && val3.length>0){
1485
+         for(let i=0;i<val3.length;i++){
1486
+          total_three +=val3[i].count
1487
+         }
1488
+      }  
1489
+      if(val4!=null && val4.length>0){
1490
+         for(let i=0;i<val4.length;i++){
1491
+          total_four +=val4[i].count
1492
+         }
1493
+      }  
1494
+
1495
+      if(val5!=null && val5.length>0){
1496
+         for(let i=0;i<val5.length;i++){
1497
+          total_five +=val5[i].count
1498
+         }
1499
+      }  
1500
+      console.log("入库",total_one)
1501
+      console.log("盘盈",total_two)
1502
+      console.log("出库",total_three)
1503
+      console.log("盘亏",total_four)
1504
+      console.log("退库",total_five)
1505
+      var total = total_one + total_two -total_three-total_four + total_five
1506
+      if (total < min_number) {
1507
+          min_str = total + min_unit;
1508
+        }
1509
+        if (total == 0) {
1510
+          min_str = "";
1511
+          max_str = "";
1512
+        }
1513
+        if (total >= min_number) {
1514
+          if (parseInt(total / min_number) != 0) {
1515
+            max_str = parseInt(total / min_number) + max_unit;
1516
+          }
1517
+          if (total % min_number != 0) {
1518
+            min_str = (total % min_number) + min_unit;
1519
+          }
1520
+      }
1521
+      if(max_str == "" && min_str == ""){
1522
+        return "0"
1523
+      }else{
1524
+        return max_str + min_str;
1525
+      }
1526
+    },
1527
+    GetInitStartFlowOne(val1,val2,val3,val4,val5,min_number,min_unit,max_unit){
1528
+      var total_one =0
1529
+      var total_two = 0
1530
+      var total_three =0
1531
+      var total_four =0
1532
+      var total_five = 0
1533
+      var total =0
1534
+      var min_str = ""
1535
+      var max_str = ""  
1536
+      if(val1!=null && val1.length>0){
1537
+         for(let i=0;i<val1.length;i++){
1538
+           total_one +=val1[i].count
1539
+         }
1540
+      }  
1541
+
1542
+      if(val2!=null && val2.length>0){
1543
+         for(let i=0;i<val2.length;i++){
1544
+          total_two +=val2[i].count
1545
+         }
1546
+      }  
1547
+    
1548
+      console.log("val3",val3)
1549
+      if(val3!=null && val3.length>0){
1550
+         for(let i=0;i<val3.length;i++){
1551
+          total_three +=val3[i].count
1552
+         }
1553
+      }  
1554
+      if(val4!=null && val4.length>0){
1555
+         for(let i=0;i<val4.length;i++){
1556
+          total_four +=val4[i].count
1557
+         }
1558
+      }  
1559
+
1560
+      if(val5!=null && val5.length>0){
1561
+         for(let i=0;i<val5.length;i++){
1562
+          total_five +=val5[i].count
1563
+         }
1564
+      }  
1565
+      console.log("入库",total_one)
1566
+      console.log("盘盈",total_two)
1567
+      console.log("出库",total_three)
1568
+      console.log("盘亏",total_four)
1569
+      console.log("退库",total_five)
1570
+      var total = total_one + total_two -total_three-total_four + total_five
1571
+      
1572
+      return total
1421
     }
1573
     }
1422
   }
1574
   }
1423
 }
1575
 }

+ 158 - 13
src/xt_pages/stock/drugs/components/purchaseNewDrugQueryPrint.vue 查看文件

295
                 }
295
                 }
296
                }
296
                }
297
              }
297
              }
298
+          
299
+              //  新版
300
+              if(list[i].new_drug_in_flow_info!=null && list[i].new_drug_in_flow_info.length>0){
301
+                for(let j=0;j<list[i].new_drug_in_flow_info.length;j++){
302
+                   if(list[i].max_unit == list[i].new_drug_in_flow_info[j].max_unit){
303
+                        list[i].new_drug_in_flow_info[j].count = list[i].new_drug_in_flow_info[j].count * list[i].min_number
304
+                   }
305
+                }
306
+             }
307
+
308
+             if(list[i].new_drug_cancel_flow_info!=null && list[i].new_drug_cancel_flow_info.length>0){
309
+                for(let j=0;j<list[i].new_drug_cancel_flow_info.length;j++){
310
+                   if(list[i].max_unit == list[i].new_drug_cancel_flow_info[j].max_unit){
311
+                        list[i].new_drug_cancel_flow_info[j].count = list[i].new_drug_cancel_flow_info[j].count * list[i].min_number
312
+                   }
313
+                }
314
+             }
315
+
316
+             if(list[i].new_drug_no_profit_flow_info!=null && list[i].new_drug_no_profit_flow_info.length>0){
317
+                for(let j=0;j<list[i].new_drug_no_profit_flow_info.length;j++){
318
+                   if(list[i].max_unit == list[i].new_drug_no_profit_flow_info[j].max_unit){
319
+                        list[i].new_drug_no_profit_flow_info[j].count = list[i].new_drug_no_profit_flow_info[j].count * list[i].min_number
320
+                   }
321
+                }
322
+             }
323
+
324
+             if(list[i].new_drug_out_flow_info!=null && list[i].new_drug_out_flow_info.length>0){
325
+                for(let j=0;j<list[i].new_drug_out_flow_info.length;j++){
326
+                   if(list[i].max_unit == list[i].new_drug_out_flow_info[j].max_unit){
327
+                        list[i].new_drug_out_flow_info[j].count = list[i].new_drug_out_flow_info[j].count * list[i].min_number
328
+                   }
329
+                }
330
+             }
331
+
332
+             if(list[i].new_drug_profit_flow_info!=null && list[i].new_drug_profit_flow_info.length>0){
333
+                for(let j=0;j<list[i].new_drug_profit_flow_info.length;j++){
334
+                   if(list[i].max_unit == list[i].new_drug_profit_flow_info[j].max_unit){
335
+                        list[i].new_drug_profit_flow_info[j].count = list[i].new_drug_profit_flow_info[j].count * list[i].min_number
336
+                   }
337
+                }
338
+             }
339
+
340
+
298
             }
341
             }
299
 
342
 
300
 
343
 
304
                 list[i].drugAddOne= 0
347
                 list[i].drugAddOne= 0
305
                 list[i].drugOutOne =0
348
                 list[i].drugOutOne =0
306
                
349
                
307
-                list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
308
-                //   list[i].drugIn = this.getDrugWarehouseInfoOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
309
-                //   list[i].drugInMoney = this.getDrugInMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
310
-                //   list[i].drugSaleMoney = this.getSaleMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
350
+               // list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
351
+
352
+               list[i].drugIn = this.GetInitStartFlow(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)
353
+               list[i].over_count_one = this.GetInitStartFlowOne(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit) 
354
+               
311
                 list[i].drugInMoney = "/"
355
                 list[i].drugInMoney = "/"
312
                 list[i].drugSaleMoney = "/"
356
                 list[i].drugSaleMoney = "/"
313
 
357
 
314
                 list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
358
                 list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
315
                 list[i].drugAddOne= this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
359
                 list[i].drugAddOne= this.drugAddInfoOne(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
316
-                //   list[i].drugAddPrice = this.getdrugAddPrice(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
317
-                //   list[i].drugAddSalePrice = this.drugAddSalePrice(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
360
+               
318
                 list[i].drugAddPrice = "/"
361
                 list[i].drugAddPrice = "/"
319
                 list[i].drugAddSalePrice = "/"
362
                 list[i].drugAddSalePrice = "/"
320
 
363
 
321
                 list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
364
                 list[i].drugOut=  this.getDrugOut(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
322
                 list[i].drugOutOne = this.getDrugOutOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
365
                 list[i].drugOutOne = this.getDrugOutOne(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
323
-                //   list[i].drugOutPrice = this.getDrugOutPrice(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
324
-                //   list[i].drugOutSalePrice = this.getDrugOutSaleprice(list[i].DrugWarehouseOutInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryLosses,list[i].WareStartEndStockCancelInfo)
366
+                
325
                 list[i].drugOutPrice = "/"
367
                 list[i].drugOutPrice = "/"
326
                 list[i].drugOutSalePrice = "/"
368
                 list[i].drugOutSalePrice = "/"
327
 
369
 
328
-                //   list[i].overDrug = this.getDrugWarehouseInfo(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
329
-                //   list[i].overDrugPrice =  this.getDrugInMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
330
-                //   list[i].oveDrugSaleMoney =  this.getSaleMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
331
-                if(this.org_id == 0 || this.org_id ==10265){
370
+               
371
+                if(this.org_id ==10265){
332
                   list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
372
                   list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
333
                 }else{
373
                 }else{
334
-                  list[i].overDrug = this.GetDrugOver(list[i].DrugStatFlow.over_count,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
374
+                  list[i].overDrug = this.GetDrugOver(list[i].over_count_one,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
335
                 }
375
                 }
336
                 list[i].overDrugPrice = "/"
376
                 list[i].overDrugPrice = "/"
337
                 list[i].oveDrugSaleMoney = "/"
377
                 list[i].oveDrugSaleMoney = "/"
1256
       }else{
1296
       }else{
1257
         return max_str + min_str;
1297
         return max_str + min_str;
1258
       }
1298
       }
1299
+    },
1300
+
1301
+    GetInitStartFlow(val1,val2,val3,val4,val5,min_number,min_unit,max_unit){
1302
+      var total_one =0
1303
+      var total_two = 0
1304
+      var total_three =0
1305
+      var total_four =0
1306
+      var total_five = 0
1307
+      var total =0
1308
+      var min_str = ""
1309
+      var max_str = ""  
1310
+      if(val1!=null && val1.length>0){
1311
+         for(let i=0;i<val1.length;i++){
1312
+           total_one +=val1[i].count
1313
+         }
1314
+      }  
1315
+
1316
+      if(val2!=null && val2.length>0){
1317
+         for(let i=0;i<val2.length;i++){
1318
+          total_two +=val2[i].count
1319
+         }
1320
+      }  
1321
+    
1322
+      console.log("val3",val3)
1323
+      if(val3!=null && val3.length>0){
1324
+         for(let i=0;i<val3.length;i++){
1325
+          total_three +=val3[i].count
1326
+         }
1327
+      }  
1328
+      if(val4!=null && val4.length>0){
1329
+         for(let i=0;i<val4.length;i++){
1330
+          total_four +=val4[i].count
1331
+         }
1332
+      }  
1333
+
1334
+      if(val5!=null && val5.length>0){
1335
+         for(let i=0;i<val5.length;i++){
1336
+          total_five +=val5[i].count
1337
+         }
1338
+      }  
1339
+    
1340
+      var total = total_one + total_two -total_three-total_four + total_five
1341
+      if (total < min_number) {
1342
+          min_str = total + min_unit;
1343
+        }
1344
+        if (total == 0) {
1345
+          min_str = "";
1346
+          max_str = "";
1347
+        }
1348
+        if (total >= min_number) {
1349
+          if (parseInt(total / min_number) != 0) {
1350
+            max_str = parseInt(total / min_number) + max_unit;
1351
+          }
1352
+          if (total % min_number != 0) {
1353
+            min_str = (total % min_number) + min_unit;
1354
+          }
1355
+      }
1356
+      if(max_str == "" && min_str == ""){
1357
+        return "0"
1358
+      }else{
1359
+        return max_str + min_str;
1360
+      }
1361
+    },
1362
+    GetInitStartFlowOne(val1,val2,val3,val4,val5,min_number,min_unit,max_unit){
1363
+      var total_one =0
1364
+      var total_two = 0
1365
+      var total_three =0
1366
+      var total_four =0
1367
+      var total_five = 0
1368
+      var total =0
1369
+      var min_str = ""
1370
+      var max_str = ""  
1371
+      if(val1!=null && val1.length>0){
1372
+         for(let i=0;i<val1.length;i++){
1373
+           total_one +=val1[i].count
1374
+         }
1375
+      }  
1376
+
1377
+      if(val2!=null && val2.length>0){
1378
+         for(let i=0;i<val2.length;i++){
1379
+          total_two +=val2[i].count
1380
+         }
1381
+      }  
1382
+    
1383
+      console.log("val3",val3)
1384
+      if(val3!=null && val3.length>0){
1385
+         for(let i=0;i<val3.length;i++){
1386
+          total_three +=val3[i].count
1387
+         }
1388
+      }  
1389
+      if(val4!=null && val4.length>0){
1390
+         for(let i=0;i<val4.length;i++){
1391
+          total_four +=val4[i].count
1392
+         }
1393
+      }  
1394
+
1395
+      if(val5!=null && val5.length>0){
1396
+         for(let i=0;i<val5.length;i++){
1397
+          total_five +=val5[i].count
1398
+         }
1399
+      }  
1400
+     
1401
+      var total = total_one + total_two -total_three-total_four + total_five
1402
+      
1403
+      return total
1259
     }
1404
     }
1260
    },
1405
    },
1261
     created(){
1406
     created(){

+ 25 - 5
src/xt_pages/stock/query/purchaseNewStockQuery.vue 查看文件

265
             this.loading = false
265
             this.loading = false
266
             for(let i=0;i<list.length;i++){
266
             for(let i=0;i<list.length;i++){
267
                
267
                
268
-             
269
-              list[i].stockIn = list[i].GoodStartFlowInfo.over_count
270
-
271
-              //list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty)
268
+              if(this.org_id == 10265 || this.org_id == 0){
269
+                list[i].stockIn = list[i].GoodStartFlowInfo.over_count
270
+              }else{
271
+                list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
272
+              }
273
+              //  list[i].stockIn = list[i].GoodStartFlowInfo.over_count
272
                list[i].stock_in_price = "/"
274
                list[i].stock_in_price = "/"
273
                list[i].stockMoney = "/"
275
                list[i].stockMoney = "/"
274
               
276
               
1015
           this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
1017
           this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
1016
           this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
1018
           this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
1017
           this.tableList[i].specification_name_one = this.tableList[i].specification_name + "/"+this.tableList[i].packing_unit
1019
           this.tableList[i].specification_name_one = this.tableList[i].specification_name + "/"+this.tableList[i].packing_unit
1018
-          // this.tableList[i].stock_in_price = this.tableList[i].buy_price
1020
+         
1019
         }
1021
         }
1020
         import('@/vendor/Export2Excel').then(excel => {
1022
         import('@/vendor/Export2Excel').then(excel => {
1021
            const multiHeader = [['序号', '查询日期',' 耗材类型','耗材名称','规格&单位','生产产商','经销商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
1023
            const multiHeader = [['序号', '查询日期',' 耗材类型','耗材名称','规格&单位','生产产商','经销商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
1106
          }
1108
          }
1107
        }
1109
        }
1108
        return count
1110
        return count
1111
+    },
1112
+    getAllStockInFlow(val){
1113
+      var count = 0
1114
+      if(val!=null && val.length>0){
1115
+        for(let i=0;i<val.length;i++){
1116
+            count+= val[i].count
1117
+        }
1118
+      }
1119
+      return count
1120
+    },
1121
+    getAllStockOutFlow(val){
1122
+      var count = 0
1123
+      if(val!=null && val.length>0){
1124
+        for(let i=0;i<val.length;i++){
1125
+            count+= val[i].count
1126
+        }
1127
+      }
1128
+      return count
1109
     } 
1129
     } 
1110
   },
1130
   },
1111
 
1131
 

+ 48 - 11
src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue 查看文件

167
                 var list = response.data.data.list
167
                 var list = response.data.data.list
168
                 this.loading = false
168
                 this.loading = false
169
                 for(let i=0;i<list.length;i++){
169
                 for(let i=0;i<list.length;i++){
170
-                    list[i].stockIn = list[i].GoodStartFlowInfo.over_count
170
+                    // list[i].stockIn = list[i].GoodStartFlowInfo.over_count
171
+
172
+                    if(this.org_id == 10265 || this.org_id == 0){
173
+                       list[i].stockIn = list[i].GoodStartFlowInfo.over_count
174
+                    }else{
175
+                       list[i].stockIn = this.getAllStockIn(list[i].StWarehousingInfoTwo) + this.getAllStockInFlow(list[i].WareStartInStockFlow) - this.getAllOutStockIn(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlow(list[i].WareStartOutStockFlow)
176
+                    }
171
                     list[i].stock_in_price = "/"
177
                     list[i].stock_in_price = "/"
172
                     list[i].stockMoney = "/"
178
                     list[i].stockMoney = "/"
173
-                    // list[i].stockIn = this.getWarehouseInfoStart(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo) //期初结余
174
-                    // list[i].stock_in_price = this.getWarehouseInfoStartPrice(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo)
175
-                    // list[i].stockMoney = this.getWarehouseInfoStartMoney(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo)
179
+                   
176
                     
180
                     
177
                     list[i].stockAdd = this.getWarehouseInfoOne(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)//期间增加
181
                     list[i].stockAdd = this.getWarehouseInfoOne(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)//期间增加
178
-                    // list[i].addStockMoney = this.getAddStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
179
-                    // list[i].saleStockMoney = this.getSaleStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
182
+                   
180
                     list[i].addStockMoney = "/"
183
                     list[i].addStockMoney = "/"
181
                     list[i].saleStockMoney = "/"
184
                     list[i].saleStockMoney = "/"
182
 
185
 
183
                     list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
186
                     list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
184
-                    // list[i].stockOutprice = this.stockOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
185
-                    // list[i].saleOutMoney = this.getSaleStockMony(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
187
+                   
186
                     list[i].stockOutprice = "/"
188
                     list[i].stockOutprice = "/"
187
                     list[i].saleOutprice = "/"
189
                     list[i].saleOutprice = "/"
188
-                    // list[i].overStock= this.getEndWarehouseInfo(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
189
-                    // list[i].overPrice= this.getEndOverPrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
190
-                    // list[i].overMoney = this.getEndSalePrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
190
+                  
191
                     if(this.org_id ==0 || this.org_id ==10265){
191
                     if(this.org_id ==0 || this.org_id ==10265){
192
                       list[i].overStock = list[i].GoodEndFlowInfo.over_count
192
                       list[i].overStock = list[i].GoodEndFlowInfo.over_count
193
                     }else{
193
                     }else{
724
      }
724
      }
725
    },
725
    },
726
 
726
 
727
+   getAllStockIn(val){
728
+       var count = 0
729
+      if(val!=null && val.length>0){
730
+        for(let i=0;i<val.length;i++){
731
+            count+= val[i].warehousing_count
732
+        }
733
+      }
734
+      return count
735
+    },
736
+    getAllOutStockIn(val){
737
+       var count = 0 
738
+       if(val!=null && val.length>0){
739
+         for(let i=0;i<val.length;i++){
740
+           count +=val[i].count
741
+         }
742
+       }
743
+       return count
744
+    },
745
+    getAllStockInFlow(val){
746
+      var count = 0
747
+      if(val!=null && val.length>0){
748
+        for(let i=0;i<val.length;i++){
749
+            count+= val[i].count
750
+        }
751
+      }
752
+      return count
753
+    },
754
+    getAllStockOutFlow(val){
755
+      var count = 0
756
+      if(val!=null && val.length>0){
757
+        for(let i=0;i<val.length;i++){
758
+            count+= val[i].count
759
+        }
760
+      }
761
+      return count
762
+    } 
763
+
727
    },
764
    },
728
     created(){
765
     created(){
729
       this.org_id =  this.$store.getters.xt_user.org_id
766
       this.org_id =  this.$store.getters.xt_user.org_id

+ 109 - 0
src/xt_pages/workforce/remind_print_setting_one.vue 查看文件

80
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
80
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
81
                     {{main_collection.dialysissolution.anticoagulant_shouji}}iu
81
                     {{main_collection.dialysissolution.anticoagulant_shouji}}iu
82
                    </span>
82
                    </span>
83
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 12">
84
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
85
+                   </span>
86
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 13">
87
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
88
+                   </span>
89
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 14">
90
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
91
+                   </span>
92
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 15">
93
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
94
+                   </span>
95
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 16">
96
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
97
+                   </span>
98
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 17">
99
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
100
+                   </span>
83
                  
101
                  
84
                 </div>
102
                 </div>
85
                 <div class="printCell" v-if="org_id ==9671">
103
                 <div class="printCell" v-if="org_id ==9671">
114
                   <span v-if="main_collection.prescription.anticoagulant == 11">
132
                   <span v-if="main_collection.prescription.anticoagulant == 11">
115
                     {{main_collection.prescription.anticoagulant_shouji}}iu
133
                     {{main_collection.prescription.anticoagulant_shouji}}iu
116
                    </span>
134
                    </span>
135
+                  
136
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 12">
137
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
138
+                   </span>
139
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 13">
140
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
141
+                   </span>
142
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 14">
143
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
144
+                   </span>
145
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 15">
146
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
147
+                   </span>
148
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 16">
149
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
150
+                   </span>
151
+                   <span v-if="main_collection.prescription.anticoagulant == 17">
152
+                    {{main_collection.prescription.anticoagulant_shouji}}iu
153
+                   </span>
117
                  
154
                  
118
                 </div>
155
                 </div>
119
                 <div class="printCell" v-if="org_id!=9671">
156
                 <div class="printCell" v-if="org_id!=9671">
151
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
188
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
152
                     iu/h
189
                     iu/h
153
                    </span>
190
                    </span>
191
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 12">
192
+                    iu/h
193
+                   </span>
194
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 13">
195
+                    iu/h
196
+                   </span>
197
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 14">
198
+                    iu/h
199
+                   </span>
200
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 15">
201
+                    iu/h
202
+                   </span>
203
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 16">
204
+                    iu/h
205
+                   </span>
206
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 17">
207
+                    iu/h
208
+                   </span>
154
               
209
               
155
                 </div>
210
                 </div>
156
 
211
 
189
                   <span v-if="main_collection.prescription.anticoagulant == 11">
244
                   <span v-if="main_collection.prescription.anticoagulant == 11">
190
                     iu/h
245
                     iu/h
191
                    </span>
246
                    </span>
247
+                   <span v-if="main_collection.prescription.anticoagulant == 12">
248
+                    iu/h
249
+                   </span>
250
+                   <span v-if="main_collection.prescription.anticoagulant == 13">
251
+                    iu/h
252
+                   </span>
253
+                   <span v-if="main_collection.prescription.anticoagulant == 14">
254
+                    iu/h
255
+                   </span>
256
+                   <span v-if="main_collection.prescription.anticoagulant == 15">
257
+                    iu/h
258
+                   </span>
259
+                   <span v-if="main_collection.prescription.anticoagulant == 16">
260
+                    iu/h
261
+                   </span>
262
+                   <span v-if="main_collection.prescription.anticoagulant == 17">
263
+                    iu/h
264
+                   </span>
192
               
265
               
193
                 </div>
266
                 </div>
194
                
267
                
227
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
300
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
228
                    iu
301
                    iu
229
                    </span>
302
                    </span>
303
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 12">
304
+                   iu
305
+                   </span>
306
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 13">
307
+                   iu
308
+                   </span>
309
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 14">
310
+                   iu
311
+                   </span>
312
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 15">
313
+                   iu
314
+                   </span>
315
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 16">
316
+                   iu
317
+                   </span>
318
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 17">
319
+                   iu
320
+                   </span>
230
           
321
           
231
                 </div>
322
                 </div>
232
 
323
 
265
                   <span v-if="main_collection.prescription.anticoagulant == 11">
356
                   <span v-if="main_collection.prescription.anticoagulant == 11">
266
                    iu
357
                    iu
267
                    </span>
358
                    </span>
359
+                   <span v-if="main_collection.prescription.anticoagulant == 12">
360
+                   iu
361
+                   </span>
362
+                   <span v-if="main_collection.prescription.anticoagulant == 13">
363
+                   iu
364
+                   </span>
365
+                   <span v-if="main_collection.prescription.anticoagulant == 14">
366
+                   iu
367
+                   </span>
368
+                   <span v-if="main_collection.prescription.anticoagulant == 15">
369
+                   iu
370
+                   </span>
371
+                   <span v-if="main_collection.prescription.anticoagulant == 16">
372
+                   iu
373
+                   </span>
374
+                   <span v-if="main_collection.prescription.anticoagulant == 17">
375
+                   iu
376
+                   </span>
268
           
377
           
269
                 </div>
378
                 </div>
270
                 <div class="printCell" v-if="org_id==9671 || org_id==9675 || org_id==10340">
379
                 <div class="printCell" v-if="org_id==9671 || org_id==9675 || org_id==10340">