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

src/router/index.js

@@ -10,7 +10,7 @@ import patient from './modules/patient'
 import qcd from './modules/qcd'
 import Dialysisanalysis from './modules/Dialysisanalysis'
 import DialysisIndex from './modules/dialysisIndex'
-import DialysisLogIndex from './modules/logIndex'
+// import DialysisLogIndex from './modules/logIndex'
 import stock from './modules/stock'
 import weight_sign from './modules/weight_sign'
 import workforce from './modules/workforce'

src/router/modules/workforce.js

@@ -56,6 +56,15 @@ export default {
       noCache: true
     }
   },
+  {//患者调班
+    path: '/workforce/Patientshift',
+    component: () => import('@/xt_pages/workforce/Patientshift'),
+    name: '患者调班',
+    meta: {
+      title: '患者调班',
+      noCache: true
+    }
+  },
   {
     path: '/workforce/schedule/printone',
     component: () => import('@/xt_pages/workforce/printOne'),

src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue

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

src/xt_pages/workforce/printOne.vue

@@ -489,6 +489,7 @@ export default {
       getSchedualPrintList(params).then((response) => {
         if (response.data.state == 1) {
           this.loading = false
+          console.log('111111',response.data.data);
           var list = response.data.data.list
           this.list = list
           var listOne = response.data.data.listOne