see999 пре 3 година
родитељ
комит
0638244498

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue Прегледај датотеку

@@ -1797,7 +1797,7 @@ export default {
1797 1797
           }
1798 1798
           this.check = response.data.data.check
1799 1799
           this.predialysis = response.data.data.PredialysisEvaluation
1800
-          console.log('透前评估', this.predialysis)
1800
+          // console.log('透前评估', this.predialysis)
1801 1801
           this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
1802 1802
             this.predialysis.blood_access_part_opera_id
1803 1803
           )

+ 23 - 0
src/xt_pages/outpatientCharges/components/chargeDialog.vue Прегледај датотеку

@@ -66,6 +66,19 @@
66 66
         </div>
67 67
       </el-form-item>
68 68
 
69
+      <el-form-item label="发票编码:">
70
+        <div style="display:flex;">
71
+          <el-input v-model.number="form.fapiao_code"></el-input>
72
+        </div>
73
+      </el-form-item>
74
+
75
+
76
+      <el-form-item label="发票号码:">
77
+        <div style="display:flex;">
78
+          <el-input v-model.number="form.fapiao_number"></el-input>
79
+        </div>
80
+      </el-form-item>
81
+
69 82
     </el-form>
70 83
 
71 84
     <span slot="footer" class="dialog-footer">
@@ -97,6 +110,9 @@
97 110
           reality_price:'',
98 111
           found_price:'',
99 112
           total:0,
113
+          fapiao_code:"",
114
+          fapiao_number:""
115
+
100 116
 
101 117
         },
102 118
         payWays: [
@@ -121,6 +137,8 @@
121 137
           preferential_price:'',
122 138
           reality_price:'',
123 139
           found_price:'',
140
+          fapiao_code:"",
141
+          fapiao_number:""
124 142
         },
125 143
 
126 144
       }
@@ -154,6 +172,11 @@
154 172
         this.form.discount_price = 0.0
155 173
         this.form.preferential_price = 0.0
156 174
 
175
+        this.form.fapiao_code =""
176
+        this.form.fapiao_number = ""
177
+
178
+
179
+
157 180
         this.visibility = true
158 181
 
