Pārlūkot izejas kodu

修改问题和模版

张保健 5 gadus atpakaļ
vecāks
revīzija
d593126988

+ 6 - 7
src/lang/zh.js Parādīt failu

@@ -152,14 +152,13 @@ export default {
152 152
     salesReturnDetail: '退货单详情',
153 153
     stockOutDetail: '出库单详情',
154 154
     cancelStockDetail: '退库单详情',
155
-    stockDetail:'出入库明细查询',
156
-
157
-    showconfig:'显示配置',
158
-    user_detail:'使用明细',
159
-    systemManage:'系统管理',
160
-    printTemplate:'打印模版',
161
-
155
+    stockDetail: '出入库明细查询',
162 156
 
157
+    showconfig: '显示配置',
158
+    user_detail: '使用明细',
159
+    systemManage: '系统管理',
160
+    printTemplate: '打印模版',
161
+    hisconfig: 'His集成'
163 162
   },
164 163
   navbar: {
165 164
     logOut: '退出登录',

+ 11 - 11
src/router/modules/patient.js Parādīt failu

@@ -148,16 +148,16 @@ export default {
148 148
       title: 'proeducation',
149 149
       noCache: true
150 150
     }
151
-  },{
152
-      path: '/course/print',
153
-      component: () => import('@/xt_pages/user/coursePrint'),
154
-      hidden: true,
155
-      is_menu: false,
156
-      name: 'dialysisPrintOrder',
157
-      meta: {
158
-        title: 'dialysisPrintOrder',
159
-        noCache: true
160
-      }
161
-    },
151
+  }, {
152
+    path: '/course/print',
153
+    component: () => import('@/xt_pages/user/coursePrint'),
154
+    hidden: true,
155
+    is_menu: false,
156
+    name: 'coursePrint',
157
+    meta: {
158
+      title: 'coursePrint',
159
+      noCache: true
160
+    }
161
+  }
162 162
   ]
163 163
 }

+ 90 - 83
src/router/modules/systems.js Parādīt failu

@@ -18,92 +18,99 @@ export default {
18 18
       title: 'adminManage'
19 19
     }
20 20
   },
