Начало Каталог Помощ
Регистрация Вход
elizebath
/
elizebeth
разклонено от csx/Vue_New
Наблюдаван 1
Харесван 0
Разклонения 0
Код Задачи 0 Заявки за сливане 0 Версии 0 Уики Activity
Преглед на файлове

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

csx преди 3 години
родител
0fdbb340d6
ревизия
4ea867efff
променени са 11 файла, в които са добавени 68 реда и са изтрити 64 реда
Обединен изглед Покажи статистика за разликите
  1. 5 5
      src/xt_pages/hospitalStation/components/deskPrescription.vue
  2. 5 5
      src/xt_pages/hospitalStation/components/registerDialog.vue
  3. 5 5
      src/xt_pages/hospitalStation/components/registerDialog9504.vue
  4. 5 5
      src/xt_pages/hospitalStation/index.vue
  5. 5 5
      src/xt_pages/hospitalStation/outpatientChargesManagement.vue
  6. 5 5
      src/xt_pages/outpatientCharges/components/registerDialog.vue
  7. 5 5
      src/xt_pages/outpatientCharges/components/registerDialog9504.vue
  8. 18 14
      src/xt_pages/outpatientCharges/outpatientChargesManagement.vue
  9. 5 5
      src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue
  10. 5 5
      src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue
  11. 5 5
      src/xt_pages/outpatientRegistration/index.vue

+ 5 - 5
src/xt_pages/hospitalStation/components/deskPrescription.vue Целия файл

472 
         end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
 472 
         end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
473 
         register: [
 473 
         register: [
474 
           { value: 11, label: '普通门诊' },
 474 
           { value: 11, label: '普通门诊' },
475 
-          { value: 12, label: '门诊挂号' },
476 
-          { value: 13, label: '急诊' },
475 
+          // { value: 12, label: '门诊挂号' },
476 
+          // { value: 13, label: '急诊' },
477 
           { value: 14, label: '门诊特殊病' },
 477 
           { value: 14, label: '门诊特殊病' },
478 
-          { value: 15, label: '门诊统筹' },
479 
-          { value: 16, label: '门诊慢性病' },
480 
-          { value: 21, label: '普通住院' }
478 
+          // { value: 15, label: '门诊统筹' },
479 
+          // { value: 16, label: '门诊慢性病' },
480 
+          // { value: 21, label: '普通住院' }
481
481
482 
         ],
 482 
         ],
483 
         isLastOrNextVisible: false,
 483 
         isLastOrNextVisible: false,

+ 5 - 5
src/xt_pages/hospitalStation/components/registerDialog.vue Целия файл