159 182
       }, hide: function () {

+ 5 - 5
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Прегледај датотеку

@@ -138,11 +138,11 @@
138 138
                         >退号
139 139
                         </el-button>
140 140
 
141
-                        <el-button
142
-                        v-if="$store.getters.xt_user.org_id == 4 || 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 == 9990"
143
-                        size="small" @click="open(11)" type="primary"
144
-                        >撤销明细
145
-                        </el-button>
141
+                        <!--<el-button-->
142
+                        <!--v-if="$store.getters.xt_user.org_id == 4 || 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 == 9990"-->
143
+                        <!--size="small" @click="open(11)" type="primary"-->
144
+                        <!--&gt;撤销明细-->
145
+                        <!--</el-button>-->
146 146
 
147 147
                     </div>
148 148
                     <!--<el-button size="small" @click="query" type="primary"-->

+ 162 - 0
src/xt_pages/outpatientCharges/settlementPrint.vue Прегледај датотеку

@@ -0,0 +1,162 @@
1
+<template>
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
+    <div class="app-container" style="padding-top:40px;">
15
+        <div class='dialysisPage'>
16
+            <printOne v-bind:childResponse="childResponse" :paramsObj="paramsObj"></printOne>
17
+        </div>
18
+    </div>
19
+  </div>
20
+</template>
21
+
22
+<script>
23
+
24
+import { jsGetAge, uParseTime } from "@/utils/tools";
25
+// import LabelBox from "./printItem/LabelBox";
26
+import print from "print-js";
27
+import printOne from "./settlementTemplate/printOne"
28
+export default {
29
+  name: "dialysisPrintOrder",
30
+  components: {
31
+    printOne
32
+  },
33
+  props:{
34
+    paramsObj:Object
35
+  },
36
+  data() {
37
+    return {
38
+      crumbs: [
39
+        { path: false, name: "透析管理" },
40
+        { path: false, name: "打印单" }
41
+      ],
42
+      childResponse: {},
43
+      paramsObj:{}
44
+      
45
+
46
+    };
47
+  },
48
+  methods: {
49
+    getAdminUser(id) {
50
+      if (id == 0) {
51
+        return "";
52
+      }
53
+      if (id == undefined) {
54
+        return "";
55
+      }
56
+      for (let i = 0; i < this.adminUser.length; i++) {
57
+        if (this.adminUser[i].id == id) {
58
+          return this.adminUser[i].name;
59
+        }
60
+      }
61
+    },
62
+    getTime(value, temp) {
63
+      if (value == 0) {
64
+        return "";
65
+      }
66
+      if (value != undefined) {
67
+        return uParseTime(value, temp);
68
+      }
69
+      return "";
70
+    },
71
+    printThisPage() {
72
+      var ptime = Math.round(new Date().getTime() / 1000);
73
+      this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
74
+
75
+      const style =
76
+        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
77
+        const style1 = "@media print{#prescription-print{font-size:14px;}.title{text-align: center;font-size: 22px;font-weight: bold;}.row{display: flex;justify-content: space-between;}.under_line{border-bottom: 1px solid #999;width: 95%;text-align: center;margin-left: 2px;display: inline-block;}.inline_block{display: inline-block;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 14px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; /* 解决边框冲突 */border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid;text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}}"
78
+        printJS({
79
+            printable: "prescription-print",
80
+            type: "html",
81
+            style: style1,
82
+            scanStyles: false
83
+        });
84
+
85
+      // if (this.org_template_info.template_id == 1) {
86
+      //   printJS({
87
+      //     printable: "dialysis-print-box",
88
+      //     type: "html",
89
+      //     style: style,
90
+      //     scanStyles: false
91
+      //   });
92
+      // }
93
+    },
94
+  },
95
+  created() {
96
+  },
97
+  watch:{
98
+    paramsObj:{//深度监听,可监听到对象、数组的变化
99
+      handler(val, oldVal){
100
+        this.paramsObj = val
101
+        
102
+      },
103
+      deep:true
104
+    }
105
+  }
106
+};
107
+</script>
108
+
109
+<style lang="scss" scoped>
110
+.printTitle{
111
+    font-size: 22px;
112
+    text-align: center;
113
+    font-weight: bold;
114
+}
115
+.infoMain{
116
+    display: flex;
117
+    flex-wrap: wrap;
118
+    border-bottom: 2px solid #000;
119
+    padding:0 10px;
120
+}
121
+.infoMain .infoP{
122
+    width: 33%;
123
+    line-height: 24px;
124
+}
125
+.prescriptionBox{
126
+    padding:0 10px;
127
+    height:600px;
128
+}
129
+.Rp{
130
+    font-size: 22px;
131
+    font-weight: bold;
132
+}
133
+.drugsBox{
134
+    padding-left: 40px;
135
+    margin-bottom: 10px;
136
+}
137
+.drugsBox p{
138
+    line-height: 30px;
139
+}
140
+.drugsOne{
141
+    line-height: 24px;
142
+}
143
+.drugsOne span{
144
+    margin-right: 20px;
145
+}
146
+.doctorBox{
147
+    display: flex;
148
+    justify-content: space-between;
149
+    padding:0 10px;
150
+    line-height: 24px;
151
+    border-bottom: 2px solid #000;
152
+}
153
+.actionBar{
154
+    display: flex;
155
+    justify-content: space-between; 
156
+    line-height: 24px;
157
+    padding:0 10px;
158
+}
159
+.actionBar p{
160
+    width:150px;
161
+}
162
+</style>

+ 461 - 0
src/xt_pages/outpatientCharges/settlementTemplate/printOne.vue Прегледај датотеку

@@ -0,0 +1,461 @@
1
+<template>
2
+    <div id="prescription-print" class="print_page_main_content">
3
+        <div class="title">医疗保障基金结算清单</div>
4
+        <div style="text-align:right;">清单流水号 <div style="width:120px;" class="under_line"></div></div>
5
+        <div class="row">
6
+            <div>定点医疗机构名称<div style="width:120px;" class="under_line"></div></div>
7
+            <div>定点医疗机构代码<div style="width:120px;" class="under_line"></div></div>
8
+            <div>医保结算等级<div style="width:120px;" class="under_line"></div></div>
9
+        </div>
10
+        <div class="row">
11
+            <div>医保编号<div style="width:120px;" class="under_line"></div></div>
12
+            <div>病案号<div style="width:120px;" class="under_line"></div></div>
13
+            <div>申报时间
14
+                <div style="width:40px;" class="under_line"></div>年
15
+                <div style="width:40px;" class="under_line"></div>月
16
+                <div style="width:40px;" class="under_line"></div>日
17
+            </div>
18
+        </div>
19
+        <div>
20
+            <table class="proj_table">
21
+                <tbody>
22
+                    <tr>
23
+                        <td style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
24
+                            一、基本信息
25
+                        </td>
26
+                    </tr>
27
+                    <tr>
28
+                        <td>
29
+                            <div class="row">
30
+                                <div class="inline_block">姓名
31
+                                    <div style="width:80px;" class="under_line"></div>
32
+                                </div>
33
+                                <div class="inline_block">性别
34
+                                    <label-box :isChecked="false" showValue="男"></label-box>
35
+                                    <label-box :isChecked="false" showValue="女"></label-box>
36
+                                </div>
37
+                                <div class="inline_block">出生日期
38
+                                    <div style="width:40px;" class="under_line"></div>年
39
+                                    <div style="width:40px;" class="under_line"></div>月
40
+                                    <div style="width:40px;" class="under_line"></div>日
41
+                                </div>
42
+                                <div class="inline_block">年龄
43
+                                    <div style="width:80px;" class="under_line"></div>岁
44
+                                </div>
45
+                                <div class="inline_block">国籍
46
+                                    <div style="width:80px;" class="under_line"></div>
47
+                                </div>
48
+                            </div>
49
+                            <div class="row">
50
+                                <div class="inline_block">(年龄不足1周岁)年龄
51
+                                    <div style="width:80px;" class="under_line"></div>天
52
+                                </div>
53
+                                <div class="inline_block">民族
54
+                                    <div style="width:80px;" class="under_line"></div>
55
+                                </div>
56
+                                <div class="inline_block">患者证件类别
57
+                                    <div style="width:80px;" class="under_line"></div>
58
+                                </div>
59
+                                <div class="inline_block">患者证件号码
60
+                                    <div style="width:140px;" class="under_line"></div>
61
+                                </div>
62
+                            </div>
63
+                            <div>
64
+                                <div class="inline_block">职业
65
+                                    <div style="width:80px;" class="under_line"></div>
66
+                                </div>
67
+                                <div class="inline_block" style="width:80px;"></div>
68
+                                <div class="inline_block">现住址
69
+                                    <div style="width:80px;" class="under_line"></div>省(区、市)
70
+                                    <div style="width:80px;" class="under_line"></div>市
71
+                                    <div style="width:80px;" class="under_line"></div>县
72
+                                    <div style="width:140px;" class="under_line"></div>
73
+                                </div>
74
+                            </div>
75
+                            <div class="row">
76
+                                <div class="inline_block">工作单位名称
77
+                                    <div style="width:80px;" class="under_line"></div>
78
+                                </div>
79
+                                <div class="inline_block">工作单位地址
80
+                                    <div style="width:160px;" class="under_line"></div>
81
+                                </div>
82
+                                <div class="inline_block">单位电话
83
+                                    <div style="width:120px;" class="under_line"></div>
84
+                                </div>
85
+                                <div class="inline_block">邮编
86
+                                    <div style="width:120px;" class="under_line"></div>
87
+                                </div>
88
+                            </div>
89
+                            <div class="row">
90
+                                <div class="inline_block">联系人姓名
91
+                                    <div style="width:80px;" class="under_line"></div>
92
+                                </div>
93
+                                <div class="inline_block">关系
94
+                                    <div style="width:80px;" class="under_line"></div>
95
+                                </div>
96
+                                <div class="inline_block">地址
97
+                                    <div style="width:80px;" class="under_line"></div>省(区、市)
98
+                                    <div style="width:80px;" class="under_line"></div>市
99
+                                    <div style="width:80px;" class="under_line"></div>县
100
+                                    <div style="width:140px;" class="under_line"></div>
101
+                                </div>
102
+                                <div class="inline_block">电话
103
+                                    <div style="width:80px;" class="under_line"></div>
104
+                                </div>
105
+                            </div>
106
+                            <div class="row">
107
+                                <div style="width:33%;">医保类型<div style="width:120px;" class="under_line"></div></div>
108
+                                <div style="width:33%;">特殊人员类型<div style="width:120px;" class="under_line"></div></div>
109
+                                <div style="width:33%;">参保地<div style="width:120px;" class="under_line"></div></div>
110
+                            </div>
111
+                            <div class="row">
112
+                                <div style="width:33%;">新生儿入院类型<div style="width:120px;" class="under_line"></div></div>
113
+                                <div style="width:33%;">新生儿出生体重<div style="width:120px;" class="under_line"></div>克</div>
114
+                                <div style="width:33%;">新生儿入院体重<div style="width:120px;" class="under_line"></div>克</div>
115
+                            </div>
116
+                        </td>
117
+                    </tr>
118
+                    <tr>
119
+                        <td style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
120
+                            二、门诊慢特病诊疗信息
121
+                        </td>
122
+                    </tr>
123
+                    <tr>
124
+                        <td>
125
+                            <div class="row">
126
+                                <div class="inline_block">诊断科别
127
+                                    <div style="width:100px;" class="under_line"></div>
128
+                                </div>
129
+                                <div class="inline_block">就诊日期
130
+                                    <div style="width:100px;" class="under_line"></div>
131
+                                </div>
132
+                            </div>
133
+                        </td>
134
+                    </tr>
135
+                    <tr>
136
+                        <td style="padding:0;line-height:30px;height:30px;">
137
+                            <table class="inside_table">
138
+                                <tbody>
139
+                                    <tr>
140
+                                        <td style="width:25%;">诊断名称</td>
141
+                                        <td style="width:25%;">诊断代码</td>
142
+                                        <td style="width:25%;">手术及操作名称</td>
143
+                                        <td style="width:25%;">手术及操作代码</td>
144
+                                    </tr>
145
+                                    <tr v-for="item in 6">
146
+                                        <td>&nbsp;</td>
147
+                                        <td>&nbsp;</td>
148
+                                        <td>&nbsp;</td>
149
+                                        <td>&nbsp;</td>
150
+                                    </tr>
151
+                                </tbody>
152
+                            </table>
153
+                        </td>
154
+                    </tr>
155
+                    <tr>
156
+                        <td style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
157
+                            三、住院诊疗信息
158
+                        </td>
159
+                    </tr>
160
+                    <tr>
161
+                        <td>
162
+                            <div class="inline_block">住院医疗类型
163
+                                <label-box :isChecked="false" showValue="1.住院"></label-box>
164
+                                <label-box :isChecked="false" showValue="2.日间手术"></label-box>
165
+                            </div>
166
+                        </td>
167
+                    </tr>
168
+                    <tr>
169
+                        <td>
170
+                            <div>
171
+                                <div class="inline_block">入院途径
172
+                                    <label-box :isChecked="false" showValue="1.急诊"></label-box>
173
+                                    <label-box :isChecked="false" showValue="2.门诊"></label-box>
174
+                                    <label-box :isChecked="false" showValue="3.其他医疗机构转入"></label-box>
175
+                                    <label-box :isChecked="false" showValue="9.其他"></label-box>
176
+                                </div>
177
+                            </div>
178
+                        </td>
179
+                    </tr>
180
+                    <tr>
181
+                        <td>
182
+                            <div>
183
+                                <div class="inline_block">治疗类别
184
+                                    <label-box :isChecked="false" showValue="1.西医"></label-box>
185
+                                    <label-box :isChecked="false" showValue="2.中医"></label-box>
186
+                                    (
187
+                                    <label-box :isChecked="false" showValue="2.1 中医"></label-box>
188
+                                    <label-box :isChecked="false" showValue="2.2 民族医"></label-box>
189
+                                    )
190
+                                    <label-box :isChecked="false" showValue="3.中西医"></label-box>
191
+                                </div>
192
+                            </div>
193
+                        </td>
194
+                    </tr>
195
+                    <tr>
196
+                        <td>
197
+                            <div class="row">
198
+                                <div style="width:40%" class="inline_block">入院时间
199
+                                    <div style="width:40px;" class="under_line"></div>年
200
+                                    <div style="width:40px;" class="under_line"></div>月
201
+                                    <div style="width:40px;" class="under_line"></div>日
202
+                                    <div style="width:40px;" class="under_line"></div>时
203
+                                </div>
204
+                                <div style="width:30%" class="inline_block">入院科别
205
+                                    <div style="width:80px;" class="under_line"></div>
206
+                                </div>
207
+                                <div style="width:30%" class="inline_block">转科科别
208
+                                    <div style="width:80px;" class="under_line"></div>
209
+                                </div>
210
+                            </div>
211
+                        </td>
212
+                    </tr>
213
+                    <tr>
214
+                        <td>
215
+                            <div class="row">
216
+                                <div style="width:40%" class="inline_block">出院时间
217
+                                    <div style="width:40px;" class="under_line"></div>年
218
+                                    <div style="width:40px;" class="under_line"></div>月
219
+                                    <div style="width:40px;" class="under_line"></div>日
220
+                                    <div style="width:40px;" class="under_line"></div>时
221
+                                </div>
222
+                                <div style="width:30%" class="inline_block">出院科别
223
+                                    <div style="width:80px;" class="under_line"></div>
224
+                                </div>
225
+                                <div style="width:30%" class="inline_block">实际住院
226
+                                    <div style="width:80px;" class="under_line"></div>天
227
+                                </div>
228
+                            </div>
229
+                        </td>
230
+                    </tr>
231
+                    <tr>
232
+                        <td>
233
+                            <div class="row">
234
+                                <div style="width:40%" class="inline_block">门(急)诊诊断(西医诊断)
235
+                                    <div style="width:80px;" class="under_line"></div>
236
+                                </div>
237
+                                <div style="width:30%" class="inline_block">疾病代码
238
+                                    <div style="width:80px;" class="under_line"></div>
239
+                                </div>
240
+                                <div style="width:30%" class="inline_block">
241
+                                </div>
242
+                            </div>
243
+                            <div class="row">
244
+                                <div style="width:40%" class="inline_block">门(急)诊诊断(中医诊断)
245
+                                    <div style="width:80px;" class="under_line"></div>
246
+                                </div>
247
+                                <div style="width:30%" class="inline_block">疾病代码
248
+                                    <div style="width:80px;" class="under_line"></div>
249
+                                </div>
250
+                                <div style="width:30%" class="inline_block">
251
+                                </div>
252
+                            </div>
253
+                        </td>
254
+                    </tr>
255
+                    <tr>
256
+                        <td style="padding:0;line-height:30px;height:30px;">
257
+                            <table class="inside_table">
258
+                                <tbody>
259
+                                    <tr>
260
+                                        <td style="width:20%;">出院西医诊断</td>
261
+                                        <td style="width:15%;">疾病代码</td>
262
+                                        <td style="width:15%;">入院病情</td>
263
+                                        <td style="width:20%;">出院中医诊断</td>
264
+                                        <td style="width:15%;">疾病代码</td>
265
+                                        <td style="width:15%;">入院病情</td>
266
+                                    </tr>
267
+                                    <tr>
268
+                                        <td style="text-align:left;">&nbsp;主要诊断:</td>
269
+                                        <td>&nbsp;</td>
270
+                                        <td>&nbsp;</td>
271
+                                        <td style="text-align:left;">&nbsp;主病:</td>
272
+                                        <td>&nbsp;</td>
273
+                                        <td>&nbsp;</td>
274
+                                    </tr>
275
+                                    <tr>
276
+                                        <td style="text-align:left;">&nbsp;其他诊断:</td>
277
+                                        <td>&nbsp;</td>
278
+                                        <td>&nbsp;</td>
279
+                                        <td style="text-align:left;">&nbsp;主证:</td>
280
+                                        <td>&nbsp;</td>
281
+                                        <td>&nbsp;</td>
282
+                                    </tr>
283
+                                    <tr v-for="item in 7">
284
+                                        <td>&nbsp;</td>
285
+                                        <td>&nbsp;</td>
286
+                                        <td>&nbsp;</td>
287
+                                        <td>&nbsp;</td>
288
+                                        <td>&nbsp;</td>
289
+                                        <td>&nbsp;</td>
290
+                                    </tr>
291
+                                </tbody>
292
+                            </table>
293
+                        </td>
294
+                    </tr>
295
+                    <tr>
296
+                        <td>
297
+                            <div class="inline_block">诊断代码计数
298
+                                <div style="width:80px;" class="under_line"></div>
299
+                            </div>
300
+                        </td>
301
+                    </tr>
302
+                    <tr>
303
+                        <td style="padding:0;line-height:30px;height:30px;">
304
+                            <table class="inside_table">
305
+                                <tbody>
306
+                                    <tr>
307
+                                        <td style="width:20%;">手术及操作名称</td>
308
+                                        <td style="width:20%;">手术及操作代码</td>
309
+                                        <td style="width:10%;">手术及操作日期</td>
310
+                                        <td style="width:10%;">麻醉方式*</td>
311
+                                        <td style="width:10%;">术者医师姓名</td>
312
+                                        <td style="width:10%;">术者医师代码</td>
313
+                                        <td style="width:10%;">麻醉医师姓名</td>
314
+                                        <td style="width:10%;">麻醉医师代码</td>
315
+                                    </tr>
316
+                                    <tr>
317
+                                        <td style="text-align:left;">&nbsp;主要:</td>
318
+                                        <td>&nbsp;</td>
319
+                                        <td>&nbsp;</td>
320
+                                        <td>&nbsp;</td>
321
+                                        <td>&nbsp;</td>
322
+                                        <td>&nbsp;</td>
323
+                                        <td>&nbsp;</td>
324
+                                        <td>&nbsp;</td>
325
+                                    </tr>
326
+                                    <tr>
327
+                                        <td style="text-align:left;">&nbsp;其他:</td>
328
+                                        <td>&nbsp;</td>
329
+                                        <td>&nbsp;</td>
330
+                                        <td>&nbsp;</td>
331
+                                        <td>&nbsp;</td>
332
+                                        <td>&nbsp;</td>
333
+                                        <td>&nbsp;</td>
334
+                                        <td>&nbsp;</td>
335
+                                    </tr>
336
+                                    <tr v-for="item in 8">
337
+                                        <td>&nbsp;</td>
338
+                                        <td>&nbsp;</td>
339
+                                        <td>&nbsp;</td>
340
+                                        <td>&nbsp;</td>
341
+                                        <td>&nbsp;</td>
342
+                                        <td>&nbsp;</td>
343
+                                        <td>&nbsp;</td>
344
+                                        <td>&nbsp;</td>
345
+                                    </tr>
346
+                                </tbody>
347
+                            </table>
348
+                        </td>
349
+                    </tr>
350
+                    <tr>
351
+                        <td>
352
+                            <div class="inline_block">手术及操作代码计数
353
+                                <div style="width:80px;" class="under_line"></div>
354
+                            </div>
355
+                        </td>
356
+                    </tr>
357
+                    <tr>
358
+                        <td>
359
+                            <div class="inline_block">呼吸机使用时间
360
+                                <div style="width:40px;" class="under_line"></div>天
361
+                                <div style="width:40px;" class="under_line"></div>小时
362
+                                <div style="width:40px;" class="under_line"></div>分钟
363
+                            </div>
364
+                        </td>
365
+                    </tr>
366
+                    <tr>
367
+                        <td>
368
+                            <div>
369
+                                <div class="inline_block">颅脑损伤患者昏迷时间:
370
+                                    入院前<div style="width:40px;" class="under_line"></div>
371
+
372
+                                    天<div style="width:40px;" class="under_line"></div>
373
+                                    
374
+                                    小时<div style="width:40px;" class="under_line"></div>分钟
375
+                                </div>
376
+                            </div>
377
+                            <div>
378
+                                <div class="inline_block"><span style="visibility: hidden;">颅脑损伤患者昏迷时间:</span>
379
+                                    入院前<div style="width:40px;" class="under_line"></div>
380
+
381
+                                    天<div style="width:40px;" class="under_line"></div>
382
+                                    
383
+                                    小时<div style="width:40px;" class="under_line"></div>分钟
384
+                                </div>
385
+                            </div>
386
+                        </td>
387
+                    </tr>
388
+                </tbody>
389
+            </table>
390
+        </div>
391
+    </div>
392
+</template>
393
+
394
+<script>
395
+import LabelBox from '../../dialysis/printItem/LabelBox'
396
+export default {
397
+    components:{
398
+        LabelBox
399
+    },
400
+    data(){
401
+        return{
402
+
403
+        }
404
+    }
405
+}
406
+</script>
407
+
408
+
409
+
410
+<style lang="scss" scoped>
411
+.title{
412
+    text-align: center;
413
+    font-size: 22px;
414
+    font-weight: bold;
415
+}
416
+.row{
417
+    display: flex;
418
+    justify-content: space-between;
419
+}
420
+.under_line{
421
+    border-bottom: 1px solid #999;
422
+    width: 95%;
423
+    text-align: center;
424
+    margin-left: 2px;
425
+    display: inline-block;
426
+}
427
+.inline_block{
428
+    display: inline-block;
429
+}
430
+// #prescription-print{
431
+//     width: 960px;
432
+// }
433
+.print_page_main_content .proj_table {
434
+  width: 100%;
435
+  border: 1px solid;
436
+  border-collapse: collapse;
437
+  padding: 2px;
438
+}
439
+
440
+.print_page_main_content .proj_table tbody tr td {
441
+  border: 1px solid;
442
+  /* text-align: center; */
443
+  font-size: 16px;
444
+  padding: 5px 8px;
445
+  line-height: 30px;
446
+}
447
+
448
+.print_page_main_content .proj_table .inside_table {
449
+  width: 100%;
450
+  border: hidden; /* 解决边框冲突 */
451
+  border-collapse: collapse;
452
+}
453
+
454
+.print_page_main_content .proj_table .inside_table tr td {
455
+  border: 1px solid;
456
+  text-align: center;
457
+  font-size: 14px;
458
+  padding: 6px 5px;
459
+  line-height: 16px;
460
+}
461
+</style>

+ 7 - 3
src/xt_pages/outpatientCharges/statementPrint.vue Прегледај датотеку

@@ -13,8 +13,8 @@
13 13
       </template>
14 14
 
15 15
       <div class='dialysisPage' style="padding-top:40px;">
16
-        <printOne :info="info" v-if="org_id != 0"></printOne>
17
-        <printTwo  v-if="org_id == 0"></printTwo>
16
+        <printOne :info="info" v-if="org_id != 9990"></printOne>
17
+        <printTwo  :info="info" v-if="org_id == 9990"></printTwo>
18 18
       </div>
19 19
   </div>
20 20
 </template>
@@ -213,7 +213,11 @@ export default {
213 213
               that.info['treat_cost_total'] = response.data.data.treatCostTotal
214 214
               that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal
215 215
               that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal
216
-              console.log(this.info)
216
+              that.info['date'] =  response.data.data.date
217
+              that.info['number'] =  response.data.data.number
218
+              that.info['order_infos'] =  response.data.data.order_infos
219
+              that.info['diagnosis'] =  response.data.data.diagnosis
220
+
217 221
             }
218 222
           })
