Browse Source

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

XMLWAN 4 years ago
parent
commit
0d42c7c1d4

+ 44 - 0
src/api/data.js View File

@@ -263,6 +263,50 @@ export function GetAddition(params) {
263 263
 
264 264
 
265 265
 
266
+export function createDiagnose(params) {
267
+  return request({
268
+    url: '/api/diagnose/create',
269
+    method: 'post',
270
+    params: params
271
+  })
272
+}
273
+
274
+export function modifyDiagnose(params) {
275
+  return request({
276
+    url: '/api/diagnose/modify',
277
+    method: 'post',
278
+    params: params
279
+  })
280
+}
281
+
282
+export function getDiagnoseList(params) {
283
+  return request({
284
+    url: '/api/diagnose/list',
285
+    method: 'get',
286
+    params: params
287
+  })
288
+}
289
+
290
+export function deleteDiagnose(params) {
291
+  return request({
292
+    url: '/api/diagnose/delete',
293
+    method: 'post',
294
+    params: params
295
+  })
296
+}
297
+
298
+export function GetDiagnose(params) {
299
+  return request({
300
+    url: '/api/diagnose/get',
301
+    method: 'get',
302
+    params: params
303
+  })
304
+}
305
+
306
+
307
+
308
+
309
+
266 310
 
267 311
 
268 312
 

+ 2 - 0
src/xt_pages/data/components/addtion.vue View File

@@ -190,6 +190,7 @@
190 190
               response.data.data.addition.code
191 191
             this.Dialog.formValue.price =
192 192
               response.data.data.addition.price
193
+            this.Dialog.titles="编辑"
193 194
 
194 195
             this.Dialog.isCreated = 2
195 196
             this.$refs.dialog.show()
@@ -286,6 +287,7 @@
286 287
         this.$refs.dialog.hide()
287 288
       },
