Explorar el Código

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

28169 hace 1 año
padre
commit
28c3af10f7

+ 1 - 1
src/router/index.js Ver fichero

10
 import qcd from './modules/qcd'
10
 import qcd from './modules/qcd'
11
 import Dialysisanalysis from './modules/Dialysisanalysis'
11
 import Dialysisanalysis from './modules/Dialysisanalysis'
12
 import DialysisIndex from './modules/dialysisIndex'
12
 import DialysisIndex from './modules/dialysisIndex'
13
-import DialysisLogIndex from './modules/logIndex'
13
+// import DialysisLogIndex from './modules/logIndex'
14
 import stock from './modules/stock'
14
 import stock from './modules/stock'
15
 import weight_sign from './modules/weight_sign'
15
 import weight_sign from './modules/weight_sign'
16
 import workforce from './modules/workforce'
16
 import workforce from './modules/workforce'

+ 9 - 0
src/router/modules/workforce.js Ver fichero

56
       noCache: true
56
       noCache: true
57
     }
57
     }
58
   },
58
   },
59
+  {//患者调班
60
+    path: '/workforce/Patientshift',
61
+    component: () => import('@/xt_pages/workforce/Patientshift'),
62
+    name: '患者调班',
63
+    meta: {
64
+      title: '患者调班',
65
+      noCache: true
66
+    }
67
+  },
59
   {
68
   {
60
     path: '/workforce/schedule/printone',
69
     path: '/workforce/schedule/printone',
61
     component: () => import('@/xt_pages/workforce/printOne'),
70
     component: () => import('@/xt_pages/workforce/printOne'),

+ 3 - 3
src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue Ver fichero

8
           <td colspan="4">发票号:</td>
8
           <td colspan="4">发票号:</td>
9
         </tr>
9
         </tr>
10
         <tr style="border-bottom: 1px solid black;">
10
         <tr style="border-bottom: 1px solid black;">
11
-          <td colspan="4">单据编码:{{info.number}}</td>
12
-          <td colspan="2">就诊时间:{{info.setl_time}}</td>
13
-          <td colspan="2">金额单位:{{info.medfee_sumamt}}元</td>
11
+          <td colspan="2">单据编码:{{info.number}}</td>
12
+          <td colspan="4">就诊时间:{{info.setl_time}}</td>
13
+          <td colspan="3">金额单位:{{info.medfee_sumamt}}元</td>
14
         </tr>
14
         </tr>
15
         <tr>
15
         <tr>
16
           <td colspan="4">姓名:{{info.patient.name}}</td>
16
           <td colspan="4">姓名:{{info.patient.name}}</td>

+ 1 - 0
src/xt_pages/workforce/printOne.vue Ver fichero

489
       getSchedualPrintList(params).then((response) => {
489
       getSchedualPrintList(params).then((response) => {
490
         if (response.data.state == 1) {
490
         if (response.data.state == 1) {
491
           this.loading = false
491
           this.loading = false
492
+          console.log('111111',response.data.data);
492
           var list = response.data.data.list
493
           var list = response.data.data.list
493
           this.list = list
494
           this.list = list
494
           var listOne = response.data.data.listOne
495
           var listOne = response.data.data.listOne