21
-    {
22
-      path: '/role/manage',
23
-      component: () => import('@/xt_pages/role/role'),
24
-      name: 'roleManage',
25
-      meta: {
26
-        title: 'roleManage'
27
-      }
28
-    },
29
-    {
30
-      path: '/role/admin/create',
31
-      component: () => import('@/xt_pages/role/CreateAdmin'),
32
-      name: 'addAdmin',
33
-      meta: {
34
-        title: 'addAdmin',
35
-        noCache: true
36
-      },
37
-      hidden: true,
38
-      is_menu: false
39
-    },
40
-    {
41
-      path: '/role/admin/edit',
42
-      component: () => import('@/xt_pages/role/EditAdmin'),
43
-      name: 'editAdmin',
44
-      meta: {
45
-        title: 'editAdmin',
46
-        noCache: true
47
-      },
48
-      hidden: true,
49
-      is_menu: false
50
-    },
51
-    {
52
-      path: '/role/perview',
53
-      component: () => import('@/xt_pages/role/EditPerview'),
54
-      name: 'setupPerview',
55
-      meta: {
56
-        title: 'setupPerview',
57
-        noCache: true
58
-      },
59
-      hidden: true,
60
-      is_menu: false
61
-    },
62
-    {
63
-      path: '/role/admin/specialpermission',
64
-      component: () => import('@/xt_pages/role/special_permission'),
65
-      name: 'special_permission_manage',
66
-      meta: {
67
-        title: 'special_permission_manage'
68
-      }
21
+  {
22
+    path: '/role/manage',
23
+    component: () => import('@/xt_pages/role/role'),
24
+    name: 'roleManage',
25
+    meta: {
26
+      title: 'roleManage'
27
+    }
28
+  },
29
+  {
30
+    path: '/role/admin/create',
31
+    component: () => import('@/xt_pages/role/CreateAdmin'),
32
+    name: 'addAdmin',
33
+    meta: {
34
+      title: 'addAdmin',
35
+      noCache: true
69 36
     },
70
-    {
71
-      path: '/data/dictionary',
72
-      component: () => import('@/xt_pages/data/index'),
73
-      name: 'dictionary',
74
-      meta: {
75
-        title: 'data_dictionary'
76
-      }
37
+    hidden: true,
38
+    is_menu: false
39
+  },
40
+  {
41
+    path: '/role/admin/edit',
42
+    component: () => import('@/xt_pages/role/EditAdmin'),
43
+    name: 'editAdmin',
44
+    meta: {
45
+      title: 'editAdmin',
46
+      noCache: true
77 47
     },
78
-    {
79
-      path: '/data/template',
80
-      component: () => import('@/xt_pages/data/template'),
81
-      name: 'template',
82
-      meta: {
83
-        title: 'template'
84
-      }
48
+    hidden: true,
49
+    is_menu: false
50
+  },
51
+  {
52
+    path: '/role/perview',
53
+    component: () => import('@/xt_pages/role/EditPerview'),
54
+    name: 'setupPerview',
55
+    meta: {
56
+      title: 'setupPerview',
57
+      noCache: true
85 58
     },
86
-    {
87
-      path: '/data/druguse',
88
-      component: () => import('@/xt_pages/data/druguseTemplate'),
89
-      name: 'druguse',
90
-      meta: {
91
-        title: 'druguse'
92
-      }
93
-    }, {
94
-      path: '/data/showconfig',
95
-      component: () => import('@/xt_pages/data/showConfig'),
96
-      name: 'showconfig',
97
-      meta: {
98
-        title: 'showconfig'
99
-      }
100
-    },{
101
-      path: '/data/print',
102
-      component: () => import('@/xt_pages/data/printTemplate'),
103
-      name: 'printTemplate',
104
-      meta: {
105
-        title: 'printTemplate'
106
-      }
59
+    hidden: true,
60
+    is_menu: false
61
+  },
62
+  {
63
+    path: '/role/admin/specialpermission',
64
+    component: () => import('@/xt_pages/role/special_permission'),
65
+    name: 'special_permission_manage',
66
+    meta: {
67
+      title: 'special_permission_manage'
68
+    }
69
+  },
70
+  {
71
+    path: '/data/dictionary',
72
+    component: () => import('@/xt_pages/data/index'),
73
+    name: 'dictionary',
74
+    meta: {
75
+      title: 'data_dictionary'
76
+    }
77
+  },
78
+  {
79
+    path: '/data/template',
80
+    component: () => import('@/xt_pages/data/template'),
81
+    name: 'template',
82
+    meta: {
83
+      title: 'template'
84
+    }
85
+  },
86
+  {
87
+    path: '/data/druguse',
88
+    component: () => import('@/xt_pages/data/druguseTemplate'),
89
+    name: 'druguse',
90
+    meta: {
91
+      title: 'druguse'
92
+    }
93
+  }, {
94
+    path: '/data/showconfig',
95
+    component: () => import('@/xt_pages/data/showConfig'),
96
+    name: 'showconfig',
97
+    meta: {
98
+      title: 'showconfig'
99
+    }
100
+  }, {
101
+    path: '/data/print',
102
+    component: () => import('@/xt_pages/data/printTemplate'),
103
+    name: 'printTemplate',
104
+    meta: {
105
+      title: 'printTemplate'
106
+    }
107
+  }, {
108
+    path: '/data/hisconfig',
109
+    component: () => import('@/xt_pages/data/hisConfig'),
110
+    name: 'hisconfig',
111
+    meta: {
112
+      title: 'hisconfig'
107 113
     }
114
+  }
108 115
   ]
109 116
 }

+ 377 - 0
src/xt_pages/data/components/hisConfigInfo.vue Parādīt failu

@@ -0,0 +1,377 @@
1
+<template>
2
+  <div class="">
3
+    <div class="filter-container">
4
+      <el-button size="small" class="filter-item" style="float:right;" @click="handleCreate" type="primary"
5
+                 icon="el-icon-circle-plus-outline">{{$t('table.add')}}
6
+      </el-button>
7
+    </div>
8
+    <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list"
9
+              v-loading="listLoading" border fit highlight-current-row style="width: 100%;min-height:500px;">
10
+      <!-- <el-table-column align="center" :label="$t('table.id')" width="65" @click="handleUpdate(scope.row)">
11
+        <template slot-scope="scope">
12
+          <span>{{scope.row.id}}</span>
13
+        </template>
14
+      </el-table-column> -->
15
+      <el-table-column align="center" label="标题">
16
+        <template slot-scope="scope">
17
+          <!-- <span @click="handleUpdate(scope.row)">{{scope.row.name}}</span> -->
18
+          <span>{{scope.row.title}}</span>
19
+        </template>
20
+      </el-table-column>
21
+      <el-table-column align="center" label="内容">
22
+        <template slot-scope="scope">
23
+          <span v-html="scope.row.content">{{scope.row.content}}</span>
24
+        </template>
25
+      </el-table-column>
26
+      <el-table-column align="center" :label="$t('table.actions')" width="230" class-name="small-padding fixed-width">
27
+        <template slot-scope="scope">
28
+          <el-tooltip class="item" effect="dark" content="编辑" placement="top">
29
+            <el-button icon="el-icon-edit-outline" type="primary" size="small"
30
+                       @click="handleUpdate(scope.row)"></el-button>
31
+          </el-tooltip>
32
+          <el-tooltip class="item" effect="dark" content="删除" placement="top">
33
+            <el-button icon="el-icon-delete" v-if="scope.row.status!='deleted'" size="small" type="danger"
34
+                       @click="handleModifyStatus(scope.row,'deleted')">
35
+            </el-button>
36
+          </el-tooltip>
37
+
38
+
39
+        </template>
40
+      </el-table-column>
41
+    </el-table>
42
+
43
+    <!-- <div class="pagination-container">
44
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listQuery.page" :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
45
+      </el-pagination>
46
+    </div> -->
47
+
48
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
49
+      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="right" label-width="70px">
50
+        <el-form-item label="标题" prop="title">
51
+          <el-input v-model="temp.title" maxlength="100" placeholder="请输入标题"></el-input>
52
+        </el-form-item>
53
+
54
+        <el-form-item label="内容"  v-if="type == 'course_disease'">
55
+          <keep-alive>
56
+            <editor ref="editor"
57
+                     id="editor"
58
+                     style="width: 600px"
59
+                     v-bind:r_content="temp.content">
60
+            </editor>
61
+          </keep-alive>
62
+        </el-form-item>
63
+
64
+        <el-form-item label="内容" prop="content" v-else>
65
+          <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 4}" v-model="temp.content"
66
+                    placeholder="请输入内容"></el-input>
67
+        </el-form-item>
68
+
69
+
70
+        <el-form-item :label="$t('data_config.remark')">
71
+          <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 4}" placeholder="请输入备注"
72
+                    v-model="temp.remark"></el-input>
73
+        </el-form-item>
74
+      </el-form>
75
+      <div slot="footer" class="dialog-footer">
76
+        <el-button @click="dialogFormVisible = false">{{$t('table.cancel')}}</el-button>
77
+        <el-button v-if="dialogStatus=='create'" type="primary" @click="createData">{{$t('table.confirm')}}</el-button>
78
+        <el-button v-else type="primary" @click="updateData">{{$t('table.confirm')}}</el-button>
79
+      </div>
80
+    </el-dialog>
81
+
82
+    <el-dialog title="Reading statistics" :visible.sync="dialogPvVisible">
83
+      <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="pvData" border fit
84
+                highlight-current-row style="width: 100%">
85
+        <el-table-column prop="key" label="Channel"></el-table-column>
86
+        <el-table-column prop="pv" label="Pv"></el-table-column>
87
+      </el-table>
88
+      <span slot="footer" class="dialog-footer">
89
+        <el-button type="primary" @click="dialogPvVisible = false">{{$t('table.confirm')}}</el-button>
90
+      </span>
91
+    </el-dialog>
92
+
93
+  </div>
94
+</template>
95
+
96
+<script>
97
+  import { createChildConfig, createConfig, deleteChildConfig, updateChildConfig, updateTemplate } from '@/api/data'
98
+  import waves from '@/directive/waves' // 水波纹指令
99
+  import { parseTime } from '@/utils'
100
+  import store from '@/store'
101
+  import bus from '@/assets/eventBus'
102
+  import Editor from '@/components/Editor'
103
+
104
+  export default {
105
+    name: 'hisConfigInfo',
106
+    directives: {
107
+      waves
108
+    },
109
+    components: {
110
+      Editor
111
+    },
112
+    props: {
113
+      type: {
114
+        type: String,
115
+        default: 'patient'
116
+      }
117
+    },
118
+    beforeMount(){
119
+
120
+
121
+    },
122
+    data() {
123
+      return {
124
+        currentId: undefined,
125
+        tableKey: 0,
126
+        // list: null,
127
+        total: null,
128
+        listLoading: true,
129
+        listQuery: {
130
+          page: 1,
131
+          limit: 20,
132
+          importance: undefined,
133
+          title: undefined,
134
+          type: this.type,
135
+          sort: '+id'
136
+        },
137
+        importanceOptions: [1, 2, 3],
138
+        // calendarTypeOptions,
139
+        sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
140
+        statusOptions: ['published', 'draft', 'deleted'],
141
+        showReviewer: false,
142
+        temp: {
143
+          id: undefined,
144
+          parent_id: 0,
145
+          module: this.type,
146
+          org_id: 0,
147
+          title: '',
148
+          content: '',
149
+          remark: ''
150
+        },
151
+        dialogFormVisible: false,
152
+        dialogStatus: '',
153
+        textMap: {
154
+          update: '修改',
155
+          create: '新增'
156
+        },
157
+        dialogPvVisible: false,
158
+        pvData: [],
159
+        rules: {
160
+          title: [{ required: true, message: '请输入名称', trigger: 'blur' }],
161
+          content: [{ required: true, message: '请输入字段名', trigger: 'blur' }]
162
+        },
163
+        downloadLoading: false
164
+      }
165
+    },
166
+    // watch: {
167
+    //   'temp.config_field':function(){
168
+    //       this.temp.config_field =  this.temp.config_field.replace(/[^A-Za-z]/g,'');
169
+    //   }
170
+    // },
171
+    computed: {
172
+      list: function() {
173
+        // const list = store.getters.configlist[this.type]
174
+        // this.total = list.length
175
+        return store.getters.configlist[this.type]
176
+      }
177
+    },
178
+    filters: {
179
+      statusFilter(status) {
180
+        const statusMap = {
181
+          published: 'success',
182
+          draft: 'info',
183
+          deleted: 'danger'
184
+        }
185
+        return statusMap[status]
186
+      },
187
+      typeFilter(type) {
188
+        return calendarTypeKeyValue[type]
189
+      }
190
+    },
191
+    created() {
192
+      this.getList()
193
+    },
194
+    methods: {
195
+      fieldChange: function(newValue) {
196
+        this.temp.config_field = newValue.replace(/[^A-Za-z]/g, '')
197
+      },
198
+      handleRowChange(currentRow, oldCurrentRow) {
199
+        if (currentRow != undefined) {
200
+          this.currentId = currentRow.id
201
+          bus.$emit('parentChangeId', currentRow)
202
+        }
203
+      },
204
+      getList() {
205
+        this.listLoading = false
206
+        // setTimeout(() => {
207
+        //     this.listLoading = false
208
+        //   }, 1 * 1000)
209
+      },
210
+      handleFilter() {
211
+        this.listQuery.page = 1
212
+        this.getList()
213
+      },
214
+      handleSizeChange(val) {
215
+        this.listQuery.limit = val
216
+        this.getList()
217
+      },
218
+      handleCurrentChange(val) {
219
+        this.listQuery.page = val
220
+        this.getList()
221
+      },
222
+      handleModifyStatus(row, status) {
223
+        this.temp = Object.assign({}, row) // copy obj
224
+        this.$confirm('此操作将永久删除该配置项, 是否继续?', '提示', {
225
+          confirmButtonText: '确 定',
226
+          cancelButtonText: '取 消',
227
+          type: 'warning'
228
+        }).then(() => {
229
+          const tempData = Object.assign({}, this.temp)
230
+          deleteChildConfig(tempData).then(response => {
231
+            if (!response.data) {
232
+              // 由于mockjs 不支持自定义状态码只能这样hack
233
+              reject('error')
234
+            }
235
+            if (response.data.state === 0) {
236
+              this.$message.error(response.data.msg)
237
+            }
238
+
239
+            const result = response.data.data.dataconfig
240
+            store.dispatch('updateParentConfigList', [tempData, 'delete']).then(() => {
241
+              next()
242
+            })
243
+          })
244
+
245
+          this.$message({
246
+            type: 'success',
247
+            message: '删除成功!'
248
+          })
249
+        })
250
+          .catch(() => {
251
+            this.$message({
252
+              type: 'info',
253
+              message: '已取消删除'
254
+            })
255
+          })
256
+      },
257
+      resetTemp() {
258
+        this.temp = {
259
+          id: undefined,
260
+          parent_id: 0,
261
+          module: this.type,
262
+          org_id: 0,
263
+          title: '',
264
+          content: '',
265
+          remark: ''
266
+        }
267
+      },
268
+      handleCreate() {
269
+        this.resetTemp()
270
+        this.dialogStatus = 'create'
271
+        this.dialogFormVisible = true
272
+        this.$nextTick(() => {
273
+          this.$refs['dataForm'].clearValidate()
274
+        })
275
+      },
276
+      createData() {
277
+        this.$refs['dataForm'].validate((valid) => {
278
+          if(this.type == "course_disease"){
279
+            this.temp.content = this.$refs.editor.content;
280
+          }
281
+
282
+          if (valid) {
283
+            createConfig(this.temp).then(response => {
284
+              if (!response.data) { // 由于mockjs 不支持自定义状态码只能这样hack
285
+                reject('error')
286
+              }
287
+              if (response.data.state === 0) {
288
+                this.$message.error(response.data.msg)
289
+              }
290
+              const result = response.data.data.dataconfig
291
+              // 更新store
292
+              store.dispatch('updateConfigList', result).then(() => {
293
+
294
+              })
295
+
296
+              this.dialogFormVisible = false
297
+
298
+              this.$message.success('创建成功')
299
+            })
300
+          }
301
+        })
302
+      },
303
+      handleUpdate(row) {
304
+        this.temp = Object.assign({}, row) // copy obj
305
+        this.dialogStatus = 'update'
306
+        this.dialogFormVisible = true
307
+        this.$nextTick(() => {
308
+          this.$refs['dataForm'].clearValidate()
309
+        })
310
+      },
311
+      updateData() {
312
+        this.$refs['dataForm'].validate(valid => {
313
+          if (valid) {
314
+            const tempData = Object.assign({}, this.temp)
315
+            if(this.type == "course_disease"){
316
+              tempData.content = this.$refs.editor.content;
317
+            }
318
+            updateTemplate(tempData).then(response => {
319
+              if (!response.data) {
320
+                // 由于mockjs 不支持自定义状态码只能这样hack
321
+                reject('error')
322
+              }
323
+              if (response.data.state === 0) {
324
+                this.$message.error(response.data.msg)
325
+              }
326
+
327
+              const result = response.data.data.dataconfig
328
+              store.dispatch('updateParentConfigList', [result, 'update']).then(() => {
329
+                next()
330
+              })
331
+
332
+              this.dialogFormVisible = false
333
+
334
+              this.$message.success('更新成功')
335
+            })
336
+          }
337
+        })
338
+      },
339
+      handleDelete(row) {
340
+
341
+        this.$message.success('删除成功')
342
+
343
+        const index = this.list.indexOf(row)
344
+        this.list.splice(index, 1)
345
+      },
346
+      handleFetchPv(pv) {
347
+        fetchPv(pv).then(response => {
348
+          this.pvData = response.data.pvData
349
+          this.dialogPvVisible = true
350
+        })
351
+      },
352
+      handleDownload() {
353
+        this.downloadLoading = true
354
+        import('@/vendor/Export2Excel').then(excel => {
355
+          const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
356
+          const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
357
+          const data = this.formatJson(filterVal, this.list)
358
+          excel.export_json_to_excel({
359
+            header: tHeader,
360
+            data,
361
+            filename: 'table-list'
362
+          })
363
+          this.downloadLoading = false
364
+        })
365
+      },
366
+      formatJson(filterVal, jsonData) {
367
+        return jsonData.map(v => filterVal.map(j => {
368
+          if (j === 'timestamp') {
369
+            return parseTime(v[j])
370
+          } else {
371
+            return v[j]
372
+          }
373
+        }))
374
+      }
375
+    }
376
+  }
377
+</script>

