소스 검색

Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

see999 3 년 전
부모
커밋
448780732f

+ 16 - 33
src/xt_pages/outpatientCharges/newStatementPrint.vue 파일 보기

@@ -13,8 +13,7 @@
13 13
     </template>
14 14
 
15 15
     <div class='dialysisPage' style="padding-top:40px;">
16
-      <printOne v-if="org_id != 9990" :info="info" :p_admin="p_admin" :charge_admin="charge_admin"></printOne>
17
-      <printTwo v-if="org_id == 9990" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
16
+      <printOne :info="info" :p_admin="p_admin" :charge_admin="charge_admin"></printOne>
18 17
     </div>
19 18
   </div>
20 19
 </template>
@@ -31,14 +30,12 @@
31 30
   import BreadCrumb from "@/xt_pages/components/bread-crumb";
32 31
   import print from "print-js";
33 32
   import printOne from "./statementTemplate/printOne"
34
-  import printTwo from "./statementTemplate/printTwo"
35 33
   import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
36 34
   export default {
37 35
     name: "newStatementPrint",
38 36
     components: {
39 37
       BreadCrumb,
40
-      printOne,
41
-      printTwo
38
+      printOne
42 39
     },
43 40
     props:{
44 41
       paramsObj:Object
@@ -62,8 +59,6 @@
62 59
         info:null,
63 60
         p_admin:{},
64 61
         charge_admin:{},
65
-        org_id:'',
66
-        order_infos:null
67 62
       };
68 63
     },
69 64
     methods:{
@@ -71,26 +66,14 @@
71 66
         var ptime = Math.round(new Date().getTime() / 1000);
72 67
         this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
73 68
 
74
-        if(this.org_id != 9990){
75
-          const style =
69
+        const style =
76 70
           '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
77
-          printJS({
78
-            printable: "statement-print",
79
-            type: "html",
80
-            style: style,
81
-            scanStyles: false
82
-          });
83
-        }else {
84
-          const style =
85
-          '@media print {#statement-print{font-size:12px;width:600px;margin:0 auto;}.statementTitle{font-size: 22px;text-align: center;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
86
-          printJS({
87
-            printable: "statement-print",
88
-            type: "html",
89
-            style: style,
90
-            scanStyles: false
91
-          });
92
-        }
93
-
71
+        printJS({
72
+          printable: "statement-print",
73
+          type: "html",
74
+          style: style,
75
+          scanStyles: false
76
+        });
94 77
 
95 78
         // if (this.org_template_info.template_id == 1) {
96 79
         //   printJS({
@@ -164,6 +147,8 @@
164 147
         //       console.log("doctorporject",doctorPorject)
165 148
         //     }
166 149
         // })
150
+      },  getTimes(time) {
151
+        return uParseTime(time, '{y}-{m}-{d}')
167 152
       },
168 153
       searchAction(){
169 154
 
@@ -190,8 +175,6 @@
190 175
                 that.info = response.data.data.info;
191 176
                 that.p_admin = response.data.data.printor_admin;
192 177
                 that.charge_admin = response.data.data.charge_admin;
193
-                that.order_infos = response.data.data;
194
-
195 178
 
196 179
 
197 180
                 that.info['p_admin'] =  that.p_admin;
@@ -203,8 +186,6 @@
203 186
                 that.info['diagnosis'] =  response.data.data.diagnosis;
204 187
 
205 188
 
206
-                console.log(that.info);
207
-
208 189
                 that.info['bed_cost_total'] = response.data.data.bedCostTotal;
209 190
                 that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal;
210 191
                 that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal;
@@ -242,7 +223,11 @@
242 223
                 that.info['treat_cost_total'] = response.data.data.treatCostTotal;
243 224
                 that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal;
244 225
                 that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal;
245
-                console.log(this.info)
226
+
227
+                if(that.paramsObj.settle_type != 1){
228
+                  that.info.begndate = that.getTimes(that.paramsObj.start_time)
229
+                  that.info.enddate = that.getTimes(that.paramsObj.end_time)
230
+                }
246 231
               }
