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

src/api/advice.js

@@ -583,4 +583,22 @@ export function getNewLongSchedualDoctors(params){
     method: 'get',
     params: params
   })
+}
+
+export function getPatientsByName(params){
+   
+  return request({
+    url:"/api/schedule/getpatientbyname",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getDocAdviceByPatientId(params){
+  
+  return request({
+    url:"/api/schedule/getdocadvicebypatientid",
+    method:"get",
+    params:params,
+  })
 }

src/api/role/admin.js

@@ -276,18 +276,18 @@ export function getEnterPriseDetail(params){
 }
 
 export function UploadPrintOrder(data){
-  
+  console.log("DATAOWOWOWOW",data)
   return request({
     url:"/api/device/uploadprintorder",
-    method:"Post",
+    method:"post",
     data:data,
   })
 }
 
-export function CreateQianshuUserName(data){
+export function CreateQianshuUserName(admin_user_id,data){
   
   return request({
-    url:"/api/device/createqianshuusername",
+    url:"/api/device/createqianshuusername?admin_user_id="+admin_user_id,
     method:"Post",
     data:data,
   })

src/api/stock.js

@@ -273,9 +273,9 @@ export function getWarehouseOutInfoList(params) {
   })
 }
 
-export function postWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type, storehouse_id) {
+export function postWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type, storehouse_id,warehouseOut_id) {
   return request({
-    url: '/api/warehouseout/create?warehousing_out_time=' + warehousing_time + '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type + '&storehouse_id=' + storehouse_id,
+    url: '/api/warehouseout/create?warehousing_out_time=' + warehousing_time + '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type + '&storehouse_id=' + storehouse_id+"&warehouseOut_id="+warehouseOut_id,
     method: 'post',
     data: params
   })

src/router/modules/dialysis.js

@@ -56,6 +56,15 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/patientDoctorAdvice',
+      component: () => import('@/xt_pages/dialysis/patientDoctorAdvice'),
+      name: '医嘱统计',
+      meta: {
+        title: '医嘱统计',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/longDoctorAdvice',
       component: () => import('@/xt_pages/dialysis/longDoctorAdvice'),

src/router/modules/workforce.js

@@ -143,6 +143,18 @@ export default {
       noCache: true
     }
   },
+  // id 10469
+  {
+    path: '/schedule/remind/print/setting/two',
+    component: () => import('@/xt_pages/workforce/remind_print_setting_two'),
+    name: 'remind_print_setting_two',
+    hidden: true,
+    is_menu: false,
+    meta: {
+      title: 'remind_print_setting_two',
+      noCache: true
+    }
+  },
   {
     path: '/scheduleTablePrint',
     component: () => import('@/xt_pages/workforce/scheduleTablePrint'),

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -48,7 +48,7 @@
               岁
             </div>
             <div class="inline_block" style="margin-left: 25px">
-              科室：
+              科室22：
               <check-box
                 text="门诊透析"
                 :checked="record.patient.source == 1"
@@ -662,17 +662,14 @@
                     <div class="row" style="padding: 2px 0;">
                       <div class="inline_block">
                         抗凝方式：
-                        <check-box
-                          text="普通肝素"
-                          :checked="
-                            isCheckBoxChecked(
-                              record.prescription,
-                              'anticoagulant',
-                              2
-                            )
-                          "
-                        ></check-box>
+                        <check-box text="普通肝素" :checked="isCheckBoxChecked(record.prescription,'anticoagulant',2)"></check-box>
+                        <check-box text="肝素钙注射液" :checked="isCheckBoxChecked(record.prescription,'anticoagulant',14)"></check-box>
                         （ 首剂
+                        <div class="under_line" style="width: 50px;">
+                          {{isCheckBoxChecked( record.prescription,"anticoagulant",2)? record.prescription.anticoagulant_shouji: ""}}
+                          {{isCheckBoxChecked( record.prescription,"anticoagulant",14)? record.prescription.anticoagulant_shouji: ""}}
+                        </div>
+                        mg&nbsp; 维持
                         <div class="under_line" style="width: 50px;">
                           {{
                             isCheckBoxChecked(
@@ -680,17 +677,14 @@
                               "anticoagulant",
                               2
                             )
-                              ? record.prescription.anticoagulant_shouji
+                              ? record.prescription.anticoagulant_weichi
                               : ""
                           }}
-                        </div>
-                        mg&nbsp; 维持
-                        <div class="under_line" style="width: 50px;">
                           {{
                             isCheckBoxChecked(
                               record.prescription,
                               "anticoagulant",
-                              2
+                              14
                             )
                               ? record.prescription.anticoagulant_weichi
                               : ""
@@ -734,7 +728,7 @@
                             "
                           ></check-box>
                         </span>
-                        <div class="under_line" style="width: 40px;">
+                        <div class="under_line" style="width: 50px;">
                           <span v-if="record.prescription.anticoagulant == 3"
                             >{{
                               isCheckBoxChecked(
@@ -768,6 +762,17 @@
                                 : ""
                             }}
                           </span>
+                          <span v-if="record.prescription.anticoagulant == 14"
+                            >{{
+                              isCheckBoxChecked(
+                                record.prescription,
+                                "anticoagulant",
+                                14
+                              )
+                                ? record.prescription.anticoagulant_zongliang
+                                : ""
+                            }}
+                          </span>
                         </div>
                         IU
                         <check-box
@@ -1476,7 +1481,9 @@
                         "
                       ></check-box>
                       （ 科室
-                      <div class="under_line" style="width: 200px;"></div>
+                      <div class="under_line" style="width: 200px;">
+                        {{ record.assessment_after_dislysis.inpatient_department }}
+                      </div>
                       交待病房护士/患者/陪人观察内容：
                       <check-box
                         text="意识状态"

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyThree.vue

@@ -848,6 +848,7 @@
                         :src="setAdminUserES(advice[0]&&advice[0].execution_staff)"
                         alt=""
                         srcset=""
+                        v-else
                       />
                     </td>
                     <td style="line-height: 30px" width="90">

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1489,11 +1489,22 @@
                             }}
                           </td>
                           <td>
-                            {{
+                            <span v-if="org_id ==10551">
+                              {{
                               monitor_record.venous_pressure
                                 ? monitor_record.venous_pressure
                                 : "/"
-                            }}
+                              }}
+                            </span>
+
+                            <span v-if="org_id !=10551">
+                              {{
+                              monitor_record.venous_pressure
+                                ? monitor_record.venous_pressure
+                                : ""
+                              }}
+                            </span>
+                           
                           </td>
                           <td>
                             {{

src/xt_pages/dialysis/details/index.vue

@@ -459,10 +459,10 @@
             <div style="border: 1px solid black;width: 82%;"  >
               <div style="margin: 5px 0;">
                 <span style="font-weight: bolder;">{{main_collection.patient.name}} </span>&nbsp;&nbsp;
+                 
+                <span>
                   <span v-if="main_collection.patient.gender==1">男</span>
                   <span v-if="main_collection.patient.gender==2">女</span>
-                <span>
-
                 </span>&nbsp;&nbsp;
                 <span>{{getNewAge(main_collection.patient.id_card_no)  }}岁</span>&nbsp;&nbsp;<span>{{getTimes(main_collection.schedule_date)}}</span>&nbsp;&nbsp;
                 <span></span>
@@ -489,7 +489,7 @@
               </div>
               <div style="display: flex;margin: 5px 0;">
                 <div style="flex: 1;">血流量:{{main_collection.prescription.blood_flow_volume}}ml/min</div>
-                <div style="flex: 1;">置换液总量:{{main_collection.prescription.displace_liqui_value}}L</div>
+                <div style="flex: 1;">置换液总量:<span v-if="main_collection.prescription.displace_liqui_value>0">{{main_collection.prescription.displace_liqui_value}}</span>L</div>
               </div>
               <div style="margin: 5px 0;">
                 <div>透析液类型:

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -110,7 +110,8 @@
           org_template_info.template_id == 50 ||
           org_template_info.template_id == 52 ||
           org_template_info.template_id == 53  ||
-          org_template_info.template_id == 64 )
+          org_template_info.template_id == 64 ||
+          org_template_info.template_id == 199 )
         "
       >
       <div>
@@ -1309,6 +1310,12 @@
             v-if="org_template_info.template_id == 68"
           >
           </DialysisPrintOrderSixtyeight>
+
+          <DialysisPrintOrderZero
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 199"
+          >
+          </DialysisPrintOrderZero>
         </div>
       </el-container>
     </div>
@@ -1395,6 +1402,7 @@ import DialysisPrintOrderSixtyFive from "./template/DialysisPrintOrderSixtyFive.
 import DialysisPrintOrderSixtysix from './template/DialysisPrintOrderSixtysix.vue'
 import DialysisPrintOrdersixtySeven from './template/DialysisPrintOrdersixtySeven.vue'
 import DialysisPrintOrderSixtyeight from './template/DialysisPrintOrderSixtyeight.vue'
+import DialysisPrintOrderZero from './template/DialysisPrintOrderZero.vue'
 export default {
   name: "dialysisPrintOrder",
   components: {
@@ -1466,6 +1474,7 @@ export default {
     DialysisPrintOrderSixtyFive,
     DialysisPrintOrderSixtysix,
     DialysisPrintOrderSixtyeight,
+    DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
     // DialysisPrintOrderSixtyFive
@@ -2016,15 +2025,14 @@ export default {
           style: style2,
           scanStyles: false,
         });
-      }else if (
-        this.org_template_info.template_id == 64
-      ) {
+      }else if (this.org_template_info.template_id == 64 ) {
         printJS({
           printable: "dialysis-print-box-64",
           type: "html",
           style: style12,
           scanStyles: false,
         });
+        console.log("printjswowoowowowwoow",style12)
 
       }else if (this.org_template_info.template_id == 65 || this.org_template_info.template_id == 6) {
         printJS({
@@ -2043,7 +2051,6 @@ export default {
         });
       }
       else if (this.org_template_info.template_id == 68 ) {
-        console.log('6666',this.org_template_info.template_id);
         printJS({
           printable: "dialysis-print-box-1",
           type: "html",
@@ -2090,6 +2097,15 @@ export default {
           style: style2,
           scanStyles: false,
         });
+      }else if (this.org_template_info.template_id == 199 ) {
+        printJS({
+          printable: "dialysis-print-box-64",
+          type: "html",
+          style: style12,
+          scanStyles: false,
+        });
+       
+
       }
     },
     printThisOnePage() {
@@ -2210,13 +2226,22 @@ export default {
           scanStyles: false,
         });
       } else if (this.org_template_info.template_id == 53 ) {
-        console.log("进来233232323232")
+       
         printJS({
           printable: "dialysis-print-box-1-2",
           type: "html",
           style: style93,
           scanStyles: false,
         });
+      }else if (this.org_template_info.template_id == 199 ) {
+        printJS({
+          printable: "dialysis-print-box-64",
+          type: "html",
+          style: style12,
+          scanStyles: false,
+        });
+       
+
       }
     },
 
@@ -2255,7 +2280,7 @@ export default {
       return name;
     },
     setAdminUserES(id) {
-      console.log(id);
+      // console.log(id);
       if (id == 0) {
         return "";
       }
@@ -2277,7 +2302,7 @@ export default {
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.childResponse = response;
-          console.log('this.org_template_info是数据',response.data.data);
+          // console.log('this.org_template_info是数据',response.data.data.org_template_info.template_id);
           this.org_template_info = response.data.data.org_template_info;
           this.loading = false;
           //   this.adminUser = response.data.data.users
@@ -2704,7 +2729,7 @@ export default {
       });
     },
     changePatient(schedual) {
-      console.log(schedual);
+      // console.log(schedual);
       var xtdate = parseTime(schedual.schedule_date, "{y}-{m}-{d}");
       this.$router.push(
         "/dialysis/print?xtdate=" +
@@ -2731,11 +2756,11 @@ export default {
     getData() {
       let patientArr = [];
       patientArr = JSON.parse(JSON.stringify(this.zone_schedules));
-      console.log("patientArr", patientArr);
+      // console.log("patientArr", patientArr);
       let arr1 = [];
       if (this.patientStateVal == 0) {
         arr1 = patientArr;
-        console.log(arr1);
+        // console.log(arr1);
       } else if (this.patientStateVal == 1) {
         let arr = [];
         arr = patientArr;
@@ -2756,7 +2781,7 @@ export default {
             }
           }
         }
-        console.log("执行1", arr);
+        // console.log("执行1", arr);
         arr1 = arr;
       } else if (this.patientStateVal == 2) {
         let arr = [];
@@ -2774,12 +2799,12 @@ export default {
                   .systolic_blood_pressure != 0)
             ) {
               // 删除元素后改变i的值
-              console.log("几次");
+              // console.log("几次");
               arr[i].schedules.splice(j--, 1);
             }
           }
         }
-        console.log("执行2", arr);
+        // console.log("执行2", arr);
         arr1 = arr;
       } else if (this.patientStateVal == 3) {
         let arr = [];
@@ -2895,7 +2920,7 @@ export default {
         newArr.push(...item.schedules);
       });
       this.tableData = newArr;
-      console.log("table", this.tableData);
+      // console.log("table", this.tableData);
     },
   },
   watch: {
@@ -2926,7 +2951,7 @@ export default {
   },
   created() {
     // console.log("hhahahhahahahah=======",this.org_template_info.template_id)
-    console.log("this.$store.getters.xt_user.org.id",this.$store.getters.xt_user.org.id)
+    // console.log("this.$store.getters.xt_user.org.id",this.$store.getters.xt_user.org.id)
     var schedule_type_selected = this.$store.getters.schedule_type_selected;
     var zone_selected = this.$store.getters.zone_selected;
     var patient_state_selected = this.$store.getters.patient_state_selected;

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -39,7 +39,15 @@
           </template>
        </el-autocomplete>
        <el-button type="primary" @click="toSeach">搜索</el-button>
+
+       
       </div>
+      <!-- <div class="filter-container">
+      <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
+       <el-button type="primary" @click="toSeachOne">搜索</el-button>
+
+       
+      </div> -->
       <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询:</span>
@@ -830,6 +838,7 @@ export default {
       execution_frequency:"",
       zoneIdList:[],
       partion_str:"",
+      keyword:"",
     };
   },
   created() {
@@ -959,7 +968,7 @@ export default {
          var schedule_type = this.listQuery.schedul_type
          var partition_type = this.listQuery.partition_type
        
-        getNewSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way,cost_type:this.costType,execution_frequency:nameOne}).then(rs => {
+        getNewSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way,cost_type:this.costType,execution_frequency:nameOne,keyword:this.keyword}).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
             this.admin_users = resp.data.adminUser
@@ -1547,7 +1556,7 @@ export default {
         return searchArray
       },
      handleSelect(val) {
-       console.log("val323223232323232323",val)
+      
        this.patient_id = val.id
        this.listQuery.keyword = val.name
        this.requestSchedualDoctors(this.time)
@@ -1556,6 +1565,9 @@ export default {
        this.patient_id = 0
        this.requestSchedualDoctors(this.time)
      },
+     toSeachOne(){
+      this.requestSchedualDoctors(this.time)
+     },
      toExcution(){
 
        if(this.selecting_schs.length ==0){

src/xt_pages/dialysis/patientDoctorAdvice.vue

@@ -0,0 +1,403 @@
+<template>
+    <div class="main-contain">
+       <div class="position">
+         <bread-crumb :crumbs="crumbs"></bread-crumb>
+        
+       </div>
+       <div class="app-container">
+         <div class="filter-container">
+            <el-form :inline="true" :model="listQuery">
+                <el-form-item label>
+
+                <!-- <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model.trim="listQuery.search"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="false"
+                    placeholder="病人透析号/姓名"
+                    @select="handleSelect"
+                    style="width:160px;"
+                    >
+                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                    <template slot-scope="{ item }">
+                        <div class="name">{{ item.name }}</div>
+                    </template>
+                </el-autocomplete> -->
+                <el-input v-model="listQuery.search" style="width: 200px;" placeholder="请输入患者姓名或透析号"></el-input>
+                <el-button type="primary" size="small" @click="toSeach">搜索</el-button>
+                </el-form-item>
+            </el-form>
+
+            <label class="title" style="text-align:left;">
+              <span class="name">日期查询</span> :
+            </label>
+            <el-date-picker
+                v-model="listQuery.start_time"
+                prefix-icon="el-icon-date"
+                @change="changeTime"
+                :editable="false"
+                style="width: 196px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+            ></el-date-picker>
+            <span class>-</span>
+            <el-date-picker
+                v-model="listQuery.end_time"
+                prefix-icon="el-icon-date"
+                @change="changeEndTime"
+                :editable="false"
+                style="width: 196px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+            ></el-date-picker>
+
+            <el-container>
+                <div style="width:160px">
+                    <div class="tableTitle" style="margin-bottom: 10px;">患者列表</div>
+                    <el-table :data="patientsData" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }"
+                    :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                    highlight-current-row
+                    @current-change="handleChange"
+                    ref="singleTable"
+                    >
+                    <el-table-column prop="dialysis_no" label="透析号" width="70">
+                        <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
+                    </el-table-column>
+                    <el-table-column prop="name" label="姓名" width="90">
+                        <template slot-scope="scope">{{ scope.row.name }}</template>
+                    </el-table-column>
+                    </el-table>
+                </div>
+                <div style="padding-left:10px;flex:1">
+                  <div class="tableTitle" style="margin-top: 10px;margin-bottom: 10px;">统计表</div>
+                  <div>
+                    <el-button type="primary" @click="exportList" style="margin-bottom: 10px;">导出</el-button>
+                    <el-table 
+                     :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }"
+                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                     highlight-current-row
+                     
+                      >
+                            <el-table-column  label="医嘱名称" min-width="200" align="center">
+                               <template slot-scope="scope">
+                                   {{ scope.row.advice_name }}
+                               </template>
+                            </el-table-column>
+                            <!-- <el-table-column  label="生产厂家" width="140">
+                                <template slot-scope="scope">
+                                 
+                                </template>
+                            </el-table-column> -->
+                            <el-table-column  label="规格" min-width="200" align="center">
+                                <template slot-scope="scope">
+                                    {{ scope.row.specification_name }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column  label="数量" min-width="200" align="center">
+                                <template slot-scope="scope">
+                                   {{ getCount(scope.row.child) }}
+                                </template>
+                                
+                            </el-table-column>
+                          
+                     </el-table>
+
+                    <el-pagination
+                    align="right"
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :current-page="listQuery.page"
+                    :page-sizes="[20, 40, 60, 80, 100,200,300,500,1000]"
+                    :page-size="10"
+                    background
+                    style="margin-top:20px;"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="total"
+                    ></el-pagination>
+                   </div>
+                </div>
+            </el-container>
+         </div>
+      </div> 
+    </div>
+</template>
+<script>
+    import {getPatientsByName,getDocAdviceByPatientId} from '@/api/advice'
+    import BreadCrumb from "@/xt_pages/components/bread-crumb";
+    export default {
+        components: {
+             BreadCrumb
+         }, 
+        data(){
+          
+          return{
+            crumbs: [
+              { path: false, name: "透析管理" },
+              { path: false, name: "药品统计" }
+           ], 
+           listQuery:{
+            search:"",
+            start_time:"",
+            end_time:"",
+            page:1,
+            limit:10,
+           },
+           patientsData:[],
+           DialysisData:[],
+           total:0,
+           patient_id:0
+          }
+         
+        },
+        created(){
+            var nowDate = new Date();
+            var nowYear = nowDate.getFullYear();
+            var nowMonth = nowDate.getMonth() + 1;
+            var nowDay = nowDate.getDate();
+            this.listQuery.end_time = nowYear +"-" +(nowMonth < 10 ? "0" + nowMonth : nowMonth) +"-" +(nowDay < 10 ? "0" + nowDay : nowDay);
+            nowDate.setMonth(nowDate.getMonth() - 1);
+            nowYear = nowDate.getFullYear();
+            nowMonth = nowDate.getMonth() + 1;
+            nowDay = nowDate.getDate();
+            this.listQuery.start_time = nowYear + "-" + (nowMonth < 10 ? "0" + nowMonth : nowMonth) +"-" +(nowDay < 10 ? "0" + nowDay : nowDay);
+
+            //获取该机构下的所有患者
+           this.getPatientsByName()
+          },
+        methods:{
+            getPatientsByName(){
+                  var keyword = this.listQuery.search
+                  var params = {
+                    keyword:keyword,
+                  }
+                getPatientsByName(params).then(response=>{
+                    if(response.data.state == 1){
+                    var patients = response.data.data.patients
+                    
+                    this.patientsData = patients
+                     
+                    
+                    this.$nextTick(()=>{
+                        // 别忘了标签上定义ref  这里的 myTable就说获取的标签上的ref命的名
+                        this.$refs.singleTable.setCurrentRow(this.patientsData[0])
+                    })
+                    
+                   
+                    }
+                })
+             },
+            handleSelect(){
+
+            },
+            changeTime(){
+              this.handleChange(this.patient_id)
+            },
+            changeEndTime(){
+              this.handleChange(this.patient_id)
+            },
+            handleSizeChange(){
+
+            },
+            handleCurrentChange(){
+
+            },
+            exportList(){
+                var params = {
+                  patient_id:0,
+                  start_time:this.listQuery.start_time,
+                  end_time:this.listQuery.end_time,
+                  limit:this.listQuery.limit,
+                  page:this.listQuery.page,
+                }
+                console.log("paramswowowoow",params)
+                
+              getDocAdviceByPatientId(params).then(response=>{
+                  if(response.data.state == 1){
+                    var list =  response.data.data.list
+                    var tableData = []
+                    if(list!=null && list.length>0){
+                        let dataInfo = {}
+                        list.forEach((item, index) => {
+                        let { patient_id } = item
+                        if (!dataInfo[patient_id]) {
+                            dataInfo[patient_id] = {
+                            patient_id:item.patient_id,
+                            child: [],
+                            }
+                        }
+                       })
+                       let arr = Object.values(dataInfo)
+
+                       if(arr!=null && arr.length>0){
+                         for(let i=0;i<list.length;i++){
+                           for(let j=0;j<arr.length;j++){
+                              if(list[i].patient_id == arr[j].patient_id){
+                                  arr[j].child.push(list[i])
+                              } 
+                           } 
+                         }
+                       }
+
+                       console.log("arrwowoowowo",arr)
+
+                      if(arr!=null && arr.length>0){
+                         for(let i=0;i<arr.length;i++){
+                            let dataInfo = {}
+                            arr[i].child.forEach((item, index) => {
+                            let { advice_name} = item
+                            if (!dataInfo[advice_name]) {
+                                    dataInfo[advice_name] = {
+                                    advice_name:item.advice_name,
+                                    childOne: [],
+                                    count:0,
+                                    specification_name:item.advice_desc +item.drug_spec_unit,
+                                    patient_id:item.patient_id,
+                                 }
+                                }
+                            })
+                            let newArr = Object.values(dataInfo)
+                            console.log("newArrwoowow",newArr)
+                            if(newArr!=null && newArr.length>0){
+                              for(let z=0;z<arr[i].child.length;z++){
+                                for(let y=0;y<newArr.length;y++){
+                                   if(arr[i].child[z].advice_name == newArr[y].advice_name){
+                                     newArr[y].childOne.push(arr[i].child[z])
+                                   }
+
+                                }
+                              }
+                            }
+                            console.log("newArrwoowow",newArr)
+                            tableData.push(...newArr)
+                         }           
+                      }
+                    console.log("tableDatawpwwwoow",tableData)
+                   
+                    for(let i=0;i<tableData.length;i++){
+                       tableData[i].index = i+1
+                       tableData[i].count_name = this.getCount(tableData[i].childOne)
+                       tableData[i].specification_name =tableData[i].specification_name
+                       tableData[i].query_date = this.listQuery.start_time + "~" + this.listQuery.end_time
+                      tableData[i].patient_name = this.getPatientName(tableData[i].patient_id)
+                
+                     }
+                     import('@/vendor/Export2Excel').then(excel => {
+                        
+                            const tHeader = ['序号','患者姓名','查询日期','药品名称','规格&单位','数量']
+                            const filterVal = ['index','patient_name','query_date','advice_name','specification_name','count_name']
+
+                            const data = this.formatJson(filterVal,tableData)
+
+                            excel.export_json_to_excel({
+                            header: tHeader,
+                            data,
+                            filename: '患者药品使用查询表'
+                            })
+                        })
+                    }
+                  }
+              })
+           
+            },
+            formatJson(filterVal, jsonData) {
+                return jsonData.map(v => filterVal.map(j => v[j]))
+            },
+            getPatientName(id){
+                var patient_name = ""
+                for(let i=0;i<this.patientsData.length;i++){
+                if(id == this.patientsData[i].id){
+                    patient_name = this.patientsData[i].name
+                }
+                }
+                return patient_name
+            },
+            handleChange(val){
+                console.log("valwoowowowwo",val)
+                this.patient_id =val.id
+                var params = {
+                  patient_id:val.id,
+                  start_time:this.listQuery.start_time,
+                  end_time:this.listQuery.end_time,
+                  limit:this.listQuery.limit,
+                  page:this.listQuery.page,
+                }
+                console.log("paramswowowoow",params)
+              getDocAdviceByPatientId(params).then(response=>{
+                  if(response.data.state == 1){
+                    var list =  response.data.data.list
+
+                    if(list!=null && list.length>0){
+                        let dataInfo = {}
+                        list.forEach((item, index) => {
+                        let { advice_name } = item
+                        if (!dataInfo[advice_name]) {
+                            dataInfo[advice_name] = {
+                            advice_name:item.advice_name,
+                            child: [],
+                            count:0,
+                            specification_name:item.advice_desc +item.drug_spec_unit,
+                            patient_id:item.patient_id,
+                            }
+                        }
+                       })
+                       let arr = Object.values(dataInfo)
+
+                       if(arr!=null && arr.length>0){
+                         for(let i=0;i<list.length;i++){
+                           for(let j=0;j<arr.length;j++){
+                              if(list[i].advice_name == arr[j].advice_name){
+                                  arr[j].child.push(list[i])
+                              } 
+                           } 
+                         }
+                       }
+
+                       this.DialysisData= []
+
+                       this.DialysisData = arr
+
+                       console.log("arrwoowowowowo",arr)
+                    }
+                   
+                  }
+              })
+            },
+            toSeach(){
+              this.getPatientsByName()
+            },
+            getCount(val){
+               var count =0
+               if(val!=null && val.length>0){
+                for(let i=0;i<val.length;i++){
+                    count+=val[i].prescribing_number
+                }
+               }
+               return count
+               
+            }
+        }   
+    }
+</script>
+
+<style lang="scss" scoped>
+.tableTitle {
+  font-size: 16px;
+  color: #000;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+</style>
+<style lang="scss">
+.page_timePersonal {
+  .cell {
+    text-align: center;
+  }
+}
+</style>

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -940,6 +940,7 @@
                       :src="setAdminUserES(advice.advice_doctor)"
                       alt=""
                       srcset=""
+                      v-else
                     />
                   </td>
                   <td style="text-align: left; padding-left: 5px" width="344">
@@ -999,6 +1000,7 @@
                       :src="setAdminUserES(advice.execution_staff)"
                       alt=""
                       srcset=""
+                      v-else
                     />
                   </td>
                   <td style="line-height: 30px" width="90">
@@ -1287,18 +1289,6 @@
                   <td style="height: 20px" width="90">
                     <p style="height: 20px; line-height: 20px">核对</p>
                   </td>
-                  <!-- <td style="height: 20px" width="144">
-                    <p style="height: 20px; line-height: 20px">上次透后体重</p>
-                  </td> -->
-                  <!-- <td style="height: 20px" width="60">
-                    {{
-                      patientInfo.total_dialysis +
-                        patientInfo.user_sys_before_count >
-                      0
-                        ? patientInfo.user_sys_before_count
-                        : "/"
-                    }}kg
-                  </td> -->
                 </tr>
               </table>
             </td>
@@ -1308,7 +1298,7 @@
             :key="advice_index"
             style="transform: translateY(3px)"
           >
-            <td>
+            <td v-if="advice.advice_name!=''">
               <table class="print-table" border="1">
                 <tr>
                   <td width="60">
@@ -1326,6 +1316,7 @@
                       :src="setAdminUserES(advice.advice_doctor)"
                       alt=""
                       srcset=""
+                      v-else
                     />
                   </td>
                   <td style="text-align: left; padding-left: 5px" width="344">
@@ -1361,21 +1352,6 @@
                       getTime(advice.execution_time, "{h}:{i}")
                     }}</span>
                   </td>
-                  <!-- <td
-                    style="line-height: 30px"
-                    width="90"
-                    v-if="org_id == 10249 || org_id == 0"
-                  >
-                    <span v-if="setAdminUserES(advice.advice_doctor) == ''">
-                      {{ getAdminUser(advice.advice_doctor) }}
-                    </span>
-                    <img
-                      style="height: 30px"
-                      :src="setAdminUserES(advice.advice_doctor)"
-                      alt=""
-                      srcset=""
-                    />
-                  </td> -->
                   <td style="line-height: 10px" width="90">
                     <span v-if="setAdminUserES(advice.execution_staff) == ''">{{
                       getAdminUser(advice.execution_staff)
@@ -1385,6 +1361,7 @@
                       :src="setAdminUserES(advice.execution_staff)"
                       alt=""
                       srcset=""
+                      v-else
                     />
                   </td>
                   <td style="line-height: 30px" width="90">
@@ -1400,86 +1377,7 @@
                     />
                   </td>
 
-                  <!-- <td v-if="advice_index === 0" width="145">透前体重:</td> -->
-                  <!-- <td v-if="advice_index === 0" width="60">
-                    {{
-                      patientInfo.total_dialysis +
-                        patientInfo.user_sys_before_count >
-                      0
-                        ? patientInfo.user_sys_before_count
-                        : "/"
-                    }}kg
-                  </td> -->
-                  <!-- <td v-if="advice_index === 1" width="145">体重增加量:</td> -->
-                  <!-- <td v-if="advice_index === 1" width="60">
-                    {{
-                      assessmentafter.weight_after == 0 ||
-                      predialysis.weight_before == 0
-                        ? 0
-                        : (
-                            predialysis.weight_before -
-                            assessmentafter.weight_after
-                          ).toFixed(2)
-                    }}kg
-                  </td> -->
-                  <!-- <td v-if="advice_index === 2" width="145">干体重(DW):</td> -->
-                  <!-- <td v-if="advice_index === 2" width="60">
-                    {{
-                      patientInfo.total_dialysis +
-                        patientInfo.user_sys_before_count >
-                      0
-                        ? predialysis.user_sys_before_count
-                        : "/"
-                    }}kg
-                  </td> -->
-                  <!-- <td v-if="advice_index === 3" width="145">较干体重增加量:</td> -->
-                  <!-- <td v-if="advice_index === 3" width="60">
-                    {{
-                      patientInfo.total_dialysis +
-                        patientInfo.user_sys_before_count >
-                        0 && afterdialysis.weight_after != 0
-                        ? (
-                            afterdialysis.weight_after - predialysis.dry_weight
-                          ).toFixed(2)
-                        : 0
-                    }}kg
-                  </td> -->
-                  <!-- <td v-if="advice_index === 4" width="145">机器显示脱水量:</td>
-                  <td v-if="advice_index === 4" width="60">
-                    {{
-                      patientInfo.total_dialysis +
-                        patientInfo.user_sys_before_count >
-                      0
-                        ? afterdialysis.actual_ultrafiltration
-                        : "/"
-                    }}ml
-                  </td> -->
-                  <!-- <td v-if="advice_index === 5" width="145">透后体重:</td>
-                  <td v-if="advice_index === 5" width="60">
-                    {{
-                      patientInfo.total_dialysis +
-                        patientInfo.user_sys_before_count >
-                      0
-                        ? afterdialysis.weight_after
-                        : "/"
-                    }}kg
-                  </td>
-                  <td v-if="advice_index === 6" width="145">
-                    本次透析体重下降量:
-                  </td>
-                  <td v-if="advice_index === 6" width="60">
-                    {{
-                      afterdialysis.weight_after == 0 ||
-                      predialysis.weight_before == 0
-                        ? 0
-                        : (
-                            predialysis.weight_before -
-                            afterdialysis.weight_after
-                          ).toFixed(2)
-                    }}kg
-                  </td> -->
-                  <!-- <td v-if="advice_index > 6" width="145"></td>
-                  <td v-if="advice_index > 6" width="60"></td> -->
+                 
                 </tr>
               </table>
             </td>

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThreeAdvice.vue

@@ -377,6 +377,7 @@
                         v-if="setAdminUserES(advices[0].advice_doctor) == ''"
                       >
                         {{ getAdminUser(advices[0].advice_doctor) }}
+                      
                       </span>
                       <img
                         class="es-img"
@@ -867,6 +868,7 @@
                       :src="setAdminUserES(advice.advice_doctor)"
                       alt=""
                       srcset=""
+                      v-else
                     />
                   </td>
                   <td style="text-align: left; padding-left: 5px" width="340">
@@ -926,6 +928,7 @@
                       :src="setAdminUserES(advice.execution_staff)"
                       alt=""
                       srcset=""
+                      v-else
                     />
                   </td>
                   <td style="line-height: 30px" width="90">

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -1204,18 +1204,6 @@
                           置换量<br />(L)
                         </td>
                         <td width="210">病情变化及处理</td>
-
-                        <!-- <td width="100">时间</td>
-                    <td width="30">T<br>C°</td>
-                    <td width="30">P<br/>次/分</td>
-                    <td width="30">R<br/>次/分</td>
-                    <td width="100">BP<br/>mmHg</td>
-                    <td width="60">静脉压/动脉压<br/>mmHg</td>
-                    <td width="80">血流量<br/>ml/min</td>
-                    <td width="90">超滤量累计L</td>
-                    <td width="80">钠浓度<br/>mmol/L</td>
-                    <td width="240">病情特殊情况处理<br/>及专科护理措施记录</td>
-                    <td  width="100">护士签名</td> -->
                       </tr>
 
                       <tr
@@ -1436,10 +1424,6 @@
                           医嘱内容
                         </td>
                       </tr>
-                      <!-- <tr style="line-height:35px;padding:8px 5px;">
-                    <td colspan="4" style="font-size: 16px">开医嘱</td>
-                    <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
-                  </tr> -->
                       <tr style="line-height: 35px; padding: 8px 5px">
                         <td style="font-size: 16px" width="10%">时间</td>
                         <td style="font-size: 16px" colspan="2" width="45%">
@@ -1521,12 +1505,6 @@
                             >({{ advice.remark }})</span
                           >
                         </td>
-                        <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
-                      <span>{{advice.delivery_way}}</span>
-                      <span>{{advice.execution_frequency}}</span>
-                      <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
-                    </td> -->
-                        <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
                         <td height="32px" v-if="advice.advice_doctor">
                           <span
                             v-if="setAdminUserES(advice.advice_doctor) == ''"
@@ -1544,17 +1522,14 @@
                           <span v-if="setAdminUserES(advice.doctor) == ''">{{
                             getAdminUser(advice.doctor)
                           }}</span>
-                          <img
+                           <img
                             style="height: 30px"
                             :src="setAdminUserES(advice.doctor)"
                             alt=""
                             srcset=""
+                            v-else
                           />
                         </td>
-                        <!-- <td height="35px">
-                      <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
-                      <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
-                    </td> -->
                         <td height="32px">
                           <span
                             v-if="setAdminUserES(advice.execution_staff) == ''"
@@ -1726,7 +1701,7 @@
           </div>
         </template>
         <div class="row" style="margin-top: -11px; position: relative">
-          <table class="proj_table">
+          <table border="1" class="proj_table" style="border-collapse: collapse;text-align:center ;">
             <template v-if="doctor_advices_2.length > 0">
               <tr style="line-height: 35px; padding: 8px 5px">
                 <td
@@ -1738,7 +1713,7 @@
                     font-size: 16px;
                     padding: 6px 8px;
                     line-height: 30px;
-                    border: 1px solid;
+                    border: 1px solid black;
                   "
                 >
                   医嘱内容
@@ -1752,14 +1727,14 @@
                 style="line-height: 35px; padding: 8px 5px"
                 class="split_table_tr"
               >
-                <td style="font-size: 16px" width="10%">时间</td>
-                <td style="font-size: 16px" colspan="2" width="45%">
+                <td style="font-size: 16px;border: 1px solid black;" width="10%">时间</td>
+                <td style="font-size: 16px;border: 1px solid black;" colspan="2" width="45%">
                   医嘱内容
                 </td>
-                <td style="font-size: 16px" width="10%">医生签名</td>
+                <td style="font-size: 16px;border: 1px solid black;" width="10%">医生签名</td>
                 <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
-                <td style="font-size: 16px" width="10%">执行人签名</td>
-                <td style="font-size: 16px" width="10%">时间</td>
+                <td style="font-size: 16px;border: 1px solid black;" width="10%">执行人签名</td>
+                <td style="font-size: 16px;border: 1px solid black;" width="10%">时间</td>
               </tr>
               <!-- <template v-for="group in doctor_advices" > -->
               <tr
@@ -1767,7 +1742,7 @@
                 v-for="(advice, advice_index) in doctor_advices_2"
                 :key="advice_index"
               >
-                <td height="32px">
+                <td height="32px" style="border: 1px solid black;">
                   <span v-if="advice.start_time">
                     {{ getTime(advice.start_time, "{h}:{i}") }}
                   </span>
@@ -1777,7 +1752,7 @@
                   height="32px"
                   colspan="2"
                   class="advice-name"
-                  style="padding-left: 7px"
+                  style="padding-left: 7px;border: 1px solid black;"
                 >
                   <span v-if="advice.parent_id > 0">---></span>
                   <span>{{ advice.advice_name }}</span>
@@ -1824,13 +1799,7 @@
                     >({{ advice.remark }})</span
                   >
                 </td>
-                <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
-                  <span>{{advice.delivery_way}}</span>
-                  <span>{{advice.execution_frequency}}</span>
-                  <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
-                </td> -->
-                <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
-                <td height="32px">
+                <td height="32px" style="border: 1px solid black;">
                   <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{
                     getAdminUser(advice.advice_doctor)
                   }}</span>
@@ -1852,11 +1821,8 @@
                     v-else
                   />
                 </td>
-                <!-- <td height="35px">
-                  <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
-                  <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
-                </td> -->
-                <td height="32px">
+
+                <td height="32px" style="border: 1px solid black;">
                   <span v-if="setAdminUserES(advice.execution_staff) == ''">{{
                     getAdminUser(advice.execution_staff)
                   }}</span>
@@ -1868,7 +1834,7 @@
                     v-else
                   />
                 </td>
-                <td height="32px">
+                <td height="32px" style="border: 1px solid black;">
                   <span v-if="advice.execution_time">{{
                     getTime(advice.execution_time, "{h}:{i}")
                   }}</span>
@@ -1886,6 +1852,7 @@
                   font-size: 16px;
                   padding: 6px 8px;
                   line-height: 30px;
+                  border: 1px solid black;
                 "
               >
                 透析后情况

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -377,15 +377,19 @@
                   <tbody>
                     <tr>
                       <td width="70">抗凝方式:</td>
-                      <td width="80">
+                      <td width="80" v-if="prescription.anticoagulant == 2 ">
                         <label-box :isChecked="prescription.anticoagulant == 2 ? true : false" showValue="普通肝素"></label-box>
                       </td>
+                      <td width="120" v-if="prescription.anticoagulant == 14">
+                        <label-box :isChecked="prescription.anticoagulant == 14 ? true : false" showValue="肝素钙注射液"></label-box>
+                      </td>
                       <td width="10">(</td>
                       <td width="35">首剂</td>
                       <td width="50">
                         <div class="under-line">
                           &nbsp;
                           <span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_shouji }}</span>
+                          <span v-if="prescription.anticoagulant == 14">{{ prescription.anticoagulant_shouji }}</span>
                         </div>
                       </td>
                       <td width="50">mg</td>
@@ -395,6 +399,7 @@
                         <div class="under-line">
                           &nbsp;
                           <span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_weichi }}</span>
+                          <span v-if="prescription.anticoagulant == 14">{{ prescription.anticoagulant_weichi }}</span>
                         </div>
                       </td>
                       <td width="40">mg/h</td>
@@ -412,9 +417,11 @@
                       <td width="60">
                         <div class="under-line">
                           &nbsp;
+                          <span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_zongliang }}</span>
                           <span v-if="prescription.anticoagulant == 3">{{ prescription.anticoagulant_zongliang }}</span>
                           <span v-if="prescription.anticoagulant == 6">{{ prescription.anticoagulant_zongliang }}</span>
                           <span v-if="prescription.anticoagulant == 7">{{ prescription.anticoagulant_zongliang }}</span>