+ 55 - 0
src/xt_pages/data/hisConfig.vue Parādīt failu

@@ -0,0 +1,55 @@
1
+<template>
2
+<div class="main-contain">
3
+  <div class="position">
4
+    <bread-crumb :crumbs='crumbs'></bread-crumb>
5
+  </div>
6
+  <div class="app-container">
7
+    <el-tabs v-model="activeName" >
8
+      <el-tab-pane v-for="item in tabMapOptions" :label="item.label" :key='item.key' :name="item.key" style="display:flex;">
9
+        <keep-alive>
10
+          <div style="display:flex;width:100%;">
11
+          <tab-pane v-if='activeName==item.key' :type='item.key' style="flex:1;"></tab-pane>
12
+          </div>
13
+        </keep-alive>
14
+      </el-tab-pane>
15
+    </el-tabs>
16
+  </div>
17
+  </div>
18
+
19
+</template>
20
+
21
+<script>
22
+import tabPane from './components/hisConfigInfo'
23
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
24
+export default {
25
+  name: 'hisconfig',
26
+  components: { tabPane,BreadCrumb},
27
+  data() {
28
+    return {
29
+      crumbs: [
30
+        { path: false, name: '系统管理' },
31
+        { path: 'data/hisconfig', name: 'His集成' },
32
+      ],
33
+      tabMapOptions: [
34
+        { label: "集成配置", key: 'education'},
35
+        { label: "医护配置", key: 'summary'},
36
+        { label: "病患配置", key: 'course_disease' },
37
+        { label: "同步配置", key: 'rescue_record'}
38
+      ],
39
+      activeName: 'education',
40
+      createdTimes: 0
41
+    }
42
+  },
43
+  methods: {
44
+    showCreatedTimes() {
45
+      this.createdTimes = this.createdTimes + 1
46
+    }
47
+  }
48
+}
49
+</script>
50
+
51
+<style scoped>
52
+  .tab-container{
53
+    margin: 30px;
54
+  }
55
+</style>

