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

src/api/device.js

@@ -382,4 +382,21 @@ export function deleteObjectRegistration(id,params){
     method:"get",
     params:params
   })
+}
+
+export function getRegistGoodInforList(params){
+  return request({
+    url:"/api/manage/getregistgoodinforlist",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function getRegistNumber(id,record_date,params){
+  
+  return request({
+    url:"/api/manage/getregistnumber?id="+id+"&record_date="+record_date,
+    method:"Get",
+    params:params,
+  })
 }

src/api/role/admin.js

@@ -92,4 +92,20 @@ export function toSign(params){
     method:"get",
     params:params
   })
+}
+
+export function toTestOne(params){
+  return request({
+    url:"/api/sign/createrusername",
+    method:"get",
+    params:params
+  })
+}
+
+export function toTestTwo(params){
+  return request({
+    url:"/api/sign/createpersionseal",
+    method:"get",
+    params:params
+  })
 }

src/router/modules/patient.js

@@ -368,7 +368,6 @@ export default {
   //     noCache: true
   //   }
   // },
-
   // {//日常生活能力评估
   //   path: '/patients/patient/:id/dailyLife',
   //   component: () => import('@/xt_pages/user/evaluationtool/dailyLife'),

src/router/modules/stock.js

@@ -506,7 +506,25 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'drugQueryPrint', noCache: true }
-    }
+    },
+
+    {
+      path: '/stock/print_damage',
+      component: () => import('@/xt_pages/stock/print_damage'),
+      name: 'print_damage',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'print_damage', noCache: true }
+    },
+
+    {
+      path: '/stock/drug_damage/print',
+      component: () => import('@/xt_pages/stock/drug_damage_print'),
+      name: 'drug_damage_print',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drug_damage_print', noCache: true }
+    },
 
   ]
 }

src/xt_pages/Dialysisanalysis/albumin/albuminall.vue