+                          <span v-if="prescription.anticoagulant == 14">{{ prescription.anticoagulant_zongliang }}</span>
                         </div>
                       </td>
                       <td width="20" v-if="isShowZero">mg</td>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
     <el-button type="primary" @click="checkData">一键核对</el-button>
+    <el-button type="primary" @click="toUpload">一键上传</el-button>
     
     <div id="dialysis-print-box-1"  ref="pdfContent">
       <div
@@ -1498,11 +1499,21 @@
                           }}
                         </td>
                         <td>
-                          {{
+                          <span v-if="org_id ==10551">
+                            {{
                             monitor.venous_pressure
                               ? monitor.venous_pressure
                               : "/"
-                          }}
+                            }}
+                          </span>
+                          <span v-if="org_id!=10551">
+                            {{
+                            monitor.venous_pressure
+                              ? monitor.venous_pressure
+                              : ""
+                            }}
+                          </span>
+                          
                         </td>
                         <td>
                           <span
@@ -3434,6 +3445,116 @@ export default {
     };
   },
   methods: {
+    toUpload() {
+         
+         let dom = document.getElementById("dialysis-print-box-1")
+         //调用方法下载
+         html2canvas(dom, {
+           useCORS: true, //允许跨域
+           allowTaint: false,
+           logging: false,
+           letterRendering: true,
+           ddpi: window.devicePixelRatio * 4, //将分辨率提高到特定的DPI 提高四倍
+           scale: 4, //按比例增加分辨率
+           background: '#fff',//pdf背景色为白色，默认是黑色的
+         }).then((canvas) => {
+           //返回图片dataURL，参数：图片格式和清晰度(0-1)
+           var pageData = canvas.toDataURL('image/jpeg', 1.0);
+ 
+           //方向默认竖直，尺寸ponits，格式a4[595.28,841.89]
+           var pdf = new jsPDF('', 'pt', 'a4');
+ 
+           //addImage后两个参数控制添加图片的尺寸，此处将页面高度按照a4纸宽高比列进行压缩
+           //  pdf.addImage(pageData, 'JPEG', 0, 0, 595.28, 592.28 / canvas.width * canvas.height);
+           pdf.addImage(pageData, 'JPEG', 0, 0, 555.28, 592.28 / canvas.width * canvas.height);
+           
+           console.log("pdf222222222222222222",pdf)
+
+           var newBase64Data =  pdf.output("dataurlstring").split("base64,")[1]
+           // console.log("base63",newBase64Data)
+           const blob = this.base64ToBlob(newBase64Data, 'application/pdf');
+           console.log("blobwoowowowwo",blob)
+           this.openPdf(blob);
+           
+           // var data = {
+           //   name:newBase64Data,
+           // }
+           // UploadPrintOrder(data).then(response=>{
+           //   if(response.data.state == 1){
+           //     var sign =  response.data.data.sign
+           //     console.log("SIGNWWOOWWO")
+           //     var pdfBase64 = response.data.data.pdfBase64
+           //     console.log("pdfBase64",pdfBase64)
+           //     this.$message.success("保存成功!")
+           //     const blob = this.base64ToBlob(pdfBase64, 'application/pdf');
+           //     this.openPdf(blob);
+           //   }
+           // })
+           
+           // this.viewPdf(newBase64Data)
+           //保存到pdf，名字是stone
+           // pdf.save('stone.pdf');
+          
+         });
+       },
+    
+     viewPdf(content) {
+       console.log("content",content);
+       const blob = this.base64ToBlob(content);
+       if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+         window.navigator.msSaveOrOpenBlob(blob);
+       } else {
+         const fileURL = URL.createObjectURL(blob);
+         console.log("fileUlrwowowoow",fileURL)
+         window.open(fileURL);//打开ppf文件
+       }
+     },
+     compare (property) {
+       return function (a, b) {
+           var value1 = a[property]
+           var value2 = b[property]
+           return value1 - value2
+       }
+     },
+ 
+     openPdf(blob) {
+       const objectUrl = URL.createObjectURL(blob);
+       const a = document.createElement('a');
+       a.href = objectUrl;
+       a.target = '_blank';
+       a.click();
+       URL.revokeObjectURL(objectUrl);
+     },
+      base64ToBlob(base64Data, contentType) {
+       contentType = contentType || '';
+       const sliceSize = 1024;
+       const byteCharacters = window.atob(base64Data);
+       const bytesLength = byteCharacters.length;
+       const slicesCount = Math.ceil(bytesLength / sliceSize);
+       const byteArrays = new Array(slicesCount);
+ 
+       for (let sliceIndex = 0; sliceIndex < slicesCount; ++sliceIndex) {
+         const begin = sliceIndex * sliceSize;
+         const end = Math.min(begin + sliceSize, bytesLength);
+ 
+         const bytes = new Array(end - begin);
+         for (let offset = begin, i = 0; offset < end; ++i, ++offset) {
+           bytes[i] = byteCharacters[offset].charCodeAt(0);
+         }
+         byteArrays[sliceIndex] = new Uint8Array(bytes);
+       }
+ 
+       return new Blob(byteArrays, {
+         type: contentType
+       });
+     },
+    
+     UploadPdf(res) {
+       let pdfBase64Str = res;
+       let title = "上传给后端的个人报告";
+       var myfile = this.dataURLtoFile(pdfBase64Str, title + ".pdf")
+       console.log("myfile",myfile)
+     },
     // 获取当前年份，用于年龄计算
     getoldAge() {
       let date = new Date();

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1498,10 +1498,6 @@
                           医嘱内容
                         </td>
                       </tr>
-                      <!-- <tr style="line-height:35px;padding:8px 5px;">
-                    <td colspan="4" style="font-size: 16px">开医嘱</td>
-                    <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
-                  </tr> -->
                       <tr style="line-height: 35px; padding: 8px 5px">
                         <td style="font-size: 16px" width="10%">时间</td>
                         <td style="font-size: 16px" colspan="2" width="45%">
@@ -1510,16 +1506,8 @@
                         <td style="font-size: 16px" width="10%">医生签名</td>
                         <td style="font-size: 16px" width="10%">时间</td>
                         <td style="font-size: 16px" width="10%">执行人签名</td>
-                        <td
-                          style="font-size: 16px"
-                          width="10%"
-                          v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375"
-                        >
-                          核对护士
-                        </td>
+                       
                       </tr>
-                      <!-- <template v-for="group in doctor_advices" > -->
-
                       <tr
                         v-for="(advice, advice_index) in doctor_advices"
                         :key="advice_index"
@@ -1528,7 +1516,7 @@
                           <span v-if="advice.start_time">
                             {{ getTime(advice.start_time, "{h}:{i}") }}
                           </span>
-                          <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
+
                         </td>
                         <td
                           height="32px"
@@ -1536,7 +1524,8 @@
                           class="advice-name"
                           style="padding-left: 7px"
                         >
-                          <span v-if="advice.parent_id > 0">---></span>
+                      
+                          <span v-if="advice.parent_id > 0"></span>
                           <span>{{ advice.advice_name }}</span>
                           <span v-if="advice && advice.advice_desc"
                             >({{ advice.advice_desc
@@ -1563,12 +1552,7 @@
                             >({{ advice.remark }})</span
                           >
                         </td>
-                        <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
-                      <span>{{advice.delivery_way}}</span>
-                      <span>{{advice.execution_frequency}}</span>
-                      <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
-                    </td> -->
-                        <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
+                      
                         <td height="32px">
                           <span
                             v-if="setAdminUserES(advice.advice_doctor) == ''"
@@ -1582,10 +1566,7 @@
                             v-else
                           />
                         </td>
-                        <!-- <td height="35px">
-                      <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
-                      <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
-                    </td> -->
+                       
                         <td height="32px">
                           <span v-if="advice.execution_time">{{
                             getTime(advice.execution_time, "{h}:{i}")
@@ -1604,21 +1585,7 @@
                             v-else
                           />
                         </td>
-
-                        <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375">
-                          <span v-if="setAdminUserES(advice.checker) == ''">{{
-                            getAdminUser(advice.checker)
-                          }}</span>
-                          <img
-                            style="height: 30px"
-                            :src="setAdminUserES(advice.checker)"
-                            alt=""
-                            srcset=""
-                            v-else
-                          />
-                        </td>
                       </tr>
-                      <!-- </template> -->
                     </tbody>
                   </table>
                 </td>
@@ -1820,6 +1787,7 @@
             </div>
           </div>
         </template>
+
         <div class="row" style="margin-top: -11px; position: relative">
           <table class="proj_table">
             <tbody>
@@ -1839,10 +1807,7 @@
                     医嘱内容
                   </td>
                 </tr>
-                <!-- <tr style="line-height:35px;padding:8px 5px;">
-                <td colspan="4" style="font-size: 16px">开医嘱</td>
-                <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
-              </tr> -->
+              
                 <tr style="line-height: 35px; padding: 8px 5px">
                   <td style="font-size: 15px" width="10%">时间</td>
                   <td style="font-size: 15px" colspan="2" width="45%">
@@ -1851,15 +1816,9 @@
                   <td style="font-size: 15px" width="10%">医生签名</td>
                   <td style="font-size: 15px" width="10%">时间</td>
                   <td style="font-size: 15px" width="10%">执行人签名</td>
-                  <td
-                    style="font-size: 15px"
-                    width="10%"
-                    v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375"
-                  >
-                    核对护士
-                  </td>
+                 
                 </tr>
-                <!-- <template v-for="group in doctor_advices" > -->
+               
                 <tr
                   v-for="(advice, advice_index) in doctor_advices"
                   :key="advice_index"
@@ -1868,7 +1827,7 @@
                     <span v-if="advice.start_time">
                       {{ getTime(advice.start_time, "{h}:{i}") }}
                     </span>
-                    <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
+                  
                   </td>
                   <td
                     height="32px"
@@ -1876,7 +1835,7 @@
                     class="advice-name"
                     style="padding-left: 7px"
                   >
-                    <span v-if="advice.parent_id > 0">---></span>
+                    <span v-if="advice.parent_id > 0"></span>
                     <span>{{ advice.advice_name }}</span>
                     <span v-if="advice && advice.advice_desc"
                       >({{ advice.advice_desc
@@ -1903,12 +1862,7 @@
                       >({{ advice.remark }})</span
                     >
                   </td>
-                  <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
-                <span>{{advice.delivery_way}}</span>
-                <span>{{advice.execution_frequency}}</span>
-                <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
-              </td> -->
-                  <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
+                
                   <td height="32px">
                     <span
                       v-if="setAdminUserES(advice.advice_doctor) == ''"
@@ -1922,10 +1876,7 @@
                       v-else
                     />
                   </td>
-                  <!-- <td height="35px">
-                <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
-                <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
-              </td> -->
+                  
                   <td height="32px">
                     <span v-if="advice.execution_time">{{
                       getTime(advice.execution_time, "{h}:{i}")
@@ -1945,18 +1896,6 @@
                     />
                   </td>
 
-                  <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375">
-                    <span v-if="setAdminUserES(advice.checker) == ''">{{
-                      getAdminUser(advice.checker)
-                    }}</span>
-                    <img
-                      style="height: 30px"
-                      :src="setAdminUserES(advice.checker)"
-                      alt=""
-                      srcset=""
-                      v-else
-                    />
-                  </td>
                 </tr>
               </template>
 
@@ -2562,12 +2501,12 @@
          <div style="position: relative; left: 70%;top: 50px;width: 288px;">
           患者签名：
           <div class="under_line" style="width: 120px;">
-            <img
+            <!-- <img
               style="height: 30px"
               :src="dialysisOrder == null? 0: dialysisOrder.url"
               alt=""
               srcset=""
-            />
+            /> -->
           </div>
         </div>
       </div>
@@ -3679,8 +3618,8 @@ export default {
       
         console.log("时间我我我哦我我",this.doctor_advices)
         if (this.doctor_advices.length <= 6) {
-          var nl = 6;
-          this.print_length = 6;
+          var nl = 3;
+          this.print_length = 3;
 
           for (let index = 0; index < nl; index++) {
             if (

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -2,13 +2,14 @@
   <div >
     <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
     <el-button type="primary" @click="toUpload">一键上传</el-button>
-    <div id="dialysis-print-box-64">
+    <div >
       <div
-        id="dialysis-print-box-64-1"
+        id="dialysis-print-box-64-1  "
         class="dialysis-print-order print-template-two print_page_main_content"
+        
       >
-        <div>
-          <!-- <div
+        <div id="dialysis-print-box-64" style="padding:10px 0 0 40px  ;">
+          <!-- <div 10px 0 0 40px
             class="order-yy-name"
             style=" letter-spacing: 0;
                 font-weight: 600;
@@ -24,16 +25,16 @@
               <div style="display:inline-block; ;">病历号：
                 {{patientInfo.record_number?patientInfo.record_number:"" }}
               </div>
-              <div style="display:inline-block;margin-left: 90px;">
+              <div style="display:inline-block;margin-left: 50px;">
                 姓名：{{ patientInfo.name }}
               </div>
-              <div style="display:inline-block; margin-left: 90px;">
+              <div style="display:inline-block; margin-left: 50px;">
                 性别：{{ patientInfo_gender_1 == true ? "男" : "女" }}
               </div>
-              <div style="display:inline-block; margin-left: 90px;">
+              <div style="display:inline-block; margin-left: 50px;">
                 年龄：{{ getAge(patientInfo) }}
               </div>
-              <div style="display:inline-block; margin-left: 90px;">
+              <div style="display:inline-block; margin-left: 50px;">
                 透析次数：{{
                   patientInfo.total_dialysis +
                     patientInfo.user_sys_before_count
@@ -52,7 +53,7 @@
                 透析中心：{{ orgname }}
               </div>
             </div>
-            <table border="1" cellspacing="0" cellpadding="0" style="border-collapse: collapse; width: 960px; ">
+            <table border="1" cellspacing="0" cellpadding="0" style="border-collapse: collapse; width: 100%; ">
               <tr>
                 <td colspan="3" style="border:1px solid black">
                   <div style="display: inline-block; word-break: break-all;word-wrap: break-word;">
@@ -1320,7 +1321,8 @@ export default {
     },
 
     toUpload() {
-        let dom = document.getElementById("dialysis-print-box-64");
+       
+        let dom = document.getElementById("dialysis-print-box-64")
         //调用方法下载
         html2canvas(dom, {
           useCORS: true, //允许跨域
@@ -1330,7 +1332,6 @@ export default {
           ddpi: window.devicePixelRatio * 4, //将分辨率提高到特定的DPI 提高四倍
           scale: 4, //按比例增加分辨率
           background: '#fff',//pdf背景色为白色，默认是黑色的
-       
         }).then((canvas) => {
           //返回图片dataURL，参数：图片格式和清晰度(0-1)
           var pageData = canvas.toDataURL('image/jpeg', 1.0);
@@ -1339,22 +1340,26 @@ export default {
           var pdf = new jsPDF('', 'pt', 'a4');
 
           //addImage后两个参数控制添加图片的尺寸，此处将页面高度按照a4纸宽高比列进行压缩
-          pdf.addImage(pageData, 'JPEG', 0, 0, 595.28, 592.28 / canvas.width * canvas.height);
+          // pdf.addImage(pageData, 'JPEG', 0, 0, 595.28, 592.28 / canvas.width * canvas.height);
+          pdf.addImage(pageData, 'JPEG', 0, 0, 555.28, 592.28 / canvas.width * canvas.height);
 
           var newBase64Data =  pdf.output("dataurlstring").split("base64,")[1]
           console.log("base63",newBase64Data)
-          this.viewPdf(newBase64Data)
 
-          var data = {
-            name:newBase64Data,
-          }
-          UploadPrintOrder(data).then(response=>{
-            if(response.data.state == 1){
-              var sign =  response.data.data.sign
-              console.log("SIGNWWOOWWO")
-              this.$message.success("保存成功!")
-            }
-          })
+          const blob = this.base64ToBlob(newBase64Data, 'application/pdf');
+          this.openPdf(blob);
+          // this.viewPdf(newBase64Data)
+          
+          // var data = {
+          //   name:newBase64Data,
+          // }
+          // UploadPrintOrder(data).then(response=>{
+          //   if(response.data.state == 1){
+          //     var sign =  response.data.data.sign
+          //     console.log("SIGNWWOOWWO")
+          //     this.$message.success("保存成功!")
+          //   }
+          // })
           
           // this.viewPdf(newBase64Data)
           //保存到pdf，名字是stone
@@ -1374,19 +1379,19 @@ export default {
         window.open(fileURL);//打开ppf文件
       }
     },
-    base64ToBlob(code) {
-      code = code.replace(/[\n\r]/g, '');// 检查base64字符串是否符合base64编码
-      // atob() 方法用于解码使用 base-64 编码的字符串。
-      const raw = window.atob(code);
-      const rawLength = raw.length;
-      const uInt8Array = new Uint8Array(rawLength);
-      for (let i = 0; i < rawLength; ++i) {
-      // 将解码后的逐个字符转换成Unicode序号，放入Unit8Array数组
-        uInt8Array[i] = raw.charCodeAt(i);
-      }
-      // 通过Blob将Uint8Array数组转换成pdf类型的文件对象
-      return new Blob([uInt8Array], { type: 'application/pdf' });
-    },
+    // base64ToBlob(code) {
+    //   code = code.replace(/[\n\r]/g, '');// 检查base64字符串是否符合base64编码
+    //   // atob() 方法用于解码使用 base-64 编码的字符串。
+    //   const raw = window.atob(code);
+    //   const rawLength = raw.length;
+    //   const uInt8Array = new Uint8Array(rawLength);
+    //   for (let i = 0; i < rawLength; ++i) {
+    //   // 将解码后的逐个字符转换成Unicode序号，放入Unit8Array数组
+    //     uInt8Array[i] = raw.charCodeAt(i);
+    //   }
+    //   // 通过Blob将Uint8Array数组转换成pdf类型的文件对象
+    //   return new Blob([uInt8Array], { type: 'application/pdf' });
+    // },
     compare (property) {
       return function (a, b) {
           var value1 = a[property]
@@ -1394,6 +1399,40 @@ export default {
           return value1 - value2
       }
     },
+
+    openPdf(blob) {
+      const objectUrl = URL.createObjectURL(blob);
+      const a = document.createElement('a');
+      a.href = objectUrl;
+      a.target = '_blank';
+      a.click();
+      URL.revokeObjectURL(objectUrl);
+    },
+     base64ToBlob(base64Data, contentType) {
+      contentType = contentType || '';
+      const sliceSize = 1024;
+      const byteCharacters = window.atob(base64Data);
+      const bytesLength = byteCharacters.length;
+      const slicesCount = Math.ceil(bytesLength / sliceSize);
+      const byteArrays = new Array(slicesCount);
+
+      for (let sliceIndex = 0; sliceIndex < slicesCount; ++sliceIndex) {
+        const begin = sliceIndex * sliceSize;
+        const end = Math.min(begin + sliceSize, bytesLength);
+
+        const bytes = new Array(end - begin);
+        for (let offset = begin, i = 0; offset < end; ++i, ++offset) {
+          bytes[i] = byteCharacters[offset].charCodeAt(0);
+        }
+        byteArrays[sliceIndex] = new Uint8Array(bytes);
+      }
+
+      return new Blob(byteArrays, {
+        type: contentType
+      });
+    },
+
+  
   },
   created() {
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1566,24 +1566,22 @@ export default {
       this.$refs.additionalCharges.hide()
 
     }, searchProjectAction() {
-      console.log('~~~~')
-      
-      // console.log(this.allProject)
-
-
+      console.log('~~~~',this.search_project_keyword)
+      console.log('1111',this.allProject)
       if (this.search_project_keyword.length == 0) {
         this.tabProject = this.allProject
 
       } else {
         let arr = []
         for (let i = 0; i < this.allProject.length; i++) {
-
+          
             if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
-              arr = arr.concat(this.allProject[i])
+                arr = arr.concat(this.allProject[i])
             }
           
         }
         this.tabProject = arr
+        console.log('rrrr',this.tabProject)
       }
 
     }, searchProjectTeamAction() {
@@ -1609,8 +1607,7 @@ export default {
         for (let i = 0; i < this.drugs.length; i++) {
           if (this.drugs[i].drug_name.indexOf(this.search_keyword) != -1 || 
           this.drugs[i].wubi.indexOf(this.search_keyword) != -1 || 
-          this.drugs[i].pinyin.indexOf(this.search_keyword) != -1 ||
-          this.drugs[i].first_letter.indexOf(this.search_keyword) != -1) {
+          this.drugs[i].pinyin.indexOf(this.search_keyword) != -1) {
             arr = arr.concat(this.drugs[i])
           }
         }
@@ -3463,13 +3460,12 @@ export default {
               total: good_info[i].total,
               is_special_diseases: good_info[i].is_special_diseases,
               good_info: good_info[i],
-              stock_count: good_info[i].stock_count
+              stock_count: good_info[i].stock_count,
+              first_letter:good_info[i].first_letter
             }
             this.tabProject.push(obj)
           }
-
           this.allProject = this.tabProject
-
         }
       })
 

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -558,11 +558,14 @@ export default {
             let arr4 = []
             // console.log('3333',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
-              this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
-              this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
-                arr4 = arr4.concat(this.all_data[i])
+              if(this.all_data[i].first_letter !=undefined){
+                if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
+                  this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
+                  this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
+                    arr4 = arr4.concat(this.all_data[i])
+                }
               }
+              
             }
             this.patientTableData = arr4
             break
@@ -570,11 +573,14 @@ export default {
             let arr2 = []
             // console.log('4444',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
-                  this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
-                  this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
-                arr2 = arr2.concat(this.all_data[i])
+              if(this.all_data[i].first_letter !=undefined){
+                if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
+                    this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 ||
+                    this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
+                  arr2 = arr2.concat(this.all_data[i])
+                }
               }
+             
             }
             this.patientTableData = arr2
 
@@ -583,11 +589,14 @@ export default {
             let arr3 = []
             // console.log('5555',this.all_data);
             for (let i = 0; i < this.all_data.length; i++) {
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
-              this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 || 
-              this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
-                arr3 = arr3.concat(this.all_data[i])
+              if(this.all_data[i].first_letter !=undefined){
+                if (this.all_data[i].name.indexOf(this.search_input) != -1 || 
+                  this.all_data[i].his_patient.number.indexOf(this.search_input) != -1 || 
+                  this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
+                  arr3 = arr3.concat(this.all_data[i])
+                }
               }
+              
             }
             this.patientTableData = arr3
             break

src/xt_pages/hospitalStation/print.vue

@@ -14,9 +14,9 @@
 
         <div class='dialysisPage'>
             <div v-if="org_id != 10138">
-                <printOne v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-                <printFour v-if="org_id == 10088" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFour>
-                <printFive v-if="org_id == 10215 || org_id == 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFive>
+                <printOne v-if="org_id != 10088 && org_id != 10215 && org_id!=0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+                <printFour v-if="org_id == 10088 || org_id == 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFour>
+                <printFive v-if="org_id == 10215 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFive>
             </div>
             <div v-else>
                 <printThree v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -13,9 +13,9 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne  v-if="org_id != 10215 && org_id != 0 && org_id !=9671&&org_id !=9675" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
-      <summary-print v-if="org_id == 10215|| org_id == 0 || org_id ==9671 ||org_id ==9675" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
-
+      <printOne  v-if="org_id != 10215 && org_id !=0 && org_id !=9671&&org_id !=9675&& org_id !=10515" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
+      <summary-print v-if="org_id == 10215|| org_id ==9671 ||org_id ==9675" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
+      <printTwo v-if="org_id==10515 || org_id==0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printTwo>
 <!--      <list-print-two :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></list-print-two>-->
     </div>
   </div>
@@ -27,13 +27,15 @@
   import printOne from './allListTemplate/printOne'
   import ListPrintTwo from './listTemplate/listPrintTwo'
   import SummaryPrint from './allListTemplate/summaryPrint'
+  import printTwo from './allListTemplate/printTwo'
 
   export default {
     name: 'allListPrint',
     components: {
       SummaryPrint,
       ListPrintTwo,
-      printOne
+      printOne,
+      printTwo
     },
     props: {
       paramsObj: Object

src/xt_pages/outpatientCharges/allListTemplate/printTwo.vue

@@ -0,0 +1,189 @@
+<template>
+  <div id="allList-print" class="allList-print">
+    <div class="allListTitle">{{ $store.getters.xt_user.org.org_name }}费用汇总</div>
+      <div class="allListInfo">
+        <div>患者姓名：{{ patient.name }}</div>
+        <div>透析号：{{ patient.dialysis_no }}</div>
+        <div>性别：{{ patient.gender == 1 ? '男' : '女' }}</div>
+        <div>年龄：{{ patient.age }} 岁</div>
+        <div v-if="$store.getters.xt_user.org_id  == 0">日期：{{ hospital.in_hosptial_time }} 至
+          {{ hospital.out_hosptial_time }}
+        </div>
+        <div v-else>日期：{{ getTimes(order.settle_start_time) }} 至 {{ getTimes(order.settle_end_time) }}</div>
+
+      </div>
+    <div v-for='(i,index) in pageArr.length' :key="index">
+      <table class="allListTable" border="1">
+        <tr v-if="index==0">
+          <td style="width:10%">类别</td>
+          <td style="width:50%">项目名称</td>
+          <td style="width:10%">规格</td>
+          <td style="width:10%">单价(元)</td>
+          <td style="width:10%">数量</td>
+          <td style="width:10%">金额(元)</td>
+        </tr>
+        <template v-for='item in list.slice(index * 13,(index * 13) + pageArr[index])'>
+          <tr v-if="item.is_total == 2">
+            <td style="width:10%">{{ item.med_chrgitm_type }}</td>
+            <td style="width:50%">{{ item.name }}</td>
+            <td style="width:10%">{{ item.spec }}</td>
+            <td style="width:10%">{{ (item.price).toFixed(2) }}</td>
+            <td style="width:10%">{{ item.count }}{{ item.unit }}</td>
+            <td style="width:10%">{{ (item.price * item.count).toFixed(2) }}</td>
+          </tr>
+          <tr>
+            <td colspan="6" style="text-align:right;" v-if="item.is_total == 1">合计：{{ item.total }}元</td>
+          </tr>
+        </template>
+      </table>
+    </div>
+    <div class="tableBottom">
+      <div class="tableBottomOne">制表人：{{ admin.user_name }}</div>
+      <div class="tableBottomOne">制表日期：{{ getNowTime() }}</div>
+      <div class="tableBottomOne">总费用：{{ order.medfee_sumamt }}元</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from '@/utils/tools'
+
+export default {
+  props: {
+    list: {
+      type: Array,
+      default: function() {
+        return []
+      }
+    }, patient: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, order: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, admin: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    }, hospital: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+
+    }
+  },
+  data() {
+    return {
+      page: 1,
+      pageArr: []
+    }
+  },
+  methods: {
+    getNowTime: function() {
+      let dateTime
+      let yy = new Date().getFullYear()
+      let mm = new Date().getMonth() + 1
+      let dd = new Date().getDate()
+      let hh = new Date().getHours()
+      let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
+          :
+          new Date().getMinutes()
+      let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
+          :
+          new Date().getSeconds()
+      dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
+      return dateTime
+    },
+    getTimes(time) {
+      return uParseTime(time, '{y}-{m}-{d}')
+    }, getTotal: function(items) {
+      let total = 0
+      for (let i = 0; i < items.length; i++) {
+        total = total + (items[i].count * items[i].price).toFixed(2)
+      }
+      return total
+
+    },
+    getPage() {
+      if (this.list.length <= 13) {
+        this.page = 1
+        this.pageArr.push(this.list.length)
+      } else if (this.list.length > 13) {
+        this.page = parseInt(this.list.length / 13)
+        let num = this.list.length % 13
+        for (var i = 0; i < this.page; i++) {
+          this.pageArr.push(13)
+        }
+        if (num != 0) {
+          this.pageArr.push(num)
+        }
+      }
+    }
+
+  },
+  watch: {
+    list: {
+      handler(newVal) {
+        this.getPage()
+      },
+      deep: true
+    }
+  }
+}
+
+
+</script>
+
+<style lang="scss" scoped>
+.allList-print {
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  margin-bottom: 20px;
+  padding: 20px 10px;
+}
+
+.allListTitle {
+  font-size: 22px;
+  text-align: center;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+.allListInfo {
+  display: flex;
+  font-size: 14px;
+  justify-content: space-between;
+  margin: 10px 0;
+}
+
+.allListTable {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 20px;
+  font-size: 12px;
+  border-color: #000;
+  text-align: left;
+}
+
+.allListTable tr td {
+  padding: 0 5px;
+}
+
+.tableBottom {
+  font-size: 14px;
+  display: flex;
+  margin-top: 20px;
+}
+
+.tableBottomOne {
+  margin-right: 40px;
+}
+</style>

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -10,7 +10,7 @@
         type="primary"
       >打印</el-button>
     </template>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 "><!---->
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 "><!--&& org_id != 10188 && org_id != 0-->
         <div class='dialysisPage'>
           <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 && org_id != 0" >
             <printOne v-if="org_id != 10088" :paramsObj="invoiceParams"></printOne>
@@ -19,8 +19,8 @@
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
           <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive>
-          <printthirteen v-if="org_id == 0 " :paramsObj="invoiceParams"></printthirteen>
-<!--          <printEight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></printEight>-->
+          <!-- <printthirteen v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printthirteen> -->
+<!--         <printEight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></printEight>-->
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>
           <PrintNight v-if="org_id == 10210" :paramsObj="invoiceParams"></PrintNight>
           <!-- <PrintTen v-if="org_id == 10375 ||org_id == 0 " :paramsObj="invoiceParams"></PrintTen> -->
@@ -44,6 +44,11 @@
         <print-ten :paramsObj="invoiceParams"></print-ten>
       </div>
     </div>
+    <!-- <div class="app-container" style="padding-top:30px;" v-if="org_id == 10188 || org_id == 0 ">
+      <div class='dialysisPage'>
+        <printthirteen  :paramsObj="invoiceParams"></printthirteen>
+      </div>
+    </div> -->
     <!-- <div class="app-container" style="padding-top:40px;" v-if="org_id == 0">
       <div class='dialysisPage'>
         <printthirteen :paramsObj="invoiceParams"></printthirteen>

src/xt_pages/outpatientCharges/invoiceTemplate/printthirteen.vue

@@ -1,20 +1,25 @@
 
 <template>
   <div id='invoice-print'>
-    <div v-for='(i,index) in pageArr.length' :key="index" style="width: 80%;margin: 0 auto;">
-      <div style="text-align: center;width: 100%;font-size: 20px; font-weight: bolder;">盐城盐都悦达金骆驼血液透析中心收费票据</div>
+    <div v-for='(i,index) in pageArr.length' :key="index" style="width: 80%;margin: 0 auto;font-size: 16px;">
+      <div style="text-align: center;width: 100%;font-size: 20px; font-weight: bolder;">盐城响水燕舞血液透析中心收据</div>
       <div style="display: flex; margin: 15px 0 5px 0;">
-        <div style="flex: 1.5;">业务流水号:{{ list.order_number }}</div>
-        <div style="flex: 1;">医疗机构类型:</div>
-        <div style="flex: 0.6;">医生：{{ doctor_info.user_name }}</div>
+        <div style="flex: 1.1;">业务流水号:{{ list.order_number }}</div>
+        <div style="flex: 0.9;">医疗机构类型:</div>
         <div style="flex: 1;">医院国家编码：H32092103007</div>
-      </div> 
+       
+      </div>
+      <div style="display: flex;">
+        <div style="flex:1;">医生：{{ doctor_info.user_name }}</div>
+        <div style="flex: 1;">医生编码：{{ doctor_info.doctor_number }}</div>
+        <div style="flex: 1;">No.{{list.order.fa_piao_number}}</div>
+      </div>
       <div style="display: flex;border: 1px solid black;padding: 5px 0;">
         <div style="flex: 1;">姓名：{{ paramsObj.name }}</div>
         <div style="flex: 1;">性别：</div>
         <div style="flex: 1;">医保类型：</div>
         <div style="flex: 1;">社会保障号码：</div>
-       
+
       </div>
       <div style="display: flex;border: 1px solid black;text-align: center;border-top:none;">
         <div style="flex: 1;display: flex;">
@@ -26,10 +31,15 @@
           <div style="flex: 1;border-left: 1px solid black; padding: 5px 0;">数量</div>
           <div style="flex: 1;border-left: 1px solid black; padding: 5px 0;">金额</div>
         </div>
+        <div style="flex: 2;display: flex;border-left: 1px solid black;">
+          <div style="flex: 1; padding: 5px 0;">项目/规格</div>
+          <div style="flex: 1;border-left: 1px solid black; padding: 5px 0;">数量</div>
+          <div style="flex: 1;border-left: 1px solid black; padding: 5px 0;">金额</div>
+        </div>
       </div>
 
-      <div style="display: flex;border: 1px solid black;border-top:none;height: 200px;">
-        <div style="flex: 1;margin-left: 10px;" >
+      <div style="display: flex;border: 1px solid black;border-top:none;min-height: 200px;">
+        <div style="flex: 1;" >
           <div v-if="list.westernMedicineCostTotal">西药 &nbsp;&nbsp;{{ list.westernMedicineCostTotal }}</div>
           <div v-if="list.treatCostTotal">治疗费 &nbsp;&nbsp;{{ list.treatCostTotal }}</div>
           <div v-if="list.bedCostTotal">床位费 &nbsp;&nbsp;{{ list.bedCostTotal }}</div>
@@ -40,8 +50,8 @@
           <div v-if="list.materialCostTotal">材料费 &nbsp;&nbsp;{{ list.materialCostTotal }}</div>
         </div>
         <div style="flex: 2;border-left: 1px solid black;">
-          <div v-for="item in list.order_info.slice(index * 10,(index * 10) + pageArr[index])" style="margin-left: 10px;">
-            <span style="display:inline-block;width:300px;">
+          <div v-for="item in list.order_info.slice(index * 10,(index * 10) + pageArr[index])" style="">
+            <span style="display:inline-block;width:56%;">
                 <span v-if="item.advice.id == 0">
                     <span v-if="item.project.type == 2">{{ item.project.project.project_name }}</span>
                     <span v-if="item.project.type == 3">{{ item.project.good_info.good_name }}</span>
@@ -64,6 +74,9 @@
             </span>
           </div>
         </div>
+        <div style="flex: 2;border-left: 1px solid black;">
+          
+        </div>
       </div>
       <div style="display: flex;border:1px solid black;border-top: none;">
         <div style="flex: 2; padding: 5px 0;">
@@ -72,51 +85,45 @@
         </div>
         <div style="flex: 1;border-left: 1px solid black; padding: 5px 0;">￥：{{ list.medfee_sumamt }}</div>
       </div>
-      <div style="display: flex;border:1px solid black;border-top: none;height: 70px;">
-        <div 
-          style="flex: 0.5;border-right: 1px solid black; padding: 5px 0;
-          text-align: center;line-height: 60px;font-weight: bolder;"
-        >
-          附注:
-        </div>
-        <div style="flex: 2; padding: 5px 0; position: relative;">
+      <div style="border:1px solid black;border-top: none;height: 80px;">
+        <div style="padding: 5px 0; position: relative;">
           <div v-if="index == pageArr.length - 1">
-                <div style="display:flex;">
-                  <div style="width:150px">医疗总费用：{{ list.order.medfee_sumamt }}</div>
-                  <div style="width:150px">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
-                  <div style="width:150px">统筹支出：{{ list.order.hifp_pay }}</div>
-                  <div style="width:150px">大病支出：{{list.order.hifmi_pay}}</div>
-
-                </div>
-                <div style="display:flex;">
-                  <div style="width:150px">个人账户支付：{{ list.order.acct_pay }}</div>
-                  <div style="width:150px">现金支出：{{ list.order.psn_cash_pay }}</div>
-                  <div style="width:150px">本次账户：0</div>
-                  <div style="width:150px">上次账户：0</div>
-                </div>
-              <div style="display:flex;">
-                <div style="width:150px">账户余额：{{ list.order.balc }}</div>
-                <div style="width:150px">其他支出：{{ list.order.oth_pay }}</div>
-                <div style="width:150px">大病补充保险支出：0</div>
-                <div style="width:150px">民政支出：0</div>
-              </div>
-              <div style="display:flex;">
-                <div style="width:220px">医疗救助基金支出：{{ list.order.maf_pay }}</div>
-                <div style="width:280px">企业补充医疗保险基金支出：{{ list.order.hifes_pay }}</div>
-              </div>
+            <div style="display:flex;">
+              <div style="flex: 1;">医疗总费用：{{ list.order.medfee_sumamt }}</div>
+              <div style="flex: 1;">基金支付总额：{{ list.order.fund_pay_sumamt }}</div>
+              <div style="flex: 1;">统筹支出：{{ list.order.hifp_pay }}</div>
+              <div style="flex: 1;">大病支出：{{list.order.hifmi_pay}}</div>
 
             </div>
-          <span style="position: absolute;left: 90%;top: 70%;">(手写无效)</span>
+            <div style="display:flex;">
+              <div style="flex: 1;">个人账户支付：{{ list.order.acct_pay }}</div>
+              <div style="flex: 1;">现金支出：{{ list.order.psn_cash_pay }}</div>
+              <div style="flex: 1;">本次账户：0</div>
+              <div style="flex: 1;">上次账户：0</div>
+            </div>
+            <div style="display:flex;">
+              <div style="flex: 1;">账户余额：{{ list.order.balc }}</div>
+              <div style="flex: 1;">其他支出：{{ list.order.oth_pay }}</div>
+              <div style="flex: 1;">大病补充保险支出：0</div>
+              <div style="flex: 1;">民政支出：0</div>
+            </div>
+            <div style="display:flex;">
+              <div style="flex: 1;">医疗救助基金支出：{{ list.order.maf_pay }}</div>
+              <div style="flex: 1;">企业补充医疗保险基金支出：{{ list.order.hifes_pay }}</div>
+            </div>
+
+          </div>
+          <!-- <span style="position: absolute;left: 80%;top: 70%;">(手写无效)</span> -->
         </div>
       </div>
       <div style="display: flex;">
         <div style="flex: 1;">收款单位（章）：{{ org_name }}</div>
         <div style="flex: 1;">收费员：{{ paramsObj.chargeName }}</div>
-        <div style="flex: 1;"> 
+        <div style="flex: 1;">
           <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
           年
           <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
-          月  
+          月
           <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
           日
           </div>
@@ -267,4 +274,4 @@ export default {
         }
     }
 }
-</script>
+</script>

src/xt_pages/outpatientCharges/invoiceTemplate/printtwelve.vue

@@ -80,27 +80,26 @@
         <div :style="{position: 'absolute',top:(80 + (index * 450))  + 'px',left:'30px'}">
           {{paramsObj.name}}
         </div>
-        <div :style="{position: 'absolute',top:(80 + (index * 450))  + 'px',left:'200px'}">
+        <!-- <div :style="{position: 'absolute',top:(80 + (index * 450))  + 'px',left:'200px'}">
           {{list.order.fa_piao_number}}
-        </div>
+        </div> -->
       </div>
 
       <div style="display: flex;">
         <div :style="{position: 'absolute',top:(100 + (index * 450))  + 'px',left:'81px'}">
-
         </div>
         <div :style="{position: 'absolute',top:(100 + (index * 450))  + 'px',left:'190px'}">
-
+          
         </div>
         <div :style="{position: 'absolute',top:(100 + (index * 450))  + 'px',left:'300px'}">
         {{printDate}}
         </div>
       </div>
       <div style="display: flex;">
-        <div :style="{position: 'absolute',top:(170+(index * 450))+'px',left:'75px'}">{{list.westernMedicineCostTotal?list.westernMedicineCostTotal:""}}</div>
-        <div :style="{position: 'absolute',top:(170+(index * 450))+'px',left:'121px'}"></div>
-        <div :style="{position: 'absolute',top:(170+(index * 450))+'px',left:'270px'}">{{ list.operationCostTotal?list.operationCostTotal:""}}</div>
-        <div :style="{position: 'absolute',top:(170+(index * 450))+'px',left:'310px'}"></div>
+        <div :style="{position: 'absolute',top:(155+(index * 450))+'px',left:'75px'}">{{list.westernMedicineCostTotal?list.westernMedicineCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:(155+(index * 450))+'px',left:'121px'}"></div>
+        <div :style="{position: 'absolute',top:(155+(index * 450))+'px',left:'270px'}">{{ list.operationCostTotal?list.operationCostTotal:""}}</div>
+        <div :style="{position: 'absolute',top:(155+(index * 450))+'px',left:'310px'}"></div>
       </div>
       <div style="display: flex;">
         <div :style="{position: 'absolute',top:(190+(index * 450))+'px',left:'75px'}">{{list.chineseTraditionalMedicineCostTotal?list.chineseTraditionalMedicineCostTotal:""}}</div>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -31,7 +31,7 @@
           v-if="org_id == 10138 || org_id == 10278  "
         ></printThree>
         <printFour
-          v-if="org_id == 9504 || org_id == 10028 || org_id == 10088 || org_id == 0 "
+          v-if="org_id == 9504 || org_id == 10028 || org_id == 10088 "
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
@@ -55,20 +55,22 @@
       </printSeven>
       <print10191 :info="info" v-if="org_id == 10191"></print10191>
       <printTen :info="info" v-if="org_id == 10210"></printTen>
-      <printEleven :info="info" v-if="org_id == 10485 || org_id == 0"></printEleven>
+      <printEleven :info="info" v-if="org_id == 10485"></printEleven>
+      <!-- 阜阳经沃 -->
+      <printtwelve :info="info" v-if="org_id == 10480 || org_id == 0"></printtwelve>
       <printOne :info="info" v-if=" org_id != 9990 &&
             org_id != 10138 &&
             org_id != 9504 &&
             org_id != 10028 &&
             org_id != 0 &&
-            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 && this.paramsObj.balance_accounts_type == 1">
+            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 10480 && this.paramsObj.balance_accounts_type == 1">
       </printOne>
 
       <privateChargePrint :info="info" v-if="org_id != 9990 &&
             org_id != 10138 &&
             org_id != 9504 &&
             org_id != 10028 &&
-            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 0 && this.paramsObj.balance_accounts_type == 2">
+            org_id != 10278 && org_id != 10387 && org_id != 10191 &&org_id != 10210 &&org_id != 10485 &&org_id != 0 &&org_id != 10480 && this.paramsObj.balance_accounts_type == 2">
       </privateChargePrint>
 
     </div>
@@ -92,7 +94,7 @@ import printSeven from './statementTemplate/printSeven'
 import Print10191 from './statementTemplate/print10191'
 import printTen from './statementTemplate/printTen'
 import printEleven from './statementTemplate/printeEleven'
-
+import printtwelve from './statementTemplate/printtwelve'
 export default {
   name: 'dialysisPrintOrder',
   components: {
@@ -107,7 +109,8 @@ export default {
     testVue,
     printFive,
     printTen,
-    printEleven
+    printEleven,
+    printtwelve
   },
   props: {
     paramsObj: Object
@@ -302,7 +305,7 @@ export default {
           //   scanStyles: false,
           // });
         } else if (
-          this.$store.getters.xt_user.org_id == 10485 || this.$store.getters.xt_user.org_id == 0
+          this.$store.getters.xt_user.org_id == 10485
         ) {
           const style =
             '@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table tr td {padding: 5px;line-height: 30px;border: none;}'
@@ -313,6 +316,18 @@ export default {
             scanStyles: false
           })
 
+        }else if (
+          this.$store.getters.xt_user.org_id == 10480 || this.$store.getters.xt_user.org_id == 0
+        ) {
+          const style =
+            '@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table tr td {padding: 2px;line-height: 30px;border: 1px solid black;text-align: center;}'
+          printJS({
+            printable: 'statement-print',
+            type: 'html',
+            style: style,
+            scanStyles: false
+          })
+
         } else {
           const style =
             '@media print {#statement-print{font-size:14px;border:1px solid white}.statementTitle{font-size: 22px;text-align: center;font-weight: bold;}table{border-collapse: collapse;text-align: center;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 57%;}}}'

src/xt_pages/outpatientCharges/statementTemplate/printFive.vue

@@ -23,7 +23,7 @@
       </tr>
 
         <!-- 帐单列表分为左右两列，需要对数据进行x/2分别放进list_L，list_R两个数组进行循环 -->
-        <tr>
+        <tr></tr>
 <!--          <td colspan="24">-->
 <!--            <template v-for="(v, i) in info.list" >-->
 <!--              <el-row gutter="24" >-->

src/xt_pages/outpatientDoctorStation/checkTemplate/printThree.vue

@@ -1,121 +1,114 @@
 <template>
-  <div>
+  <div id="prescription-print">
     <div v-for="(item, index) in advicePrint" :key="index">
-      <div id="prescription-print3" class="prescription-print">
-        
-        <div class="printTitle">检验申请单</div>
-
-        <div style="border: 1px solid #000;margin-bottom: 10px;">
-          <div
-            style="
-              display: flex;
-              justify-content: space-between;
-              border-bottom: 1px solid #000;
-              line-height: 40px;
-              padding: 0 10px;
-            "
-          >
-            <div>是否急诊：否</div>
-            <div>
-              结算方式：{{
-                faber && faber.transBody
-                  ? getName(faber.transBody.outputlist1)
-                  : ""
-              }}
-            </div>
-            <div>金额：{{ total }}</div>
-          </div>
-          <div
-            style="
-              display: flex;
-              justify-content: space-between;
-              border-bottom: 1px solid #000;
-              line-height: 40px;
-              padding: 0 10px;
-            "
-          >
-            <div>
-              姓名：{{ item.patient.name }}
-              <!-- {{
-                advicePrint[0].patient.name
-                  ? advicePrint[0].patient.name.indexOf("（") > -1
-                    ? advicePrint[0].patient.name.substring(
-                        0,
-                        advicePrint[0].patient.name.indexOf("（")
-                      )
-                    : advicePrint[0].patient.name
-                  : ""
-              }} -->
-            </div>
-            <div>
-              性别：
-              <span v-if="item.patient.gender == 1">男</span>
-              <span v-if="item.patient.gender == 2">女</span>
-            </div>
-            <div>年龄：{{getAge(item.patient)?getAge(item.patient):""}}岁</div>
-
-          </div>
-          <div style="margin-bottom: 20px; padding: 10px 10px 0" >
-            病史摘要：{{
-              history.history_of_present_illness
-                ? history.history_of_present_illness
+    <div      id="prescription-print"  class="prescription-print"     style="page-break-after: always">
+      <div class="printTitle">检验申请单</div>
+
+      <div style="border: 1px solid #000;margin-bottom: 10px;">
+        <div
+          style="
+            display: flex;
+            justify-content: space-between;
+            border-bottom: 1px solid #000;
+            line-height: 40px;
+            padding: 0 10px;
+          "
+        >
+          <div>是否急诊：否</div>
+          <div>
+            结算方式：{{
+              faber && faber.transBody
+                ? getName(faber.transBody.outputlist1)
                 : ""
             }}
           </div>
-          <!-- <div style="margin-bottom:20px;padding:0 10px;"   >体格检查：
-                      <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
-                      <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>
-                      <span>呼吸：{{ history.breathing ? history.breathing + '次/分' : '/' }}</span>
-                      <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
-                  </div> -->
-          <div style="margin-bottom: 20px; padding: 0 10px">
-            临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
+          <div>金额：{{ total }}</div>
+        </div>
+        <div
+          style="
+            display: flex;
+            justify-content: space-between;
+            border-bottom: 1px solid #000;
+            line-height: 40px;
+            padding: 0 10px;
+          "
+        >
+          <div>
+            姓名：{{
+              advicePrint[0].patient.name
+                ? advicePrint[0].patient.name.indexOf("（") > -1
+                  ? advicePrint[0].patient.name.substring(
+                    0,
+                    advicePrint[0].patient.name.indexOf("（")
+                  )
+                  : advicePrint[0].patient.name
+                : ""
+            }}
           </div>
-          <div style="display: flex; margin-bottom: 20px; padding: 0 10px">
-            <div>检验项目：</div>
-            <div style="position: relative;">
-              <div v-for="item in projectPrint" style="margin-bottom: 10px">
-                {{ item.team.project_team }}
-              </div>
-              <div v-for="item in singleProjectPrint">
-                <!-- <div v-if="item.remark == '血透前抽血'" style="border-right: 1px solid red;padding-bottom: 5px;"> -->
-                  {{ item.project.project_name }}
-                <!-- </div> -->
-              </div>
-              <!-- <div style="height: 10px;"></div>
-              <div v-for="item in singleProjectPrint" >
-                <div v-if="item.remark == '血透后抽血'" style="border-right: 1px solid rgb(0, 47, 255);padding-bottom: 5px;">
-                  {{ item.project.project_name }}
-                </div>
-              </div> -->
-              <!-- <span style="position: absolute;top: 65px;right: -77px;" v-if=" singleProjectPrint.length>0">血透前抽血</span>
-              <span style="position: absolute;bottom: 96px;right: -77px;" v-if=" singleProjectPrint.length>0">血透后抽血</span> -->
-            </div>
+          <div>
+            性别：
+            <span v-if="advicePrint[0].patient.gender == 1">男</span>
+            <span v-if="advicePrint[0].patient.gender == 2">女</span>
           </div>
-          <div
-            style="
-              display: flex;
-              justify-content: space-between;
-              border-top: 1px solid #000;
-              line-height: 40px;
-              padding: 0 10px;
-            "
-          >
-            <div>开单医生：{{ doctor ? doctor : "" }}</div>
-            <div>
-              开单日期：
-              {{ getTime(pre_time) ? getTime(pre_time).split(" ")[0] : "" }}
-            </div>
-            <div>
-              医生签字：
+          <!--          <div>-->
+          <!--            年龄：{{-->
+          <!--              advicePrint[0].patient.age ? advicePrint[0].patient.age : ""-->
+          <!--            }}岁-->
+          <!--          </div>-->
+          <div>年龄：{{getAge(advicePrint[0].patient)?getAge(advicePrint[0].patient):""}}岁</div>
 
-              <span style="width: 100px; display: inline-block"></span>
+        </div>
+        <div style="margin-bottom: 20px; padding: 10px 10px 0" v-if="org_id!=10278 && org_id!=10138 && org_id!=0">
+          病史摘要：{{
+            history.history_of_present_illness
+              ? history.history_of_present_illness
+              : ""
+          }}
+        </div>
+        <!-- <div style="margin-bottom:20px;padding:0 10px;">体格检查：
+                    <span>体温：{{ history.temperature ? history.temperature + '℃' : '/' }}</span>
+                    <span>脉搏：{{ history.pulse ? history.pulse + '次/分' : '/' }}</span>
+                    <span>呼吸：{{ history.breathing ? history.breathing + '次/分' : '/' }}</span>
+                    <span>血压：{{ history.sbp }}/{{ history.dbp }}mmHg</span>
+                </div> -->
+        <div style="margin-bottom: 20px; padding: 0 10px">
+          临床诊断：{{ getDiagnosis(advicePrint[0].info.diagnosis) }}
+        </div>
+        <div style="display: flex; margin-bottom: 20px; padding: 0 10px">
+          <div>检验项目：</div>
+          <div>
+<!--            <div v-for="item in projectPrint" style="margin-bottom: 10px">-->
+<!--              {{ item.team.project_team }}-->
+<!--            </div>-->
+            <div v-for="subitem in item.singleProjectPrint" style="margin-bottom: 10px">
+              {{ subitem.project.project_name }}
             </div>
           </div>
         </div>
-      
+        <div
+          style="
+            display: flex;
+            justify-content: space-between;
+            border-top: 1px solid #000;
+            line-height: 40px;
+            padding: 0 10px;
+          "
+        >
+          <div>开单医生：{{ doctor ? doctor : "" }}</div>
+          <div>
+            开单日期：
+            {{ getTime(pre_time) ? getTime(pre_time).split(" ")[0] : "" }}
+          </div>
+          <div>
+            医生签字：
+            <span style="width: 100px; display: inline-block"></span>
+          </div>
+        </div>
       </div>
+   
     </div>
+    </div>
+
   </div>
 </template>
 <script>
@@ -281,7 +274,7 @@ export default {
           var projectlist = response.data.data.projectlist;
 
           var projectlist = response.data.data.projectlist;
-          console.log("所有项目列表", this.singleProjectPrint);
+          // console.log("所有项目列表", projectlist);
           this.projectList = projectlist;
           this.getPage();
           let outputlist1Name = response.data.data.his.patient_info
@@ -345,7 +338,7 @@ export default {
               total =
                 total +
                 this.prescriptions[i].project[a].price *
-                  this.prescriptions[i].project[a].count;
+                this.prescriptions[i].project[a].count;
             }
           }
 
@@ -358,7 +351,7 @@ export default {
               addtotal =
                 addtotal +
                 this.prescriptions[i].additionalcharge[a].price *
-                  this.prescriptions[i].additionalcharge[a].count;
+                this.prescriptions[i].additionalcharge[a].count;
             }
           }
           addtotal = Math.floor(addtotal * 100) / 100;
@@ -372,7 +365,7 @@ export default {
               total =
                 total +
                 this.prescriptions[i].advices[a].price *
-                  this.prescriptions[i].advices[a].prescribing_number;
+                this.prescriptions[i].advices[a].prescribing_number;
             }
           }
 
@@ -385,7 +378,7 @@ export default {
               addtotal =
                 addtotal +
                 this.prescriptions[i].additionalcharge[a].price *
-                  this.prescriptions[i].additionalcharge[a].count;
+                this.prescriptions[i].additionalcharge[a].count;
             }
           }
           addtotal = Math.floor(addtotal * 100) / 100;
@@ -556,9 +549,9 @@ export default {
 <style lang="scss" scoped>
 .prescription-print {
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
-    0 0 60px rgba(0, 0, 0, 0.06) inset;
+  0 0 60px rgba(0, 0, 0, 0.06) inset;
   -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
-    0 0 40px rgba(0, 0, 0, 0.06) inset;
+  0 0 40px rgba(0, 0, 0, 0.06) inset;
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
   margin-bottom: 20px;
   padding: 20px 10px;

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -314,7 +314,7 @@
                                           </template>
                                       </el-table-column>
 
-                                      <el-table-column label="库存" width="60" v-if="org_id != 10454">
+                                      <el-table-column label="库存" width="60" v-if="org_id != 10206">
                                           <template slot-scope="scope">
                                              <!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217 || org_id ==10210 || org_id ==record_date ||org_id ==10340">
                                              <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
@@ -426,9 +426,9 @@
                                                  {{scope.row.stock_count}}
                                             </span>
                                             <span v-else> {{ scope.row.total }}</span> -->
-                                            <span v-if="org_id != 10454 && scope.row.type == 3 && scope.row.good_info.sum_count > 0">{{scope.row.good_info.sum_count}}</span>
+                                            <span v-if="org_id != 10206 && scope.row.type == 3 && scope.row.good_info.sum_count > 0">{{scope.row.good_info.sum_count}}</span>
 <!--                                            //针对坐标系统的库存数据-->
-                                            <span v-if="org_id == 10454 && scope.row.type == 3">{{scope.row.good_info.zuobiao_stock_num}}</span>
+                                            <span v-if="org_id == 10206 && scope.row.type == 3">{{scope.row.good_info.zuobiao_stock_num}}</span>
 
                                           </template>
                                       </el-table-column>
@@ -1617,14 +1617,17 @@ export default {
 
     }, searchProjectAction() {
       console.log('~~~~',this.search_project_keyword)
-      // console.log(this.allProject)
+      console.log('5555',this.tabProject)
+      console.log('6666',this.allProject)
+      // console.log('4444',this.tabProject[1].first_letter.indexOf(this.search_project_keyword) != -1)
       if (this.search_project_keyword.length == 0) {
         this.tabProject = this.allProject
-
       } else {
         let arr = []
         for (let i = 0; i < this.allProject.length; i++) {
 
+            // console.log('4444',this.tabProject[i].first_letter.indexOf(this.search_project_keyword) != -1)
+
             if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
               arr = arr.concat(this.allProject[i])
             }
@@ -3601,6 +3604,7 @@ export default {
               is_special_diseases: good_info[i].is_special_diseases,
               good_info: good_info[i],
               stock_count:good_info[i].stock_count,
+              first_letter:good_info[i].first_letter,
               bbx01:good_info[i].bbx01,
               zuobiao_stock_num:0,
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -854,12 +854,15 @@ export default {
           case 0:
             let arr = []
             for (let i = 0; i < this.all_data.length; i++) {
-              if (this.all_data[i].name.indexOf(this.search_input) != -1 ||
-               this.all_data[i].number.indexOf(this.search_input) != -1 ||
-               this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
-                arr = arr.concat(this.all_data[i])
-                console.log(arr)
+              if( this.all_data[i].first_letter !=undefined){
+                if (this.all_data[i].name.indexOf(this.search_input) != -1 ||
+                this.all_data[i].number.indexOf(this.search_input) != -1 ||
+                this.all_data[i].first_letter.indexOf(this.search_input) != -1) {
+                  arr = arr.concat(this.all_data[i])
+                  console.log(arr)
+                }
               }
+
             }
             this.all_data = arr
 
@@ -868,12 +871,15 @@ export default {
             let arr2 = []
 
             for (let i = 0; i < this.cure_data.length; i++) {
-              if (this.cure_data[i].name.indexOf(this.search_input) != -1 ||
-              this.cure_data[i].number.indexOf(this.search_input) != -1 ||
-              this.cure_data[i].first_letter.indexOf(this.search_input) != -1) {
-                console.log('2222',this.cure_data);
-                arr2 = arr2.concat(this.cure_data[i])
+              if(this.cure_data[i].first_letter != undefined){
+                if (this.cure_data[i].name.indexOf(this.search_input) != -1 ||
+                  this.cure_data[i].number.indexOf(this.search_input) != -1 ||
+                  this.cure_data[i].first_letter.indexOf(this.search_input) != -1) {
+                    console.log('2222',this.cure_data);
+                    arr2 = arr2.concat(this.cure_data[i])
+                }
               }
+
             }
             this.cure_data = arr2
 
@@ -1492,7 +1498,7 @@ export default {
           this.additions = response.data.data.additions
 
           //针对普爱医院获取药品和耗材相关库存数据
-          if(this.org_id == 10454 || this.org_id == 10205){
+          if(this.org_id == 10206){
             var that = this
             axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystock', {
 
@@ -1569,7 +1575,7 @@ export default {
                 his_patient_id: response.data.data.list_two[i].his_patient.id,
                 first_letter:response.data.data.list_two[i].first_letter
               }
-              console.log('6666',obj);
+              // console.log('6666',obj);
               this.un_cure_data.push(obj)
             }
 
@@ -1598,7 +1604,7 @@ export default {
                   his_patient_id: response.data.data.list[i].his_patient[b].id,
                   first_letter:response.data.data.list[i].first_letter
                 }
-                console.log('8888',obj);
+                // console.log('8888',obj);
                 this.un_cure_data.push(obj)
               }
               //已就诊

src/xt_pages/outpatientDoctorStation/print.vue

@@ -3,7 +3,7 @@
     <div class="dialysisPage" style="padding-top: 40px">
       <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243">
 
-        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188" v-bind:childResponse="childResponse"
+        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188 && org_id != 0" v-bind:childResponse="childResponse"
         :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient"
         :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date"
         :prescription_id="prescription_id"></printOne>
@@ -28,7 +28,7 @@
         </prinSeven>
 
         <printFour
-          v-if="org_id == 10088"
+          v-if="org_id == 10088 || org_id == 0"
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"
@@ -99,7 +99,7 @@ import {
   getAllDoctorList,
   getAllHisPatientList,
 } from "@/api/project/project";
-import PrintTen from '../outpatientCharges/invoiceTemplate/printTen.vue'
+import PrintTen from '../outpatientCharges/invoiceTemplate/printTen'
 import PrintTenOne from './template/printTenOne.vue'
 export default {
   name: "dialysisPrintOrder",
@@ -159,7 +159,7 @@ export default {
       }
        else {
         const style =
-          "@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;position: relative;}.drugsBox div{line-height: 20px;width:80%} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBoxxxx{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .doctorBoxxxx p {margin-left: auto} .actionBar p{width:150px;}}";
+          "@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{padding:0 10px;min-height:100px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;position: relative;}.drugsBox div{line-height: 20px;width:80%} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBoxxxx{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .doctorBoxxxx p {margin-left: auto} .actionBar p{width:150px;}}";
         printJS({
           printable: "prescriptionPrint",
           type: "html",

src/xt_pages/outpatientDoctorStation/template/printFour.vue

@@ -52,7 +52,28 @@
 
           </div>
           <div class="doctorBox">
-              <p>医师：{{item.doctor?item.doctor:""}}</p>
+            <p>
+            医师：
+            <span
+              style="display: inline-block"
+              v-if="item.creator == ''"
+            >
+                {{ item.doctor }}
+              </span>
+            <span
+              style="display: inline-block"
+              v-else-if="doc_name != ''"
+            >
+                {{ doc_name }}
+              </span>
+            <img
+              style="height: 50px;"
+              :src="setAdminUserES(item.creator,item.doctor)"
+              alt=""
+              srcset=""
+
+            />
+          </p>
               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
           </div>
           <div class="actionBar">
@@ -61,7 +82,6 @@
                  <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
                  <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
                  <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p> -->
-
                  <p>审核：</p>
                  <p>配对：</p>
                  <p>核对：</p>
@@ -105,9 +125,29 @@ export default {
         projectList:[],
         orgname:"",
         diagnoses:[],
+        operatorMaps: {},
+        operators: [],
+        doctorList_1: [],
       }
     },
    methods:{
+   // 电子签名
+   setAdminUserES(id,name) {
+      console.log(id)
+      console.log(name)
+      console.log(this.operatorMaps)
+
+
+      if (id == 0) {
+        return "";
+      }
+      if (id in this.operatorMaps) {
+        return this.operatorMaps[id].url;
+      } else {
+        this.doc_name = name
+        return "";
+      }
+    },
      getAge(patient){
        var thisLen = patient.id_card_no.length
        var birth = ''
@@ -171,6 +211,18 @@ export default {
             this.advicePrint = advicePrint
             this.prescriptions = advicePrint
             console.log("处方222222",this.prescriptions)
+            this.doctorList_1 = response.data.data.eles;
+            console.log(this.doctorList_1, "医生列表");
+            if (this.doctorList_1.length > 0) {
+              var operatorsLen = this.doctorList_1.length;
+              for (var index = 0; index < operatorsLen; index++) {
+                this.$set(
+                  this.operatorMaps,
+                  this.doctorList_1[index].creator,
+                  this.doctorList_1[index]
+                );
+              }
+            }
             var hisPatient = response.data.data.hisPatient
             console.log("hisPatient",hisPatient)
             this.hisPatient = hisPatient

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -56,7 +56,7 @@
             </div>
           </div>
         </div>
-        <div class="prescriptionBox" >
+        <div class="prescriptionBox" style="min-height: 350px;">
           <div class="Rp">Rp:</div>
           <div
             class="drugsBox"

src/xt_pages/role/admin.vue

@@ -287,7 +287,7 @@
               </el-button>
             </span> -->
 
-            <!-- <span>
+           <!-- <span>
               <el-button type="primary" size="small" @click="toQianShu(scope.row.user_id,scope.row.user_name)">
                     <span>创建签署人用户</span>
               </el-button>
@@ -297,13 +297,13 @@
               <el-button type="primary" size="small" @click="toYinZhang(scope.row.user_id,scope.row.user_name)">
                     <span>创建个人印章</span>
               </el-button>
-            </span>
-
+            </span>  -->
+<!-- 
             <span>
               <el-button type="primary" size="small" @click="toShouQuan(scope.row.user_id,scope.row.user_name)">
                     <span>创建企业印章</span>
               </el-button>
-            </span> -->
+            </span>  -->
             <el-tooltip
               class="item"
               effect="dark"
@@ -1046,11 +1046,13 @@ export default {
       })
     },
    
-    toQianShu(){
-      CreateQianshuUserName().then(response=>{
+    toQianShu(admin_user_id){
+       
+      CreateQianshuUserName(admin_user_id).then(response=>{
          if(response.data.state==1){
           var sign =  response.data.data.sign
           var userId =  response.data.data.userId
+          this.$message.success("签署成功!")
          }
       }) 
     },

src/xt_pages/role/components/AdminInfoForm.vue

@@ -75,7 +75,7 @@
        </el-form-item>
     </el-col>
     <el-col :span="8">
-       <el-form-item label="工号:">
+       <el-form-item label="身份证(工号):">
            <el-input v-model="form.job_number" style="width:180px;"></el-input>
        </el-form-item>
     </el-col>

src/xt_pages/sign/signIn.vue

@@ -45,6 +45,7 @@
                         <div :class="Object.keys(queueInfo).length>0 ? 'signInMainLeft' : 'signInMainLeft100'">
                             <div class="signInMainLeftTitle">
                                 <p>排队号</p>
+                                <p v-if="$store.getters.xt_user.org.id==3877 || $store.getters.xt_user.org.id==10485">床位号</p>
                                 <p>姓名</p>
                                 <p>病历号</p>
                                 <p>签到时间</p>
@@ -57,6 +58,7 @@
                                         <span v-if="item.schedule_type == 3">晚上</span>
                                         {{ item.queue_no }}号
                                     </p>
+                                    <p v-if="$store.getters.xt_user.org.id==3877 || $store.getters.xt_user.org.id==10485">{{ item.partition_name + item.bed_name }}</p>
                                     <p>{{ item.patient_name }}</p>
                                     <p>{{ item.dialysis_no }}</p>
                                     <p>{{ item.create_time }}</p>
@@ -138,8 +140,10 @@
                         <div :class="Object.keys(queueInfo).length>0 ? 'signInMainLeft' : 'signInMainLeft100'">
                             <div class="signInMainLeftTitle">
                                 <p>排队号</p>
+                                <p v-if="$store.getters.xt_user.org.id==3877 || $store.getters.xt_user.org.id==10485">床位号</p>
                                 <p>姓名</p>
                                 <p>病历号</p>
+                                
                                 <p>签到时间</p>
                             </div>
                             <div class="signInList">
@@ -150,6 +154,7 @@
                                         <span v-if="item.schedule_type == 3">晚上</span>
                                         {{ item.queue_no }}号
                                     </p>
+                                    <p v-if="$store.getters.xt_user.org.id==3877 || $store.getters.xt_user.org.id==10485">{{ item.partition_name + item.bed_name }}</p>
                                     <p>{{ item.patient_name }}</p>
                                     <p>{{ item.dialysis_no }}</p>
                                     <p>{{ item.create_time }}</p>
@@ -257,6 +262,7 @@ export default {
         },
     },
     created(){
+        
         if(sessionStorage.getItem('signInKey') != null){
             if(sessionStorage.getItem('signInKey') == 1){
                 this.dialogTableVisible = true
@@ -340,6 +346,7 @@ export default {
                     if(res.channel == 'queue/join'){
                         if(res.data.type == 1){
                             this.signInList = res.data.patientQueueList.data
+                            console.log("signInListWOOWOWOWOWOWOW",this.signInList)
                             this.count = res.data.patientQueueList.count
                             this.signInList.map(item => {
                                 item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
@@ -363,6 +370,7 @@ export default {
                     }else if(res.channel == 'queue/queuelist'){
                         console.log(11111111111,res.data)
                         this.signInList = res.data.patientQueueList.data
+                        console.log("signInListWOOWOWOWOWOWOW",this.signInList)
                         this.count = res.data.patientQueueList.count
                         this.signInList.map(item => {
                             item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
@@ -370,6 +378,7 @@ export default {
                     }else if(res.channel == 'queue/queuelistbyq'){
                         console.log(11111111111,res.data)
                         this.signInList = res.data.patientQueueList.data
+                        console.log("signInListWOOWOWOWOWOWOW",this.signInList)
                         this.count = res.data.patientQueueList.count
                         this.signInList.map(item => {
                             item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -821,17 +821,20 @@ export default {
           const array = this.recordInfo.recordData;
           if (this.storehouse_id == 0) {
             this.$message.error("仓库不能为空!");
+            this.loading = false;
             return false;
           }
           for (let i = 0; i < array.length; i++) {
             if (array[i].drug_id == 0) {
               this.$message.error("药品名称或者药品规格名称不能为空");
+              this.loading = false;
               return;
             }
           }
 
           if (this.recordInfo.recordData.length <= 0) {
             this.$message.success("请添加入库商品");
+            this.loading = false;
             return;
           }
 

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -813,6 +813,9 @@ export default {
         count_two +=val3[i].count
       }
      }
+     console.log("countwowowoowow3333",count)
+     console.log("count_one222222",count_one)
+     console.log("count_two222222",count_two)
      all_count = count +count_one - count_two
      if(all_count >0){
        return all_count

src/xt_pages/stock/stockFlow.vue

@@ -96,6 +96,12 @@
              {{getTime(scope.row.ctime)}}
            </template>
         </el-table-column>
+
+        <el-table-column prop="drug_name" label="出库日期" align="center">
+           <template slot-scope="scope">
+             {{getTime(scope.row.system_time)}}
+           </template>
+        </el-table-column>
         <el-table-column prop="drug_name" label="仓库名称"  align="center">
            <template slot-scope="scope">
              <span>{{getHouseName(scope.row.storehouse_id)}}</span>

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -661,16 +661,19 @@ export default {
           for (let i = 0; i < array.length; i++) {
             if (array[i].good_type_id == 0) {
               this.$message.error("商品类型不能为空");
+              this.loading = false
               return;
             }
             if (array[i].good_id == 0) {
               this.$message.error("规格名称不能为空");
+              this.loading = false
               return;
             }
             total = total + array[i].price * array[i].return_count;
           }
           if (this.recordInfo.recordData.length <= 0) {
             this.$message.success("请添加出库商品");
+            this.loading = false
             return;
           }
 
@@ -696,6 +699,13 @@ export default {
           }
 
           for(let i=0;i<this.recordInfo.recordData.length;i++){
+             
+            if(parseInt(this.recordInfo.recordData[i].count) > parseInt(this.recordInfo.recordData[i].stock_count) ){
+               this.$message.error(this.recordInfo.recordData[i].good_name+"/"+this.recordInfo.recordData[i].specification_name+"库存不足!")
+               this.loading = false
+               return
+            }
+
             for(let j=0;j<this.manufacturerList.length;j++){
               if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
                  this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
@@ -720,11 +730,13 @@ export default {
               }
 
             }
+            
           }
           const params = {
             stockOut: this.recordInfo.recordData
           };
-
+          console.log("pramsswoowowowoow",params)
+          console.log(" this.warehouseOut_id", this.warehouseOut_id)
           const loading = this.$loading({
             lock: true,
             text: 'Loading',
@@ -921,7 +933,7 @@ export default {
 
     },
     getSupplyCount(count,sum_count,index){
-
+       
       if(sum_count < count){
         this.$message.error("出库数量不能大于剩余库存")
         for(let i=0;i<this.recordInfo.recordData.length;i++){

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -648,14 +648,22 @@
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
                 this.$message.error('商品类型不能为空')
+                this.loading = false
                 return
               }
               if (array[i].good_id == 0) {
                 this.$message.error('规格名称不能为空')
+                this.loading = false
                 return
               }
             }
             for(let i=0;i<this.recordInfo.recordData.length;i++){
+
+              if(parseInt(this.recordInfo.recordData[i].count) > parseInt(this.recordInfo.recordData[i].stock_count) ){
+                this.$message.error(this.recordInfo.recordData[i].good_name+"/"+this.recordInfo.recordData[i].specification_name+"库存不足!")
+                this.loading = false
+                return
+               }
                if(this.recordInfo.recordData[i].dealer == ""){
                 this.recordInfo.recordData[i].dealer = 0
              }

src/xt_pages/user/components/PatientSidebar.vue

@@ -207,68 +207,68 @@ export default {
             },
           ]
         },
-        {
-          name: '5',
-          label: '评估工具',
-          children: [
-            {
-              name: '5-1',
-              label: '跌倒评估'
-            },
-            {
-              name: '5-2',
-              label: '小儿跌倒风险评估'
-            },
-            {
-              name: '5-3',
-              label: '压疮风险评估'
-            },
-            {
-              name: '5-4',
-              label: 'OH压疮评估'
-            },
-            {
-              name: '5-5',
-              label: '日常生活能力评估'
-            },
-            {
-              name: '5-6',
-              label: '导管脱落风险评估'
-            },
-            {
-              name: '5-7',
-              label: 'RASS及疼痛评估'
-            },
-            {
-              name: '5-8',
-              label: '营养状况评估'
-            },
-            {
-              name: '5-9',
-              label: '约束告知单'
-            },
-            {
-              name: '5-10',
-              label: '心理评估'
-            },
-            {
-              name: '5-11',
-              label: '瘙痒评估'
-            },
-            {
-              name: '5-12',
-              label: '血液透析患者评估'
-            },
-            {
-              name: '5-13',
-              label: 'Glasgow昏迷评分量表'
-            },
-            {
-              name: '5-14',
-              label: '肌力评估表'
-            },
-          ]
-        },
+        // {
+        //   name: '5',
+        //   label: '评估工具',
+        //   children: [
+        //     {
+        //       name: '5-1',
+        //       label: '跌倒评估'
+        //     },
+        //     {
+        //       name: '5-2',
+        //       label: '小儿跌倒风险评估'
+        //     },
+        //     {
+        //       name: '5-3',
+        //       label: '压疮风险评估'
+        //     },
+        //     {
+        //       name: '5-4',
+        //       label: 'OH压疮评估'
+        //     },
+        //     {
+        //       name: '5-5',
+        //       label: '日常生活能力评估'
+        //     },
+        //     {
+        //       name: '5-6',
+        //       label: '导管脱落风险评估'
+        //     },
+        //     {
+        //       name: '5-7',
+        //       label: 'RASS及疼痛评估'
+        //     },
+        //     {
+        //       name: '5-8',
+        //       label: '营养状况评估'
+        //     },
+        //     {
+        //       name: '5-9',
+        //       label: '约束告知单'
+        //     },
+        //     {
+        //       name: '5-10',
+        //       label: '心理评估'
+        //     },
+        //     {
+        //       name: '5-11',
+        //       label: '瘙痒评估'
+        //     },
+        //     {
+        //       name: '5-12',
+        //       label: '血液透析患者评估'
+        //     },
+        //     {
+        //       name: '5-13',
+        //       label: 'Glasgow昏迷评分量表'
+        //     },
+        //     {
+        //       name: '5-14',
+        //       label: '肌力评估表'
+        //     },
+        //   ]
+        // },
 
       ],
       name:""

src/xt_pages/user/evaluationtool/Cathetershedding.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="patient-container">
-        <patient-sidebar :id="patientID" defaultActive="5-5"></patient-sidebar>
+        <patient-sidebar :id="patientID" defaultActive="5-6"></patient-sidebar>
         <div>
             <div class="patient-app-container advice-container app-container">
                 <div class='content_top' style="width: 100%;margin-bottom: 20px;">

src/xt_pages/user/evaluationtool/Fallassessment.vue

@@ -4,7 +4,7 @@
       <patient-sidebar :id="patient_id" defaultActive="5-1"></patient-sidebar>
       <div>
         <div class="patient-app-container advice-container app-container">
-          <div class='content_top' style="width: 95%;margin-bottom: 20px;">
+          <div class='content_top' style="width: 97%;margin-bottom: 20px;">
             <div style="font-size: 20px">跌倒评估评分</div>
             <div>
               <el-button @click="Historicalscore">历史评分</el-button>
@@ -12,7 +12,7 @@
             </div>
           </div>
 
-          <div class='content_top' style="width: 95%;">
+          <div class='content_top' style="width: 97%;">
             <div style="width: 49%; ">
               <div style="margin-bottom: 50px;">
                 <div class="biaotou content_top">
@@ -152,13 +152,13 @@
                 </div>
                 <div>
                   <span>护士：</span>
-                  <el-select v-model="Nurse" placeholder="请选择" >
+                  <el-select v-model="Nurse" placeholder="请选择" style="width:120px;">
                     <el-option
                       v-for="item in options"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
-                      style="width:150px;">
+                      >
                     </el-option>
                   </el-select>
                 </div>

src/xt_pages/user/evaluationtool/Glasgow.vue

@@ -34,7 +34,7 @@
                     <td>
                       <div style="display: flex;flex-wrap: wrap;padding:4px 0 4px 8px;">
                         <span v-for="item in zhengyan" class="ttbwzz-type-a" @change="handleCheckedCitiesChange">
-                          <label><input type="checkbox" name="ball" :value="item" />&nbsp;{{ item }}</label>
+                          <label><input type="checkbox" class="checkbox1" name="ball" :value="item.value" />&nbsp;{{ item.label }}</label>
                         </span>
                       </div>
                     </td>
@@ -44,8 +44,8 @@
                     <td class="start">言语反映 （V）</td>
                     <td>
                       <div style="display: flex;flex-wrap: wrap;padding:4px 0 4px 8px;">
-                        <span v-for="item in yanyu" class="ttbwzz-type-a" @change="handleCheckedCitiesChange">
-                          <label><input type="checkbox" name="ball" :value="item" />&nbsp;{{ item }}</label>
+                        <span v-for="item in yanyu" class="ttbwzz-type-a" @change="yuyan_change">
+                          <label><input type="checkbox" class="checkbox2" name="ball" :value="item.value" />&nbsp;{{ item.label }}</label>
                         </span>
                       </div>
                     </td>
@@ -55,8 +55,8 @@
                     <td class="start">运动反应（M）</td>
                     <td>
                       <div style="display: flex;flex-wrap: wrap;padding:4px 0 4px 8px;">
-                        <span v-for="item in yundong" class="ttbwzz-type-a" @change="handleCheckedCitiesChange">
-                          <label><input type="checkbox" name="ball" :value="item" />&nbsp;{{ item }}</label>
+                        <span v-for="item in yundong" class="ttbwzz-type-a" @change="yundong_change">
+                          <label><input type="checkbox" class="checkbox3" name="ball" :value="item.value" />&nbsp;{{ item.label }}</label>
                         </span>
                       </div>
                     </td>
@@ -120,6 +120,8 @@
               :data="history_Glasgow"
               stripe
               border
+              @row-click="glasgow_click"
+              :highlight-current-row="true"
               :header-cell-style="{
                   background: '#0077ff9f',color:'white'}"
               style="width: 100%">
@@ -209,17 +211,29 @@
               <div style="vertical-align: top;  margin: 10px 0px; position: relative;">
                   <span style="position: relative; top: -55px;">护理措施：</span>
                   <div style="margin-top: 20px;display: inline-block; width: 85%;height: 80px;">
-                      
+
                   </div>
               </div>
-              
+
             </div>
           </div>
         </div>
       </div>
-      
+
     </el-dialog>
+
     </div>
+     <!-- 删除弹窗 -->
+     <el-dialog
+      title="提示"
+      :visible.sync="dele_dialogVisible"
+      width="30%">
+      <span>确认删除该数据</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dele_Cancel">取 消</el-button>
+        <el-button type="primary" @click="deleclick">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -237,12 +251,14 @@ export default {
       value1:'',
       value:'',
       input:'',
-      Glasgow_Totalpoints:null,
+      zhengyan_num:null,
+      yuyan_num:null,
+      yundong_num:null,
       options:[],
       tableData:[],
-      zhengyan:['自动睁眼(4分)','互换睁眼(3分)','刺激睁眼(2分)','无反应(1分)'],
-      yanyu:['正常(5分)','不准确回答问题(4分)','不恰当词句(3分)','不能理解的言语(2分)','无言语反映(1分)'],
-      yundong:['能按指令运动肢体(6分)','对刺痛能定位(5分)','对刺痛能躲避(4分)','刺痛肢体屈曲(3分)','刺痛肢体过伸(2分)','无反应(1分)'],
+      zhengyan:[{value:4,label:'自动睁眼(4分)'},{value:3,label:'互换睁眼(3分)'},{value:2,label:'刺激睁眼(2分)'},{value:1,label:'无反应(1分)'}],
+      yanyu:[{value:5,label:'正常(5分)'},{value:4,label:'不准确回答问题(4分)'},{value:3,label:'不恰当词句(3分)'},{value:2,label:'不能理解的言语(2分)'},{value:1,label:'无言语反映(1分)'}],
+      yundong:[{value:6,label:'能按指令运动肢体(6分)'},{value:5,label:'对刺痛能定位(5分)'},{value:4,label:'对刺痛能躲避(4分)'},{value:3,label:'刺痛肢体屈曲(3分)'},{value:2,label:'刺痛肢体过伸(2分)'},{value:1,label:'无反应(1分)'}],
       pinggr:[{id:1,label:'小米'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
       history_Glasgow:[{date:'2023-9-27',mark:'',evaluate:''}],
 
@@ -252,21 +268,58 @@ export default {
       Glas_baoxiao:false,
       cancel_num:0,
       Glas_pinggu:null,
-      open_print:false
+      open_print:false,
+      dele_id:'',
+      dele_dialogVisible:false,
     }
   },
   methods:{
     handleCheckedCitiesChange(e){
       var ball = e.target.value
-      var jiequ =(ball.split('(')[1].split('分')[0]) * 1
-      if(e.target.checked==true){
-        this.Glasgow_Totalpoints=this.Glasgow_Totalpoints + jiequ
-        return this.Glasgow_Totalpoints
-      }else{
-        this.Glasgow_Totalpoints=this.Glasgow_Totalpoints-jiequ
-        return this.Glasgow_Totalpoints
+      // var jiequ =(ball.split('(')[1].split('分')[0]) * 1
+      // if(e.target.checked==true){
+      //   this.Glasgow_Totalpoints=this.Glasgow_Totalpoints + jiequ
+      //   return this.Glasgow_Totalpoints
+      // }else{
+      //   this.Glasgow_Totalpoints=this.Glasgow_Totalpoints-jiequ
+      //   return this.Glasgow_Totalpoints
+      // }
+      const checkboxs=document.getElementsByClassName('checkbox1')
+      for(let i=0;i<checkboxs.length;i++){
+        if(ball==checkboxs[i].value ){
+          console.log('vvvv',ball,'bbbb',e.target.checked);
+          this.zhengyan_num = checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
+    },
+    yuyan_change(e){
+      var ball = e.target.value
+      const checkboxs=document.getElementsByClassName('checkbox2')
+      for(let i=0;i<checkboxs.length;i++){
+        if(ball==checkboxs[i].value ){
+          console.log('vvvv',ball,'bbbb',e.target.checked);
+          this.yuyan_num = checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
+    },
+    yundong_change(e){
+      var ball = e.target.value
+      const checkboxs=document.getElementsByClassName('checkbox3')
+      for(let i=0;i<checkboxs.length;i++){
+        if(ball==checkboxs[i].value ){
+          console.log('vvvv',ball,'bbbb',e.target.checked);
+          this.yundong_num = checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
       }
-
     },
     Glas_add(){
       this.cancel_num=0
@@ -301,12 +354,30 @@ export default {
       this.Glasadd_show=false
       this.cancel_num =1
     },
+    glasgow_click(row,column, event){
+      this.dele_id=row.id
+    },
     Glas_dele(){
       this.append=false
       this.Glas_gzdayin=false
       this.Glasadd_show=true
       this.Glas_baoxiao=false
       this.cancel_num=0
+      this.dele_dialogVisible=true
+    },
+    deleclick(){
+      for(let i=0;i<this.history_Glasgow.length;i++){
+        if(this.dele_id==this.history_Glasgow[i].id){
+          this.history_Glasgow.splice(i,1)
+        }
+      }
+      this.dele_dialogVisible=false
+    },
+    dele_Cancel(){
+      this.append=false
+      this.Glasadd_show=true
+      this.Glas_gzdayin=true
+      this.dele_dialogVisible=false
     },
     Glas_quxiao(){
       // console.log('1111',this.cancel_num);
@@ -333,6 +404,12 @@ export default {
         scanStyles: false
       })
       this.open_print=false
+    },
+
+  },
+  computed:{
+    Glasgow_Totalpoints(){
+      return this.zhengyan_num*1 + this.yuyan_num*1 + this.yundong_num*1
     }
   }
 }
@@ -405,7 +482,7 @@ export default {
     z-index: -1;
 }
 .tables {
-  
+
   thead th{
     text-align: center;
     height: 40px;

src/xt_pages/user/evaluationtool/Muscleforce.vue

@@ -97,7 +97,7 @@
                       <td class="start">{{ item.title }}</td>
                       <td>
                         <div class="jiange">
-                          <label style="font-size: 15px;"><input type="checkbox" name="ball" :value="item.value" @change="handleCheckedCitiesChange"/>&nbsp;{{ item.value }}</label>
+                          <label style="font-size: 15px;"><input type="checkbox" class="checkbox" name="ball" :value="item.value" @change="handleCheckedCitiesChange"/>&nbsp;{{ item.label }}</label>
                         </div>
                       </td>
                     </tr>
@@ -154,6 +154,7 @@
                   :data="history_muscle"
                   stripe
                   border
+                  @row-click="Muscle_click"
                   :highlight-current-row="true"
                   :header-cell-style="{
                       background: '#0077ff9f',color:'white'
@@ -181,7 +182,10 @@
 
       </div>
 
-      <el-dialog
+
+    </div>
+    <!-- 打印 -->
+    <el-dialog
       title="提示"
       :visible.sync="open_print"
       width="67%"
@@ -224,15 +228,24 @@
                       <!-- <el-input maxlength="200" type = "textarea" :rows="3" v-model="input" placeholder="输入护理措施，200字以内" ></el-input> -->
                   </div>
               </div>
-              
+
             </div>
           </div>
         </div>
       </div>
-      
-    </el-dialog>
-    </div>
 
+    </el-dialog>
+    <!-- 删除弹窗 -->
+    <el-dialog
+      title="提示"
+      :visible.sync="dele_dialogVisible"
+      width="30%">
+      <span>确认删除该数据</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dele_Cancel">取 消</el-button>
+        <el-button type="primary" @click="deleclick">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -256,14 +269,14 @@ export default {
       options:[],
       tableData:[],
       shuju:[
-        {title:'0级',value:'肌肉完全不收缩'},
-        {title:'1级',value:'可见肌肉收缩但无肢体运动'},
-        {title:'2级',value:'肢体能在床上移动，但不能抬离床面，即不能对抗地心引力'},
-        {title:'3级',value:'肢体能抬离床面，克服地心引力做随意运动，但不能对抗外加阻力'},
-        {title:'4级',value:'能在一般的外加阻力下作运动，但力量较正常弱'},
-        {title:'5级',value:' 正常肌力'},
+        {title:'0级',label:'肌肉完全不收缩',value:0},
+        {title:'1级',label:'可见肌肉收缩但无肢体运动',value:1},
+        {title:'2级',label:'肢体能在床上移动，但不能抬离床面，即不能对抗地心引力',value:2},
+        {title:'3级',label:'肢体能抬离床面，克服地心引力做随意运动，但不能对抗外加阻力',value:3},
+        {title:'4级',label:'能在一般的外加阻力下作运动，但力量较正常弱',value:4},
+        {title:'5级',label:' 正常肌力',value:5},
       ],
-      history_muscle:[{date:'2023-9-27',mark:'',evaluate:''}],
+      history_muscle:[{id:'001',date:'2023-9-27',mark:'',evaluate:''}],
       pinggr:[{id:1,label:'小米'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
       append:false,
       add_open:1,
@@ -271,20 +284,23 @@ export default {
       baocun_quxiao:false,
       muscle_gsdayin:false,
       cancel_num:0,
-      open_print:false
+      open_print:false,
+      dele_id:'',
+      dele_dialogVisible:false,
     }
   },
   methods:{
     handleCheckedCitiesChange(e){
-      for(let i=0;i<this.shuju.length;i++){
-        if(e.target.value == this.shuju[i].value ){
-          const arr= (this.shuju[i].title.split('级')[0])
-          if(e.target.checked == true){
-          this.Mus_Totalpoints = arr
-          }else{
-          this.Mus_Totalpoints =0
-          }
-          console.log('33333',arr);
+      console.log('6666',e.target.value);
+      const ball = e.target.value
+      const checkboxs=document.getElementsByClassName('checkbox')
+      for(let i=0;i<checkboxs.length;i++){
+        if(ball==checkboxs[i].value ){
+          console.log('vvvv',this.ball,'bbbb',e.target.checked);
+          this.Mus_Totalpoints = checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
         }
       }
     },
@@ -318,11 +334,30 @@ export default {
         }
       }
     },
+    Muscle_click(row,column, event){
+      this.dele_id=row.id
+    },
     muscle_dele(){
       this.muscle_gsdayin=false
       this.baocun_quxiao = false
       this.append=false
       this.muscle_pinggu=null
+      this.dele_dialogVisible=true
+    },
+    deleclick(){
+      for(let i=0;i<this.history_muscle.length;i++){
+        if(this.dele_id==this.history_muscle[i].id){
+          this.history_muscle.splice(i,1)
+        }
+      }
+      this.dele_dialogVisible=false
+    },
+    dele_Cancel(){
+      this.dele_dialogVisible=false
+      this.muscle_gsdayin=true
+      this.muscle_show=true
+      this.baocun_quxiao=false
+      this.append=false
     },
     muscle_cancel(){
       if(this.cancel_num==0){
@@ -353,7 +388,9 @@ export default {
         scanStyles: false
       })
       this.open_print=false
-    }
+    },
+
+
   }
 }
 </script>
@@ -415,7 +452,7 @@ export default {
     z-index: -1;
 }
 .tables {
-  
+
   thead th{
     // background: #0077ff9f;
     // color: white;

src/xt_pages/user/evaluationtool/OHpressuresore.vue

@@ -37,7 +37,7 @@
                               <td>
                                   <div class="jiange">
                                       <span v-for="item in tiwei" class="rightjiange" @change="handleCheckedCitiesChange">
-                                          <label><input type="checkbox" name="ball" :value="item"/>&nbsp;{{ item }}</label>
+                                          <label><input type="checkbox" class="checkbox1" name="ball" :value="item.value"/>&nbsp;{{ item.label }}</label>
                                       </span>
                                   </div>
                               </td>
@@ -46,8 +46,8 @@
                               <td class="start">病理性骨突出</td>
                               <td>
                                   <div class="jiange">
-                                      <span v-for="item in bingli" class="rightjiange" @change="handleCheckedCitiesChange">
-                                          <label><input type="checkbox" name="ball" :value="item" />&nbsp;{{ item }}</label>
+                                      <span v-for="item in bingli" class="rightjiange" @change="bingligu">
+                                          <label><input type="checkbox" class="checkbox2" name="ball" :value="item.value" />&nbsp;{{ item.label }}</label>
                                       </span>
                                   </div>
                               </td>
@@ -57,8 +57,8 @@
                               <td class="start">浮肿</td>
                               <td>
                                   <div class="jiange">
-                                      <span v-for="item in edema" class="rightjiange" @change="handleCheckedCitiesChange">
-                                          <label><input type="checkbox" name="ball" :value="item" />&nbsp;{{ item }}</label>
+                                      <span v-for="item in edema" class="rightjiange" @change="fozhong_chang">
+                                          <label><input type="checkbox" class="checkbox3" name="ball" :value="item.value" />&nbsp;{{ item.label }}</label>
                                       </span>
                                   </div>
                               </td>
@@ -68,8 +68,8 @@
                               <td class="start">关节痉挛</td>
                                 <td>
                                   <div class="jiange">
-                                      <span v-for="item in guanjie" class="rightjiange" @change="handleCheckedCitiesChange">
-                                          <label><input type="checkbox" name="ball" :value="item" />&nbsp;{{ item }}</label>
+                                      <span v-for="item in guanjie" class="rightjiange" @change="guanjie_change">
+                                          <label><input type="checkbox" class="checkbox4" name="ball" :value="item.value" />&nbsp;{{ item.label }}</label>
                                       </span>
                                   </div>
                               </td>
@@ -137,6 +137,8 @@
               :data="history_OH"
               stripe
               border
+              @row-click="dele_click"
+              :highlight-current-row="true"
               :header-cell-style="{
                   background: '#0077ff9f',color:'white'}"
               style="width: 100%">
@@ -160,7 +162,10 @@
           </div>
         </div>
       </div>
-      
+
+
+    </div>
+    <!-- 打印 -->
     <el-dialog
       title="提示"
       :visible.sync="open_print"
@@ -252,9 +257,19 @@
           </div>
         </div>
       </div>
-      
+
+    </el-dialog>
+    <!-- 删除弹窗 -->
+    <el-dialog
+      title="提示"
+      :visible.sync="dele_dialogVisible"
+      width="30%">
+      <span>确认删除该数据</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dele_Cancel">取 消</el-button>
+        <el-button type="primary" @click="deleclick">确 定</el-button>
+      </span>
     </el-dialog>
-    </div>
   </div>
 </template>
 <script>
@@ -267,18 +282,21 @@ export default {
   data(){
     return{
       patientID:0,
-      Totalpoints:null,
+      tiwei_num:null,
+      bingli_num:null,
+      edema_num:null,
+      gaunjie_num:null,
       ball:'',
       input:'',
-      history_OH:[{date:'2023-9-27',mark:'',evaluate:''}],
+      history_OH:[{id:'001',date:'2023-9-27',mark:'',evaluate:''}],
       form:[],
       appraiser:null,
       value1:'',
       options:[],
-      tiwei:['能(0分)','不能完全自立(1.5分)','不能(3分)'],
-      bingli:['无(0分)','轻度/中度(1.5分)','高度(3分)'],
-      edema:['无(0分)','有(3分)'],
-      guanjie:['无(0分)','有(1分)'],
+      tiwei:[{value:0,label:'能(0分)'},{value:1.5,label:'不能完全自立(1.5分)'},{value:3,label:'不能(3分)'}],
+      bingli:[{value:0,label:'无(0分)'},{value:1.5,label:'轻度/中度(1.5分)'},{value:3,label:'高度(3分)'}],
+      edema:[{value:0,label:'无(0分)'},{value:3,label:'有(3分)'}],
+      guanjie:[{value:0,label:'无(0分)'},{value:1,label:'有(1分)'}],
       pinggr:[{id:1,label:'小米'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
       checkList:[],
       checkList1:[],
@@ -292,23 +310,69 @@ export default {
       zsgy_open:0,//控制编辑,删除,打印显示
       cancel_num:0,//取消的条件
       open_print:false,
+      dele_id:'',//删除的索引
+      dele_dialogVisible:false
     }
   },
   methods:{
     //选择的总分
     handleCheckedCitiesChange(e){
-      this.ball = e.target.value
-      var jiequ =(this.ball.split('(')[1].split('分')[0]) * 1
-      if(e.target.checked==true){
-        this.Totalpoints=this.Totalpoints + jiequ
-        console.log('22222 .slice(1)',this.ball);
-        console.log('3333333333',this.Totalpoints);
-        return this.Totalpoints
-      }else{
-        this.Totalpoints=this.Totalpoints-jiequ
-        return this.Totalpoints
+      const ball = e.target.value
+      const checkboxs=document.getElementsByClassName('checkbox1')
+      for(let i=0;i<checkboxs.length;i++){
+        if(ball==checkboxs[i].value ){
+            console.log('vvvv',ball,'bbbb',e.target.checked);
+            this.tiwei_num = checkboxs[i].value
+            e.target.checked=true
+            checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+        // if(checkboxs[i].checked == true){
+        //   if(ball==checkboxs[i].value){
+        //     checkboxs[i].checked=false
+        //   }
+        // }
+      }
+    },
+    bingligu(e){
+      const ball=e.target.value
+      const checkboxs=document.getElementsByClassName('checkbox2')
+      for(let i=0;i<checkboxs.length;i++){
+        if(ball==checkboxs[i].value ){
+          console.log('vvvv',ball,'bbbb',e.target.checked);
+          this.bingli_num = checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
+    },
+    fozhong_chang(e){
+      const ball=e.target.value
+      const checkboxs=document.getElementsByClassName('checkbox3')
+      for(let i=0;i<checkboxs.length;i++){
+        if(ball==checkboxs[i].value ){
+          console.log('vvvv',ball,'bbbb',e.target.checked);
+          this.edema_num = checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
+    },
+    guanjie_change(e){
+      const ball=e.target.value
+      const checkboxs=document.getElementsByClassName('checkbox4')
+      for(let i=0;i<checkboxs.length;i++){
+        if(ball==checkboxs[i].value ){
+          console.log('vvvv',ball,'bbbb',e.target.checked);
+          this.gaunjie_num= checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
       }
-
     },
     // 新增
     OHadd(){
@@ -352,17 +416,36 @@ export default {
       this.baocun_open=1
       this.cancel_num=1
     },
+    dele_click(row, column, event){
+      this.dele_id=row.id
+    },
     //删除
     dele_OH(){
       this.zsgy_open=0
       this.append=false
+      this.dele_dialogVisible=true
+    },
+    deleclick(){
+      for(let i=0;i<this.history_OH.length;i++){
+        if(this.dele_id==this.history_OH[i].id){
+          this.history_OH.splice(i,1)
+        }
+      }
+      this.dele_dialogVisible=false
     },
     //打印
     print_OH(){
       this.open_print=true
     },
+    dele_Cancel(){
+      this.append=false
+      this.zsgy_open=1
+      this.add_show=true
+      this.dele_dialogVisible=false
+    },
     //取消
     cancel_OH(){
+      const checkboxs=document.getElementsByClassName('ball')
       this.baocun_open=0
       console.log('1111',this.cancel_num);
       if(this.cancel_num==1){
@@ -372,6 +455,13 @@ export default {
         this.zsgy_open=0
         this.add_show=true
         this.append=false
+        this.tiwei_num=''
+        this.bingli_num=null
+        this.edema_num=null
+        this.gaunjie_num=null
+        for(let i=0;i<checkboxs.length;i++){
+          checkboxs[i].checked = false
+        }
       }
 
     },
@@ -385,6 +475,11 @@ export default {
       })
       this.open_print=false
     }
+  },
+  computed:{
+    Totalpoints(){
+      return this.gaunjie_num*1 + this.edema_num*1 + this.bingli_num*1 + this.tiwei_num*1
+    }
   }
 }
 </script>

src/xt_pages/user/evaluationtool/RassAssessment.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="patient-container">
-        <patient-sidebar :id="patientID" defaultActive="5-6"></patient-sidebar>
+        <patient-sidebar :id="patientID" defaultActive="5-7"></patient-sidebar>
         <div>
             <div class="patient-app-container advice-container app-container">
                 <div class='content_top' style="width: 100%;margin-bottom: 20px;">
@@ -196,9 +196,14 @@
                                         <img :src="item.imgs" alt="">
                                       </div>
                                       <span>
-                                        <label >
+                                        <!-- <el-radio :label="item.text" :value="item.value" :key="index" style="color: black;" ></el-radio> -->
+                                        <!-- <label >
                                         <input type="radio" :value="item.value"  name="ttpggj-bqf" @click="radioclick($event,item.value)">
-                                        {{item.text}}</label>
+                                        {{item.text}}</label> -->
+                                        <el-radio-group v-model="radio1" @change="radioclick($event,item.value)">
+                                          <el-radio  :label="item.text" :value="item.value" :key="index" style="color: black;" >
+                                          </el-radio>
+                                      </el-radio-group>
                                       </span>
                                     </div>
                                   </div>
@@ -544,9 +549,10 @@ export default {
           }
         }
       },
-      radioclick(e,val){
-        if(e.target.checked == true){
-          this.radio_val =val
+      radioclick(e,value){
+        console.log('2222',e,value);
+        if(e == this.radio1){
+          this.radio_val =value
         }
       },
       yuyanchange(e){
@@ -566,7 +572,7 @@ export default {
         // this.shijue = val
         this.shijue_val =val
         console.log('00000',val);
-         
+
       },
       click_NRS(val){
         this.NRS_val = val
@@ -594,7 +600,7 @@ export default {
           return this.behav_val
           // this.$refs.behavior.getTotalpoints()
         }
-        
+
       }
     }
 }

src/xt_pages/user/evaluationtool/behavior.vue

@@ -51,44 +51,55 @@
           </table>
         </div>
         <div v-if="radio == '老年痴呆症量表'">
-          <table border="1" class="table">
+          <table border="1" class="table" style="white-space:pre-wrap;">
             <thead>
               <tr>
-                <td>老年痴呆症疼痛估量表</td>
-                <td>0</td>
-                <td>1</td>
-                <td>2</td>
+                <td style="width: 17%;">老年痴呆症疼痛估量表</td>
+                <td style="width: 27%;">0</td>
+                <td style="width: 27%;">1</td>
+                <td style="width: 27%;">2</td>
               </tr>
             </thead>
-            <tbody>
-              <tr class="bg_color">
+             <tbody>
+             <tr class="bg_color">
                 <td>1、呼吸</td>
-                <td v-for="(item,index) in laor_huxi" :key="index">
-                  <el-radio v-model="radio_lrhuxi" :label="item.value" @change="laorhuxi">{{ item.label }}</el-radio>
+                <td v-for="(item,index) in laor_huxi" :key="index" >
+                  <div>
+                    <el-radio v-model="radio_lrhuxi" :label="item.value" @change="laorhuxi"
+                    style="white-space: normal;">
+                    {{ item.label }}
+                    </el-radio>
+                  </div>
                 </td>
               </tr>
               <tr class="">
                 <td>2、负面声音表达</td>
                 <td v-for="(item,index) in laor_fumian" :key="index">
-                  <el-radio v-model="radio_lrfumian" :label="item.value" @change="laorhuxi">{{ item.label }}</el-radio>
+                  <div style="Word-break: break-all">
+                    <el-radio v-model="radio_lrfumian" :label="item.value" @change="laorhuxi"
+                    style="white-space: normal;">{{ item.label }}</el-radio>
+                  </div>
                 </td>
               </tr>
-              <tr class="bg_color">
+               <tr class="bg_color">
                 <td>3、面部表情</td>
                 <td v-for="(item,index) in laor_mianbu" :key="index">
-                  <el-radio v-model="radio_lrmianbu" :label="item.value" @change="laorhuxi">{{ item.label }}</el-radio>
+                  <el-radio v-model="radio_lrmianbu" :label="item.value" @change="laorhuxi"
+                  style="white-space: normal;">{{ item.label }}</el-radio>
                 </td>
               </tr>
               <tr class="">
                 <td>4、身体语言</td>
                 <td v-for="(item,index) in laor_shengti" :key="index">
-                  <el-radio v-model="radio_lrshengti" :label="item.value" @change="laorhuxi">{{ item.label }}</el-radio>
+                  <el-radio v-model="radio_lrshengti" :label="item.value" @change="laorhuxi"
+                  style="white-space: normal;">{{ item.label }}</el-radio>
                 </td>
               </tr>
               <tr class="bg_color">
                 <td>5、可安抚程度</td>
                 <td v-for="(item,index) in laor_keanfu" :key="index">
-                  <el-radio v-model="radio_lrkeanfu" :label="item.value" @change="laorhuxi">{{ item.label }}</el-radio>
+                  <el-radio v-model="radio_lrkeanfu" :label="item.value" @change="laorhuxi"
+                  style="white-space: normal;">{{ item.label }}</el-radio>
                 </td>
               </tr>
             </tbody>
@@ -108,31 +119,36 @@
               <tr class="bg_color">
                 <td>1、面部表情</td>
                 <td v-for="(item,index) in zhongzhen_mianbu" :key="index">
-                  <el-radio v-model="radio_zzmianbu" :label="item.value" @change="zhongzheng">{{ item.label }}</el-radio>
+                  <el-radio v-model="radio_zzmianbu" :label="item.value" @change="zhongzheng"
+                  style="white-space: normal;">{{ item.label }}</el-radio>
                 </td>
               </tr>
               <tr class="">
                 <td>2、身体运动</td>
                 <td v-for="(item,index) in zhongzhen_shengti" :key="index">
-                  <el-radio v-model="radio_zzshengti" :label="item.value" @change="zhongzheng">{{ item.label }}</el-radio>
+                  <el-radio v-model="radio_zzshengti" :label="item.value" @change="zhongzheng"
+                  style="white-space: normal;">{{ item.label }}</el-radio>
                 </td>
               </tr>
               <tr class="bg_color">
                 <td>3、肌紧张（对上肢被动屈伸的评估）</td>
                 <td v-for="(item,index) in zhongzhen_jjinz" :key="index">
-                  <el-radio v-model="radio_zzjjinz" :label="item.value" @change="zhongzheng">{{ item.label }}</el-radio>
+                  <el-radio v-model="radio_zzjjinz" :label="item.value" @change="zhongzheng"
+                  style="white-space: normal;">{{ item.label }}</el-radio>
                 </td>
               </tr>
               <tr class="">
                 <td>4、机械通气的顺应（插管患者）</td>
                 <td v-for="(item,index) in zhongzhen_jixie" :key="index">
-                  <el-radio v-model="radio_zzjixie" :label="item.value" @change="zhongzheng">{{ item.label }}</el-radio>
+                  <el-radio v-model="radio_zzjixie" :label="item.value" @change="zhongzheng"
+                  style="white-space: normal;">{{ item.label }}</el-radio>
                 </td>
               </tr>
               <tr class="bg_color">
                 <td>5、发声（未插管患者）</td>
                 <td v-for="(item,index) in zhongzhen_fashen" :key="index">
-                  <el-radio v-model="radio_zzfasheng" :label="item.value" @change="zhongzheng">{{ item.label }}</el-radio>
+                  <el-radio v-model="radio_zzfasheng" :label="item.value" @change="zhongzheng"
+                  style="white-space: normal;">{{ item.label }}</el-radio>
                 </td>
               </tr>
             </tbody>
@@ -260,7 +276,7 @@ export default{
       mianbu_val:0,
       shengti_val:0,
       keanfu_val:0,
-      
+
       zzmian_val:0,
       zzshengti_val:0,
       zzjjinz_val:0,
@@ -353,7 +369,7 @@ export default{
     //   }else if (this.radio == '2月-7岁患者量表') {
     //     return this.hzface_val + this.hzleg_val + this.hzactiv_val + this.hzcry_val + this.hzcon_val
     //   }
-      
+
     // }
   }
 
@@ -361,32 +377,33 @@ export default{
 </script>
 
 <style lang="scss" scoped>
-    .jiange{
-        margin-left: 20px;
-        color: black;
-        line-height: 40px;
-    }
-    .table{
-        border: 1px solid #DCDFE6;
-        border-collapse:collapse;
-        border-spacing: 0;
-        width: 98%;
-        margin:10px auto;
-        thead td{
-            text-align: center;
-        }
-        tbody td{
-            font-size: 15px;
-            padding: 5px;
-        }
-        tr td{
-            line-height: 30px;
-        }
-        .bg_color{
-            background: rgb(243, 240, 240);
-        }
-        input{
-            -webkit-appearance: checkbox;
-        }
-    }
-</style>
+  .jiange{
+      margin-left: 20px;
+      color: black;
+      line-height: 40px;
+  }
+  .table{
+      border: 1px solid #DCDFE6;
+      border-collapse:collapse;
+      border-spacing: 0;
+      width: 98%;
+      margin:10px auto;
+      thead td{
+          text-align: center;
+      }
+      tbody td{
+          font-size: 15px;
+          padding: 5px;
+      }
+      tr td{
+          line-height: 30px;
+      }
+      .bg_color{
+          background: rgb(243, 240, 240);
+      }
+      input{
+          -webkit-appearance: checkbox;
+      }
+  }
+
+</style>

src/xt_pages/user/evaluationtool/dailyLife.vue

@@ -1,7 +1,7 @@
 <!--  日常生活能力评估 -->
 <template>
     <div class="patient-container">
-        <patient-sidebar :id="patientID" defaultActive="5-4"></patient-sidebar>
+        <patient-sidebar :id="patientID" defaultActive="5-5"></patient-sidebar>
         <div>
             <div class="patient-app-container advice-container app-container">
 
@@ -14,144 +14,144 @@
 
                 <div>
                   <table class="table" border="1" style="width: 100%;">
-                      <thead>
-                        <tr>
-                          <th style="width: 150px;">项目</th>
-                          <th colspan="4">分值</th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        <tr class="bg_color">
-                          <td class="start">进食</td>
-                          <td v-for="(item,index) in jinshi" :key="index">
-                              <div class="jiange">
-                                <span>
-                                  <label><input type="checkbox" name="ball" :value="item.value" @click="jinshiclick($event,item.value)"/>&nbsp;
-                                      {{ item.label }}
-                                  </label>
-                                </span>
-                              </div>
-                          </td>
-                          <td>&nbsp;</td>
-                        </tr>
-                        <tr>
-                          <td class="start">洗澡</td>
-                          <td v-for="(item,index) in xizao" :key="index">
+                    <thead>
+                      <tr>
+                        <th style="width: 150px;">项目</th>
+                        <th colspan="4">分值</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      <tr class="bg_color">
+                        <td class="start">进食</td>
+                        <td v-for="(item,index) in jinshi" :key="index">
+                          <div class="jiange">
+                            <span>
+                              <label><input type="checkbox" class="checkbox1" name="ball" :value="item.value" @click="jinshiclick($event,item.value)"/>&nbsp;
+                                  {{ item.label }}
+                              </label>
+                            </span>
+                          </div>
+                        </td>
+                        <td>&nbsp;</td>
+                      </tr>
+                      <tr>
+                        <td class="start">洗澡</td>
+                        <td v-for="(item,index) in xizao" :key="index">
+                          <div class="jiange">
+                            <span>
+                              <label><input type="checkbox" class="checkbox2" name="ball" :value="item.value" @click="xizaoclick($event,item.value)"/>&nbsp;
+                                  {{ item.label }}
+                              </label>
+                            </span>
+                          </div>
+                        </td>
+                        <td></td>
+                        <td></td>
+                      </tr>
+                      <tr class="bg_color">
+                        <td class="start">修饰</td>
+                        <td v-for="(item,index) in xiushi" :key="index">
                             <div class="jiange">
                               <span>
-                                <label><input type="checkbox" name="ball" :value="item.value" @click="xizaoclick($event,item.value)"/>&nbsp;
-                                    {{ item.label }}
-                                </label>
-                              </span>
-                            </div>
-                          </td>
-                          <td></td>
-                          <td></td>
-                        </tr>
-                        <tr class="bg_color">
-                          <td class="start">修饰</td>
-                          <td v-for="(item,index) in xiushi" :key="index">
-                              <div class="jiange">
-                                <span>
-                                  <label><input type="checkbox" name="ball" :value="item.value" @click="xiushiclick($event,item.value)"/>&nbsp;
-                                      {{item.label}}
-                                  </label>
-                                </span>
-                              </div>
-                          </td>
-                          <td></td>
-                          <td></td>
-                        </tr>
-                        <tr>
-                          <td class="start">穿衣</td>
-                          <td v-for="(item,index) in chuanyi" :key="index">
-                            <div class="jiange">
-                              <span>
-                                <label><input type="checkbox" name="ball" :value="item.value" @click="chuanyiclick($event,item.value)"/>&nbsp;
-                                    {{item.label}}
-                                </label>
-                              </span>
-                            </div>
-                          </td>
-                          <td></td>
-                        </tr>
-                        <tr class="bg_color">
-                          <td class="start">控制大便</td>
-                          <td v-for="(item,index) in dabian" :key="index">
-                            <div class="jiange">
-                              <span>
-                                <label><input type="checkbox" name="ball" :value="item.value" @click="dabianclick($event,item.value)"/>&nbsp;
-                                    {{item.label}}
-                                </label>
-                              </span>
-                            </div>
-                          </td>
-                          <td></td>
-                        </tr>
-                        <tr>
-                          <td class="start">控制小便</td>
-                          <td v-for="(item,index) in xioabian" :key="index">
-                            <div class="jiange">
-                              <span>
-                                <label><input type="checkbox" name="ball" :value="item.value" @click="xioabianclick($event,item.value)"/>&nbsp;
-                                    {{item.label}}
-                                </label>
-                              </span>
-                            </div>
-                          </td>
-                          <td></td>
-                        </tr>
-                        <tr class="bg_color">
-                          <td class="start">如厕</td>
-                          <td v-for="(item,index) in ruce" :key="index">
-                            <div class="jiange">
-                              <span>
-                                <label><input type="checkbox" name="ball" :value="item.value" @click="ruceclick($event,item.value)"/>&nbsp;
-                                    {{item.label}}
-                                </label>
-                              </span>
-                            </div>
-                          </td>
-                          <td></td>
-                        </tr>
-                        <tr>
-                          <td class="start">床椅转移</td>
-                          <td v-for="(item,index) in chuangyi" :key="index">
-                            <div class="jiange">
-                              <span>
-                                <label><input type="checkbox" name="ball" :value="item.value" @click="chuangyiclick($event,item.value)"/>&nbsp;
+                                <label><input type="checkbox" class="checkbox3" name="ball" :value="item.value" @click="xiushiclick($event,item.value)"/>&nbsp;
                                     {{item.label}}
                                 </label>
                               </span>
                             </div>
-                          </td>
-                        </tr>
-                        <tr class="bg_color">
-                          <td class="start">平地行走</td>
-                          <td v-for="(item,index) in pingdi" :key="index">
-                            <div class="jiange">
-                              <span>
-                                <label><input type="checkbox" name="ball" :value="item.value" @click="pingdiclick($event,item.value)"/>&nbsp;
-                                    {{item.label}}
-                                </label>
-                              </span>
-                            </div>
-                          </td>
-                        </tr>
-                        <tr>
-                          <td class="start">上下楼梯</td>
-                          <td v-for="(item,index) in louti" :key="index">
-                            <div class="jiange">
-                              <span>
-                                <label><input type="checkbox" name="ball" :value="item.value" @click="louticlick($event,item.value)"/>&nbsp;
-                                    {{ item.label }}
-                                </label>
-                              </span>
-                            </div>
-                          </td>
-                          <td></td>
-                        </tr>
-                      </tbody>
+                        </td>
+                        <td></td>
+                        <td></td>
+                      </tr>
+                      <tr>
+                        <td class="start">穿衣</td>
+                        <td v-for="(item,index) in chuanyi" :key="index">
+                          <div class="jiange">
+                            <span>
+                              <label><input type="checkbox" class="checkbox4" name="ball" :value="item.value" @click="chuanyiclick($event,item.value)"/>&nbsp;
+                                  {{item.label}}
+                              </label>
+                            </span>
+                          </div>
+                        </td>
+                        <td></td>
+                      </tr>
+                      <tr class="bg_color">
+                        <td class="start">控制大便</td>
+                        <td v-for="(item,index) in dabian" :key="index">
+                          <div class="jiange">
+                            <span>
+                              <label><input type="checkbox" class="checkbox5" name="ball" :value="item.value" @click="dabianclick($event,item.value)"/>&nbsp;
+                                  {{item.label}}
+                              </label>
+                            </span>
+                          </div>
+                        </td>
+                        <td></td>
+                      </tr>
+                      <tr>
+                        <td class="start">控制小便</td>
+                        <td v-for="(item,index) in xioabian" :key="index">
+                          <div class="jiange">
+                            <span>
+                              <label><input type="checkbox" class="checkbox6" name="ball" :value="item.value" @click="xiaobianclick($event,item.value)"/>&nbsp;
+                                  {{item.label}}
+                              </label>
+                            </span>
+                          </div>
+                        </td>
+                        <td></td>
+                      </tr>
+                      <tr class="bg_color">
+                        <td class="start">如厕</td>
+                        <td v-for="(item,index) in ruce" :key="index">
+                          <div class="jiange">
+                            <span>
+                              <label><input type="checkbox" class="checkbox7" name="ball" :value="item.value" @click="ruceclick($event,item.value)"/>&nbsp;
+                                  {{item.label}}
+                              </label>
+                            </span>
+                          </div>
+                        </td>
+                        <td></td>
+                      </tr>
+                      <tr>
+                        <td class="start">床椅转移</td>
+                        <td v-for="(item,index) in chuangyi" :key="index">
+                          <div class="jiange">
+                            <span>
+                              <label><input type="checkbox" class="checkbox8" name="ball" :value="item.value" @click="chuangyiclick($event,item.value)"/>&nbsp;
+                                  {{item.label}}
+                              </label>
+                            </span>
+                          </div>
+                        </td>
+                      </tr>
+                      <tr class="bg_color">
+                        <td class="start">平地行走</td>
+                        <td v-for="(item,index) in pingdi" :key="index">
+                          <div class="jiange">
+                            <span>
+                              <label><input type="checkbox" class="checkbox9" name="ball" :value="item.value" @click="pingdiclick($event,item.value)"/>&nbsp;
+                                  {{item.label}}
+                              </label>
+                            </span>
+                          </div>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td class="start">上下楼梯</td>
+                        <td v-for="(item,index) in louti" :key="index">
+                          <div class="jiange">
+                            <span>
+                              <label><input type="checkbox" class="checkbox10" name="ball" :value="item.value" @click="louticlick($event,item.value)"/>&nbsp;
+                                  {{ item.label }}
+                              </label>
+                            </span>
+                          </div>
+                        </td>
+                        <td></td>
+                      </tr>
+                    </tbody>
                   </table>
                 </div>
 
@@ -244,7 +244,7 @@ export default {
               {value:5,label:'偶尔失禁(5分)'},
               {value:0,label:'完全失禁(0分)'}
             ],
-      xioabian:[{value:10,label:'可控制大便(10分)'},
+      xioabian:[{value:10,label:'可控制小便(10分)'},
               {value:5,label:'偶尔失禁(5分)'},
               {value:0,label:'完全失禁(0分)'}
             ],
@@ -270,74 +270,129 @@ export default {
   },
   methods:{
     jinshiclick(e,val){
-     if(e.target.checked == true){
-      this.jinshi_val = val
-     }else{
-      this.jinshi_val =this.jinshi_val - val
-     }
+      const checkboxs=document.getElementsByClassName('checkbox1')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.jinshi_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     xizaoclick(e,val){
-      if(e.target.checked == true){
-      this.xizao_val = val
-     }else{
-      this.xizao_val =this.xizao_val - val
-     }
+      const checkboxs=document.getElementsByClassName('checkbox2')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.xizao_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     xiushiclick(e,val){
-     if(e.target.checked == true){
-      this.xiushi_val = val
-     }else{
-      this.xiushi_val =this.xiushi_val - val
-     }
+     const checkboxs=document.getElementsByClassName('checkbox3')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.xiushi_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     chuanyiclick(e,val){
-      if(e.target.checked == true){
-      this.chuanyi_val = val
-     }else{
-      this.chuanyi_val =this.chuanyi_val - val
-     }
+     const checkboxs=document.getElementsByClassName('checkbox4')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.chuanyi_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     dabianclick(e,val){
-     if(e.target.checked == true){
-      this.dabian_val = val
-     }else{
-      this.dabian_val =this.dabian_val - val
-     }
+     const checkboxs=document.getElementsByClassName('checkbox5')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.dabian_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     xiaobianclick(e,val){
-      if(e.target.checked == true){
-      this.xiaobian_val = val
-     }else{
-      this.xiaobian_val =this.xiaobian_val - val
-     }
+     const checkboxs=document.getElementsByClassName('checkbox6')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.xiaobian_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     ruceclick(e,val){
-     if(e.target.checked == true){
-      this.ruce_val = val
-     }else{
-      this.ruce_val =this.ruce_val - val
-     }
+     const checkboxs=document.getElementsByClassName('checkbox7')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.ruce_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     chuangyiclick(e,val){
-      if(e.target.checked == true){
-      this.chuangyi_val = val
-     }else{
-      this.chuangyi_val =this.chuangyi_val - val
-     }
+     const checkboxs=document.getElementsByClassName('checkbox8')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.chuangyi_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     pingdiclick(e,val){
-     if(e.target.checked == true){
-      this.paingdi_val = val
-     }else{
-      this.paingdi_val =this.paingdi_val - val
-     }
+    //  if(e.target.checked == true){
+    //   this.paingdi_val = val
+    //  }else{
+    //   this.paingdi_val =this.paingdi_val - val
+    //  }
+     const checkboxs=document.getElementsByClassName('checkbox9')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.paingdi_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     louticlick(e,val){
-      if(e.target.checked == true){
-      this.louti_val = val
-     }else{
-      this.louti_val =this.louti_val - val
-     }
+     const checkboxs=document.getElementsByClassName('checkbox10')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.louti_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     datehistory(){
       this.$router.push({path: '/patients/date_history'})

src/xt_pages/user/evaluationtool/hemodialysis.vue

@@ -642,6 +642,8 @@
                   :data="history_hemod"
                   stripe
                   border
+                  @row-click="hemod_click"
+                  :highlight-current-row="true"
                   :header-cell-style="{
                       background: '#0077ff9f',color:'white'}"
                   style="width: 100%">
@@ -1262,12 +1264,23 @@
                       </tbody>
                   </table>
               </div>
-              
+
             </div>
           </div>
         </div>
       </div>
-      
+
+    </el-dialog>
+     <!-- 删除弹窗 -->
+     <el-dialog
+      title="提示"
+      :visible.sync="dele_dialogVisible"
+      width="30%">
+      <span>确认删除该数据</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dele_Cancel">取 消</el-button>
+        <el-button type="primary" @click="deleclick">确 定</el-button>
+      </span>
     </el-dialog>
   </div>
 </template>
@@ -1318,6 +1331,8 @@ export default {
       cancel_num:0,
       hemod_pinggu:null,
       open_print:false,
+      dele_id:'',
+      dele_dialogVisible:false,
     }
   },
   methods:{
@@ -1339,9 +1354,9 @@ export default {
         const pinggrlen=this.pinggr
         for(let i=0;i<lent.length;i++){
           for(let y=0;y<pinggrlen.length;y++){
-            if(this.hemod_pinggu=pinggrlen[y].id){
+            if(this.hemod_pinggu==pinggrlen[y].id){
               lent[i].evaluate=pinggrlen[y].label
-              return lent[i].evaluate
+              return lent
             }
           }
         }
@@ -1366,12 +1381,30 @@ export default {
       this.baocunqx=true
       this.gsdayin=false
     },
+    dele_Cancel(){
+      this.append=false
+      this.append=true
+      this.baocunqx=false
+      this.dele_dialogVisible=false
+    },
     hemod_dele(){
       this.append=false
       this.gsdayin=false
       this.baocunqx=false
       this.hemodadd_show=true
       this.cancel_num=0
+      this.dele_dialogVisible=true
+    },
+    hemod_click(row,column, event){
+      this.dele_id=row.id
+    },
+    deleclick(){
+      for(let i=0;i<this.history_hemod.length;i++){
+        if(this.dele_id==this.history_hemod[i].id){
+          this.history_hemod.splice(i,1)
+        }
+      }
+      this.dele_dialogVisible=false
     },
     print_pingfen(){
       const style= '@media print {.diedao_content{background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0;} .tables thead th{ text-align: center;height: 20px;} .tables tbody td{height: 20px;padding:0 10px} .tables{font-size: 16px;}}'
@@ -1446,7 +1479,7 @@ z-index: 2000;
   z-index: -1;
 }
 .tables {
-  
+
   thead th{
     text-align: center;
     height: 20px;

src/xt_pages/user/evaluationtool/pediatricFallAssessment.vue

@@ -13,124 +13,124 @@
               </div>
 
               <div>
-                  <table class="table" id="table" border="1" style="width: 100%;">
-                      <thead>
-                          <tr>
-                          <th style="width:10%;">项目</th>
-                          <th style="width: 22.4%;">4分</th>
-                          <th style="width: 22.4%;">3分</th>
-                          <th style="width: 22.4%;">2分</th>
-                          <th style="width: 22.4%;">1分</th>
-                          </tr>
-                      </thead>
-                      <tbody>
-                          <tr class="bg_color">
-                            <td class="start">年龄</td>
-                            <td v-for="(item,index) in age" :key="index">
-                              <div class="jiange">
-                                <label><input name="ball" type="checkbox"  :value="item.value" @click="ageChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
-                              </div>
-                            </td>
-                          </tr>
-                          <tr>
-                            <td style="border-right: none;">
-                              <div class="bing">性别</div>
-                            </td>
-                            <td colspan="2" style="border-left: none;"></td>
-                            <td v-for="(item,index) in sex" :key="index">
-                              <div class="jiange">
-                                <label><input name="ball" type="checkbox" :value="item.value" @click="sexChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
-                              </div>
-                            </td>
-                          </tr>
-                          <tr class="bg_color">
-                            <td class="start">诊断</td>
-                            <td v-for="(item,index) in diagnosis" :key="index">
-                              <div class="jiange">
-                                <label><input name="ball" type="checkbox" :value="item.value" @click="diagnosischange($event,item.value)"/>&nbsp;{{item.lable}}</label>
-                              </div>
-                            </td>
-                              
-                          </tr>
-                          <tr>
-                            <td style="border-right: none;">
-                                <div class="bing">认知障碍</div>
-                            </td>
-                            <td style="border-left: none;"></td>
-                            <td v-for="(item,index) in cognize" :key="index">
-                              <div class="jiange">
-                                <label><input name="ball" type="checkbox" :value="item.value" @click="cognizeChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
-                              </div>
-                            </td>
-                              
-                          </tr>
-                          <tr class="bg_color">
-                            <td class="start">环境因素</td>
-                            <td v-for="(item,index) in environment" :key="index">
-                              <div class="jiange">
-                                <label><input name="ball" type="checkbox" :value="item.value" @click="environChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
-                              </div>
-                            </td>
+                <table class="table" id="table" border="1" style="width: 100%;">
+                  <thead>
+                    <tr>
+                    <th style="width:10%;">项目</th>
+                    <th style="width: 22.4%;">4分</th>
+                    <th style="width: 22.4%;">3分</th>
+                    <th style="width: 22.4%;">2分</th>
+                    <th style="width: 22.4%;">1分</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr class="bg_color">
+                      <td class="start">年龄</td>
+                      <td v-for="(item,index) in age" :key="index">
+                        <div class="jiange">
+                          <label><input name="ball" class="checked1" type="checkbox" :value="item.value" @click="ageChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                        </div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="border-right: none;">
+                        <div class="bing">性别</div>
+                      </td>
+                      <td colspan="2" style="border-left: none;"></td>
+                      <td v-for="(item,index) in sex" :key="index">
+                        <div class="jiange">
+                          <label><input name="ball" class="checked2" type="checkbox" :value="item.value" @click="sexChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                        </div>
+                      </td>
+                    </tr>
+                    <tr class="bg_color">
+                      <td class="start">诊断</td>
+                      <td v-for="(item,index) in diagnosis" :key="index">
+                        <div class="jiange">
+                          <label><input name="ball" class="checked3" type="checkbox" :value="item.value" @click="diagnosischange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                        </div>
+                      </td>
 
-                          </tr>
-                          <tr>
-                            <td style="border-right: none;">
-                                <div class="bing">药物使用</div>
-                            </td>
-                            <td style="border-left: none;"></td>
-                            <td v-for="(item,index) in medicine" :key="index">
-                              <div class="jiange">
-                                <label><input name="ball" type="checkbox" :value="item.value" @click="medicineChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
-                              </div>
-                            </td>
+                    </tr>
+                    <tr>
+                      <td style="border-right: none;">
+                          <div class="bing">认知障碍</div>
+                      </td>
+                      <td style="border-left: none;"></td>
+                      <td v-for="(item,index) in cognize" :key="index">
+                        <div class="jiange">
+                          <label><input name="ball" class="checked4" type="checkbox" :value="item.value" @click="cognizeChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                        </div>
+                      </td>
 
-                          </tr>
-                          <tr class="bg_color">
-                          <td colspan="5" style="height: 30px;"></td>
+                    </tr>
+                    <tr class="bg_color">
+                      <td class="start">环境因素</td>
+                      <td v-for="(item,index) in environment" :key="index">
+                        <div class="jiange">
+                          <label><input name="ball" class="checked5" type="checkbox" :value="item.value" @click="environChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                        </div>
+                      </td>
 
-                          </tr>
-                          <tr>
-                          <td colspan="5">
-                            <div class="content_top" >
-                              <div>
-                                  <div class="bottoms">
-                                  <span>总分:</span>
-                                  <el-input v-model="pedia_Totalpoints" style="width: 100px;"></el-input>分
-                                  </div>
+                    </tr>
+                    <tr>
+                      <td style="border-right: none;">
+                          <div class="bing">药物使用</div>
+                      </td>
+                      <td style="border-left: none;"></td>
+                      <td v-for="(item,index) in medicine" :key="index">
+                        <div class="jiange">
+                          <label><input name="ball" class="checked6" type="checkbox" :value="item.value" @click="medicineChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                        </div>
+                      </td>
 
-                                  <div class="bottoms">
-                                      <span>评估日期:</span>
-                                      <el-date-picker
-                                          v-model="value1"
-                                          type="date"
-                                          placeholder="选择日期"
-                                          :clearable="false"
-                                          style="width: 150px;">
-                                      </el-date-picker>
-                                  </div>
+                    </tr>
+                    <tr class="bg_color">
+                    <td colspan="5" style="height: 30px;"></td>
 
-                                  <div class="bottoms">
-                                      <span>评估人:</span>
-                                      <el-select v-model="value" placeholder="请选择" >
-                                          <el-option
-                                          v-for="item in options"
-                                          :key="item.value"
-                                          :label="item.label"
-                                          :value="item.value"
-                                          style="width:150px;">
-                                          </el-option>
-                                      </el-select>
-                                  </div>
+                    </tr>
+                    <tr>
+                    <td colspan="5">
+                      <div class="content_top" >
+                        <div>
+                            <div class="bottoms">
+                            <span>总分:</span>
+                            <el-input v-model="pedia_Totalpoints" style="width: 100px;"></el-input>分
+                            </div>
+
+                            <div class="bottoms">
+                                <span>评估日期:</span>
+                                <el-date-picker
+                                    v-model="value1"
+                                    type="date"
+                                    placeholder="选择日期"
+                                    :clearable="false"
+                                    style="width: 150px;">
+                                </el-date-picker>
+                            </div>
 
-                              </div>
-                              <div style="margin:5px 10px;">
-                                <el-button type="primary">确认</el-button>
-                              </div>
+                            <div class="bottoms">
+                                <span>评估人:</span>
+                                <el-select v-model="value" placeholder="请选择" >
+                                    <el-option
+                                    v-for="item in options"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                    style="width:150px;">
+                                    </el-option>
+                                </el-select>
                             </div>
-                          </td>
-                          </tr>
-                      </tbody>
-                  </table>
+
+                        </div>
+                        <div style="margin:5px 10px;">
+                          <el-button type="primary">确认</el-button>
+                        </div>
+                      </div>
+                    </td>
+                    </tr>
+                  </tbody>
+                </table>
 
               </div>
 
@@ -184,62 +184,95 @@ export default {
               ],
       cognize:[{value:3,lable:'没有意识到不能自我行动'},
                 {value:2,lable:'忘记有行动的限制'},
-                {value:1,lable:'能自我辨识方位；昏迷、无反应'}], 
+                {value:1,lable:'能自我辨识方位；昏迷、无反应'}],
       environment:[{value:4,lable:'住院期间有跌倒坠床史：患儿移动或活动时需要使用辅助工具（拐杖、助行器、转运床、轮椅等）；婴幼儿放置在无护栏的成人床'},
                 {value:3,lable:'近1个月有跌倒坠床史：婴幼儿放置在有护栏的成人床'},
                 {value:2,lable:'近3个月有跌倒坠床史：婴幼儿放置在有护栏的婴儿床'},
-                {value:1,lable:'>3个月有跌倒坠床史/无跌倒坠床史'}],  
+                {value:1,lable:'>3个月有跌倒坠床史/无跌倒坠床史'}],
       medicine:[{value:3,lable:'联合用药：镇静剂、安眠药、巴比妥类药、吩噻嗪类药、抗抑郁药、利尿药、降压药、强心剂、麻醉药、化疗药、散瞳剂'},
                 {value:2,lable:'以上其中一种药物'},
-                {value:1,lable:'其他药物/没有'}],                     
+                {value:1,lable:'其他药物/没有'}],
       checked:'',
       checkList:[],
       dialogVisible:false,
       text:'',
+      num:1
     }
   },
   methods:{
     ageChange(e,val){
-      console.log('22222',val);
-      if(e.target.checked == true){
+      console.log('22222',e,val);
+      const checkboxs=document.getElementsByClassName('checked1')
+     for(let i=0;i<checkboxs.length;i++){
+      if(val==checkboxs[i].value){
         this.agevalue = val
+        checkboxs[i].value
+        checkboxs[i].checked=true
       }else{
-        this.agevalue = this.agevalue - val
+        checkboxs[i].checked = false
       }
+     }
     },
     sexChange(e,val){
-      if(e.target.checked == true){
-        this.sexvalue = val
-      }else{
-        this.sexvalue =  this.sexvalue - val
-      }
+      const checkboxs=document.getElementsByClassName('checked2')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value ){
+          console.log('vvvv',val,'bbbb',e.target.checked);
+          this.sexvalue = val
+
+          checkboxs[i].checked=true
+
+        }else{
+          checkboxs[i].checked = false
+        }
+     }
     },
     diagnosischange(e,val){
-      if(e.target.checked == true){
-        this.diagnosis_val = val
-      }else{
-        this.diagnosis_val =  this.diagnosis_val - val
-      }
+      const checkboxs=document.getElementsByClassName('checked3')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value ){
+          console.log('vvvv',val,'bbbb',e.target.checked);
+          this.diagnosis_val = val
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+     }
     },
     cognizeChange(e,val){
-      if(e.target.checked == true){
-        this.cognize_val = val
-      }else{
-        this.cognize_val =  this.cognize_val - val
+      const checkboxs=document.getElementsByClassName('checked4')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value ){
+          console.log('vvvv',val,'bbbb',e.target.checked);
+          this.cognize_val = val
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
       }
     },
     environChange(e,val){
-      if(e.target.checked == true){
-        this.environment_val = val
-      }else{
-        this.environment_val =  this.environment_val - val
+      const checkboxs=document.getElementsByClassName('checked5')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value ){
+          console.log('vvvv',val,'bbbb',e.target.checked);
+          this.environment_val = val
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
       }
     },
     medicineChange(e,val){
-      if(e.target.checked == true){
-        this.medicine_val = val
-      }else{
-        this.medicine_val =  this.medicine_val - val
+      const checkboxs=document.getElementsByClassName('checked6')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value ){
+          console.log('vvvv',val,'bbbb',e.target.checked);
+          this.medicine_val = val
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
       }
     },
     // 历史评估

src/xt_pages/user/evaluationtool/pressuresore.vue

@@ -50,7 +50,7 @@
                       15~18分为低危；<br>
                       13~14分为中危；<br>
                       10~12分为高危；<br>
-                      ≤9分为极高危 
+                      ≤9分为极高危
                     </div>
                   </td>
                   <td rowspan="6" style="position: relative;vertical-align: top;">
@@ -72,7 +72,7 @@
                     <div class="jiange">
                       <label><input name="ball" type="checkbox" value="football" />&nbsp;其他</label>
                     </div>
-                    <div class="tianjia">
+                    <div class="tianjia" @click="add_press=true">
                       <!--  style="position: absolute;bottom: 0px;font-size: 17px;color:#4579C5;line-height: 40px;" -->
                       +添加
                     </div>
@@ -188,7 +188,7 @@
                   <th>D</th>
                   <th>E</th>
                   <th>F</th>
-                </tr> 
+                </tr>
               </thead>
               <tbody>
                 <tr>
@@ -202,34 +202,34 @@
                     </el-date-picker>
                   </td>
                   <td class="start">
-                    <el-input v-model="input" style="width:100px;"></el-input>
+                    <el-input v-model="ganzhi" style="width:80px;"></el-input>
                   </td>
                   <td class="start">
-                    <el-input v-model="input" style="width:100px"></el-input>
+                    <el-input v-model="shidu" style="width:80px"></el-input>
                   </td>
                   <td class="start">
-                    <el-input v-model="input" style="width:100px"></el-input>
+                    <el-input v-model="huodong" style="width:80px"></el-input>
                   </td>
                   <td class="start">
-                    <el-input v-model="input" style="width:100px"></el-input>
+                    <el-input v-model="yidong" style="width:80px"></el-input>
                   </td>
                   <td class="start">
-                    <el-input v-model="input" style="width:100px"></el-input>
+                    <el-input v-model="yingyang" style="width:80px"></el-input>
                   </td>
                   <td class="start">
-                    <el-input v-model="input" style="width:100px"></el-input>
+                    <el-input v-model="mocha" style="width:80px"></el-input>
                   </td>
                   <td class="start">
-                    <el-input v-model="input" style="width:100px"></el-input>
+                    <el-input v-model="mark" style="width:70px"></el-input>
                   </td>
                   <td class="start">
-                    <el-select v-model="value" placeholder="请选择" >
+                    <el-select v-model="value" placeholder="请选择" style="width:120px;">
                         <el-option
                           v-for="item in options"
                           :key="item.value"
                           :label="item.label"
                           :value="item.value"
-                          style="width:150px;">
+                          >
                         </el-option>
                     </el-select>
                   </td>
@@ -264,7 +264,7 @@
             </div>
             <div class="zhuangui">
                 <p style="display: inline-block; margin-right: 30px;">
-                    评估人签字: 
+                    评估人签字:
                     <el-input v-model="input" style="width:120px;"></el-input>
                 </p>
                 <p style="display: inline-block;">
@@ -280,7 +280,7 @@
             <div class="content_top">
               <div class="zhuangui">
                 <p style="display: inline-block; margin-right: 30px;">
-                    护士长签字: 
+                    护士长签字:
                     <el-select v-model="value" placeholder="请选择" style="width: 120px;">
                         <el-option
                         v-for="item in options"
@@ -318,7 +318,21 @@
 
         </div>
       </div>
-        
+      <!-- 添加弹窗页面 -->
+      <el-dialog
+        title="增加护理措施"
+        :visible.sync="add_press"
+        width="30%"
+      >
+        <span>
+          护理措施：
+          <input type="text" style="width: 290px;height: 36px;border: 1px solid #d7d7d7;">
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="add_press = false">取 消</el-button>
+          <el-button type="primary" @click="add_press = false">确 定</el-button>
+        </span>
+      </el-dialog>
     </div>
 </template>
 <script>
@@ -335,20 +349,32 @@ export default {
       input:'',
       options:[],
       value:'',
-      zhuangui:['出院','死亡','其他']
+      ganzhi:null,
+      shidu:null,
+      huodong:null,
+      yidong:null,
+      yingyang:null,
+      mocha:null,
+      zhuangui:['出院','死亡','其他'],
+      add_press:false,
     }
    },
    methods:{
     yachaunghistory(){
       this.$router.push({path: '/patients/Pressure_history'})
     }
+   },
+   computed:{
+    mark(){
+      return this.ganzhi*1 + this.shidu*1 + this.huodong*1 + this.yidong*1 + this.mocha*1 + this.yingyang*1
+    }
    }
 }
 </script>
 <style lang="scss" scoped>
   .content_top{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
   }
   .table{
         border: 1px solid #DCDFE6;
@@ -364,7 +390,7 @@ export default {
         tbody td{
            height: 40px;
            padding: 5px;
-           
+
         }
         .start{
           vertical-align: top;
@@ -401,4 +427,4 @@ export default {
     .zhuangui{
         margin-top: 10px;
     }
-</style>
+</style>

src/xt_pages/user/evaluationtool/pruritusAssessment.vue

@@ -24,14 +24,18 @@
               <tr>
                 <td class="start">痒的部位</td>
                 <td>
-                    <div class="jiange">
-                        <span v-for="item in buwei" class="rightjiange" @change="handleCheckedCitiesChange">
-                            <label><input type="checkbox" name="ball" :value="item" />&nbsp;{{ item }}</label>
-                        </span> 
-                        <label @change="handleCheckedCitiesChange"><input type="checkbox" name="ball" value="其他" />
-                            &nbsp;其他 <el-input v-model="input" style="width: 100px;"></el-input>
-                        </label>
-                    </div>
+                  <div class="jiange">
+                    <span v-for="item in buwei" class="rightjiange" @change="handleCheckedCitiesChange">
+                        <label><input type="checkbox" class="check" name="ball" :value="item" />&nbsp;{{ item }}</label>
+                    </span>
+                    <label @change="handleCheckedCitiesChange"><input type="checkbox" class="check" name="ball" value="其他" />
+                        &nbsp;其他 <el-input v-model="input" style="width: 100px;"></el-input>
+                    </label>
+                    <!-- quan_change -->
+                    <label @change="handleCheckedCitiesChange">
+                      <input type="checkbox" class="check" name="ball" value="全身" />&nbsp;全身
+                    </label>
+                  </div>
                 </td>
                 <td class="start">{{checked_points}}</td>
                 <td class="saoyang">瘙痒部位：计分范围1~3分一个部位瘙痒计1分，最多得3分，选全身计3分</td>
@@ -44,9 +48,9 @@
                             <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> 
+                </td>
                 <td class="start">{{radio1_points}}</td>
-                <td class="saoyang">瘙痒严重程度：计分范围1~5分</td>                          
+                <td class="saoyang">瘙痒严重程度：计分范围1~5分</td>
               </tr>
               <tr>
                 <td class="start">痒的频率</td>
@@ -112,10 +116,10 @@
           <div style="margin:5px 10px;">
               <el-button type="primary">确认</el-button>
           </div>
-        </div>  
+        </div>
       </div>
     </div>
-      
+
   </div>
 </template>
 <script>
@@ -138,7 +142,7 @@ export default {
       radio3_points:0,
       checked_points:0,
       // pruritus_Totalpoints:0,
-      buwei:['躯体','上肢','下肢','头皮','全身'],
+      buwei:['躯体','上肢','下肢','头皮'],
       chengdu:['不要抓(1)','要抓但没有抓痕(2)','抓出抓痕才能止痒(3)','经常抓出抓痕(4)','完全坐立不安(5)'],
       pinlv:['很少时候(1)','较少时候(2)','较多时候(3)','很多时候(4)','一直持续(5)'],
       yingxiang:['无影响(0)','一夜痒醒一次(2)','一夜痒醒两次(4)','一夜痒醒三次(6)'],
@@ -149,28 +153,110 @@ export default {
   },
   methods:{
     handleCheckedCitiesChange(e){
-      this.ball = e.target.value
-      console.log('1111111',this.ball)
+      const ball = e.target.value
+      // const checkboxs=document.getElementsByClassName('checkbox1')
+      const checkbox2=document.getElementsByClassName('check')
+      // if(checkboxs[0].checked==true){
+      //   // if(e.target.value == '全身'){
+      //     this.checked_points = 3
+      //   // }else{
+      //   //   var checked =1
+      //   //   this.checked_points = this.checked_points + checked
+      //   // }
+      // }else{
+      //   // if(e.target.value == '全身'){
+      //     this.checked_points = 0
+      //   // }else{
+      //   //   var checked =1
+      //   //   this.checked_points = this.checked_points - checked
+      //   // }
+      // }
+      // for(let i=0;i<checkbox2.length;i++){
+      //   if(ball=='全身'){
+      //     if(ball==checkbox2[i].value){
+      //       console.log('1111',this.checked_points);
+      //       checkbox2[i].checked=true
+      //       this.checked_points = 3
+      //     }else{
+      //       console.log('2222',this.checked_points);
+      //       checkbox2[i].checked=false
+      //     }
+      //   }else{
+      //     if(checkbox2[i].value=='全身'){
+      //       console.log('3333',this.checked_points);
+      //       this.checked_points=0
+      //       checkbox2[i].checked=false
+      //     }else{
+      //       if(checkbox2[i].value==ball){
+      //         console.log('4444',this.checked_points);
+      //         var checked =1
+      //         e.target.checked=true
+      //         this.checked_points = this.checked_points + checked
+      //         // return this.checked_points
+      //       }
+
+      //     }
+
+      //   }
+      //   // if(checkboxs[0].checked==true){
+      //   //   this.checked_points = 3
+      //   //   checkbox2[i].checked=false
+      //   // }else{
+      //   //   if(ball==checkbox2[i].value){
+      //   //     console.log('2222',checkbox2[1].value);
+      //   //     checkboxs[0].checked=false
+      //   //     checkbox2[i].checked=true
+      //   //     var checked =1
+      //   //     this.checked_points = this.checked_points + checked
+      //   //   }
+      //   // }
+      // }
+      // console.log('1111111',ball)
+      // for(let i=0;i<checkbox2.length;i++){
+      //   if(ball=='全身'){
+      //     checkboxs[0].checked=true
+      //     checkbox2[i].checked=false
+      //     this.checked_points = 3
+      //   }else{
+      //     var checked =1
+      //     checkboxs[0].checked=false
+      //     e.target.checked=true
+      //     this.checked_points = this.checked_points + checked
+      //   }
+      // }
+
+      // if(ball=='全身'){
+      //   checkboxs[0].checked=true
+      // }else{
+      //   checkboxs[0].checked=false
+      // }
+
       if(e.target.checked==true){
         if(e.target.value == '全身'){
           this.checked_points = 3
-          // this.pruritus_Totalpoints=this.pruritus_Totalpoints + this.checked_points
         }else{
-          var checked =1
-          this.checked_points = this.checked_points + checked
-          // this.pruritus_Totalpoints=this.pruritus_Totalpoints + checked
+          // if(this.checked_points<3){
+            var checked =1
+            this.checked_points = this.checked_points + checked
+          // }else{
+          //   this.checked_points = 3
+          // }
         }
       }else{
         if(e.target.value == '全身'){
           this.checked_points = 0
-          // this.pruritus_Totalpoints=this.pruritus_Totalpoints - 3
         }else{
           var checked =1
           this.checked_points = this.checked_points - checked
-          // this.pruritus_Totalpoints=this.pruritus_Totalpoints - checked
         }
       }
     },
+    quan_change(e){
+      const ball=e.target.value
+      if(ball=='全身'){
+
+      }
+    },
     radiochecked(e){
       const bal=e
       const jiequ =(bal.split('(')[1].split(')')[0]) * 1
@@ -198,7 +284,7 @@ export default {
 <style lang="scss" scoped>
     .content_top{
       display: flex;
-      justify-content: space-between; 
+      justify-content: space-between;
     }
     .table{
         border: 1px solid #DCDFE6;
@@ -241,6 +327,6 @@ export default {
     .bottoms{
         display: inline-block;
         margin-left: 10px;
-        margin-top: 5px; 
+        margin-top: 5px;
     }
-</style>
+</style>

src/xt_pages/user/history/Children_history.vue

@@ -58,7 +58,7 @@
             show-overflow-tooltip>
             <template slot-scope="scope">
               <el-button type="primary" icon="el-icon-edit-outline" @click="open_editor(scope.row)"></el-button>
-              <el-button type="primary" icon="el-icon-delete"></el-button>
+              <el-button type="primary" icon="el-icon-delete" @click="deletes(scope.row)"></el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -230,7 +230,7 @@
             <td class="start">年龄</td>
             <td v-for="(item,index) in age" :key="index">
               <div class="jiange">
-                <label><input name="ball" type="checkbox"  :value="item.value" @click="ageChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                <label><input name="ball" class="checked1" type="checkbox" :value="item.value" @click="ageChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
               </div>
             </td>
           </tr>
@@ -241,7 +241,7 @@
             <td colspan="2" style="border-left: none;"></td>
             <td v-for="(item,index) in sex" :key="index">
               <div class="jiange">
-                <label><input name="ball" type="checkbox" :value="item.value" @click="sexChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                <label><input name="ball" class="checked2" type="checkbox" :value="item.value" @click="sexChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
               </div>
             </td>
           </tr>
@@ -249,7 +249,7 @@
             <td class="start">诊断</td>
             <td v-for="(item,index) in diagnosis" :key="index">
               <div class="jiange">
-                <label><input name="ball" type="checkbox" :value="item.value" @click="diagnosischange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                <label><input name="ball" class="checked3" type="checkbox" :value="item.value" @click="diagnosischange($event,item.value)"/>&nbsp;{{item.lable}}</label>
               </div>
             </td>
 
@@ -261,7 +261,7 @@
             <td style="border-left: none;"></td>
             <td v-for="(item,index) in cognize" :key="index">
               <div class="jiange">
-                <label><input name="ball" type="checkbox" :value="item.value" @click="cognizeChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                <label><input name="ball" class="checked4" type="checkbox" :value="item.value" @click="cognizeChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
               </div>
             </td>
 
@@ -270,7 +270,7 @@
             <td class="start">环境因素</td>
             <td v-for="(item,index) in environment" :key="index">
               <div class="jiange">
-                <label><input name="ball" type="checkbox" :value="item.value" @click="environChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                <label><input name="ball" class="checked5" type="checkbox" :value="item.value" @click="environChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
               </div>
             </td>
 
@@ -282,7 +282,7 @@
             <td style="border-left: none;"></td>
             <td v-for="(item,index) in medicine" :key="index">
               <div class="jiange">
-                <label><input name="ball" type="checkbox" :value="item.value" @click="medicineChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
+                <label><input name="ball" class="checked6" type="checkbox" :value="item.value" @click="medicineChange($event,item.value)"/>&nbsp;{{item.lable}}</label>
               </div>
             </td>
 
@@ -331,6 +331,18 @@
         </tbody>
       </table>
     </el-dialog>
+     <!--删除 -->
+     <el-dialog
+      title="提示"
+      :visible.sync="delete_centerDialogVisible"
+      width="20%"
+      center>
+      <span>是否删除该记录</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="delete_centerDialogVisible=false">取 消</el-button>
+        <el-button type="primary" @click="delete_childer">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -338,12 +350,14 @@ import print from 'print-js'
 export default{
   data(){
     return{
-      tableData:[{time:'2023-9-27',mark:'15',evaluate:'千亦雪'},{time:'2023-9-27',mark:'14',evaluate:'千任雪'}],
+      tableData:[{id:1,time:'2023-9-27',mark:'15',evaluate:'千亦雪'},{id:2,time:'2023-9-27',mark:'14',evaluate:'千任雪'}],
       multipleSelection:[],
       dialogVisible:false,
       mingxi_dialogVisible:false,
       editor_dialogVisible:false,
+      delete_centerDialogVisible:false,
 
+      row:'',
       value1:'',
       value:'',
       options:[],
@@ -374,6 +388,7 @@ export default{
       checked:'',
       checkList:[],
       text:'',
+
     }
   },
   methods:{
@@ -400,7 +415,18 @@ export default{
     open_editor(row){
       this.editor_dialogVisible =true
     },
-
+    deletes(row){
+      this.row=row.id
+      this.delete_centerDialogVisible = true
+    },
+    delete_childer(){
+      for(let i=0;i<this.tableData.length;i++){
+        if(this.row==this.tableData[i].id){
+          this.tableData.splice(i,1)
+        }
+      }
+      this.delete_centerDialogVisible=false
+    },
     print_pingfen(id){
       this.dialogVisible=false
       this.mingxi_dialogVisible=false
@@ -428,53 +454,85 @@ export default{
     },
 
     ageChange(e,val){
-      console.log('22222',val);
-      if(e.target.checked == true){
+      console.log('22222',e,val);
+      const checkboxs=document.getElementsByClassName('checked1')
+     for(let i=0;i<checkboxs.length;i++){
+      if(val==checkboxs[i].value){
         this.agevalue = val
+        checkboxs[i].value
+        checkboxs[i].checked=true
       }else{
-        this.agevalue = this.agevalue - val
+        checkboxs[i].checked = false
       }
+     }
     },
     sexChange(e,val){
-      if(e.target.checked == true){
-        this.sexvalue = val
-      }else{
-        this.sexvalue =  this.sexvalue - val
-      }
+      const checkboxs=document.getElementsByClassName('checked2')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value ){
+          console.log('vvvv',val,'bbbb',e.target.checked);
+          this.sexvalue = val
+
+          checkboxs[i].checked=true
+
+        }else{
+          checkboxs[i].checked = false
+        }
+     }
     },
     diagnosischange(e,val){
-      if(e.target.checked == true){
-        this.diagnosis_val = val
-      }else{
-        this.diagnosis_val =  this.diagnosis_val - val
-      }
+      const checkboxs=document.getElementsByClassName('checked3')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value ){
+          console.log('vvvv',val,'bbbb',e.target.checked);
+          this.diagnosis_val = val
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+     }
     },
     cognizeChange(e,val){
-      if(e.target.checked == true){
-        this.cognize_val = val
-      }else{
-        this.cognize_val =  this.cognize_val - val
+      const checkboxs=document.getElementsByClassName('checked4')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value ){
+          console.log('vvvv',val,'bbbb',e.target.checked);
+          this.cognize_val = val
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
       }
     },
     environChange(e,val){
-      if(e.target.checked == true){
-        this.environment_val = val
-      }else{
-        this.environment_val =  this.environment_val - val
+      const checkboxs=document.getElementsByClassName('checked5')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value ){
+          console.log('vvvv',val,'bbbb',e.target.checked);
+          this.environment_val = val
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
       }
     },
     medicineChange(e,val){
-      if(e.target.checked == true){
-        this.medicine_val = val
-      }else{
-        this.medicine_val =  this.medicine_val - val
+      const checkboxs=document.getElementsByClassName('checked6')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value ){
+          console.log('vvvv',val,'bbbb',e.target.checked);
+          this.medicine_val = val
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
       }
     },
   },
   computed:{
     pedia_Totalpoints(){
       return this.agevalue + this.sexvalue + this.diagnosis_val +this.cognize_val + this.environment_val + this.medicine_val
-    }
+    },
   }
 }
 </script>

src/xt_pages/user/history/Pressure_history.vue

@@ -94,7 +94,7 @@
             show-overflow-tooltip>
             <template slot-scope="scope">
               <el-button type="primary" icon="el-icon-edit-outline" @click="open_editor(scope.row)"></el-button>
-              <el-button type="primary" icon="el-icon-delete"></el-button>
+              <el-button type="primary" icon="el-icon-delete" @click="open_delete(scope.row)"></el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -431,7 +431,7 @@
                   <div class="jiange">
                     <label><input name="ball" type="checkbox" value="football" />&nbsp;其他</label>
                   </div>
-                  <div class="tianjia">
+                  <div class="tianjia" @click="add_press=true">
                     <!--  style="position: absolute;bottom: 0px;font-size: 17px;color:#4579C5;line-height: 40px;" -->
                     +添加
                   </div>
@@ -561,34 +561,34 @@
                   </el-date-picker>
                 </td>
                 <td class="start">
-                  <el-input v-model="input" style="width:80px;"></el-input>
+                    <el-input v-model="ganzhi" style="width:80px;"></el-input>
                 </td>
                 <td class="start">
-                  <el-input v-model="input" style="width:80px"></el-input>
+                  <el-input v-model="shidu" style="width:80px"></el-input>
                 </td>
                 <td class="start">
-                  <el-input v-model="input" style="width:80px"></el-input>
+                  <el-input v-model="huodong" style="width:80px"></el-input>
                 </td>
                 <td class="start">
-                  <el-input v-model="input" style="width:80px"></el-input>
+                  <el-input v-model="yidong" style="width:80px"></el-input>
                 </td>
                 <td class="start">
-                  <el-input v-model="input" style="width:80px"></el-input>
+                  <el-input v-model="yingyang" style="width:80px"></el-input>
                 </td>
                 <td class="start">
-                  <el-input v-model="input" style="width:80px"></el-input>
+                  <el-input v-model="mocha" style="width:80px"></el-input>
                 </td>
                 <td class="start">
-                  <el-input v-model="input" style="width:80px"></el-input>
+                  <el-input v-model="mark" style="width:70px"></el-input>
                 </td>
                 <td class="start">
-                  <el-select v-model="value" placeholder="请选择" >
+                  <el-select v-model="value" placeholder="请选择"  style="width:120px;">
                       <el-option
                         v-for="item in options"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
-                        style="width:150px;">
+                       >
                       </el-option>
                   </el-select>
                 </td>
@@ -666,6 +666,33 @@
           </div>
       </div>
     </el-dialog>
+    <!-- 编辑添加弹窗页面 -->
+    <el-dialog
+        title="增加护理措施"
+        :visible.sync="add_press"
+        width="30%"
+      >
+        <span>
+          护理措施：
+          <input type="text" style="width: 290px;height: 36px;border: 1px solid #d7d7d7;">
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="add_press = false">取 消</el-button>
+          <el-button type="primary" @click="add_press = false">确 定</el-button>
+        </span>
+    </el-dialog>
+    <!--删除 -->
+    <el-dialog
+      title="提示"
+      :visible.sync="delete_centerDialogVisible"
+      width="20%"
+      center>
+      <span>是否删除该记录</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="delete_centerDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="delete_press">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -673,18 +700,27 @@ import print from 'print-js'
 export default{
   data(){
     return{
-      tableData:[{time:'2023-9-27',ganzhi:'2',shidu:'2',huodong:'3',yidong:'4',yingyang:'1',mocha:'3',mark:'15',evaluate:'千亦雪'}],
+      tableData:[{id:1,time:'2023-9-27',ganzhi:'2',shidu:'2',huodong:'3',yidong:'4',yingyang:'1',mocha:'3',mark:'15',evaluate:'千亦雪'}],
       multipleSelection:[],
       dialogVisible:false,
       mingxi_dialogVisible:false,
       editor_dialogVisible:false,
+      delete_centerDialogVisible:false,
 
+      ganzhi:null,
+      shidu:null,
+      huodong:null,
+      yidong:null,
+      yingyang:null,
+      mocha:null,
+      add_press:false,
       zhuangui:['出院','死亡','其他'],
       value1:'',
       checkList:[],
       input:'',
       options:[],
       value:'',
+      row:''
     }
   },
   methods:{
@@ -711,6 +747,18 @@ export default{
     open_editor(row){
       this.editor_dialogVisible =true
     },
+    open_delete(row){
+      this.row=row.id
+      this.delete_centerDialogVisible=true
+    },
+    delete_press(){
+      for(let i=0;i<this.tableData.length;i++){
+        if(this.row==this.tableData[i].id){
+          this.tableData.splice(i,1)
+        }
+      }
+      this.delete_centerDialogVisible=false
+    },
     print_pingfen(id){
       const style= '@media print {.diedao_content{background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0;} .table tr td{padding:5px}}'
       if(id==1){
@@ -732,6 +780,11 @@ export default{
       }
 
     },
+  },
+  computed:{
+    mark(){
+      return this.ganzhi*1 + this.shidu*1 + this.huodong*1 + this.yidong*1 + this.mocha*1 + this.yingyang*1
+    }
   }
 }
 </script>

src/xt_pages/user/history/RASS_history.vue

@@ -61,7 +61,7 @@
             align="center"
             show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-button type="primary" icon="el-icon-delete"></el-button>
+              <el-button type="primary" icon="el-icon-delete" @click="RASS_delete(scope.row)"></el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -288,6 +288,18 @@
         </div>
       </div>
     </el-dialog>
+     <!--删除 -->
+     <el-dialog
+      title="提示"
+      :visible.sync="delete_centerDialogVisible"
+      width="20%"
+      center>
+      <span>是否删除该记录</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="delete_centerDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="deletes">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -301,7 +313,10 @@ export default{
       RASS_dialogVisible:false,
       teng_dialogVisible:false,
       mingxi_dialogVisible:false,
-      tableData:[{time:'2023-9-27',mark:'15',evaluate:'千亦雪'},{time:'2023-9-27',mark:'14',evaluate:'千任雪'}],
+      delete_centerDialogVisible:false,
+      row:'',
+
+      tableData:[{id:1,time:'2023-9-27',mark:'15',evaluate:'千亦雪'},{id:1,time:'2023-9-27',mark:'14',evaluate:'千任雪'}],
       LOS:[{title:'0分', value:'清醒'},{title:'1分', value:'有些昏昏欲睡，但容易唤醒'},
             {title:'2分', value:'频繁发生昏昏欲睡，容易唤醒，但不能持续处于觉醒状态'},
             {title:'3分', value:'无意识，无法唤醒'},{title:'S分', value:'正常意识，容易唤醒'}
@@ -374,7 +389,20 @@ export default{
       this.teng_dialogVisible=false
     },
     teng_dele(row){
-      this.tableData.splice(row, 1);
+      this.row=row.id
+      this.delete_centerDialogVisible=true
+    },
+    RASS_delete(row){
+      this.row=row.id
+      this.delete_centerDialogVisible=true
+    },
+    deletes(){
+      for(let i=0;i<this.tableData.length;i++){
+        if(this.row==this.tableData[i].id){
+          this.tableData.splice(i,1)
+        }
+      }
+      this.delete_centerDialogVisible=false
     }
   }
 }

src/xt_pages/user/history/daoguan_history.vue

@@ -79,7 +79,7 @@
             show-overflow-tooltip>
             <template slot-scope="scope">
               <el-button type="primary" icon="el-icon-edit-outline" @click="open_xiugai(scope.row)"></el-button>
-              <el-button type="primary" icon="el-icon-delete"></el-button>
+              <el-button type="primary" icon="el-icon-delete" @click="open_delete(scope.row)"></el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -430,7 +430,18 @@
           <p>3.常规情况下，评分5~8分，至少每天评估一次；评分≥9，至少每班评估一次，紧急与特殊情况，应随时评估。</p>
       </div>
     </el-dialog>
-
+     <!--删除 -->
+     <el-dialog
+      title="提示"
+      :visible.sync="delete_centerDialogVisible"
+      width="20%"
+      center>
+      <span>是否删除该记录</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="delete_centerDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="delete_daogaun">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -443,7 +454,8 @@ export default{
       dialogVisible:false,
       mingxi_dialogVisible:false,
       editor_dialogVisible:false,
-      tableData:[{time:'2023-9-27',mark:'15',evaluate:'千亦雪'},{time:'2023-9-27',mark:'14',evaluate:'千任雪'}],
+      delete_centerDialogVisible:false,
+      tableData:[{id:1,time:'2023-9-27',mark:'15',evaluate:'千亦雪'},{id:2,time:'2023-9-27',mark:'14',evaluate:'千任雪'}],
       tuoguan:['低危导管 (1分)','中危导管 (2分)','高危导管 (3分)'],
       yishi:['意识清醒 (0分)','中昏迷、深昏迷 (1分)','嗜睡、昏睡 (2分)','浅昏迷 (3分)','意识模糊 (4分)'],
       peihe:['完全配合 (1分)','部分配合 (2分)','不配合 (3分)'],
@@ -459,6 +471,7 @@ export default{
       options:[],
       input:'',
       value:'',
+      row:''
     }
   },
   methods:{
@@ -508,7 +521,18 @@ export default{
     open_xiugai(row){
       this.editor_dialogVisible=true
     },
-
+    open_delete(row){
+      this.row=row.id
+      this.delete_centerDialogVisible=true
+    },
+    delete_daogaun(){
+      for(let i=0;i<this.tableData.length;i++){
+        if(this.row==this.tableData[i].id){
+          this.tableData.splice(i,1)
+        }
+      }
+      this.delete_centerDialogVisible=false
+    },
     handleCheckedCitiesChange(e){
       const ball=e
       const jiequ =(ball.split('(')[1].split('分')[0]) * 1

src/xt_pages/user/history/date_history.vue

@@ -119,7 +119,7 @@
             >
             <template slot-scope="scope">
               <el-button type="primary" icon="el-icon-edit-outline" @click="open_xiugai(scope.row)"></el-button>
-              <el-button type="primary" icon="el-icon-delete"></el-button>
+              <el-button type="primary" icon="el-icon-delete" @click="open_delete(scope.row)"></el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -373,13 +373,13 @@
               <tr class="bg_color">
                 <td class="start">进食</td>
                 <td v-for="(item,index) in jinshi" :key="index">
-                    <div class="jiange">
-                      <span>
-                        <label><input type="checkbox" name="ball" :value="item.value" @click="jinshiclick($event,item.value)"/>&nbsp;
-                            {{ item.label }}
-                        </label>
-                      </span>
-                    </div>
+                  <div class="jiange">
+                    <span>
+                      <label><input type="checkbox" class="checkbox1" name="ball" :value="item.value" @click="jinshiclick($event,item.value)"/>&nbsp;
+                          {{ item.label }}
+                      </label>
+                    </span>
+                  </div>
                 </td>
                 <td>&nbsp;</td>
               </tr>
@@ -388,7 +388,7 @@
                 <td v-for="(item,index) in xizao" :key="index">
                   <div class="jiange">
                     <span>
-                      <label><input type="checkbox" name="ball" :value="item.value" @click="xizaoclick($event,item.value)"/>&nbsp;
+                      <label><input type="checkbox" class="checkbox2" name="ball" :value="item.value" @click="xizaoclick($event,item.value)"/>&nbsp;
                           {{ item.label }}
                       </label>
                     </span>
@@ -402,7 +402,7 @@
                 <td v-for="(item,index) in xiushi" :key="index">
                     <div class="jiange">
                       <span>
-                        <label><input type="checkbox" name="ball" :value="item.value" @click="xiushiclick($event,item.value)"/>&nbsp;
+                        <label><input type="checkbox" class="checkbox3" name="ball" :value="item.value" @click="xiushiclick($event,item.value)"/>&nbsp;
                             {{item.label}}
                         </label>
                       </span>
@@ -416,7 +416,7 @@
                 <td v-for="(item,index) in chuanyi" :key="index">
                   <div class="jiange">
                     <span>
-                      <label><input type="checkbox" name="ball" :value="item.value" @click="chuanyiclick($event,item.value)"/>&nbsp;
+                      <label><input type="checkbox" class="checkbox4" name="ball" :value="item.value" @click="chuanyiclick($event,item.value)"/>&nbsp;
                           {{item.label}}
                       </label>
                     </span>
@@ -429,7 +429,7 @@
                 <td v-for="(item,index) in dabian" :key="index">
                   <div class="jiange">
                     <span>
-                      <label><input type="checkbox" name="ball" :value="item.value" @click="dabianclick($event,item.value)"/>&nbsp;
+                      <label><input type="checkbox" class="checkbox5" name="ball" :value="item.value" @click="dabianclick($event,item.value)"/>&nbsp;
                           {{item.label}}
                       </label>
                     </span>
@@ -442,7 +442,7 @@
                 <td v-for="(item,index) in xioabian" :key="index">
                   <div class="jiange">
                     <span>
-                      <label><input type="checkbox" name="ball" :value="item.value" @click="xioabianclick($event,item.value)"/>&nbsp;
+                      <label><input type="checkbox" class="checkbox6" name="ball" :value="item.value" @click="xiaobianclick($event,item.value)"/>&nbsp;
                           {{item.label}}
                       </label>
                     </span>
@@ -455,7 +455,7 @@
                 <td v-for="(item,index) in ruce" :key="index">
                   <div class="jiange">
                     <span>
-                      <label><input type="checkbox" name="ball" :value="item.value" @click="ruceclick($event,item.value)"/>&nbsp;
+                      <label><input type="checkbox" class="checkbox7" name="ball" :value="item.value" @click="ruceclick($event,item.value)"/>&nbsp;
                           {{item.label}}
                       </label>
                     </span>
@@ -468,7 +468,7 @@
                 <td v-for="(item,index) in chuangyi" :key="index">
                   <div class="jiange">
                     <span>
-                      <label><input type="checkbox" name="ball" :value="item.value" @click="chuangyiclick($event,item.value)"/>&nbsp;
+                      <label><input type="checkbox" class="checkbox8" name="ball" :value="item.value" @click="chuangyiclick($event,item.value)"/>&nbsp;
                           {{item.label}}
                       </label>
                     </span>
@@ -480,7 +480,7 @@
                 <td v-for="(item,index) in pingdi" :key="index">
                   <div class="jiange">
                     <span>
-                      <label><input type="checkbox" name="ball" :value="item.value" @click="pingdiclick($event,item.value)"/>&nbsp;
+                      <label><input type="checkbox" class="checkbox9" name="ball" :value="item.value" @click="pingdiclick($event,item.value)"/>&nbsp;
                           {{item.label}}
                       </label>
                     </span>
@@ -492,7 +492,7 @@
                 <td v-for="(item,index) in louti" :key="index">
                   <div class="jiange">
                     <span>
-                      <label><input type="checkbox" name="ball" :value="item.value" @click="louticlick($event,item.value)"/>&nbsp;
+                      <label><input type="checkbox" class="checkbox10" name="ball" :value="item.value" @click="louticlick($event,item.value)"/>&nbsp;
                           {{ item.label }}
                       </label>
                     </span>
@@ -544,6 +544,18 @@
         </table>
       </div>
     </el-dialog>
+     <!--删除 -->
+     <el-dialog
+      title="提示"
+      :visible.sync="delete_centerDialogVisible"
+      width="20%"
+      center>
+      <span>是否删除该记录</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="delete_centerDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="delete_date">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -556,7 +568,8 @@ export default{
       dialogVisible:false,
       mingxi_dialogVisible:false,
       editor_dialogVisible:false,
-      tableData:[{time:'2023-9-27',mark:'15',evaluate:'千亦雪'},{time:'2023-9-27',mark:'14',evaluate:'千任雪'}],
+      delete_centerDialogVisible:false,
+      tableData:[{id:1,time:'2023-9-27',mark:'15',evaluate:'千亦雪'},{id:2,time:'2023-9-27',mark:'14',evaluate:'千任雪'}],
       jinshi:[{value:10,label:'可独立进食(10分)'},
               {value:5,label:'需部分帮助(如协助夹菜等)(5分)'},
               {value:0,label:'需极大帮助或完全依赖他人(0分)'}
@@ -575,7 +588,7 @@ export default{
               {value:5,label:'偶尔失禁(5分)'},
               {value:0,label:'完全失禁(0分)'}
             ],
-      xioabian:[{value:10,label:'可控制大便(10分)'},
+      xioabian:[{value:10,label:'可控制小便(10分)'},
               {value:5,label:'偶尔失禁(5分)'},
               {value:0,label:'完全失禁(0分)'}
             ],
@@ -612,6 +625,7 @@ export default{
       chuangyi_val:null,
       paingdi_val:null,
       louti_val:null,
+      row:''
     }
   },
   methods:{
@@ -664,76 +678,142 @@ export default{
     open_xiugai(row){
       this.editor_dialogVisible=true
     },
-
+    open_delete(row){
+      this.row=row.id
+      this.delete_centerDialogVisible=true
+    },
+    delete_date(){
+      for(let i=0;i<this.tableData.length;i++){
+        if(this.row==this.tableData[i].id){
+          this.tableData.splice(i,1)
+        }
+      }
+      this.delete_centerDialogVisible=false
+    },
     jinshiclick(e,val){
-     if(e.target.checked == true){
-      this.jinshi_val = val
-     }else{
-      this.jinshi_val =this.jinshi_val - val
-     }
+      const checkboxs=document.getElementsByClassName('checkbox1')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.jinshi_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     xizaoclick(e,val){
-      if(e.target.checked == true){
-      this.xizao_val = val
-     }else{
-      this.xizao_val =this.xizao_val - val
-     }
+      const checkboxs=document.getElementsByClassName('checkbox2')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.xizao_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     xiushiclick(e,val){
-     if(e.target.checked == true){
-      this.xiushi_val = val
-     }else{
-      this.xiushi_val =this.xiushi_val - val
-     }
+     const checkboxs=document.getElementsByClassName('checkbox3')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.xiushi_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     chuanyiclick(e,val){
-      if(e.target.checked == true){
-      this.chuanyi_val = val
-     }else{
-      this.chuanyi_val =this.chuanyi_val - val
-     }
+     const checkboxs=document.getElementsByClassName('checkbox4')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.chuanyi_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     dabianclick(e,val){
-     if(e.target.checked == true){
-      this.dabian_val = val
-     }else{
-      this.dabian_val =this.dabian_val - val
-     }
+     const checkboxs=document.getElementsByClassName('checkbox5')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.dabian_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     xiaobianclick(e,val){
-      if(e.target.checked == true){
-      this.xiaobian_val = val
-     }else{
-      this.xiaobian_val =this.xiaobian_val - val
-     }
+     const checkboxs=document.getElementsByClassName('checkbox6')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.xiaobian_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     ruceclick(e,val){
-     if(e.target.checked == true){
-      this.ruce_val = val
-     }else{
-      this.ruce_val =this.ruce_val - val
-     }
+     const checkboxs=document.getElementsByClassName('checkbox7')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.ruce_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     chuangyiclick(e,val){
-      if(e.target.checked == true){
-      this.chuangyi_val = val
-     }else{
-      this.chuangyi_val =this.chuangyi_val - val
-     }
+     const checkboxs=document.getElementsByClassName('checkbox8')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.chuangyi_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     pingdiclick(e,val){
-     if(e.target.checked == true){
-      this.paingdi_val = val
-     }else{
-      this.paingdi_val =this.paingdi_val - val
-     }
+    //  if(e.target.checked == true){
+    //   this.paingdi_val = val
+    //  }else{
+    //   this.paingdi_val =this.paingdi_val - val
+    //  }
+     const checkboxs=document.getElementsByClassName('checkbox9')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.paingdi_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
     louticlick(e,val){
-      if(e.target.checked == true){
-      this.louti_val = val
-     }else{
-      this.louti_val =this.louti_val - val
-     }
+     const checkboxs=document.getElementsByClassName('checkbox10')
+      for(let i=0;i<checkboxs.length;i++){
+        if(val==checkboxs[i].value){
+          this.louti_val = val
+          checkboxs[i].value
+          checkboxs[i].checked=true
+        }else{
+          checkboxs[i].checked = false
+        }
+      }
     },
   },
   computed:{

src/xt_pages/user/history/mind_history.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="patient-container">
     <div class="patient-app-containers advice-container app-container">
-      <div style="display: flex;margin-bottom: 20px;"> 
+      <div style="display: flex;margin-bottom: 20px;">
         <div style="width: 50%;">
           <el-button type="text" icon="el-icon-arrow-left" style="font-size: 18px;" @click="fanhui">返回</el-button>
           <div class="history">历史评分</div>
@@ -16,7 +16,7 @@
           ref="multipleTable"
           :data="tableData"
           border
-          
+
           tooltip-effect="dark"
           :header-cell-style="{
             background:'#4579c5',
@@ -34,7 +34,7 @@
             label="评估日期"
             width="150"
             align="center">
-            
+
           </el-table-column>
           <el-table-column
             prop=""
@@ -74,7 +74,7 @@
             show-overflow-tooltip>
             <template slot-scope="scope">
               <el-button type="primary" icon="el-icon-edit-outline" @click="open_xiugai(scope.row)"></el-button>
-              <el-button type="primary" icon="el-icon-delete"></el-button>
+              <el-button type="primary" icon="el-icon-delete" @click="open_delet(scope.row)"></el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -120,7 +120,7 @@
           </div>
         </div>
       </div>
-    </el-dialog>  
+    </el-dialog>
     <!-- 编辑 -->
     <el-dialog
       title="提示"
@@ -154,7 +154,7 @@
                             <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>                           
+                </td>
             </tr>
             <tr class="bg_color">
                 <td class="start">自伤</td>
@@ -210,7 +210,19 @@
               <el-button type="primary">确认</el-button>
           </div>
       </div>
-    </el-dialog>  
+    </el-dialog>
+    <!-- 删除 -->
+    <el-dialog
+      title="提示"
+      :visible.sync="delete_centerDialogVisible"
+      width="20%"
+      center>
+      <span>是否删除该记录</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="delete_centerDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="delete_mind">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -222,7 +234,9 @@ export default{
       multipleSelection:[],
       dialogVisible:false,
       editor_dialogVisible:false,
-      tableData:[{time:'2023-9-27',mark:'15',evaluate:'千亦雪'},{time:'2023-9-27',mark:'14',evaluate:'千任雪'}],
+      delete_centerDialogVisible:false,
+      row:'',
+      tableData:[{id:1,time:'2023-9-27',mark:'15',evaluate:'千亦雪'},{id:2,time:'2023-9-27',mark:'14',evaluate:'千任雪'}],
 
       checkList:'',
       radio1:'',
@@ -261,6 +275,18 @@ export default{
     },
     open_xiugai(row){
       this.editor_dialogVisible=true
+    },
+    open_delet(row){
+      this.row=row.id
+      this.delete_centerDialogVisible=true
+    },
+    delete_mind(){
+      for(let i=0;i<this.tableData.length;i++){
+        if(this.row==this.tableData[i].id){
+          this.tableData.splice(i,1)
+        }
+      }
+      this.delete_centerDialogVisible=false
     }
   }
 }
@@ -284,7 +310,7 @@ export default{
 }
 .content_top{
       display: flex;
-      justify-content: space-between; 
+      justify-content: space-between;
     }
 .tables{
     border: 1px solid #DCDFE6;
@@ -317,7 +343,7 @@ export default{
       margin-right: 40px;
       font-size: 15px;
     }
-    
+
     input{
         -webkit-appearance: checkbox;
     }
@@ -325,6 +351,6 @@ export default{
 .bottoms{
   display: inline-block;
   margin-left: 10px;
-  margin-top: 5px; 
+  margin-top: 5px;
 }
-</style>
+</style>

src/xt_pages/user/history/nourishment_history.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="patient-container">
     <div class="patient-app-containers advice-container app-container">
-      <div style="display: flex;margin-bottom: 20px;"> 
+      <div style="display: flex;margin-bottom: 20px;">
         <div style="width: 50%;">
           <el-button type="text" icon="el-icon-arrow-left" style="font-size: 18px;" @click="fanhui">返回</el-button>
           <div class="history">历史评分</div>
@@ -17,7 +17,7 @@
           ref="multipleTable"
           :data="tableData"
           border
-          
+
           tooltip-effect="dark"
           :header-cell-style="{
             background:'#4579c5',
@@ -74,7 +74,7 @@
             show-overflow-tooltip>
             <template slot-scope="scope">
               <el-button type="primary" icon="el-icon-edit-outline" @click="open_xiugai(scope.row)"></el-button>
-              <el-button type="primary" icon="el-icon-delete"></el-button>
+              <el-button type="primary" icon="el-icon-delete" @click="open_delet(scope.row)"></el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -120,7 +120,7 @@
           </div>
         </div>
       </div>
-    </el-dialog>  
+    </el-dialog>
      <!-- 打印明细 -->
      <el-dialog
       title="提示"
@@ -308,8 +308,8 @@
                       </tr>
                     </tbody>
                 </table>
-              </div> 
-              
+              </div>
+
               <div style="font-size: 16px;">打印时间：</div>
             </div>
           </div>
@@ -524,6 +524,18 @@
           </div>
       </div>
     </el-dialog>
+    <!-- 删除 -->
+    <el-dialog
+      title="提示"
+      :visible.sync="delete_centerDialogVisible"
+      width="20%"
+      center>
+      <span>是否删除该记录</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="delete_centerDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="delete_niouris">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -536,7 +548,8 @@ export default{
       dialogVisible:false,
       mingxi_dialogVisible:false,
       editor_dialogVisible:false,
-      tableData:[{time:'2023-9-27',mark:'15',evaluate:'千亦雪'},{time:'2023-9-27',mark:'14',evaluate:'千任雪'}],
+      delete_centerDialogVisible:false,
+      tableData:[{id:1,time:'2023-9-27',mark:'15',evaluate:'千亦雪'},{id:2,time:'2023-9-27',mark:'14',evaluate:'千任雪'}],
       qingdu:['骸骨折','慢性疾病急性发作或有','COPD','血液透析','肝硬化','一般恶性肿瘤患者','糖尿病'],
       zhdu:['腹部大手术','脑卒中','重度肺炎','血液恶性肿瘤'],
       zhongsdu:['颅脑损伤','骨髓移植','大于APACHE分的ICU患者'],
@@ -553,6 +566,7 @@ export default{
       radio_val:null,
       radio1_val:null,
       radio2_val:null,
+      row:'',
     }
   },
   methods:{
@@ -597,6 +611,18 @@ export default{
     open_xiugai(row){
       this.editor_dialogVisible=true
     },
+    open_delet(row){
+      this.row=row.id
+      this.delete_centerDialogVisible=true
+    },
+    delete_niouris(){
+      for(let i=0;i<this.tableData.length;i++){
+        if(this.row==this.tableData[i].id){
+          this.tableData.splice(i,1)
+        }
+      }
+      this.delete_centerDialogVisible=false
+    },
     radio_change(e){
       const ball=e * 1
       console.log('1111',e);
@@ -688,4 +714,4 @@ input{
   display: flex;
   justify-content: space-between;
 }
-</style>
+</style>

src/xt_pages/user/history/pruritus_history.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="patient-container">
     <div class="patient-app-containers advice-container app-container">
-      <div style="display: flex;margin-bottom: 20px;"> 
+      <div style="display: flex;margin-bottom: 20px;">
         <div style="width: 50%;">
           <el-button type="text" icon="el-icon-arrow-left" style="font-size: 18px;" @click="fanhui">返回</el-button>
           <div class="history">历史评分</div>
@@ -17,7 +17,7 @@
           ref="multipleTable"
           :data="tableData"
           border
-          
+
           tooltip-effect="dark"
           :header-cell-style="{
             background:'#4579c5',
@@ -80,7 +80,7 @@
             show-overflow-tooltip>
             <template slot-scope="scope">
               <el-button type="primary" icon="el-icon-edit-outline" @click="open_xiugai(scope.row)"></el-button>
-              <el-button type="primary" icon="el-icon-delete"></el-button>
+              <el-button type="primary" icon="el-icon-delete" @click="open_delet(scope.row)"></el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -128,7 +128,7 @@
           </div>
         </div>
       </div>
-    </el-dialog>  
+    </el-dialog>
      <!-- 打印明细 -->
      <el-dialog
       title="提示"
@@ -168,7 +168,7 @@
                           <div class="jiange">
                               <span v-for="item in buwei" class="rightjiange" >
                                   <label><input type="checkbox" name="ball" :value="item" />&nbsp;{{ item }}</label>
-                              </span> 
+                              </span>
                               <label ><input type="checkbox" name="ball" value="其他" />
                                   &nbsp;其他 <span style="display: inline-block;border-bottom:1px solid #DCDFE6;width: 60px;"></span>
                               </label>
@@ -185,9 +185,9 @@
                                   <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> 
+                      </td>
                       <td class="start">{{radio1_points}}</td>
-                      <td class="saoyang">瘙痒严重程度：计分范围1~5分</td>                          
+                      <td class="saoyang">瘙痒严重程度：计分范围1~5分</td>
                     </tr>
                     <tr>
                       <td class="start">痒的频率</td>
@@ -247,7 +247,7 @@
                     <div class="jiange">
                         <span v-for="item in buwei" class="rightjiange" @change="handleCheckedCitiesChange">
                             <label><input type="checkbox" name="ball" :value="item" />&nbsp;{{ item }}</label>
-                        </span> 
+                        </span>
                         <label @change="handleCheckedCitiesChange"><input type="checkbox" name="ball" value="其他" />
                             &nbsp;其他 <el-input v-model="input" style="width: 100px;"></el-input>
                         </label>
@@ -264,9 +264,9 @@
                             <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> 
+                </td>
                 <td class="start">{{radio1_points}}</td>
-                <td class="saoyang">瘙痒严重程度：计分范围1~5分</td>                          
+                <td class="saoyang">瘙痒严重程度：计分范围1~5分</td>
               </tr>
               <tr>
                 <td class="start">痒的频率</td>
@@ -332,8 +332,20 @@
           <div style="margin:5px 10px;">
               <el-button type="primary">确认</el-button>
           </div>
-        </div>   
-    </el-dialog>  
+        </div>
+    </el-dialog>
+     <!-- 删除 -->
+    <el-dialog
+      title="提示"
+      :visible.sync="delete_centerDialogVisible"
+      width="20%"
+      center>
+      <span>是否删除该记录</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="delete_centerDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="delete_pruritus">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -346,7 +358,9 @@ export default{
       dialogVisible:false,
       mingxi_dialogVisible:false,
       editor_dialogVisible:false,
-      tableData:[{time:'2023-9-27',mark:'15',evaluate:'千亦雪'},{time:'2023-9-27',mark:'14',evaluate:'千任雪'}],
+      delete_centerDialogVisible:false,
+
+      tableData:[{id:1,time:'2023-9-27',mark:'15',evaluate:'千亦雪'},{id:2,time:'2023-9-27',mark:'14',evaluate:'千任雪'}],
 
       buwei:['躯体','上肢','下肢','头皮','全身'],
       chengdu:['不要抓(1)','要抓但没有抓痕(2)','抓出抓痕才能止痒(3)','经常抓出抓痕(4)','完全坐立不安(5)'],
@@ -365,6 +379,7 @@ export default{
       options:[],
       value:'',
       value1:'',
+      row:'',
     }
   },
   methods:{
@@ -404,11 +419,23 @@ export default{
         })
         this.mingxi_dialogVisible=false
       }
-      
+
     },
     open_xiugai(row){
       this.editor_dialogVisible=true
     },
+    open_delet(row){
+      this.row=row.id
+      this.delete_centerDialogVisible=true
+    },
+    delete_pruritus(){
+      for(let i=0;i<this.tableData.length;i++){
+        if(this.row==this.tableData[i].id){
+          this.tableData.splice(i,1)
+        }
+      }
+      this.delete_centerDialogVisible=false
+    },
     handleCheckedCitiesChange(e){
       this.ball = e.target.value
       console.log('1111111',this.ball)
@@ -445,7 +472,7 @@ export default{
         this.radio3_points =jiequ
       }
     },
-    
+
   },
   computed:{
     pruritus_Totalpoints(){
@@ -473,7 +500,7 @@ export default{
 }
 .content_top{
       display: flex;
-      justify-content: space-between; 
+      justify-content: space-between;
 }
 .table{
     border: 1px solid #DCDFE6;
@@ -516,6 +543,6 @@ export default{
 .bottoms{
     display: inline-block;
     margin-left: 10px;
-    margin-top: 5px; 
+    margin-top: 5px;
 }
-</style>
+</style>

src/xt_pages/user/history/tumble_history.vue

@@ -604,6 +604,37 @@
         </div>
       </div>
     </el-dialog>
+    <!--删除 -->
+    <el-dialog
+      title="提示"
+      :visible.sync="delete_centerDialogVisible"
+      width="20%"
+      center>
+      <span>是否删除该记录</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="delete_centerDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="delete_tumble">确 定</el-button>
+      </span>
+    </el-dialog>
+    <!-- 添加弹窗页面 -->
+    <el-dialog
+        title="添加"
+        :visible.sync="add_centerDialogVisible"
+        width="30%"
+        center>
+        <span>
+          <el-input
+            type="textarea"
+            :autosize="{ minRows: 4, maxRows: 6}"
+            placeholder="请输入需要添加的内容.."
+            v-model="textarea2">
+          </el-input>
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="add_centerDialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="add_tumble">确 定</el-button>
+        </span>
+      </el-dialog>
   </div>
 </template>
 <script>
@@ -611,12 +642,15 @@ import print from 'print-js'
 export default{
   data(){
     return{
-      tableData:[{time:'2023-9-27',mark:'15',measures:'无',evaluate:'千亦雪'},{time:'2023-9-27',mark:'14',measures:'无',evaluate:'千任雪'}],
+      tableData:[{id:1,time:'2023-9-27',mark:'15',measures:'无',evaluate:'千亦雪'},{id:2,time:'2023-9-27',mark:'14',measures:'无',evaluate:'千任雪'}],
       multipleSelection:[],
       dialogVisible:false,
       mingxi_dialogVisible:false,
       bianji_dialogVisible:false,
+      delete_centerDialogVisible:false,
+      add_centerDialogVisible:false,
 
+      row:'',
       pingdate:'',
       Nurse:'',
       input:'',
@@ -646,21 +680,16 @@ export default{
       console.log('0000',this.multipleSelection);
     },
     open_pingfen(ids){
-      if(ids==1){
-        if(this.multipleSelection.length==0){
-          this.$message('至少选择一条数据')
-        }else{
+      if(this.multipleSelection.length==0){
+        this.$message('请选择需要打印的记录')
+      }else{
+        if(ids==1){
           this.dialogVisible=true
-        }
-      }
-      if(ids==2){
-        if(this.multipleSelection.length==0){
-          this.$message('至少选择一条数据')
         }else{
           this.mingxi_dialogVisible=true
         }
-      }
 
+      }
     },
     // open_mingxi(){
     //   if(this.multipleSelection.length==0){
@@ -696,11 +725,24 @@ export default{
       console.log('1111',row);
     },
     delete_fall(row){
+      this.row=row.id
+      this.delete_centerDialogVisible=true
       console.log('3333',row);
       // this.tableData.splice(row)
     },
+    delete_tumble(){
+      for(let i=0;i<this.tableData.length;i++){
+        if(this.row==this.tableData[i].id){
+          this.tableData.splice(i,1)
+        }
+      }
+      this.delete_centerDialogVisible=false
+    },
+    add_tumble(){
+      this.add_centerDialogVisible = false
+    },
     add(){
-      this.centerDialogVisible =true
+      this.add_centerDialogVisible =true
     },
     handleCheckedCitiesChange(e){
       var ball = e.target.value

src/xt_pages/user/inspection.vue

@@ -1314,7 +1314,7 @@ export default {
 
 
 
-                  if(this.org_id == 10121){
+                  if(this.org_id == 10121 || this.org_id ==10278 || this.org_id ==10138){
                     item.value = inspectionsMap[items[index].id].inspect_value
                     item.item_name = inspectionsMap[items[index].id].item_name
                   }else{

src/xt_pages/workforce/components/ScheduleItem.vue

@@ -2,17 +2,17 @@
   <!-- 排班表填充内容 -->
     <div >
 
-            <div>
-                <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span>
-                <template v-if="schedulMode">
-                  <br/>
-                  <span v-if="scheduleDetail.mode_name.length>0"  :class='modeColor(scheduleDetail.mode_name)' >{{'('+scheduleDetail.mode_name+')'}}</span>
-                </template>
-                <template v-if="schedulFlag">
-                  <br/><span >{{scheduleDetail.dialysis_machine_name}}</span>
-                </template>
-                
-            </div>
+      <div>
+          <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span>
+          <template v-if="schedulMode">
+            <br/>
+            <span v-if="scheduleDetail.mode_name.length>0"  :class='modeColor(scheduleDetail.mode_name)' >{{'('+scheduleDetail.mode_name+')'}}</span>
+          </template>
+          <template v-if="schedulFlag">
+            <br/><span >{{scheduleDetail.dialysis_machine_name}}</span>
+          </template>
+
+      </div>
     </div>
 </template>
 
@@ -43,7 +43,7 @@ export default {
   },
   data() {
     return {
-      
+
     }
   },
 

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -150,7 +150,7 @@
              <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus!=''">
                 <span v-if="org_id!=10131&& org_id !=10215">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
                 <span v-if="org_id==10131 || org_id == 10215">{{scope.row.dialysissolution.dialyzer_perfusion_apparatus}}</span>
-              
+
               </span>
              <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ scope.row.dialysissolution.dialysis_dialyszers}}</span>
           </span>
@@ -366,10 +366,10 @@ export default {
           str = zone.join(",")
         }
 
-       
+
         let weekOfDay = parseInt(moment().format('E'))
         let next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD');
-        
+
         let next_sunday = moment().add((7 - weekOfDay) + 7, 'days').format('YYYY-MM-DD')
 
         console.log("开始时间++++++++",(this.getTimestamp(next_monday)/1000)-28800)
@@ -377,8 +377,8 @@ export default {
         var now_time = parseInt(this.week_type - 1)*86400 + (this.getTimestamp(next_monday)/1000 -28800)
         console.log("now_time------------------",now_time)
 
-       
-      
+
+
        const params = {
           start_time:next_monday,
           end_time:next_sunday,
@@ -651,9 +651,9 @@ export default {
         var name = ''
         for (let i = 0; i < solution.length; i++) {
           if (mode_id == solution[i].mode_id) {
-         
+
             name = solution[i].dialyzer_perfusion_apparatus
-            
+
           }
         }
         console.log('name', name)
@@ -664,7 +664,7 @@ export default {
       this.getNextScheduleWeekDay()
     },
     signPrint() {
-        
+        //
         if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id ==10375){
          var zone = this.zone
           var newArr = []
@@ -683,7 +683,7 @@ export default {
             path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2
           })
           }
-        if(this.org_id!=9671 && this.org_id!=9675 && this.org_id!=10340){
+        if(this.org_id!=9671 && this.org_id!=9675 && this.org_id!=10340 && this.org_id !=10375 && this.org_id !=10469  && this.org_id !=0 ){
           var zone = this.zone
         var newArr = []
         for(let i=0;i<this.zoneList.length;i++){
@@ -701,7 +701,26 @@ export default {
           path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2
         })
         }
-       
+        else if(this.org_id==10469 || this.org_id==0){
+          var zone = this.zone
+          console.log("zone23232",zone)
+          var newArr = []
+          for(let i=0;i<this.zoneList.length;i++){
+            newArr.push(this.zoneList[i].id)
+          }
+          var arr = newArr.join(",")
+          var str = ""
+          if(this.zone == 0){
+            str = arr
+          }
+          if(zone != 0){
+            str = zone.join(",")
+          }
+          this.$router.push({
+            path: '/schedule/remind/print/setting/two?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2
+          })
+        }
+
     },
     getTime(val) {
       if(val == ""){

src/xt_pages/workforce/components/tableWeeks.vue

@@ -27,7 +27,7 @@
                 打印设置
             </el-button>
 
-           
+
         </div>
 
         <div class="cell clearfix">
@@ -230,7 +230,7 @@
                     </span> -->
 
                     <!-- <span v-if="org_id==10131 || org_id == 10215 || org_id == 10233">{{scope.row.dialysissolution.dialyzer_perfusion_apparatus}}</span> -->
-                    
+
                       <!-- {{scope.row.prescription.dialysis_dialyszers}} -->
                     <span v-if="scope.row.prescription.dialysis_dialyszers =='' ">
                        {{scope.row.dialysissolution.dialysis_dialyszers}}
@@ -240,7 +240,7 @@
                        {{scope.row.dialysissolution.dialyzer_perfusion_apparatus}}
                     </span>
                     <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus !=''">{{scope.row.prescription.dialyzer_perfusion_apparatus}}</span>
-  
+
                     <span v-if="scope.row.prescription.dialysis_irrigation==''">/{{scope.row.dialysissolution.dialysis_irrigation}}</span>
                     <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{scope.row.prescription.dialysis_irrigation}}</span>
             </template>
@@ -259,7 +259,7 @@
                     <span v-if="scope.row.dialysissolution.anticoagulant === 9">达肝素</span>
                     <span v-if="scope.row.dialysissolution.anticoagulant === 10">体外抗凝</span>
                     <span v-if="scope.row.dialysissolution.anticoagulant === 11">那屈肝素</span>
-                       
+
                     <span v-if="scope.row.dialysissolution.antioxidant_commodity_name!=''">
              (<span>{{scope.row.prescription.antioxidant_commodity_name}}</span>)
           </span>
@@ -865,8 +865,7 @@
 
         return desc
 
-      }
-      ,
+      },
       printAction() {
         var zone = this.zone
         var newArr = []
@@ -876,7 +875,7 @@
         var arr = newArr.join(",")
         var str = ""
         if(this.zone == 0){
-           str = arr  
+           str = arr
         }
         if(zone != 0){
           str = zone.join(",")
@@ -884,11 +883,10 @@
         this.$router.push({
           path: '/schedule/remind/print?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str
         })
-      }
-      ,
+      },
       signPrint() {
-
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 0 || this.org_id == 10375){
+//
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340  || this.org_id == 10375){
          var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []
@@ -898,7 +896,7 @@
           var arr = newArr.join(",")
           var str = ""
           if(this.zone == 0){
-            str = arr  
+            str = arr
           }
           if(zone != 0){
             str = zone.join(",")
@@ -907,7 +905,7 @@
             path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
           })
         }
-        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340 && this.org_id != 0 && this.org_id!=10375){
+        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340 && this.org_id != 0 && this.org_id!=10375 && this.org_id!=10469){
           var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []
@@ -917,7 +915,7 @@
           var arr = newArr.join(",")
           var str = ""
           if(this.zone == 0){
-            str = arr  
+            str = arr
           }
           if(zone != 0){
             str = zone.join(",")
@@ -925,8 +923,26 @@
           this.$router.push({
             path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
           })
-         }
-      
+        }else if(this.org_id==10469 || this.org_id==0){
+          var zone = this.zone
+          console.log("zone23232",zone)
+          var newArr = []
+          for(let i=0;i<this.zoneList.length;i++){
+            newArr.push(this.zoneList[i].id)
+          }
+          var arr = newArr.join(",")
+          var str = ""
+          if(this.zone == 0){
+            str = arr
+          }
+          if(zone != 0){
+            str = zone.join(",")
+          }
+          this.$router.push({
+            path: '/schedule/remind/print/setting/two?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
+          })
+        }
+
       }
       ,
       compare(property) {
@@ -989,7 +1005,7 @@
       ,
 
       getScheduleList() {
-        
+
         var zone = this.zone
         var newArr = []
         for(let i=0;i<this.zoneList.length;i++){
@@ -998,7 +1014,7 @@
         var arr = newArr.join(",")
         var str = ""
         if(this.zone == 0){
-           str = arr  
+           str = arr
         }
         if(zone != 0){
           str = zone.join(",")
@@ -1544,9 +1560,9 @@
         var name = ''
         for (let i = 0; i < solution.length; i++) {
           if (mode_id == solution[i].mode_id) {
-         
+
             name = solution[i].dialyzer_perfusion_apparatus
-            
+
           }
         }
         console.log('name', name)

src/xt_pages/workforce/remind.vue

@@ -5,18 +5,17 @@
 
   </div>
   <div class="app-container">
-
     <el-tabs v-model="activeName"  ref="elTabs">
         <el-tab-pane name="thisWeek">
             <span slot="label"><i class="el-icon-date"></i> 本周（{{theWeek.thisWeek}}）</span>
         </el-tab-pane>
         <el-tab-pane name="nextWeek">
             <span slot="label"><i class="el-icon-date"></i> 下一周（{{theWeek.nextWeek}}）</span>
-        </el-tab-pane> 
+        </el-tab-pane>
     </el-tabs>
     <table-push v-if="activeName=='pushTime'"></table-push>
     <!-- <table-weeks v-else :week-time="activeName"> </table-weeks> -->
-     
+
    <table-weeks v-if="activeName == 'thisWeek'"> </table-weeks>
    <nextTableWeeks v-if="activeName =='nextWeek'"></nextTableWeeks>
   </div>

src/xt_pages/workforce/remind_print_setting_two.vue

@@ -0,0 +1,815 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-row style="float:right;">
+        <el-col :span="24">
+          <el-button
+            size="small"
+            icon="el-icon-printer"
+            type="primary"
+            @click="printAction"
+            >打印</el-button
+          >
+        </el-col>
+      </el-row>
+    </div>
+    <div class="app-container" style="background-color: white;">
+      <div id="print_content">
+        <div class="print_main_content">
+          <div class="table_panel">
+            <div v-for="(main_collection,index) in scheduleData" :key="index" class="boxshadow"
+              style="page-break-after: always; box-sizing: border-box;margin: 0px 35px 30px;">
+              <div style="border: 1px solid black;width: 90%;"  >
+                <div style="margin: 5px 5px;">
+                  <span>
+                    <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
+                    <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
+                  </span>&nbsp;&nbsp;
+                  <span>
+                    <span v-if="main_collection.patient.gender==1">男</span>
+                    <span v-if="main_collection.patient.gender==2">女</span>
+                  </span>&nbsp;&nbsp;
+                  <span>
+                    <span v-if="type ==1 && printObj.name == 1">{{getNewAge(main_collection.patient.id_card_no) }}岁</span>
+                    <span v-if="type ==2 && printObj.name == 1">{{getNewAge(main_collection.id_card_no) }}岁</span>
+                  </span>&nbsp;&nbsp;
+
+                  <!-- <span>{{getNewAge(main_collection.patient.id_card_no)  }}岁</span>&nbsp;&nbsp; -->
+                  <span>{{getTimes(main_collection.schedule_date)}}</span>&nbsp;&nbsp;
+                  <span></span>&nbsp;&nbsp;
+                  <span>
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span>
+                  </span>&nbsp;&nbsp;<span>{{ main_collection.number.number }}</span>
+                </div>
+                <div style="margin: 5px 5px;">
+                  <span>身高:{{ main_collection.patient.height?main_collection.patient.height:"" }} cm</span>&nbsp;&nbsp;
+                  <span>干体重:{{main_collection.assessmentbefor.dry_weight}}kg</span>&nbsp;&nbsp;
+                  <span>HCT:%</span>&nbsp;&nbsp;<span>KTV目标:</span>
+                </div>
+              </div>
+              <div style="height: 30px;width: 90%;border: 1px solid black;">
+
+              </div>
+              <div style="border: 1px solid black;width: 90%;">
+                <div style="display: flex;margin: 5px 5px;">
+                  <div style="flex: 1;">透析模式:{{getModeId(main_collection.mode_id)}}</div>
+                  <div style="flex: 1;">透析器/灌流器:
+                    {{ main_collection.dialysissolution.dialysis_strainer }}
+                    <span v-if="printObj.dialyzers == 1&& main_collection.dialysissolution.dialysis_dialyszers!=''">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
+                    <span v-if="printObj.perfusion_apparatus == 1&& main_collection.dialysissolution.dialysis_irrigation!=''">{{main_collection.dialysissolution.dialysis_irrigation}}</span>
+                    <span v-if="main_collection.dialysissolution.dialysis_strainer!=''">{{ main_collection.dialysissolution.dialysis_strainer }}</span>
+                    <span v-if="main_collection.dialysissolution.dialyzer_perfusion_apparatus!=''">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
+                  </div>
+
+                </div>
+                <div style="display: flex;margin: 5px 5px;">
+                  <div style="flex: 1;">血流量:{{main_collection.prescription.blood_flow_volume}}ml/min</div>
+                  <div style="flex: 1;">置换液总量:{{main_collection.prescription.displace_liqui_value}}L</div>
+                </div>
+                <div style="margin: 5px 5px;">
+                  <div>透析液类型:
+                    <span>Na:{{ main_collection.prescription.sodium }}</span>
+                    <span>K:{{ main_collection.prescription.kalium }}</span>
+                    <span>Ca:{{main_collection.prescription.calcium }}</span>
+                    <span>
+                      <span v-if="main_collection.prescription.chaptalization==0"> 不含 </span>
+                      <span v-if="main_collection.prescription.chaptalization>0"> 含糖:{{main_collection.prescription.chaptalization}} </span>
+                      HCO3:</span>
+                  </div>
+                </div>
+                <div style="display: flex;margin: 5px 5px;">
+                  <div style="flex: 1;">超滤曲线:</div>
+                  <div style="flex: 1;">Na曲线:</div>
+                </div>
+                <div style="margin: 5px 5px;">
+                  <span>抗凝方案:</span>
+                  <span>{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
+                  <span>
+                    首剂：<span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                      {{main_collection.dialysissolution.anticoagulant_shouji}}mg
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                      {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}mg
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}} mg
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 6">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                      {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                      {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                      {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                      {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                      </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                      {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                    </span>
+                  </span>
+
+                  <span>
+                    维持：{{main_collection.dialysissolution.anticoagulant_weichi}}
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 1">
+                      mg/h
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                      mg/h
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                    iu/h
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                      mg/h
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                      mg/h
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 6">
+                    iu/h
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                    iu/h
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                      iu/h
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                      iu/h
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                      iu/h
+                      </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                      iu/h
+                    </span>
+                  </span>
+
+                  <span>
+                      总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 1">
+                      mg
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                      mg
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                      iu
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                    mg
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                      mg
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 6">
+                    iu
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                      iu
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                      iu
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                    iu
+                    </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                      iu
+                      </span>
+                    <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                    iu
+                    </span>
+                  </span>
+                </div>
+                <div style="margin: 5px 5px;">
+                  血管通路:{{getBloodAccess(main_collection.assessmentbefor.blood_access_part_opera_id)}}
+                </div>
+              </div>
+              <div style="border: 1px solid black;width: 90%;">
+                <div style="margin: 5px 5px;">高危因素:{{ main_collection.prescription.remark }}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { getScheduleList,getPrintList,getNextScheduleWeekDayOne } from '@/api/schedule'
+  import { parseTime } from '@/utils'
+  import { uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import { getDataConfig } from '@/utils/data'
+  import print from 'print-js'
+  const moment = require('moment')
+  export default {
+    name: 'SchedulePrint',
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '排班提醒' },
+          { path: false, name: '排班提醒打印' }
+        ],
+        scheduleData:[],
+        week_type: 0,
+        day:'',
+        td_1_width: '10%',
+        td_2_width: '10%',
+        td_3_width: '25%',
+        td_4_width: '45%',
+        modeOptions: null,
+        anticoagulants_confit:null,
+        currentDate:'',
+        start_time:moment().week(moment().week() + 1).startOf('week').unix(),
+        end_time:moment().week(moment().week() + 1).endOf('week').unix(),
+        org_id:0,
+        now_time:0,
+        zone:"",
+        pre_status:0,
+        printObj:{},
+        type:1,
+        printDate:'',
+        blood_access_part_opera:[],
+      }
+    },
+    components: {
+      BreadCrumb
+    },
+    created() {
+     this.blood_access_part_opera = getDataConfig('hemodialysis', 'vascular_access_desc')
+     this.type = this.$route.query.type
+     this.getPrintList()
+     this.org_id = this.$store.getters.xt_user.org.id
+     console.log("机构ID",this.org_id)
+     this.currentDate = this.getCurrentDate()
+     console.log("打印时间----------------------------",this.currentDate)
+    this.printDate = moment().format("YYYY-MM-DD HH:mm:ss")
+    this.modeOptions = this.$store.getters.treatment_mode
+    this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
+    this.week_type = this.$route.query.week_type
+    this.week_time  = this.$route.query.week_time
+    this.zone = this.$route.query.zone
+    this.pre_status = this.$route.query.prestatus
+
+    if(parseInt(this.$route.query.type) == 1){
+      const params = {
+          week_type:this.week_type,
+          week_time:this.week_time,
+          zone:this.zone,
+        }
+       console.log("params",params)
+       getScheduleList(params).then(response=>{
+         if(response.data.state ==1){
+           var list = response.data.data.list
+
+           for(let i=0;i<list.length;i++){
+              list[i].sort = list[i].number.sort
+           }
+           var arr = list.sort(this.compare('sort'))
+           console.log("arr--------",arr)
+           this.scheduleData = arr
+
+             let a = response.data.data.day
+              console.log("a",a)
+              var myDate = new Date(a);
+              var year = myDate.getFullYear(); //年
+              var month = myDate.getMonth() + 1; //月
+              var day = myDate.getDate(); //日
+              var days = myDate.getDay();
+              switch(days) {
+              case 1:
+                days = '星期一';
+                break;
+              case 2:
+                days = '星期二';
+                break;
+              case 3:
+                days = '星期三';
+                break;
+              case 4:
+                days = '星期四';
+                break;
+              case 5:
+                days = '星期五';
+                break;
+              case 6:
+                days = '星期六';
+                break;
+              case 0:
+                days = '星期日';
+                break;
+          }
+          var str = year + "年" + month + "月" + day + "日  ";
+          this.currentDate = str
+          }
+       })
+
+      var now_time = parseInt(this.week_type) * 86400 + this.start_time
+      console.log("now",now_time)
+      this.now_time = now_time
+    }
+    if(parseInt(this.$route.query.type) == 2){
+       this.getNextScheduleWeekDay()
+    }
+
+    },
+    methods: {
+      getAdvice:function(doctor_advice) {
+        if (doctor_advice != null) {
+
+        let name = ""
+        for (let i = 0; i< doctor_advice.length; i++) {
+
+          let prescribing_number = ''
+          let single_dose = ''
+          let drug_spec = ''
+
+          if (doctor_advice[i].prescribing_number > 0) {
+            prescribing_number = doctor_advice[i].prescribing_number + doctor_advice[i].prescribing_number_unit
+          }
+          if (doctor_advice[i].single_dose > 0) {
+            single_dose = ' 单次用量 ' + doctor_advice[i].single_dose + doctor_advice[i].single_dose_unit
+          }
+
+          if (doctor_advice[i].drug_spec > 0) {
+            drug_spec = doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit
+          }
+
+          name = name + doctor_advice[i].advice_name + " " + drug_spec + " " + prescribing_number + " " + single_dose + " " + doctor_advice[i].delivery_way + " " + doctor_advice[i].execution_frequency + " " + doctor_advice[i].remark + "\n"
+
+          if (doctor_advice[i].child.length > 0) {
+
+            for (let a = 0; a < doctor_advice[i].child.length; a++) {
+
+              if (doctor_advice[i].child[a].prescribing_number > 0) {
+                doctor_advice[i].child[a]['presc'] = doctor_advice[i].child[a].prescribing_number + doctor_advice[i].child[a].prescribing_number_unit
+              } else {
+                doctor_advice[i].child[a]['presc'] = ''
+              }
+
+              if (doctor_advice[i].child[a].single_dose > 0) {
+                doctor_advice[i].child[a]['single'] = " " + ' 单次用量 ' + " " + doctor_advice[i].child[a].single_dose + doctor_advice[i].child[a].single_dose_unit
+              } else {
+                doctor_advice[i].child[a]['single'] = ''
+              }
+
+              name = name + "▲" + doctor_advice[i].child[a].advice_name + ""
+                + doctor_advice[i].child[a].advice_desc
+                + doctor_advice[i].child[a].drug_spec_unit
+                + doctor_advice[i].child[a].presc
+                + doctor_advice[i].child[a].single + "\n"
+            }
+
+          }
+        }
+          return name
+
+
+        }
+
+      },
+      printAction: function() {
+        const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel {font-size:25px } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 180px;} @page {margin-top:10px;}}'
+        // const style1 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 170px;} @page {margin-top:10px;}}'
+          printJS({
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+          })
+
+      }, getSchedulesType: function(type) {
+        let type_name = ''
+        switch (type) {
+          case 1:
+            type_name = '上午'
+            break
+          case 2:
+            type_name = '下午'
+            break
+          case 3:
+            type_name = '晚上'
+            break
+        }
+        return type_name
+      },
+      getCurrentDate: function () {
+        console.log(this.$route.query.week_type)
+        var myDate = new Date();
+        var year = myDate.getFullYear(); //年
+        var month = myDate.getMonth() + 1; //月
+        var day = myDate.getDate() + 7; //日
+        var newday = myDate.getDay();
+        var days = parseInt(this.$route.query.week_type);
+        var dayNum = parseInt(this.$route.query.week_type);
+        switch(days) {
+          case 1:
+            days = '星期一';
+            break;
+          case 2:
+            days = '星期二';
+            break;
+          case 3:
+            days = '星期三';
+            break;
+          case 4:
+            days = '星期四';
+            break;
+          case 5:
+            days = '星期五';
+            break;
+          case 6:
+            days = '星期六';
+            break;
+          case 7:
+            days = '星期日';
+            break;
+        }
+        if(newday > dayNum){
+          let lastDay = day - (newday - dayNum)
+          console.log("lastDay1",lastDay)
+          var str = year + "年" + month + "月" + lastDay + "日  " + days;
+          return str;
+        }else if(newday < dayNum){
+          let lastDay = day + (dayNum - newday)
+          console.log("lastDay2",lastDay)
+          var str = year + "年" + month + "月" + lastDay + "日  " + days;
+          return str;
+        }else{
+          var str = year + "年" + month + "月" + day + "日  " + days;
+          return str;
+        }
+
+
+      },
+
+       compare(property) {
+       return function (a, b) {
+          var value1 = a[property];
+          var value2 = b[property];
+          return value1 - value2;
+      }
+     },
+     getTime(val) {
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+      getTimes(time) {
+        return uParseTime(time, '{y}-{m}-{d}')
+      },
+     getPrintList(){
+      getPrintList().then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           console.log("打印设置",list)
+           this.printObj = list
+         }
+      })
+     },
+     getTimestamp(time) { //把时间日期转成时间戳
+        return (new Date(time)).getTime()
+    },
+    getNextScheduleWeekDay() {
+        const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
+        const end = moment().weekday(7).format('YYYY-MM-DD')
+        var zone = this.zone
+        // var newArr = []
+        // for(let i=0;i<this.zoneList.length;i++){
+        //    newArr.push(this.zoneList[i].id)
+        // }
+        // var arr = newArr.join(",")
+        // var str = ""
+        // if(this.zone == 0){
+        //    str = arr
+        // }
+        // if(zone != 0){
+        //   str = zone.join(",")
+        // }
+        // var now_time = parseInt(this.week_type) * 86400 + this.start_time
+        let weekOfDay = parseInt(moment().format('E'))
+        let next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD');
+        var now_time = parseInt(this.week_type - 1)*86400 + (this.getTimestamp(next_monday)/1000 -28800)
+        const params = {
+          start_time:moment().week(moment().week() + 1).startOf('week').unix(),
+          end_time:moment().week(moment().week() + 1).endOf('week').unix(),
+          week_type:this.week_type,
+          week_time:this.week_time,
+          zone:this.zone,
+          record_date:this.getTime(now_time)
+        }
+        // const params = {
+        //   start_time:1609603200,
+        //   end_time:1610208000,
+        //   week_type:this.week_type,
+        //   week_time:this.week_time,
+        // }
+      console.log("params",params)
+      getNextScheduleWeekDayOne(params).then(response => {
+        this.scheduleData = [];
+        if (response.data.state == 1) {
+          var scheduleData = response.data.data.schedule;
+
+          for(let i=0;i<scheduleData.length;i++){
+              scheduleData[i].sort = scheduleData[i].number.sort
+          }
+            var arr =   scheduleData.sort(this.compare('sort'))
+            console.log("元旦快乐",arr)
+            this.scheduleData = arr
+
+            // var newList = []
+            // for(let i=0;i<scheduleData.length;i++){
+            //   if(scheduleData.prescription.id > 0){
+            //      newList.push(scheduleData[i])
+            //   }
+            // }
+            // var arr =   newList.sort(this.compare('sort'))
+            // console.log("元旦快乐",arr)
+            // this.scheduleData = arr
+        } else {
+          this.$message.error("网络错误");
+          return false;
+        }
+      });
+     },
+    getAnticoagulant(name){
+
+      if(name == 0){
+         name = ""
+       }
+       if(name == 1){
+         name = "无肝素"
+       }
+       if(name == 2){
+         name = "普通肝素"
+       }
+       if(name == 3){
+         name ="低分子肝素"
+       }
+
+       if(name == 4){
+         name = "阿加曲班"
+       }
+        if(name == 5){
+         name = "枸橼酸钠"
+       }
+        if(name == 6){
+         name = "低分子肝素钙"
+       }
+        if(name == 7){
+         name = "低分子肝素钠"
+       }
+       if(name == 8){
+         name = "依诺肝素"
+       }
+
+       if(name == 9){
+         name = "达肝素"
+       }
+       if(name == 10){
+         name = "体外抗凝"
+       }
+
+       if(name == 11){
+         name = "那屈肝素"
+       }
+
+       if(name == 12){
+         name = "无抗凝剂"
+       }
+       if(name == 13){
+         name = "那屈肝素钙"
+       }
+
+
+
+       return name
+     },
+     getAnticoagulantZonliang(arr,mode_id){
+       var name = 0
+       if(arr.length > 0){
+         for(let i=0;i<arr.length;i++){
+          if(mode_id == arr[i].mode_id){
+            name = arr[i].anticoagulant_zongliang
+          }
+        }
+       }
+       return name
+     },
+      getNewAge(UUserCard) {
+      if (UUserCard != null && UUserCard != '') {
+        // 获取年龄
+        var myDate = new Date()
+        var month = myDate.getMonth() + 1
+        var day = myDate.getDate()
+        var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1
+        if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <= day) {
+          age++
+        }
+        return age
+      }
+      },
+      getModeId(val){
+      var name =""
+      if(val == 1){
+        name ="HD"
+      }
+      if(val == 2){
+        name ="HDF"
+      }
+      if(val == 3){
+        name ="HD+HP"
+      }
+      if(val == 4){
+        name ="HP"
+      }
+      if(val == 5){
+        name ="HF"
+      }
+      if(val == 6){
+        name ="SCUF"
+      }
+      if(val == 7){
+        name ="IUF"
+      }
+      if(val == 8){
+        name ="IUF"
+      }
+      if(val == 9){
+        name ="HFHD+HP"
+      }
+      if(val == 10){
+        name ="HFHD+HP"
+      }
+      if(val == 11){
+        name ="HFR"
+      }
+      if(val == 12){
+        name ="HDF+HP"
+      }
+      if(val == 13){
+        name ="CRRT"
+      }
+      if(val == 14){
+        name ="腹水回输"
+      }
+      if(val == 19){
+        name ="IUF+HD"
+      }
+      if(val == 20){
+        name ="UF"
+      }
+      if(val == 21){
+        name ="HD+"
+      }
+      if(val == 22){
+        name ="血浆胆红素吸附+HDF"
+      }
+      if(val == 23){
+        name ="血浆胆红素吸附"
+      }
+      if(val == 24){
+        name ="I-HDF"
+      }
+      if(val == 25){
+        name ="HD高通"
+      }
+      if(val == 26){
+        name ="CVVH"
+      }
+      if(val == 27){
+        name ="CVVHD"
+      }
+      if(val == 28){
+        name ="CVVHDF"
+      }
+      if(val == 29){
+        name ="PE"
+      }
+      if(val == 30){
+        name ="血浆胆红素吸附+HP"
+      }
+      if(val == 31){
+        name ="HPD"
+      }
+      if(val == 32){
+        name ="HDP"
+      }
+      return name
+      },
+      getBloodAccess(id){
+        var name = ""
+        for(let i=0;i<this.blood_access_part_opera.length;i++){
+          if(id == this.blood_access_part_opera[i].id){
+             name = this.blood_access_part_opera[i].name
+          }
+        }
+        return name
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.print_main_content {
+  background-color: white;
+  max-width: 1500px;
+  margin: 0 auto;
+  padding: 0 0 20px 0;
+
+  .order_title_panl {
+    text-align: center;
+
+    .main_title {
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: 500;
+    }
+  }
+  .table_panel {
+    .boxshadow{
+      box-shadow: 0 0 5px gray;
+      padding: 10px 20px;
+    }
+    .table {
+      width: 100%;
+      border: 1px solid;
+      border-collapse: collapse;
+      padding: 2px;
+
+      thead {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 20px;
+            padding: 15px 5px;
+          }
+        }
+      }
+      tbody {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 18px;
+            padding: 10px 5px;
+
+            .proj {
+              padding: 5px 0;
+              text-align: left;
+
+              .proj_title {
+                font-size: 16px;
+                font-weight: 500;
+                line-height: 25px;
+              }
+
+              .proj_item {
+                font-size: 15px;
+                line-height: 20px;
+
+                .zone_name {
+                  font-weight: 500;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+.signPrint{
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  margin-bottom: 20px;
+  padding: 20px 10px;
+}
+.printCell{
+  span{
+    display: inline-block;
+    width: 180px;
+  }
+}
+</style>