+ 1 - 1
src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue Parādīt failu

@@ -4,7 +4,7 @@
4 4
       title="透后评估"
5 5
       :visible.sync="isVisibility"
6 6
       width="1010px"
7
-      modal-append-to-body=“false”
7
+      :modal-append-to-body="false"
8 8
     >
9 9
       <el-form ref="form" :model="form" label-width="160px">
10 10
         <!-- <el-row :gutter="20"> -->

+ 1 - 1
src/xt_pages/dialysis/details/dialog/acceptsTreatmentDialog.vue Parādīt failu

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
   <el-dialog title="接诊评估"
3
-             modal-append-to-body=“false”
3
+             :modal-append-to-body= "false"
4 4
              :visible.sync="isVisibility"
5 5
             width="854px">
6 6
     <el-form :model="receiveTreatmentAsses" label-width="80px">

+ 1 - 1
src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue Parādīt failu

@@ -3,7 +3,7 @@
3 3
     title="透前评估"
4 4
     :visible.sync="isVisibility"
5 5
     width="1010px"
6
-    modal-append-to-body=“false”
6
+    :modal-append-to-body="false"
7 7
   >
8 8
 
9 9
     <!--<check-box-dialog-->

+ 1 - 1
src/xt_pages/dialysis/details/dialog/computer_dialog.vue Parādīt failu

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
   <div>