288 289
       showDialog: function() {
290
+        this.Dialog.titles="新增"
289 291
         this.Dialog.formValue = Object.assign(
290 292
           {},
291 293
           this.Dialog.resetForm

+ 382 - 0
src/xt_pages/data/components/diagnoseOther.vue View File

@@ -0,0 +1,382 @@
1
+<template>
2
+  <div class="main-contain">
3
+    <div class=" sign-and-weigh-box" style="background: white">
4
+
5
+
6
+      <diagnose-other-dialog
7
+        ref="dialog"
8
+        :titles="Dialog.titles"
9
+        :formValue="Dialog.formValue"
10
+        :visibility="Dialog.isVisibility"
11
+        :type="Dialog.type"
12
+        :isCreated="Dialog.isCreated"
13
+        v-on:dialog-comfirm="dialogComfirm"
14
+        v-on:dialog-cancle="dialogCancle"
15
+      ></diagnose-other-dialog>
16
+
17
+
18
+      <el-row :gutter="15">
19
+        <el-col>
20
+          <div>
21
+            <el-button
22
+              size="small"
23
+              icon="el-icon-circle-plus-outline"
24
+              style="float: right;margin-bottom: 15px"
25
+              type="primary"
26
+              @click="showDialog"
27
+            >新增
28
+            </el-button>
29
+          </div>
30
+
31
+          <el-table
32
+            :row-style="{ color: '#303133' }"
33
+            :header-cell-style="{
34
+              backgroundColor: 'rgb(245, 247, 250)',
35
+              color: '#606266'
36
+            }"
37
+            :data="manufacturerData"
38
+            style="width: 100%"
39
+            border
40
+            v-loading="loading"
41
+          >
42
+            <el-table-column label="国家编码" align="center">
43
+              <template slot-scope="scope">
44
+                {{ scope.row.country_code }}
45
+              </template>
46
+            </el-table-column>
47
+
48
+            <el-table-column label="目录代码" align="center">
49
+              <template slot-scope="scope">
50
+                {{ scope.row.content_code }}
51
+              </template>
52
+            </el-table-column>
53
+
54
+
55
+            <el-table-column label="诊断名称" align="center">
56
+              <template slot-scope="scope">
57
+                {{ scope.row.class_name }}
58
+              </template>
59
+            </el-table-column>
60
+
61
+            <el-table-column label="国家目录名称" align="center">
62
+              <template slot-scope="scope">
63
+                {{ scope.row.country_content_name }}
64
+              </template>
65
+            </el-table-column>
66
+
67
+            <el-table-column label="备注" align="center">
68
+              <template slot-scope="scope">
69
+                {{ scope.row.remark }}
70
+              </template>
71
+            </el-table-column>
72
+
73
+            <el-table-column label="操作" align="center">
74
+              <template slot-scope="scope">
75
+                <el-tooltip
76
+                  class="item"
77
+                  effect="dark"
78
+                  content="编辑"
79
+                  placement="top"
80
+                >
81
+                  <el-button
82
+                    size="small"
83
+                    type="primary"
84
+                    icon="el-icon-edit-outline"
85
+                    @click="handleEdit(scope.$index, scope.row)"
86
+                  >
87
+                  </el-button>
88
+                </el-tooltip>
89
+                <el-tooltip
90
+                  class="item"
91
+                  effect="dark"
92
+                  content="删除"
93
+                  placement="top"
94
+                >
95
+                  <el-button
96
+                    size="small"
97
+                    type="danger"
98
+                    icon="el-icon-delete"
99
+                    @click="handleDelete(scope.$index, scope.row)"
100
+                  >
101
+                  </el-button>
102
+                </el-tooltip>
103
+
104
+              </template>
105
+            </el-table-column>
106
+          </el-table>
107
+
108
+          <el-pagination
109
+            @size-change="handleSizeChange"
110
+            @current-change="handleCurrentChange"
111
+            :page-sizes="[10, 50, 100]"
112
+            :page-size="10"
113
+            background
114
+            align="right"
115
+            style="margin-top:20px;"
116
+            layout="total, sizes, prev, pager, next, jumper"
117
+            :total="total"
118
+          >
119
+          </el-pagination>
120
+        </el-col>
121
+      </el-row>
122
+    </div>
123
+  </div>
124
+</template>
125
+
126
+<script>
127
+  import {
128
+    createDiagnose,
129
+    modifyDiagnose,
130
+    getDiagnoseList,
131
+    deleteDiagnose,
132
+    GetDiagnose
133
+  } from '@/api/data'
134
+  import DiagnoseOtherDialog from "./diagnoseOtherDialog";
135
+
136
+  export default {
137
+    components: {
138
+      DiagnoseOtherDialog,
139
+    },
140
+    name: 'diagnoseOther',
141
+    data() {
142
+      return {
143
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
144
+        manufacturerData: [],
145
+        total: 0,
146
+        pageTotal: 0,
147
+        pageSelect: 0,
148
+
149
+        page: 1,
150
+        limit: 10,
151
+        loading: false,
152
+
153
+        manufacturer_code: '',
154
+        editId: '',
155
+        editIndex: '',
156
+        Dialog: {
157
+          titles: '新增',
158
+          isVisibility: false,
159
+          isCreated: 1, //1.创建 2.编辑 3.查看详情
160
+          formValue: {
161
+            class_name: '',
162
+            content_code: '',
163
+            country_code: '',
164
+            country_content_name: '',
165
+            remark: '',
166
+            pinyin: '',
167
+            wubi: ''
168
+
169
+          },
170
+          resetForm: {
171
+            class_name: '',
172
+            content_code: '',
173
+            country_code: '',
174
+            country_content_name: '',
175
+            remark: '',
176
+            pinyin: '',
177
+            wubi: ''
178
+          }
179
+        }
180
+      }
181
+    },
182
+    methods: {
183
+      handleEdit: function(index, row) {
184
+        this.editId = row.id
185
+        this.editIndex = index
186
+        let params = {
187
+          id: row.id
188
+        }
189
+        GetDiagnose(params).then(response => {
190
+          if (response.data.state == 0) {
191
+            this.$message.error(response.data.msg)
192
+            return false
193
+          } else {
194
+            this.Dialog.formValue.class_name =
195
+              response.data.data.sick.class_name
196
+            this.Dialog.formValue.content_code =
197
+              response.data.data.sick.content_code
198
+            this.Dialog.formValue.country_code =
199
+              response.data.data.sick.country_code
200
+            this.Dialog.formValue.country_content_name =
201
+              response.data.data.sick.country_content_name
202
+            this.Dialog.formValue.remark =
203
+              response.data.data.sick.remark
204
+            this.Dialog.formValue.pinyin =
205
+              response.data.data.sick.pinyin
206
+            this.Dialog.formValue.wubi =
207
+              response.data.data.sick.wubi
208
+
209
+            this.Dialog.isCreated = 2
210
+            this.$refs.dialog.show()
211
+
212
+          }
213
+        })
214
+      },
215
+      handleDelete: function(index, row) {
216
+        this.$confirm('确认删除这条记录?', '删除记录', {
217
+          confirmButtonText: '确定',
218
+          cancelButtonText: '取消',
219
+          type: 'warning'
220
+        })
221
+          .then(() => {
222
+            let params = {
223
+              id: row.id
224
+            }
225
+            deleteDiagnose(params).then(response => {
226
+              if (response.data.state == 0) {
227
+                this.$message.error(response.data.msg)
228
+                return false
229
+              } else {
230
+                this.manufacturerData.splice(index, 1)
231
+                this.$message.success('厂家已经删除')
232
+              }
233
+            })
234
+          })
235
+          .catch(() => {
236
+          })
237
+      },
238
+      showDetails: function(index, row) {
239
+        let params = {
240
+          id: row.id
241
+        }
242
+        GetDiagnose(params).then(response => {
243
+          if (response.data.state == 0) {
244
+            this.$message.error(response.data.msg)
245
+            return false
246
+          } else {
247
+            this.Dialog.formValue.class_name =
248
+              response.data.data.sick.class_name
249
+            this.Dialog.formValue.content_code =
250
+              response.data.data.sick.content_code
251
+            this.Dialog.formValue.country_code =
252
+              response.data.data.sick.country_code
253
+            this.Dialog.formValue.country_content_name =
254
+              response.data.data.sick.country_content_name
255
+            this.Dialog.formValue.remark =
256
+              response.data.data.sick.remark
257
+            this.Dialog.formValue.pinyin =
258
+              response.data.data.sick.pinyin
259
+            this.Dialog.formValue.wubi =
260
+              response.data.data.sick.wubi
261
+
262
+            this.Dialog.isCreated = 3
263
+            this.Dialog.isVisibility = true
264
+          }
265
+        })
266
+      },
267
+      dialogComfirm: function(val) {
268
+        // this.manufacturerDialog.isVisibility = false
269
+        this.$refs.dialog.hide()
270
+        if (val.isCreated == 2) {
271
+          //修改
272
+          let params = {
273
+            class_name: val.class_name,
274
+            content_code: val.content_code,
275
+            country_code: val.country_code,
276
+            country_content_name: val.country_content_name,
277
+            remark: val.remark,
278
+            id: this.editId,
279
+            pinyin: val.pinyin,
280
+            wubi: val.wubi
281
+
282
+          }
283
+          modifyDiagnose(params).then(response => {
284
+            if (response.data.state == 0) {
285
+              this.$message.error(response.data.msg)
286
+              return false
287
+            } else {
288
+              this.manufacturerData[this.editIndex].class_name =
289
+                response.data.data.sick.class_name
290
+              this.manufacturerData[this.editIndex].content_code =
291
+                response.data.data.sick.content_code
292
+              this.manufacturerData[this.editIndex].country_code =
293
+                response.data.data.sick.country_code
294
+              this.manufacturerData[this.editIndex].country_code =
295
+                response.data.data.sick.country_code
296
+              this.manufacturerData[this.editIndex].country_content_name =
297
+                response.data.data.sick.country_content_name
298
+              this.manufacturerData[this.editIndex].remark =
299
+                response.data.data.sick.remark
300
+              this.manufacturerData[this.editIndex].pinyin =
301
+                response.data.data.sick.pinyin
302
+              this.manufacturerData[this.editIndex].wubi =
303
+                response.data.data.sick.wubi
304
+
305
+              this.$message.success('修改成功')
306
+            }
307
+          })
308
+        } else if (val.isCreated == 1) {
309
+          //新增
310
+          createDiagnose(val).then(response => {
311
+            if (response.data.state == 0) {
312
+              this.$message.error(response.data.msg)
313
+              return false
314
+            } else {
315
+              this.manufacturerData.unshift(response.data.data.sick)
316
+
317
+              this.$message.success('新增成功')
318
+            }
319
+          })
320
+        }
321
+      },
322
+      dialogCancle: function() {
323
+        this.$refs.dialog.hide()
324
+      },
325
+      showDialog: function() {
326
+        this.Dialog.formValue = Object.assign(
327
+          {},
328
+          this.Dialog.resetForm
329
+        )
330
+        this.$refs.dialog.show()
331
+        this.Dialog.isCreated = 1
332
+      },
333
+      handleSizeChange(val) {
334
+        this.limit = val
335
+        this.getList()
336
+      },
337
+      handleCurrentChange(val) {
338
+        this.page = val
339
+        this.getList()
340
+      },
341
+      getList() {
342
+        let params = {
343
+          page: this.page,
344
+          limit: this.limit
345
+        }
346
+        this.loading = true
347
+        getDiagnoseList(params).then(response => {
348
+          if (response.data.state == 0) {
349
+            this.loading = false
350
+            this.$message.error(response.data.msg)
351
+            return false
352
+          } else {
353
+            this.loading = false
354
+            this.total = response.data.data.total
355
+            this.manufacturerData = []
356
+            for (let i = 0; i < response.data.data.sick.length; i++) {
357
+              this.manufacturerData.push(response.data.data.sick[i])
358
+            }
359
+          }
360
+        })
361
+      }
362
+    },
363
+    created() {
364
+      this.getList()
365
+    }
366
+  }
367
+</script>
368
+
369
+<style lang="scss">
370
+  .el-table td,
371
+  .el-table th.is-leaf,
372
+  .el-table--border,
373
+  .el-table--group {
374
+    border-color: #d0d3da;
375
+  }
376
+
377
+  .el-table--border::after,
378
+  .el-table--group::after,
379
+  .el-table::before {
380
+    background-color: #d0d3da;
381
+  }
382
+</style>

+ 161 - 0
src/xt_pages/data/components/diagnoseOtherDialog.vue View File

@@ -0,0 +1,161 @@
1
+<template>
2
+  <el-dialog width="854px" :title="titles" :visible.sync="visibility" :close-on-click-modal="isClose"
3
+             :close-on-press-escape="isClose">
4
+
5
+    <el-form :model="formValue" :rules="rules" ref="formValue" class="demo-form-inline"
6
+             :label-position="labelPosition"
7
+             label-width="100px">
8
+
9
+      <el-row>
10
+        <el-col :span="8">
11
+          <el-form-item label="诊断名称" prop="class_name">
12
+            <el-input v-model="formValue.class_name"></el-input>
13
+          </el-form-item>
14
+        </el-col>
15
+
16
+        <el-col :span="8">
17
+          <el-form-item label="拼音" prop="pinyin">
18
+            <el-input v-model="formValue.pinyin"></el-input>
19
+          </el-form-item>
20
+        </el-col>
21
+        <el-col :span="8">
22
+          <el-form-item label="五笔" prop="wubi">
23
+            <el-input v-model="formValue.wubi"></el-input>
24
+          </el-form-item>
25
+        </el-col>
26
+
27
+        <el-col :span="8">
28
+          <el-form-item label="目录代码" prop="content_code">
29
+            <el-input v-model="formValue.content_code"></el-input>
30
+          </el-form-item>
31
+        </el-col>
32
+
33
+        <el-col :span="8">
34
+          <el-form-item label="国家编码" prop="country_code">
35
+            <el-input v-model="formValue.country_code"></el-input>
36
+          </el-form-item>
37
+        </el-col>
38
+
39
+        <el-col :span="8">
40
+          <el-form-item label="国家目录名称" prop="country_content_name">
41
+            <el-input v-model="formValue.country_content_name"></el-input>
42
+          </el-form-item>
43
+        </el-col>
44
+      </el-row>
45
+
46
+      <el-col>
47
+        <el-form-item label="备注">
48
+          <el-input type="textarea" :row="5" v-model="formValue.remark"
49
+                    placeholder="请输入内容">
50
+          </el-input>
51
+        </el-form-item>
52
+      </el-col>
53
+    </el-form>
54
+
55
+    <span slot="footer" class="dialog-footer">
56
+    <el-button v-if="isCreated == 3" @click="cancle('formValue')">取 消</el-button>
57
+    <el-button v-if="isCreated != 3 " @click="cancle('formValue')">取 消</el-button>
58
+    <el-button v-if="isCreated != 3" type="primary" @click="comfirm('formValue')">保 存</el-button>
59
+  </span>
60
+  </el-dialog>
61
+
62
+</template>
63
+
64
+<script>
65
+  export default {
66
+    name: 'diagnoseOtherDialog',
67
+
68
+    data() {
69
+
70
+      return {
71
+        visibility: false,
72
+        labelPosition: 'right',
73
+        isClose: false,
74
+        form: {
75
+          class_name: '',
76
+          content_code: '',
77
+          country_code: '',
78
+          country_content_name: '',
79
+          remark: '',
80
+          pinyin: '',
81
+          wubi: ''
82
+
83
+        },
84
+        resetForm: {
85
+          class_name: '',
86
+          content_code: '',
87
+          country_code: '',
88
+          country_content_name: '',
89
+          remark: '',
90
+          pinyin: '',
91
+          wubi: ''
92
+        },
93
+        rules: {
94
+          class_name: [
95
+            { required: true, message: '请输入大类名称', trigger: 'blur' }
96
+          ],
97
+          content_code: [
98
+            { required: true, message: '请输入目录代码', trigger: 'blur' }
99
+          ]
100
+
101
+        }
102
+      }
103
+    },
104
+    props: {
105
+
106
+      titles: {
107
+        type: String,
108
+        default: ''
109
+      },
110
+      formValue: {
111
+        type: Object
112
+      },
113
+      type: {
114
+        type: Number,
115
+        default: 1
116
+
117
+      },
118
+      isCreated: {
119
+        type: Number,
120
+        default: 1
121
+
122
+      }
123
+    },
124
+    methods: {
125
+      show: function() {
126
+        this.visibility = true
127
+
128
+      }, hide: function() {
129
+        this.visibility = false
130
+      },
131
+      cancle: function(formName) {
132
+        this.$emit('dialog-cancle', this.getValue())
133
+        this.$refs['formValue'].resetFields()
134
+      },
135
+      comfirm: function(formName) {
136
+        this.$refs['formValue'].validate((valid) => {
137
+          if (valid) {
138
+            let value = {}
139
+            value = this.getValue()
140
+            this.$emit('dialog-comfirm', value)
141
+            this.form = Object.assign({}, this.resetForm)
142
+
143
+          }
144
+        })
145
+      },
146
+      getValue: function() {
147
+        let form = {}
148
+        form = this.formValue
149
+        form['title'] = this.titles
150
+        form['type'] = this.type
151
+        form['isCreated'] = this.isCreated
152
+        return form
153
+      }
154
+    }
155
+
156
+  }
157
+</script>
158
+
159
+<style scoped>
160
+
161
+</style>

+ 6 - 1
src/xt_pages/data/specialDictionary.vue View File

@@ -42,7 +42,8 @@
42 42
         </el-tab-pane>
43 43
 
44 44
         <el-tab-pane label="诊断信息" name="10">
45
-          <diagnosis></diagnosis>
45
+          <!--<diagnosis></diagnosis>-->
46
+          <diagnose-other></diagnose-other>
46 47
         </el-tab-pane>
47 48
 
48 49
       </el-tabs>
@@ -62,10 +63,14 @@
62 63
   import Dealer from '../stock/config/dealer'
63 64
   import Diagnosis from './components/diagnosis'
64 65
   import Addtion from './components/addtion'
66
+  import DiagnoseOtherDialog from "./components/diagnoseOtherDialog";
67
+  import DiagnoseOther from "./components/diagnoseOther";
65 68
 
66 69
   export default {
67 70
     name: 'specialDictionary',
68 71
     components: {
72
+      DiagnoseOther,
73
+      DiagnoseOtherDialog,
69 74
       Addtion,
70 75
       Diagnosis,
71 76
       Dealer,

+ 33 - 11
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

@@ -5,18 +5,21 @@
5 5
     </div>
6 6
     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
7 7
       <div class="mainLeft">
8
-        <!-- <div class="mainCell" style="justify-content: space-between;">
9
-          <p style="color: red">未收费:<span>{{cal_one}}</span>人</p>
10
-          <p style="color: red">已收费:<span>{{cal_two}}</span>人</p>
11
-          <p style="color: red">已退费:<span>{{cal_three}}</span>人</p>
12
-
13
-        </div> -->
8
+         <div class="mainCell" style="justify-content: space-between;">
9
+          <p >未收费:<span style="color: red">{{cal_one}}</span>人</p>
10
+          <p>已收费:<span  style="color: red">{{cal_two}}</span>人</p>
11
+          <p>已退费:<span  style="color: red">{{cal_three}}</span>人</p>
12
+        </div>
14 13
         <div class="mainCell">
15 14
           <el-radio-group v-model="radio" @change="changeRadio">
16
-            <el-radio :label=1>未收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_one}}</span>人</el-radio>
17
-            <el-radio :label=2>已收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_two}}</span>人</el-radio>
18
-            <el-radio :label=3>已退费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人</el-radio>
15
+            <el-radio :label=1>未收费</el-radio>
16
+            <el-radio :label=2>已收费</el-radio>
17
+            <el-radio :label=3>已退费</el-radio>
19 18
             <el-radio :label=4>全部</el-radio>