219 223
           .catch(function (error) {

+ 108 - 56
src/xt_pages/outpatientCharges/statementTemplate/printTwo.vue Прегледај датотеку

@@ -1,102 +1,154 @@
1 1
 <template>
2 2
   <div id="statement-print" class="statement-print">
3
-    <div class="statementTitle">珠海市职工基本医疗保险门慢就医结算单</div>
3
+    <div class="statementTitle" v-if="info.insutype == '310'">珠海市职工基本医疗保险门慢就医结算单</div>
4
+    <div class="statementTitle" v-if="info.insutype == '390'">珠海市城乡居民基本医疗保险门慢就医结算单</div>
5
+
4 6
     <div style="display:flex">
5
-        <div style="width:70%">医疗机构名称:</div>
6
-        <div style="width:30%">医院等级:</div>
7
+      <div style="width:70%">医疗机构名称:{{info.fixmedins_name}}</div>
8
+      <div style="width:30%" v-if="info.hosp_lv == '1'">医院等级:三级特等</div>
9
+      <div style="width:30%" v-if="info.hosp_lv == '2'">医院等级:三级甲等</div>
10
+      <div style="width:30%" v-if="info.hosp_lv == '3'">医院等级:三级乙等</div>
11
+      <div style="width:30%" v-if="info.hosp_lv == '4'">医院等级:三级丙等</div>
12
+      <div style="width:30%" v-if="info.hosp_lv == '5'">医院等级:二级甲等</div>
13
+      <div style="width:30%" v-if="info.hosp_lv == '6'">医院等级:二级乙等</div>
14
+      <div style="width:30%" v-if="info.hosp_lv == '7'">医院等级:二级丙等</div>
15
+      <div style="width:30%" v-if="info.hosp_lv == '8'">医院等级:一级甲等</div>
16
+      <div style="width:30%" v-if="info.hosp_lv == '9'">医院等级:一级乙等</div>
17
+      <div style="width:30%" v-if="info.hosp_lv == '10'">医院等级:一级丙等</div>
18
+      <div style="width:30%" v-if="info.hosp_lv == '11'">医院等级:无等级</div>
19
+
7 20
     </div>
8 21
     <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;padding-bottom:10px;">
9
-        <div style="flex:1;">单据编码:</div>
10
-        <div style="width:33%">就诊时间:</div>
11
-        <div>金额单位:</div>
22
+      <div style="flex:1;">单据编码:{{info.number}}</div>
23
+      <div style="width:33%">就诊时间:{{getTime(info.date)}}</div>
24
+      <div>金额单位:</div>
12 25
     </div>
13 26
     <div style="display:flex">
14
-        <div style="width:50%">姓名:</div>
15
-        <div style="width:50%">个人电脑号: </div>
27
+      <div style="width:50%">姓名:{{info.psn_name}}</div>
28
+      <div style="width:50%">个人电脑号:{{info.psn_no}}</div>
16 29
     </div>
17 30
     <div style="display:flex">
18
-        <div style="width:50%">社保卡号</div>
19
-        <div style="width:50%">诊断: </div>
31
+      <div style="width:50%">社保卡号</div>
32
+      <div style="width:50%">诊断:{{info.diagnosis}}</div>
20 33
     </div>
21 34
     <div style="display:flex">
22
-        <div style="width:50%">人员类别:</div>
23
-        <div style="width:50%">待遇类别: </div>
35
+      <div style="width:50%" v-if="info.psn_type == '11'">人员类别:在职</div>
36
+      <div style="width:50%" v-if="info.psn_type == '1101'">人员类别:职工在职</div>
37
+      <div style="width:50%" v-if="info.psn_type == '1102'">人员类别:公务员在职</div>
38
+      <div style="width:50%" v-if="info.psn_type == '1103'">人员类别:灵活就业人员在职</div>
39
+      <div style="width:50%" v-if="info.psn_type == '1160'">人员类别:地方其他扩展人员</div>
40
+      <div style="width:50%" v-if="info.psn_type == '12'">人员类别:退休人员</div>
41
+      <div style="width:50%" v-if="info.psn_type == '1201'">人员类别:职工退休</div>
42
+      <div style="width:50%" v-if="info.psn_type == '1202'">人员类别:公务员退休</div>
43
+      <div style="width:50%" v-if="info.psn_type == '1203'">人员类别:灵活就业人员退休</div>
44
+      <div style="width:50%" v-if="info.psn_type == '1260'">人员类别:地方其他扩展人员</div>
45
+      <div style="width:50%" v-if="info.psn_type == '13'">人员类别:离休</div>
46
+      <div style="width:50%" v-if="info.psn_type == '1300'">人员类别:离休人员</div>
47
+      <div style="width:50%" v-if="info.psn_type == '1360'">人员类别:地方其他扩展人员</div>
48
+      <div style="width:50%" v-if="info.psn_type == '14'">人员类别:居民(未成年)</div>
49
+      <div style="width:50%" v-if="info.psn_type == '1401'">人员类别:新生儿</div>
50
+      <div style="width:50%" v-if="info.psn_type == '1402'">人员类别:学龄前儿童</div>
51
+      <div style="width:50%" v-if="info.psn_type == '1403'">人员类别:中小学生</div>
52
+      <div style="width:50%" v-if="info.psn_type == '1404'">人员类别:大学生</div>
53
+      <div style="width:50%" v-if="info.psn_type == '1405'">人员类别:未成年(未入学)</div>
54
+      <div style="width:50%" v-if="info.psn_type == '15'">人员类别:居民(成年)</div>
55
+      <div style="width:50%" v-if="info.psn_type == '1501'">人员类别:普通居民(成年)</div>
56
+      <div style="width:50%" v-if="info.psn_type == '1560'">人员类别:地方其他扩展身份</div>
57
+      <div style="width:50%" v-if="info.psn_type == '16'">人员类别:居民(老年)</div>
58
+
59
+
60
+      <div style="width:50%">待遇类别:</div>
24 61
     </div>
25 62
     <div style="display:flex;padding:10px 0;border-top:1px solid #000;border-bottom:1px solid #000;">
26
-        <div style="width:50%;text-align:center;">项目名称</div>
27
-        <div style="width:10%;text-align:center;">单价</div>
28
-        <div style="width:10%;text-align:center;">数量</div>
29
-        <div style="width:10%;text-align:center;">金额</div>
30
-        <div style="width:10%;text-align:center;">门诊目录</div>
31
-        <div style="width:10%;text-align:center;">医保目录</div>
63
+      <div style="width:50%;text-align:center;">项目名称</div>
64
+      <div style="width:10%;text-align:center;">单价</div>
65
+      <div style="width:10%;text-align:center;">数量</div>
66
+      <div style="width:10%;text-align:center;">金额</div>
67
+      <div style="width:10%;text-align:center;">门诊目录</div>
68
+      <div style="width:10%;text-align:center;">医保目录</div>
32 69
     </div>
33
-    <div style="border-bottom:1px solid #000;padding:10px 0;display:flex;">
34
-        <div style="width:50%;text-align:center;">1</div>
35
-        <div style="width:10%;text-align:center;">2</div>
36
-        <div style="width:10%;text-align:center;">3</div>
37
-        <div style="width:10%;text-align:center;">4</div>
38
-        <div style="width:10%;text-align:center;">5</div>
39
-        <div style="width:10%;text-align:center;">6</div>
70
+    <div style="border-bottom:1px solid #000;padding:10px 0;display:flex;" v-for="(item,index) in info.order_infos"
71
+         :key="index">
72
+      <div style="width:50%;text-align:center;" v-if="item.advice_id > 0">{{item.advice.drug.drug_name}}</div>
73
+      <div style="width:50%;text-align:center;" v-if="item.project_id > 0">{{item.project.project.project_name}}</div>
74
+
75
+      <div style="width:10%;text-align:center;">{{item.pric}}</div>
76
+      <div style="width:10%;text-align:center;">{{item.cnt}}</div>
77
+      <div style="width:10%;text-align:center;">{{item.det_item_fee_sumamt}}</div>
78
+      <div style="width:10%;text-align:center;">是</div>
79
+      <div style="width:10%;text-align:center;">是</div>
40 80
     </div>
41 81
     <div style="display:flex;border-bottom:1px solid #000;padding:20px 0 10px;">
42
-        <div style="width:70%;">合计:</div>
43
-        <div style="width:10%;text-align:center;">4</div>
44
-        <div style="width:20%;"></div>
82
+      <div style="width:70%;">合计:</div>
83
+      <div style="width:10%;text-align:center;">{{info.medfee_sumamt}}</div>
84
+      <div style="width:20%;"></div>
45 85
     </div>
46
-    <div>医保基金支付金额:</div>
47
-    <div>个人现金支付金额:</div>
86
+    <div>医保基金支付金额:{{info.fund_pay_sumamt?info.fund_pay_sumamt:''}}</div>
87
+    <div>个人现金支付金额:{{info.psn_pay?info.psn_pay:''}}</div>
48 88
     <div>其中</div>
49 89
     <div style="display:flex;border-bottom:1px solid #000;padding-bottom:10px;">
50
-        <div>个人自付:</div>
51
-        <div>其中:1.乙类自付    </div>
52
-        <div>2.自费    </div>
90
+      <div>个人自付:</div>
91
+      <div>其中:1.乙类自付 {{info.preselfpay_amt?info.preselfpay_amt:''}}</div>
92
+      <div>2.自费 {{info.overlmt_selfpay?info.overlmt_selfpay:''}}</div>
53 93
     </div>
54 94
     <div style="display:flex;padding-top:10px;">
55
-        <div style="width:33%">参保人签名:</div>
56
-        <div style="width:33%">审核人: </div>
57
-        <div style="width:33%">医院盖章: </div>
95
+      <div style="width:33%">参保人签名:</div>
96
+      <div style="width:33%">审核人:</div>
97
+      <div style="width:33%">医院盖章:</div>
58 98
     </div>
59
-    
99
+
60 100
   </div>
61 101
 </template>
62 102
 <script>
103
+  import {uParseTime} from '@/utils/tools'
63 104
   export default {
64 105
     props: {
65 106
       info: {
66 107
         type: Object,
67
-        default: function() {
108
+        default: function () {
68 109
           return {}
69 110
         }
70 111
       }, p_admin: {
71 112
         type: Object,
72
-        default: function() {
113
+        default: function () {
73 114
           return {}
74 115
         }
75 116
       }, charge_admin: {
76 117
         type: Object,
77
-        default: function() {
118
+        default: function () {
78 119
           return {}
79 120
         }
80 121
       }
81
-    },methods:{
82
-      getNowTime: function () {
83
-        let dateTime
84
-        let yy = new Date().getFullYear()
85
-        let mm = new Date().getMonth() + 1
86
-        let dd = new Date().getDate()
87
-        let hh = new Date().getHours()
88
-        let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
89
-          :
90
-          new Date().getMinutes()
91
-        let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
92
-          :
93
-          new Date().getSeconds()
94
-        dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
95
-        return dateTime
122
+    }, methods: {
123
+      getTime(val) {
124
+        if (val < 0) {
125
+          return ""
126
+        }
127
+        if (val == "") {
128
+          return ""
129
+        } else {
130
+          return uParseTime(val, '{y}-{m}-{d}')
131
+        }
96 132
       },
133
+        getNowTime: function () {
134
+          let dateTime
135
+          let yy = new Date().getFullYear()
136
+          let mm = new Date().getMonth() + 1
137
+          let dd = new Date().getDate()
138
+          let hh = new Date().getHours()
139
+          let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
140
+            :
141
+            new Date().getMinutes()
142
+          let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
143
+            :
144
+            new Date().getSeconds()
145
+          dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
146
+          return dateTime
147
+        }
148
+      ,
97 149
 
150
+      }
98 151
     }
99
-  }
100 152
 
101 153
 
102 154
 </script>

+ 18 - 5
src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue Прегледај датотеку

@@ -10,7 +10,7 @@
10 10
       <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
11 11
         <template slot-scope="scope">
12 12
           <div style="display:flex;align-items:center;">
13
-            <el-input v-model="scope.row.single_dose" style="width:65%;"></el-input>
13
+            <el-input v-model="scope.row.single_dose" @input="getSingleDose(scope)" style="width:65%;"></el-input>
14 14
             <div>{{scope.row.single_dose_unit}}</div>
15 15
           </div>
16 16
         </template>
@@ -43,7 +43,7 @@
43 43
 
44 44
       <el-table-column align="center" prop="day" width="50" label="天数">
45 45
         <template slot-scope="scope">
46
-          <el-input v-model="scope.row.day" placeholder=""></el-input>
46
+          <el-input v-model="scope.row.day" @input="getDay(scope)" placeholder=""></el-input>
47 47
           <div>{{'天'}}</div>
48 48
 
49 49
         </template>
@@ -87,7 +87,7 @@
87 87
       </el-table-column>
88 88
       <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
89 89
         <template slot-scope="scope">
90
-          <el-input v-model="scope.row.single_dose" placeholder=""></el-input>
90
+          <el-input v-model="scope.row.single_dose" @input="getProjectSingleDose(scope)" placeholder=""></el-input>
91 91
           <div>{{scope.row.unit}}</div>
92 92
 
93 93
         </template>
@@ -110,7 +110,7 @@
110 110
       </el-table-column>
111 111
       <el-table-column align="center" prop="number_days" width="50" label="天数">
112 112
         <template slot-scope="scope">
113
-          <el-input v-model="scope.row.number_days" placeholder=""></el-input>
113
+          <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)" placeholder=""></el-input>
114 114
           <div>{{'天'}}</div>
115 115
         </template>
116 116
       </el-table-column>
@@ -377,6 +377,18 @@
377 377
           .catch(() => {});
378 378
 
379 379
       },
380
+      getSingleDose(scope){
381
+        // this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
382
+      },
383
+      getDay(scope){
384
+        // this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
385
+      },
386
+      getProjectSingleDose(scope){
387
+        // this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
388
+      },
389
+      getProjectDay(scope){
390
+        // this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
391
+      }
380 392
     },mounted(){
381 393
       this.getInitData()
382 394
      
@@ -385,11 +397,12 @@
385 397
       // "prescription.advices":{
386 398
       //   handler(newVal,oldVal){
387 399
       //     newVal.map(item => {
388
-      //       // item.prescribing_number = item.single_dose * item.day
400
+      //       item.prescribing_number = item.single_dose * item.day
389 401
       //       if(item.single_dose != oldVal[index].single_dose || item.number_days != oldVal[index].number_days){
390 402
       //         item.total = item.single_dose * item.number_days
391 403
       //       }
392 404
             
405
+            
393 406
       //     })
394 407
       //   },
395 408
       //   deep:true

+ 52 - 52
src/xt_pages/outpatientRegistration/index.vue Прегледај датотеку

@@ -688,7 +688,7 @@
688 688
             cb([])
689 689
           }
690 690
         })