3
-    <el-dialog title="透析上机" :visible.sync="visible" width="854px" modal-append-to-body=“false”>
3
+    <el-dialog title="透析上机" :visible.sync="visible" width="854px" :modal-append-to-body="false">
4 4
       <el-form :model="form" label-width="80px">
5 5
         <el-form-item label="上机床位">
6 6
           <el-select v-model="form.bed_id" placeholder="" :disabled="dialysis_order.id != 0">

+ 1 - 1
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Parādīt failu

@@ -3,7 +3,7 @@
3 3
     title="透析处方"
4 4
     :visible.sync="isVisibility"
5 5
     width="1010px"
6
-    modal-append-to-body=“false”
6
+    :modal-append-to-body="false"
7 7
     :append-to-body="true"
8 8
   >
9 9
     <el-form ref="dialysisPrescription" :model="dialysisPrescription" label-width="148px">

+ 1 - 1
src/xt_pages/dialysis/details/dialog/doubleCheckDialog.vue Parādīt failu

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <el-dialog title="双人核对"
3 3
              :visible.sync="isVisibility"
4
-             modal-append-to-body=“false”
4
+             :modal-append-to-body="false"
5 5
              width="854px">
6 6
 
7 7
     <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="110px">

+ 2 - 1
src/xt_pages/dialysis/details/dialog/finish_dialog.vue Parādīt failu

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
     <div>
