28169 1 yıl önce
ebeveyn
işleme
b9dae075e6

+ 3 - 2
src/xt_pages/Pharmacy/PatientDispensing.vue Dosyayı Görüntüle

@@ -142,6 +142,7 @@
142 142
               </el-option>
143 143
             </el-select>
144 144
           </div>
145
+          
145 146
 
146 147
           <div>
147 148
             <el-button type="primary" @click="toExport" v-if="state == 2"
@@ -533,7 +534,7 @@ export default {
533 534
         if (res.data.state == 1) {
534 535
            var list = res.data.data.list;
535 536
            console.log("hhhhawoowowow",list)
536
-          if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 || this.$store.getters.xt_user.org.id == 10387 ){
537
+          if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 || this.$store.getters.xt_user.org.id == 10387 ||  this.$store.getters.xt_user.org.id == 0  ||  this.$store.getters.xt_user.org.id == 10480  ){
537 538
             this.tableData = []
538 539
             if(list!=null && list.length >0){
539 540
               for(let i=0;i<list.length;i++){
@@ -544,7 +545,7 @@ export default {
544 545
             }
545 546
 
546 547
           }
547
-          if(this.$store.getters.xt_user.org.id != 10188 && this.$store.getters.xt_user.org.id != 10217 && this.$store.getters.xt_user.org.id != 10387){
548
+          if(this.$store.getters.xt_user.org.id != 10188 && this.$store.getters.xt_user.org.id != 10217 && this.$store.getters.xt_user.org.id != 10387 && this.$store.getters.xt_user.org.id != 0 && this.$store.getters.xt_user.org.id != 10480 ){
548 549
             this.tableData = []
549 550
             this.tableData = list
550 551
           }

+ 16 - 3
src/xt_pages/data/components/addDrugs.vue Dosyayı Görüntüle

@@ -488,6 +488,16 @@
488 488
                             </el-option>
489 489
                         </el-select>
490 490
                     </el-form-item>
491
+                    <el-form-item label="是否项目:" prop="is_pharmacy">
492
+                        <el-select v-model="form.is_project" style="width:160px;" placeholder="请选择">
493
+                            <el-option
494
+                                    v-for="item in projectList"
495
+                                    :key="item.id"
496
+                                    :label="item.name"
497
+                                    :value="item.id">
498
+                            </el-option>
499
+                        </el-select>
500
+                    </el-form-item>
491 501
                     <el-form-item label="" style="visibility: hidden;">
492 502
                         <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
493 503
                     </el-form-item>
@@ -632,6 +642,7 @@
632 642
           is_pharmacy:1,//是否通过药房发药
633 643
           bbx01:"",
634 644
           bby01:"",
645
+          is_project:"",
635 646
         },
636 647
 
637 648
         rules: {
@@ -645,10 +656,10 @@
645 656
           unval:[{required:true,message:"请填写拆零",trigger:'change'}],
646 657
           min_number:[{required:true,message:"请填写拆零",trigger:'change'}],
647 658
           packing_unit: [{ required: true, message: '请填写包装单位', trigger: 'change' }],
648
-          drug_type: [{ required: true, message: '请填写药品类型', trigger: 'blur' }],
659
+          // drug_type: [{ required: true, message: '请填写药品类型', trigger: 'blur' }],
649 660
           drug_stock_limit: [{ required: true, message: '请填写库存警戒', trigger: 'blur' }],
650 661
           // drug_origin_place: [{ required: true, message: '请填写产地', trigger: 'blur' }],
651
-          drug_dosage_form: [{ required: true, message: '请填写药品剂型', trigger: 'blur' }],
662
+          // drug_dosage_form: [{ required: true, message: '请填写药品剂型', trigger: 'blur' }],
652 663
           medical_insurance_level: [{ required: true, message: '请选择医保等级', trigger: 'change' }],
653 664
 
654 665
           unit_matrixing: [{ required: true, message: '请填写单位换算', trigger: 'blur' }],
@@ -657,7 +668,7 @@
657 668
           packing_price:[{required:true,message:'请填写包装零售价',trigger:'blur'}],
658 669
           drug_classify: [{ required: true, message: '请选择药物分类', trigger: 'change' }],
659 670
           drug_dose: [{ required: true, message: '请填写剂量', trigger: 'blur' }],
660
-          manufacturer: [{ required: true, message: '请选择生产产商', trigger: 'change' }],
671
+          // manufacturer: [{ required: true, message: '请选择生产产商', trigger: 'change' }],
661 672
           dealer: [{ required: true, message: '请选择经销商', trigger: 'change' }],
662 673
           prescription_mark: [{ required: true, message: '请选择处方药标志' }],
663 674
           social_security_directory_code: [{ required: true, message: '请填写社保目录编码' }],
@@ -690,6 +701,7 @@
690 701
           id: "2",
691 702
           name: "否"
692 703
         }],
704
+        projectList:[{id:"1",name:"是"},{id:"2",name:"否"}]
693 705
       }
694 706
     },
695 707
     props: {
@@ -961,6 +973,7 @@
961 973
         form['is_pharmacy'] = this.form.is_pharmacy
962 974
         form['bbx01'] = this.form.bbx01
963 975
         form['bby01'] = this.form.bby01
976
+        form['is_project'] = this.form.is_project
964 977
 
965 978
         return form
966 979
       },

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

@@ -725,7 +725,12 @@
725 725
               if(this.formValue.drug_classify == 0){
726 726
                  this.formValue.drug_classify = ""
727 727
               }
