Ver código fonte

提交代码

陈少旭 1 ano atrás
pai
commit
d107cdef3f

+ 37 - 35
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Ver arquivo

@@ -3306,21 +3306,21 @@ export default {
3306 3306
        }
3307 3307
       }
3308 3308
 
3309
-      // if(this.org_id == 10206){
3310
-      //   if (row.zuobiao_stock_num <= 0) {
3311
-      //     if (selection) {
3312
-      //       selection.forEach(row => {
3313
-      //         if (row.zuobiao_stock_num <= 0) {
3314
-      //           this.$refs.multipleTable.toggleRowSelection(row)
3315
-      //         }
3316
-      //       })
3317
-      //     } else {
3318
-      //       this.$refs.multipleTable.clearSelection()
3319
-      //     }
3320
-      //     this.$message.error(row.drug_name + '库存不足')
3321
-      //     return
3322
-      //   }
3323
-      // }
3309
+      if(this.org_id == 10206){
3310
+        if (row.zuobiao_stock_num <= 0) {
3311
+          if (selection) {
3312
+            selection.forEach(row => {
3313
+              if (row.zuobiao_stock_num <= 0) {
3314
+                this.$refs.multipleTable.toggleRowSelection(row)
3315
+              }
3316
+            })
3317
+          } else {
3318
+            this.$refs.multipleTable.clearSelection()
3319
+          }
3320
+          this.$message.error(row.drug_name + '库存不足')
3321
+          return
3322
+        }
3323
+      }
3324 3324
 
3325 3325
 
3326 3326
 
@@ -3634,21 +3634,21 @@ export default {
3634 3634
         }
3635 3635
        }
3636 3636
 
3637
-      // if ( this.org_id == 10206) {
3638
-      //   if (row.type == 3) {
3639
-      //     if (selection) {
3640
-      //       selection.forEach(row => {
3641
-      //         if (row.zuobiao_stock_num <= 0) {
3642
-      //           this.$refs.tables.toggleRowSelection(row)
3643
-      //         }
3644
-      //       })
3645
-      //     } else {
3646
-      //       this.$refs.tables.clearSelection()
3647
-      //     }
3648
-      //     this.$message.error(row.project_name + '库存不足')
3649
-      //     return
3650
-      //   }
3651
-      // }
3637
+      if ( this.org_id == 10206) {
3638
+        if (row.type == 3) {
3639
+          if (selection) {
3640
+            selection.forEach(row => {
3641
+              if (row.zuobiao_stock_num <= 0) {
3642
+                this.$refs.tables.toggleRowSelection(row)
3643
+              }
3644
+            })
3645
+          } else {
3646
+            this.$refs.tables.clearSelection()
3647
+          }
3648
+          this.$message.error(row.project_name + '库存不足')
3649
+          return
3650
+        }
3651
+      }
3652 3652
       this.teamList = selection
3653 3653
     },
3654 3654
     getlist() {
@@ -3734,6 +3734,8 @@ export default {
3734 3734
                   console.log( this.zuobiao_project[i].lsqty)
3735 3735
                   console.log( this.tabProject[b].zuobiao_stock_num)
3736 3736
                   this.tabProject[b].zuobiao_stock_num = this.zuobiao_project[i].lsqty
3737
+                  this.tabProject[b].price = this.zuobiao_project[i].price
3738
+
3737 3739
                 }
3738 3740
               }
3739 3741
             }
@@ -3831,11 +3833,11 @@ export default {
3831 3833
                   this.$message.error(project[i].good_info.good_name + '库存不足')
3832 3834
                 }
3833 3835
 
3834
-                // if (project[i].good_info.zuobiao_stock_num <= 0 && this.org_id == 10206) {
3835
-                //   num++
3836
-                //   this.$refs.tabProjectTeam.toggleRowSelection(row)
3837
-                //   this.$message.error(project[i].good_info.good_name + '库存不足')
3838
-                // }
3836
+                if (project[i].good_info.zuobiao_stock_num <= 0 && this.org_id == 10206) {
3837
+                  num++
3838
+                  this.$refs.tabProjectTeam.toggleRowSelection(row)
3839
+                  this.$message.error(project[i].good_info.good_name + '库存不足')
3840
+                }
3839 3841
 
3840 3842
                 if (num > 0) {
3841 3843
                   this.$refs.tabProjectTeam.clearSelection()

+ 1 - 1
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Ver arquivo

@@ -1541,7 +1541,7 @@ export default {
1541 1541
                       for (let b = 0; b < that.drugs.length; b++) {
1542 1542
                         if (that.zuobiao_drug[i].bby01 == that.drugs[b].bby01) {
1543 1543
                           that.drugs[b]['zuobiao_stock_num'] = that.zuobiao_drug[i].sysl
1544
-                          that.drugs[b].min_price = that.zuobiao_drug[i].price
1544
+                          that.drugs[b].min_price = that.zuobiao_drug[i].lsj
1545 1545
 
1546 1546
                         }
1547 1547