3
-        <el-dialog title="透析下机" :visible.sync="visible" width="854px" modal-append-to-body=“false” >
3
+        <el-dialog title="透析下机" :visible.sync="visible" width="854px" :modal-append-to-body="false" >
4 4
             <div class="txsj">
5 5
             </div>
6 6
             <el-form :model="form" label-width="80px">
@@ -45,6 +45,7 @@ export default {
45 45
 
46 46
             patient_id: 0,
47 47
             schedule_date: 0,
48
+            start_time: '',
48 49
 
49 50
             form: {
50 51
                 nurse_id: 0,

+ 1 - 1
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Parādīt failu

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
   <div class="dialog_box">
3
-    <el-dialog title="透析监测" :visible.sync="visible" width="1100px" @close="reset" modal-append-to-body=“false”>
3
+    <el-dialog title="透析监测" :visible.sync="visible" width="1100px" @close="reset" :modal-append-to-body="false">
4 4
       <div v-show="edit == false">
5 5
         <div class="txsj">
6 6
           <el-button round @click="newRecordAction">新增监测</el-button>

+ 1 - 1
src/xt_pages/dialysis/details/dialog/treatmentSummaryDialog.vue Parādīt failu

@@ -3,7 +3,7 @@
3 3
     title="治疗小结"
4 4
     width="854px"
5 5
     :visible.sync="isVisibility"
6
-    modal-append-to-body=“false”
6
+    :modal-append-to-body="false"
7 7
   >
8 8
     <el-form :model="treatmentSummary">
9 9
       <el-row :gutter="20">

+ 16 - 0
src/xt_pages/dialysis/dialysisPrintOrder.vue Parādīt failu

@@ -25,6 +25,10 @@
25 25
           <el-button  :loading="loading" size="small" icon="el-icon-printer" @click="printThisTwoPage" type="primary">打印医嘱单</el-button>
26 26
         </div>
27 27
       </template>
28
+      <template  v-if="org_template_info.template_id == 6">
29
+        <el-button  :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印</el-button>
30
+      </template>
31
+      
28 32
     </div>
29 33
     <div class="app-container ">
30 34
       <!--<div class="order-print-btn"-->
@@ -47,6 +51,8 @@
47 51
 
48 52
       <DialysisPrintOrderFive v-bind:childResponse="childResponse" v-if="org_template_info.template_id == 5 "> </DialysisPrintOrderFive>
49 53
 
54
+      <DialysisPrintOrderSix v-bind:childResponse="childResponse" v-if="org_template_info.template_id == 6 "> </DialysisPrintOrderSix>
55
+
50 56
 
51 57
     </div>
52 58
   </div>
@@ -63,6 +69,7 @@
63 69
   import DialysisPrintOrderThree from './template/dialysisPrintOrderThree'
64 70
   import DialysisPrintOrderFour from './template/DialysisPrintOrderFour'
65 71
   import DialysisPrintOrderFive from './template/DialysisPrintOrderFive'
72
+  import DialysisPrintOrderSix from './template/DialysisPrintOrderSix'
66 73
   import print from 'print-js'
67 74
 
68 75
   export default {
@@ -73,6 +80,7 @@
73 80
       DialysisPrintOrderThree,
74 81
       DialysisPrintOrderFour,
75 82
       DialysisPrintOrderFive,
83
+      DialysisPrintOrderSix,
76 84
       LabelBox,
77 85
       BreadCrumb
78 86
     },
@@ -227,6 +235,14 @@
227 235
             scanStyles: false
228 236
           })