19
+            <!--<el-radio :label=1>未收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_one}}</span>人</el-radio>-->
20
+            <!--<el-radio :label=2>已收费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_two}}</span>人</el-radio>-->
21
+            <!--<el-radio :label=3>已退费<span style="color: red;margin-bottom:10px;display: inline-block;">{{cal_three}}</span>人</el-radio>-->
22
+            <!--<el-radio :label=4>全部</el-radio>-->
20 23
 
21 24
           </el-radio-group>
22 25
         </div>
@@ -208,6 +211,13 @@
208 211
       </div>
209 212
     </div>
210 213
     <additionalCharges ref='additionalCharges' @click="addCharges" :addtions_charge="addtions_charge"></additionalCharges>
214
+    <el-dialog
215
+      class="centerDialog"
216
+      width="900px"
217
+      title="打印"
218
+      :visible.sync="treatVisible">
219
+      <treatPrint :paramsObj='paramsObj'></treatPrint>
220
+    </el-dialog>
211 221
   </div>
212 222
 </template>
213 223
 
@@ -221,6 +231,7 @@
221 231
   import additionalCharges from './components/additionalCharges'
222 232
   import { getPatientInformation, getPatientList } from '@/api/project/project'
223 233
   import { getPatientInfo, getSchedulePatientList, register, upload,Refund } from '@/api/his/his'
234
+  import treatPrint from './treatPrint'
224 235
 
225 236
   const moment = require('moment')
226 237
   export default {
@@ -230,7 +241,9 @@
230 241
       charged,
231 242
       medicalInsuranceRefund,
232 243
       prescriptionTable,
233
-      additionalCharges
244
+      additionalCharges,
245
+      treatPrint,
246
+      
234 247
     },
235 248
     data() {
236 249
       return {
@@ -276,6 +289,8 @@
276 289
         all_table_data:[],
277 290
         order:{},
278 291
         addtions_charge:[],
292
+        treatVisible:false,
293
+        paramsObj:{}
279 294
       }
280 295
     },
