数据

src/xt_pages/stock/cancelStockOrder.vue

@@ -626,7 +626,7 @@ export default {
       for(let i=0;i<this.exportList.length;i++){
         this.exportList[i].total_price = this.exportList[i].count * this.exportList[i].price
         this.exportList[i].good_name = this.exportList[i].GoodInfo.good_name
-        this.exportList[i].unit = this.exportList[i].GoodInfo.specification_name + "/" +this.exportList[i].packing_unit
+        this.exportList[i].unit = this.exportList[i].GoodInfo.specification_name + "/" +this.exportList[i].GoodInfo.packing_unit
         if(this.exportList[i].dealer == 0){
           this.exportList[i].dealer = ""
         }

src/xt_pages/stock/cancelStockOrderPrint.vue

@@ -29,7 +29,7 @@
               <td style="line-height: 50px" width="80">总金额</td>
             </tr>
 
-            <tr v-for="(item,i) in it.CancelStockInfo" :key="i">
+            <tr v-for="(item,i) in it.XtCancelStockInfo" :key="i">
               <td style="line-height: 50px">
                 <span>{{item.GoodInfo.good_name}}</span>
               </td>
@@ -314,7 +314,7 @@
       },
 
       getCancelStockOrderPrint(id){
-        console.log("23232322332",id)
+       
         var params = {
             id:id
         }
@@ -330,7 +330,7 @@
         var total = 0
         var arr = []
         for(let i=0;i<this.tableList.length;i++){
-          arr.push(...this.tableList[i].CancelStockInfo)
+          arr.push(...this.tableList[i].XtCancelStockInfo)
         } 
         console.log("arr23223",arr)
         for(let i=0;i<arr.length;i++){

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -212,7 +212,7 @@
                     v-for="(item,index) in numberList"
                     :key="index"
                     :label="item.batch_number"
-                    :value="item.batch_number">
+                    :value="item.id">
                   </el-option>
               </el-select>
               </el-form-item>
@@ -498,6 +498,7 @@ export default {
       tempObj["product_date"] = ""
       tempObj["expiry_date"] = ""
       tempObj["batch_number"] = ""
+      tempObj["batch_number_id"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -595,10 +596,18 @@ export default {
             this.$message.success("请添加退库商品");
             return;
           }
-
+          for(let i=0;i<this.recordInfo.recordData.length;i++){
+             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
+                   this.recordInfo.recordData[i].batch_number_id = this.numberList[j].id
+                }
+             }
+          }
           const params = {
             cancelStock: this.recordInfo.recordData
           };
+          console.log("params2222",params)
           postDrugCancelStock(
             params,
             this.return_time,
@@ -610,14 +619,19 @@ export default {
               this.$message.error(response.data.msg);
               return false;
             } else {
-              this.$notify({
-                title: "成功",
-                message: "退库成功",
-                type: "success",
-                duration: 2000
-              });
-              this.recordInfo.recordData = [];
-              this.$router.back(-1);
+              if(response.data.data.msg == 1){
+                this.$notify({
+                  title: "成功",
+                  message: "退库成功",
+                  type: "success",
+                  duration: 2000
+                });
+                this.recordInfo.recordData = [];
+                this.$router.back(-1);
+              }
+              if(response.data.data.msg == 2){
+                this.$message.error("退库数量大于入库数量")
+              }
             }
           });
         } else {
@@ -737,6 +751,7 @@ export default {
     tempObj["product_date"] = ""
     tempObj["expiry_date"] = ""
     tempObj["batch_number"] = ""
+    tempObj["batch_number_id"] = ""
     this.unitList =  getDataConfig('hemodialysis','units')
     console.log("单位",this.unitList)
     this.recordInfo.recordData.push(tempObj);

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -1172,7 +1172,7 @@ export default {
           this.exportList[i].unit = this.exportList[i].dose + this.exportList[i].dose_unit + "*" + this.exportList[i].min_number + this.exportList[i].min_unit + "/"+this.exportList[i].max_unit
 
           this.exportList[i].total_price = (this.exportList[i].count * this.exportList[i].price).toFixed(2)
-          this.exportList[i].expire_date  = this.getTime(this.exportList[i].expiry_date,"{y}-{h}-{d}")
+          this.exportList[i].expiry_date  = this.getTime(this.exportList[i].expiry_date,"{y}-{h}-{d}")
            this.exportList[i].product_date = this.getTime(this.exportList[i].product_date,"{y}-{h}-{d}")
           for(let j=0;j<this.manufacturerList.length;j++){
             if(this.exportList[i].manufacturer == this.manufacturerList[j].id){

src/xt_pages/stock/drugs/query.vue

@@ -121,6 +121,11 @@
              {{getCount(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
            </template>
         </el-table-column>
+        <el-table-column prop="drug_name" label="退库数量" align="center">
+           <template slot-scope="scope">
+             {{getCancelCount(scope.row.drug_id)}}
+           </template>
+        </el-table-column>
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
              <span v-if="getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)!=''">{{getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span>
@@ -246,7 +251,7 @@ import { min } from 'moment'
         drug_type:0,
         minCount:[],
         drugOutList:[],
-        
+        cancelCountList:[],
       }
     },
     methods: {
@@ -571,6 +576,9 @@ import { min } from 'moment'
             var minCount = response.data.data.minCount
             console.log("minCount",minCount)
             this.minCount = minCount
+            var cancelCountList =  response.data.data.cancelCountList
+            console.log("退库数据",cancelCountList)
+            this.cancelCountList = cancelCountList
             var info = response.data.data.info
             for(let i=0;i<info.length;i++){
               if(info[i].count_unit == info[i].max_unit){
@@ -668,7 +676,16 @@ import { min } from 'moment'
 
        console.log("str0000000",str,str_min)
        return str+str_min
-     }
+     },
+      getCancelCount(id){
+        var count= 0
+        for(let i=0;i<this.cancelCountList.length;i++){
+          if(id == this.cancelCountList[i].drug_id){
+            count = this.cancelCountList[i].count
+          }
+        }
+        return count
+      },
     }
   }
 </script>

src/xt_pages/stock/stockFlow.vue

@@ -71,6 +71,7 @@
            <template slot-scope="scope">
             <span v-if="scope.row.consumable_type == 1">{{scope.row.warehousing_order}}</span>
             <span v-if="scope.row.consumable_type == 2">{{scope.row.warehouse_out_order_number}}</span>  
+            <span v-if="scope.row.consumable_type == 3">{{scope.row.warehouse_out_order_number}}</span>  
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作日期" align="center">
@@ -391,12 +392,8 @@
      },
      changeDrug(val){
        this.tableList= []
-       if(val == 4 || val == 0){
-        this.getlist()
-       }
-       if(val == 2 || val == 3 || val == 0){
-        this.getStockOutList()
-       }
+       this.stock_type = val
+       this.getStockFlow()
      },
      getStockCount(id){
       var stock_count = 0
@@ -415,8 +412,9 @@
           good_id:this.$route.query.id,
           start_time:this.start_time,
           end_time:this.end_time,
-          is_sys:this.stockType 
+          is_sys:this.stock_type 
         } 
+        
        getStockFlow(params).then(response=>{
           if(response.data.state == 1){
             var list =  response.data.data.list

src/xt_pages/stock/stockPrint.vue

@@ -39,8 +39,11 @@
                                    <td>{{item.price}}</td>
                                    <td>{{getManufacture(item.manufacturer)}}</td>
                                    <td>{{getInCount(item.good_id)}}</td>
-                                   <td><span>{{getOutCount(item.good_id) + getAutoCount(item.good_id)}}</span></td> 
-                                   <td>{{getInCount(item.good_id)- getOutCount(item.good_id) - getAutoCount(item.good_id)}}</td>
+                                   <!-- <td><span>{{getOutCount(item.good_id) + getAutoCount(item.good_id)}}</span></td>  -->
+                                   <td><span>{{getInCount(item.good_id) - getStockCount(item.good_id)}}{{item.packing_unit}}</span></td>
+                                   <!-- <td>{{getInCount(item.good_id)- getOutCount(item.good_id) - getAutoCount(item.good_id)}}</td> -->
+                                   <!-- <td>{{getCancelCount(item.good_id)}}{{item .packing_unit}}</td> -->
+                                   <td> {{getStockCount(item.good_id)}} {{item.packing_unit}} </td>
                                 </tr>
                             </tbody>
                         </table>
@@ -87,6 +90,7 @@ export default {
           countList:[],
           outCountList:[],
           autoCountList:[],
+          cancelCountList:[],
         }
     },
     methods:{
@@ -197,6 +201,9 @@ export default {
            var autoCount = response.data.data.autoCount
            console.log("autoCount",autoCount)
            this.autoCountList = autoCount
+           var totalCount = response.data.data.totalCount
+           console.log("totalcount",totalCount)
+           this.cancelCountList = totalCount
          }
       })
     },
@@ -226,7 +233,25 @@ export default {
           }
         }
         return count
-      }
+      },
+      getCancelCount(id){
+        var count = 0
+        for(let i=0;i<this.cancelCountList.length;i++){
+          if(id == this.cancelCountList[i].good_id){
+              count = this.cancelCountList[i].count
+          }
+        }
+        return count
+     },
+    getStockCount(id){
+     var stock_count = 0
+     for(let i=0;i<this.countList.length;i++){
+       if(id == this.countList[i].good_id){
+         stock_count = this.countList[i].stock_count
+       }
+     }
+     return stock_count
+     }
     },
     created(){
       var starttime =  this.$route.query.start_time

src/xt_pages/stock/stockQuery.vue

@@ -414,8 +414,10 @@ export default {
            this.tableList[i].unit = this.tableList[i].specification_name + "/" + this.tableList[i].packing_unit
            this.tableList[i].prodect_name = this.getManufacture(this.tableList[i].manufacturer)
            this.tableList[i].inCount =  this.getInCount(this.tableList[i].good_id)
-           this.tableList[i].outCount = this.getOutCount(this.tableList[i].good_id) + this.getAutoCount(this.tableList[i].good_id)
-           this.tableList[i].overplus =this.getInCount(this.tableList[i].good_id)- this.getOutCount(this.tableList[i].good_id) - this.getAutoCount(this.tableList[i].good_id)
+          //  this.tableList[i].outCount = this.getOutCount(this.tableList[i].good_id) + this.getAutoCount(this.tableList[i].good_id)
+          //  this.tableList[i].overplus =this.getInCount(this.tableList[i].good_id)- this.getOutCount(this.tableList[i].good_id) - this.getAutoCount(this.tableList[i].good_id)
+          this.tableList[i].outCount =  this.getInCount(this.tableList[i].good_id) - this.getStockCount(this.tableList[i].good_id)
+          this.tableList[i].overplus = this.getStockCount(this.tableList[i].good_id)
          }
          console.log("table",this.tableList)
          const data = this.formatJson(filterVal, this.tableList)