提交代码

src/xt_pages/outpatientCharges/summary.vue

@@ -1334,7 +1334,7 @@ export default {
                 name: order.patient.name,
                 id_card_no: order.patient.id_card_no,
                 year: "2023",
-                month: "09",
+                month: order.setl_time.split(" ")[0].split("-")[1],
                 code: data[b].code,
                 pric: data[b].total ,
                 item_name: data[b].name,

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2641,6 +2641,9 @@ export default {
 
                       }
                     }
+
+
+
                     console.log("newArr",newArr )
                   }
                 }
@@ -2994,6 +2997,8 @@ export default {
 
       if(this.org_id != 10206 && this.org_id != 0) {
         obj.med_type = 14
+      }else{
+        obj.med_type = 12
       }
 
       this.prescriptions.push(obj)
@@ -3251,11 +3256,32 @@ export default {
         return
        }
       }
+
+      if(this.org_id == 10206){
+        if (row.zuobiao_stock_num <= 0) {
+          if (selection) {
+            selection.forEach(row => {
+              if (row.zuobiao_stock_num <= 0) {
+                this.$refs.multipleTable.toggleRowSelection(row)
+              }
+            })
+          } else {
+            this.$refs.multipleTable.clearSelection()
+          }
+          this.$message.error(row.drug_name + '库存不足')
+          return
+        }
+      }
+
+
+
+
       this.curDrugs = selection
     },
 
     comfirm() {
 
+
       if (this.curDrugs.length > 0) {
         for (let i = 0; i < this.curDrugs.length; i++) {
           if(this.org_id != 10206 && this.org_id != 0) {
@@ -3560,6 +3586,22 @@ export default {
             return
         }
        }
+
+      if ( this.org_id == 10206) {
+        if (row.type == 3) {
+          if (selection) {
+            selection.forEach(row => {
+              if (row.zuobiao_stock_num <= 0) {
+                this.$refs.tables.toggleRowSelection(row)
+              }
+            })
+          } else {
+            this.$refs.tables.clearSelection()
+          }
+          this.$message.error(row.project_name + '库存不足')
+          return
+        }
+      }
       this.teamList = selection
     },
     getlist() {
@@ -3729,12 +3771,20 @@ export default {
                 }
 
                 teamList.push(obj)
-              } else if (project[i].type == 3 && project[i].status == 1 && this.org_id != 10206 && this.org_id != 0) {
-                if (project[i].good_info.sum_count <= 0) {
+              } else if (project[i].type == 3 && project[i].status == 1 ) {
+
+                if (project[i].good_info.sum_count <= 0 && this.org_id != 10206) {
                   num++
                   this.$refs.tabProjectTeam.toggleRowSelection(row)
                   this.$message.error(project[i].good_info.good_name + '库存不足')
                 }
+
+                if (project[i].good_info.zuobiao_stock_num <= 0 && this.org_id == 10206) {
+                  num++
+                  this.$refs.tabProjectTeam.toggleRowSelection(row)
+                  this.$message.error(project[i].good_info.good_name + '库存不足')
+                }
+
                 if (num > 0) {
                   this.$refs.tabProjectTeam.clearSelection()
                 }

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -468,36 +468,38 @@
         //   this.$message.error('该处方已经结算或记账，无法删除')
         //
         // }
-        if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
-          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-            console.log(1)
-            scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
-          } else {
-            console.log(12)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number)
-          }
-        } else {
-          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-            console.log(123)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose)
+        if(this.$store.getters.xt_user.org_id != 10206) {
+          if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
+            if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+              console.log(1)
+              scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
+            } else {
+              console.log(12)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number)
+            }
           } else {
-            console.log(1234)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
+            if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+              console.log(123)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose)
+            } else {
+              console.log(1234)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
+            }
           }
-        }
-        if (scope.row.prescribing_number == 0) {
-          scope.row.prescribing_number = 1
-        }
-        if (scope.row.prescribing_number_unit == scope.row.drug.min_unit && this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0) {
-          // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
-          if (scope.row.prescribing_number > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+          if (scope.row.prescribing_number == 0) {
+            scope.row.prescribing_number = 1
           }
-        } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit && this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0) {
+            // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
+            if (scope.row.prescribing_number > scope.row.drug.sum_count) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
+          } else {
+            if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
+            // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
           }
-          // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
         }
 
       },
@@ -506,42 +508,44 @@
           this.$message.error('该处方包含已发药的药品，无法修改')
           return
         }
-        if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
-          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-            console.log(1)
-            scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
+        if(this.$store.getters.xt_user.org_id != 10206) {
+          if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
+            if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+              console.log(1)
+              scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
+            } else {
+              console.log(12)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number)
+            }
           } else {
-            console.log(12)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number)
+            if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+              console.log(123)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose)
+            } else {
+              console.log(1234)
+              scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
+            }
+          }
+          if (scope.row.prescribing_number == 0) {
+            scope.row.prescribing_number = 1
           }
-        } else {
           if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-            console.log(123)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose)
+            // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
+            if (scope.row.drug.is_user != 1) {
+              if (scope.row.prescribing_number > scope.row.drug.sum_count && this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0) {
+                this.$message.error(scope.row.drug_name + '库存不足')
+              }
+            }
+
           } else {
-            console.log(1234)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
-          }
-        }
-        if (scope.row.prescribing_number == 0) {
-          scope.row.prescribing_number = 1
-        }
-        if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-          // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
-          if(scope.row.drug.is_user!=1){
-           if (scope.row.prescribing_number > scope.row.drug.sum_count  && this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0) {
-            this.$message.error(scope.row.drug_name + '库存不足')
-           }
-          }
+            if (scope.row.drug.is_user != 1) {
+              if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count && this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0) {
+                this.$message.error(scope.row.drug_name + '库存不足')
+              }
+            }
 
