Browse Source

Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

csx 4 years ago
parent
commit
25b0b9e3a5

+ 158 - 162
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

@@ -11,16 +11,13 @@
11 11
     <div class="backColor"></div>
12 12
     <div class="mainCenter">
13 13
       <div class="centerLeft">
14
-        <el-form :model="form"  ref="form" label-width="80px">
14
+        <el-form :model="form" ref="form" label-width="80px">
15 15
           <el-form-item label="姓名:" prop="name">
16 16
             <el-input v-model="patientInfo.name" placeholder="" readonly></el-input>
17 17
           </el-form-item>
18 18
           <el-form-item label="证件号: " prop="name">
19 19
             <el-input v-model="patientInfo.id_card_no" placeholder="" readonly></el-input>
20 20
           </el-form-item>
21
-          <el-form-item label="挂号类型: " prop="name">
22
-            <el-input v-model="hisPatientInfo.register_type" placeholder="" readonly></el-input>
23
-          </el-form-item>
24 21
           <el-form-item label="挂号类型: " prop="name">
25 22
             <el-select style="margin-right:5px;" v-model="doctorValue" placeholder="">
26 23
               <el-option
@@ -66,7 +63,8 @@
66 63
             <el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span>
67 64
             </el-tab-pane>
68 65
             <div class="RP">Rp</div>
69
-            <prescription-table ref="prescription_tables" :prescription="curPrescriptions" :preDrugs="preDrugs" :activeType="customTabIndex"></prescription-table>
66
+            <prescription-table ref="prescription_tables" :prescription="curPrescriptions" :preDrugs="preDrugs"
67
+                                :activeType="customTabIndex"></prescription-table>
70 68
           </el-tabs>
71 69
 
72 70
         </div>
@@ -99,22 +97,23 @@
99 97
           <p :class="rightTab == 2 ? 'activeP' : ''" @click="clickTab(2)">项目</p>
100 98
         </div>
101 99
         <template>
102
-          <div style="margin-top:5px;">
103
-            <el-input style="width:50%;" v-model="input" placeholder=""></el-input>
104
-            <el-select style="float: right;width: 49%;" v-model="value" placeholder="">
105
-              <el-option
106
-                v-for="item in options"
107
-                :key="item.value"
108
-                :label="item.label"
109
-                :value="item.value">
110
-              </el-option>
111
-            </el-select>
112
-          </div>
100
+          <!--<div style="margin-top:5px;">-->
101
+          <!--<el-input style="width:50%;" v-model="input" placeholder=""></el-input>-->
102
+          <!--<el-select style="float: right;width: 49%;" v-model="value" placeholder="">-->
103
+          <!--<el-option-->
104
+          <!--v-for="item in options"-->
105
+          <!--:key="item.value"-->
106
+          <!--:label="item.label"-->
107
+          <!--:value="item.value">-->
108
+          <!--</el-option>-->
109
+          <!--</el-select>-->
110
+          <!--</div>-->
113 111
           <div style="height:84%;overflow-y: auto;margin-bottom: 60px;" v-show="showOne">
114 112
             <el-tabs class="rightTabs" v-model="activeName">
115 113
               <el-tab-pane label="药品列表" name="1">
116 114
                 <el-table ref="multipleTable" :data="drugs" border @select='selectDrugs' style="width: 100%;"
117 115
                           :row-style="{ color: '#303133' }"
116
+                          @select-all="changeAllGoodInfoTableData"
118 117
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
119 118
                           highlight-current-row>
120 119
                   <el-table-column align="center" type="selection" width="40"></el-table-column>
@@ -131,7 +130,8 @@
131 130
 
132 131
               </el-tab-pane>
133 132
               <el-tab-pane label="医嘱模板" name="2">
134
-                <el-table  ref="multipleTableTwo" :data="advices_template" border style="width: 100%;" :row-style="{ color: '#303133' }"
133
+                <el-table ref="multipleTableTwo" :data="advices_template" border style="width: 100%;"
134
+                          :row-style="{ color: '#303133' }"
135 135
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
136 136
                           highlight-current-row>
