See999 4 years ago
parent
commit
2b0d4db1f3

+ 1 - 1
src/xt_pages/dialysis/allSummaryDialog_print.vue View File

70
         return{
70
         return{
71
             crumbs: [
71
             crumbs: [
72
                 { path: false, name: '耗材药品' },
72
                 { path: false, name: '耗材药品' },
73
-                { path: false, name: '药品打印' }
73
+                { path: false, name: '打印' }
74
             ],
74
             ],
75
             tableData:[],
75
             tableData:[],
76
             start_time:"",
76
             start_time:"",

+ 1 - 1
src/xt_pages/dialysis/components/allSummaryDialog.vue View File

110
         },
110
         },
111
         toPrint(){
111
         toPrint(){
112
             this.$router.push({
112
             this.$router.push({
113
-                path: '/dialysis/allsummarydialog_print?startime='+this.start_time+"&endtime="+this.end_time,
113
+                path: '/dialysis/allsummarydialog_print?startime='+this.start_time+"&endtime="+this.end_time + "&type=3",
114
                 // query: { date: date }
114
                 // query: { date: date }
115
             })
115
             })
116
         },
116
         },

+ 1 - 1
src/xt_pages/dialysis/components/consumablesDialog.vue View File

24
 
24
 
25
     </div>
25
     </div>
26
     <div style="margin-top:10px;">
26
     <div style="margin-top:10px;">
27
-      <el-table :data="tableData" border style="width: 100%" height="100%">
27
+      <el-table :data="tableData" border style="width: 100%" height="300px">
28
         <el-table-column align="center" prop="date" label="商品类型" width="180">
28
         <el-table-column align="center" prop="date" label="商品类型" width="180">
29
           <template slot-scope="scope">
29
           <template slot-scope="scope">
30
             {{scope.row.good_type_name}}
30
             {{scope.row.good_type_name}}

+ 1 - 1
src/xt_pages/dialysis/components/dialysisParameters.vue View File

317
              sch_ids.push(this.selecting_schs[index].id);
317
              sch_ids.push(this.selecting_schs[index].id);
318
          }
318
          }
319
          this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids);
319
          this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids);
320
-         this.$router.push("/dialysis/dialysisParameters_print?startime="+this.start_time)
320
+         this.$router.push("/dialysis/dialysisParameters_print?startime="+this.start_time + "&type=2")
321
         },
321
         },
322
        handleSizeChange(val) {
322
        handleSizeChange(val) {
323
         this.limit = val;
323
         this.limit = val;

+ 1 - 1
src/xt_pages/dialysis/components/dialysisParametersDialog.vue View File

111
             this.$router.push({
111
             this.$router.push({
112
                 // path: '/dialysis/dialysisParameters_print',
112
                 // path: '/dialysis/dialysisParameters_print',
113
                 // query: { date: date }
113
                 // query: { date: date }
114
-                path:"/dialysis/dialysisdrugs_print?startime="+this.query.start_time+"&endtime="+this.query.end_time
114
+                path:"/dialysis/dialysisdrugs_print?startime="+this.query.start_time+"&endtime="+this.query.end_time + "&type=2"
115
             })
115
             })
116
         },
116
         },
117
        selectStartime() {
117
        selectStartime() {

+ 12 - 5
src/xt_pages/dialysis/consumableDrugs.vue View File

5
         </div>
5
         </div>
6
         <div class="app-container">
6
         <div class="app-container">
7
             <el-tabs v-model="activeName" @tab-click="handleClick">
7
             <el-tabs v-model="activeName" @tab-click="handleClick">
8
-                <el-tab-pane label="透析耗材" name="first">
8
+                <el-tab-pane label="透析耗材" name="1">
9
                     <consumables></consumables>
9
                     <consumables></consumables>
10
                 </el-tab-pane>
10
                 </el-tab-pane>
11
                 <!-- <el-tab-pane label="透析药品" name="second">
11
                 <!-- <el-tab-pane label="透析药品" name="second">
12
                     <dialysis-drugs></dialysis-drugs>
12
                     <dialysis-drugs></dialysis-drugs>
13
                 </el-tab-pane> -->
13
                 </el-tab-pane> -->
14
-                <el-tab-pane label="透析参数" name="third">
14
+                <el-tab-pane label="透析参数" name="2">
15
                     <dialysis-parameters></dialysis-parameters>
15
                     <dialysis-parameters></dialysis-parameters>
16
                 </el-tab-pane>
16
                 </el-tab-pane>
17
-                <el-tab-pane label="汇总" name="fourth">
17
+                <el-tab-pane label="汇总" name="3">
18
                     <all-summary></all-summary>
18
                     <all-summary></all-summary>
19
                 </el-tab-pane>
19
                 </el-tab-pane>
20
             </el-tabs>
20
             </el-tabs>
43
                 { path: false, name: "透析管理" },
43
                 { path: false, name: "透析管理" },
44
                 { path: false, name: "耗材药品" }
44
                 { path: false, name: "耗材药品" }
45
             ],
45
             ],
46
-            activeName:'first'
46
+            activeName:'1'
47
         }
47
         }
48
     },
48
     },
49
     methods:{
49
     methods:{
50
         handleClick(){}
50
         handleClick(){}
51
-    }
51
+    },
52
+    beforeRouteEnter: (to, from, next) => {
53
+        next(vm => {
54
+            if(from.query.type){
55
+                vm.activeName = from.query.type
56
+            }
57
+        });
58
+    },
52
 }
59
 }
53
 </script>
60
 </script>

+ 1 - 1
src/xt_pages/dialysis/consumables_print.vue View File

67
           },
67
           },
68
             crumbs: [
68
             crumbs: [
69
                 { path: false, name: '耗材药品' },
69
                 { path: false, name: '耗材药品' },
70
-                { path: false, name: '药品打印' }
70
+                { path: false, name: '打印' }
71
             ],
71
             ],
72
             start_time:"",
72
             start_time:"",
73
             end_time:"",
73
             end_time:"",

+ 1 - 1
src/xt_pages/dialysis/dialysisDrugs_print.vue View File

67
         return{
67
         return{
68
             crumbs: [
68
             crumbs: [
69
                 { path: false, name: '耗材药品' },
69
                 { path: false, name: '耗材药品' },
70
-                { path: false, name: '药品打印' }
70
+                { path: false, name: '打印' }
71
             ],
71
             ],
72
             tableData:[],
72
             tableData:[],
73
             start_time:"",
73
             start_time:"",

+ 1 - 1
src/xt_pages/dialysis/dialysisParameters_print.vue View File

121
         return{
121
         return{
122
             crumbs: [
122
             crumbs: [
123
                 { path: false, name: '耗材药品' },
123
                 { path: false, name: '耗材药品' },
124
-                { path: false, name: '参数打印' }
124
+                { path: false, name: '打印' }
125
             ],
125
             ],
126
             tableData:[],
126
             tableData:[],
127
             nowDate:"",
127
             nowDate:"",