281 296
     created() {
@@ -478,7 +493,14 @@
478 493
           this.$router.push('/outpatientDoctorStation/printtwo?record=' + this.record_date)
479 494
 
480 495
         } else if (index == 3) {
481
-          this.$router.push('/outpatientCharges/treatPrint?record_date=' + this.record_date + '&patient_id=' + this.patient_id + '&prescription_id=' + this.prescription_id)
496
+          let obj = {
497
+            record_date:this.record_date,
498
+            patient_id:this.patient_id,
499
+            prescription_id:this.prescription_id
500
+          }
501
+          this.paramsObj = obj
502
+          this.treatVisible = true
503
+          // this.$router.push('/outpatientCharges/treatPrint?record_date=' + this.record_date + '&patient_id=' + this.patient_id + '&prescription_id=' + this.prescription_id)
482 504
         } else if (index == 4) {
483 505
 
484 506
           if(this.hisPatientInfo.id == 0){

+ 1 - 1
src/xt_pages/outpatientCharges/summary.vue View File

@@ -51,7 +51,7 @@
51 51
           type="index"
52 52
         >
53 53
         </el-table-column>
54
-        <el-table-column align="center" prop="name" label="诊号">
54
+        <el-table-column align="center" prop="name" label="诊号">
55 55
           <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
56 56
         </el-table-column>
57 57
         <el-table-column align="center" prop="name" label="患者名字">

+ 28 - 17
src/xt_pages/outpatientCharges/treatPrint.vue View File

@@ -1,21 +1,19 @@
1 1
 <template>
2
-  <div class="main-contain">
3
-    <div class="position">
4
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
5
-       <template>
6
-        <el-button
7
-          :loading="loading"
8
-          size="small"
9
-          icon="el-icon-printer"
10
-          @click="printThisPage"
11
-          type="primary"
12
-          >打印</el-button
13
-        >
14
-      </template>
15
-    </div>
16
-    <div class="app-container" style="min-height:0;">
17
-        <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px">
18
-            <printOne v-bind:childResponse="childResponse"></printOne>
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>
19 17
         </div>
20 18
     </div>
21 19
   </div>
@@ -41,6 +39,9 @@ export default {
41 39
     BreadCrumb,
42 40
     printOne
43 41
   },
42
+  props:{
43
+    paramsObj:Object
44
+  },
44 45
   data() {
45 46
     return {
46 47
       crumbs: [
@@ -48,6 +49,7 @@ export default {
48 49
         { path: false, name: "打印单" }
49 50
       ],
50 51
       childResponse: {},
52
+      paramsObj:{}
51 53
       
52 54
 
53 55
     };
@@ -100,6 +102,15 @@ export default {
100 102
   },
101 103
   created() {
102 104
   },
105
+  watch:{
106
+    paramsObj:{//深度监听,可监听到对象、数组的变化
107
+      handler(val, oldVal){
108
+        this.paramsObj = val
109
+        
110
+      },
111
+      deep:true
112
+    }
113
+  }
103 114
 };
104 115
 </script>
105 116
 

+ 27 - 3
src/xt_pages/outpatientCharges/treatTemplate/printOne.vue View File

@@ -94,6 +94,9 @@ export default {
94 94
           orgname:""
95 95
       } 
96 96
     },
97
+    props:{
98
+        paramsObj:Object
99
+    },
97 100
     methods:{
98 101
        getChargePrint(record_date,patient_id,prescription_id){
99 102
            var params = {
@@ -118,21 +121,42 @@ export default {
118 121
        }
119 122
     },
120 123
     created(){
121
-       var record_date =  this.$route.query.record_date
124
+       var record_date =  this.paramsObj.record_date
122 125
        console.log("record_date",record_date)
123
-       var patient_id = this.$route.query.patient_id
126
+       var patient_id = this.paramsObj.patient_id
124 127
        console.log("patient_id",patient_id)
125
-       var prescription_id = this.$route.query.prescription_id
128
+       var prescription_id = this.paramsObj.prescription_id
126 129
        this.getChargePrint(record_date,patient_id,prescription_id)
127 130
        var xtuser = this.$store.getters.xt_user
128 131
        this.orgname = xtuser.org.org_name
129 132
 
133
+    },
134
+    watch:{
135
+        paramsObj:{//深度监听,可监听到对象、数组的变化
136
+        handler(val, oldVal){
137
+            this.paramsObj = val
138
+            this.patient_id = this.paramsObj.patient_id
139
+            var record_date = this.paramsObj.record
140
+            this.record_date = record_date
141
+            var prescription_id = this.paramsObj.prescription_id
142
+            this.prescription_id = prescription_id
143
+            
144
+        },
145
+        deep:true
146
+        }
130 147
     }
131 148
 }
132 149
 </script>
133 150
 
134 151
 
135 152
 <style lang="scss" scoped>
153
+.prescription-print{
154
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
155
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
156
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
157
+    margin-bottom: 20px;
158
+    padding:20px 10px;
159
+}
136 160
 .printTitle{
137 161
     font-size: 22px;
138 162
     text-align: center;

+ 78 - 54
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

@@ -21,17 +21,17 @@
21 21
           <!--<el-form-item label="挂号类型: " prop="name">-->
22 22
           <!--<el-input v-model="hisPatientInfo.register_type" placeholder="" readonly></el-input>-->
23 23
           <!--</el-form-item>-->
24
-          <el-form-item label="挂号类型: " prop="name" label-position="right">
24
+          <el-form-item label="处方类型: " prop="name" label-position="right">
25 25
             <el-select style="width:100%;" v-model="register_type" placeholder="">
26 26
               <el-option
27
-                v-for="(item,index) in getDictionaryDataConfig('system','register_type')"
27
+                v-for="(item,index) in register"
28 28
                 :key="index"
29
-                :label="item.name"
30
-                :value="item.name">
29
+                :label="item.label"
30
+                :value="item.value">
31 31
               </el-option>
32 32
             </el-select>
33 33
           </el-form-item>
34
-          <el-form-item label="病类型:" prop="name" label-position="right">
34
+          <el-form-item label="病类型:" prop="name" label-position="right">
35 35
 
36 36
             <el-select style="width:100%;" v-model="state1" placeholder="">
37 37
               <el-option
@@ -43,6 +43,22 @@
43 43
             </el-select>
44 44
 
45 45
           </el-form-item>
46
+
47
+          <el-form-item label="诊断:" prop="name" label-position="right">
48
+
49
+            <el-select style="width:100%;" v-model="diagnose" placeholder="">
50
+              <el-option
51
+                v-for="(item,index) in diagnoses"
52
+                :key="index"
53
+                :label="item.class_name"
54
+                :value="item.id">
55
+              </el-option>
56
+            </el-select>
57
+
58
+          </el-form-item>
59
+
60
+
61
+
46 62
           <el-form-item label="过敏病史: " prop="name" label-position="right">
47 63
             <el-autocomplete
48 64
               style="width:100%;"
@@ -79,7 +95,7 @@
79 95
         </div>
80 96
         <div class="costBox">
81 97
           <div>
82
-            <span>医生:</span>
98
+            <span><span style="color: red">*</span>医生:</span>
83 99
             <el-select style="margin-right:5px;width:140px;" v-model="doctorValue" placeholder="" @change="changeDoctor">
84 100
               <el-option
85 101
                 v-for="(item,index) in doctors"
@@ -88,7 +104,7 @@
88 104
                 :value="item.admin_user_id">
89 105
               </el-option>
90 106
             </el-select>
91
-            <span>科室:</span>
107
+            <span> <span style="color: red">*</span>科室:</span>
92 108
             <el-select style="margin-right:5px;width:140px;" v-model="departmentValue" placeholder="">
93 109
               <el-option
94 110
                 v-for="(item,index) in department"
@@ -304,10 +320,6 @@
304 320
         type: Array,
305 321
         default: []
306 322
       },
307
-      diagnoses: {
308
-        type: Array,
309
-        default: []
310
-      }
311 323
     },
312 324
     components: {
313 325
       selectTemplate,
@@ -317,6 +329,16 @@
317 329
     },
318 330
     data() {
319 331
       return {
332
+        register: [
333
+          {value: 0,label:"普通"},
334
+          {value: 1,label: '急诊'},
335
+          {value: 2,label: "儿科"},
336
+          {value: 3,label: "麻醉"},
337
+          {value: 4,label: "精一"},
338
+          {value: 5,label: "精二"},
339
+          {value: 6,label: "其他"},
340
+
341
+        ],
320 342
         multipleTableHeight:'',
321 343
         register_type: '',
322 344
         value: '0',
@@ -367,6 +389,8 @@
367 389
         ],
368 390
         department: [],
369 391
         sick: [],
392
+        diagnoses: [],
393
+        diagnose:'',
370 394
         curTotal: 0,
371 395
         prescription_id: 0
372 396
       }
@@ -511,16 +535,7 @@
511 535
         }
512 536
       },
513 537
 
514
-      querySearch(queryString, cb) {
515
-        var restaurants = this.diagnoses
516
-        console.log(restaurants)
517
-        restaurants.map(item => {
518
-          item.value = item.name
519
-        })
520
-        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
521
-        // 调用 callback 返回建议列表的数据
522
-        cb(results)
523
-      },
538
+
524 539
 
525 540
       querySearch2(queryString, cb) {
526 541
         var restaurants = this.other_sick
@@ -560,7 +575,10 @@
560 575
             this.doctors = response.data.data.doctors
561 576
             this.department = response.data.data.department
562 577
             this.sick = response.data.data.sick
563
-            this.additions = response.data.data.additions
578
+
579
+            this.sick = response.data.data.sick
580
+
581
+            this.diagnoses = response.data.data.diagnose
564 582
             // var info = response.data.data.info
565 583
             // if (info.user_type == 2 || info.user_type == 1) {
566 584
             //   this.doctorValue = info.admin_user_id
@@ -630,7 +648,7 @@
630 648
         this.teamList = []
631 649
 
632 650
       },