137 137
                   <el-table-column align="center" type="selection" width="40"></el-table-column>
@@ -152,13 +152,14 @@
152 152
             </el-tabs>
153 153
           </div>
154 154
 
155
-         <div style="height:84%;overflow-y: auto;margin-bottom: 60px;" v-show="showTwo">
155
+          <div style="height:84%;overflow-y: auto;margin-bottom: 60px;" v-show="showTwo">
156 156
             <el-tabs class="rightTabs" v-model="activeName">
157 157
               <el-tab-pane label="项目列表" name="1">
158
-                 <el-table :data="tabProject" border @select='selectChange' style="width: 100%;"
158
+                <el-table :data="tabProject" border @select='selectChange' style="width: 100%;"
159 159
                           :row-style="{ color: '#303133' }"
160
+                          @select-all="changeAllGoodInfoTableDataTwo"
160 161
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
161
-                          highlight-current-row >
162
+                          highlight-current-row>
162 163
                   <el-table-column align="center" type="selection" width="40"></el-table-column>
163 164
                   <el-table-column align="center" prop="name" label="名称">
164 165
                     <template slot-scope="scope">{{ scope.row.project_name }}</template>
@@ -175,7 +176,7 @@
175 176
                 <el-table :data="tabPrjectTeam" border style="width: 100%;" :row-style="{ color: '#303133' }"
176 177
                           :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
177 178
                           highlight-current-row
178
-                         @select='selectTeam'>
179
+                          @select='selectTeam'>
179 180
                   <el-table-column align="center" type="selection" width="40"></el-table-column>
180 181
                   <el-table-column align="center" prop="name" label="名称">
181 182
                     <template slot-scope="scope">{{scope.row.project_team}}</template>
@@ -206,7 +207,8 @@
206 207
         </template>
207 208
       </div>
208 209
     </div>
209
-    <additionalCharges ref='additionalCharges' :hisPatientInfo="hisPatientInfo" :patientInfo="patientInfo"></additionalCharges>
210
+    <additionalCharges ref='additionalCharges' :hisPatientInfo="hisPatientInfo"
211
+                       :patientInfo="patientInfo"></additionalCharges>
210 212
     <select-template ref='selectTemplate'></select-template>
211 213
     <save-template ref='saveTemplate'></save-template>
212 214
   </div>
@@ -214,20 +216,22 @@
214 216
 
215 217
 
216 218
 <script>
217
-  import { getPatientInfo, getSchedulePatientList, getInitData,createHisPrescription } from '@/api/his/his'
218
-  import { getDictionaryDataConfig} from "@/utils/data";
219
+  import { createHisPrescription, getInitData, getPatientInfo, getSchedulePatientList } from '@/api/his/his'
220
+  import { getDictionaryDataConfig } from '@/utils/data'
219 221
   import prescriptionTable from './prescriptionTable'
220 222
   import selectTemplate from './selectTemplate'
221 223
   import saveTemplate from './saveTemplate'
222 224
   import additionalCharges from './additionalCharges'
223
-  import { getHisProject,addProjectTeam,getAllProjectTeam,getPojectListById } from '@/api/project/project'
225
+  import { addProjectTeam, getAllProjectTeam, getHisProject, getPojectListById } from '@/api/project/project'
224 226
 