691
-      }, 
691
+      },
692 692
       readingSZ() {
693 693
         var that = this
694 694
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
@@ -1000,7 +1000,7 @@
1000 1000
                 .catch(function(error) {
1001 1001
 
1002 1002
                 })
1003
-            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9990) {
1003
+            } else if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9990) {
1004 1004
               var that = this
1005 1005
 
1006 1006
               axios.get('http://127.0.0.1:9532/api/register/get', {
@@ -1055,35 +1055,36 @@
1055 1055
 
1056 1056
                 })
1057 1057
             } else {
1058
+              var that = this
1058 1059
               saveHisPatient(params).then(response => {
1059 1060
                 if (response.data.state == 1) {
1060 1061
                   var patient = response.data.data.patient
1061 1062
                   this.getTodaySchedulePatient()
1062
-                  that.$message({ message: '挂号成功', type: 'success' })
1063
-                  that.form.settlementValue = ''
1064
-                  that.form.medicalInsuranceCard = ''
1065
-                  that.form.name = ''
1066
-                  that.form.sex = ''
1067
-                  that.form.certificates = ''
1068
-                  that.form.medicalCare = ''
1069
-                  that.form.birthday = ''
1070
-                  that.form.age = ''
1071
-                  that.form.idCard = ''
1072
-                  that.form.register = ''
1073
-                  that.form.doctor = ''
1074
-                  that.form.department = ''
1075
-                  that.form.costChecked = false
1076
-                  that.form.registrationFee = ''
1077
-                  that.form.medicalExpenses = ''
1078
-                  that.form.cost = ''
1079
-                  that.form.total = ''
1080
-                  that.form.phone = ''
1081
-                  that.form.social_type = ''
1082
-                  that.loadingone = false
1083
-
1084
-                  that.form.p_type = 14
1085
-                  that.form.sick_type = that.sick[0].id
1086
-                  that.form.diagnosis = that.diagnoses[0].id
1063
+                  this.$message({ message: '挂号成功', type: 'success' })
1064
+                  this.form.settlementValue = ''
1065
+                  this.form.medicalInsuranceCard = ''
1066
+                  this.form.name = ''
1067
+                  this.form.sex = ''
1068
+                  this.form.certificates = ''
1069
+                  this.form.medicalCare = ''
1070
+                  this.form.birthday = ''
1071
+                  this.form.age = ''
1072
+                  this.form.idCard = ''
1073
+                  this.form.register = ''
1074
+                  this.form.doctor = ''
1075
+                  this.form.department = ''
1076
+                  this.form.costChecked = false
1077
+                  this.form.registrationFee = ''
1078
+                  this.form.medicalExpenses = ''
1079
+                  this.form.cost = ''
1080
+                  this.form.total = ''
1081
+                  this.form.phone = ''
1082
+                  this.form.social_type = ''
1083
+                  this.loadingone = false
1084
+
1085
+                  this.form.p_type = 14
1086
+                  this.form.sick_type = this.sick[0].id
1087
+                  this.form.diagnosis = this.diagnoses[0].id
1087 1088
 
1088 1089
                 } else {
1089 1090
                   this.$message.error('今日患者已挂号!')
@@ -1313,31 +1314,30 @@
1313 1314
                 if (response.data.state == 1) {
1314 1315
                   var patient = response.data.data.patient
1315 1316
                   this.getTodaySchedulePatient()
1316
-                  that.$message({ message: '挂号成功', type: 'success' })
1317
-                  that.form.settlementValue = ''
1318
-                  that.form.medicalInsuranceCard = ''
1319
-                  that.form.name = ''
1320
-                  that.form.sex = ''
1321
-                  that.form.certificates = ''
1322
-                  that.form.medicalCare = ''
1323
-                  that.form.birthday = ''
1324
-                  that.form.age = ''
1325
-                  that.form.idCard = ''
1326
-                  that.form.register = ''
1327
-                  that.form.doctor = ''
1328
-                  that.form.department = ''
1329
-                  that.form.costChecked = false
1330
-                  that.form.registrationFee = ''
1331
-                  that.form.medicalExpenses = ''
1332
-                  that.form.cost = ''
1333
-                  that.form.total = ''
1334
-                  that.form.phone = ''
1335
-                  that.form.social_type = ''
1336
-                  that.loadingone = false
1337
-
1338
-                  that.form.p_type = 14
1339
-                  that.form.sick_type = that.sick[0].id
1340
-                  that.form.diagnosis = that.diagnoses[0].id
1317
+                  this.$message({ message: '挂号成功', type: 'success' })
1318
+                  this.form.settlementValue = ''
1319
+                  this.form.medicalInsuranceCard = ''
1320
+                  this.form.name = ''
1321
+                  this.form.sex = ''
1322
+                  this.form.certificates = ''
1323
+                  this.form.medicalCare = ''
1324
+                  this.form.birthday = ''
1325
+                  this.form.age = ''
1326
+                  this.form.idCard = ''
1327
+                  this.form.register = ''
1328
+                  this.form.doctor = ''
1329
+                  this.form.department = ''
1330
+                  this.form.costChecked = false
1331
+                  this.form.registrationFee = ''
1332
+                  this.form.medicalExpenses = ''
1333
+                  this.form.cost = ''
1334
+                  this.form.total = ''
1335
+                  this.form.phone = ''
1336
+                  this.form.social_type = ''
1337
+                  this.loadingone = false
1338
+                  this.form.p_type = 14
1339
+                  this.form.sick_type = this.sick[0].id
1340
+                  this.form.diagnosis = this.diagnoses[0].id
1341 1341
                 } else {
1342 1342
                   this.$message.error('今日患者已挂号!')
1343 1343
                 }

+ 1 - 1
src/xt_pages/outpatientRegistration/registrationHistory.vue Прегледај датотеку

@@ -758,7 +758,7 @@
758 758
           let params = {
759 759
             'id':row.id,
760 760
             'patient_id': row.patient_id,
761
-            'record_time': row.record_date,
761
+            'record_time': this.getTime(row.record_date, '{y}-{m}-{d}'),
762 762
             'admin_user_id': this.$store.getters.xt_user.user.id
763 763
           }
764 764
           axios.get('http://127.0.0.1:9532/api/refundnumber/post', {

+ 34 - 9
src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue Прегледај датотеку

@@ -39,7 +39,8 @@
39 39
               <td style="line-height: 18px">
40 40
                  <span v-if="item.drug_id != 0">{{item.drug?item.drug.drug_spec:''}}</span>
41 41
               </td>
42
-              <td style="line-height: 18px">{{ getManufacturer(item.manufacturer) }}</td>
42
+              <!-- <td style="line-height: 18px">{{ getManufacturer(item.manufacturer) }}</td> -->
43
+              <td style="line-height: 18px">{{ getManufacturer(item.drug.id) }}</td>
43 44
               <td style="line-height: 18px">
44 45
                 <span>{{getUnit(item.drug_id)}}</span>
45 46
               </td>
@@ -218,7 +219,21 @@
218 219
             for (let i = 0; i < response.data.data.list.length; i++) {
219 220
               this.list.push(response.data.data.list[i])
220 221
             }
221
-            console.log("list222222",this.list)
222
+           
223
+            for(let j=0;j<this.list.length;j++){
224
+              this.list[j].manufacturer_name = ""
225
+            }
226
+
227
+            for(let i=0;i<this.list.length;i++){
228
+           
229
+              for(let j=0;j<this.manufacturer.length;j++){
230
+                 if(this.list[i].manufacturer == this.manufacturer[j].id){
231
+                    this.list[i].manufacturer_name = this.manufacturer[j].manufacturer_name
232
+                 }
233
+              }
234
+            }
235
+
236
+             console.log("list222222",this.list)
222 237
           }
223 238
         })
224 239
       },
@@ -231,13 +246,22 @@
231 246
         }
232 247
         return name
233 248
       },
249
+      // getManufacturer(id){
250
+      //   let name = ''
251
+      //   this.manufacturer.map(item => {
252
+      //     if(item.id == id){
253
+      //       name = item.manufacturer_name
254
+      //     }
255
+      //   })
256
+      //   return name
257
+      // },
234 258
       getManufacturer(id){
235
-        let name = ''
236
-        this.manufacturer.map(item => {
237
-          if(item.id == id){
238
-            name = item.manufacturer_name
239
-          }
240
-        })
259
+        let name = ""
260
+        for(let i=0;i<this.list.length;i++){
261
+           if(id == this.list[i].id){
262
+              name = this.list[i].manufacturer_name
263
+           }
264
+        }
241 265
         return name
242 266
       },
243 267
       GetConfigInfo: function() {
@@ -246,7 +270,8 @@
246 270
             this.$message.error(response.data.msg);
247 271
             return false;
248 272
             } else {
249
-            this.manufacturer = response.data.data.manufacturer;
273
+             this.manufacturer = response.data.data.manufacturer;
274
+              this.getList()
250 275
             }
251 276
         });
252 277
       },