Browse Source

批量打印

XMLWAN 4 years ago
parent
commit
96e9e1f602

+ 1 - 1
src/App.vue View File

@@ -41,7 +41,7 @@ export default {
41 41
   },
42 42
   watch:{
43 43
   $route(to,from){
44
-    console.log("pppppppppp",to.path);
44
+    
45 45
     if(to.path.indexOf('/patients/patient')== -1){
46 46
       window.sessionStorage.removeItem('patientKey')
47 47
     }

+ 1 - 1
src/xt_pages/data/components/addConsumable.vue View File

@@ -9,7 +9,7 @@
9 9
             <el-tab-pane label="基础数据" name="first">
10 10
                 <div>
11 11
                     <el-form :model="form" :rules="rules" ref="form" label-width="100px" style="display: flex;flex-wrap: wrap;justify-content: space-between;">
12
-                        <el-form-item label="耗材名称22 : " prop="name" style="width:100%">
12
+                        <el-form-item label="耗材名称 : " prop="name" style="width:100%">
13 13
                             <el-input v-model="form.good_name" placeholder="" maxlength="30"></el-input>
14 14
                         </el-form-item>
15 15
                         <el-form-item label="拼音 : " prop="name" style="width:50%">

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderNineteen.vue View File

@@ -1341,7 +1341,7 @@ export default {
1341 1341
         this.lastafterdialysis = response.data.data.assessmentAfterDislysis;
1342 1342
         this.operators = response.data.data.operators;
1343 1343
         console.log("operators", this.operators);
1344
-        console.log('pppppppppppppppppp22',response.data.data.dialysisOrder)
1344
+        // console.log('pppppppppppppppppp22',response.data.data.dialysisOrder)
1345 1345
         this.dialysisOrder =
1346 1346
           response.data.data.dialysisOrder === null
1347 1347
             ? null

+ 2 - 2
src/xt_pages/stock/cancelStockOrderAdd.vue View File

@@ -56,7 +56,7 @@
56 56
           <el-select
57 57
             size="small"
58 58
             v-model="form.dealer"
59
-            clearable
59
+            filterable
60 60
             placeholder="请选择经销商"
61 61
             @change="changeDealer"
62 62
           >
@@ -75,7 +75,7 @@
75 75
           <el-select
76 76
             size="small"
77 77
             v-model="form.manufacturer"
78
-            clearable
78
+            filterable
79 79
             placeholder="请选择厂商"
80 80
             @change="changeManufacturer"
81 81
           >

+ 2 - 2
src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue View File

@@ -66,7 +66,7 @@
66 66
           <el-select
67 67
             size="small"
68 68
             v-model="form.dealer"
69
-            clearable
69
+            filterable
70 70
             placeholder="请选择经销商"
71 71
             @change="changeDealer"
72 72
           >
@@ -85,7 +85,7 @@
85 85
           <el-select
86 86
             size="small"
87 87
             v-model="form.manufacturer"
88
-            clearable
88
+            filterable
89 89
             placeholder="请选择厂商"
90 90
             @change="changeManufacturer"
91 91
           >

+ 2 - 2
src/xt_pages/stock/drugs/drugSalesReturnOrderAdd.vue View File

@@ -34,7 +34,7 @@
34 34
 
35 35
       <div class="cell clearfix">
36 36
         <label class="title"><span class="name">经销商</span> : </label>
37
-        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
37
+        <el-select size="small" v-model="form.dealer" filterable placeholder="请选择经销商" @change="changeDealer">
38 38
           <el-option
39 39
             v-for="(option, index) in dealer"
40 40
             :key="index"
@@ -47,7 +47,7 @@
47 47
       <div class="cell clearfix">
48 48
         <label class="title"><span class="name">厂商</span> : </label>
49 49
 
50
-        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer">
50
+        <el-select size="small" v-model="form.manufacturer" filterable placeholder="请选择厂商" @change="changeManufacturer">
51 51
           <el-option
52 52
             v-for="(option, index) in manufacturer"
53 53
             :key="index"

+ 2 - 2
src/xt_pages/stock/drugs/drugStockInOrderAdd.vue View File

@@ -34,7 +34,7 @@
34 34
 
35 35
       <div class="cell clearfix">
36 36
         <label class="title"><span class="name">经销商</span> : </label>
37
-        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
37
+        <el-select size="small" v-model="form.dealer" filterable placeholder="请选择经销商" @change="changeDealer">
38 38
           <el-option
39 39
             v-for="(option, index) in dealer"
40 40
             :key="index"
@@ -47,7 +47,7 @@
47 47
       <div class="cell clearfix">
48 48
         <label class="title"><span class="name">厂商</span> : </label>
49 49
 
50
-        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商"
50
+        <el-select size="small" v-model="form.manufacturer" filterable placeholder="请选择厂商"
51 51
                    @change="changeManufacturer">
52 52
           <el-option
53 53
             v-for="(option, index) in manufacturer"

+ 2 - 2
src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue View File

@@ -62,7 +62,7 @@
62 62
         <el-select
63 63
           size="small"
64 64
           v-model="form.dealer"
65
-          clearable
65
+          filterable
66 66
           placeholder="请选择经销商"
67 67
           @change="changeDealer"
68 68
         >
@@ -81,7 +81,7 @@
81 81
         <el-select
82 82
           size="small"
83 83
           v-model="form.manufacturer"
84
-          clearable
84
+          filterable
85 85
           placeholder="请选择厂商"
86 86
           @change="changeManufacturer"
87 87
         >

+ 2 - 2
src/xt_pages/stock/salesReturnOrderAdd.vue View File

@@ -28,7 +28,7 @@
28 28
 
29 29
       <div class="cell clearfix">
30 30
         <label class="title"><span class="name">经销商</span> : </label>
31
-        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
31
+        <el-select size="small" v-model="form.dealer" filterable placeholder="请选择经销商" @change="changeDealer">
32 32
           <el-option
33 33
             v-for="(option, index) in dealer"
34 34
             :key="index"
@@ -41,7 +41,7 @@
41 41
       <div class="cell clearfix">
42 42
         <label class="title"><span class="name">厂商</span> : </label>
43 43
 
44
-        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer">
44
+        <el-select size="small" v-model="form.manufacturer" filterable placeholder="请选择厂商" @change="changeManufacturer">
45 45
           <el-option
46 46
             v-for="(option, index) in manufacturer"
47 47
             :key="index"

+ 43 - 12
src/xt_pages/stock/stockInOrderAdd.vue View File

@@ -28,8 +28,9 @@
28 28
 
29 29
       <div class="cell clearfix">
30 30
         <label class="title"><span class="name">经销商</span> : </label>
31
-        <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
32
-          <el-option
31
+       
32
+       <el-select size="small" v-model="form.dealer" filterable placeholder="请选择经销商"  @change="changeDealer">
33
+           <el-option
33 34
             v-for="(option, index) in dealer"
34 35
             :key="index"
35 36
             :label="option.dealer_name"
@@ -41,7 +42,7 @@
41 42
       <div class="cell clearfix">
42 43
         <label class="title"><span class="name">厂商</span> : </label>
43 44
 
44
-        <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商"
45
+        <el-select size="small" v-model="form.manufacturer" filterable placeholder="请选择厂商"
45 46
                    @change="changeManufacturer">
46 47
           <el-option
47 48
             v-for="(option, index) in manufacturer"
@@ -61,12 +62,12 @@
61 62
           <el-table-column align="center" width="200">
62 63
 
63 64
             <template slot="header" slot-scope="scope">
64
-              <span>商品类型<span style="color: red">*</span></span>
65
+              <span>耗材类型<span style="color: red">*</span></span>
65 66
             </template>
66 67
 
67 68
             <template slot-scope="scope">
68 69
               <el-form-item style="padding-top: 15px;margin-left: 10px;margin-right: 10px">
69
-                <el-input placeholder="请输入商品类型" v-model="scope.row.good_type_id"
70
+                <el-input placeholder="请输入耗材类型" v-model="scope.row.good_type_id"
70 71
                           :value="typeName(scope.row.good_type_id)"
71 72
                           @focus="showDialog(scope.$index, scope.row)"></el-input>
72 73
               </el-form-item>
@@ -86,7 +87,24 @@
86 87
 
87 88
             </template>
88 89
           </el-table-column>
89
-
90
+          <el-table-column align="center" width="200">
91
+             <template slot="header" slot-scope="scope">
92
+              <span>单位<span style="color: red">*</span></span>
93
+            </template>
94
+            <template slot-scope="scope">
95
+              <el-form-item style="padding-top:15px">
96
+              <el-select v-model="scope.row.good_unit" style="width:160px;" placeholder="请选择">
97
+                 <el-option
98
+                   v-for="(item,index) in propForm.goodUnit"
99
+                   :key="index"
100
+                   :label="item.name"
101
+                   :value="item.id">
102
+                </el-option>
103
+              </el-select>
104
+ 
105
+              </el-form-item>
106
+            </template>
107
+          </el-table-column>
90 108
 
91 109
           <el-table-column align="center" width="150">
92 110
             <template slot="header" slot-scope="scope">
@@ -195,7 +213,7 @@
195 213
 <script>
196 214
   import stockInDialog from './Dialog/stockInDialog'
197 215
   import { uParseTime } from '@/utils/tools'
198
-
216
+ import {getDataConfig } from "@/utils/data";
199 217
   import {
200 218
     deleteWarehouseInfo,
201 219
     GetAllConfig,
@@ -340,7 +358,9 @@
340 358
         this.propForm.formValue = {}
341 359
         this.propForm.isCreated = 1
342 360
         this.isVisibility = true
343
-      }, comfirm: function(val) {
361
+      },
362
+       comfirm: function(val) {
363
+        console.log("val99999999999999",val)
344 364
         this.propForm.goodType = []
345 365
         this.propForm.goods = []
346 366
 
@@ -352,7 +372,7 @@
352 372
               this.recordInfo.recordData[this.currentIndex].good_type_id = val.selectedGoodInfo[i].good_type_id
353 373
               this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
354 374
               this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].buy_price.toString()
355
-
375
+              this.recordInfo.recordData[this.currentIndex].good_unit = val.selectedGoodInfo[i].good_unit
356 376
             } else {
357 377
               const tempForm = {}
358 378
               tempForm['good_type_id'] =val.selectedGoodInfo[i].good_type_id
@@ -365,6 +385,7 @@
365 385
               tempForm['remark'] = ''
366 386
               tempForm['dealer'] = ''
367 387
               tempForm['manufacturer'] = ''
388
+              tempForm['good_unit'] = val.selectedGoodInfo[i].good_unit
368 389
               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
369 390
             }
370 391
           }
@@ -434,6 +455,7 @@
434 455
         }
