11月14日 库存扣减更新

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -508,7 +508,7 @@
         align="right"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 20, 30, 50,100]"
+        :page-sizes="[20, 40, 60, 80,100]"
         :page-size="10"
         background
         style="margin-top:20px;"
@@ -626,7 +626,7 @@ export default {
       total: 0,
       listQuery: {
         page: 1,
-        limit: 10,
+        limit: 20,
         schedul_type: 0,
         partition_type: 0,
         schedul_time: "",

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -381,7 +381,8 @@ export default {
         type: this.type,
         manufacturer: this.manufacturer_id,
         order_type: this.order_type,
-        dealer: this.dealer_id
+        dealer: this.dealer_id,
+        keywords: this.searchKey
       };
       console.log("Params23232233223232332",Params)
       this.cancelStockDate = [];

src/xt_pages/stock/detail/stockInDetail.vue

@@ -253,17 +253,16 @@ export default {
     changeType: function(val) {
       this.order_type = val;
       this.GetCancelStock();
-      // this.getPrintStockGood()
+     
     },
     changeManufacturer: function(val) {
       this.manufacturer_id = val;
       this.GetCancelStock();
-      // this.getPrintStockGood()
+     
     },
     changeDealer: function(val) {
       this.dealer_id = val;
       this.GetCancelStock();
-      // this.getPrintStockGood()
     },
     getTypeName: function(row) {
       let name = "";
@@ -361,7 +360,8 @@ export default {
         type: this.type,
         manufacturer: this.manufacturer_id,
         order_type: this.order_type,
-        dealer: this.dealer_id
+        dealer: this.dealer_id,
+        keywords: this.searchKey
       };
       this.cancelStockDate = [];
       getStockDetail(Params).then(response => {

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -355,7 +355,8 @@ export default {
         type: this.type,
         manufacturer: this.manufacturer_id,
         order_type: this.order_type,
-        dealer: this.dealer_id
+        dealer: this.dealer_id,
+        keywords: this.searchKey
       };
       this.cancelStockDate = [];
       getStockDetail(Params).then(response => {

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -209,7 +209,7 @@ export default {
 
   created() {
     this.org_id = this.$store.getters.xt_user.org.id
-    console.log("jj233223323223",this.org_id)
+   
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -136,21 +136,7 @@
         <el-table-column label="操作" align="center" width="240">
           <template slot-scope="scope">
            
-            <!-- <el-tooltip
-              class="item"
-              effect="dark"
-              content="详情"
-              placement="top"
-            >
-              <el-button
-                size="small"
-                type="warning"
-                icon="el-icon-document"
-                @click="handleSearch(scope.row.id,scope.row.warehouse_out_time,scope.row.warehouse_out_order_number)"
-              >
-              </el-button>
-            </el-tooltip> -->
-
+         
             <el-tooltip
               class="item"
               effect="dark"
@@ -639,11 +625,10 @@ export default {
       this.$router.push({path:"/drug/out/drugstockoutorderedit?id="+row.id+"&type="+this.type+"&is_sys="+row.is_sys})
     },
     handleSearch(val){
-      //  console.log("val23233232",val)
+      
        this.getInitializtion()
        this.getSinleOrderDetail(val.id,val.warehouse_out_time,val.is_sys)
        this.list = []
-      //  this.getDrugAutoMaticList(val.id,val.time,val.warehouse_out_order_number)
 
     },
 
@@ -963,7 +948,8 @@ export default {
               list[i].number = ""
            }
          }
-          this.tableList = list
+         console.log("list233223323233223",list)
+         this.tableList = list
         }
      })
    },

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -552,6 +552,8 @@ export default {
           const params = {
             stockOut: this.recordInfo.recordData
           };
+          console.log("param23323232",params)
+         
           const loading = this.$loading({
             lock: true,
             text: 'Loading',

src/xt_pages/stock/drugs/inventory.vue

@@ -282,7 +282,12 @@ export default {
            getDrugWarehouseInfoList(params).then(response=>{
              if(response.data.state == 1){
                 var list =  response.data.data.list
+                console.log("lisrt2332323223322323232323",list)
                 for(let i=0;i<list.length;i++){
+                   if(list[i].XtBaseDrug.max_unit == list[i].XtBaseDrug.min_unit){
+                      list[i].stock_max_number += list[i].stock_min_number
+                      list[i].stock_min_number = 0
+                   }
                    list[i].drug_name = list[i].XtBaseDrug.drug_name
                    list[i].specification_name = list[i].XtBaseDrug.dose +list[i].XtBaseDrug.dose_unit + "*"+list[i].XtBaseDrug.min_number +list[i].XtBaseDrug.min_unit+"/"+list[i].XtBaseDrug.max_unit
                    list[i].warehouseing_unit = list[i].max_unit
@@ -551,8 +556,9 @@ export default {
 
             if(response.data.state == 1){
               this.total =  response.data.data.total
+              
               this.tableList = response.data.data.list
-             
+              
               this.doctorList =  response.data.data.doctorList
               
 

src/xt_pages/workforce/remind_print_setting.vue

@@ -104,7 +104,7 @@
                   <span>首剂：{{main_collection.dialysissolution.anticoagulant_shouji}}</span>
                 </div>
                 <div class="printCell">
-                  <span>体重增加：{{ main_collection.assessmentbefor.weight_before - main_collection.lastafterweight.weight_after }}Kg</span>
+                  <span>体重增加：{{ (main_collection.assessmentbefor.weight_before - main_collection.lastafterweight.weight_after).toFixed(2) }}Kg</span>
                   <span>维持：{{main_collection.dialysissolution.anticoagulant_weichi}}</span>
                 </div>
                 <div class="printCell">