229 237
         }
238
+        else if (this.org_template_info.template_id == 6 ) {
239
+          printJS({
240
+            printable: 'dialysis-print-box-1',
241
+            type: 'html',
242
+            style: style2,
243
+            scanStyles: false
244
+          })
245
+        }
230 246
       },printThisOnePage() {
231 247
         var ptime = Math.round(new Date().getTime() / 1000)
232 248
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderFour.vue Parādīt failu

@@ -1085,7 +1085,7 @@
1085 1085
   import print from 'print-js'
1086 1086
 
1087 1087
   export default {
1088
-    name: 'dialysisPrintOrder',
1088
+    name: 'dialysisPrintOrderFour',
1089 1089
     components: {
1090 1090
       // DialysisPrintOrderOne,
1091 1091
       // DialysisPrintOrderTwo,

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue Parādīt failu

@@ -1026,7 +1026,7 @@
1026 1026
   import print from 'print-js'
1027 1027
 
1028 1028
   export default {
1029
-    name: 'dialysisPrintOrder',
1029
+    name: 'dialysisPrintOrderOne',
1030 1030
     components: {
1031 1031
       // DialysisPrintOrderOne,
1032 1032
       // DialysisPrintOrderTwo,

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1552 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue


+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderThree.vue Parādīt failu

@@ -1072,7 +1072,7 @@
1072 1072
   import print from 'print-js'
1073 1073
 
1074 1074
   export default {
1075
-    name: 'dialysisPrintOrder',
1075
+    name: 'dialysisPrintOrderThree',
1076 1076
     components: {
1077 1077
       // DialysisPrintOrderOne,
1078 1078
       // DialysisPrintOrderTwo,

+ 1 - 1
src/xt_pages/dialysis/template/dialysisPrintOrderFive.vue Parādīt failu

@@ -1110,7 +1110,7 @@
1110 1110
   import print from 'print-js'
1111 1111
 
1112 1112
   export default {
1113
-    name: 'dialysisPrintOrder',
1113
+    name: 'dialysisPrintOrderFive',
1114 1114
     props: ['childResponse'],
1115 1115
     components: {
1116 1116
       // DialysisPrintOrderOne,

+ 1 - 1
src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue Parādīt failu

@@ -1024,7 +1024,7 @@
1024 1024
   import print from 'print-js'
1025 1025
 
1026 1026
   export default {
1027
-    name: 'dialysisPrintOrder',
1027
+    name: 'dialysisPrintOrderTwo',
1028 1028
     props: ['childResponse'],
1029 1029
     components: {
1030 1030
       // DialysisPrintOrderOne,