633
-      setData(data, info, admin_info,doctors,department) {
651
+      setData(data, info, admin_info,doctors,department,hisPatientInfo) {
634 652
         this.prescription_id = data[0].id
635 653
         this.editableTabsValue = "处方1"
636 654
         this.$emit('event1', this.prescription_id)
@@ -653,11 +671,17 @@
653 671
           this.showOne = false
654 672
           this.showTwo = true
655 673
         }
656
-        this.state1 = info.diagnosis
657
-        this.state2 = info.sick_history
674
+        this.state1 = info.sick_type
675
+        if(this.state1 == 0){
658 676
 
677
+          this.state1 = ""
678
+        }
679
+        this.state2 = info.sick_history
680
+        if(this.state2 == 0){
681
+          this.state2 = ""
682
+        }
659 683
 
660
-        this.register_type = info.register_type
684
+        // this.register_type = info.register_type
661 685
 
662 686
         if(info.prescription_status == 0){
663 687
           this.order_status = ''
@@ -678,42 +702,41 @@
678 702
 
679 703
 
680 704
         if(info.id > 0){
681
-          console.log("!Q!!!!")
682
-
683 705
           this.doctorValue = info.doctor_id
684 706
           this.departmentValue = info.department
685 707
         }else{
686
-          console.log("------")
687
-          this.doctorValue = ''
688
-          this.departmentValue = ''
689
-
690
-          if (admin_info.user_type == 2 || admin_info.user_type == 1) {
691
-            this.doctorValue = admin_info.admin_user_id
692
-            if (admin_info.department_id == 0) {
693
-              if (this.department.length > 0) {
694
-                this.departmentValue = department[0].id
708
+          if(hisPatientInfo.doctor != 0 && hisPatientInfo.department != 0) {
709
+            this.doctorValue = hisPatientInfo.doctor
710
+            this.departmentValue = hisPatientInfo.department
711
+          }else{
712
+            if (admin_info.user_type == 2 || admin_info.user_type == 1) {
713
+              this.doctorValue = admin_info.admin_user_id
714
+              if (admin_info.department_id == 0) {
715
+                if (this.department.length > 0) {
716
+                  this.departmentValue = department[0].id
717
+                } else {
718
+                  this.departmentValue = ''
719
+                }
695 720
               } else {
696
-                this.departmentValue = ''
721
+                this.departmentValue = admin_info.department_id
697 722
               }
698 723
             } else {
699
-              this.departmentValue = admin_info.department_id
724
+              this.doctorValue = doctors[0].admin_user_id
725
+            }
726
+            if(this.doctorValue == 0){
727
+              this.doctorValue = ''
700 728
             }
701
-          }else{
702
-            this.doctorValue = doctors[0].admin_user_id
703
-          }
704
-
705
-          if(this.doctorValue == 0){
706
-            this.doctorValue = ''
707 729
           }
708
-
709
-
710
-
711 730
         }
712
-
713
-
714
-
715
-
716
-
731
+        if (info.register_type == 0){
732
+          // if(hisPatientInfo.register_type != 0){
733
+          //   this.register_type = hisPatientInfo.register_type
734
+          // }else{
735
+            this.register_type = ''
736
+          // }
737
+        }else{
738
+          this.register_type = info.register_type
739
+        }
717 740
       },
718 741
       moreState(tab, event) {
719 742
         if (tab == 'more') {
@@ -738,7 +761,8 @@
738 761
         if (index == 1) {
739 762
           let params = {
740 763
             patient_id: this.patientInfo.id,
741
-            diagnose: this.state1,
764
+            diagnose: this.diagnose,
765
+            sick_type: this.state1,
742 766
             sick_history: this.state2,
743 767
             doctor: this.doctorValue,
744 768
             department: this.departmentValue,

+ 309 - 132
src/xt_pages/outpatientDoctorStation/doctorDesk.vue View File

@@ -114,18 +114,26 @@
114 114
     </el-table>
115 115
     <el-dialog
116 116
       class="centerDialog"
117
-      width="560px"
117
+      width="600px"
118 118
       title="打印"
119 119
       :visible.sync="innerVisible"
120 120
       append-to-body>
121 121
       
122
-      <print :paramsObj='paramsObj'></print>
122
+      <print v-if="index == 2" :paramsObj='paramsObj'></print>
123
+      <treatPrint v-if="index == 6" :paramsObj='paramsObj'></treatPrint>
123 124
     </el-dialog>
124 125
       <span slot="footer" class="dialog-footer">
125 126
         <el-button @click="centerDialogVisible = false">取 消</el-button>
126 127
         <el-button type="primary" @click="savePrint">确 定</el-button>
127 128
       </span>
128 129
     </el-dialog>
130
+    <el-dialog
131
+      class="centerDialog"
132
+      width="600px"
133
+      title="打印"
134
+      :visible.sync="recordVisible">
135
+      <recordPrint :patientid="patientid"></recordPrint>
136
+    </el-dialog>
129 137
 
130 138
   </div>
131 139
 </template>
@@ -141,6 +149,8 @@
141 149
   import { uParseTime } from '@/utils/tools'
142 150
   import { getPrescriptionList } from "@/api/project/project"
143 151
   import print from './print'
152
+  import treatPrint from './treatPrint'
153
+  import recordPrint from './recordPrint'
144 154
   export default {
145 155
     components: {
146 156
       BreadCrumb,
@@ -148,7 +158,9 @@
148 158
       deskRecord,
149 159
       medicalRecord,
150 160
       saveRecordTemplate,
151
-      print
161
+      print,
162
+      treatPrint,
163
+      recordPrint
152 164
     },
153 165
     data() {
154 166
       return {
@@ -196,7 +208,9 @@
196 208
         admin_info:{},
197 209
         saveLoading:false,
198 210
         innerVisible:false,
199
-        paramsObj:{}
211
+        paramsObj:{},
212
+        recordVisible:false,
213
+        recordObj:{}
200 214
 
201 215
       }
202 216
     },
@@ -433,7 +447,7 @@
433 447
 
434 448
 
435 449
 
436
-            this.$refs.prescriptions.setData(this.prescriptions,this.info,this.admin_info,this.doctors,this.department)
450
+            this.$refs.prescriptions.setData(this.prescriptions,this.info,this.admin_info,this.doctors,this.department,this.hisPatientInfo)
437 451
           }
438 452
         })
439 453
 
@@ -449,149 +463,302 @@
449 463
           }
450 464
         }
451 465
         if(isShowDailog){
452
-
453 466
           this.patientTableData.map((item,index) => {
454 467
             if(item.patient_id == this.oldCurrentRow.patient_id){
455 468
               this.$refs.tab.setCurrentRow(this.patientTableData[index])
469
+              return
456 470
             }
457 471
           })
458
-          this.$message.error('需要保存当前处方才能切换')
459
-          return
460
-        }
461
-
462
-
463
-        this.patientid = val.patients.id
464
-        let params = {
465
-          'record_date': this.record_date,
466
-          'patient_id': val.patients.id
467
-        }
468
-        getPatientInfo(params).then(response => {
469
-          if (response.data.state == 0) {
470
-            this.$message.error(response.data.msg)
471
-            return false
472
-          } else {
473
-            this.prescriptions = []
474
-            this.patientInfo = response.data.data.xt_info
475
-            this.hisPatientInfo = response.data.data.his_info
476
-            this.case_history = response.data.data.case_history
477
-            var case_history = response.data.data.case_history
478
-            console.log("case_history22222222",case_history)
479
-            if (case_history.breathing  == 0) {
480
-                case_history.breathing = ""
481
-            }
482
-            this.case_history = case_history
483
-            this.info = response.data.data.info
484
-            this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
485
-            if (this.case_history.temperature <= 0) {
486
-              this.case_history.temperature = ''
487
-            }
488
-            if (this.case_history.blood_sugar <= 0) {
489
-              this.case_history.blood_sugar = ''
490
-            }
491
-            if (this.case_history.pulse <= 0) {
492
-              this.case_history.pulse = ''
493
-            }
494
-            if (this.case_history.sbp <= 0) {
495
-              this.case_history.sbp = ''
496
-            }
497
-            if (this.case_history.dbp <= 0) {
498
-              this.case_history.dbp = ''
499
-            }
500
-            if (this.case_history.height <= 0) {
501
-              this.case_history.height = ''
502
-            }
503
-            if (this.case_history.blood_fat <= 0) {
504
-              this.case_history.blood_fat = ''
505
-            }
506
-            if (this.case_history.sick_type <= 0) {
507
-              this.case_history.sick_type = ''
508
-            }
509
-            this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
510
-            if (this.case_history.is_infect == 1) {
511
-              this.case_history.is_infect = true
512
-            } else {
513
-              this.case_history.is_infect = false
472
+          this.$confirm('是否保存当前处方', '保存', {
473
+            confirmButtonText: '确 定',
474
+            cancelButtonText: '取 消',
475
+            type: 'warning'
476
+          }).then(() => {
477
+            this.open(1)
478
+          }).catch(() => {
479
+            this.patientTableData.map((item,index) => {
480
+              if(item.patient_id == val.patient_id){
481
+                this.$refs.tab.setCurrentRow(this.patientTableData[index])
482
+              }
483
+            })
484
+            this.patientid = val.patients.id
485
+            let params = {
486
+              'record_date': this.record_date,
487
+              'patient_id': val.patients.id
514 488
             }
515
-            this.prescriptionList =response.data.data.prescription
516
-            if (response.data.data.prescription.length > 0) {
517
-              for (let i = 0; i < response.data.data.prescription.length; i++) {
518
-                var prescription = response.data.data.prescription[i]
519
-                let tempAdvice = []
520
-                let tempProject = []
521
-                let tempAddition = []
522
-                for (let b = 0; b < prescription.advices.length; b++) {
523
-                  let obj = {
524
-                    advice_id: prescription.advices[b].id,
525
-                    drug_name: prescription.advices[b].advice_name,
526
-                    single_dose: prescription.advices[b].single_dose,
527
-                    delivery_way: prescription.advices[b].delivery_way,
528
-                    execution_frequency: prescription.advices[b].execution_frequency,
529
-                    retail_price: prescription.advices[b].price.toString(),
530
-                    remark: prescription.advices[b].remark,
531
-                    day:prescription.advices[b].day,
532
-                    prescribing_number:prescription.advices[b].prescribing_number.toString(),
533
-                    single_dose_unit:prescription.advices[b].single_dose_unit,
534
-                    prescribing_number_unit:prescription.advices[b].prescribing_number_unit,
535
-                    medical_insurance_number:prescription.advices[b].med_list_codg,
536
-                    id:prescription.advices[b].drug_id
537
-                  }
538
-                  tempAdvice.push(obj)
489
+            getPatientInfo(params).then(response => {
490
+              if (response.data.state == 0) {
491
+                this.$message.error(response.data.msg)
492
+                return false
493
+              } else {
494
+                this.prescriptions = []
495
+                this.patientInfo = response.data.data.xt_info
496
+                this.hisPatientInfo = response.data.data.his_info
497
+                this.case_history = response.data.data.case_history
498
+                var case_history = response.data.data.case_history
499
+                console.log("case_history22222222",case_history)
500
+                if (case_history.breathing  == 0) {
501
+                  case_history.breathing = ""
539 502
                 }
540
-                for (let b = 0; b < prescription.project.length; b++) {
541
-                  console.log(prescription.project[b])
542
-                  console.log(prescription.project[b].project)
503
+                this.case_history = case_history
504
+                this.info = response.data.data.info
505
+                this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
506
+                if (this.case_history.temperature <= 0) {
507
+                  this.case_history.temperature = ''
508
+                }
509
+                if (this.case_history.blood_sugar <= 0) {
510
+                  this.case_history.blood_sugar = ''
511
+                }
512
+                if (this.case_history.pulse <= 0) {
513
+                  this.case_history.pulse = ''
514
+                }
515
+                if (this.case_history.sbp <= 0) {
516
+                  this.case_history.sbp = ''
517
+                }
518
+                if (this.case_history.dbp <= 0) {
519
+                  this.case_history.dbp = ''
520
+                }
521
+                if (this.case_history.height <= 0) {
522
+                  this.case_history.height = ''
523
+                }
524
+                if (this.case_history.blood_fat <= 0) {
525
+                  this.case_history.blood_fat = ''
526
+                }
527
+                if (this.case_history.sick_type <= 0) {
528
+                  this.case_history.sick_type = ''
529
+                }
530
+                this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
531
+                if (this.case_history.is_infect == 1) {
532
+                  this.case_history.is_infect = true
533
+                } else {
534
+                  this.case_history.is_infect = false
535
+                }
536
+                this.prescriptionList =response.data.data.prescription
537
+                if (response.data.data.prescription.length > 0) {
538
+                  for (let i = 0; i < response.data.data.prescription.length; i++) {
539
+                    var prescription = response.data.data.prescription[i]
540
+                    let tempAdvice = []
541
+                    let tempProject = []
542
+                    let tempAddition = []
543
+                    for (let b = 0; b < prescription.advices.length; b++) {
544
+                      let obj = {
545
+                        advice_id: prescription.advices[b].id,
546
+                        drug_name: prescription.advices[b].advice_name,
547
+                        single_dose: prescription.advices[b].single_dose,
548
+                        delivery_way: prescription.advices[b].delivery_way,
549
+                        execution_frequency: prescription.advices[b].execution_frequency,
550
+                        retail_price: prescription.advices[b].price.toString(),
551
+                        remark: prescription.advices[b].remark,
552
+                        day:prescription.advices[b].day,
553
+                        prescribing_number:prescription.advices[b].prescribing_number.toString(),
554
+                        single_dose_unit:prescription.advices[b].single_dose_unit,
555
+                        prescribing_number_unit:prescription.advices[b].prescribing_number_unit,
556
+                        medical_insurance_number:prescription.advices[b].med_list_codg,
557
+                        id:prescription.advices[b].drug_id
558
+                      }
559
+                      tempAdvice.push(obj)
560
+                    }
561
+                    for (let b = 0; b < prescription.project.length; b++) {
562
+                      console.log(prescription.project[b])
563
+                      console.log(prescription.project[b].project)
564
+                      let obj = {
565
+                        id: prescription.project[b].id,
566
+                        project_id: prescription.project[b].project_id,
567
+                        project_name: prescription.project[b].project.project_name,
568
+                        statistical_classification: prescription.project[b].project.statistical_classification,
569
+                        single_dose: prescription.project[b].single_dose,
570
+                        delivery_way: prescription.project[b].delivery_way,
571
+                        execution_frequency: prescription.project[b].execution_frequency,
572
+                        number_days: prescription.project[b].day,
573
+                        total:prescription.project[b].count.toString(),
574
+                        price:prescription.project[b].price,
575
+                        remark:prescription.project[b].remark,
576
+                        medical_code:prescription.project[b].project.medical_code,
577
+                        unit:prescription.project[b].unit
578
+                      }
579
+                      tempProject.push(obj)
580
+                    }
581
+                    for (let b = 0; b < prescription.addition.length; b++) {
582
+                      let obj = {
583
+                        id: prescription.addition[b].id,
584
+                        item_name: prescription.addition[b].item_name,
585
+                        price: prescription.addition[b].price,
586
+                        count: prescription.addition[b].count,
587
+                        item_id: prescription.addition[b].item_id,
588
+                      }
589
+                      tempAddition.push(obj)
590
+                    }
591
+                    let index = i + 1
592
+                    let obj = {
593
+                      id: prescription.id,
594
+                      name: '处方' + index,
595
+                      advices: tempAdvice,
596
+                      project: tempProject,
597
+                      addition:tempAddition,
598
+                      order_status:prescription.order_status
599
+                    }
600
+                    this.prescriptions.push(obj)
601
+                  }
602
+                } else {
543 603
                   let obj = {
544
-                    id: prescription.project[b].id,
545
-                    project_id: prescription.project[b].project_id,
546
-                    project_name: prescription.project[b].project.project_name,
547
-                    statistical_classification: prescription.project[b].project.statistical_classification,
548
-                    single_dose: prescription.project[b].single_dose,
549
-                    delivery_way: prescription.project[b].delivery_way,
550
-                    execution_frequency: prescription.project[b].execution_frequency,
551
-                    number_days: prescription.project[b].day,
552
-                    total:prescription.project[b].count.toString(),
553
-                    price:prescription.project[b].price,
554
-                    remark:prescription.project[b].remark,
555
-                    medical_code:prescription.project[b].project.medical_code,
556
-                    unit:prescription.project[b].unit
604
+                    id:0,
605
+                    name: '处方' + 1,
606
+                    advices: [],
607
+                    project: [],
608
+                    addition:[],
609
+                    orderStatus:0,
557 610
                   }
558
-                  tempProject.push(obj)
611
+                  this.prescriptions.push(obj)
559 612
                 }
560
-                for (let b = 0; b < prescription.addition.length; b++) {
613
+                this.$refs.prescriptions.setData(this.prescriptions,this.info)
614
+              }
615
+            })
616
+
617
+
618
+          })
619
+
620
+
621
+
622
+          // this.$message.error('需要保存保存处方才能切换')
623
+        }else{
624
+          this.patientid = val.patients.id
625
+          let params = {
626
+            'record_date': this.record_date,
627
+            'patient_id': val.patients.id
628
+          }
629
+          getPatientInfo(params).then(response => {
630
+            if (response.data.state == 0) {
631
+              this.$message.error(response.data.msg)
632
+              return false
633
+            } else {
634
+              this.prescriptions = []
635
+              this.patientInfo = response.data.data.xt_info
636
+              this.hisPatientInfo = response.data.data.his_info
637
+              this.case_history = response.data.data.case_history
638
+              var case_history = response.data.data.case_history
639
+              console.log("case_history22222222",case_history)
640
+              if (case_history.breathing  == 0) {
641
+                case_history.breathing = ""
642
+              }
643
+              this.case_history = case_history
644
+              this.info = response.data.data.info
645
+              this.patientInfo.birth = uParseTime(this.patientInfo.birthday, '{y}-{m}-{d}')
646
+              if (this.case_history.temperature <= 0) {
647
+                this.case_history.temperature = ''
648
+              }
649
+              if (this.case_history.blood_sugar <= 0) {
650
+                this.case_history.blood_sugar = ''
651
+              }
652
+              if (this.case_history.pulse <= 0) {
653
+                this.case_history.pulse = ''
654
+              }
655
+              if (this.case_history.sbp <= 0) {
656
+                this.case_history.sbp = ''
657
+              }
658
+              if (this.case_history.dbp <= 0) {
659
+                this.case_history.dbp = ''
660
+              }
661
+              if (this.case_history.height <= 0) {
662
+                this.case_history.height = ''
663
+              }
664
+              if (this.case_history.blood_fat <= 0) {
665
+                this.case_history.blood_fat = ''
666
+              }
667
+              if (this.case_history.sick_type <= 0) {
668
+                this.case_history.sick_type = ''
669
+              }
670
+              this.case_history.sick_date = uParseTime(this.case_history.sick_date, '{y}-{m}-{d}')
671
+              if (this.case_history.is_infect == 1) {
672
+                this.case_history.is_infect = true
673
+              } else {
674
+                this.case_history.is_infect = false
675
+              }
676
+              this.prescriptionList =response.data.data.prescription
677
+              if (response.data.data.prescription.length > 0) {
678
+                for (let i = 0; i < response.data.data.prescription.length; i++) {
679
+                  var prescription = response.data.data.prescription[i]
680
+                  let tempAdvice = []
681
+                  let tempProject = []
682
+                  let tempAddition = []
683
+                  for (let b = 0; b < prescription.advices.length; b++) {
684
+                    let obj = {
685
+                      advice_id: prescription.advices[b].id,
686
+                      drug_name: prescription.advices[b].advice_name,
687
+                      single_dose: prescription.advices[b].single_dose,
688
+                      delivery_way: prescription.advices[b].delivery_way,
689
+                      execution_frequency: prescription.advices[b].execution_frequency,
690
+                      retail_price: prescription.advices[b].price.toString(),
691
+                      remark: prescription.advices[b].remark,
692
+                      day:prescription.advices[b].day,
693
+                      prescribing_number:prescription.advices[b].prescribing_number.toString(),
694
+                      single_dose_unit:prescription.advices[b].single_dose_unit,
695
+                      prescribing_number_unit:prescription.advices[b].prescribing_number_unit,
696
+                      medical_insurance_number:prescription.advices[b].med_list_codg,
697
+                      id:prescription.advices[b].drug_id
698
+                    }
699
+                    tempAdvice.push(obj)
700
+                  }
701
+                  for (let b = 0; b < prescription.project.length; b++) {
702
+                    console.log(prescription.project[b])
703
+                    console.log(prescription.project[b].project)
704
+                    let obj = {
705
+                      id: prescription.project[b].id,
706
+                      project_id: prescription.project[b].project_id,
707
+                      project_name: prescription.project[b].project.project_name,
708
+                      statistical_classification: prescription.project[b].project.statistical_classification,
709
+                      single_dose: prescription.project[b].single_dose,
710
+                      delivery_way: prescription.project[b].delivery_way,
711
+                      execution_frequency: prescription.project[b].execution_frequency,
712
+                      number_days: prescription.project[b].day,
713
+                      total:prescription.project[b].count.toString(),
714
+                      price:prescription.project[b].price,
715
+                      remark:prescription.project[b].remark,
716
+                      medical_code:prescription.project[b].project.medical_code,
717
+                      unit:prescription.project[b].unit
718
+                    }
719
+                    tempProject.push(obj)
720
+                  }
721
+                  for (let b = 0; b < prescription.addition.length; b++) {
722
+                    let obj = {
723
+                      id: prescription.addition[b].id,
724
+                      item_name: prescription.addition[b].item_name,
725
+                      price: prescription.addition[b].price,
726
+                      count: prescription.addition[b].count,
727
+                      item_id: prescription.addition[b].item_id,
728
+                    }
729
+                    tempAddition.push(obj)
730
+                  }
731
+                  let index = i + 1
561 732
                   let obj = {
562
-                    id: prescription.addition[b].id,
563
-                    item_name: prescription.addition[b].item_name,
564
-                    price: prescription.addition[b].price,
565
-                    count: prescription.addition[b].count,
566
-                    item_id: prescription.addition[b].item_id,
733
+                    id: prescription.id,
734
+                    name: '处方' + index,
735
+                    advices: tempAdvice,
736
+                    project: tempProject,
737
+                    addition:tempAddition,
738
+                    order_status:prescription.order_status
567 739
                   }
568
-                  tempAddition.push(obj)
740
+                  this.prescriptions.push(obj)
569 741
                 }
570
-                let index = i + 1
742
+              } else {
571 743
                 let obj = {
572
-                  id: prescription.id,
573
-                  name: '处方' + index,
574
-                  advices: tempAdvice,
575
-                  project: tempProject,
576
-                  addition:tempAddition,
577
-                  order_status:prescription.order_status
744
+                  id:0,
745
+                  name: '处方' + 1,
746
+                  advices: [],
747
+                  project: [],
748
+                  addition:[],
749
+                  orderStatus:0,
578 750
                 }
579 751
                 this.prescriptions.push(obj)
580 752
               }
581
-            } else {
582
-              let obj = {
583
-                id:0,
584
-                name: '处方' + 1,
585
-                advices: [],
586
-                project: [],
587
-                addition:[],
588
-                orderStatus:0,
589
-              }
590
-              this.prescriptions.push(obj)
753
+              this.$refs.prescriptions.setData(this.prescriptions,this.info)
591 754
             }
592
-            this.$refs.prescriptions.setData(this.prescriptions,this.info)
593
-          }
594
-        })
755
+          })
756
+
757
+
758
+        }
759
+
760
+
761
+
595 762
       },
596 763
       currentChange(currentRow, oldCurrentRow){
597 764
         let isShowDailog = false
@@ -640,7 +807,8 @@
640 807
           }
641 808
           this.$refs.child.createCaseHistory()
642 809
         } else if (index == 2) {
643
-          this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
810
+          this.recordVisible = true
811
+          // this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date+"&patient_id="+this.patientid)
644 812
         } else if (index == 3) {
645 813
            var mode_status =   this.$refs.saveRecordTemplate.mode_status
646 814
            console.log("数据返回",mode_status)
@@ -713,7 +881,15 @@
713 881
           //  this.$router.push("/outpatientDoctorStation/print?record="+this.record_date+"&prescription_id="+this.prescription_id+"&ids="+ids+"&patient_id="+this.patientid)
714 882
          }
715 883
          if(this.index == 6){
716
-            this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id+"&ids="+ids+"&patient_id="+this.patientid)
884
+          let obj = {
885
+            record:this.record_date,
886
+            prescription_id:this.prescription_id,
887
+            ids:ids,
888
+            patient_id:this.patientid
889
+          }
890
+          this.paramsObj = obj
891
+          this.innerVisible = true
892
+          // this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date+"&prescription_id="+this.prescription_id+"&ids="+ids+"&patient_id="+this.patientid)
717 893
          }
718 894
       }
719 895
     },
@@ -1003,6 +1179,7 @@
1003 1179
   .centerDialog{
1004 1180
     .el-dialog__body{
1005 1181
       max-height: calc(100vh - 100px) !important;
1182
+      padding: 0 20px;
1006 1183
     }
1007 1184
   }
1008 1185
 </style>

+ 3 - 2
src/xt_pages/outpatientDoctorStation/print.vue View File

@@ -1,7 +1,8 @@
1 1
 <template>
2 2
   <div>
3
-       <template>
3
+      <template>
4 4
         <el-button
5
+          style="position:fixed;right:25px;z-index:999"
5 6
           :loading="loading"
6 7
           size="small"
7 8
           icon="el-icon-printer"
@@ -11,7 +12,7 @@
11 12
         >
12 13
       </template>
13 14
             
14
-    <div class='dialysisPage'>
15
+    <div class='dialysisPage' style="padding-top:40px;">
15 16
       <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
16 17
     </div>
17 18
   </div>

+ 19 - 39
src/xt_pages/outpatientDoctorStation/recordPrint.vue View File

@@ -1,42 +1,18 @@
1 1
 <template>
2
-  <div class="main-contain">
3
-    <div class="position">
4
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
5
-       <template>
6
-        <el-button
7
-          size="small"
8
-          icon="el-icon-printer"
9
-          @click="printThisPage"
10
-          type="primary"
11
-          >打印</el-button
12
-        >
13
-      </template>
14
-    </div>
15
-    <div class="app-container" style="min-height:0;">
16
-        <el-container class="newContainer">
17
-            <!-- <div style="width:270px;margin-right:20px;">
18
-                <div class="cell clearfix" style="margin-bottom:10px;">
19
-                    <el-input size="small"  v-model.trim="search_input" class="filter-item"/>
20
-                    <el-button size="small" class="filter-item" type="primary" :model="keyword" @click="searchAction">搜索</el-button>
21
-                </div>
22
-                <el-table ref="tab" @row-click="changePatient" highlight-current-row :data="patientTableData" height="480" border style="width: 100%">
23
-                    <el-table-column prop="date"  label="患者">
24
-                        <template slot-scope="scope">
25
-                            {{scope.row.patients.name?scope.row.patients.name:''}}
26
-                        </template>
27
-                    </el-table-column>
28
-                    <el-table-column prop="name" label="就诊号">
29
-                        <template slot-scope="scope">
30
-                           {{ scope.row.his_patient.number ?scope.row.his_patient.number:''}}
31
-                        </template>
32
-                    </el-table-column>
33
-                </el-table>
34
-            </div> -->
2
+  <div>
3
+    <template>
4
+      <el-button
5
+        style="position:fixed;right:25px;z-index:999"
6
+        size="small"
7
+        icon="el-icon-printer"
8
+        @click="printThisPage"
9
+        type="primary"
10
+        >打印</el-button
11
+      >
12
+    </template>
35 13
             
36
-            <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px">
37
-              <printOne v-bind:childResponse="childResponse" :patient="patient" :hispatient = "hispatient" :history="history"></printOne>
38
-            </div>
39
-        </el-container>
14
+    <div class='dialysisPage' style="padding-top:40px;">
15
+      <printOne v-bind:childResponse="childResponse" :patient="patient" :hispatient="hispatient" :history="history" :patientid="patientid"></printOne>
40 16
     </div>
41 17
   </div>
42 18
 </template>
@@ -57,6 +33,9 @@ export default {
57 33
     BreadCrumb,
58 34
     printOne
59 35
   },
36
+  props:{
37
+    patientid:Number,
38
+  },
60 39
   data() {
61 40
     return {
62 41
       crumbs: [
@@ -70,7 +49,8 @@ export default {
70 49
       hispatient:{},
71 50
       educationOptions:[],
72 51
       history:{},
73
-      keyword:""
52
+      keyword:"",
53
+      patientid:''
74 54
     };
75 55
   },
76 56
   methods: {
@@ -160,7 +140,7 @@ export default {
160 140
     
161 141
   },
162 142
   created() {
163
-    this.getPatientList() 
143
+    // this.getPatientList() 
164 144
    
165 145
   },
166 146
   // computed:{

+ 14 - 3
src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue View File

@@ -1,5 +1,6 @@
1 1
 <template>
2
-    <div id='prescription-print' class="prescription-print">
2
+<div id='prescription-print'>
3
+    <div class="prescription-print">
3 4
         <div class="printTitle">{{orgname}} &nbsp;&nbsp; 门诊病历</div>
4 5
         <div class="infoTitle">
5 6
             <div>姓名:{{patient.name?patient.name:''}}</div>
@@ -37,8 +38,9 @@
37 38
             <div style="flex:1;">{{patient.id?patient.id:''}}</div>
38 39
         </div>
39 40
         <div style="page-break-after:always;margin-top:50px;"></div>
41
+    </div>
40 42
 
41
-
43
+    <div class="prescription-print">
42 44
         <div class="printTitle">病历内容</div>
43 45
         <div class="recordTitle">
44 46
             <div>科别:{{getDeparment(hispatient.departments)?getDeparment(hispatient.departments):''}}</div>
@@ -89,6 +91,7 @@
89 91
             医生签名:{{getDoctor(history.doctor)?getDoctor(history.doctor):''}}
90 92
         </div>
91 93
     </div>
94
+</div>
92 95
 </template>
93 96
 <script>
94 97
 
@@ -98,6 +101,7 @@ export default {
98 101
     props:{
99 102
       patient:Object,
100 103
       hispatient:Object,
104
+      patientid:Number
101 105
     //   history:Object,
102 106
     },
103 107
     data(){
@@ -141,7 +145,7 @@ export default {
141 145
       getPatientCaseHistory(){
142 146
 
143 147
         const params = {
144
-          patient_id:this.$route.query.patient_id
148
+          patient_id:this.patientid
145 149
         }
146 150
       console.log("病历22222",params)
147 151
       getPatientCaseHistory(params).then(response=>{
@@ -183,6 +187,13 @@ export default {
183 187
 
184 188
 
185 189
 <style lang="scss" scoped>
190
+.prescription-print{
191
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
192
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
193
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
194
+    margin-bottom: 20px;
195
+    padding:20px 10px;
196
+}
186 197
 .printTitle{
187 198
     font-size: 22px;
188 199
     text-align: center;

+ 7 - 8
src/xt_pages/outpatientDoctorStation/template/printOne.vue View File

@@ -182,13 +182,12 @@ export default {
182 182
       this.orgname = xtuser.org.org_name
183 183
      
184 184
    },
185
-  //  watch:{
186
-  //    patient_id:function(val){
187
-  //      console.log("101000010101010",this.patient_id,this.record_date,this.prescription_id)
188
-  //      this.getPrescriptionPrint()
189
-  //      this.getHisPatientDetail()
190
-  //    }
191
-  //  }
185
+   watch:{
186
+    ids:function(val){
187
+      this.ids = val
188
+      this.getPrescriptionPrint()
189
+    }
190
+   }
192 191
 }
193 192
 </script>
194 193
 
@@ -199,7 +198,7 @@ export default {
199 198
     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
200 199
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
201 200
     margin-bottom: 20px;
202
-    padding:20px 0px;
201
+    padding:20px 10px;
203 202
 }
204 203
 .printTitle{
205 204
     font-size: 22px;

+ 32 - 32
src/xt_pages/outpatientDoctorStation/treatPrint.vue View File

@@ -1,9 +1,8 @@
1 1
 <template>
2
-  <div class="main-contain">
3
-    <div class="position">
4
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
2
+  <div>
5 3
        <template>
6 4
         <el-button
5
+          style="position:fixed;right:25px;z-index:999"
7 6
           :loading="loading"
8 7
           size="small"
9 8
           icon="el-icon-printer"
@@ -12,30 +11,10 @@
12 11
           >打印</el-button
13 12
         >
14 13
       </template>
15
-    </div>
16
-    <div class="app-container" style="min-height:0;">
17
-        <el-container class="newContainer">
18
-            <!-- <div style="width:270px;margin-right:20px;">
19
-                <div class="cell clearfix" style="margin-bottom:10px;">
20
-                    <el-input size="small"  v-model.trim="search_input" class="filter-item"/>
21
-                    <el-button size="small" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
22
-                </div>
23
-                <el-table ref="tab"   @current-change="changePatient" highlight-current-row :data="patientTableData" 
24
-                 height="480" border style="width: 100%">
25
-                    <el-table-column prop="date"  label="患者">   
26
-                      <template slot-scope="scope">{{scope.row.patients?scope.row.patients.name:''}}</template> 
27
-                    </el-table-column>
28
-                    <el-table-column prop="name" label="就诊号">
29
-                        <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}</template>
30
-                    </el-table-column>
31
-                </el-table>
32
-            </div> -->
33 14
             
34
-            <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px;margin:0 auto;width:960px;">
35
-              <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
36
-            </div>
37
-        </el-container>
38
-    </div>
15
+      <div class='dialysisPage' style="padding-top:40px;">
16
+        <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
17
+      </div>
39 18
   </div>
40 19
 </template>
41 20
 
@@ -57,6 +36,9 @@ export default {
57 36
     BreadCrumb,
58 37
     printOne
59 38
   },
39
+  props:{
40
+    paramsObj:Object
41
+  },
60 42
   data() {
61 43
     return {
62 44
       crumbs: [
@@ -71,7 +53,8 @@ export default {
71 53
       search_input:"",
72 54
       loading:false,
73 55
       patient_id:0,
74
-      prescription_id:0
56
+      prescription_id:0,
57
+      ids:''
75 58
     };
76 59
   },
77 60
   methods:{
@@ -126,9 +109,9 @@ export default {
126 109
                 cal_two = cal_two + 1
127 110
               }
128 111
             }
129
-            this.$refs.tab.setCurrentRow(this.patientTableData[0])
130
-            console.log(this.patientTableData[0])
131
-            this.choosePatient(this.patientTableData[0])
112
+            // this.$refs.tab.setCurrentRow(this.patientTableData[0])
113
+            // console.log(this.patientTableData[0])
114
+            // this.choosePatient(this.patientTableData[0])
132 115
             this.cal_one = cal_one
133 116
             this.cal_two = cal_two   
134 117
          }
@@ -169,12 +152,29 @@ export default {
169 152
 
170 153
   created() {
171 154
     this.getAllDoctorList()
172
-    var record_date = this.$route.query.record
155
+    var record_date = this.paramsObj.record
173 156
     this.record_date = record_date
174 157
     console.log("record_date",record_date)
175
-    this.prescription_id = this.$route.query.prescription_id
158
+    this.prescription_id = this.paramsObj.prescription_id
159
+    this.patient_id = this.paramsObj.patient_id
160
+    this.ids = this.paramsObj.ids
176 161
     this.getAllHisPatientList(record_date)
177 162
   },
163
+  watch:{
164
+    paramsObj:{//深度监听,可监听到对象、数组的变化
165
+      handler(val, oldVal){
166
+        this.paramsObj = val
167
+        this.patient_id = this.paramsObj.patient_id
168
+        var record_date = this.paramsObj.record
169
+        this.record_date = record_date
170
+        var prescription_id = this.paramsObj.prescription_id
171
+        this.prescription_id = prescription_id
172
+        this.ids = this.paramsObj.ids
173
+        
174
+      },
175
+      deep:true
176
+    }
177
+  }
178 178
 
179 179
 };
180 180
 </script>

+ 20 - 7
src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue View File

@@ -102,7 +102,7 @@
102 102
      </div>
103 103
 
104 104
 
105
-    <div id='prescriptionPrint'>
105
+    <!-- <div id='prescriptionPrint'>
106 106
 
107 107
         <div v-for="(item,index) in advicePrint" :key="index">
108 108
             <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
@@ -204,7 +204,7 @@
204 204
 
205 205
         </div>
206 206
 
207
-    </div>
207
+    </div> -->
208 208
   </div>
209 209
 </template>
210 210
 <script>
@@ -214,7 +214,8 @@ export default {
214 214
     props:{
215 215
       patient_id:Number,
216 216
       record_date:String,
217
-      prescription_id:Number
217
+      prescription_id:Number,
218
+      ids:String
218 219
     },
219 220
     data(){
220 221
       return {
@@ -271,10 +272,10 @@ export default {
271 272
         //   patient_id:this.patient_id,
272 273
         //   record_date:this.record_date,
273 274
         //   prescription_id:this.prescription_id,
274
-          patient_id:this.$route.query.patient_id,
275
-          record_date:this.$route.query.record,
276
-          prescription_id:this.$route.query.prescription_id,
277
-          ids:this.$route.query.ids,
275
+          patient_id:this.patient_id,
276
+          record_date:this.record_date,
277
+          prescription_id:this.prescription_id,
278
+          ids:this.ids,
278 279
         }
279 280
         console.log("999999",params)
280 281
        getPrescriptionPrint(params).then(response=>{
@@ -342,6 +343,11 @@ export default {
342 343
      patient_id:function(val){
343 344
        console.log("101000010101010",this.patient_id,this.record_date,this.prescription_id)
344 345
     //    this.getPrescriptionPrint()
346
+     },
347
+     ids:function(val){
348
+         this.ids = val
349
+         console.log('this.idsids',this.ids)
350
+         this.getPrescriptionPrint()
345 351
      }
346 352
    }
347 353
 }
@@ -349,6 +355,13 @@ export default {
349 355
 
350 356
 
351 357
 <style lang="scss" scoped>
358
+.prescription-print{
359
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
360
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
361
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
362
+    margin-bottom: 20px;
363
+    padding:20px 10px;
364
+}
352 365
 .prescription-print{
353 366
     font-size: 14px;
354 367
 }