浏览代码

11月14日 库存扣减更新

XMLWAN 3 年前
父节点
当前提交
e16442174a

+ 2 - 2
src/xt_pages/dialysis/bloodPresssWatch.vue 查看文件

508
         align="right"
508
         align="right"
509
         @size-change="handleSizeChange"
509
         @size-change="handleSizeChange"
510
         @current-change="handleCurrentChange"
510
         @current-change="handleCurrentChange"
511
-        :page-sizes="[10, 20, 30, 50,100]"
511
+        :page-sizes="[20, 40, 60, 80,100]"
512
         :page-size="10"
512
         :page-size="10"
513
         background
513
         background
514
         style="margin-top:20px;"
514
         style="margin-top:20px;"
626
       total: 0,
626
       total: 0,
627
       listQuery: {
627
       listQuery: {
628
         page: 1,
628
         page: 1,
629
-        limit: 10,
629
+        limit: 20,
630
         schedul_type: 0,
630
         schedul_type: 0,
631
         partition_type: 0,
631
         partition_type: 0,
632
         schedul_time: "",
632
         schedul_time: "",

+ 2 - 1
src/xt_pages/stock/detail/cancelStockDetail.vue 查看文件

381
         type: this.type,
381
         type: this.type,
382
         manufacturer: this.manufacturer_id,
382
         manufacturer: this.manufacturer_id,
383
         order_type: this.order_type,
383
         order_type: this.order_type,
384
-        dealer: this.dealer_id
384
+        dealer: this.dealer_id,
385
+        keywords: this.searchKey
385
       };
386
       };
386
       console.log("Params23232233223232332",Params)
387
       console.log("Params23232233223232332",Params)
387
       this.cancelStockDate = [];
388
       this.cancelStockDate = [];

+ 4 - 4
src/xt_pages/stock/detail/stockInDetail.vue 查看文件

253
     changeType: function(val) {
253
     changeType: function(val) {
254
       this.order_type = val;
254
       this.order_type = val;
255
       this.GetCancelStock();
255
       this.GetCancelStock();
256
-      // this.getPrintStockGood()
256
+     
257
     },
257
     },
258
     changeManufacturer: function(val) {
258
     changeManufacturer: function(val) {
259
       this.manufacturer_id = val;
259
       this.manufacturer_id = val;
260
       this.GetCancelStock();
260
       this.GetCancelStock();
261
-      // this.getPrintStockGood()
261
+     
262
     },
262
     },
263
     changeDealer: function(val) {
263
     changeDealer: function(val) {
264
       this.dealer_id = val;
264
       this.dealer_id = val;
265
       this.GetCancelStock();
265
       this.GetCancelStock();
266
-      // this.getPrintStockGood()
267
     },
266
     },
268
     getTypeName: function(row) {
267
     getTypeName: function(row) {
269
       let name = "";
268
       let name = "";
361
         type: this.type,
360
         type: this.type,
362
         manufacturer: this.manufacturer_id,
361
         manufacturer: this.manufacturer_id,
363
         order_type: this.order_type,
362
         order_type: this.order_type,
364
-        dealer: this.dealer_id
363
+        dealer: this.dealer_id,
364
+        keywords: this.searchKey
365
       };
365
       };
366
       this.cancelStockDate = [];
366
       this.cancelStockDate = [];
