11月7日 库存扣减更新

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -286,7 +286,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028">
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span> 
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                                               </span>
@@ -383,7 +383,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028">
                                                    {{scope.row.stock_count}}
                                               </span>
                                               <span v-else> {{ scope.row.total }}</span>
@@ -2652,19 +2652,36 @@
       selectDrugs(selection, row) {
         console.log('selection', selection)
         console.log('row', row)
-        if (row.total <= 0) {
-          if (selection) {
-            selection.forEach(row => {
-              if (row.total <= 0) {
-                this.$refs.multipleTable.toggleRowSelection(row)
+        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 ){
+            if (row.count <= 0) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.count <= 0) {
+                    this.$refs.multipleTable.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.multipleTable.clearSelection()
               }
-            })
-          } else {
-            this.$refs.multipleTable.clearSelection()
-          }
-          this.$message.error(row.drug_name + '库存不足')
-          return
+              this.$message.error(row.drug_name + '库存不足')
+              return
+            }
+        }else{
+           if (row.total <= 0) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.total <= 0) {
+                    this.$refs.multipleTable.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.multipleTable.clearSelection()
+              }
+              this.$message.error(row.drug_name + '库存不足')
+              return
+            }
         }
+       
         this.curDrugs = selection
       },
 
@@ -2910,21 +2927,41 @@
       },
       selectChange(selection, row) {
         console.log('row', row)
-        if (row.total <= 0) {
-          if (row.type == 3) {
-            if (selection) {
-              selection.forEach(row => {
-                if (row.total <= 0) {
-                  this.$refs.tables.toggleRowSelection(row)
-                }
-              })
-            } else {
-              this.$refs.tables.clearSelection()
+        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 ){
+           if (row.stock_count <= 0) {
+            if (row.type == 3) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.stock_count <= 0) {
+                    this.$refs.tables.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.tables.clearSelection()
+              }
+              this.$message.error(row.project_name + '库存不足')
+              return
             }
-            this.$message.error(row.project_name + '库存不足')
-            return
           }
+        }else{
+           if (row.total <= 0) {
+            if (row.type == 3) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.total <= 0) {
+                    this.$refs.tables.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.tables.clearSelection()
+              }
+              this.$message.error(row.project_name + '库存不足')
+              return
+            }
+          }
+
         }
+       
         this.teamList.push(row)
       },
       getlist() {

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -562,6 +562,7 @@ export default {
           }
           for(let i=0;i<this.recordInfo.recordData.length;i++){
             this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
+            console.log("批次列表",this.numberList)
              for(let j=0;j<this.numberList.length;j++){
                 if(this.recordInfo.recordData[i].batch_number == this.numberList[j].id){
                    this.recordInfo.recordData[i].batch_number = this.numberList[j].batch_number
@@ -574,7 +575,7 @@ export default {
             cancelStock: this.recordInfo.recordData
           };
           console.log("params2222",params,this.return_time)
-          
+        
           postDrugCancelStock(
             params,
             this.return_time,
@@ -698,7 +699,10 @@ export default {
            if(response.data.state == 1){
              var list = response.data.data.list
              console.log("list2222",list)
-             this.numberList = list
+             for(let i=0;i<list.length;i++){
+               this.numberList.push(list[i])
+             }
+             
            }
         })
       },

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

@@ -706,7 +706,9 @@
            if(response.data.state == 1){
              var list = response.data.data.list
              console.log("list2222",list)
-             this.numberList = list
+             for(let i=0;i<list.length;i++){
+               this.numberList.push(list[i])
+             }
            }
         })
       },

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -1217,7 +1217,7 @@ export default {
               total += this.drugFlowList[i].count
           }
         }
-        all_price = total * price
+        all_price = total * min_price
       
         return  all_price
       },