Merge branch '20220812' of http://git.shengws.com/csx/Vue_New into 2022-10-17_vue_schedule_branch

src/api/his/his.js

@@ -40,7 +40,6 @@ export function getDoctors() {
 }
 
 export function createHisPrescription(data, params) {
-  console.log('param2323232323233223233223332322323', data, params)
   return request({
     url: '/api/hisprescription/create',
     method: 'post',
@@ -661,8 +660,6 @@ export function getPresciptionTemplateDetail(params) {
   })
 }
 
-
-
 export function getHisData(params) {
   return request({
     url: '/data',
@@ -679,7 +676,6 @@ export function getHisDataTwo(params) {
   })
 }
 
-
 export function getHisDataThree(params) {
   return request({
     url: '/handelsettledata',
@@ -688,7 +684,6 @@ export function getHisDataThree(params) {
   })
 }
 
-
 export function getExportChargeData(params) {
   return request({
     url: '/api/his/getexportdata',
@@ -705,9 +700,6 @@ export function getHisDataFive(params) {
   })
 }
 
-
-
-
 export function getHisDataSix(params) {
   return request({
     url: '/handleExportData10138',

src/router/index_路由未分离前.js

@@ -694,6 +694,7 @@ export const xt_asyncRouterMap = [
         name: 'remind',
         meta: { title: 'remind', noCache: true }
       },
+
       // {
       //   path: '/workforce/schedulePrint',
       //   component: () => import('@/xt_pages/workforce/schedulePrint'),

src/router/modules/dialysis.js

@@ -88,15 +88,15 @@ export default {
         noCache: true
       }
     },
-    {
-      path: '/dialysis/consumable/index',
-      component: () => import('@/xt_pages/dialysis/details/consumable/index'),
-      name: '透前准备',
-      meta: {
-        title: '透前准备',
-        noCache: true
-      }
-    },
+    // {
+    //   path: '/dialysis/consumable/index',
+    //   component: () => import('@/xt_pages/dialysis/details/consumable/index'),
+    //   name: '透前准备',
+    //   meta: {
+    //     title: '透前准备',
+    //     noCache: true
+    //   }
+    // },
     {
       path: '/dialysis/consumable/dialysisdrugprint',
       component: () => import('@/xt_pages/dialysis/details/consumable/dialysisDrugPrint'),

src/router/modules/workforce.js

@@ -38,6 +38,15 @@ export default {
       noCache: true
     }
   },
+  {
+    path: '/dialysis/consumable/index',
+    component: () => import('@/xt_pages/dialysis/details/consumable/index'),
+    name: '透前准备',
+    meta: {
+      title: '透前准备',
+      noCache: true
+    }
+  },
   {
     path: '/workforce/schedulePrint',
     component: () => import('@/xt_pages/workforce/schedulePrint'),

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyTwo.vue

@@ -400,6 +400,9 @@
                             <td width="80">
                             <label-box :isChecked="record.prescription.mode_id == 3 ? true : false" showValue="HD+HP"></label-box>
                             </td>
+                           <td width="80">
+                             <label-box :isChecked="record.prescription.mode_id == 8 ? true : false" showValue="HFHD"></label-box>
+                           </td>
                         </tr>
                         </tbody>
                         </table>

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

@@ -230,7 +230,7 @@
            <el-checkbox v-model="dry_weight" label="干体重"></el-checkbox>
            <el-checkbox v-model="blood_pressure" label="透前血压"></el-checkbox>
            <el-checkbox v-model="ultrafiltration_volume" label="目标脱水量"></el-checkbox>
-           <el-checkbox v-model="internal_fistula" label="血管通路"></el-checkbox>
+           <!-- <el-checkbox v-model="internal_fistula" label="血管通路"></el-checkbox> -->
            <el-checkbox v-model="blood_flow_volume" label="血流量"></el-checkbox>
            <el-checkbox v-model="anticoagulant" label="抗凝剂(首剂)(维持)(总量)"></el-checkbox>
            <el-checkbox v-model="sealing_fluid_dispose" label="封管液"></el-checkbox>