518合并代码

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2984,8 +2984,9 @@ export default {
     }, changeAllGoodInfoTableDataTwo(row) {
       this.teamList = row
     },
-         selectChange(selection, row) {
-        if(row.sum_count <=0){
+    selectChange(selection, row) {
+       if(row.type == 3){
+         if(row.sum_count <=0){
           if(selection){
               selection.forEach(row => {
                 if (row.sum_count <= 0) {
@@ -2998,6 +2999,8 @@ export default {
               })
           }
         }
+       }
+      
         // 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){
         //    if (row.stock_count <= 0) {
         //     if (row.type == 3) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2998,19 +2998,22 @@
         this.teamList = row
       },
       selectChange(selection, row) {
-        if(row.sum_count <=0){
-          if(selection){
-              selection.forEach(row => {
-                if (row.sum_count <= 0) {
-                  this.$refs.tables.toggleRowSelection(row)
-                }else{
-                  this.$refs.tables.clearSelection()
-                }
-                this.$message.error(row.project_name + '库存不足')
-                return
-              })
+        if(row.type == 3){
+          if(row.sum_count <=0){
+            if(selection){
+                selection.forEach(row => {
+                  if (row.sum_count <= 0) {
+                    this.$refs.tables.toggleRowSelection(row)
+                  }else{
+                    this.$refs.tables.clearSelection()
+                  }
+                  this.$message.error(row.project_name + '库存不足')
+                  return
+                })
+            }
           }
         }
+       
         // 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){
         //    if (row.stock_count <= 0) {
         //     if (row.type == 3) {

src/xt_pages/outpatientTool/components/drugDetail.vue

@@ -207,7 +207,7 @@ import { min } from 'moment'
                }
              }
             }
-           
+            console.log("tabl2323323232",this.tableData)
           }
         })  
       },

src/xt_pages/outpatientTool/components/goodDetail.vue

@@ -3,7 +3,6 @@
         <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
             <div>
                 <el-input size="small" style="width:150px;" v-model="keywords" 
-                          @keyup.enter.native='searchAction'
                           placeholder="请输入耗材名称"
                           class="filter-item"/>
                  <el-button size="small" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
@@ -182,6 +181,7 @@ import {getGoodDetailSummary} from "@/api/stock"
             }
            }
            this.patients = response.data.data.patients
+           console.log("@33232322332",this.tableData)
          }
        })   
      },
@@ -257,6 +257,9 @@ import {getGoodDetailSummary} from "@/api/stock"
           }
         }
         return packing_unit
+      },
+      searchAction(){
+        this.getlist()
       }
     },
     created() {