@@ -376,7 +376,8 @@ export default {
 
           this.input = response.data.data.reference.range_min + "<=" + response.data.data.reference.item_name + "<=" + response.data.data.reference.range_max
           let objone = {
-            value:  response.data.data.unusual_total / response.data.data.patient_count,
+            // value:  response.data.data.unusual_total / response.data.data.patient_count,
+            value:  response.data.data.unusual_total,
             name: '不达标值患者',
             count:response.data.data.unusual_total,
           }
@@ -384,7 +385,7 @@ export default {
           this.tableData.push(objone)
 
           let objtwo = {
-            value:   response.data.data.normal_total / response.data.data.patient_count,
+            value:   response.data.data.normal_total,
             name: '达标值患者',
             count:response.data.data.normal_total,
 
@@ -393,7 +394,7 @@ export default {
           this.tableData.push(objtwo)
 
           let objthree = {
-            value: response.data.data.no_check_total / response.data.data.patient_count,
+            value: response.data.data.no_check_total ,
             name: '未检查患者',
             count:response.data.data.no_check_total,
 

src/xt_pages/Dialysisanalysis/bloodPhosphorus/phosphorusall.vue

@@ -455,7 +455,7 @@ export default {
           this.reference =  response.data.data.reference
           this.input = response.data.data.reference.range_min + "<=" + response.data.data.reference.item_name + "<=" + response.data.data.reference.range_max
           let objone = {
-            value:  response.data.data.unusual_total / response.data.data.patient_count,
+            value:  response.data.data.unusual_total ,
             name: '不达标值患者',
             count:response.data.data.unusual_total,
           }
@@ -463,7 +463,7 @@ export default {
           this.tableData.push(objone)
 
           let objtwo = {
-            value:   response.data.data.normal_total / response.data.data.patient_count,
+            value:   response.data.data.normal_total,
             name: '达标值患者',
             count:response.data.data.normal_total,
 
@@ -472,7 +472,7 @@ export default {
           this.tableData.push(objtwo)
 
           let objthree = {
-            value: response.data.data.no_check_total / response.data.data.patient_count,
+            value: response.data.data.no_check_total ,
             name: '未检查患者',
             count:response.data.data.no_check_total,
 

src/xt_pages/Dialysisanalysis/bloodPotassium/potassiumall.vue

@@ -375,7 +375,7 @@ export default {
           this.reference = response.data.data.reference
           this.input = response.data.data.reference.range_min + "<=" + response.data.data.reference.item_name + "<=" + response.data.data.reference.range_max
           let objone = {
-            value:  response.data.data.unusual_total / response.data.data.patient_count,
+            value:  response.data.data.unusual_total ,
             name: '不达标值患者',
             count:response.data.data.unusual_total,
           }
@@ -383,7 +383,7 @@ export default {
           this.tableData.push(objone)
 
           let objtwo = {
-            value:   response.data.data.normal_total / response.data.data.patient_count,
+            value:   response.data.data.normal_total,
             name: '达标值患者',
             count:response.data.data.normal_total,
 
@@ -392,7 +392,7 @@ export default {
           this.tableData.push(objtwo)
 
           let objthree = {
-            value: response.data.data.no_check_total / response.data.data.patient_count,
+            value: response.data.data.no_check_total,
             name: '未检查患者',
             count:response.data.data.no_check_total,
 

src/xt_pages/Dialysisanalysis/calcium/calciumall.vue

@@ -376,7 +376,7 @@ export default {
 
           this.input = response.data.data.reference.range_min + "<=" + "钙" + "<=" + response.data.data.reference.range_max
           let objone = {
-            value:  response.data.data.unusual_total / response.data.data.patient_count,
+            value:  response.data.data.unusual_total,
             name: '不达标值患者',
             count:response.data.data.unusual_total,
           }
@@ -384,7 +384,7 @@ export default {
           this.tableData.push(objone)
 
           let objtwo = {
-            value:   response.data.data.normal_total / response.data.data.patient_count,
+            value:   response.data.data.normal_total ,
             name: '达标值患者',
             count:response.data.data.normal_total,
 
@@ -393,7 +393,7 @@ export default {
           this.tableData.push(objtwo)
 
           let objthree = {
-            value: response.data.data.no_check_total / response.data.data.patient_count,
+            value: response.data.data.no_check_total ,
             name: '未检查患者',
             count:response.data.data.no_check_total,
 

src/xt_pages/Dialysisanalysis/hemoglobin/hemoglobinall.vue

@@ -455,7 +455,7 @@ export default {
           this.reference = response.data.data.reference
           this.input = response.data.data.reference.range_min + "<=" + response.data.data.reference.item_name + "<=" + response.data.data.reference.range_max
           let objone = {
-            value:  response.data.data.unusual_total / response.data.data.patient_count,
+            value:  response.data.data.unusual_total ,
             name: '不达标值患者',
             count:response.data.data.unusual_total,
           }
@@ -463,7 +463,7 @@ export default {
           this.tableData.push(objone)
 
           let objtwo = {
-            value:   response.data.data.normal_total / response.data.data.patient_count,
+            value:   response.data.data.normal_total ,
             name: '达标值患者',
             count:response.data.data.normal_total,
 
@@ -472,7 +472,7 @@ export default {
           this.tableData.push(objtwo)
 
           let objthree = {
-            value: response.data.data.no_check_total / response.data.data.patient_count,
+            value: response.data.data.no_check_total ,
             name: '未检查患者',
             count:response.data.data.no_check_total,
 

src/xt_pages/Dialysisanalysis/platelets/plateletsall.vue

@@ -375,7 +375,7 @@ export default {
           this.reference = response.data.data.reference
           this.input = response.data.data.reference.range_min + "<=" + response.data.data.reference.item_name + "<=" + response.data.data.reference.range_max
           let objone = {
-            value:  response.data.data.unusual_total / response.data.data.patient_count,
+            value:  response.data.data.unusual_total ,
             name: '不达标值患者',
             count:response.data.data.unusual_total,
           }
@@ -383,7 +383,7 @@ export default {
           this.tableData.push(objone)
 
           let objtwo = {
-            value:   response.data.data.normal_total / response.data.data.patient_count,
+            value:   response.data.data.normal_total,
             name: '达标值患者',
             count:response.data.data.normal_total,
 
@@ -392,7 +392,7 @@ export default {
           this.tableData.push(objtwo)
 
           let objthree = {
-            value: response.data.data.no_check_total / response.data.data.patient_count,
+            value: response.data.data.no_check_total ,
             name: '未检查患者',
             count:response.data.data.no_check_total,
 

src/xt_pages/Dialysisanalysis/qualitycontrol/totalSstatistics.vue

@@ -372,19 +372,21 @@ export default {
       this.tableData = []
       console.log("~~~~~~~~~~")
       GetQCStatistisData(params).then(response => {
+        console.log('asdgfdgfhdg',response.data.data);
         if (response.data.state == 1) {
           this.reference = response.data.data.reference
           this.input = response.data.data.reference.range_min + "<=" + response.data.data.reference.item_name + "<=" + response.data.data.reference.range_max
           let objone = {
-            value:  response.data.data.unusual_total / response.data.data.patient_count,
+            // value:  response.data.data.unusual_total / response.data.data.patient_count,
+            value:  response.data.data.unusual_total, 
             name: '不达标值患者',
             count:response.data.data.unusual_total,
           }
           this.pieData.push(objone)
           this.tableData.push(objone)
 
-            let objtwo = {
-            value:   response.data.data.normal_total / response.data.data.patient_count,
+          let objtwo = {
+            value:  response.data.data.normal_total,
             name: '达标值患者',
             count:response.data.data.normal_total,
 
@@ -393,7 +395,7 @@ export default {
           this.tableData.push(objtwo)
 
           let objthree = {
-            value: response.data.data.no_check_total / response.data.data.patient_count,
+            value: response.data.data.no_check_total,
             name: '未检查患者',
             count:response.data.data.no_check_total,
 
@@ -429,12 +431,16 @@ export default {
               top: '0%',
               left: 'center'
             },
+            tooltip : {
+              trigger: 'item',
+              formatter: "{a} <br/>{b} : {c} ({d}%)"
+            },
             series: [
               {
                 type: 'pie',
                 label: {
                   normal : {
-                    formatter: '{b}:{c}: ({d}%)',
+                    formatter: '{b}:{c} ({d}%)',
                     textStyle : {
                         fontWeight : 'normal',
                         fontSize : 15,

src/xt_pages/device/objectRegistration.vue

@@ -45,7 +45,7 @@
 
                 <el-table-column prop="fenopda" label="使用数量" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{ scope.row.model_number }}
+                        {{ scope.row.user_count }}
                     </template>
                 </el-table-column>
 
@@ -128,20 +128,29 @@
                 <el-form :model="form" ref="form">
                     <el-row :span="24">
                       <el-col :span="8">
-                        <el-form-item label="登记日期:" label-width="110px" prop="record_date" >
+                        <el-form-item label="登记日期:" label-width="110px" prop="record_date">
                             <el-date-picker
                             value-format="yyyy-MM-dd"
                             v-model="form.record_date"
                             type="date"
                             placeholder="选择日期时间"
-                            style="width: 150px;">
+                            style="width: 150px;"
+                            @change="changeModelNumber">
                             </el-date-picker>
                         </el-form-item>
                       </el-col>
 
                       <el-col :span="8">
                         <el-form-item label="品名、型号:" label-width="110px" prop="record_date">
-                           <el-input v-model="form.model_number" style="width: 150px;"></el-input>
+                           <!-- <el-input v-model="form.model_number" style="width: 150px;"></el-input> -->
+                           <el-select v-model="form.model_number" filterable  placeholder="请选择" @change="changeModelNumber">
+                              <el-option
+                                v-for="item in goodList"
+                                :key="item.id"
+                                :label="item.specification_name"
+                                :value="item.id">
+                              </el-option>
+                           </el-select>
                         </el-form-item>
                       </el-col>
                     
@@ -251,14 +260,23 @@
                             v-model="form.record_date"
                             type="date"
                             placeholder="选择日期时间"
-                            style="width: 150px;">
+                            style="width: 150px;"
+                            @change="changeModelNumber">
                             </el-date-picker>
                         </el-form-item>
                       </el-col>
 
                       <el-col :span="8">
                         <el-form-item label="品名、型号:" label-width="110px" prop="model_number">
-                           <el-input v-model="form.model_number" style="width: 150px;"></el-input>
+                           <!-- <el-input v-model="form.model_number" style="width: 150px;"></el-input> -->
+                           <el-select v-model="form.model_number" filterable  placeholder="请选择" @change="changeModelNumber">
+                              <el-option
+                                v-for="item in goodList"
+                                :key="item.id"
+                                :label="item.specification_name"
+                                :value="item.id">
+                              </el-option>
+                           </el-select>
                         </el-form-item>
                       </el-col>
                     
@@ -427,7 +445,9 @@
         getRegistrationDisInfectList,
         getObjectRegistrationByIdList,
         UpdateObjectRegistration,
-        deleteObjectRegistration 
+        deleteObjectRegistration,
+        getRegistGoodInforList,
+        getRegistNumber 
     } from "@/api/device"
     import { uParseTime } from '@/utils/tools'
     const moment = require('moment')
@@ -491,10 +511,11 @@
          ],
          operators: [],
          operatorMaps:{},
-         
+         goodList:[],
         }
       },
       created(){
+        this.getRegistGoodInforList()
         this.getAllDoctorList()
         this.getlist()
       },
@@ -723,10 +744,16 @@
                 if(this.form.packaging_identification ==false ){
                     packaging_identification_one = 2
                 }
+                var model_number = ""
+                for(let i=0;i<this.goodList.length;i++){
+                  if(this.form.model_number == this.goodList[i].id){
+                    model_number = this.goodList[i].specification_name
+                  }
+                }
                 var params = {
                     id:this.form.id,
                     record_date:this.form.record_date,
-                    model_number:this.form.model_number,
+                    model_number:model_number,
                     user_count:this.form.user_count.toString(),
                     product_date:this.form.product_date,
                     expiry_date:this.form.expiry_date,
@@ -844,9 +871,15 @@
               if(this.form.packaging_identification ==false ){
                 packaging_identification_one = 2
               }
+              var model_number = ""
+              for(let i=0;i<this.goodList.length;i++){
+                if(this.form.model_number == this.goodList[i].id){
+                   model_number = this.goodList[i].specification_name
+                }
+              }
               var params = {
                 record_date:this.form.record_date,
-                model_number:this.form.model_number,
+                model_number:model_number,
                 user_count:this.form.user_count.toString(),
                 product_date:this.form.product_date,
                 expiry_date:this.form.expiry_date,
@@ -870,6 +903,32 @@
       },
       toSeach(){
         this.getlist()
+      },
+      getRegistGoodInforList(){
+        getRegistGoodInforList().then(response=>{
+           if(response.data.state == 1){
+             var  goodList =  response.data.data.list
+             this.goodList = goodList
+           } 
+        })
+      },
+
+      changeModelNumber(val){
+        console.log("val23233223",val)
+
+        getRegistNumber(val,this.form.record_date).then(response=>{
+          if(response.data.state ==1 ){
+            var list =  response.data.data.list
+            var count = 0
+            if(list!=null && list.length >0){
+              for(let i=0;i<list.length;i++){
+                count +=list[i].count
+              }
+            }
+            this.form.user_count = ""
+            this.form.user_count = count
+          }
+        })
       }
         
       }

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1336,6 +1336,7 @@
                           <td width="50">脉搏<br />(次/分)</td>
                           <td width="50">呼吸<br />(次/分)</td>
                           <td width="50">血流量<br />(ml/min)</td>
+                          <td width="50" v-if="org_id == 10478 || org_id == 0">动脉压<br />(mmHg)</td>
                           <td width="50">静脉压<br />(mmHg)</td>
                           <td width="50">跨膜压<br />(mmHg)</td>
                           <td width="60" v-if="org_id != 9836">
@@ -1465,6 +1466,13 @@
                                 : ""
                             }}
                           </td>
+                          <td v-if="org_id==0 || org_id == 10478">
+                            {{
+                              monitor_record.arterial_pressure
+                                ? monitor_record.arterial_pressure
+                                : ""
+                            }}
+                          </td>
                           <td>
                             {{
                               monitor_record.venous_pressure

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -58,8 +58,8 @@
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{anticoagulant_zongliang != "0" ? anticoagulant_zongliang : ""}}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id !=45">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 10234">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 10234 )">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 10234 && this.$store.getters.xt_user.template_info.template_id != 65">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 10234 ||  this.$store.getters.xt_user.template_info.template_id== 65)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3" >
             
               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675">
@@ -192,8 +192,8 @@
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_shouji != "0" ? anticoagulant_shouji : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 ">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
-            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 && this.$store.getters.xt_user.template_info.template_id!=0">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38  || this.$store.getters.xt_user.template_info.template_id == 65 ||  this.$store.getters.xt_user.template_info.template_id == 0)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671">
                  {{ anticoagulant_shouji != "0" ? "mg" : "" }}
@@ -303,8 +303,8 @@
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_weichi != "0" ? anticoagulant_weichi : "" }}</span>
           <span v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45">
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1"></span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 ">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 65 ">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 65)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
               <span v-if="this.$store.getters.xt_user.template_info.org_id ==9671">
               {{ anticoagulant_weichi != "0" ? "mg/h" : "" }}
@@ -945,7 +945,7 @@ export default {
   
   },
   created() {
-   
+    console.log("template_id", this.$store.getters.xt_user.template_info.template_id)
     var perfusion_apparatus = this.$store.getters.perfusion_apparatus
     var map = {}
     for (let index = 0; index < perfusion_apparatus.length; index++) {

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -312,11 +312,13 @@
                         this.$store.getters.xt_user.template_info.org_id != 9829 &&
                         this.$store.getters.xt_user.template_info.org_id != 10440 &&
                         this.$store.getters.xt_user.template_info.org_id != 10469 &&
-                        this.$store.getters.xt_user.template_info.org_id != 10471">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 &&
+                        this.$store.getters.xt_user.template_info.org_id != 10471 &&
+                        this.$store.getters.xt_user.template_info.org_id != 10495">
+                       <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 &&
                           this.$store.getters.xt_user.template_info.template_id != 45 &&
                           this.$store.getters.xt_user.template_info.org_id != 10346 &&
-                          this.$store.getters.xt_user.template_info.org_id != 10387">
+                          this.$store.getters.xt_user.template_info.org_id != 10387 &&
+                          this.$store.getters.xt_user.template_info.org_id != 10495 ">
                             <el-form-item
                                     v-if='dialysisPrescription.anticoagulant != 1 &&
                                     this.$store.getters.xt_user.template_info.template_id != 21 &&
@@ -360,7 +362,8 @@
                                     this.$store.getters.xt_user.template_info.template_id == 38 ||
                                     this.$store.getters.xt_user.template_info.org_id == 9987 ||
                                     this.$store.getters.xt_user.template_info.org_id == 10346 ||
-                                    this.$store.getters.xt_user.template_info.org_id == 10387'
+                                    this.$store.getters.xt_user.template_info.org_id == 10387 ||
+                                    this.$store.getters.xt_user.template_info.org_id ==10495'
                                     :label="'首剂(mg) : '" prop="anticoagulant_shouji" :rules="isCheckmust('首剂')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
@@ -411,8 +414,8 @@
 
 
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.weichi != -1 && isShows('维持')  && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 ">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495 ">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
                                           v-if="anticoagulant.weichi != -1 &&
                                            this.$store.getters.xt_user.template_info.template_id != 21 &&
@@ -420,7 +423,8 @@
                                             this.$store.getters.xt_user.template_info.template_id != 38 &&
                                             this.$store.getters.xt_user.template_info.org_id != 9987  &&
                                             this.$store.getters.xt_user.template_info.org_id != 54 &&
-                                            this.$store.getters.xt_user.template_info.org_id != 9990" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
+                                            this.$store.getters.xt_user.template_info.org_id != 9990 &&
+                                            this.$store.getters.xt_user.template_info.org_id != 10495" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -435,7 +439,9 @@
                                           this.$store.getters.xt_user.template_info.org_id == 54 ||
                                           this.$store.getters.xt_user.template_info.org_id == 10346 ||
                                           this.$store.getters.xt_user.template_info.org_id == 10387  ||
-                                          this.$store.getters.xt_user.template_info.org_id == 9990" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
+                                          this.$store.getters.xt_user.template_info.org_id == 9990 ||
+                                          this.$store.getters.xt_user.template_info.org_id == 10495
+                                          " prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -490,10 +496,10 @@
 
 
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.zongliang != -1 && isShows('总量') && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471">
-                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495">
+                          <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 10495'
                                     :label="'总量(' + anticoagulant.zongliang_unit + ') : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -501,7 +507,7 @@
                                           v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
                             </el-form-item>
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387'
+                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10495 '
                                     :label="'总量(mg) : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -235,6 +235,7 @@
                 template_id == 54 ||
                 template_id == 56 ||
                 template_id == 60 ||
+                template_id == 65 ||
                 org_id == 10210 ||
                 org_id == 9555
                 || org_id == 10432
@@ -306,6 +307,7 @@
               template_id != 54 &&
               template_id != 56 &&
               template_id != 60 &&
+              template_id != 65 &&
               org_id!= 10210 &&
               org_id != 9555
               && org_id!=10432 && org_id!=10445
@@ -360,6 +362,7 @@
                 template_id == 56 ||
                 template_id == 47 ||
                 template_id == 60 ||
+                template_id == 65 ||
                 org_id == 10432 ||
                 org_id == 10445 ||
                 org_id == 10410 ||
@@ -413,6 +416,7 @@
               template_id != 48 &&
               template_id != 47 &&
               template_id != 60 &&
+              template_id != 65 &&
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
@@ -1133,6 +1137,7 @@
                 template_id == 56 ||
                 template_id == 47 ||
                 template_id == 60 ||
+                template_id == 65 ||
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
@@ -1179,6 +1184,7 @@
               template_id != 56 &&
               template_id != 47 &&
               template_id != 60 &&
+              template_id != 65 &&
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 &&
@@ -1231,6 +1237,7 @@
                 template_id == 54 ||
                 template_id == 56 ||
                 template_id == 60 ||
+                template_id == 65 ||
                 org_id == 10210 ||
                 org_id == 9555 ||
                 org_id == 10340 ||
@@ -1287,6 +1294,7 @@
               template_id == 54 &&
               template_id == 56 &&
               template_id == 60 &&
+              template_id == 65 &&
               org_id !=  10210 &&
               org_id !=  10340 &&
               org_id != 9555 &&

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,10 +14,10 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) " width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1432,6 +1432,14 @@
                         <td width="50">脉搏<br />(次/分)</td>
                         <td width="50">呼吸<br />(次/分)</td>
                         <td width="50">血流量<br />(ml/min)</td>
+                        <td width="50" v-if="org_id==10478 || org_id == 0">
+                          动脉压<br />({{
+                            monitors[0] &&
+                            monitors[0]["venous_pressure_type"] == 2
+                              ? "kpa"
+                              : "mmHg"
+                          }})
+                        </td>
                         <td width="50">
                           静脉压<br />({{
                             monitors[0] &&
@@ -1480,6 +1488,13 @@
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
                         <td>{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
                         <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
+                        <td v-if="org_id == 0 ||org_id ==10478">
+                          {{
+                            monitor.arterial_pressure
+                              ? monitor.arterial_pressure
+                              : ""
+                          }}
+                        </td>
                         <td>
                           {{
                             monitor.venous_pressure
@@ -1635,6 +1650,7 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td v-if="org_id == 0 || org_id ==10478"></td>
                         <td></td>
                         <td></td>
                         <td></td>
@@ -3009,13 +3025,13 @@
                       >
                         <span
                           style="height: 30px; display: inline-block"
-                          v-if="setAdminUserES(prescription.creater) == ''"
+                          v-if="setAdminUserES(doctor_advices[0].advice_doctor) == ''"
                         >
-                          {{ getAdminUser(prescription.creater) }}
+                          {{ getAdminUser(doctor_advices[0].advice_doctor) }}
                         </span>
                         <img
                           style="height: 40px"
-                          :src="setAdminUserES(prescription.creater)"
+                          :src="setAdminUserES(doctor_advices[0].advice_doctor)"
                           alt=""
                           srcset=""
                           v-else

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyFive.vue

@@ -1092,14 +1092,14 @@
                         }}
                       </div>
                      
-                     <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
+                     <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10495">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
                     </span>
 
-                    <span v-if="org_id==9675 || org_id==10447 || org_id==9829 || org_id==10440 || org_id==10469 || org_id == 10471">
+                    <span v-if="org_id==9675 || org_id==10447 || org_id==9829 || org_id==10440 || org_id==10469 || org_id == 10471 || org_id == 10495">
                       <span v-if="prescription.anticoagulant == 4">iu</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">mg</span>
@@ -1138,7 +1138,7 @@
                             : "0"
                         }}
                       </div>
-                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
+                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10495">
 
                         <span v-if="prescription.anticoagulant == 5">ml/h</span>
                           <span v-if="prescription.anticoagulant == 4">mg/h</span>
@@ -1146,7 +1146,7 @@
                           <span v-if="prescription.anticoagulant == 2">iu/h</span>
                           <span v-if="prescription.anticoagulant == 1">mg/h</span>
                       </span>
-                      <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">
+                      <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10495">
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
                           <span v-if="prescription.anticoagulant == 3">iu/h</span>
                           <span v-if="prescription.anticoagulant == 4">ml</span>
@@ -1211,13 +1211,13 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
+                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10495">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
                      </span>
-                    <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">
+                    <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10495">
                        <span v-if="prescription.anticoagulant == 2">mg</span>
                        <span v-if="prescription.anticoagulant == 3">iu</span>
                        <span v-if="prescription.anticoagulant == 4">ml</span>

src/xt_pages/management/components/ManageForm.vue

@@ -34,6 +34,24 @@
             </el-form-item>
           </el-col>
 
+          <!-- <el-col :span="8">
+            <el-form-item
+              label="分区:"
+              v-show="bedShow"
+              required
+              prop="zone_id"
+            >
+              <el-select style="width:135px" v-model="form.zone_id">
+                <el-option
+                  v-for="item in this.deviceType"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col> -->
+
           <el-col :span="8">
             <el-form-item
               label="机位号:"
@@ -388,7 +406,8 @@ export default {
         revers_mode: "", // 反渗模式
         treat_mode: [],
         treat_type: [], // 治疗模式
-        beds: ""
+        beds: "",
+        zone_id:"",
       },
       forms: {
         beds: ""
@@ -471,6 +490,7 @@ export default {
       getAllSubregion().then(response => {
         if (response.data.state === 1) {
           var zones = response.data.data.zones;
+        
           this.deviceType = zones;
           var numbers = response.data.data.numbers;
           var devicenumber = response.data.data.devicenumber;

src/xt_pages/management/home.vue

@@ -117,6 +117,13 @@
                                   </el-select>
                                  </el-form-item>
                               </el-col>
+                              <el-col :span="8">
+                                  <el-form-item label="分区:">
+                                       <el-select style="width:150px" v-model="form.zone_id" :disabled="disableThree">
+                                          <el-option v-for="item in this.bedZone" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                                       </el-select>
+                                  </el-form-item>
+                              </el-col>
                               <el-col :span="8">
                                   <el-form-item label="机位号:">
                                        <el-select style="width:150px" v-model="form.bed_number" :disabled="disableThree">
@@ -2779,7 +2786,8 @@ export default {
           Disinfection_mode: '',
           revers_mode: '',
           beds: '',
-          bed_numbers: ''
+          bed_numbers: '',
+          zone_id:"",
         },
         activeName: 'first',
         activeNameTwo: 'first',
@@ -3347,6 +3355,7 @@ export default {
       getAllSubregion() {
         getAllSubregion().then(response => {
           var zones = response.data.data.zones
+          console.log("zones",zones)
           this.deviceType = zones
           var numbers = response.data.data.numbers
 
@@ -3469,6 +3478,7 @@ export default {
         getMachineDetailById(id).then(response => {
           if (response.data.state === 1) {
             var addmacher = response.data.data.addmacher
+            console.log("addmacher",addmacher)
             var warning = response.data.data.warning
 
             var time = this.getTimestamp(this.userform.date) - warning.stime
@@ -3587,7 +3597,10 @@ export default {
             this.form.device_name = addmacher.device_name
             this.form.manufacture_factory = addmacher.manufacture_factory
             this.form.service_manufacturer = addmacher.service_manufacturer
-
+            if(addmacher.zone_id >=0){
+              this.form.zone_id = addmacher.zone_id
+            }
+          
             // this.form.unit_type = addmacher.unit_type
 
             this.form.unit_type = parseInt(addmacher.device_mode)

src/xt_pages/medicalScheduling/index.vue

@@ -954,13 +954,24 @@ export default {
                     data.push(...newNurse)
                     data.push(...newDoctor)
                     data.push(obj)
-
-                    this.tableData = data
+                    console.log("data2o2oo2o2o2o22o",data)
+                    this.tableData = this.distinct(data)
 
 
                 }
             })
         },
+        distinct(tempArr) {
+            for (let i = 0; i < tempArr.length; i++) {
+                for (let j = i + 1; j < tempArr.length; j++) {
+                    if (tempArr[i].admin_user_id == tempArr[j].admin_user_id) {
+                        tempArr.splice(j, 1);
+                        j--;
+                    };
+                };
+            };
+            return tempArr;
+       },
 
         getClass(name,index){
             if(name != undefined){

src/xt_pages/role/admin.vue

@@ -15,6 +15,28 @@
         size="small"
         @click="BatchDelete"
         >医药师登记</el-button>
+
+         <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTest">短信</el-button> -->
+
+        <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestOne">个人用户实名</el-button> -->
+         
+          <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toTestTwo">创建个人印章</el-button> -->
+          
      </div>
     
       
@@ -169,7 +191,7 @@
 </template>
 
 <script>
-import { adminMainView, getAdmins, setAdminStatus } from "@/api/role/admin";
+import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo } from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
 
 import { parseTime } from "@/utils";
@@ -459,6 +481,30 @@ export default {
    handleSelectionChange(val) {
       this.selectDrug = val;
     },
+    toTest(){
+      toSign().then(response=>{
+        if(response.data.state ==1){
+          var sign = response.data.data.sign
+          console.log("sign",sign)
+        }
+      })
+    },
+    toTestOne(){
+      toTestOne().then(response=>{
+        if(response.data.state==1){
+          var sign = response.data.data.sign
+          console.log("sign",sign)
+        }
+      })
+    },
+    toTestTwo(){
+      toTestTwo().then(response=>{
+        if(response.data.state ==1){
+          var sign = response.data.data.sign
+          console.log("sign",sign)
+        }
+      })
+    }
   },
   watch: {
     should_update_admins(should_change) {

src/xt_pages/stock/drugs/components/drugQuery.vue

@@ -94,6 +94,11 @@
                 {{getManufacturName(scope.row.manufacturer)}}
               </template>
             </el-table-column>
+            <el-table-column label="经销商" align="center" v-if="org_id ==10485">
+              <template slot-scope="scope">
+                  {{getDearName(scope.row.dealer)}}
+              </template>
+            </el-table-column>
             <el-table-column label="批准文号" align="center">
               <template slot-scope="scope">
                 {{scope.row.number}}
@@ -402,6 +407,7 @@ export default {
      isClose: false,
      drug_type: 0,
      storehouseId:0,
+     dealerList:[],
     }
   
   },
@@ -454,6 +460,7 @@ export default {
            this.manufacturerList = response.data.data.manufacturerList
            this.goodTypeList = response.data.data.goodTypeList
            this.patientList = response.data.data.patientList
+           this.dealerList = response.data.data.dealerList
          }
       })
     },
@@ -1489,7 +1496,16 @@ export default {
           this.$message.success("保存成功!")
         }
       })
-    }
+    },
+    getDearName(id){
+      var dear_name = ""
+      for(let i=0;i<this.dealerList.length;i++){
+        if(id == this.dealerList[i].id){
+          dear_name = this.dealerList[i].dealer_name
+        }
+      }
+      return dear_name
+    },
   },
   created(){
     this.getStorehouseList()

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -24,6 +24,7 @@
       @click="search"
       >搜索</el-button
       >
+     
       <el-date-picker
       size="small"
       v-model="start_time"
@@ -40,9 +41,18 @@
       placeholder="选择日期"
       @change="changeEndTime">
       </el-date-picker>
+
+      <el-button
+      size="small"
+      class="filter-item"
+      type="primary"
+      icon="el-icon-search"
+      @click="toPrint"
+      >打印</el-button
+      >
     </div>
     <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" >
-        <el-table-column type="selection" width="55" align="center"> </el-table-column>
+        <!-- <el-table-column type="selection" width="55" align="center"> </el-table-column> -->
         <el-table-column  prop="date" label="报损日期" align="center">
             <template slot-scope="scope">
               {{getTime(scope.row.start_time)}}
@@ -474,6 +484,9 @@ export default {
       }else{
         return storehouse_name
       }
+     },
+     toPrint(){
+      this.$router.push({path:'/stock/drug_damage/print?storehouse_id='+this.storehouse_id+"&limit="+this.limit+"&page="+this.page+"&start_time"+this.start_time+"&end_time="+this.end_time+"&keyword"+this.searchKey}) 
      }
     },
     created(){

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -99,6 +99,18 @@
                  <span v-if="scope.row.inventory_type == 11">盘亏</span>
                </template>
             </el-table-column>
+
+            <el-table-column prop="name" label="盘点人"  width="100" align="center">
+                <template slot-scope="scope">
+                   {{getName(scope.row.creater)}}
+                </template>
+            </el-table-column>
+
+            <el-table-column prop="name" label="盘点时间"  width="100" align="center">
+                <template slot-scope="scope">
+                   {{ getTime(scope.row.ctime) }}
+                </template>
+            </el-table-column>
         </el-table>
         <el-pagination
             @size-change="handleSizeChange"
@@ -222,6 +234,15 @@ export default {
         console.log("str",str)
         this.ids = str  
       },
+      getName(admin_user_id){
+         var user_name = ""
+         for(let i=0;i<this.doctorList.length;i++){
+           if(admin_user_id == this.doctorList[i].admin_user_id){
+               user_name = this.doctorList[i].user_name
+           }
+         }
+         return user_name
+      }
     },
     created(){
       this.getlist()

src/xt_pages/stock/inventoryDetails.vue

@@ -41,13 +41,13 @@
                   {{scope.row.good_name}}
                 </template>
             </el-table-column>
-            <el-table-column prop="name" label="规格" width="200" align="center">
+            <el-table-column prop="name" label="规格" width="100" align="center">
                <template slot-scope="scope">
                   {{scope.row.specification_name}}
                 </template>
             </el-table-column>
 
-            <el-table-column  prop="name" label="有效日期" width="200" align="center">
+            <el-table-column  prop="name" label="有效日期" width="100" align="center">
                <template slot-scope="scope">
                  {{getTime(scope.row.expire_date)}}
                </template>
@@ -88,6 +88,18 @@
                 <span v-if="scope.row.inventory_type ==7">有效期到期</span>
                </template>
             </el-table-column>
+
+            <el-table-column prop="name" label="盘点人"  width="100" align="center">
+                <template slot-scope="scope">
+                   {{getName(scope.row.creater)}}
+                </template>
+            </el-table-column>
+
+            <el-table-column prop="name" label="盘点时间"  width="100" align="center">
+                <template slot-scope="scope">
+                   {{ getTime(scope.row.ctime) }}
+                </template>
+            </el-table-column>
           
         </el-table>
         <el-pagination
@@ -107,6 +119,7 @@
 <script>
 import { uParseTime } from '@/utils/tools'
 import { getInventoryDetailList } from "@/api/stock"
+import user from '../../store/modules/user';
 
 export default {
     name: "inventory",
@@ -127,6 +140,7 @@ export default {
             damageList:[],
             storehouse_id:0,
             houseList:[],
+            docList:[]
          }
     },
     methods:{
@@ -173,6 +187,7 @@ export default {
                for(let i=0;i<response.data.data.houseList.length;i++){
                  this.houseList.push(response.data.data.houseList[i])
                }
+               this.docList = response.data.data.doclist
               
              }
           })
@@ -236,6 +251,15 @@ export default {
       changeHouseList(){
         this.houseList = []
         this.getlist()
+      },
+      getName(admin_user_id){
+         var user_name = ""
+         for(let i=0;i<this.docList.length;i++){
+           if(admin_user_id == this.docList[i].admin_user_id){
+               user_name = this.docList[i].user_name
+           }
+         }
+         return user_name
       }
     },
     created(){

src/xt_pages/stock/query/goodNewQuery.vue

@@ -48,6 +48,11 @@
             border
            :cell-class-name="cellStyle"
           >
+          <el-table-column label="耗材编码" align="center" v-if="org_id ==9956 || org_id == 0">
+              <template slot-scope="scope">
+                 {{ scope.row.good_number?scope.row.good_number:"" }}
+              </template>
+            </el-table-column>
             <el-table-column label="耗材类型" align="center">
               <template slot-scope="scope">
                 {{getGoodTypeName(scope.row.good_type_id)}}
@@ -68,6 +73,11 @@
                   {{getManufacturName(scope.row.manufacturer)}}
               </template>
             </el-table-column>
+            <el-table-column label="经销商" align="center" v-if="org_id ==10485">
+              <template slot-scope="scope">
+                  {{getDearName(scope.row.dealer)}}
+              </template>
+            </el-table-column>
             <el-table-column label="批准文号" align="center">
               <template slot-scope="scope">
                  {{scope.row.number}}
@@ -358,7 +368,8 @@ export default {
      warehouseOutByList:[],
      flushList:[],
      type_name:0,
-     storehouseId:0
+     storehouseId:0,
+     dealerList:[]
     }
   
   },
@@ -411,6 +422,7 @@ export default {
            this.manufacturerList = response.data.data.manufacturerList
            this.goodTypeList = response.data.data.goodTypeList
            this.patientList = response.data.data.patientList
+           this.dealerList = response.data.data.dealerList
          }
       })
     },
@@ -445,6 +457,15 @@ export default {
       }
       return manufacturer_name
     },
+    getDearName(id){
+      var dear_name = ""
+      for(let i=0;i<this.dealerList.length;i++){
+        if(id == this.dealerList[i].id){
+          dear_name = this.dealerList[i].dealer_name
+        }
+      }
+      return dear_name
+    },
     handleSizeChange(val) {
       this.limit = val;
       this.getlist()

src/xt_pages/stock/stockDamaged.vue

@@ -40,10 +40,17 @@
           placeholder="选择日期"
           @change="changeEndTime">
       </el-date-picker>
+
+      <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-printer"
+        @click="toPrint">打印</el-button>
     </div>
   
     <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-        <el-table-column type="selection" width="55" align="center"> </el-table-column>
+        <!-- <el-table-column type="selection" width="55" align="center"> </el-table-column> -->
         <el-table-column  prop="date" label="报损日期" align="center">
             <template slot-scope="scope">
               {{getTime(scope.row.ctime)}}
@@ -833,6 +840,12 @@ export default {
       changeHouseList(){
         this.houseList = []
         this.getlist()
+      },
+      toPrint(){
+        this.$router.push({path:'/stock/print_damage?storehouse_id='+this.storehouse_id+"&start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.searchKey+"&limit="+this.limit+"&page="+this.page})
+      },
+      SaveCheckedDamage(){
+
       }
     },
     created(){

src/xt_pages/user/components/PatientForm.vue

@@ -1497,6 +1497,14 @@ export default {
       this.submitMsg = "新增患者成功";
       this.form = Object.assign({}, defaultForm);
       this.form.lapseto  = 1
+      if(this.org_id == 0 || this.org_id ==9919){
+         this.form.diagnose = "1.慢性肾脏病5期  IgA肾病 维持性血液透析 肾性贫血 肾性高血压  继发性甲状旁腺功能亢进症  2.右前臂自体动静脉内瘘成形术后"
+         this.form.treatment_plan ="完善相关检查，规律血液透析，每周2次，每次5小时。纠正贫血，  达泊丁 （自备） 120ug  皮下注射  每4周1次；控制血压：非洛地平缓释片 5mg    口服  1次/日，酒石酸美托洛尔片 50mg/次 口服  每日1次；阿托伐他汀钙片 40mg/次  口服  每日1次。"
+         this.form.patient_complains = "维持性血液透析1年余"
+         this.form.past_history = "既往否认冠心病、糖尿病等慢性疾病；否认肝炎、结核、艾滋、梅毒等传染病史；否认药物、食物过敏史；无重大手术、外伤史。"
+         this.form.present_history = "患者于30年前体检查尿蛋白+，行肾穿刺活检，病理结果示：IgA肾病，此后于香港当地医院规范治疗，定时复查，至2021年12月复查发现血肌酐渐升高，300+umol/L，血压高于正常，开始为肾透析行右前臂自体动静脉内瘘成形术，1年前导入透析治疗，每周2次，每次5小时，规律维持至今。平素无胸闷、心慌，无咳嗽、咳痰，无恶心、呕吐，饮食、睡眠可，尿量约1000ml/日。本次检查感染四项阴性，血红蛋白103g/L，PTH 28.2pmol/L， Ca 2.17mmol/L ，P 1.57mmol/L。"
+         this.form.remark = "神志清，精神可，体型肥胖，面色黝黑，颜面、眼睑无浮肿，皮肤未见出血点、瘀斑；胸廓对称，心前区无隆起，心界向左扩大，心音有力，节律规整，未闻及明显杂音，双肺呼吸音粗；腹部呈脂肪堆积，腹软，无包块、无皮疹、无静脉曲张、无压痛；脊柱、四肢未见畸形，关节活动正常，肌力正常；双下肢无明显水肿；右前臂自体动静脉内瘘能触及震颤、闻及连续杂音。"
+      }
     }
 
   },

src/xt_pages/user/evaluationtool/Constraintnotification.vue

@@ -20,9 +20,9 @@
                         <td style="width: 150px; height: 40px; ">存在以下潜在风险：</td>
                         <td>
                             <div class="jiange">
-                                <el-checkbox-group v-model="checkList">
-                                    <el-checkbox v-for="item in qianzai" :label="item" :key="item"></el-checkbox>
-                                </el-checkbox-group>    
+                                <span v-for="item in qianzai" class="rightjiange">
+                                    <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
+                                </span>
                             </div>
                         </td>
                     </tr>
@@ -39,9 +39,9 @@
                             <td class="start">意识及情绪：</td>
                             <td>
                                 <div class="jiange">
-                                    <el-checkbox-group v-model="checkList">
-                                        <el-checkbox v-for="item in yisqingxu" :label="item" :key="item"></el-checkbox>
-                                    </el-checkbox-group>    
+                                    <span v-for="item in yisqingxu" class="rightjiange">
+                                        <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
+                                    </span>
                                 </div>
                             </td>
                         </tr>
@@ -49,9 +49,9 @@
                             <td class="start">手术麻醉：</td>
                             <td>
                                 <div class="jiange">
-                                    <el-checkbox-group v-model="checkList">
-                                        <el-checkbox v-for="item in mazui" :label="item" :key="item"></el-checkbox>
-                                    </el-checkbox-group>
+                                    <span v-for="item in mazui" class="rightjiange">
+                                        <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
+                                    </span>
                                 </div>
                             </td>
                         </tr>
@@ -59,9 +59,9 @@
                             <td class="start"></td>
                             <td>
                                 <div class="jiange">
-                                    <el-checkbox-group v-model="checkList">
-                                        <el-checkbox label="醉酒躁动"></el-checkbox>
-                                    </el-checkbox-group>
+                                    <span class="rightjiange">
+                                        <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;醉酒躁动</label>
+                                    </span>
                                 </div>
                             </td>
                         </tr>
@@ -69,9 +69,9 @@
                             <td class="start">管道：</td>
                             <td>
                                 <div class="jiange">
-                                    <el-checkbox-group v-model="checkList">
-                                        <el-checkbox v-for="item in guandao" :label="item" :key="item"></el-checkbox>
-                                    </el-checkbox-group>
+                                    <span v-for="item in guandao" class="rightjiange">
+                                        <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
+                                    </span>
                                 </div>
                             </td>
                         </tr>
@@ -79,9 +79,9 @@
                             <td class="start">上肢情况：</td>
                             <td>
                                 <div class="jiange">
-                                    <el-checkbox-group v-model="checkList">
-                                        <el-checkbox v-for="item in shangzhi" :label="item" :key="item"></el-checkbox>
-                                    </el-checkbox-group>
+                                    <span v-for="item in shangzhi" class="rightjiange">
+                                        <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
+                                    </span>
                                 </div>
                             </td>
                         </tr>
@@ -89,9 +89,9 @@
                             <td class="start">下肢情况：</td>
                             <td>
                                 <div class="jiange">
-                                    <el-checkbox-group v-model="checkList">
-                                        <el-checkbox v-for="item in xiazhi" :label="item" :key="item"></el-checkbox>
-                                    </el-checkbox-group>
+                                    <span v-for="item in xiazhi" class="rightjiange">
+                                        <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
+                                    </span>
                                 </div>
                             </td>
                         </tr>
@@ -99,9 +99,9 @@
                             <td class="start">皮肤状况：</td>
                             <td>
                                 <div class="jiange">
-                                    <el-checkbox-group v-model="checkList">
-                                        <el-checkbox v-for="item in pifu" :label="item" :key="item"></el-checkbox>
-                                    </el-checkbox-group>
+                                    <span v-for="item in pifu" class="rightjiange">
+                                        <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
+                                    </span>
                                 </div>
                             </td>
                         </tr>
@@ -120,27 +120,109 @@
                                         </thead>
                                         <tbody>
                                             <tr class="bg_color">
-                                                <td></td>
-                                                <td></td>
+                                                <td>
+                                                    <div class="jiange">
+                                                        <span style="font-size: 15px;">
+                                                            <label><input type="checkbox" name="ball" value="volleyball" />
+                                                                &nbsp;双上肢腕式约束
+                                                            </label>
+                                                        </span>
+                                                    </div> 
+                                                </td>
+                                                <td>
+                                                    <div class="jiange">
+                                                        <span style="font-size: 15px;">
+                                                            <label><input type="checkbox" name="ball" value="volleyball" />
+                                                                &nbsp;约束部位皮肤损失
+                                                            </label>
+                                                        </span>
+                                                    </div> 
+                                                </td>
                                             </tr>
                                             <tr class="">
-                                                <td></td>
-                                                <td></td>
+                                                <td>
+                                                    <div class="jiange">
+                                                        <span style="font-size: 15px;">
+                                                            <label><input type="checkbox" name="ball" value="volleyball" />
+                                                                &nbsp;膝部约束
+                                                            </label>
+                                                        </span>
+                                                    </div> 
+                                                </td>
+                                                <td>
+                                                    <div class="jiange">
+                                                        <span style="font-size: 15px;">
+                                                            <label><input type="checkbox" name="ball" value="volleyball" />
+                                                                &nbsp;约束部位皮下瘀斑
+                                                            </label>
+                                                        </span>
+                                                    </div> 
+                                                </td>
                                             </tr>
                                             <tr class="bg_color">
-                                                <td></td>
-                                                <td></td>
+                                                <td>
+                                                    <div class="jiange">
+                                                        <span style="font-size: 15px;">
+                                                            <label><input type="checkbox" name="ball" value="volleyball" />
+                                                                &nbsp;四肢约束
+                                                            </label>
+                                                        </span>
+                                                    </div> 
+                                                </td>
+                                                <td>
+                                                    <div class="jiange">
+                                                        <span style="font-size: 15px;">
+                                                            <label><input type="checkbox" name="ball" value="volleyball" />
+                                                                &nbsp;约束肢体末端水肿及水肿加重
+                                                            </label>
+                                                        </span>
+                                                    </div> 
+                                                </td>
                                             </tr>
                                             <tr class="">
-                                                <td></td>
-                                                <td></td>
+                                                <td>
+                                                    <div class="jiange">
+                                                        <span style="font-size: 15px;">
+                                                            <label><input type="checkbox" name="ball" value="volleyball" />
+                                                                &nbsp;四肢加胸部约束
+                                                            </label>
+                                                        </span>
+                                                    </div> 
+                                                </td>
+                                                <td>
+                                                    <div class="jiange">
+                                                        <span style="font-size: 15px;">
+                                                            <label><input type="checkbox" name="ball" value="volleyball" />
+                                                                &nbsp;约束肢体发生骨折
+                                                            </label>
+                                                        </span>
+                                                    </div> 
+                                                </td>
                                             </tr>
                                             <tr class="bg_color">
-                                                <td></td>
-                                                <td></td>
+                                                <td>
+                                                    <div class="jiange">
+                                                        <span style="font-size: 15px;">
+                                                            <label><input type="checkbox" name="ball" value="volleyball" />
+                                                                &nbsp;胸腹部约束
+                                                            </label>
+                                                        </span>
+                                                    </div> 
+                                                </td>
+                                                <td>
+                                                     
+                                                </td>
                                             </tr>
                                             <tr class="">
-                                                <td></td>
+                                                <td>
+                                                    <div class="jiange">
+                                                        <span style="font-size: 15px;">
+                                                            <label><input type="checkbox" name="ball" value="volleyball" />
+                                                                &nbsp;肩部约束
+                                                            </label>
+                                                        </span>
+                                                    </div>
+                                                </td>
                                                 <td></td>
                                             </tr>
                                         </tbody>
@@ -263,7 +345,10 @@ export default {
         }
         .jiange{
             margin-left: 20px;
-            color: black;
+        }
+        .rightjiange{
+          margin-right: 40px;
+          font-size: 15px;
         }
         input{
             -webkit-appearance: checkbox;

src/xt_pages/user/evaluationtool/Fallassessment.vue

@@ -32,7 +32,7 @@
                       <td>
                         <div class="jiange">
                           <span v-for="item in nianlin" class="rightjiange">
-                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
                           </span>
                         </div>
                           
@@ -131,7 +131,7 @@
                       <td>
                         <div class="jiange">
                           <span v-for="item in xiaoguo" class="rightjiange">
-                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
                           </span>
                         </div>
                       </td>
@@ -469,6 +469,7 @@
         }
         .rightjiange{
           margin-right: 40px;
+          font-size: 15px;
         }
         input{
             -webkit-appearance: checkbox;

src/xt_pages/user/evaluationtool/Glasgow.vue

@@ -21,9 +21,9 @@
                                         <td class="start">睁眼反应（E）</td>
                                         <td>
                                             <div class="jiange">
-                                              <el-checkbox-group v-model="checkList" :max="1">
-                                                <el-checkbox v-for="item in zhengyan" :label="item" :key="item"></el-checkbox>
-                                              </el-checkbox-group>
+                                                <span v-for="item in zhengyan" class="rightjiange">
+                                                    <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
+                                                </span>
                                             </div>
                                         </td>
                                     </tr>
@@ -32,9 +32,9 @@
                                         <td class="start">言语反映 （V）</td>
                                         <td>
                                             <div class="jiange">
-                                              <el-checkbox-group v-model="checkList1">
-                                                <el-checkbox v-for="item in yanyu" :label="item" :key="item"></el-checkbox>
-                                              </el-checkbox-group>
+                                                <span v-for="item in yanyu" class="rightjiange">
+                                                    <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
+                                                </span>
                                             </div>
                                         </td>
                                     </tr>
@@ -43,9 +43,9 @@
                                         <td class="start">运动反应（M）</td>
                                         <td>
                                             <div class="jiange">
-                                              <el-checkbox-group v-model="checkList2">
-                                                <el-checkbox v-for="item in yundong" :label="item" :key="item"></el-checkbox>
-                                              </el-checkbox-group>
+                                                <span v-for="item in yundong" class="rightjiange">
+                                                    <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
+                                                </span> 
                                             </div>
                                         </td>
                                     </tr>
@@ -93,7 +93,7 @@
                             
                         </div> 
                         
-                        <hr style="width: 100%;margin-top: 20px;"/>
+                        <hr style=" background-color: #DCDFE6;margin-top: 20px; height: 1px;border: none;"/>
                         <div class="shuoming">
                             <p>说明：</p>
                             <p>总分15分，其中 14-15分为正常，8-13分为中度意识障碍，≦7分为浅昏迷 ，3分为深昏迷 。</p>
@@ -203,5 +203,12 @@ export default {
             margin: 5px 0px 5px 20px;
             color: black;
         }
+        .rightjiange{
+          margin-right: 40px;
+          font-size: 15px;
+        }
+        input{
+            -webkit-appearance: checkbox;
+        }
     }
 </style>

src/xt_pages/user/evaluationtool/Muscleforce.vue

@@ -21,9 +21,7 @@
                                         <td class="start">0级</td>
                                         <td>
                                             <div class="jiange">
-                                              <el-checkbox-group v-model="checkList" :max="1">
-                                                <el-checkbox v-for="item in zhengyan" :label="item" :key="item"></el-checkbox>
-                                              </el-checkbox-group>
+                                                <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball"/>&nbsp; 肌肉完全不收缩</label>
                                             </div>
                                         </td>
                                     </tr>
@@ -32,9 +30,7 @@
                                         <td class="start">1级</td>
                                         <td>
                                             <div class="jiange">
-                                              <el-checkbox-group v-model="checkList1">
-                                                <el-checkbox v-for="item in yanyu" :label="item" :key="item"></el-checkbox>
-                                              </el-checkbox-group>
+                                                <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball" />&nbsp; 可见肌肉收缩但无肢体运动</label>
                                             </div>
                                         </td>
                                     </tr>
@@ -43,42 +39,42 @@
                                         <td class="start">2级</td>
                                         <td>
                                             <div class="jiange">
-                                              <el-checkbox-group v-model="checkList2">
-                                                <el-checkbox v-for="item in yundong" :label="item" :key="item"></el-checkbox>
-                                              </el-checkbox-group>
+                                                <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball"/>
+                                                    &nbsp;肢体能在床上移动，但不能抬离床面，即不能对抗地心引力
+                                                </label>
                                             </div>
                                         </td>
                                     </tr>
                                    
-                                    <tr class="bg_color">
+                                    <tr >
                                         <td class="start">3级</td>
                                         <td>
                                             <div class="jiange">
-                                              <el-checkbox-group v-model="checkList" :max="1">
-                                                <el-checkbox v-for="item in zhengyan" :label="item" :key="item"></el-checkbox>
-                                              </el-checkbox-group>
+                                                <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball" />
+                                                    &nbsp;肢体能抬离床面，克服地心引力做随意运动，但不能对抗外加阻力
+                                                </label>
                                             </div>
                                         </td>
                                     </tr>
                                     
-                                    <tr>
+                                    <tr class="bg_color">
                                         <td class="start">4级</td>
                                         <td>
                                             <div class="jiange">
-                                              <el-checkbox-group v-model="checkList1">
-                                                <el-checkbox v-for="item in yanyu" :label="item" :key="item"></el-checkbox>
-                                              </el-checkbox-group>
+                                                <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball" />
+                                                    &nbsp;能在一般的外加阻力下作运动，但力量较正常弱
+                                                </label>
                                             </div>
                                         </td>
                                     </tr>
                                    
-                                    <tr class="bg_color">
+                                    <tr>
                                         <td class="start">5级</td>
                                         <td>
                                             <div class="jiange">
-                                              <el-checkbox-group v-model="checkList2">
-                                                <el-checkbox v-for="item in yundong" :label="item" :key="item"></el-checkbox>
-                                              </el-checkbox-group>
+                                                <label style="font-size: 15px;"><input type="checkbox" name="ball" value="volleyball" />
+                                                    &nbsp;正常肌力
+                                                </label>
                                             </div>
                                         </td>
                                     </tr>
@@ -180,9 +176,6 @@ export default {
             input:'',
             options:[],
             tableData:[],
-            zhengyan:['自动睁眼(4分)','互换睁眼(3分)','刺激睁眼(2分)','无反应(1分)'],
-            yanyu:['正常(5分)','不准确回答问题(4分)','不恰当词句(3分)','不能理解的言语(2分)','无言语反映(1分)'],
-            yundong:['能按指令运动肢体(6分)','对刺痛能定位(5分)','对刺痛能躲避(4分)','刺痛肢体屈曲(3分)','刺痛肢体过伸(2分)','无反应(1分)'],
         }
     }
 }
@@ -228,5 +221,8 @@ export default {
             margin: 5px 0px 5px 20px;
             color: black;
         }
+        input{
+            -webkit-appearance: checkbox;
+        }
     }
 </style>

src/xt_pages/user/evaluationtool/mindAssessment.vue

@@ -23,9 +23,9 @@
                             <td class="start">心理评估</td>
                             <td>
                                 <div class="jiange">
-                                    <el-checkbox-group v-model="checkList" :max="1">
-                                        <el-checkbox v-for="item in xinli" :label="item" :key="item"></el-checkbox>
-                                    </el-checkbox-group>
+                                    <span v-for="item in xinli" class="rightjiange">
+                                        <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
+                                    </span>
                                 </div>
                             </td>
                         </tr>
@@ -34,7 +34,7 @@
                             <td>
                                 <div class="jiange">
                                     <el-radio-group v-model="radio1">
-                                        <el-radio v-for="(item,index ) in qingan" :label="item" :key="index">{{ item }}</el-radio>
+                                        <el-radio v-for="(item,index ) in qingan" :label="item" :key="index" style="color: black;font-size: 15px;">{{ item }}</el-radio>
                                     </el-radio-group>
                                 </div>
                             </td>                           
@@ -44,7 +44,7 @@
                             <td>
                                 <div  class="jiange">
                                     <el-radio-group v-model="radio2">
-                                    <el-radio v-for="(item,index ) in qingan" :label="item" :key="index">{{ item }}</el-radio>
+                                    <el-radio v-for="(item,index ) in qingan" :label="item" :key="index" style="color: black;font-size: 15px;">{{ item }}</el-radio>
                                     </el-radio-group>
                                 </div>
                             </td>
@@ -54,7 +54,7 @@
                             <td>
                                 <div  class="jiange">
                                     <el-radio-group v-model="radio3">
-                                    <el-radio v-for="(item,index ) in qingan" :label="item" :key="index">{{ item }}</el-radio>
+                                        <el-radio v-for="(item,index ) in qingan" :label="item" :key="index" style="color: black;font-size: 15px;">{{ item }}</el-radio>
                                     </el-radio-group>
                                 </div>
                             </td>
@@ -96,7 +96,6 @@
                 
             </div>
         </div>
-       
     </div>
 </template>
 <script>
@@ -154,10 +153,18 @@ export default {
             margin-left: 20px;
             color: black;
         }
+        .rightjiange{
+          margin-right: 40px;
+          font-size: 15px;
+        }
+        
         input{
             -webkit-appearance: checkbox;
         }
     }
+    .el-radio__label{
+        font-size: 15px !important;
+    }
     .bottoms{
         display: inline-block;
         margin-left: 10px;

src/xt_pages/user/evaluationtool/nourishmentAssessment.vue

@@ -28,12 +28,14 @@
                            
                             <td class="saoyang wenzi_color">
                                 营养需要量轻度增加：
-                                <el-checkbox-group v-model="checkList">
-                                    <el-checkbox v-for='item in qingdu' :label="item" :key="item"></el-checkbox>
-                                    <el-checkbox label="">
-                                        <el-input v-model="input" placeholder=""></el-input>
-                                    </el-checkbox>
-                                </el-checkbox-group> 
+                                <div >
+                                    <span v-for="item in qingdu" class="rightjiange">
+                                        <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
+                                    </span>
+                                    <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                        <el-input v-model="input" placeholder="" style="width: 120px;"></el-input>
+                                    </label>
+                                </div>
                             </td>                          
                         </tr>
                         <tr class="bg_color">
@@ -41,24 +43,28 @@
                            
                             <td class="saoyang wenzi_color">
                                 营养需要量中度增加：
-                                <el-checkbox-group v-model="checkList">
-                                    <el-checkbox v-for='item in zhdu' :label="item" :key="item"></el-checkbox>
-                                    <el-checkbox label="">
-                                        <el-input v-model="input" placeholder=""></el-input>
-                                    </el-checkbox>
-                                </el-checkbox-group> 
+                                <div >
+                                    <span v-for="item in zhdu" class="rightjiange">
+                                        <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
+                                    </span>
+                                    <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                        <el-input v-model="input" placeholder="" style="width: 120px;"></el-input>
+                                    </label>
+                                </div>
                             </td>
                         </tr>
                         <tr>
                             <td class="start">3级</td>
                             <td class="saoyang wenzi_color">
                                 营养需要量重度增加：
-                                <el-checkbox-group v-model="checkList">
-                                    <el-checkbox v-for='item in zhongsdu' :label="item" :key="item"></el-checkbox>
-                                    <el-checkbox label="">
-                                        <el-input v-model="input" placeholder=""></el-input>
-                                    </el-checkbox>
-                                </el-checkbox-group> 
+                                <div >
+                                    <span v-for="item in zhongsdu" class="rightjiange">
+                                        <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
+                                    </span>
+                                    <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                        <el-input v-model="input" placeholder="" style="width: 120px;"></el-input>
+                                    </label>
+                                </div>
                             </td>
                         </tr>
                         </tbody>
@@ -79,34 +85,57 @@
                         <tr>
                             <td class="start">1级</td>
                            
-                            <td class="saoyang">                              
-                                <el-checkbox-group v-model="checkList">
-                                    <el-checkbox label="3个月内体重下降>5%"></el-checkbox>
-                                    <el-checkbox label="一周内进食量较从前减少25%-50%"></el-checkbox>
-                                </el-checkbox-group> 
+                            <td class="saoyang">
+                                <div >
+                                    <span class="rightjiange">
+                                        <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                            3个月内体重下降>5%
+                                        </label>
+                                        <label style="margin-left: 40px;"><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                            一周内进食量较从前减少25%-50%
+                                        </label>
+                                    </span>
+                                    
+                                </div>                             
                             </td>                          
                         </tr>
                         <tr class="bg_color">
                             <td class="start">2级</td>
                             
                             <td class="saoyang">
-                                
-                                <el-checkbox-group v-model="checkList">
-                                    <el-checkbox label="2个月内体重下降>5%"></el-checkbox>
-                                    <el-checkbox label="一周内进食量较从前减少50%-75%"></el-checkbox>
-                                </el-checkbox-group>
-                               
+                                <div >
+                                    <span class="rightjiange">
+                                        <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                            2个月内体重下降>5%
+                                        </label>
+                                        <label style="margin-left: 40px;"><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                            一周内进食量较从前减少50%-75%
+                                        </label>
+                                    </span>
+                                    
+                                </div>  
                             </td>
                         </tr>
                         <tr>
                             <td class="start">3级</td>
-                            <td class="saoyang">                         
-                                <el-checkbox-group v-model="checkList">
-                                    <el-checkbox label="1个月内体重下降>5%"></el-checkbox>
-                                    <el-checkbox label="一周内进食量较从前减少75%-100%"></el-checkbox>
-                                    <el-checkbox label="体重指数（BMI）<18.5"></el-checkbox>
-                                    <el-checkbox label="血蛋白<30g/L（得不到准确的BNI值时用白蛋白替代）"></el-checkbox>
-                                </el-checkbox-group>
+                            <td class="saoyang"> 
+                                <div >
+                                    <span class="rightjiange">
+                                        <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                            1个月内体重下降>5%
+                                        </label>
+                                        <label style="margin-left: 40px;"><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                            一周内进食量较从前减少75%-100%
+                                        </label>
+                                        <label style="margin-left: 40px;"><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                            体重指数（BMI）<18.5
+                                        </label>
+                                        <label style="margin-left: 40px;"><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                            血蛋白<30g/L（得不到准确的BNI值时用白蛋白替代）
+                                        </label>
+                                    </span>
+                                    
+                                </div>                          
                             </td>
                         </tr>
                         </tbody>
@@ -121,11 +150,11 @@
                         <tbody>
                             <tr class="bg_color ">
                                 <td class="start yingyang">0级</td>
-                                <td class="saoyang wenzi_color">≤70岁</td>
+                                <td class="saoyang" style="font-size: 15px;">≤70岁</td>
                             </tr>
                             <tr>
                                 <td class="start yingyang">1级</td>
-                                <td class="saoyang wenzi_color">＞70岁</td>                          
+                                <td class="saoyang" style="font-size: 15px;">＞70岁</td>                          
                             </tr>
                        
                         </tbody>
@@ -227,9 +256,9 @@ export default {
             margin-left: 20px;
             color: black;
         }
-        .wenzi_color{
-            color: #606266;
-            font-size: 14px;
+        .rightjiange{
+          margin-right: 40px;
+          font-size: 15px;
         }
         input{
             -webkit-appearance: checkbox;

src/xt_pages/user/evaluationtool/pruritusAssessment.vue

@@ -25,9 +25,12 @@
                             <td class="start">痒的部位</td>
                             <td>
                                 <div class="jiange">
-                                    <el-checkbox-group v-model="checkList" :max="3">
-                                        <el-checkbox v-for="item in buwei" :label="item" :key="item"></el-checkbox>
-                                    </el-checkbox-group>
+                                    <span v-for="item in buwei" class="rightjiange">
+                                        <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;{{ item }}</label>
+                                    </span> 
+                                    <label><input type="checkbox" name="ball" value="volleyball" />
+                                        &nbsp;其他 <el-input v-model="input" style="width: 100px;"></el-input>
+                                    </label>
                                 </div>
                             </td>
                             <td class="start">0</td>
@@ -38,7 +41,7 @@
                             <td>
                                 <div class="jiange">
                                     <el-radio-group v-model="radio1">
-                                        <el-radio v-for="(item,index ) in chengdu" :label="item" :key="index">{{ item }}</el-radio>
+                                        <el-radio v-for="(item,index ) in chengdu" :label="item" :key="index" style="color: black;font-size: 15PX;">{{ item }}</el-radio>
                                     </el-radio-group>
                                 </div>
                             </td> 
@@ -50,7 +53,7 @@
                             <td>
                                 <div  class="jiange">
                                     <el-radio-group v-model="radio2">
-                                    <el-radio v-for="(item,index ) in pinlv" :label="item" :key="index">{{ item }}</el-radio>
+                                        <el-radio v-for="(item,index ) in pinlv" :label="item" :key="index" style="color: black;font-size: 15PX;">{{ item }}</el-radio>
                                     </el-radio-group>
                                 </div>
                             </td>
@@ -62,7 +65,7 @@
                             <td>
                                 <div  class="jiange">
                                     <el-radio-group v-model="radio3">
-                                    <el-radio v-for="(item,index ) in yingxiang" :label="item" :key="index">{{ item }}</el-radio>
+                                        <el-radio v-for="(item,index ) in yingxiang" :label="item" :key="index" style="color: black;font-size: 15PX;">{{ item }}</el-radio>
                                     </el-radio-group>
                                 </div>
                             </td>
@@ -130,10 +133,14 @@ export default {
             radio1:'',
             radio2:'',
             radio3:'',
-            buwei:['躯体','上肢','下肢','头皮','全身',"其他"],
+            input:'',
+            buwei:['躯体','上肢','下肢','头皮','全身'],
             chengdu:['不要抓(1)','要抓但没有抓痕(2)','抓出抓痕才能止痒(3)','经常抓出抓痕(4)','完全坐立不安(5)'],
             pinlv:['很少时候(1)','较少时候(2)','较多时候(3)','很多时候(4)','一直持续(5)'],
-            yingxiang:['无影响(0)','一夜痒醒一次(2)','一夜痒醒两次(4)','一夜痒醒三次(6)']
+            yingxiang:['无影响(0)','一夜痒醒一次(2)','一夜痒醒两次(4)','一夜痒醒三次(6)'],
+            options:[],
+            value:'',
+            value1:'',
         }
     }
 }
@@ -170,6 +177,10 @@ export default {
             margin-left: 20px;
             color: black;
         }
+        .rightjiange{
+          margin-right: 40px;
+          font-size: 15px;
+        }
         input{
             -webkit-appearance: checkbox;
         }

src/xt_pages/workforce/components/tableData.vue

@@ -1379,9 +1379,9 @@ export default {
             }
           }
         } else {
-          if(column.label == '晚' ){
-            return 'evening_border'
-          }
+          // if(column.label == '晚' ){
+          //   return 'evening_border'
+          // }
         }
       }
       return "";

src/xt_pages/workforce/scheduleTablePrint.vue

@@ -1,10 +1,8 @@
 <template>
     <div>
-      
       <el-button style="float:right;" type="primary" @click="printAction">打印</el-button>
 
 <!--      <el-button type="primary" @click="printAction">打印</el-button>-->
-      <div class="print_main_content">
         <table v-if="$route.query.week_date ==''" id="scheduleTable" class="scheduleTable" border="1" cellspacing="0">
             <tr>
                 <td rowspan="2">分区</td>
@@ -16,7 +14,7 @@
                 <td colspan="3">周五({{ weekTitle[4] }})</td>
                 <td colspan="3">周六({{ weekTitle[5] }})</td>
                 <td colspan="3">周日({{ weekTitle[6] }})</td>
-                <td rowspan="2">总数</td>
+                <td>总数</td>
             </tr>
             <tr>
                 <td>上午</td>
@@ -42,144 +40,141 @@
                 <td>晚上</td>
             </tr>
             <tr v-for="(item,index) in scheduleZone" :key="index">
-                <td style="min-width:40px;">{{ item.area }}</td>
-                <td style="min-width:40px;">{{ item.cut }}</td>
-                <td style="min-width:40px;">
+                <td style="min-width:50px;">{{ item.area }}</td>
+                <td style="min-width:50px;">{{ item.cut }}</td>
+                <td style="min-width:50px;">
                     <span v-if="item.Mon_M.patient_id">
-                        <span>{{ item.Mon_M.patient }}</span>
-                        <span v-if="item.Mon_M.mode_name != 'HD'">{{ item.Mon_M.mode_name }}</span>
+                        <div>{{ item.Mon_M.patient }} </div>
+                        <div v-if="item.Mon_M.mode_name != 'HD'">
+                            {{ item.Mon_M.mode_name }}
+                     </div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
+                <td style="min-width:50px;">
                     <span v-if="item.Mon_A.patient_id">
-                       
-                        <span>{{ item.Mon_A.patient }}</span>
-                        <span v-if="item.Mon_A.mode_name != 'HD'">{{ item.Mon_A.mode_name }}</span>
+                        <div>{{ item.Mon_A.patient }} </div>
+                        <div v-if="item.Mon_A.mode_name != 'HD'">{{ item.Mon_A.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
+                <td style="min-width:50px;">
                     <span v-if="item.Mon_N.patient_id">
-                        
-                        <span>{{ item.Mon_N.patient }}</span>
-                        <span v-if="item.Mon_N.mode_name != 'HD'">{{ item.Mon_N.mode_name }}</span>
+                        <div>{{ item.Mon_N.patient }}</div>
+                        <div v-if="item.Mon_N.mode_name != 'HD'">{{ item.Mon_N.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
+                <td style="min-width:50px;">
                     <span v-if="item.Tue_M.patient_id">
-                        
-                        <span>{{ item.Tue_M.patient }}</span>
-                        <span  v-if="item.Tue_M.mode_name != 'HD'">{{ item.Tue_M.mode_name }}</span>
+                        <div>{{ item.Tue_M.patient }}</div>
+                        <div v-if="item.Tue_M.mode_name != 'HD'">{{ item.Tue_M.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
+                <td style="min-width:50px;">
                     <span v-if="item.Tue_A.patient_id">
-                        
-                        <span>{{ item.Tue_A.patient }}</span>
-                        <span  v-if="item.Tue_A.mode_name != 'HD'">{{ item.Tue_A.mode_name }}</span>
+                        <div>{{ item.Tue_A.patient }}</div>
+                        <div v-if="item.Tue_A.mode_name != 'HD'">{{ item.Tue_A.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
+                <td style="min-width:50px;">
                     <span v-if="item.Tue_N.patient_id">
-                        
-                        <span>{{ item.Tue_N.patient }}</span>
-                        <span v-if="item.Tue_N.mode_name != 'HD'">{{ item.Tue_N.mode_name }}</span>
+                        <div>{{ item.Tue_N.patient }}</div>
+                        <div v-if="item.Tue_N.mode_name != 'HD'">{{ item.Tue_N.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
+                <td style="min-width:50px;">
                     <span v-if="item.Wed_M.patient_id">
-                        
-                        <span>{{ item.Wed_M.patient }}</span>
-                        <span v-if="item.Wed_M.mode_name != 'HD'">{{ item.Wed_M.mode_name }}</span>
+                        <div>{{ item.Wed_M.patient }}</div>
+                        <div v-if="item.Wed_M.mode_name != 'HD'">{{ item.Wed_M.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
+                <td style="min-width:50px;">
                     <span v-if="item.Wed_A.patient_id">
-                        <span>{{ item.Wed_A.patient }}</span>
-                        <span v-if="item.Wed_A.mode_name != 'HD'">{{ item.Wed_A.mode_name }}</span>
+                        <div>{{ item.Wed_A.patient }}</div>
+                        <div v-if="item.Wed_A.mode_name != 'HD'">{{ item.Wed_A.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
+                <td style="min-width:50px;">
                     <span v-if="item.Wed_N.patient_id">
-                        <span>{{ item.Wed_N.patient }}</span>
-                        <span v-if="item.Wed_N.mode_name != 'HD'">{{ item.Wed_N.mode_name }}</span>
+                        <div>{{ item.Wed_N.patient }}</div>
+                        <div v-if="item.Wed_N.mode_name != 'HD'">{{ item.Wed_N.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
-                    <span v-if="item.Thurs_M.patient_id">     
-                        <span>{{ item.Thurs_M.patient }}</span>
-                        <span  v-if="item.Thurs_M.mode_name != 'HD'">{{ item.Thurs_M.mode_name }}</span>
+                <td style="min-width:50px;">
+                    <span v-if="item.Thurs_M.patient_id">
+                        <div>{{ item.Thurs_M.patient }}</div>
+                        <div v-if="item.Thurs_M.mode_name != 'HD'">{{ item.Thurs_M.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
-                    <span v-if="item.Thurs_A.patient_id">                   
-                        <span>{{ item.Thurs_A.patient }}</span>
-                        <span v-if="item.Thurs_A.mode_name != 'HD'">{{ item.Thurs_A.mode_name }}</span>
+                <td style="min-width:50px;">
+                    <span v-if="item.Thurs_A.patient_id">
+                        <div>{{ item.Thurs_A.patient }}</div>
+                        <div v-if="item.Thurs_A.mode_name != 'HD'">{{ item.Thurs_A.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
-                    <span v-if="item.Thurs_N.patient_id">           
-                        <span>{{ item.Thurs_N.patient }}</span>
-                        <span  v-if="item.Thurs_N.mode_name != 'HD'">{{ item.Thurs_N.mode_name }}</span>
+                <td style="min-width:50px;">
+                    <span v-if="item.Thurs_N.patient_id">
+                        <div>{{ item.Thurs_N.patient }}</div>
+                        <div v-if="item.Thurs_N.mode_name != 'HD'">{{ item.Thurs_N.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
-                    <span v-if="item.Fri_M.patient_id">                  
-                        <span>{{ item.Fri_M.patient }}</span>
-                        <span v-if="item.Fri_M.mode_name != 'HD'">{{ item.Fri_M.mode_name }}</span>
+                <td style="min-width:50px;">
+                    <span v-if="item.Fri_M.patient_id">
+                        <div>{{ item.Fri_M.patient }}</div>
+                        <div v-if="item.Fri_M.mode_name != 'HD'">{{ item.Fri_M.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
-                    <span v-if="item.Fri_A.patient_id">                     
-                        <span>{{ item.Fri_A.patient }}</span>
-                        <span v-if="item.Fri_A.mode_name != 'HD'">{{ item.Fri_A.mode_name }}</span>
+                <td style="min-width:50px;">
+                    <span v-if="item.Fri_A.patient_id">
+                        <div>{{ item.Fri_A.patient }}</div>
+                        <div v-if="item.Fri_A.mode_name != 'HD'">{{ item.Fri_A.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
-                    <span v-if="item.Fri_N.patient_id">                      
-                        <span>{{ item.Fri_N.patient }}</span>
-                        <span v-if="item.Fri_N.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</span>
+                <td style="min-width:50px;">
+                    <span v-if="item.Fri_N.patient_id">
+                        <div>{{ item.Fri_N.patient }}</div>
+                        <div v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
-                    <span v-if="item.Sat_M.patient_id">                      
-                        <span>{{ item.Sat_M.patient }}</span>
-                        <span  v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</span>
+                <td style="min-width:50px;">
+                    <span v-if="item.Sat_M.patient_id">
+                        <div>{{ item.Sat_M.patient }}</div>
+                        <div v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
-                    <span v-if="item.Sat_A.patient_id">                       
-                        <span>{{ item.Sat_A.patient }}</span>
-                        <span v-if="item.Sat_A.mode_name != 'HD'">{{ item.Sat_A.mode_name }}</span>
+                <td style="min-width:50px;">
+                    <span v-if="item.Sat_A.patient_id">
+                        <div>{{ item.Sat_A.patient }}</div>
+                        <div v-if="item.Sat_A.mode_name != 'HD'">{{ item.Sat_A.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
+                <td style="min-width:50px;">
                     <span v-if="item.Sat_N.patient_id">
-                        <span>{{ item.Sat_N.patient }}</span>
-                        <span v-if="item.Sat_N.mode_name != 'HD'">{{ item.Sat_N.mode_name }}</span>
+                        <div>{{ item.Sat_N.patient }}</div>
+                        <div v-if="item.Sat_N.mode_name != 'HD'">{{ item.Sat_N.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
+                <td style="min-width:50px;">
                     <span v-if="item.Sun_M.patient_id">
-                        <span>{{ item.Sun_M.patient }}</span>
-                        <span v-if="item.Sun_M.mode_name != 'HD'">{{ item.Sun_M.mode_name }}</span>
+                        <div>{{ item.Sun_M.patient }}</div>
+                        <div v-if="item.Sun_M.mode_name != 'HD'">{{ item.Sun_M.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
+                <td style="min-width:50px;">
                     <span v-if="item.Sun_A.patient_id">
-                        <span>{{ item.Sun_A.patient }}</span>
-                        <span v-if="item.Sun_A.mode_name != 'HD'">{{ item.Sun_A.mode_name }}</span>
+                        <div>{{ item.Sun_A.patient }}</div>
+                        <div v-if="item.Sun_A.mode_name != 'HD'">{{ item.Sun_A.mode_name }}</div>
                     </span>
                 </td>
-                <td style="min-width:40px;">
+                <td style="min-width:50px;">
                     <span v-if="item.Sun_N.patient_id">
-                        <span>{{ item.Sun_N.patient }}</span>
-                        <span v-if="item.Sun_N.mode_name != 'HD'">{{ item.Sun_N.mode_name }}</span>
+                        <div>{{ item.Sun_N.patient }}</div>
+                        <div v-if="item.Sun_N.mode_name != 'HD'">{{ item.Sun_N.mode_name }}</div>
                     </span>
                 </td>
                 <td>{{item.total}}</td>
             </tr>
         </table>
-        <!-- 选择天数打印 -->
+
+         <!-- 选择天数打印 -->
         <table 
             v-if="$route.query.week_date !=''" 
             id="scheduleTable" class="scheduleTable" 
@@ -209,136 +204,135 @@
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周一'">
                     <span v-if="item.Mon_M.patient_id ">
                         <span>{{ item.Mon_M.patient }}</span>
-                        <span>{{ item.Mon_M.mode_name }}</span>
+                        <span v-if="item.Mon_M.mode_name != 'HD'">{{ item.Mon_M.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周一'">
                     <span v-if="item.Mon_A.patient_id ">
                         <span>{{ item.Mon_A.patient }}</span>
-                        <span>{{ item.Mon_A.mode_name }}</span>
+                        <span v-if="item.Mon_A.mode_name != 'HD'">{{ item.Mon_A.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周一'">
                     <span v-if="item.Mon_N.patient_id ">
                         <span>{{ item.Mon_N.patient }}</span>
-                        <span>{{ item.Mon_N.mode_name }}</span>
+                        <span v-if="item.Mon_N.mode_name != 'HD'">{{ item.Mon_N.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周二'">
                     <p v-if="item.Tue_M.patient_id">
                         <span>{{ item.Tue_M.patient }}</span>
-                        <span>{{ item.Tue_M.mode_name }}</span>
+                        <span v-if="item.Tue_M.mode_name != 'HD'">{{ item.Tue_M.mode_name }}</span>
                     </p>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周二'">
                     <span v-if="item.Tue_A.patient_id ">
                         
                         <span>{{ item.Tue_A.patient }}</span>
-                        <span>{{ item.Tue_A.mode_name }}</span>
+                        <span v-if="item.Tue_A.mode_name != 'HD'">{{ item.Tue_A.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周二'">
                     <span v-if="item.Tue_N.patient_id ">
                         
                         <span>{{ item.Tue_N.patient }}</span>
-                        <span>{{ item.Tue_N.mode_name }}</span>
+                        <span v-if="item.Tue_N.mode_name != 'HD'">{{ item.Tue_N.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周三'">
                     <span v-if="item.Wed_M.patient_id ">
                         
                         <span>{{ item.Wed_M.patient }}</span>
-                        <span>{{ item.Wed_M.mode_name }}</span>
+                        <span v-if="item.Wed_M.mode_name != 'HD'">{{ item.Wed_M.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周三'">
                     <span v-if="item.Wed_A.patient_id ">
                         <span>{{ item.Wed_A.patient }}</span>
-                        <span>{{ item.Wed_A.mode_name }}</span>
+                        <span v-if="item.Wed_A.mode_name != 'HD'">{{ item.Wed_A.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周三'">
                     <span v-if="item.Wed_N.patient_id ">
                         <span>{{ item.Wed_N.patient }}</span>
-                        <span>{{ item.Wed_N.mode_name }}</span>
+                        <span v-if="item.Wed_N.mode_name != 'HD'">{{ item.Wed_N.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周四'">
                     <span v-if="item.Thurs_M.patient_id ">     
                         <span>{{ item.Thurs_M.patient }}</span>
-                        <span>{{ item.Thurs_M.mode_name }}</span>
+                        <span v-if="item.Thurs_M.mode_name != 'HD'">{{ item.Thurs_M.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周四'">
                     <span v-if="item.Thurs_A.patient_id ">                   
                         <span>{{ item.Thurs_A.patient }}</span>
-                        <span>{{ item.Thurs_A.mode_name }}</span>
+                        <span v-if="item.Thurs_A.mode_name != 'HD'">{{ item.Thurs_A.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周四'">
                     <span v-if="item.Thurs_N.patient_id ">           
                         <span>{{ item.Thurs_N.patient }}</span>
-                        <span>{{ item.Thurs_N.mode_name }}</span>
+                        <span v-if="item.Thurs_N.mode_name != 'HD'">{{ item.Thurs_N.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周五'">
                     <span v-if="item.Fri_M.patient_id">                  
                         <span>{{ item.Fri_M.patient }}</span>
-                        <span>{{ item.Fri_M.mode_name }}</span>
+                        <span v-if="item.Fri_M.mode_name != 'HD'">{{ item.Fri_M.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周五'">
                     <span v-if="item.Fri_A.patient_id ">                     
                         <span>{{ item.Fri_A.patient }}</span>
-                        <span>{{ item.Fri_A.mode_name }}</span>
+                        <span v-if="item.Fri_A.mode_name != 'HD'">{{ item.Fri_A.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周五'">
                     <span v-if="item.Fri_N.patient_id ">                      
                         <span>{{ item.Fri_N.patient }}</span>
-                        <span>{{ item.Sat_M.mode_name }}</span>
+                        <span v-if="item.Fri_N.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周六'">
                     <span v-if="item.Sat_M.patient_id ">                      
                         <span>{{ item.Sat_M.patient }}</span>
-                        <span>{{ item.Sat_M.mode_name }}</span>
+                        <span v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周六'">
                     <span v-if="item.Sat_A.patient_id ">                       
                         <span>{{ item.Sat_A.patient }}</span>
-                        <span>{{ item.Sat_A.mode_name }}</span>
+                        <span v-if="item.Sat_A.mode_name != 'HD'">{{ item.Sat_A.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周六'">
                     <span v-if="item.Sat_N.patient_id ">
                         <span>{{ item.Sat_N.patient }}</span>
-                        <span>{{ item.Sat_N.mode_name }}</span>
+                        <span v-if="item.Sat_N.mode_name != 'HD'">{{ item.Sat_N.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周日'">
                     <span v-if="item.Sun_M.patient_id ">
                         <span>{{ item.Sun_M.patient }}</span>
-                        <span>{{ item.Sun_M.mode_name }}</span>
+                        <span v-if="item.Sun_M.mode_name != 'HD'">{{ item.Sun_M.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周日'">
                     <span v-if="item.Sun_A.patient_id ">
                         <span>{{ item.Sun_A.patient }}</span>
-                        <span>{{ item.Sun_A.mode_name }}</span>
+                        <span v-if="item.Sun_A.mode_name != 'HD'">{{ item.Sun_A.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周日'">
                     <span v-if="item.Sun_N.patient_id ">
                         <span>{{ item.Sun_N.patient }}</span>
-                        <span>{{ item.Sun_N.mode_name }}</span>
+                        <span v-if="item.Sun_N.mode_name != 'HD'">{{ item.Sun_N.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:60px;">{{item.total}}</td>
             </tr>
         </table>
-      </div>
     </div>
 </template>
 
@@ -364,7 +358,6 @@ export default {
             scheduleZoneRow: [],
             partitions: {},
             theWeek: {
-              historyWeek: 0,
               lastWeek: 0,
               thisWeek: 0,
               nextWeek: 0,
@@ -384,7 +377,7 @@ export default {
         this.partition_id = this.$route.query.partition_id
         var newList = []
         var arr =  this.$route.query.week_date
-        console.log('1234325431',this.$route.query);
+
         if(arr!=""){
           var newArr = arr.split(",")
 
@@ -418,13 +411,14 @@ export default {
 
         }else{
              newList = [1,2,3,4,5,6,7]
+
             this.week_date = newList.join(",")
 
         }
 
     },
     methods:{
-        getAllZones(){
+         getAllZones(){
            getAllZones().then(response=>{
              if(response.data.state == 1){
                 var zones = response.data.data.zones
@@ -460,7 +454,6 @@ export default {
                 }
                 var partitions = response.data.data.partitions
                 console.log("分区",partitions)
-                this.theWeek.historyWeek = this.theWeek.thisWeek - 2 
                 this.theWeek.thisWeek = response.data.data.theWeek
                 this.theWeek.lastWeek = this.theWeek.thisWeek - 1
                 this.theWeek.nextWeek = this.theWeek.thisWeek + 1
@@ -640,9 +633,6 @@ export default {
         },
         getSchedules() {
             var theType = 2;
-            if(this.$route.query.weekTime == "historyWeek"){
-                theType =0
-            }
             if(this.$route.query.weekTime == "lastWeek"){
                theType = 1
             }
@@ -847,6 +837,7 @@ export default {
                     });
                     var newArr= [{"area":"总数","cut":0,"Fri_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Fri_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Fri_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Mon_A":{mode_id:0,mode_name:"",patient:"",patient_id:"1"},"Mon_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Mon_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sat_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Sun_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Thurs_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Tue_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_A":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_M":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"Wed_N":{mode_id:0,mode_name:"",patient:"0",patient_id:"1"},"jihao_id":"","total":"","zone_id":"","zone_type":"","sort":""}]
 
+
                      for(let i=0;i<newArr.length;i++){
                        for(let j=0;j<this.scheduleCountList.length;j++){
                             newArr[i].cut = this.total
@@ -1020,8 +1011,8 @@ export default {
             return [weekArr[week], typeArr[schedule_type]];
         },
         printAction: function() {
-            const style = '@media print { #scheduleTable{font-size:14px;} .scheduleTable tr td{text-align: center;padding: 5px 0px;min-width:40px;}}'
-            // const style = '@media print { #scheduleTable{font-size:14px;} .scheduleTable tr td{text-align: center;padding: 5px;min-width:40px;}}'
+            const style = '@media print {#scheduleTable{font-size:16px;} .scheduleTable tr td{text-align: center;padding: 5px;}}'
+
             printJS({
             printable: 'scheduleTable',
             type: 'html',
@@ -1032,9 +1023,6 @@ export default {
         },
         getPatientSheduleCount(){
             var theType = 2;
-            if(this.$route.query.weekTime == "historyWeek"){
-                theType =0
-            }
             if(this.$route.query.weekTime == "lastWeek"){
                theType = 1
             }
@@ -1066,7 +1054,7 @@ export default {
                if(response.data.state == 1){
                   var list = response.data.data.list
                   console.log("list22222",list)
-                    console.log('asdfgfffffff',response.data.data);
+
                   this.scheduleCountList = list
                   var total = response.data.data.total
                   console.log("totalw222",total)
@@ -1086,11 +1074,7 @@ export default {
 </script>
 
 
-<style lang="scss" scoped>
-// .print_main_content{
-//     width: 960px;
-//     margin: 0 auto;
-// }
+<style lang="scss">
 td{
     text-align: center;
     padding: 5px;