浏览代码

新分支

28169 10 个月前
父节点
当前提交
de86ed2a81

+ 1 - 8
src/router/index_路由未分离前.js 查看文件

638
         name: 'Inspection',
638
         name: 'Inspection',
639
         meta: { title: 'inspection', noCache: true }
639
         meta: { title: 'inspection', noCache: true }
640
       },
640
       },
641
-      {
642
-        path: '/patients/newinspection',
643
-        component: () => import('@/xt_pages/user/newInspection'),
644
-        hidden: true,
645
-        is_menu: false,
646
-        name: 'newInspection',
647
-        meta: { title: 'newInspection', noCache: true }
648
-      },
641
+      
649
       {
642
       {
650
         path: '/',
643
         path: '/',
651
         component: () => import('@/xt_pages/user/courseOfDisease'),
644
         component: () => import('@/xt_pages/user/courseOfDisease'),

+ 8 - 0
src/router/modules/patient.js 查看文件

139
       noCache: true
139
       noCache: true
140
     }
140
     }
141
   },
141
   },
142
+  {
143
+    path: '/patients/newInspection',
144
+    component: () => import('@/xt_pages/user/lapsoInspection'),
145
+    hidden: true,
146
+    is_menu: false,
147
+    name: 'newInspection',
148
+    meta: { title: 'newInspection', noCache: true }
149
+  },
142
   {
150
   {
143
     path: '/patients/patients/:id/inspectionInfectious',
151
     path: '/patients/patients/:id/inspectionInfectious',
144
     component: () => import('@/xt_pages/user/inspectionInfectious'),
152
     component: () => import('@/xt_pages/user/inspectionInfectious'),

+ 1 - 1
src/xt_pages/dialysis/doctorAdviceStaticPrint.vue 查看文件

29
                 <td width="100">药品名称</td>
29
                 <td width="100">药品名称</td>
30
                 <td width="100">规格</td>
30
                 <td width="100">规格</td>
31
                 <td width="100">数量</td>
31
                 <td width="100">数量</td>
32
-                <td width="100" v-if="org_id == 0 || org_id==10644">数量</td>
32
+                <td width="100" v-if="org_id == 0 || org_id==10644">厂家</td>
33
               </tr>
33
               </tr>
34
               </thead>
34
               </thead>
35
               <tbody>
35
               <tbody>

+ 8 - 5
src/xt_pages/user/components/PatientSidebar.vue 查看文件

180
               name: '1-10',
180
               name: '1-10',
181
               label: '出院小结'
181
               label: '出院小结'
182
             },
182
             },
183
-            // {
184
-            //   name: '1-12',
185
-            //   label: '转归记录'
186
-            // }
187
-
188
           ]
183
           ]
189
         },
184
         },
190
         {
185
         {
195
               name: '1-3',
190
               name: '1-3',
196
               label: '肾科检验'
191
               label: '肾科检验'
197
             },
192
             },
193
+            {
194
+              name: '4-12',
195
+              label: '新版肾科检验'
196
+            },
198
             {
197
             {
199
               name: '4-1',
198
               name: '4-1',
200
               label: '肾科检查'
199
               label: '肾科检查'
348
         this.$router.push({path:'/patients/inspection_check?id='+this.id})
347
         this.$router.push({path:'/patients/inspection_check?id='+this.id})
349
       } else if(name == '4-3'){
348
       } else if(name == '4-3'){
350
         this.$router.push({path:'/patients/ktv?id='+this.id})
349
         this.$router.push({path:'/patients/ktv?id='+this.id})
350
+      }else if(name == '4-12'){
351
+        this.$router.push({path:'/patients/newInspection?id='+this.id})
351
       }
352
       }
352
       else if (name == '5-1') {
353
       else if (name == '5-1') {
353
         this.$router.push({
354
         this.$router.push({
554
         this.$router.push({ path: '/patients/sickhistory?id=' + this.id })
555
         this.$router.push({ path: '/patients/sickhistory?id=' + this.id })
555
       }else if(patientKey == '7'){
556
       }else if(patientKey == '7'){
556
         this.$router.push({path:'/patient/patient/'+this.id+'/lapsoSummary'})
557
         this.$router.push({path:'/patient/patient/'+this.id+'/lapsoSummary'})
558
+      }else if(patientKey == '4-12'){
559
+        this.$router.push({path:'/patients/newInspection?id='+this.id})
557
       }
560
       }
558
 
561
 
559
      }else{
562
      }else{

+ 0 - 0
src/xt_pages/user/newInspection.vue 查看文件