367
       getStockDetail(Params).then(response => {
367
       getStockDetail(Params).then(response => {

+ 2 - 1
src/xt_pages/stock/detail/stockOutDetail.vue 查看文件

355
         type: this.type,
355
         type: this.type,
356
         manufacturer: this.manufacturer_id,
356
         manufacturer: this.manufacturer_id,
357
         order_type: this.order_type,
357
         order_type: this.order_type,
358
-        dealer: this.dealer_id
358
+        dealer: this.dealer_id,
359
+        keywords: this.searchKey
359
       };
360
       };
360
       this.cancelStockDate = [];
361
       this.cancelStockDate = [];
361
       getStockDetail(Params).then(response => {
362
       getStockDetail(Params).then(response => {

+ 1 - 1
src/xt_pages/stock/drugs/components/drugOutDetail.vue 查看文件

209
 
209
 
210
   created() {
210
   created() {
211
     this.org_id = this.$store.getters.xt_user.org.id
211
     this.org_id = this.$store.getters.xt_user.org.id
212
-    console.log("jj233223323223",this.org_id)
212
+   
213
     var nowDate = new Date();
213
     var nowDate = new Date();
214
     var nowYear = nowDate.getFullYear();
214
     var nowYear = nowDate.getFullYear();
215
     var nowMonth = nowDate.getMonth() + 1;
215
     var nowMonth = nowDate.getMonth() + 1;

+ 4 - 18
src/xt_pages/stock/drugs/drugStockOutOrder.vue 查看文件

136
         <el-table-column label="操作" align="center" width="240">
136
         <el-table-column label="操作" align="center" width="240">
137
           <template slot-scope="scope">
137
           <template slot-scope="scope">
138
            
138
            
139
-            <!-- <el-tooltip
140
-              class="item"
141
-              effect="dark"
142
-              content="详情"
143
-              placement="top"
144
-            >
145
-              <el-button
146
-                size="small"
147
-                type="warning"
148
-                icon="el-icon-document"
149
-                @click="handleSearch(scope.row.id,scope.row.warehouse_out_time,scope.row.warehouse_out_order_number)"
150
-              >
151
-              </el-button>
152
-            </el-tooltip> -->
153
-
139
+         
154
             <el-tooltip
140
             <el-tooltip
155
               class="item"
141
               class="item"
156
               effect="dark"
142
               effect="dark"
639
       this.$router.push({path:"/drug/out/drugstockoutorderedit?id="+row.id+"&type="+this.type+"&is_sys="+row.is_sys})
625
       this.$router.push({path:"/drug/out/drugstockoutorderedit?id="+row.id+"&type="+this.type+"&is_sys="+row.is_sys})
640
     },
626
     },
641
     handleSearch(val){
627
     handleSearch(val){
642
-      //  console.log("val23233232",val)
628
+      
643
        this.getInitializtion()
629
        this.getInitializtion()
644
        this.getSinleOrderDetail(val.id,val.warehouse_out_time,val.is_sys)
630
        this.getSinleOrderDetail(val.id,val.warehouse_out_time,val.is_sys)
645
        this.list = []
631
        this.list = []
646
-      //  this.getDrugAutoMaticList(val.id,val.time,val.warehouse_out_order_number)
647
 
632
 
648
     },
633
     },
649
 
634
 
963
               list[i].number = ""
948
               list[i].number = ""
964
            }
949
            }
965
          }
950
          }
966
-          this.tableList = list
951
+         console.log("list233223323233223",list)
952
+         this.tableList = list
967
         }
953
         }
968
      })
954
      })
969
    },
955
    },

+ 2 - 0
src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue 查看文件

552
           const params = {
552
           const params = {
553
             stockOut: this.recordInfo.recordData
553
             stockOut: this.recordInfo.recordData
554
           };
554
           };
555
+          console.log("param23323232",params)
556
+         
555
           const loading = this.$loading({
557
           const loading = this.$loading({
556
             lock: true,
558
             lock: true,
557
             text: 'Loading',
559
             text: 'Loading',

+ 7 - 1
src/xt_pages/stock/drugs/inventory.vue 查看文件

282
            getDrugWarehouseInfoList(params).then(response=>{
282
            getDrugWarehouseInfoList(params).then(response=>{
283
              if(response.data.state == 1){
283
              if(response.data.state == 1){
284
                 var list =  response.data.data.list
284
                 var list =  response.data.data.list
285
+                console.log("lisrt2332323223322323232323",list)
285
                 for(let i=0;i<list.length;i++){
286
                 for(let i=0;i<list.length;i++){
287
+                   if(list[i].XtBaseDrug.max_unit == list[i].XtBaseDrug.min_unit){
288
+                      list[i].stock_max_number += list[i].stock_min_number
289
+                      list[i].stock_min_number = 0
290
+                   }
286
                    list[i].drug_name = list[i].XtBaseDrug.drug_name
291
                    list[i].drug_name = list[i].XtBaseDrug.drug_name
287
                    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
292
                    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
288
                    list[i].warehouseing_unit = list[i].max_unit
293
                    list[i].warehouseing_unit = list[i].max_unit
551
 
556
 
552
             if(response.data.state == 1){
557
             if(response.data.state == 1){
553
               this.total =  response.data.data.total
558
               this.total =  response.data.data.total
559
+              
554
               this.tableList = response.data.data.list
560
               this.tableList = response.data.data.list
555
-             
561
+              
556
               this.doctorList =  response.data.data.doctorList
562
               this.doctorList =  response.data.data.doctorList
557
               
563
               
558
 
564
 

+ 1 - 1
src/xt_pages/workforce/remind_print_setting.vue 查看文件

104
                   <span>首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</span>
104
                   <span>首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</span>
105
                 </div>
105
                 </div>
106
                 <div class="printCell">
106
                 <div class="printCell">
107
-                  <span>体重增加:{{ main_collection.assessmentbefor.weight_before - main_collection.lastafterweight.weight_after }}Kg</span>
107
+                  <span>体重增加:{{ (main_collection.assessmentbefor.weight_before - main_collection.lastafterweight.weight_after).toFixed(2) }}Kg</span>
108
                   <span>维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</span>
108
                   <span>维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</span>
109
                 </div>
109
                 </div>
110
                 <div class="printCell">
110
                 <div class="printCell">