197 
       return {
 197 
       return {
198 
         registers: [
 198 
         registers: [
199 
           {value: 11, label: "普通门诊"},
 199 
           {value: 11, label: "普通门诊"},
200 
-          {value: 12, label: '门诊挂号'},
201 
-          {value: 13, label: "急诊"},
200 
+          // {value: 12, label: '门诊挂号'},
201 
+          // {value: 13, label: "急诊"},
202 
           {value: 14, label: "门诊特殊病"},
 202 
           {value: 14, label: "门诊特殊病"},
203 
-          {value: 15, label: "门诊统筹"},
204 
-          {value: 16, label: "门诊慢性病"},
205 
-          {value: 21, label: "普通住院"},
203 
+          // {value: 15, label: "门诊统筹"},
204 
+          // {value: 16, label: "门诊慢性病"},
205 
+          // {value: 21, label: "普通住院"},
206 
         ],
 206 
         ],
207 
         medical_care:[
 207 
         medical_care:[
208 
           {value: 11, label: "普通门诊"},
 208 
           {value: 11, label: "普通门诊"},

+ 5 - 5
src/xt_pages/hospitalStation/components/registerDialog9504.vue Целия файл

186 
         read_loading:false,
 186 
         read_loading:false,
187 
         registers: [
 187 
         registers: [
188 
           {value: 11, label: "普通门诊"},
 188 
           {value: 11, label: "普通门诊"},
189 
-          {value: 12, label: '门诊挂号'},
190 
-          {value: 13, label: "急诊"},
189 
+          // {value: 12, label: '门诊挂号'},
190 
+          // {value: 13, label: "急诊"},
191 
           {value: 14, label: "门诊特殊病"},
 191 
           {value: 14, label: "门诊特殊病"},
192 
-          {value: 15, label: "门诊统筹"},
193 
-          {value: 16, label: "门诊慢性病"},
194 
-          {value: 21, label: "普通住院"},
192 
+          // {value: 15, label: "门诊统筹"},
193 
+          // {value: 16, label: "门诊慢性病"},
194 
+          // {value: 21, label: "普通住院"},
195 
         ],
 195 
         ],
196 
         medical_care:[
 196 
         medical_care:[
197 
           {value: 11, label: "普通门诊"},
 197 
           {value: 11, label: "普通门诊"},

+ 5 - 5
src/xt_pages/hospitalStation/index.vue Целия файл

176 
         read_loading: false,
 176 
         read_loading: false,
177 
         registers: [
 177 
         registers: [
178 
           {value: 11, label: '普通门诊'},
 178 
           {value: 11, label: '普通门诊'},
179 
-          {value: 12, label: '门诊挂号'},
180 
-          {value: 13, label: '急诊'},
179 
+          // {value: 12, label: '门诊挂号'},
180 
+          // {value: 13, label: '急诊'},
181 
           {value: 14, label: '门诊特殊病'},
 181 
           {value: 14, label: '门诊特殊病'},
182 
-          {value: 15, label: '门诊统筹'},
183 
-          {value: 16, label: '门诊慢性病'},
184 
-          {value: 21, label: '普通住院'}
182 
+          // {value: 15, label: '门诊统筹'},
183 
+          // {value: 16, label: '门诊慢性病'},
184 
+          // {value: 21, label: '普通住院'}
185
185
186 
         ],
 186 
         ],
187 
         sick: [],
 187 
         sick: [],

+ 5 - 5
src/xt_pages/hospitalStation/outpatientChargesManagement.vue Целия файл

402 
       return {
 402 
       return {
403 
         register: [
 403 
         register: [
404 
           { value: 11, label: '普通门诊' },
 404 
           { value: 11, label: '普通门诊' },
405 
-          { value: 12, label: '门诊挂号' },
406 
-          { value: 13, label: '急诊' },
405 
+          // { value: 12, label: '门诊挂号' },
406 
+          // { value: 13, label: '急诊' },
407 
           { value: 14, label: '门诊特殊病' },
 407 
           { value: 14, label: '门诊特殊病' },
408 
-          { value: 15, label: '门诊统筹' },
409 
-          { value: 16, label: '门诊慢性病' },
410 
-          { value: 21, label: '普通住院' }
408 
+          // { value: 15, label: '门诊统筹' },
409 
+          // { value: 16, label: '门诊慢性病' },
410 
+          // { value: 21, label: '普通住院' }
411
411
412 
         ],
 412 
         ],
413 
         loading: false,
 413 
         loading: false,

+ 5 - 5
src/xt_pages/outpatientCharges/components/registerDialog.vue Целия файл

197 
       return {
 197 
       return {
198 
         registers: [
 198 
         registers: [
199 
           { value: 11, label: '普通门诊' },
 199 
           { value: 11, label: '普通门诊' },
200 
-          { value: 12, label: '门诊挂号' },
201 
-          { value: 13, label: '急诊' },
200 
+          // { value: 12, label: '门诊挂号' },
201 
+          // { value: 13, label: '急诊' },
202 
           { value: 14, label: '门诊特殊病' },
 202 
           { value: 14, label: '门诊特殊病' },
203 
-          { value: 15, label: '门诊统筹' },
204 
-          { value: 16, label: '门诊慢性病' },
205 
-          { value: 21, label: '普通住院' }
203 
+          // { value: 15, label: '门诊统筹' },
204 
+          // { value: 16, label: '门诊慢性病' },
205 
+          // { value: 21, label: '普通住院' }
206 
         ],
 206 
         ],
207 
         medical_care: [
 207 
         medical_care: [
208 
           { value: 11, label: '普通门诊' },
 208 
           { value: 11, label: '普通门诊' },

+ 5 - 5
src/xt_pages/outpatientCharges/components/registerDialog9504.vue Целия файл

187 
         read_loading:false,
 187 
         read_loading:false,
188 
         registers: [
 188 
         registers: [
189 
           {value: 11, label: "普通门诊"},
 189 
           {value: 11, label: "普通门诊"},
190 
-          {value: 12, label: '门诊挂号'},
191 
-          {value: 13, label: "急诊"},
190 
+          // {value: 12, label: '门诊挂号'},
191 
+          // {value: 13, label: "急诊"},
192 
           {value: 14, label: "门诊特殊病"},
 192 
           {value: 14, label: "门诊特殊病"},
193 
-          {value: 15, label: "门诊统筹"},
194 
-          {value: 16, label: "门诊慢性病"},
195 
-          {value: 21, label: "普通住院"},
193 
+          // {value: 15, label: "门诊统筹"},
194 
+          // {value: 16, label: "门诊慢性病"},
195 
+          // {value: 21, label: "普通住院"},
196 
         ],
 196 
         ],
197 
         medical_care:[
 197 
         medical_care:[
198 
           {value: 11, label: "普通门诊"},
 198 
           {value: 11, label: "普通门诊"},

+ 18 - 14
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Целия файл

589
589
590 
         register: [
 590 
         register: [
591 
           { value: 11, label: '普通门诊' },
 591 
           { value: 11, label: '普通门诊' },
592 
-          { value: 12, label: '门诊挂号' },
593 
-          { value: 13, label: '急诊' },
592 
+          // { value: 12, label: '门诊挂号' },
593 
+          // { value: 13, label: '急诊' },
594 
           { value: 14, label: '门诊特殊病' },
 594 
           { value: 14, label: '门诊特殊病' },
595 
-          { value: 15, label: '门诊统筹' },
596 
-          { value: 16, label: '门诊慢性病' },
597 
-          { value: 21, label: '普通住院' }
595 
+          // { value: 15, label: '门诊统筹' },
596 
+          // { value: 16, label: '门诊慢性病' },
597 
+          // { value: 21, label: '普通住院' }
598
598
599 
         ],
 599 
         ],
600 
         register_two: [
 600 
         register_two: [
601 
           { value: '11', label: '普通门诊' },
 601 
           { value: '11', label: '普通门诊' },
602 
-          { value: '12', label: '门诊挂号' },
603 
-          { value: '13', label: '急诊' },
602 
+          // { value: '12', label: '门诊挂号' },
603 
+          // { value: '13', label: '急诊' },
604 
           { value: '14', label: '门诊特殊病' },
 604 
           { value: '14', label: '门诊特殊病' },
605 
-          { value: '15', label: '门诊统筹' },
606 
-          { value: '16', label: '门诊慢性病' },
607 
-          { value: '21', label: '普通住院' }
605 
+          // { value: '15', label: '门诊统筹' },
606 
+          // { value: '16', label: '门诊慢性病' },
607 
+          // { value: '21', label: '普通住院' }
608
608
609 
         ],
 609 
         ],
610 
         loading: false,
 610 
         loading: false,
2446
2446
2447 
             let ids = []
 2447 
             let ids = []
2448 
             let temp_order_id = 0
 2448 
             let temp_order_id = 0
2449 
+            var index = 0
2450 
+
2449 
             if (this.radio == 2) {
 2451 
             if (this.radio == 2) {
2450 
               for (let i = 0; i < this.patientTableData.length; i++) {
 2452 
               for (let i = 0; i < this.patientTableData.length; i++) {
2451 
                 if (this.hisPatientInfo.id == this.patientTableData[i].his_patient_id) {
 2453 
                 if (this.hisPatientInfo.id == this.patientTableData[i].his_patient_id) {
2455 
               temp_order_id = ids[ids.length - 1]
 2457 
               temp_order_id = ids[ids.length - 1]
2456 
               for (let i = 0; i < this.patientTableData.length; i++) {
 2458 
               for (let i = 0; i < this.patientTableData.length; i++) {
2457 
                 if (temp_order_id == this.patientTableData[i].order_id) {
 2459 
                 if (temp_order_id == this.patientTableData[i].order_id) {
2458 
-                  this.$refs.tab.setCurrentRow(this.patientTableData[i])
2460 
+                  index = i
2459 
                   // this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order_number, this.patientTableData[i].his_patient_id, this.patientTableData[i].order_id)
 2461 
                   // this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order_number, this.patientTableData[i].his_patient_id, this.patientTableData[i].order_id)
2460 
                 }
 2462 
                 }
2461 
               }
 2463 
               }
2464 
+              this.$refs.tab.setCurrentRow(this.patientTableData[index])
2465 
+
2462 
             } else {
 2466 
             } else {
2467 
+              var index = 0
2463 
               for (let i = 0; i < this.patientTableData.length; i++) {
 2468 
               for (let i = 0; i < this.patientTableData.length; i++) {
2464 
                 if (this.hisPatientInfo.id == this.patientTableData[i].his_patient_id) {
 2469 
                 if (this.hisPatientInfo.id == this.patientTableData[i].his_patient_id) {
2465 
-                  this.$refs.tab.setCurrentRow(this.patientTableData[i])
2466 
-                  // this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order_number, this.patientTableData[i].his_patient_id, this.patientTableData[i].order_id)
2470 
+                  index  = i
2467 
                 }
 2471 
                 }
2468 
-
2469 
               }
 2472 
               }
2473 
+              this.$refs.tab.setCurrentRow(this.patientTableData[index])
2470 
             }
 2474 
             }
2471 
           }
 2475 
           }
2472 
         })
 2476 
         })

+ 5 - 5
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Целия файл

517 
         end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
 517 
         end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
518 
         register: [
 518 
         register: [
519 
           { value: 11, label: '普通门诊' },
 519 
           { value: 11, label: '普通门诊' },
520 
-          { value: 12, label: '门诊挂号' },
521 
-          { value: 13, label: '急诊' },
520 
+          // { value: 12, label: '门诊挂号' },
521 
+          // { value: 13, label: '急诊' },
522 
           { value: 14, label: '门诊特殊病' },
 522 
           { value: 14, label: '门诊特殊病' },
523 
-          { value: 15, label: '门诊统筹' },
524 
-          { value: 16, label: '门诊慢性病' },
525 
-          { value: 21, label: '普通住院' }
523 
+          // { value: 15, label: '门诊统筹' },
524 
+          // { value: 16, label: '门诊慢性病' },
525 
+          // { value: 21, label: '普通住院' }
526
526
527 
         ],
 527 
         ],
528 
         medical_care:[
 528 
         medical_care:[

+ 5 - 5
src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue Целия файл

280
280
281 
         register: [
 281 
         register: [
282 
           { value: 11, label: '普通门诊' },
 282 
           { value: 11, label: '普通门诊' },
283 
-          { value: 12, label: '门诊挂号' },
284 
-          { value: 13, label: '急诊' },
283 
+          // { value: 12, label: '门诊挂号' },
284 
+          // { value: 13, label: '急诊' },
285 
           { value: 14, label: '门诊特殊病' },
 285 
           { value: 14, label: '门诊特殊病' },
286 
-          { value: 15, label: '门诊统筹' },
287 
-          { value: 16, label: '门诊慢性病' },
288 
-          { value: 21, label: '普通住院' }
286 
+          // { value: 15, label: '门诊统筹' },
287 
+          // { value: 16, label: '门诊慢性病' },
288 
+          // { value: 21, label: '普通住院' }
289
289
290 
         ],
 290 
         ],
291 
         crumbs: [
 291 
         crumbs: [

+ 5 - 5
src/xt_pages/outpatientRegistration/index.vue Целия файл

446 
         read_loading: false,
 446 
         read_loading: false,
447 
         registers: [
 447 
         registers: [
448 
           { value: 11, label: '普通门诊' },
 448 
           { value: 11, label: '普通门诊' },
449 
-          { value: 12, label: '门诊挂号' },
450 
-          { value: 13, label: '急诊' },
449 
+          // { value: 12, label: '门诊挂号' },
450 
+          // { value: 13, label: '急诊' },
451 
           { value: 14, label: '门诊特殊病' },
 451 
           { value: 14, label: '门诊特殊病' },
452 
-          { value: 15, label: '门诊统筹' },
453 
-          { value: 16, label: '门诊慢性病' },
454 
-          { value: 21, label: '普通住院' }
452 
+          // { value: 15, label: '门诊统筹' },
453 
+          // { value: 16, label: '门诊慢性病' },
454 
+          // { value: 21, label: '普通住院' }
455
455
456 
         ],
 456 
         ],
457 
         sick: [],
 457 
         sick: [],