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

src/router/modules/patient.js

@@ -579,17 +579,17 @@ export default {
   //     noCache: true
   //   }
   // },
-  {//知情同意书
-    path: '/patients/patient/:id/Informedconsent',
-    component: () => import('@/xt_pages/user/Informed/Informedconsent'),
-    hidden: true,
-    is_menu: false,
-    name: 'Informedconsent',
-    meta: {
-      title: 'Informedconsent',
-      noCache: true
-    }
-  },
+  // {//知情同意书
+  //   path: '/patients/patient/:id/Informedconsent',
+  //   component: () => import('@/xt_pages/user/Informed/Informedconsent'),
+  //   hidden: true,
+  //   is_menu: false,
+  //   name: 'Informedconsent',
+  //   meta: {
+  //     title: 'Informedconsent',
+  //     noCache: true
+  //   }
+  // },
   // {//血管通路图 pruritus_history
   //   path: '/patients/patient/:id/angiogram',
   //   component: () => import('@/xt_pages/user/angiogram'),

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1022,7 +1022,7 @@ import RegisterDialog9504 from './components/registerDialog9504'
 import cryptoJs from 'crypto-js'
 import NewStatementPrintThree from './newStatementPrintThree.vue'
 import CallUnAssociationPrescription from './components/callUnAssociationPrescription.vue'
-// import { associationprescription, checkHISPatient } from '../../api/his/his_tools'
+import { associationprescription, checkHISPatient } from '../../api/his/his_tools'
 
 const moment = require('moment')
 export default {
@@ -2760,14 +2760,14 @@ export default {
         let arr = []
         for (let i = 0; i < all_patient.length; i++) {
           if(all_patient[i].first_letter != 'undefined'){
-            if (all_patient[i].name.indexOf(this.search_input) != -1 || 
+            if (all_patient[i].name.indexOf(this.search_input) != -1 ||
               all_patient[i].number.indexOf(this.search_input) != -1 ||
               all_patient[i].first_letter.indexOf(this.search_input) != -1) {
               arr = arr.concat(all_patient[i])
             }
           }else{
-            if (all_patient[i].name.indexOf(this.search_input) != -1 || 
-              all_patient[i].number.indexOf(this.search_input) != -1 
+            if (all_patient[i].name.indexOf(this.search_input) != -1 ||
+              all_patient[i].number.indexOf(this.search_input) != -1
               ) {
               arr = arr.concat(all_patient[i])
             }
@@ -4916,7 +4916,7 @@ export default {
         num = num.substring(0)
       }
       return parseFloat(num).toFixed(decimal)
-    }, 
+    },
     getMonthChargePatientList() {
       let params = {
         'record_date': this.record_date,

src/xt_pages/user/components/PatientSidebar.vue

@@ -204,68 +204,68 @@ export default {
             },
           ]
         },
-        {
-          name: '5',
-          label: '评估工具',
-          children: [
-            {
-              name: '5-1',
-              label: '跌倒评估'
-            },
-            {
-              name: '5-2',
-              label: '小儿跌倒风险评估'
-            },
-            {
-              name: '5-3',
-              label: '压疮风险评估'
-            },
-            {
-              name: '5-4',
-              label: 'OH压疮评估'
-            },
-            {
-              name: '5-5',
-              label: '日常生活能力评估'
-            },
-            {
-              name: '5-6',
-              label: '导管脱落风险评估'
-            },
-            {
-              name: '5-7',
-              label: 'RASS及疼痛评估'
-            },
-            {
-              name: '5-8',
-              label: '营养状况评估'
-            },
-            {
-              name: '5-9',
-              label: '约束告知单'
-            },
-            {
-              name: '5-10',
-              label: '心理评估'
-            },
-            {
-              name: '5-11',
-              label: '瘙痒评估'
-            },
-            {
-              name: '5-12',
-              label: '血液透析患者评估'
-            },
-            {
-              name: '5-13',
-              label: 'Glasgow昏迷评分量表'
-            },
-            {
-              name: '5-14',
-              label: '肌力评估表'
-            },
-          ]
-        },
+        // {
+        //   name: '5',
+        //   label: '评估工具',
+        //   children: [
+        //     {
+        //       name: '5-1',
+        //       label: '跌倒评估'
+        //     },
+        //     {
+        //       name: '5-2',
+        //       label: '小儿跌倒风险评估'
+        //     },
+        //     {
+        //       name: '5-3',
+        //       label: '压疮风险评估'
+        //     },
+        //     {
+        //       name: '5-4',
+        //       label: 'OH压疮评估'
+        //     },
+        //     {
+        //       name: '5-5',
+        //       label: '日常生活能力评估'
+        //     },
+        //     {
+        //       name: '5-6',
+        //       label: '导管脱落风险评估'
+        //     },
+        //     {
+        //       name: '5-7',
+        //       label: 'RASS及疼痛评估'
+        //     },
+        //     {
+        //       name: '5-8',
+        //       label: '营养状况评估'
+        //     },
+        //     {
+        //       name: '5-9',
+        //       label: '约束告知单'
+        //     },
+        //     {
+        //       name: '5-10',
+        //       label: '心理评估'
+        //     },
+        //     {
+        //       name: '5-11',
+        //       label: '瘙痒评估'
+        //     },
+        //     {
+        //       name: '5-12',
+        //       label: '血液透析患者评估'
+        //     },
+        //     {
+        //       name: '5-13',
+        //       label: 'Glasgow昏迷评分量表'
+        //     },
+        //     {
+        //       name: '5-14',
+        //       label: '肌力评估表'
+        //     },
+        //   ]
+        // },
         {
           name: '6',
           label: '文书管理',
@@ -377,7 +377,7 @@ export default {
       } else if(name == '5-14'){
         this.$router.push({path:'/patients/patient/' + this.id+'/Muscleforce'})
       }else if(name == '6-1'){
-        this.$router.push({path: '/patients/patient/' + this.id+'/Informedconsent'})
+        this.$router.push({path: '/patients/patient/' + this.id+ '/Informedconsent'})
       }
 
     },
@@ -412,13 +412,13 @@ export default {
                if(patients[i].lapseto ==1){
                 this.patientsList.push(patients[i])
                }
-             
+
              }
           }else{
             this.patientsList = response.data.data.patients
             console.log("哈哈哈哈哈哈",this.patientsList)
           }
-        
+
 
           var len = this.patientsList.length
           if (len > 0) {

src/xt_pages/workforce/components/editTableData.vue

@@ -164,12 +164,12 @@
             :cell-style ='cellstyle'
             :row-class-name="tableRowClassName"
             show-summary
-            height="calc(100% - 50px)"
+            
             ref="table"
             style="table-layout: fixed;"
 
         >
-        <!-- :cell-style ='cellstyle'    :height="tableContainHeight" calc(100% - 50px) 600-->
+        <!-- :cell-style ='cellstyle' height="calc(100% - 50px)"   :height="tableContainHeight"-->
           <el-table-column
               prop="area"
               label="分区"

src/xt_pages/workforce/components/tableData.vue

@@ -261,11 +261,11 @@
         show-summary
         :cell-class-name="cellClass"
         sum-text="总数"
-        height="calc(100vh - 200px)"
+        
         ref="table"
         style="table-layout: fixed;"
       >
-      <!-- :height="tableContainHeight" -->
+      <!-- :height="tableContainHeight" height="calc(100vh - 200px)"-->
         <el-table-column
           prop="area"
           label="分区"
@@ -787,7 +787,7 @@ export default {
   },
   data() {
     return {
-      // tableContainHeight:null,
+      tableContainHeight:null,
       value1:false,
       modename_value:true,
       weeks:weekOptions,