225 227
   export default {
226 228
     props: {
227 229
       patientInfo: Object,
228 230
       hisPatientInfo: Object,
229 231
       prescriptions: Array,
230
-      record_date:String,
232
+      record_date: String,
233
+      other_sick:Array,
234
+      diagnoses:Array,
231 235
     },
232 236
     components: {
233 237
       selectTemplate,
@@ -237,13 +241,13 @@
237 241
     },
238 242
     data() {
239 243
       return {
240
-        value:"",
244
+        value: '',
241 245
         form: {
242 246
           name: ''
243 247
         },
244
-        drugs:[],
245
-        allDrugs:[],
246
-        advices_template:[],
248
+        drugs: [],
249
+        allDrugs: [],
250
+        advices_template: [],
247 251
 
248 252
         editableTabsValue: '处方1',
249 253
         editableTabs: [{
@@ -251,7 +255,7 @@
251 255
           name: '1'
252 256
         }],
253 257
         tabIndex: 1,
254
-        currenet_inedx:0,
258
+        currenet_inedx: 0,
255 259
         rightTab: 1,
256 260
         activeName: '1',
257 261
         curPrescriptions: this.prescriptions[0],
@@ -262,32 +266,32 @@
262 266
         doctorValue: '',
263 267
         departmentOptions: [],
264 268
         departmentValue: '',
265
-        diagnoses: this.getDictionaryDataConfig('system','diagnose'),
266
-        other_sick:this.getDictionaryDataConfig('system','other_sick_history'),
267 269
         total: 0,
268
-        state1:"",
269
-        state2:"",
270
-        customTabIndex:1,
271
-        options:[],
272
-        tabProject:[],
273
-        strids:"",
274
-        showOne:true,
275
-        showTwo:false,
276
-        tableData:[],
277
-        tabPrjectTeam:[],
278
-        teamList:[],
279
-        doctors:[],
280
-        departMent:[]
270
+        state1: '',
271
+        state2: '',
272
+        customTabIndex: 1,
273
+        options: [],
274
+        tabProject: [],
275
+        strids: '',
276
+        showOne: true,
277
+        showTwo: false,
278
+        tableData: [],
279
+        tabPrjectTeam: [],
280
+        teamList: [],
281
+        doctors: [],
282
+        departMent: []
281 283
       }
284
+    }, mounted() {
285
+
282 286
     },
283 287
     methods: {
284
-      createFilter (queryString) {
288
+      createFilter(queryString) {
285 289
         return (restaurant) => {
286 290
           return (restaurant.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
287 291
         }
288 292
       },
289 293
 
290
-      querySearch (queryString, cb) {
294
+      querySearch(queryString, cb) {
291 295
         var restaurants = this.diagnoses
292 296
         console.log(restaurants)
293 297
         restaurants.map(item => {
@@ -297,7 +301,7 @@
297 301
         // 调用 callback 返回建议列表的数据
298 302
         cb(results)
299 303
       },
300
-      querySearch2 (queryString, cb) {
304
+      querySearch2(queryString, cb) {
301 305
         var restaurants = this.other_sick
302 306
         restaurants.map(item => {
303 307
           item.value = item.name
@@ -306,14 +310,14 @@
306 310
         // 调用 callback 返回建议列表的数据
307 311
         cb(results)
308 312
       },
309
-      changeKind(val){
313
+      changeKind(val) {
310 314
         this.drugs = []
311 315
 
312
-        if(val == 0){
316
+        if (val == 0) {
313 317
           this.drugs = this.allDrugs
314
-        }else{
315
-          for (let i = 0; i < this.allDrugs.length; i++){
316
-            if (this.allDrugs[i].drug_type == val){
318
+        } else {
319
+          for (let i = 0; i < this.allDrugs.length; i++) {
320
+            if (this.allDrugs[i].drug_type == val) {
317 321
               this.drugs.push(this.allDrugs[i])
318 322
             }
319 323
           }
@@ -324,7 +328,7 @@
324 328
         return getDictionaryDataConfig(module, filed_name)
325 329
 
326 330
       },
327
-      getInitData(){
331
+      getInitData() {
328 332
         getInitData().then(response => {
329 333
           if (response.data.state == 0) {
330 334
             this.$message.error(response.data.msg)
@@ -334,42 +338,41 @@
334 338
             this.allDrugs = response.data.data.drugs
335 339
             this.advices_template = response.data.data.advices_template
336 340
             this.doctors = response.data.data.doctors
337
-            this.departMent =  response.data.data.department
341
+            this.departMent = response.data.data.department
338 342
 
339 343
           }
340 344
         })
341 345
 
342 346
       },
343
-      tabclickEvent(val){
344
-        for (let i= 0; i<this.prescriptions.length; i++){
347
+      tabclickEvent(val) {
348
+        for (let i = 0; i < this.prescriptions.length; i++) {
345 349
           console.log(this.prescriptions[i].name)
346
-            if(this.prescriptions[i].name == val.name){
347
-              this.curPrescriptions = this.prescriptions[i]
348
-
349
-              //用来区分处方属于项目还是药品
350
-              if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
351
-                this.customTabIndex = 1
352
-              }
353
-              if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0){
350
+          if (this.prescriptions[i].name == val.name) {
351
+            this.curPrescriptions = this.prescriptions[i]
354 352
 
355
-                this.customTabIndex = 2
356
-              }
353
+            //用来区分处方属于项目还是药品
354
+            if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
355
+              this.customTabIndex = 1
356
+            }
357
+            if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0) {
357 358
 
358
-              if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0){
359
-                this.customTabIndex = this.rightTab
360
-              }
359
+              this.customTabIndex = 2
360
+            }
361 361
 
362
+            if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
363
+              this.customTabIndex = this.rightTab
362 364
             }
363 365
 
366
+          }
364 367
 
365 368
         }
366 369
       },
367
-      setData(data){
370
+      setData(data) {
368 371
         this.prescriptions = data
369 372
         console.log(this.$refs)
370 373
         this.$nextTick(() => {
371
-         this.$refs.prescription_tables.setNewData(this.prescriptions[0])
372
-        });
374
+          this.$refs.prescription_tables.setNewData(this.prescriptions[0])
375
+        })
373 376
       },
374 377
       moreState(tab, event) {
375 378
         if (tab == 'more') {
@@ -378,7 +381,7 @@
378 381
       },
379 382
       open(index) {
380 383
         if (index == 1) {
381
-          let params ={
384
+          let params = {
382 385
             patient_id: this.patientInfo.id,
383 386
             diagnose: this.state1,
384 387
             sick_history: this.state2,
@@ -388,29 +391,29 @@
388 391
             his_patient_id: this.hisPatientInfo.id
389 392
           }
390 393
 
391
-          for (let i = 0; i < this.prescriptions.length; i++){
392
-            if(this.prescriptions[i].advices.length > 0 && this.prescriptions[i].project.length == 0){
394
+          for (let i = 0; i < this.prescriptions.length; i++) {
395
+            if (this.prescriptions[i].advices.length > 0 && this.prescriptions[i].project.length == 0) {
393 396
               this.prescriptions[i]['type'] = 1
394 397
             }
395
-            if(this.prescriptions[i].advices.length == 0 && this.prescriptions[i].project.length > 0){
398
+            if (this.prescriptions[i].advices.length == 0 && this.prescriptions[i].project.length > 0) {
396 399
               this.prescriptions[i]['type'] = 2
397 400
             }
398
-            for (let b = 0; b < this.prescriptions[i].advices.length; b++){
401
+            for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
399 402
               this.prescriptions[i].advices[b].single_dose = this.prescriptions[i].advices[b].single_dose.toString()
400 403
               this.prescriptions[i].advices[b].prescribing_number = this.prescriptions[i].advices[b].prescribing_number.toString()
401 404
               this.prescriptions[i].advices[b].retail_price = this.prescriptions[i].advices[b].retail_price.toString()
402 405
 
403 406
             }
404 407
           }
405
-          let data={
406
-            "prescriptions":this.prescriptions
408
+          let data = {
409
+            'prescriptions': this.prescriptions
407 410
           }
408
-           console.log("data",data)
409
-           console.log("params",params)
410
-          createHisPrescription(data,params).then(response=>{
411
-            if(response.data.state == 1){
411
+          console.log('data', data)
412
+          console.log('params', params)
413
+          createHisPrescription(data, params).then(response => {
414
+            if (response.data.state == 1) {
412 415
               this.prescriptions = []
413
-              this.$message.success("保存成功")
416
+              this.$message.success('保存成功')
414 417
             }
415 418
           })
416 419
           localStorage.setItem('drugs', JSON.stringify(this.preDrugs))
@@ -430,11 +433,11 @@
430 433
         this.prescriptions.push({
431 434
           name: newTabName,
432 435
           advices: [],
433
-          project:[],
436
+          project: []
434 437
 
435 438
         })
436 439
         this.editableTabsValue = newTabName
437
-        this.curPrescriptions = this.prescriptions[this.prescriptions.length-1]
440
+        this.curPrescriptions = this.prescriptions[this.prescriptions.length - 1]
438 441
       },
439 442
       removeTab(targetName) {
440 443
 
@@ -456,44 +459,40 @@
456 459
         console.log(this.prescriptions)
457 460
       },
458 461
       clickTab(index) {
459
-        if(index == 1){
462
+        if (index == 1) {
460 463
           this.showOne = true
461 464
           this.showTwo = false
462 465
           this.$nextTick(() => {
463
-            this.$refs.prescription_tables.setNewData(this.prescriptions[this.prescriptions.length-1])
464
-          });
465
-         this.customTabIndex = 1
466
+            this.$refs.prescription_tables.setNewData(this.prescriptions[this.prescriptions.length - 1])
467
+          })
468
+          this.customTabIndex = 1
466 469
         }
467
-        if(index == 2){
470
+        if (index == 2) {
468 471
           this.showTwo = true
469 472
           this.showOne = false
470
-           this.$nextTick(() => {
471
-            this.$refs.prescription_tables.setNewData(this.prescriptions[this.prescriptions.length-1])
472
-          });
473
-         this.customTabIndex = 2
473
+          this.$nextTick(() => {
474
+            this.$refs.prescription_tables.setNewData(this.prescriptions[this.prescriptions.length - 1])
475
+          })
476
+          this.customTabIndex = 2
474 477
         }
475 478
         this.rightTab = index
476 479
 
477
-
478 480
         //用来区分处方属于项目还是药品
479
-        if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
481
+        if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
480 482
 
481 483
           this.customTabIndex = 1
482 484
         }
483
-        if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0){
485
+        if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0) {
484 486
 
485 487
           this.customTabIndex = 2
486 488
         }
487
-        if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0){
489
+        if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
488 490
           // this.customTabIndex = this.rightTab
489 491
           this.customTabIndex = index
490 492
         }
491
-
492
-
493
-
494
-
495
-      },
496
-      addCharges() {
493
+      }, changeAllGoodInfoTableData: function(selection) {
494
+        this.curDrugs = selection
495
+      }, addCharges() {
497 496
         this.$refs.additionalCharges.show()
498 497
       },
499 498
       selectDrugs(selection, row) {
@@ -502,48 +501,49 @@
502 501
       comfirm() {
503 502
         this.preDrugs = this.curDrugs
504 503
         console.log(this.prescriptions)
505
-        for (let i = 0; i < this.prescriptions.length; i++){
506
-          if(this.prescriptions[i].name == this.editableTabsValue){
507
-           var temp =  this.deepClone(this.preDrugs)
508
-            var temp2 =  this.deepClone(this.teamList)
504
+        for (let i = 0; i < this.prescriptions.length; i++) {
505
+          if (this.prescriptions[i].name == this.editableTabsValue) {
506
+            var temp = this.deepClone(this.preDrugs)
507
+            var temp2 = this.deepClone(this.teamList)
509 508
             console.log(this.prescriptions[i].advices)
510 509
             console.log(this.prescriptions[i].project)
511 510
 
512 511
             console.log(temp)
513 512
             console.log(temp2)
514 513
 
515
-
516
-            if(temp.length > 0){
517
-              for (let b = 0; b < temp.length; b++){
514
+            if (temp.length > 0) {
515
+              for (let b = 0; b < temp.length; b++) {
518 516
                 this.prescriptions[i].advices.push(temp[b])
519 517
               }
520 518
             }
521
-            if(temp2.length > 0){
519
+            if (temp2.length > 0) {
522 520
               for (let b = 0; b < temp2.length; b++) {
523 521
                 this.prescriptions[i].project.concat(temp2[b])
524 522
               }
525 523
             }
526 524
             this.curPrescriptions = this.prescriptions[i]
527
-            this.$refs.multipleTable.clearSelection();
525
+            this.$refs.multipleTable.clearSelection()
528 526
             // this.$refs.prescription_tables.setNewData(this.prescriptions[i])
529 527
           }
530 528
         }
529
+      }, changeAllGoodInfoTableDataTwo(row) {
530
+        this.teamList = row
531 531
       },
532
-      selectChange(row){
532
+      selectChange(row) {
533 533
         this.teamList = row
534 534
       },
535
-      getlist(){
536
-        getHisProject().then(response=>{
537
-          if(response.data.state == 1){
535
+      getlist() {
536
+        getHisProject().then(response => {
537
+          if (response.data.state == 1) {
538 538
             var project = response.data.data.project
539
-            console.log("project",project)
539
+            console.log('project', project)
540 540
             this.tabProject = project
541 541
           }
542 542
         })
543 543
       },
544
-      querySearch(){
544
+      querySearch() {
545 545
 
546
-      },deepClone(source) {
546
+      }, deepClone(source) {
547 547
         if (!source && typeof source !== 'object') {
548 548
           throw new Error('error arguments', 'shallowClone')
549 549
         }
@@ -557,56 +557,52 @@
557 557
         })
558 558
         return targetObj
559 559
       },
560
-      getAllProjectTeam(){
561
-        getAllProjectTeam().then(response=>{
562
-          if(response.data.state == 1){
563
-            var team =  response.data.data.team
564
-            console.log("team",team)
560
+      getAllProjectTeam() {
561
+        getAllProjectTeam().then(response => {
562
+          if (response.data.state == 1) {
563
+            var team = response.data.data.team
564
+            console.log('team', team)
565 565
             this.tabPrjectTeam = team
566 566
           }
567 567
         })
568 568
       },
569
-      selectTeam(row){
570
-          var arr = []
571
-          for(let i=0;i<row.length;i++){
572
-             arr.push(row[i].project_id)
573
-          }
574
-        var ids =  arr.join(",")
575
-        console.log("ids",ids)
576
-        var strArr = ids.split(",")
577
-        var res = [];//接收不重复的数据
578
-
579
-        for (var i = 0; i<strArr.length; i++){
580
-        var flag = true;
581
-
582
-        for (var j = 0; j<i; j++){
583
-          if(strArr[i]===strArr[j]){
584
-            flag = false;
585
-            break;
586
-           }
587
-         }
588
-        if(flag){
589
-          res.push(strArr[i])
590
-         }
569
+      selectTeam(row) {
570
+        var arr = []
571
+        for (let i = 0; i < row.length; i++) {
572
+          arr.push(row[i].project_id)
591 573
         }
592
-        console.log("res",res)
574
+        var ids = arr.join(',')
575
+        var strArr = ids.split(',')
576
+        var res = []//接收不重复的数据
593 577
 
594
-        var idstr =  res.join(",")
595
-        console.log("idstr",idstr)
578
+        for (var i = 0; i < strArr.length; i++) {
579
+          var flag = true
580
+
581
+          for (var j = 0; j < i; j++) {
582
+            if (strArr[i] === strArr[j]) {
583
+              flag = false
584
+              break
585
+            }
586
+          }
587
+          if (flag) {
588
+            res.push(strArr[i])
589
+          }
590
+        }
591
+        var idstr = res.join(',')
596 592
         const params = {
597
-           project_id:idstr
593
+          project_id: idstr
598 594
         }
599
-        getPojectListById(params).then(response=>{
600
-           if(response.data.state == 1){
601
-             var project =  response.data.data.project
602
-             console.log("project222",project)
603
-             this.teamList = []
604
-             this.teamList = project
605
-           }
595
+        getPojectListById(params).then(response => {
596
+          if (response.data.state == 1) {
597
+            var project = response.data.data.project
598
+            console.log('project222', project)
599
+            this.teamList = []
600
+            this.teamList = project
601
+          }
606 602
         })
607 603
       }
608 604
     },
609
-    created(){
605
+    created() {
610 606
       this.getInitData()
611 607
       //获取所有项目
612 608
       this.getlist()

+ 12 - 12
src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue View File

@@ -122,16 +122,16 @@
122 122
       </el-table-column>
123 123
     </el-table>
124 124
 
125
-    <div class="additionalBox">
126
-      <div class="additionalOne" v-for="(item,index) in 8" :key="index">
127
-        <span>治疗费</span>
128
-        <el-input v-model="input" placeholder="" style="width:50px;"></el-input>
129
-        共
130
-        <el-input v-model="input" placeholder="" style="width:50px;"></el-input>
131
-        次
132
-        <i class="el-icon-delete deleteIcon"></i>
133
-      </div>
134
-    </div>
125
+    <!--<div class="additionalBox">-->
126
+      <!--<div class="additionalOne" v-for="(item,index) in 8" :key="index">-->
127
+        <!--<span>治疗费</span>-->
128
+        <!--<el-input v-model="input" placeholder="" style="width:50px;"></el-input>-->
129
+        <!---->
130
+        <!--<el-input v-model="input" placeholder="" style="width:50px;"></el-input>-->
131
+        <!---->
132
+        <!--<i class="el-icon-delete deleteIcon"></i>-->
133
+      <!--</div>-->
134
+    <!--</div>-->
135 135
 
136 136
 
137 137
 
@@ -202,7 +202,7 @@
202 202
           }
203 203
         }
204 204
       },
205
-    
205
+
206 206
       setNewData:function(data){
207 207
 
208 208
         // this.prescription.advices = data.advices
@@ -222,7 +222,7 @@
222 222
          return name
223 223
       },
224 224
       deleteProject(row){
225
-       
225
+
226 226
         for (let i = 0; i < this.prescription.project.length; i++){
227 227
           if(this.prescription.project[i].id == row.id){
228 228
               this.prescription.project.splice(i, 1)

+ 18 - 1
src/xt_pages/outpatientDoctorStation/doctorDesk.vue View File

@@ -47,7 +47,7 @@
47 47
         </div>
48 48
         <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
49 49
                    <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
50
-        <desk-prescription :record_date="record_date" ref="prescriptions"  :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"
50
+        <desk-prescription :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date" ref="prescriptions"  :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"
51 51
                            v-if="titleType == '处方'" style="flex:1;"></desk-prescription>
52 52
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
53 53
                      :hisPatientInfo="hisPatientInfo" v-if="titleType == '病历'"></desk-record>
@@ -62,6 +62,7 @@
62 62
   import deskPrescription from './components/deskPrescription'
63 63
   import deskRecord from './components/deskRecord'
64 64
   import { getPatientInfo, getSchedulePatientList } from '@/api/his/his'
65
+  import { getDictionaryDataConfig } from '@/utils/data'
65 66
 
66 67
   import { uParseTime } from '@/utils/tools'
67 68
 
@@ -95,9 +96,17 @@
95 96
         hisPatientInfo: {},
96 97
         case_history: {},
97 98
         patient_id:0,
99
+        diagnoses:[],
100
+        other_sick:[],
101
+
98 102
       }
99 103
     },
100 104
     methods: {
105
+      getDictionaryDataConfig(module, filed_name) {
106
+        console.log(getDictionaryDataConfig(module, filed_name))
107
+        return getDictionaryDataConfig(module, filed_name)
108
+
109
+      },
101 110
       changeTab(val) {
102 111
 
103 112
       },
@@ -235,6 +244,14 @@
235 244
         (nowDay < 10 ? '0' + nowDay : nowDay)
236 245
       this.getList()
237 246
 
247
+      this.diagnoses = this.getDictionaryDataConfig('system', 'diagnose')
248
+      this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
249
+      console.log(this.diagnoses)
250
+      console.log(this.other_sick)
251
+
252
+      console.log("111122222")
253
+
254
+
238 255
     }
239 256
   }
240 257
 </script>