728
-
728
+           
729
+              if(this.formValue.is_project<=0){
730
+                  this.formValue.is_project = ''
731
+              }else{
732
+                this.formValue.is_project = this.formValue.is_project.toString()
733
+              }
729 734
 
730 735
 
731 736
               this.$refs.addDrugs.show(id, this.formValue)

+ 2 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Dosyayı Görüntüle

@@ -82,7 +82,7 @@
82 82
           <div class="inline_block">
83 83
             病区:
84 84
             <div class="under_line" style="width: 50px; text-align: center">
85
-              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447 || org_id == 0 || org_id ==10460">{{
85
+              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447 || org_id == 0 || org_id ==10460 || org_id ==10567">{{
86 86
                 patientInfo.DialysisSchedule.device_zone.name
87 87
                   ? patientInfo.DialysisSchedule.device_zone.name
88 88
                   : ""
@@ -93,7 +93,7 @@
93 93
           <div class="inline_block" v-if="org_id!=10460">
94 94
             床号:
95 95
             <div class="under_line" style="width: 50px; text-align: center">
96
-              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460 || org_id ==10515">{{
96
+              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460 || org_id ==10515 || org_id == 10567">{{
97 97
                 dialysisOrder &&
98 98
                 dialysisOrder.DeviceNumber &&
99 99
                 dialysisOrder.DeviceNumber.number.length > 0

+ 5 - 2
src/xt_pages/hospitalStation/components/deskPrescription.vue Dosyayı Görüntüle

@@ -3088,8 +3088,11 @@ export default {
3088 3088
           } else {
3089 3089
             this.$refs.multipleTable.clearSelection()
3090 3090
           }
3091
-          this.$message.error(row.drug_name + '库存不足')
3092
-          return
3091
+          if (row.is_project == 0 || row.is_project == 2){
3092
+            this.$message.error(row.drug_name + '库存不足')
3093
+            return 
3094
+          }
3095
+        
3093 3096
        }
3094 3097
       }
3095 3098
 

+ 6 - 2
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Dosyayı Görüntüle

@@ -3233,6 +3233,7 @@ export default {
3233 3233
       this.$refs.additionalCharges.show()
3234 3234
     },
3235 3235
     selectDrugs(selection, row) {
3236
+    
3236 3237
       // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
3237 3238
       //     if (row.count <= 0) {
3238 3239
       //       if (selection) {
@@ -3274,8 +3275,10 @@ export default {
3274 3275
         } else {
3275 3276
           this.$refs.multipleTable.clearSelection()
3276 3277
         }
3277
-        this.$message.error(row.drug_name + '库存不足')
3278
-        return
3278
+        if (row.is_project == 0 || row.is_project == 2){
3279
+          this.$message.error(row.drug_name + '库存不足')
3280
+          return 
3281
+        }
3279 3282
        }
3280 3283
       }
3281 3284
 
@@ -3555,6 +3558,7 @@ export default {
3555 3558
       this.teamList = row
3556 3559
     },
3557 3560
     selectChange(selection, row) {
3561
+    
3558 3562
       // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
3559 3563
       //    if (row.stock_count <= 0) {
3560 3564
       //     if (row.type == 3) {

+ 3 - 3
src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue Dosyayı Görüntüle

@@ -45,7 +45,7 @@
45 45
         :editable="false"
46 46
         style="width: 150px;"
47 47
         type="date"
48
-        :picker-options="pickerOptions"
48
+       
49 49
         placeholder="选择日期时间"
50 50
         align="right"
51 51
         format="yyyy-MM-dd"
@@ -57,7 +57,7 @@
57 57
         prefix-icon="el-icon-date"
58 58
         @change="changeEndTime"
59 59
         :editable="false"
60
-        :picker-options="pickerOptions"
60
+        
61 61
         style="width: 150px;"
62 62
         type="date"
63 63
         placeholder="选择日期时间"
@@ -149,7 +149,7 @@
149 149
 
150 150
         pickerOptions: {
151 151
           disabledDate(time) {
152
-            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).getTime() - 24 * 3600 * 1000
152
+            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 2)).getTime() - 24 * 3600 * 1000
153 153
             return time.getTime() > Date.now() || time.getTime() < threeMonths
154 154
 
155 155
           }

+ 3 - 3
src/xt_pages/qcd/indicatorControlAnalysis/components/personal.vue Dosyayı Görüntüle

@@ -65,7 +65,7 @@
65 65
         :editable="false"
66 66
         style="width: 150px;"
67 67
         type="date"
68
-        :picker-options="pickerOptions"
68
+       
69 69
         placeholder="选择日期时间"
70 70
         align="right"
71 71
         format="yyyy-MM-dd"
@@ -77,7 +77,7 @@
77 77
         prefix-icon="el-icon-date"
78 78
         @change="changeEndTime"
79 79
         :editable="false"
80
-        :picker-options="pickerOptions"
80
+      
81 81
         style="width: 150px;"
82 82
         type="date"
83 83
         placeholder="选择日期时间"
@@ -147,7 +147,7 @@
147 147
 
148 148
         pickerOptions: {
149 149
           disabledDate(time) {
150
-            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).getTime() - 24 * 3600 * 1000
150
+            let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 2)).getTime() - 24 * 3600 * 1000
151 151
             return time.getTime() > Date.now() || time.getTime() < threeMonths
152 152
 
153 153
           }