247 232
             })
248 233
             .catch(function (error) {
@@ -254,9 +239,7 @@
254 239
     },
255 240
 
256 241
     created() {
257
-      this.org_id = this.$store.getters.xt_user.org_id;
258 242
       this.getInfo(this.paramsObj.order_id)
259
-
260 243
     },
261 244
     watch:{
262 245
       paramsObj:{//深度监听,可监听到对象、数组的变化

+ 4 - 1
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue 파일 보기

@@ -1713,7 +1713,10 @@
1713 1713
         } else if (index == 9) {
1714 1714
           this.statementVisible = true;
1715 1715
           let obj = {
1716
-            order_id: this.order.id
1716
+            order_id: this.order.id,
1717
+            settle_type:this.order.settle_type,
1718
+            start_time:this.order.settle_start_time,
1719
+            end_time:this.order.settle_end_time,
1717 1720
           };
1718 1721
           this.orderObj = obj
1719 1722
           // this.$refs.print.getInfo(this.order.id)

+ 370 - 363
src/xt_pages/outpatientCharges/statementPrint.vue 파일 보기

@@ -1,106 +1,106 @@
1 1
 <template>
2 2
   <div>
3
-       <template>
4
-        <el-button
5
-          style="position:fixed;right:25px;z-index:999"
6
-          :loading="loading"
7
-          size="small"
8
-          icon="el-icon-printer"
9
-          @click="printThisPage"
10
-          type="primary"
11
-          >打印</el-button
12
-        >
13
-      </template>
14
-
15
-      <div class='dialysisPage' style="padding-top:40px;">
16
-        <printOne :info="info" v-if="org_id != 9990"></printOne>
17
-        <printTwo  :info="info" v-if="org_id == 9990"></printTwo>
18
-      </div>
3
+    <template>
4
+      <el-button
5
+        style="position:fixed;right:25px;z-index:999"
6
+        :loading="loading"
7
+        size="small"
8
+        icon="el-icon-printer"
9
+        @click="printThisPage"
10
+        type="primary"
11
+      >打印</el-button
12
+      >
13
+    </template>
14
+
15
+    <div class='dialysisPage' style="padding-top:40px;">
16
+      <printOne :info="info" v-if="org_id != 9990"></printOne>
17
+      <printTwo  :info="info" v-if="org_id == 9990"></printTwo>
18
+    </div>
19 19
   </div>
20 20
 </template>
21 21
 
22 22
 <script>
23 23
 
24 24
 
25
-import { parseTime } from "@/utils";
26
-import { getDialysisRecord } from "@/api/dialysis";
27
-import { getDataConfig } from "@/utils/data";
28
-import { jsGetAge, uParseTime } from "@/utils/tools";
29
-import axios from 'axios'
30
-
31
-import BreadCrumb from "@/xt_pages/components/bread-crumb";
32
-import print from "print-js";
33
-import printOne from "./statementTemplate/printOne"
34
-import printTwo from "./statementTemplate/printTwo"
35
-import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
36
-export default {
37
-  name: "dialysisPrintOrder",
38
-  components: {
39
-    BreadCrumb,
40
-    printOne,
41
-    printTwo
42
-  },
43
-  props:{
44
-    paramsObj:Object
45
-  },
46
-  data() {
47
-    return {
48
-      crumbs: [
49
-        { path: false, name: '门诊医生站' },
50
-        { path: false, name: '打印' }
51
-      ],
52
-      record_date:"",
53
-      patientTableData:[],
54
-      advicePrint:[],
55
-      hisPatient:{},
56
-      patient:{},
57
-      search_input:"",
58
-      loading:false,
59
-      patient_id:0,
60
-      prescription_id:0,
61
-      ids:'',
62
-      info:null,
63
-      org_id:""
64
-    };
65
-  },
66
-  methods:{
67
-    printThisPage() {
68
-      var ptime = Math.round(new Date().getTime() / 1000);
69
-      this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
70
-
71
-      const style =
72
-        '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
25
+  import { parseTime } from "@/utils";
26
+  import { getDialysisRecord } from "@/api/dialysis";
27
+  import { getDataConfig } from "@/utils/data";
28
+  import { jsGetAge, uParseTime } from "@/utils/tools";
29
+  import axios from 'axios'
30
+
31
+  import BreadCrumb from "@/xt_pages/components/bread-crumb";
32
+  import print from "print-js";
33
+  import printOne from "./statementTemplate/printOne"
34
+  import printTwo from "./statementTemplate/printTwo"
35
+  import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
36
+  export default {
37
+    name: "dialysisPrintOrder",
38
+    components: {
39
+      BreadCrumb,
40
+      printOne,
41
+      printTwo
42
+    },
43
+    props:{
44
+      paramsObj:Object
45
+    },
46
+    data() {
47
+      return {
48
+        crumbs: [
49
+          { path: false, name: '门诊医生站' },
50
+          { path: false, name: '打印' }
51
+        ],
52
+        record_date:"",
53
+        patientTableData:[],
54
+        advicePrint:[],
55
+        hisPatient:{},
56
+        patient:{},
57
+        search_input:"",
58
+        loading:false,
59
+        patient_id:0,
60
+        prescription_id:0,
61
+        ids:'',
62
+        info:null,
63
+        org_id:""
64
+      };
65
+    },
66
+    methods:{
67
+      printThisPage() {
68
+        var ptime = Math.round(new Date().getTime() / 1000);
69
+        this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
70
+
71
+        const style =
72
+          '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
73 73
         printJS({
74
-            printable: "statement-print",
75
-            type: "html",
76
-            style: style,
77
-            scanStyles: false
74
+          printable: "statement-print",
75
+          type: "html",
76
+          style: style,
77
+          scanStyles: false
78 78
         });
79 79
 
80
-      // if (this.org_template_info.template_id == 1) {
81
-      //   printJS({
82
-      //     printable: "dialysis-print-box",
83
-      //     type: "html",
84
-      //     style: style,
85
-      //     scanStyles: false
86
-      //   });
87
-      // }
88
-    },
89
-    getAllDoctorList(){
90
-      getAllDoctorList().then(response=>{
91
-        if(response.data.state == 1){
92
-               var doctor =  response.data.data.doctor;
93
-
94
-               this.doctorList = doctor
95
-             }
96
-         })
97
-     },
98
-    getAllHisPatientList(){
99
-         const params = {
100
-           record_date:this.record_date
101
-         };
102
-      getAllHisPatientList(params).then(response=>{
103
-         if(response.data.state == 1){
80
+        // if (this.org_template_info.template_id == 1) {
81
+        //   printJS({
82
+        //     printable: "dialysis-print-box",
83
+        //     type: "html",
84
+        //     style: style,
85
+        //     scanStyles: false
86
+        //   });
87
+        // }
88
+      },
89
+      getAllDoctorList(){
90
+        getAllDoctorList().then(response=>{
91
+          if(response.data.state == 1){
92
+            var doctor =  response.data.data.doctor;
93
+
94
+            this.doctorList = doctor
95
+          }
96
+        })
97
+      },
98
+      getAllHisPatientList(){
99
+        const params = {
100
+          record_date:this.record_date
101
+        };
102
+        getAllHisPatientList(params).then(response=>{
103
+          if(response.data.state == 1){
104 104
             this.patientTableData = response.data.data.list;
105 105
             this.patientTableDataTwo = response.data.data.list;
106 106
 
@@ -120,319 +120,326 @@ export default {
120 120
             // this.choosePatient(this.patientTableData[0])
121 121
             this.cal_one = cal_one;
122 122
             this.cal_two = cal_two
123
-         }
124
-      })
125
-    },
123
+          }
124
+        })
125
+      },
126 126
 
127
-    changePatient(row){
128
-      console.log("row",row);
129
-      this.patient_id = row.patient_id;
130
-      this.record_date = this.record_date;
131
-      this.prescription_id = this.prescription_id
132
-      //   var params = {
133
-      //     patient_id:row.patient_id,
134
-      //     record_date:this.record_date,
135
-      //     prescription_id:this.prescription_id,
136
-      //   }
137
-      // getPrescriptionPrint(params).then(response=>{
138
-      //     if(response.data.state == 1){
139
-      //       var advicePrint =  response.data.data.advicePrint
140
-      //       console.log("adviceprint",advicePrint)
141
-      //       this.advicePrint = advicePrint
142
-      //       // var hisPatient =  response.data.data.hisPatient
143
-      //       // console.log("hispatient",hisPatient)
144
-      //       // this.hisPatient = hisPatient
145
-      //       var patient =  response.data.data.patient
146
-      //       console.log("patient",patient)
147
-      //       this.patient = patient
148
-      //       var doctorPorject = response.data.data.doctorPorject
149
-      //       console.log("doctorporject",doctorPorject)
150
-      //     }
151
-      // })
152
-    },
153
-    searchAction(){
127
+      changePatient(row){
128
+        console.log("row",row);
129
+        this.patient_id = row.patient_id;
130
+        this.record_date = this.record_date;
131
+        this.prescription_id = this.prescription_id
132
+        //   var params = {
133
+        //     patient_id:row.patient_id,
134
+        //     record_date:this.record_date,
135
+        //     prescription_id:this.prescription_id,
136
+        //   }
137
+        // getPrescriptionPrint(params).then(response=>{
138
+        //     if(response.data.state == 1){
139
+        //       var advicePrint =  response.data.data.advicePrint
140
+        //       console.log("adviceprint",advicePrint)
141
+        //       this.advicePrint = advicePrint
142
+        //       // var hisPatient =  response.data.data.hisPatient
143
+        //       // console.log("hispatient",hisPatient)
144
+        //       // this.hisPatient = hisPatient
145
+        //       var patient =  response.data.data.patient
146
+        //       console.log("patient",patient)
147
+        //       this.patient = patient
148
+        //       var doctorPorject = response.data.data.doctorPorject
149
+        //       console.log("doctorporject",doctorPorject)
150
+        //     }
151
+        // })
152
+      }, getTimes(time) {
153
+        return uParseTime(time, '{y}-{m}-{d}')
154
+      },
155
+      searchAction(){
154 156
 
155
-    },
156
-    getInfo(order_id) {
157
-      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 ||  this.$store.getters.xt_user.org_id == 10106  ||  this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9990) {
157
+      },
158
+      getInfo(order_id) {
159
+        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 ||  this.$store.getters.xt_user.org_id == 10106  ||  this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9990) {
158 160
 
159
-        var that = this;
161
+          var that = this;
160 162
 
161
-        axios.get('http://127.0.0.1:9532/api/settle/query', {
162
-          params: {
163
-            order_id: order_id,
164
-            admin_user_id:this.$store.getters.xt_user.user.id,
163
+          axios.get('http://127.0.0.1:9532/api/settle/query', {
164
+            params: {
165
+              order_id: order_id,
166
+              admin_user_id:this.$store.getters.xt_user.user.id,
165 167
 
166
-          }
167
-        })
168
-          .then(function (response) {
169
-            if (response.data.state == 0) {
170
-              this.$message.error(response.data.msg);
171
-              return false
172
-            } else {
173
-              console.log("logloglog");
168
+            }
169
+          })
170
+            .then(function (response) {
171
+              if (response.data.state == 0) {
172
+                this.$message.error(response.data.msg);
173
+                return false
174
+              } else {
175
+                console.log("logloglog");
174 176
 
175
-              console.log(response.data.data.info);
176
-              that.info = response.data.data.info;
177
-              console.log(that.info);
178
-              that.p_admin = response.data.data.printor_admin;
179
-              that.charge_admin = response.data.data.charge_admin;
177
+                console.log(response.data.data.info);
178
+                that.info = response.data.data.info;
179
+                console.log(that.info);
180
+                that.p_admin = response.data.data.printor_admin;
181
+                that.charge_admin = response.data.data.charge_admin;
180 182
 
181
-              that.info['p_admin'] =  that.p_admin;
182
-              that.info['charge_admin'] =  that.charge_admin;
183
+                that.info['p_admin'] =  that.p_admin;
184
+                that.info['charge_admin'] =  that.charge_admin;
183 185
 
184
-              that.info['date'] =  response.data.data.date;
185
-              that.info['number'] =  response.data.data.number;
186
-              that.info['order_infos'] =  response.data.data.order_infos;
187
-              that.info['diagnosis'] =  response.data.data.diagnosis;
186
+                that.info['date'] =  response.data.data.date;
187
+                that.info['number'] =  response.data.data.number;
188
+                that.info['order_infos'] =  response.data.data.order_infos;
189
+                that.info['diagnosis'] =  response.data.data.diagnosis;
188 190
 
189 191
 
190
-              that.info['bed_cost_total'] = response.data.data.bedCostTotal;
191
-              that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal;
192
-              that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal;
192
+                that.info['bed_cost_total'] = response.data.data.bedCostTotal;
193
+                that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal;
194
+                that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal;
193 195
 
194
-              that.info['operation_cost_total'] = response.data.data.operationCostTotal;
195
-              that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal;
196
-              that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal;
196
+                that.info['operation_cost_total'] = response.data.data.operationCostTotal;
197
+                that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal;
198
+                that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal;
197 199
 
198
-              that.info['other_cost_total'] = response.data.data.otherCostTotal;
199
-              that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal;
200
-              that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal;
200
+                that.info['other_cost_total'] = response.data.data.otherCostTotal;
201
+                that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal;
202
+                that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal;
201 203
 
202
-              that.info['material_cost_total'] = response.data.data.materialCostTotal;
203
-              that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal;
204
-              that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal;
204
+                that.info['material_cost_total'] = response.data.data.materialCostTotal;
205
+                that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal;
206
+                that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal;
205 207
 
206
-              that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal;
207
-              that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal;
208
-              that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal;
208
+                that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal;
209
+                that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal;
210
+                that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal;
209 211
 
210
-              that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal;
211
-              that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal;
212
-              that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
212
+                that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal;
213
+                that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal;
214
+                that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
213 215
 
214 216
 
215
-              that.info['check_cost_total'] = response.data.data.checkCostTotal;
216
-              that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal;
217
-              that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal;
217
+                that.info['check_cost_total'] = response.data.data.checkCostTotal;
218
+                that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal;
219
+                that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal;
218 220
 
219 221
 
220
-              that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal;
221
-              that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal;
222
-              that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal;
222
+                that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal;
223
+                that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal;
224
+                that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal;
223 225
 
224
-              that.info['treat_cost_total'] = response.data.data.treatCostTotal;
225
-              that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal;
226
-              that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal;
227
-              that.info['date'] =  response.data.data.date;
228
-              that.info['number'] =  response.data.data.number;
229
-              that.info['order_infos'] =  response.data.data.order_infos;
230
-              that.info['diagnosis'] =  response.data.data.diagnosis
226
+                that.info['treat_cost_total'] = response.data.data.treatCostTotal;
227
+                that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal;
228
+                that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal;
229
+                that.info['date'] =  response.data.data.date;
230
+                that.info['number'] =  response.data.data.number;
231
+                that.info['order_infos'] =  response.data.data.order_infos;
232
+                that.info['diagnosis'] =  response.data.data.diagnosis
231 233
 
232
-            }
233
-          })
234
-          .catch(function (error) {
234
+                if(that.paramsObj.settle_type != 1){
235
+                  that.info.begndate = that.getTimes(that.paramsObj.start_time)
236
+                  that.info.enddate = that.getTimes(that.paramsObj.end_time)
237
+                }
235 238
 
236
-          });
237
-      }
238
-    }
239
+              }
240
+            })
241
+            .catch(function (error) {
239 242
 
240
-  },
243
+            });
244
+        }
245
+      }
241 246
 
242
-  created() {
243
-    this.getInfo(this.paramsObj.order_id);
244
-    this.org_id = this.$store.getters.xt_user.org_id;
245
-    console.log("this.org_id",this.org_id)
246
-  },
247
-  watch:{
248
-    paramsObj:{//深度监听,可监听到对象、数组的变化
249
-      handler(val, oldVal){
250
-        this.paramsObj = val;
251
-        this.getInfo(this.paramsObj.order_id)
247
+    },
252 248
 
253
-      },
254
-      deep:true
249
+    created() {
250
+      this.getInfo(this.paramsObj.order_id);
251
+      this.org_id = this.$store.getters.xt_user.org_id;
252
+      console.log("this.org_id",this.org_id)
253
+    },
254
+    watch:{
255
+      paramsObj:{//深度监听,可监听到对象、数组的变化
256
+        handler(val, oldVal){
257
+          this.paramsObj = val;
258
+          this.getInfo(this.paramsObj.order_id)
259
+
260
+        },
261
+        deep:true
262
+      }
255 263
     }
256
-  }
257 264
 
258
-};
265
+  };
259 266
 </script>
260 267
 
261 268
 <style>
262
-.dialysis-print-order {
263
-  width: 960px;
264
-  margin: 0 auto;
265
-}
266
-
267
-.dialysis-print-order .order-yy-name {
268
-  margin: auto;
269
-  text-align: center;
270
-  font-size: 20px;
271
-  letter-spacing: 5px;
272
-}
273
-
274
-.dialysis-print-order .order-title {
275
-  margin: auto;
276
-  font-weight: 600;
277
-  text-align: center;
278
-  font-size: 22px;
279
-  padding: 10px;
280
-}
281
-
282
-.dialysis-print-order .table-box {
283
-  width: 100%;
284
-  line-height: 23px;
285
-  font-size: 14px;
286
-}
287
-
288
-.dialysis-print-order .print-table {
289
-  width: 100%;
290
-  text-align: center;
291
-  border-collapse: collapse;
292
-  line-height: 40px;
293
-  font-size: 14px;
294
-  border-color: #000;
295
-}
296
-
297
-.dialysis-print-order .print-table-no {
298
-  width: 100%;
299
-  text-align: center;
300
-  border-collapse: collapse;
301
-  font-size: 14px;
302
-}
303
-
304
-.dialysis-print-order .under-line {
305
-  border-bottom: 1px solid #999;
306
-  width: 95%;
307
-  text-align: center;
308
-  margin-left: 2px;
309
-}
310
-
311
-.dialysis-print-order .title-box {
312
-  text-align: center;
313
-  font-size: 16px;
314
-}
315
-
316
-.dialysis-print-order .radio-lebel-box {
317
-  font-weight: 400;
318
-  cursor: pointer;
319
-}
320
-
321
-.dialysis-print-order .radio-no {
322
-  opacity: 0;
323
-  outline: none;
324
-  position: absolute;
325
-  margin: 0;
326
-  width: 0;
327
-  height: 0;
328
-  z-index: -1;
329
-}
330
-
331
-.dialysis-print-order .radio-inner {
332
-  white-space: nowrap;
333
-  cursor: pointer;
334
-  outline: none;
335
-  display: inline-block;
336
-  line-height: 1;
337
-  position: relative;
338
-  vertical-align: middle;
339
-}
340
-
341
-.dialysis-print-order .radio-fang {
342
-  display: inline-block;
343
-  position: relative;
344
-  border: 1px solid #000;
345
-  box-sizing: border-box;
346
-  width: 14px;
347
-  height: 14px;
348
-  background-color: #fff;
349
-  z-index: 1;
350
-  transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
269
+  .dialysis-print-order {
270
+    width: 960px;
271
+    margin: 0 auto;
272
+  }
273
+
274
+  .dialysis-print-order .order-yy-name {
275
+    margin: auto;
276
+    text-align: center;
277
+    font-size: 20px;
278
+    letter-spacing: 5px;
279
+  }
280
+
281
+  .dialysis-print-order .order-title {
282
+    margin: auto;
283
+    font-weight: 600;
284
+    text-align: center;
285
+    font-size: 22px;
286
+    padding: 10px;
287
+  }
288
+
289
+  .dialysis-print-order .table-box {
290
+    width: 100%;
291
+    line-height: 23px;
292
+    font-size: 14px;
293
+  }
294
+
295
+  .dialysis-print-order .print-table {
296
+    width: 100%;
297
+    text-align: center;
298
+    border-collapse: collapse;
299
+    line-height: 40px;
300
+    font-size: 14px;
301
+    border-color: #000;
302
+  }
303
+
304
+  .dialysis-print-order .print-table-no {
305
+    width: 100%;
306
+    text-align: center;
307
+    border-collapse: collapse;
308
+    font-size: 14px;
309
+  }
310
+
311
+  .dialysis-print-order .under-line {
312
+    border-bottom: 1px solid #999;
313
+    width: 95%;
314
+    text-align: center;
315
+    margin-left: 2px;
316
+  }
317
+
318
+  .dialysis-print-order .title-box {
319
+    text-align: center;
320
+    font-size: 16px;
321
+  }
322
+
323
+  .dialysis-print-order .radio-lebel-box {
324
+    font-weight: 400;
325
+    cursor: pointer;
326
+  }
327
+
328
+  .dialysis-print-order .radio-no {
329
+    opacity: 0;
330
+    outline: none;
331
+    position: absolute;
332
+    margin: 0;
333
+    width: 0;
334
+    height: 0;
335
+    z-index: -1;
336
+  }
337
+
338
+  .dialysis-print-order .radio-inner {
339
+    white-space: nowrap;
340
+    cursor: pointer;
341
+    outline: none;
342
+    display: inline-block;
343
+    line-height: 1;
344
+    position: relative;
345
+    vertical-align: middle;
346
+  }
347
+
348
+  .dialysis-print-order .radio-fang {
349
+    display: inline-block;
350
+    position: relative;
351
+    border: 1px solid #000;
352
+    box-sizing: border-box;
353
+    width: 14px;
354
+    height: 14px;
355
+    background-color: #fff;
356
+    z-index: 1;
357
+    transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
351 358
     background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
352
-}
353
-
354
-.dialysis-print-order .is-checked-radio::after {
355
-  content: "√";
356
-  font-size: 15px;
357
-}
358
-
359
-.dialysis-print-order .print-table-no tr td {
360
-  padding: 8px 5px;
361
-  line-height: 25px;
362
-}
363
-
364
-.dialysis-print-order .print-table tr td {
365
-  padding: 1px 1px;
366
-  /*line-height: 25px;*/
367
-}
368
-
369
-.es-img {
370
-  height: 30px;
371
-}
372
-
373
-.advice-name {
374
-  text-align: left;
375
-}
376
-
377
-.advice-children {
378
-  display: flex;
379
-}
380
-
381
-.title-box-pro {
382
-  border: 0 #fff;
383
-  line-height: 25px;
384
-  height: 25px;
385
-  text-align: left;
386
-  padding-left: 10px !important;
387
-}
388
-.title-box-pro-tr {
389
-  border: 0 #fff;
390
-}
391
-.text-align-left {
392
-  text-align: left !important;
393
-  padding-left: 10px !important;
394
-  font-size: 14px !important;
395
-  line-height: 25px;
396
-}
397
-.print-table-tr-new td {
398
-  line-height: 20px !important;
399
-}
400
-.border-top-solid {
401
-  border: solid 1px #000;
402
-}
403
-.print-template-two tr {
404
-  line-height: 30px;
405
-}
406
-
407
-.table-box1 {
408
-  border: 1px solid #000;
409
-  width: 100%;
410
-  line-height: 30px;
411
-  font-size: 14px;
412
-  border-collapse: collapse;
413
-}
414
-.table-box1 tr {
415
-  border-bottom: 1px solid #000;
416
-}
359
+  }
360
+
361
+  .dialysis-print-order .is-checked-radio::after {
362
+    content: "√";
363
+    font-size: 15px;
364
+  }
365
+
366
+  .dialysis-print-order .print-table-no tr td {
367
+    padding: 8px 5px;
368
+    line-height: 25px;
369
+  }
370
+
371
+  .dialysis-print-order .print-table tr td {
372
+    padding: 1px 1px;
373
+    /*line-height: 25px;*/
374
+  }
375
+
376
+  .es-img {
377
+    height: 30px;
378
+  }
379
+
380
+  .advice-name {
381
+    text-align: left;
382
+  }
383
+
384
+  .advice-children {
385
+    display: flex;
386
+  }
387
+
388
+  .title-box-pro {
389
+    border: 0 #fff;
390
+    line-height: 25px;
391
+    height: 25px;
392
+    text-align: left;
393
+    padding-left: 10px !important;
394
+  }
395
+  .title-box-pro-tr {
396
+    border: 0 #fff;
397
+  }
398
+  .text-align-left {
399
+    text-align: left !important;
400
+    padding-left: 10px !important;
401
+    font-size: 14px !important;
402
+    line-height: 25px;
403
+  }
404
+  .print-table-tr-new td {
405
+    line-height: 20px !important;
406
+  }
407
+  .border-top-solid {
408
+    border: solid 1px #000;
409
+  }
410
+  .print-template-two tr {
411
+    line-height: 30px;
412
+  }
413
+
414
+  .table-box1 {
415
+    border: 1px solid #000;
416
+    width: 100%;
417
+    line-height: 30px;
418
+    font-size: 14px;
419
+    border-collapse: collapse;
420
+  }
421
+  .table-box1 tr {
422
+    border-bottom: 1px solid #000;
423
+  }
417 424
 </style>
418 425
 
419 426
 <style lang="scss">
420 427
 
421
-.newContainer{
428
+  .newContainer{
422 429
   .dialysisPage::-webkit-scrollbar {
423 430
     height: 15px;
424 431
   }
425 432
 
426 433
   .el-date-editor{
427
-    .el-input__inner{
428
-      padding-right:0px;
429
-    }
434
+  .el-input__inner{
435
+    padding-right:0px;
436
+  }
430 437
   }
431 438
   .el-table td, .el-table th{
432 439
     text-align: center;
433 440
   }
434
-}
435
-.newContainer::-webkit-scrollbar{
436
-  height: 15px !important;
437
-}
441
+  }
442
+  .newContainer::-webkit-scrollbar{
443
+    height: 15px !important;
444
+  }
438 445
 </style>

+ 4 - 1
src/xt_pages/outpatientCharges/summary.vue 파일 보기

@@ -371,7 +371,10 @@
371 371
         } else {
372 372
           this.statementVisible = true;
373 373
           let obj = {
374
-            order_id: row.id
374
+            order_id: row.id,
375
+            settle_type:row.settle_type,
376
+            start_time:row.settle_start_time,
377
+            end_time:row.settle_end_time,
375 378
           };
376 379
           this.orderObj = obj
377 380
         }

+ 3 - 1
src/xt_pages/role/components/AdminInfoForm.vue 파일 보기

@@ -440,7 +440,9 @@
440 440
 
441 441
         user_types: [
442 442
           { index: 2, name: '医生' },
443
-          { index: 3, name: '护士' }
443
+          { index: 3, name: '护士' },
444
+          { index:4,name:'行政'},
445
+          { index:5,name:'其他'}
444 446
         ],
445 447
         user_titles: [
446 448
           { index: 1, name: '医士' },