Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -80,7 +80,7 @@
 
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
 
-          <div v-if="org_id == 10206">
+          <div v-if="org_id == 10206 || org_id == 10454">
             <el-button  size="small"
                         @click="openZb(1)"
                         v-if=" this.order.id == 0"
@@ -92,7 +92,7 @@
             </el-button>
           </div>
 
-          <div  v-if="org_id != 10206 && org_id != 10340">
+          <div  v-if="org_id != 10206 && org_id != 10340 && org_id != 10454">
             <!--            <el-button size="small"-->
             <!--                       @click="openZb(1)"-->
             <!--                       type="primary">登记-->

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -3257,21 +3257,21 @@ export default {
        }
       }
 
-      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
-        }
-      }
+      // 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
+      //   }
+      // }
 
 
 
@@ -3587,27 +3587,24 @@ export default {
         }
        }
 
-      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
-        }
-      }
+      // 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() {
-
-
-
       this.tabProject = []
       getHisProject().then(response => {
         if (response.data.state == 1) {
@@ -3779,11 +3776,11 @@ export default {
                   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 (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()