-        } else {
-          if(scope.row.drug.is_user!=1){
-           if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count  && this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0) {
-            this.$message.error(scope.row.drug_name + '库存不足')
-           }
+            // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
           }
-
-          // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
         }
 
       },
@@ -633,22 +637,23 @@
         //     this.$message.error(scope.row.drug_name + '库存不足')
         //    }
         // }
+        if(this.$store.getters.xt_user.org_id != 10206) {
 
-
-        if (scope.row.prescribing_number_unit == scope.row.drug.min_unit  && this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0) {
-          if(scope.row.drug.is_user!=1){
-            if (parseInt(scope.row.prescribing_number) > scope.row.drug.sum_count) {
-              this.$message.error(scope.row.drug_name + '库存不足')
+          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit && this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0) {
+            if (scope.row.drug.is_user != 1) {
+              if (parseInt(scope.row.prescribing_number) > scope.row.drug.sum_count) {
+                this.$message.error(scope.row.drug_name + '库存不足')
+              }
             }
-          }
 
-        } else {
-          if(scope.row.drug.is_user!=1  && this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0){
-            if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
-              this.$message.error(scope.row.drug_name + '库存不足')
+          } else {
+            if (scope.row.drug.is_user != 1 && this.$store.getters.xt_user.org_id != 10206 && this.$store.getters.xt_user.org_id != 0) {
+              if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
+                this.$message.error(scope.row.drug_name + '库存不足')
+              }
             }
-          }
 
+          }
         }
       },
       getProjectSingleDose(scope) {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1498,7 +1498,7 @@ export default {
           this.additions = response.data.data.additions
 
           //针对普爱医院获取药品和耗材相关库存数据
-          if(this.org_id == 10206 || this.org_id == 0){
+          if(this.org_id == 10206){
             var that = this
             axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystock', {
 
@@ -2052,7 +2052,7 @@ export default {
                   med_type: '',
                   is_medicine_status:false,
                 }
-                if(this.org_id != 10206 || this.org_id != 0) {
+                if(this.org_id != 10206) {
                   if (prescription.med_type == 0 || prescription.med_type == '') {
 
                     obj.med_type = ''
@@ -2062,7 +2062,7 @@ export default {
                     obj.med_type = parseInt(prescription.med_type)
                   }
                   if (obj.med_type == 0 || obj.med_type == '') {
-                    if (this.org_id != 10206 || this.org_id != 0) {
+                    if (this.org_id != 10206 ) {
                       obj.med_type = 14
                     } else {
 
@@ -2085,7 +2085,7 @@ export default {
                 med_type: '',
                 is_medicine_status:false,
               }
-              if(this.org_id != 10206 || this.org_id != 0){
+              if(this.org_id != 10206 ){
                 obj.med_type = 14
               }
               this.prescriptions.push(obj)
@@ -2544,7 +2544,7 @@ export default {
                         med_type: ''
 
                       }
-                      if(this.org_id != 10206 || this.org_id != 0) {
+                      if(this.org_id != 10206) {
                         if (prescription.med_type == 0 || prescription.med_type == '') {
 
                           obj.med_type = ''
@@ -2575,7 +2575,7 @@ export default {
 
                     }
 
-                    if (this.org_id != 10206 || this.org_id != 0) {
+                    if (this.org_id != 10206 ) {
                       obj.med_type = 14
                     }
 
@@ -3077,7 +3077,7 @@ export default {
                         med_type: ''
 
                       }
-                      if(this.org_id != 10206 || this.org_id != 0) {
+                      if(this.org_id != 10206 ) {
                         if (prescription.med_type == 0 || prescription.med_type == '') {
 
                           obj.med_type = ''
@@ -3105,7 +3105,7 @@ export default {
                       med_type: ''
 
                     }
-                    if(this.org_id != 10206 || this.org_id != 0) {
+                    if(this.org_id != 10206 ) {
                       obj.med_type = 14
                     }
 
@@ -3596,7 +3596,7 @@ export default {
                       med_type: ''
 
                     }
-                    if(this.org_id != 10206 || this.org_id != 0) {
+                    if(this.org_id != 10206 ) {
                       if (prescription.med_type == 0 || prescription.med_type == '') {
 
                         obj.med_type = ''
@@ -3626,7 +3626,7 @@ export default {
 
                   }
 
-                  if(this.org_id != 10206 || this.org_id != 0) {
+                  if(this.org_id != 10206 ) {
                     obj.med_type = 14
                   }
 
@@ -4235,7 +4235,7 @@ export default {
                         med_type: ''
 
                       }
-                      if(this.org_id != 10206 || this.org_id != 0) {
+                      if(this.org_id != 10206 ) {
                         if (prescription.med_type == 0 || prescription.med_type == '') {
 
                           obj.med_type = ''
@@ -4265,7 +4265,7 @@ export default {
                       med_type: ''
 
                     }
-                    if(this.org_id != 10206 || this.org_id != 0 ) {
+                    if(this.org_id != 10206  ) {
                       obj.med_type = 14
                     }
 
@@ -4892,7 +4892,7 @@ export default {
                         med_type: ''
 
                       }
-                      if(this.org_id != 10206 || this.org_id != 0) {
+                      if(this.org_id != 10206 ) {
                         if (prescription.med_type == 0 || prescription.med_type == '') {
 
                           obj.med_type = ''
@@ -4921,7 +4921,7 @@ export default {
                       med_type: ''
 
                     }
-                    if(this.org_id != 10206 || this.org_id != 0) {
+                    if(this.org_id != 10206 ) {
 
                       obj.med_type = 14
                     }