435 456
         return name
436 457
       }, specificationName: function(good_info_id) {
458
+        console.log("333333333",this.goodInfo)
437 459
         let name = ''
438 460
         for (let i = 0; i < this.goodInfo.length; i++) {
439 461
           if (this.goodInfo[i].id == good_info_id) {
@@ -466,13 +488,15 @@
466 488
           return ''
467 489
         }
468 490
         return Math.round(parseFloat(val) * 100) / 100
469
-      }, GetWarehouseInfoByOrdeNumber: function() {
491
+      }, 
492
+      GetWarehouseInfoByOrdeNumber: function() {
470 493
         const params = {
471 494
           'warehousing_order': sessionStorage.getItem('warehousing_orders')
472 495
         }
473 496
         this.recordInfo.recordData = []
474 497
         getWarehouseInfoByOrdeNumber(params).then(response => {
475 498
           if (response.data.state != 0) {
499
+             console.log("8888888888mma",response.data.data.info)
476 500
             for (let i = 0; i < response.data.data.info.length; i++) {
477 501
               this.recordInfo.recordData.push(response.data.data.info[i])
478 502
             }
@@ -584,6 +608,8 @@
584 608
         this.$refs['tableForm'].validate((valid) => {
585 609
           if (valid) {
586 610
             const array = this.recordInfo.recordData
611
+            console.log("array9999999",array)
612
+           
587 613
             for (let i = 0; i < array.length; i++) {
588 614
               if (array[i].good_type_id == 0) {
589 615
                 this.$message.error('商品类型不能为空')
@@ -623,7 +649,10 @@
623 649
 
624 650
       }, changeDealer(val) {
625 651
 
626
-      }
652
+      },
653
+      getDataConfig(module, filed_name){
654
+         return getDataConfig(module, filed_name)
655
+       },
627 656
     }
628 657
     ,
629 658
     created() {
@@ -648,10 +677,12 @@
648 677
       tempObj['remark'] = ''
649 678
       tempObj['dealer'] = ''
650 679
       tempObj['manufacturer'] = ''
651
-
680
+      tempObj['good_unit'] = ''
652 681
       this.recordInfo.recordData.push(tempObj)
653 682
       this.GetConfigInfo()
654 683
       this.propForm.goodUnit = this.$store.getters.good_unit
684
+
685
+      console.log("单位",this.getDataConfig('hemodialysis','units'))
655 686
     }
656 687
 
657 688
   }

+ 2 - 2
src/xt_pages/stock/stockOutOrderAdd.vue View File

@@ -65,7 +65,7 @@
65 65
         <el-select
66 66
           size="small"
67 67
           v-model="form.dealer"
68
-          clearable
68
+          filterable
69 69
           placeholder="请选择经销商"
70 70
           @change="changeDealer"
71 71
         >
@@ -84,7 +84,7 @@
84 84
         <el-select
85 85
           size="small"
86 86
           v-model="form.manufacturer"
87
-          clearable
87
+          filterable
88 88
           placeholder="请选择厂商"
89 89
           @change="changeManufacturer"
90 90
         >

+ 16 - 0
src/xt_pages/stock/stockQuery.vue View File

@@ -95,6 +95,11 @@
95 95
             <span>{{ scope.row.specification_name }}</span>
96 96
           </template>
97 97
         </el-table-column>
98
+        <el-table-column label="单位" align="center">
99
+          <template slot-scope="scope">
100
+            <span>{{getUnit(scope.row.good_unit)}}</span>
101
+          </template>
102
+        </el-table-column>
98 103
         <el-table-column label="入库数量" align="center">
99 104
           <template slot-scope="scope">
100 105
             <span
@@ -370,6 +375,17 @@ export default {
370 375
       toPrint(){
371 376
         this.$router.push("/stock/stockprint?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keywords+"&type_name="+this.type_name)
372 377
         
378
+      },
379
+
380
+      getUnit(id){
381
+        
382
+        var name = ""
383
+        for(let i=0;i<this.$store.getters.good_unit.length;i++){
384
+           if(id == this.$store.getters.good_unit[i].id){
385
+              name = this.$store.getters.good_unit[i].name
386
+           } 
387
+        }
388
+        return name
373 389
       }
374 390
   }
375 391
 };

+ 7 - 1
src/xt_pages/user/patients.vue View File

@@ -1435,7 +1435,13 @@
1435 1435
            if(response.data.state == 1){
1436 1436
              this.gridData = response.data.data.patients;
1437 1437
              this.totalOne = response.data.data.total;
1438
-             this.value = response.data.data.total
1438
+             var  value = response.data.data.total
1439
+             if(value == 0){
1440
+               this.value = ""
1441
+             }
1442
+             if(value != 0){
1443
+               this.value = value
1444
+             }
1439 1445
            }
1440 1446
         })
1441 1447
       },