Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

package.json

@@ -55,6 +55,7 @@
     "js-cookie": "2.2.0",
     "jsbarcode": "^3.11.5",
     "jsonlint": "1.6.3",
+    "jspdf": "^2.5.1",
     "jszip": "3.1.5",
     "mockjs": "1.0.1-beta3",
     "moment": "^2.24.0",

src/api/dialysis.js

@@ -457,3 +457,56 @@ export function saveInformation(params){
     params:params
   })
 }
+
+
+export function getPatientList(keyword,params){
+   console.log("paramswoowwo",params)
+  return request({
+    url:"/api/patient/getpatientlist?keyword="+keyword,
+    method:"get",
+    params:params
+  })
+}
+
+export function getPrescriptionLogList(params){
+  
+  return request({
+    url:"/api/patient/getprescriptionloglist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getBeforLogList(params){
+ 
+  return request({
+    url:"/api/patient/getbeforloglist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getDocLogLogList(params){
+  return request({
+    url:"/api/patient/getdocloglist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getMonitorLogList(params){
+  return request({
+    url:"/api/patient/getmonitorloglist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getAferLogList(params){
+
+  return request({
+    url:"/api/patient/getafterloglist",
+    method:"get",
+    params:params,
+  })
+}

src/api/patient.js

@@ -246,9 +246,9 @@ export function deleteRescueRecords(patient_id, ids_str) {
   })
 }
 
-export function EditLapseto(patient_id, data) {
+export function EditLapseto(patient_id, data,start_time,end_time,address) {
   return request({
-    url: '/api/patients/lapseto/edit?id=' + patient_id,
+    url: '/api/patients/lapseto/edit?id=' + patient_id+"&start_time="+start_time+"&end_time="+end_time+"&patient_address="+address,
     method: 'post',
     data: data
   })
@@ -767,4 +767,31 @@ export function getPatientAllagic(id,params){
     method:"get",
     params:params
   })
+}
+
+export function saveSitemap(data){
+  
+  return request({
+    url:"/api/patient/savesitemap",
+    method:"Post",
+    data:data,
+  })
+}
+
+export function getPatientSitemap(patient_id,params){
+  
+  return request({
+    url:"/api/patient/getpatientsitemap?patient_id="+patient_id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function updateSiteMap(data){
+   
+  return request({
+    url:"/api/patient/updatesitemap",
+    method:"Post",
+    data:data,
+  })
 }

src/api/role/admin.js

@@ -275,11 +275,11 @@ export function getEnterPriseDetail(params){
   })
 }
 
-export function UploadPrintOrder(str,params){
+export function UploadPrintOrder(data){
   
   return request({
-    url:"/api/device/uploadprintorder?name="+str,
-    method:"Get",
-    params:params,
+    url:"/api/device/uploadprintorder",
+    method:"Post",
+    data:data,
   })
 }

src/lang/en.js

@@ -83,6 +83,7 @@ export default {
     dialysisRecord: 'dialysisRecord',
     dialysisInfo:'dialysisInfo',
     dialysis_index:'dialysis_index',
+    log_index:'log_index',
     scheduling: 'scheduling',
     device: 'Device',
     deviceManage: 'Device Manage',

src/lang/zh.js

@@ -297,6 +297,7 @@ export default {
     zeroSummary: '零用明细汇总',
     hospitalhistory: '住院历史',
     dialysis_index:'信息归档',
+    log_index:"日志查询",
     objectRegistration:"医疗器械登记",
     Dialysisanalysis: '专业质控'
   },

src/router/index.js

@@ -10,6 +10,7 @@ import patient from './modules/patient'
 import qcd from './modules/qcd'
 import Dialysisanalysis from './modules/Dialysisanalysis'
 import DialysisIndex from './modules/dialysisIndex'
+import DialysisLogIndex from './modules/logIndex'
 import stock from './modules/stock'
 import weight_sign from './modules/weight_sign'
 import workforce from './modules/workforce'
@@ -206,6 +207,7 @@ var _asy_router_map = [
   supply,
   Dialysisanalysis,// 新菜单6.1
   DialysisIndex,
+  DialysisLogIndex,
 ]
 
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

src/views/layout/Layout.vue

@@ -134,7 +134,7 @@ export default {
   created(){
     let menzhen = ['hospitalStation',"hospitalRecord","hospitalCharges","DepositManagement","hisTool",'outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord'];
     let bingli = ['User','createPatient'];
-    let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index'];
+    let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index','log_index'];
     let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','inventoryTransfer','wareHouseManage','otherManagement'];
     let caigou = ['supplyManage','supplyList'];
     let peizhi = ['system','roleManage','DepartManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config','basicConfig'];

src/views/layout/components/Sidebar/index.vue

@@ -48,7 +48,7 @@ export default {
   },
   created(){
     if(this.navTitle == '透析管理'){
-      let nameArr = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index','Dialysisanalysis'];
+      let nameArr = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index','Dialysisanalysis','log_index'];
       // console.log('permission_routers',this.permission_routers)
       let routerArr = [];
       this.permission_routers.map(item => {
@@ -120,7 +120,7 @@ export default {
             this.$emit('func',a)
           }
         }else if(newVal == '透析管理'){
-          let nameArr = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index','Dialysisanalysis'];
+          let nameArr = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index','Dialysisanalysis','log_index'];
           // console.log('permission_routers',this.permission_routers)
           let routerArr = [];
           this.permission_routers.map(item => {

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -915,7 +915,7 @@
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1"
-                        v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495 && org_id!=10510">
+                        v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495 && org_id!=10510 && org_id!=10460">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -941,7 +941,7 @@
                       </div>
 
                       <div class="inline_block" style="flex: 1"
-                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495)&& org_id!=10510">
+                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495 || org_id == 10460)&& org_id!=10510">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -1349,7 +1349,7 @@
                           <td width="60">时间</td>
                           <td width="60">血压<br />(mmHg)</td>
                           <td width="50">脉搏<br />(次/分)</td>
-                          <td width="50">呼吸<br />(次/分)</td>
+                          <td width="50" v-if="org_id!=10489">呼吸<br />(次/分)</td>
                           <td width="50">血流量<br />(ml/min)</td>
                           <td width="50" v-if="org_id == 10478">动脉压<br />(mmHg)</td>
                           <td width="50">静脉压<br />(mmHg)</td>
@@ -1467,7 +1467,7 @@
                                 : ""
                             }}
                           </td>
-                          <td>
+                          <td v-if="org_id!=10489">
                             {{
                               monitor_record.breathing_rate
                                 ? monitor_record.breathing_rate

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyseven.vue

@@ -88,12 +88,10 @@
                   <span style="width: 14%;">震颤：</span>
                   <span style="width: 14%;">外观：</span>
                   <span style="width: 14%;">置换方式：
-                    {{
-                          getDisplaceLiquiPart(record.prescription.displace_liqui_part)
-                        }}
+                    {{getDisplaceLiquiPart(record.prescription.displace_liqui_part)}}
                   </span>
                   <span style="width: 14%;">置换总量：
-                    {{ record.prescription.displace_liqui_value ? record.prescription.displace_liqui_value : "/" }}
+                    {{ record.prescription.displace_liqui_value ? record.prescription.displace_liqui_value : "/" }}L
                   </span>
                 </td>
               </tr>

src/xt_pages/dialysis/batch_print/batch_print_order_twentySeven.vue

@@ -97,14 +97,7 @@
                       </td>
                       <td width="120">
                         <div class="under-line">&nbsp;
-                          <span style="width:30px;text-align:left;">
-                          {{ record.assessment_after_dislysis.actual_treatment_hour ? 
-                          record.assessment_after_dislysis.actual_treatment_hour : '' }}
-                        </span>h
-                        <span style="width:30px;text-align:left;" v-if="record.assessment_after_dislysis.actual_treatment_minute>0">
-                          {{ record.assessment_after_dislysis.actual_treatment_minute ? 
-                          record.assessment_after_dislysis.actual_treatment_minute : '0' }}
-                        </span>min
+                          {{ getTime(record.schedule_date, "{y}-{m}-{d}") }}
                       </div>
                       </td>
                       <td width="10"></td>
@@ -113,9 +106,9 @@
                       <td width="120">
                         <div class="under-line">&nbsp;
                           {{
-                            record.patient.total_dialysis +
+                            record.Count +
                             record.patient.user_sys_before_count
-                              ? record.patient.total_dialysis +
+                              ? record.Count +
                                 record.patient.user_sys_before_count
                               : "/"
                           }}
@@ -1558,12 +1551,11 @@
                               <td width="70">抗凝方式:</td>
                               <td width="120">
                                 <label-box
-                                  :isChecked="
-                                    record.prescription.anticoagulant == 6
+                                  :isChecked="(record.prescription.anticoagulant == 6 || record.prescription.anticoagulant == 7 || record.prescription.anticoagulant == 3)
                                       ? true
                                       : false
                                   "
-                                  showValue="低分子肝素钙"
+                                  showValue="低分子肝素"
                                 ></label-box>
                               </td>
 
@@ -1572,7 +1564,7 @@
                                   &nbsp;
                                   <span
                                     v-if="
-                                      record.prescription.anticoagulant == 6
+                                      record.prescription.anticoagulant == 6 || record.prescription.anticoagulant == 7 || record.prescription.anticoagulant == 3
                                     "
                                     >{{
                                       record.prescription
@@ -1880,7 +1872,11 @@
                                 </div>
                               </td>
                               <td width="10">ml</td>
-                              <td></td>
+                              <td style="padding-left:5px;width:20%;">
+                                 置换液总量:
+                               <span style="width:50px;display: inline-block;">&nbsp;{{ record.prescription.displace_liqui_value ? record.prescription.displace_liqui_value : '' }}</span>L
+                             </td>
+                              
                             </tr>
                           </tbody>
                         </table>
@@ -2911,17 +2907,17 @@
                           v-if="
                             setAdminUserES(
                               advice[0],
-                              'execution_staff'
+                              'advice_doctor'
                             ) == ''
                           "
                           >{{
-                            getAdminUser(advice[0], "execution_staff")
+                            getAdminUser(advice[0], "advice_doctor")
                           }}</span
                         >
                         <img
                           class="es-img"
                           :src="
-                            setAdminUserES(advice[0], 'execution_staff')
+                            setAdminUserES(advice[0], 'advice_doctor')
                           "
                           alt=""
                           srcset=""

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -20,12 +20,18 @@
 
         </li>
 
-         <li v-if="isShow('置换速度')">
+         <li v-if="isShow('置换速度')&& this.$store.getters.xt_user.template_info.org_id!=10375">
           <label>置换速度 : </label>
           <span class="content">{{displace_speed }}</span>
             <span class="unit">ml/min</span>
         </li>
 
+        <li v-if="isShow('置换速度') && this.$store.getters.xt_user.template_info.org_id == 10375">
+          <label>置换速度 : </label>
+          <span class="content">{{displace_speed }}</span>
+            <span class="unit">ml/L</span>
+        </li>
+
 
         <li v-if="isShow('透析液配方')">
           <label>透析液配方 : </label>

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

@@ -604,7 +604,7 @@
                     </el-col>
 
 
-                    <el-col :span="8" v-if="isShows('置换速度')" v-show="totalShow">
+                    <el-col :span="8" v-if="isShows('置换速度') && this.$store.getters.xt_user.template_info.org_id != 10375" v-show="totalShow">
                         <el-form-item label="置换速度(ml/min)" prop="displace_speed" :rules="isCheckmust('置换速度')">
                             <el-input
                                     v-model="dialysisPrescription.displace_speed"
@@ -612,6 +612,14 @@
                         </el-form-item>
                     </el-col>
 
+                    <el-col :span="8" v-if="isShows('置换速度') && this.$store.getters.xt_user.template_info.org_id == 10375" v-show="totalShow">
+                        <el-form-item label="置换速度(L/h)" prop="displace_speed" :rules="isCheckmust('置换速度')">
+                            <el-input
+                                    v-model="dialysisPrescription.displace_speed"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+
                     <el-col
                             :span="8"
                             v-if="isShows('钙名称')"
@@ -3333,6 +3341,9 @@ mu
         this.hide()
       },
       handleSolution: function(formName) {
+        if(this.dialysisPrescription.anticoagulant == "" || this.dialysisPrescription.anticoagulant == 0){
+          this.dialysisPrescription.anticoagulant = 3
+        }
         this.$refs[formName].validate((valid)=>{
           if(valid){
             if(!this.isLoading){
@@ -3387,7 +3398,7 @@ mu
                   ParamsQuery['patient'] = this.patient.id
                   ParamsQuery['record_date'] = this.record_date
                   ParamsQuery['mode'] = '1'
-
+               
                   postSoulution(ParamsQuery).then(response => {
                     if (response.data.state == 0) {
                       this.$message.error(response.data.msg)

src/xt_pages/dialysis/details/dialysisOff.vue

@@ -20,7 +20,7 @@
           <span class="content">{{end_time}}</span>
         </li>
       </ul>
-      <ul>
+      <ul v-if="org_id!=0&&org_id!=10460">
         <li>
           <label>宣教知识 : </label>
           <span class="content">{{this.record.mission}}</span>
@@ -38,7 +38,8 @@ export default {
   name: 'DialysisComputer',
   data() {
       return {
-        title: '透析下机 '
+        title: '透析下机 ',
+        org_id:0,
       }
   },
   props: {
@@ -76,6 +77,9 @@ export default {
   },
   methods: {
 
+  },
+  created(){
+    this.org_id = this.$store.getters.xt_user.org.id
   }
 }
 </script>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1,8 +1,8 @@
 <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 id="dialysis-print-box-1"  ref="pdfContent">
       <div
         id="dialysis-print-box-1-1"
         class="dialysis-print-order print-template-two print_page_main_content"
@@ -828,7 +828,7 @@
                             ? prescription.dialyzer_perfusion_apparatus
                             : ""
                         }}
-                        <span v-if="prescription.dialysis_dialyszers&&prescription.dialysis_dialyszers!=''">/</span>
+                        <span v-if="prescription.dialyzer_perfusion_apparatus&&prescription.dialyzer_perfusion_apparatus!=''">/</span>
                         {{
                           prescription.dialysis_dialyszers
                             ? prescription.dialysis_dialyszers
@@ -951,10 +951,10 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 || org_id == 0 || org_id == 10469 || org_id == 10478 || org_id == 10490 || org_id ==10495">{{
+                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 || org_id == 0 || org_id == 10469 || org_id == 10478 || org_id == 10490 || org_id ==10495 || org_id == 10460">{{
                           lastafterdialysis.weight_after
                         }}</span>
-                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440 && org_id!=0 && org_id!=10469 && org_id!=10478 && org_id!=10490 && org_id!=10495">{{
+                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440 && org_id!=0 && org_id!=10469 && org_id!=10478 && org_id!=10490 && org_id!=10495 && org_id!=10460">{{
                           predialysis.weight_after_last_transparency
                             ? predialysis.weight_after_last_transparency
                             : "未称重"
@@ -1431,7 +1431,7 @@
                         <td width="50">时间</td>
                         <td width="65">血压<br />(mmHg)</td>
                         <td width="50">脉搏<br />(次/分)</td>
-                        <td width="50">呼吸<br />(次/分)</td>
+                        <td width="50" v-if="org_id!=10489">呼吸<br />(次/分)</td>
                         <td width="50">血流量<br />(ml/min)</td>
                         <td width="50" v-if="org_id==10478 || org_id == 0">
                           动脉压<br />({{
@@ -1488,7 +1488,7 @@
                         <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + "/": ""}}
                           {{monitor.diastolic_blood_pressure? monitor.diastolic_blood_pressure: ""}}</td>
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
-                        <td>{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
+                        <td v-if="org_id!=10489">{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
                         <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
                         <td v-if="org_id ==10478">
                           {{
@@ -3122,6 +3122,8 @@ import print from "print-js";
 import html2pdf from 'html2pdf.js'
 import { UploadPrintOrder } from "@/api/role/admin"
 import { HTML5_FMT } from "moment";
+import html2canvas from 'html2canvas'
+import { jsPDF } from 'jspdf';
 export default {
   name: "dialysisPrintOrderSix",
   props: ["childResponse"],
@@ -4082,43 +4084,6 @@ export default {
       }
     },
 
-    toUpload(){
-      const content = this.$refs.pdfContent;
-      console.log("contentwowowowow",content)
-      // Convert HTML to PDF
-      const pdfOptions = {
-        margin: 10,
-        filename: 'sample.pdf',
-        image: { type: 'jpeg', quality: 0.98 },
-        html2canvas: { scale: 2 },
-        jsPDF: { unit: 'mm', format: 'a4', orientation: 'portrait' },
-      };
-      
-      const pdf =  html2pdf().from(content).set(pdfOptions).outputPdf();
-      
-      console.log("pdfwowowoow",pdf)
-      // Convert PDF to Base64
-      const pdfBlob = new Blob([pdf], { type: 'application/pdf' });
-      const reader = new FileReader();
-      
-      reader.onload = () => {
-      const base64Data = reader.result.split(',')[1]; // Base64 string
-      console.log('Base64 PDF:', base64Data);
-
-        UploadPrintOrder(base64Data).then(response=>{
-           if(response.data.state == 1){
-             var sign =  response.data.data.sign
-             console.log("paramwowowo",sign)
-             this.$message.success("上传成功")
-           }
-        })
-        
-        // Here, you can use the base64Data as needed, like sending it to the server, etc.
-      };
-      
-      reader.readAsDataURL(pdfBlob);
-    
-    }
   },
   watch: {
     "patientInfo.gender": function () {

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.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-64">
       <div
         id="dialysis-print-box-64-1"
@@ -721,6 +722,12 @@
 import { getDialysisRecord } from "@/api/dialysis";
 import { jsGetAge, uParseTime } from "@/utils/tools";
 import { getDataConfig } from "@/utils/data";
+import print from "print-js";
+import html2pdf from 'html2pdf.js'
+import { UploadPrintOrder } from "@/api/role/admin"
+import { HTML5_FMT } from "moment";
+import html2canvas from 'html2canvas'
+import { jsPDF } from 'jspdf';
 export default {
   data() {
     return {
@@ -1221,7 +1228,76 @@ export default {
         }
       }
       return name
-    }
+    },
+
+    toUpload() {
+        let dom = document.getElementById("dialysis-print-box-64");
+        //调用方法下载
+        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);
+
+          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("保存成功!")
+            }
+          })
+          
+          // 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文件
+      }
+    },
+    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' });
+    },
   },
   created() {
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -63,7 +63,15 @@
               <td width="10"></td>
               <td width="80">透析次数:</td>
               <td width="120">
-                <div class="under-line">&nbsp;{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}</div>
+                <div class="under-line">&nbsp;
+                  {{
+                          patientInfo.total_dialysis +
+                          patientInfo.user_sys_before_count
+                            ? patientInfo.total_dialysis +
+                              patientInfo.user_sys_before_count
+                            : "/"
+                        }}
+                </div>
               </td>
               <td></td>
             </tr>
@@ -593,7 +601,7 @@
                           &nbsp;{{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : 0 }}
                         </div>
                       </td>
-                      <td width="35">min</td>
+                      <td width="35" v-if="afterdialysis.actual_treatment_minute>0">min</td>
                       <td></td>
                     </tr>
                   </tbody>

src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue

@@ -103,7 +103,7 @@
                     }}
                   </span>
                   <span style="width: 14%;">置换总量：
-                    {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}
+                    {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}L
                   </span>
                 </td>
               </tr>

src/xt_pages/medicalScheduling/schedulingStatistics.vue

@@ -745,10 +745,12 @@ export default {
         changeTime(val){
             this.start_time = val.getTime()/1000
             this.getlist()
+            this.getchartlist()
         },
         changeTimeTwo(val){
             this.end_time = val.getTime()/1000
             this.getlist()
+            this.getchartlist()
         },
         compare(property){
             return function(a,b){

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1774,7 +1774,7 @@ export default {
               // }
 
               var preTime = nowTime
-              if ( this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191){
+              if ( this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191  && this.$store.getters.xt_user.org.id != 10375){
                 if (prescription.pre_time == 0) {
                   if (this.schedule.schedule_type == 1) {
                     if(this.org_id == 10028){
@@ -1936,7 +1936,7 @@ export default {
                   tempProject.push(obj)
                 }
                 var preTime = nowTime
-                if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191) {
+                if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                   if (this.schedule.schedule_type == 1) {
                     if(this.org_id == 10028){
                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
@@ -2252,7 +2252,7 @@ export default {
                     // }
 
                     var preTime = nowTime
-                    if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 ) {
+                    if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
                           if(this.org_id == 10028){
@@ -2416,7 +2416,7 @@ export default {
 
                       var preTime = nowTime
                       // var preTime = ''
-                      if(this.org_id != 0 && this.org_id !=  9919 && this.org_id !=  10485 && this.org_id !=  10191) {
+                      if(this.org_id != 0 && this.org_id !=  9919 && this.org_id !=  10485 && this.org_id !=  10191 && this.$store.getters.xt_user.org.id != 10375) {
                         if (this.schedule.schedule_type == 1) {
                           if(this.org_id == 10028){
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
@@ -3928,7 +3928,7 @@ export default {
 
                     var preTime = nowTime
 
-                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id  != 10485 && this.org_id  != 10191 ) {
+                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id  != 10485 && this.org_id  != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
                           if(this.org_id == 10028){
@@ -4088,7 +4088,7 @@ export default {
 
                       // var preTime = nowTime
                       var preTime = nowTime
-                      if( this.org_id != 0 && this.org_id != 9919 &&  this.org_id != 10485 &&  this.org_id != 10191) {
+                      if( this.org_id != 0 && this.org_id != 9919 &&  this.org_id != 10485 &&  this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                         if (this.schedule.schedule_type == 1) {
                           if(this.org_id == 10028){
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
@@ -4577,7 +4577,7 @@ export default {
 
                     var preTime = nowTime
 
-                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191) {
+                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                       if (prescription.pre_time == 0) {
                         // preTime = nowTime
                         if (this.schedule.schedule_type == 1) {
@@ -4740,7 +4740,7 @@ export default {
 
                       var preTime = nowTime
                       // var preTime = ''
-                      if(this.org_id != 0 && this.org_id != 9919  && this.org_id != 10485 && this.org_id != 10191 ) {
+                      if(this.org_id != 0 && this.org_id != 9919  && this.org_id != 10485 && this.org_id != 10191  && this.$store.getters.xt_user.org.id != 10375) {
                         if (this.schedule.schedule_type == 1) {
                           if(this.org_id == 10028){
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

@@ -67,7 +67,11 @@
       </div>
       <div style="padding-left:10px;flex:1">
         <div class="tableTitle">统计表</div>
-        <div><el-button type="primary" @click="exportList">导出</el-button></div>
+        <div>
+          <el-button type="primary" @click="exportList">按透析记录导出</el-button>
+          <el-button type="primary" @click="exportListOne">按排班导出</el-button>
+        </div>
+       
         <el-table :data="DialysisData" style="width: 100%" border :row-style="{ color: '#303133' }"
         :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
         >
@@ -142,6 +146,7 @@ export default {
       },
       patient_id:0,
       modeIdCount:[],
+      scheduleCount:[],
     };
   },
   methods: {
@@ -202,6 +207,10 @@ export default {
 
           var modeIdCount = response.data.data.modeIdCount
           console.log("modeidcount=====",modeIdCount)
+
+        
+         
+
           for(let i=0;i<modeIdCount.length;i++){
             if(modeIdCount[i].mode_id == 1){
                modeIdCount[i].mode_id = "HD"
@@ -302,6 +311,109 @@ export default {
             }
           }
           this.modeIdCount = modeIdCount
+
+          var scheduleCount =  response.data.data.scheduleCount
+          console.log("scheduleCount",scheduleCount)
+          for(let i=0;i<scheduleCount.length;i++){
+            if(scheduleCount[i].mode_id == 1){
+              scheduleCount[i].mode_id = "HD"
+            }
+            if(scheduleCount[i].mode_id == 2){
+              scheduleCount[i].mode_id = "HDF"
+            }
+            if(scheduleCount[i].mode_id == 3){
+              scheduleCount[i].mode_id = "HD+HP"
+            }
+            if(scheduleCount[i].mode_id == 4){
+              scheduleCount[i].mode_id = "HP"
+            }
+            if(scheduleCount[i].mode_id == 5){
+              scheduleCount[i].mode_id = "HF"
+            }
+            if(scheduleCount[i].mode_id == 6){
+              scheduleCount[i].mode_id = "SCUF"
+            }
+            if(scheduleCount[i].mode_id == 7){
+              scheduleCount[i].mode_id = "IUF"
+            }
+            if(scheduleCount[i].mode_id == 8){
+              scheduleCount[i].mode_id = "HFHD"
+            }
+            if(scheduleCount[i].mode_id == 9){
+              scheduleCount[i].mode_id = "HFHD+HP"
+            }
+            if(scheduleCount[i].mode_id == 10){
+              scheduleCount[i].mode_id = "PHF"
+            }
+            if(scheduleCount[i].mode_id == 11){
+              scheduleCount[i].mode_id = "HFR"
+            }
+            if(scheduleCount[i].mode_id == 12){
+              scheduleCount[i].mode_id = "HDF+HP"
+            }
+            if(scheduleCount[i].mode_id == 13){
+              scheduleCount[i].mode_id = "CRRT"
+            }
+             if(scheduleCount[i].mode_id == 14){
+              scheduleCount[i].mode_id = "腹水回输"
+            }
+             if(scheduleCount[i].mode_id == 15){
+              scheduleCount[i].mode_id = "HD前置换"
+            }
+             if(scheduleCount[i].mode_id == 16){
+              scheduleCount[i].mode_id = "HD后置换"
+            }
+             if(scheduleCount[i].mode_id == 17){
+              scheduleCount[i].mode_id = "HDF前置换"
+            }
+             if(scheduleCount[i].mode_id == 18){
+              scheduleCount[i].mode_id = "HDF后置换"
+            }
+              if(scheduleCount[i].mode_id == 19){
+                scheduleCount[i].mode_id = "IUF+HD"
+            }
+            if(scheduleCount[i].mode_id == 20){
+              scheduleCount[i].mode_id = "UF"
+            }
+            if(scheduleCount[i].mode_id == 21){
+              scheduleCount[i].mode_id = "HD+"
+            }
+            if(scheduleCount[i].mode_id == 22){
+              scheduleCount[i].mode_id = "血浆胆红素吸附+HDF"
+            }
+            if(scheduleCount[i].mode_id == 23){
+              scheduleCount[i].mode_id = "血浆胆红素吸附"
+            }
+            if(scheduleCount[i].mode_id == 24){
+              scheduleCount[i].mode_id = "I-HDF"
+            }
+            if(scheduleCount[i].mode_id == 25){
+              scheduleCount[i].mode_id = "HD高通"
+            }
+
+            if(scheduleCount[i].mode_id == 26){
+              scheduleCount[i].mode_id = "CVVH"
+            }
+            if(scheduleCount[i].mode_id == 27){
+              scheduleCount[i].mode_id = "CVVHD"
+            }
+             if(scheduleCount[i].mode_id == 28){
+              scheduleCount[i].mode_id = "CVVHDF"
+            }
+            if(scheduleCount[i].mode_id == 29){
+              scheduleCount[i].mode_id = "PE"
+            }
+            if(scheduleCount[i].mode_id == 30){
+              scheduleCount[i].mode_id = "血浆胆红素吸附+HP"
+            }
+           if(scheduleCount[i].mode_id == 31){
+            scheduleCount[i].mode_id = "HPD"
+            }
+            if(scheduleCount[i].mode_id == 32){
+              scheduleCount[i].mode_id = "HDP"
+            }
+          }
+          this.scheduleCount = scheduleCount
           let dataInfo = {}
           list.forEach((item, index) => {
             let { patient_id } = item
@@ -353,6 +465,15 @@ export default {
        }
        return count
     },
+    getScheduleDialysisCount(id){
+       var count = 0
+       for(let i=0;i<this.scheduleCount.length;i++){
+           if(id == this.scheduleCount[i].patient_id){
+              count += this.scheduleCount[i].Count
+           }
+       }
+       return count
+    },
     onSearch(){
       if(this.listQuery.search == "" || this.listQuery.search == null){
          this.getDialysisList()
@@ -576,6 +697,55 @@ export default {
           this.downloadLoading = false
         })
       },
+
+      exportListOne(){
+       for(let i=0;i<this.DialysisData.length;i++){
+         this.DialysisData[i].index = i+1
+         this.DialysisData[i].HD = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HD")
+         this.DialysisData[i].HDF = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF")
+         this.DialysisData[i].HDHP = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HD+HP")
+         this.DialysisData[i].HP = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HP")
+         this.DialysisData[i].HF = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HF")
+         this.DialysisData[i].SCUF = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"SCUF")
+         this.DialysisData[i].IUF = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"IUF")
+         this.DialysisData[i].HFHD = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HFHD")
+         this.DialysisData[i].HFHDHP = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HFHD+HP")
+         this.DialysisData[i].HDFHP = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF+HP")
+         this.DialysisData[i].CRRT = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"CRRT")
+         this.DialysisData[i].OTR = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"腹水回输")
+
+         this.DialysisData[i].IUFHD = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"IUF+HD")
+         this.DialysisData[i].UF = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"UF")
+         this.DialysisData[i].HDPlus = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HD+")
+         this.DialysisData[i].IHDF = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"I-HDF")
+         this.DialysisData[i].HDGT = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HD高通")
+         this.DialysisData[i].CVVH = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"CVVH")
+         this.DialysisData[i].CVVHD = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"CVVHD")
+         this.DialysisData[i].CVVHDF = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"CVVHDF")
+         this.DialysisData[i].PE = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"PE")
+         this.DialysisData[i].XUEHP = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"血浆胆红素吸附+HP")
+         this.DialysisData[i].HPD = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HPD")
+         this.DialysisData[i].HDP = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDP")
+
+         this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
+         this.DialysisData[i].total_count = this.getScheduleDialysisCount(this.DialysisData[i].patient_id)
+       }
+       console.log("hhh2323323232",this.DialysisData)
+       import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','总数']
+        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','total_count']
+
+        const data = this.formatJson(filterVal, this.DialysisData)
+
+        excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '透析详情'
+         })
+          this.downloadLoading = false
+        })
+      },
+
       formatJson(filterVal, jsonData) {
         return jsonData.map(v =>
           filterVal.map(j => {
@@ -601,6 +771,23 @@ export default {
           }
         }
 
+        return count
+     },
+
+     getScheduleHdModeIdCount(id,mode_name){
+        var count = 0
+        var arr = []
+        for(let i = 0;i<this.scheduleCount.length;i++){
+           if(id == this.scheduleCount[i].patient_id && this.scheduleCount[i].mode_id == mode_name){
+             arr.push(this.scheduleCount[i])
+           }
+        }
+        if(arr.length > 0){
+          for(let i=0;i<arr.length;i++){
+            count += arr[i].Count
+          }
+        }
+
         return count
      }
 

src/xt_pages/role/admin.vue

@@ -162,20 +162,22 @@
           style="float:left"
           @click="toTestThrity">合同详情查询</el-button>
 
-          <el-button
+
+         <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toEnd">结束签署</el-button> -->
+          @click="toWatch">合同在线预览</el-button>
 
-
-          <!-- <el-button
+          <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toWatch">合同在线预览</el-button> -->
+          @click="toEnd">结束签署</el-button> -->
+           
+         
           
      </div>
     

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -354,7 +354,7 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
                     <span v-if="is_sys == 0">
                       <span v-if="scope.row.child.length == 1">{{item.retail_price}}</span> 
                       <span v-if="scope.row.child.length > 1">{{item.count * item.price}}</span> 
@@ -1959,6 +1959,7 @@ export default {
       if(max_unit == min_unit){
          all_price = max_str * price + min_str * price
       }
+      console.log("all_pricewowo",all_price)
       if(all_price > 0){
         return all_price.toFixed(2)
       }else{

src/xt_pages/stock/drugs/inventoryPrint.vue

@@ -46,6 +46,7 @@
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 const moment = require('moment');
+import print from "print-js";
 import { uParseTime } from '@/utils/tools'
 import { getInventoryModeList } from "@/api/drug/drug"
 export default {

src/xt_pages/stock/inventoryPrint.vue

@@ -45,6 +45,7 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import print from "print-js";
 const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
 import { getInventoryExportList } from "@/api/stock"

src/xt_pages/stock/query/goodNewQuery.vue

@@ -797,7 +797,8 @@ export default {
    exportList(){
       import('@/vendor/Export2Excel').then(excel => {
       
-         if(this.tableList!=null && this.tableList.length > 0){
+        if(this.org_id!=0 && this.org_id!=9956){
+          if(this.tableList!=null && this.tableList.length > 0){
           for(let i=0;i<this.tableList.length;i++){
             this.tableList[i].index = i+1
             this.tableList[i].type_name =  this.getGoodTypeName(this.tableList[i].good_type_id)
@@ -826,7 +827,42 @@ export default {
            filename: '库存查询'
          })
           this.downloadLoading = false
-        })
+        }
+
+        if(this.org_id == 0 || this.org_id == 9956){
+         
+          if(this.tableList!=null && this.tableList.length > 0){
+          for(let i=0;i<this.tableList.length;i++){
+            this.tableList[i].index = i+1
+            this.tableList[i].type_name =  this.getGoodTypeName(this.tableList[i].good_type_id)
+            this.tableList[i].spec = this.tableList[i].specification_name +"/"+ this.tableList[i].packing_unit
+            this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+            this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
+            this.tableList[i].stock_in_count = this.GetExportStockInCount(this.tableList[i].xt_good_stock,this.tableList[i].id)
+            this.tableList[i].stock_out_count =this.getExportStockOutCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+            this.tableList[i].stock_cancel_count = this.getExportCancelStockInfo(this.tableList[i].xt_good_stock,this.tableList[i].id)
+            this.tableList[i].act_out_count  = this.getExportActStockOutCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+            this.tableList[i].over_count = this.getExportOverCount(this.tableList[i].xt_good_stock,this.tableList[i].id) 
+            this.tableList[i].sum_count =  this.getOverCount(this.tableList[i].xt_warehouse_info) 
+
+          }
+         }
+         
+
+         const tHeader = ['序号','耗材编码','耗材类型', '耗材名称', '规格&单位','生产厂商','经销商','批准文号','国家编码','入库数量','出库数量','退库数量','实际出库','剩余库存','总库存']
+         const filterVal = ['index','good_number','type_name', 'good_name', 'spec','manufacturer_name','dealer_name','number','social_security_directory_code','stock_in_count','act_out_count','stock_cancel_count','stock_out_count','over_count','sum_count']
+        
+         const data = this.formatJson(filterVal, this.tableList)
+         
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '库存查询'
+         })
+          this.downloadLoading = false
+        }
+   
+       })
       },
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));

src/xt_pages/stock/query/goodNewQueryPrint.vue

@@ -33,6 +33,7 @@
               <thead>
                 <tr>
                   <td width="5%">序号</td>
+                  <td width="5%" v-if="org_id ==0 || org_id ==9956">耗材编码</td>
                   <td width="6%">耗材类型</td>
                   <td width="10%">耗材名称</td>
                   <td width="10%">规格&单位</td>
@@ -53,6 +54,7 @@
                 <tr v-for="(item, index) in tableList" :key="index">
                   <!-- 序号 -->
                   <td>{{ index + 1 }}</td>
+                  <td width="5%" v-if="org_id ==0 || org_id ==9956">{{item.good_number }}</td>
                   <!-- 耗材类型 -->
                   <td>{{ getGoodTypeName(item.good_type_id) }}</td>
                   <!-- 耗材名称 -->

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -1001,6 +1001,9 @@ export default {
     this.$router.push({path:"/purchase/new/stock/query/print?start_time="+this.start_time+"&end_time="+this.end_time+"&page="+this.page+"&limit="+this.limit+"&keyword="+this.keyword+"&good_type="+this.good_type})
    },
    exportList: function() {
+
+       if(this.org_id!=0&& this.org_id!=9956){
+         
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
           this.tableList[i].query_date = this.start_time+"~"+this.end_time
@@ -1028,6 +1031,39 @@ export default {
               filename
             })
         })
+       }
+
+       if(this.org_id == 0 || this.org_id == 9956){
+        
+        for(let i=0;i<this.tableList.length;i++){
+          this.tableList[i].index = i+1
+          this.tableList[i].query_date = this.start_time+"~"+this.end_time
+          this.tableList[i].good_type = this.getGoodTypeName(this.tableList[i].good_type_id)
+          this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+          this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
+          this.tableList[i].specification_name_one = this.tableList[i].specification_name + "/"+this.tableList[i].packing_unit
+        }
+        import('@/vendor/Export2Excel').then(excel => {
+           const multiHeader = [['序号','耗材编码', '查询日期',' 耗材类型','耗材名称','规格&单位','生产产商','经销商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
+           const header = ['','', '','','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
+           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:G2','H1:H2','I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1']
+           const filterVal = ['index','good_number', 'query_date', 'good_type','good_name','specification_name_one','manufacturer_name','dealer_name','stockIn','stock_in_price','stockMoney','stockAdd','addStockMoney','saleStockMoney','outStock','stockOutprice','saleOutMoney','overStock','overPrice','overMoney']
+    
+           const data = this.formatJson(filterVal, this.tableList)
+           
+           const filename = '进销存查询'
+     
+          
+            excel.export_json_to_excel({
+              multiHeader,
+              header,
+              merges,
+              data,
+              filename
+            })
+        })
+       }
+   
       },
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -25,6 +25,7 @@
                             <thead>
                                 <tr>
                                   <td rowspan="2" width="80">序号</td>
+                                  <td rowspan="2" width="80" v-if="org_id==9956">耗材编码</td>
                                   <td rowspan="2" width="80">耗材名称</td>
                                   <td rowspan="2" width="80">耗材类型</td>
                                   <td rowspan="2" width="80">规格&单位</td>
@@ -54,6 +55,7 @@
                             <tbody>
                                 <tr v-for="(item,index) in this.tableList" :key="index">
                                  <td>{{index + 1}}</td>
+                                 <td v-if="org_id==9956">{{item.good_number}}</td>
                                  <td>{{item.good_name}}</td>
                                  <td>{{getGoodTypeName(item.good_type_id)}}</td>
                                  <td>{{item.specification_name}}</td>

src/xt_pages/user/Sitemap.vue

@@ -20,29 +20,29 @@
       <div style="margin-top:6px;display:flex;flex-wrap: wrap;position:relative;min-height:480px;">
         <div style="width:47%;border:1px solid #ddd;padding: 5px;" id="print_mark_img" ref="imageWrapper">
           <div id="point_mark_img_wrap1" class="print_main_content" style="width: 520px;padding: 0;border: 0;" >
-            
+
             <img v-if="fileList.length==0" id="ossPointMarkImg" src="@/assets/evaluate/xgtl_default.png" alt="" srcset="">
             <img v-if="fileList.length>0" id="ossPointMarkImg" :src="fileList[0].img_url" alt="" srcset="">
 
             <!-- A端/V端 v-if="a_num==2" -->
             <div v-for="(item,index) in A_arr" :key="index">
-              <div v-if="a_num==2" title="长按右键调整线条角度" class="mark-target mark-target-a mark-target-a1" data-num="1" 
-                  :style="{left:A_left+'px', top: (A_top+(index*30))+'px', cursor: 'move',position: 'absolute'}" 
+              <div v-if="a_num==2" title="长按右键调整线条角度" class="mark-target mark-target-a mark-target-a1" data-num="1"
+                  :style="{left:A_left+'px', top: (A_top+(index*30))+'px', cursor: 'move',position: 'absolute'}"
                   @mousedown.self="A_mousedow($event)" @mouseup.self="A_moouseup($event)">{{item.markNum}}
                 <span class="mark-line mark-line-a" style="transform: rotate(160deg);" data-rotate="160"></span>
               </div>
             </div>
             <div v-for="(item,index) in V_arr" :key="index">
-              <div v-if="v_num==2" title="长按右键调整线条角度" class="mark-target mark-target-v mark-target-v1" data-num="1" 
-                    :style="{left: V_left+'px', top: (V_top+(index*30))+'px', cursor: 'move', position: 'absolute'}" 
+              <div v-if="v_num==2" title="长按右键调整线条角度" class="mark-target mark-target-v mark-target-v1" data-num="1"
+                    :style="{left: V_left+'px', top: (V_top+(index*30))+'px', cursor: 'move', position: 'absolute'}"
                     @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)">{{item.markNum}}
                 <span class="mark-line mark-line-v" style="transform: rotate(20deg);" data-rotate="20"></span>
               </div>
             </div>
             <!-- 穿刺文字 active  @mousedown="startDrag"   @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)"-->
             <div v-for="(item,index) in text_arr" :key="index" >
-              <div ref="text_cc" class="add-mark-text-wrap active" 
-              :style="{width:(item.width + 10)+'px',left:text_left+'%',top:(text_top+(index*4))+'%','font-size':14+'px', position: 'absolute'}" 
+              <div ref="text_cc" class="add-mark-text-wrap active"
+              :style="{width:(item.width + 10)+'px',left:text_left+'%',top:(text_top+(index*4))+'%','font-size':14+'px', position: 'absolute'}"
               @mousedown.self="A_mousedow($event)" @mouseup.self="A_moouseup($event)">
                 <!-- <div  style="width:82px;left:62.17%;top:39.00%;display: inline-block;" @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)">position: 'absolute',top: 36+'%',left: 48+'%' -->
                   <!-- {{ item }} -->
@@ -54,23 +54,23 @@
               </div>
             </div>
             <!-- 穿刺方向 -->
-            <div v-if="fangxiangA_num==2" @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)" 
-              title="长按右键调整线条角度" id="jinzhen_fangxiang_A" class="mark-target mark-target-a mark-target-adccz" 
+            <div v-if="fangxiangA_num==2" @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)"
+              title="长按右键调整线条角度" id="jinzhen_fangxiang_A" class="mark-target mark-target-a mark-target-adccz"
               :style="{left: fangxiangA_left+'px', top: fangxiangA_top+'px', width: 14+'px', height: 14+'px', background: 'rgb(231, 53, 53)', 'border-radius': 50+'%', position: 'absolute', cursor: 'move',}">
               <span class="mark-line mark-line-ccza" data-rotate="160" style="width:50px;transform:rotate(160deg);">
-              <b class="xtgl-ccz-arrow xtgl-ccz-arrow-a" 
+              <b class="xtgl-ccz-arrow xtgl-ccz-arrow-a"
                 style="position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);">
               </b></span></div>
 
-            <div v-if="fangxiangV_num==2" @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)" 
-            title="长按右键调整线条角度" id="jinzhen_fangxiang_V" class="mark-target mark-target-v mark-target-vdccz" 
+            <div v-if="fangxiangV_num==2" @mousedown="A_mousedow($event)" @mouseup="A_moouseup($event)"
+            title="长按右键调整线条角度" id="jinzhen_fangxiang_V" class="mark-target mark-target-v mark-target-vdccz"
             :style="{left: fangxiangV_left+'px', top: fangxiangV_top+'px', width: 14+'px', height: 14+'px', background: 'rgb(53, 162, 231)', 'border-radius': 50+'%', position: 'absolute', cursor: 'move',}">
             <span class="mark-line mark-line-cczv" data-rotate="20" style="width:50px;transform:rotate(20deg);">
               <b class="xtgl-ccz-arrow xtgl-ccz-arrow-v"
               style="position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);">
               </b></span></div>
             <!-- 辅助工具 :style="{transform: rotate(30deg)}"  ,'background-img': 'url(' + require('../../assets/evaluate/tool-a.png') + ')'  -->
-            <div v-if="fuzhuA_num==2"  
+            <div v-if="fuzhuA_num==2"
              class="jinzhen-jiaodu-target jinzhen-jiaodu-target-A" id="jinzhen-jiaodu-target-A" style="position: absolute;top: 56px;left: 360px;">
               <div class="frame-box  actives" :style="{'transform': `scale(${scalea_num})`,top:fuzhuA_top+'px',left:fuzhuA_left+'px'}" @mousedown.self="A_mousedow($event)" @mouseup.self="A_moouseup($event)">
                 <div class="frame-image" data-rotate="0" :style="{transform: `rotate(${xuanzhuan_a}deg)`}">
@@ -79,7 +79,7 @@
                 <div class="drag-elem bottom right" @click="imga_click"></div>
                 <div class="frame-image-toolbar-btn frame-image-toolbar-btn-reset" data-tooltip="" title="调整方向" @click="fuzhuaclick"></div>
               </div>
-            </div> 
+            </div>
             <div v-if="fuzhuV_num==2" style="position: absolute;top: 56px;left: 56px;"
              class="jinzhen-jiaodu-target jinzhen-jiaodu-target-V" id="jinzhen-jiaodu-target-V">
               <div class="frame-box actives" :style="{'transform': `scale(${scalev_num})`,top:fuzhuV_top+'px',left:fuzhuV_left+'px'}" @mousedown.self="A_mousedow($event)" @mouseup.self="A_moouseup($event)">
@@ -89,7 +89,7 @@
                 <div class="drag-elem bottom right" @click="imgv_click"></div>
                 <div class="frame-image-toolbar-btn frame-image-toolbar-btn-reset" data-tooltip="" title="调整方向" @click="fuzhu_click"></div>
               </div>
-            </div> 
+            </div>
           </div>
         </div>
         <div style="width:25px;"></div>
@@ -97,17 +97,17 @@
           <div>
             <p class="point-mark-title">A端：</p>
             <div :class="append == false ? 'point-mark-items' : 'mark-a-items'"> <!-- v-for="(item,index) in 12" :key="index" -->
-              <div class="point-mark-a-item not-able" 
+              <div class="point-mark-a-item not-able"
                 data-tag="-a" data-mark="A" title="点击移除标记" v-for="(item,index) in 12" :key="index" @click="a_item($event,item)">{{item}}</div>
             </div>
             <p class="point-mark-title">V端：</p>
             <div :class="append == false ? 'point-mark-items' : 'mark-v-items'" style="border-bottom: 1px solid #ddd;">
-              <div class="point-mark-v-item not-able" 
+              <div class="point-mark-v-item not-able"
                 data-tag="-v" data-mark="V" title="点击移除标记" v-for="(item,index) in 12" :key="index" @click="v_item($event,item)">{{item}}</div>
             </div>
             <div><span class="active-addtext-btn">添加文本框：</span></div>
             <div id="default-marktext-wrap" style="display:flex;flex-wrap:wrap;">
-              <span :class="append == true ?'default-mark-text chuanci' : 'disabled'" data-index="0" 
+              <span :class="append == true ?'default-mark-text chuanci' : 'disabled'" data-index="0"
                   v-for="(item,index) in puncture_text" :key="index" @click="punctureclick($event,item)">{{ item.text }}</span>
                 <!-- <span :class="append == true ?'default-mark-text chuanci' : 'disabled'" data-index="0">穿刺角度</span>
                 <span :class="append == true ?'default-mark-text chuanci' : 'disabled'" data-index="1">卡夫距导管出口距离cm</span>
@@ -154,7 +154,7 @@
         </div>
       </div>
     </div>
-    
+
     <div style="width:50%; margin-top:20px">
       <div class='content_top' style="width: 100%;margin-bottom: 20px;border-bottom:1px solid #DCDFE6;padding-bottom:10px">
         <div style="font-size: 20px;">位点记录列表</div>
@@ -245,7 +245,6 @@ export default{
       centerDialogVisible: false,
       imgDialogVisible:false,
       shiyituDialogVisible:false,
-      hidd:false,
       imgUrl:[],
       a_num:1,//控制a端是否显示和高亮
       v_num:1,//控制v端是否显示和高亮
@@ -284,7 +283,7 @@ export default{
       qiniuDomain: 'https://images.shengws.com/',
       puncture_text:[{text:'穿刺角度',width:70},{text:'卡夫距导管出口距离cm',width:158},{text:'动脉端向心穿刺',width:116},{text:'动脉端离心穿刺',width:116},
                       {text:'静脉端向心穿刺',width:116},{text:'手背朝上',width:70},{text:'手掌朝上',width:70},{text:'虎口朝上',width:70},{text:'A端',width:70},{text:'V端',width:70},{text:'自定义',width:70}],
-      // picture:'@/assets/evaluate/tool-a.png',   
+      // picture:'@/assets/evaluate/tool-a.png',
       // url:'',//图片路径
 
       value:'',//获取文本框文字
@@ -330,7 +329,7 @@ export default{
               }
             }
           }
-            
+
         }
       }
       console.log('333',this.A_arr)
@@ -353,7 +352,7 @@ export default{
               }
             }
           }
-            
+
         }
       }
     },
@@ -384,7 +383,7 @@ export default{
         _target.style.top = endy+'px'
         // console.log('x',this.endx,'y',this.endy);
       }
-      
+
       // inpu.addEventListener('mousedown',this.A_mousedow)
     },
     A_moouseup(e){
@@ -454,7 +453,7 @@ export default{
       // if(this.fuzhuV_num ==1 || this.append ==false){
       //  return this.xuanzhuan_v =0
       // }
-      
+
     },
     fuzhuaclick(){
       if(this.append ==true && this.fuzhuA_num ==2){
@@ -466,12 +465,9 @@ export default{
       }
     },
     printtup(){
-      if(this.hidd==false){
-        this.hidd =true
-      }
-      const style='@media print{.print_main_content{#ossPointMarkImg {width: 100%;min-height: 600px;height: auto;border-radius: 2px;pointer-events: none;} #point_mark_img_wrap1 {-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;position: relative;padding: 4px;width: 600px;background-color: #fff;border: 1px solid #ddd;border-radius: 4px;} .mark-target-a{background: #E73535;top: 40px; left: 40px;} .mark-line{background: #E73535;} .mark-target-v{background: rgb(53,162,231);.mark-line{background: #35A2E7;}}  .mark-target-a,.mark-target-v {position: absolute;z-index: 1001;width: 26px;border-radius: 13px;height: 26px;text-align: center;line-height: 26px;font-size: 18px;cursor: move;color: rgb(255,255,255);.mark-line {transform: rotate(160deg);transform-origin: left bottom;}.mark-line {display: inline-block;position: absolute;left: 50%;top: 50%;width: 86px;height: 1px;cursor: default;z-index: -1;} div.add-mark-text-wrap {border-radius: 4px;width: 60px;height: 24px;line-height: 24px;z-index: 1005;display: inline-block;} .remove-mark-text{color: transparent;opacity: 0;} b.xtgl-ccz-arrow-a {border-left-color: #E73535;border-top-color: #E73535;} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;} b.xtgl-ccz-arrow {position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;}div.frame-image {position: absolute;overflow: hidden;top: 0px;left: 0px;width: 100%;height: 100%;background-image: url('+'../../assets/evaluate/tool-a.png'+')!important;background-position: center center;background-size: 100%; background-repeat: no-repeat;}}}'
-      // const style='@media print{.print_main_content{#ossPointMarkImg {width: 100%;min-height: 600px;height: auto;border-radius: 2px;pointer-events: none;} #point_mark_img_wrap1 {-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;position: relative;padding: 4px;width: 600px;background-color: #fff;border: 1px solid #ddd;border-radius: 4px;}  b.xtgl-ccz-arrow-a {border-left-color: #E73535;border-top-color: #E73535;} 
-      // b.xtgl-ccz-arrow {position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;} 
+      const style='@media print{.print_main_content{#ossPointMarkImg {width: 100%;min-height: 600px;height: auto;border-radius: 2px;pointer-events: none;} #point_mark_img_wrap1 {-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;position: relative;padding: 4px;width: 600px;background-color: #fff;border: 1px solid #ddd;border-radius: 4px;} .mark-target-a{background: #E73535;top: 40px; left: 40px;} .mark-line{background: #E73535;} .mark-target-v{background: rgb(53,162,231);.mark-line{background: #35A2E7;}}  .mark-target-a,.mark-target-v {position: absolute;z-index: 1001;width: 26px;border-radius: 13px;height: 26px;text-align: center;line-height: 26px;font-size: 18px;cursor: move;color: rgb(255,255,255);.mark-line {transform: rotate(160deg);transform-origin: left bottom;}.mark-line {display: inline-block;position: absolute;left: 50%;top: 50%;width: 86px;height: 1px;cursor: default;z-index: -1;} div.add-mark-text-wrap {position: absolute;top: 36%;left: 48%;border-radius: 4px;width: 60px;height: 24px;line-height: 24px;z-index: 1005;display: inline-block;} .remove-mark-text{overflow: hidden;} b.xtgl-ccz-arrow-a {border-left-color: #E73535;border-top-color: #E73535;} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;} b.xtgl-ccz-arrow {position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;}div.frame-image {position: absolute;overflow: hidden;top: 0px;left: 0px;width: 100%;height: 100%;background-image: url('+'../../assets/evaluate/tool-a.png'+');background-position: center center;background-size: 100%; background-repeat: no-repeat;}}}'
+      // const style='@media print{.print_main_content{#ossPointMarkImg {width: 100%;min-height: 600px;height: auto;border-radius: 2px;pointer-events: none;} #point_mark_img_wrap1 {-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;position: relative;padding: 4px;width: 600px;background-color: #fff;border: 1px solid #ddd;border-radius: 4px;}  b.xtgl-ccz-arrow-a {border-left-color: #E73535;border-top-color: #E73535;}
+      // b.xtgl-ccz-arrow {position: absolute;width: 7px;height: 7px;border-left-width: 2px;border-left-style: solid;border-top-width: 2px;border-top-style: solid;top: -3px;right: 0;transform: rotate(138deg);} b.xtgl-ccz-arrow-v {border-left-color: #35a2e7;border-top-color: #35a2e7;}
       // .mark-target-a{background: #E73535;top: 40px;left: 40px;} .mark-line{background: #E73535;}}}'
       // const style='@media print{.print_main_content{#ossPointMarkImg {width: 100%;min-height: 600px;height: auto;border-radius: 2px;pointer-events: none;} #point_mark_img_wrap1 {-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;position: relative;padding: 4px;width: 600px;background-color: #fff;border: 1px solid #ddd;border-radius: 4px;} .mark-target-a{background: #E73535;top: 40px; left: 40px;} .mark-line{background: #E73535;} .mark-target-v{background: rgb(53,162,231);.mark-line{background: #35A2E7;}}  .mark-target-a,.mark-target-v {position: absolute;z-index: 1001;width: 26px;border-radius: 13px;height: 26px;text-align: center;line-height: 26px;font-size: 18px;cursor: move;color: rgb(255,255,255);.mark-line {transform: rotate(160deg);transform-origin: left bottom;}.mark-line {display: inline-block;position: absolute;left: 50%;top: 50%;width: 86px;height: 1px;cursor: default;z-index: -1;} div.add-mark-text-wrap {position: absolute;top: 36%;left: 48%;border-radius: 4px;width: 60px;height: 24px;line-height: 24px;z-index: 1005;display: inline-block;} input {width: 100px;width: 60px;max-width: 400px;border: 1px solid transparent;padding: 4px;color: #333;height: 24px;cursor: pointer;background-color: #fcfcfc;position: absolute;left: 0;top: 0;font-size: 13px;z-index: 1002;border-radius: 2px !important;outline: none;}.mark-text-ipt {cursor: default;}}}}'
 
@@ -579,7 +575,7 @@ export default{
       this.imgDialogVisible=false
     },
     saveimg(){
-      
+
       // html2canvas(this.$refs.imageWrapper).then(canvas  =>{
       //   // const imageSrc = canvas.toDataURL();
       //   const imageUrl = canvas.toDataURL("image/png");
@@ -592,7 +588,7 @@ export default{
       //   console.log('1111',urls);
         // var link= document.createElement("a");
         // //将生成的图片url赋值给a标签的href属性
-        // link.href = this.url; 
+        // link.href = this.url;
         // //设置下载的文件名
         // link.download = "页面截图";
         // // 将a标签插入dom中
@@ -667,7 +663,7 @@ export default{
   background-color: #fff;
   border: 1px solid #ddd;
   border-radius: 4px;
-  
+
   .mark-target-a{
     background: #E73535;
     top: 40px;
@@ -764,7 +760,7 @@ export default{
   //     opacity: 0;
   //     cursor: pointer;
   //     border-radius: 50%;
-      
+
   // }
   // div.add-mark-text-wrap:hover .remove-mark-text {
   //   background: red;
@@ -879,7 +875,7 @@ export default{
     box-shadow: 1px 1px 5px rgba(0,0,0,.1);
     background: url('../../assets/evaluate/xgtl_tool_rotate.png')no-repeat center center / 20px;
   }
- 
+
   .frame-box .drag-elem.bottom.right {
     cursor: nwse-resize;
     z-index: 3;
@@ -1078,4 +1074,4 @@ span.chuanci:hover{
 .ql-snow .ql-tooltip[data-mode="link"]::before {
   content: "../../assets/evaluate/tool-a.png";
 }
-</style>
+</style>

src/xt_pages/user/components/PatientDetail.vue

@@ -366,7 +366,7 @@
               </el-col>
 
 
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="流转地: "
                 >
@@ -380,9 +380,9 @@
                  </el-select>
                 </el-form-item>
               </el-col>
-           
+            -->
 
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="流转开始时间 : "
                 >
@@ -400,9 +400,9 @@
                   @change="startTimeChange"
                  ></el-date-picker>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
 
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="流转结束时间 : "
                 >
@@ -420,9 +420,9 @@
                   @change="startTimeChange"
                  ></el-date-picker>
                 </el-form-item>
-              </el-col> 
+              </el-col>  -->
 
-                <el-col :span="8" style="margin-bottom: 20px;">
+                <!-- <el-col :span="8" style="margin-bottom: 20px;">
                 <el-form-item
                   label="备注 : "
                   prop="sch_remark">
@@ -435,7 +435,7 @@
                     placeholder
                   ></el-input>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
 
             <el-col :span="8" style="height: 59px">
               <el-form-item
@@ -1374,8 +1374,6 @@ export default {
       patientSourceList:[
         {value:1,label:"门诊"},
         {value:2,label:"住院"},
-        {value:3,label:"请假"},
-        {value:4,label:"流转"}
       ],
       generic_info_fold: true,
       treat_info_fold: true,

src/xt_pages/user/components/PatientForm.vue

@@ -394,7 +394,7 @@
                 </el-form-item>
               </el-col>
       
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="患者去向 : "
                 >
@@ -408,11 +408,11 @@
                     >
                   </el-radio-group>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
            
 
             
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="流转地: "
                 >
@@ -425,11 +425,11 @@
                     </el-option>
                  </el-select>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
            
  
              
-                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="流转开始时间 : "
                 >
@@ -447,9 +447,9 @@
                   @change="startTimeChange"
                  ></el-date-picker>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
 
-              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+              <!-- <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="流转结束时间 : "
                 >
@@ -467,11 +467,11 @@
                   @change="startTimeChange"
                  ></el-date-picker>
                 </el-form-item>
-              </el-col> 
+              </el-col>  -->
            
              
 
-              <el-col :span="8" style="margin-bottom: 20px;" :style="isEdit ? 'width:360px' : ''">
+              <!-- <el-col :span="8" style="margin-bottom: 20px;" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="备注 : "
                   prop="sch_remark">
@@ -483,7 +483,7 @@
                     placeholder
                   ></el-input>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
 
 
               <el-col :span="24" :style="isEdit ? 'width:360px' : ''" v-show="showLapseto">
@@ -1411,8 +1411,6 @@ export default {
       patientSourceList:[
         {value:1,label:"门诊"},
         {value:2,label:"住院"},
-        {value:3,label:"请假"},
-        {value:4,label:"流转"}
       ],
       lapsetoOptions: [
         { value: 1, label: "留治" },

src/xt_pages/user/dialysisRecord.vue

@@ -153,6 +153,15 @@
               <span>{{getTime(scope.row.assessment_after_dislysis)}}</span>
             </template>
           </el-table-column>
+
+          <el-table-column  width="96" align="center" label="透析器/灌流器">
+             <template slot-scope="scope">
+                 {{ scope.row.prescription.dialyzer_perfusion_apparatus }}
+                 {{ scope.row.prescription.dialysis_dialyszers }}
+              <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{ scope.row.prescription.dialysis_irrigation }}</span>    
+             </template>
+          </el-table-column>
+
           <el-table-column
             prop="predialysis_evaluation.dry_weight"
             width="96"
@@ -337,6 +346,7 @@
               <th>分区机号</th>
               <th>透析模式</th>
               <th>透析时长（h）</th>
+              <th>透析器/灌流器</th>
               <th>干体重（kg）</th>
               <th>透前称重（kg）</th>
               <th>透后称重（kg）</th>
@@ -356,6 +366,11 @@
                 <td>{{ item.partition_name }}-{{ item.device.number }}</td>
                 <td>{{ modeName(item.prescription.mode_id) }}</td>
                 <td>{{getTime(item.assessment_after_dislysis)}}</td>
+                <td>
+                   <span v-if="item.prescription.dialyzer_perfusion_apparatus"></span>
+                   <span v-if="item.prescription.dialysis_dialyszers!=''">{{ item.prescription.dialysis_dialyszers }} </span>
+                   <span v-if="item.prescription.dialysis_irrigation!=''">/{{ item.prescription.dialysis_irrigation }} </span> 
+                </td>
                 <td>{{ item.predialysis_evaluation.dry_weight }}</td>
                 <td>{{ item.predialysis_evaluation.weight_before }}</td>
                 <td>{{ item.assessment_after_dislysis.weight_after }}</td>

src/xt_pages/user/patients.vue

@@ -253,7 +253,7 @@
           </ul>
         </div>
       </div>
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">患者去向</span> : </label>
         <div class="time ">
           <ul class="">
@@ -267,7 +267,7 @@
             </li>
           </ul>
         </div>
-      </div>
+      </div> -->
       <div class="cell clearfix">
         <label class="title"><span class="name">其它查询</span> : </label>
         <el-select
@@ -525,7 +525,7 @@
             </el-radio-group>
           </el-form-item>
 
-          <el-form-item label="转归(死亡)时间 :" prop="lapseto_time" required>
+          <el-form-item label="转归(死亡)时间 :" prop="lapseto_time" required v-if="lapsetoForm.lapseto_type == 2 || lapsetoForm.lapseto_type == 3"> 
             <el-date-picker
               v-model="lapsetoForm.lapseto_time"
               type="datetime"
@@ -539,6 +539,47 @@
           <el-form-item label="转出(死亡)原因:" v-if="lapsetoForm.lapseto_type == 2 || lapsetoForm.lapseto_type == 3">
               <el-input v-model="lapsetoForm.out_reason"></el-input>
           </el-form-item>
+
+          <el-form-item label="开始时间:" v-if="lapsetoForm.lapseto_type != 2 && lapsetoForm.lapsetoType !=3">
+            <el-date-picker
+                  size="small"
+                  v-model="form.patient_start_time"
+                  prefix-icon="el-icon-date"
+                  :editable="false"
+                  style="width: 150px;"
+                  type="date"
+                  placeholder="选择日期时间"
+                  align="right"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                ></el-date-picker>
+         </el-form-item>
+
+         <el-form-item label="结束时间:" v-if="lapsetoForm.lapseto_type != 2 && lapsetoForm.lapsetoType !=3">
+            <el-date-picker
+                  size="small"
+                  v-model="form.patient_end_time"
+                  prefix-icon="el-icon-date"
+                  :editable="false"
+                  style="width: 150px;"
+                  type="date"
+                  placeholder="选择日期时间"
+                  align="right"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                ></el-date-picker>
+         </el-form-item>
+
+        <el-form-item label="转院地区:" v-if="lapsetoForm.lapseto_type == 4">
+          <el-select v-model="form.patient_address" placeholder="请选择">
+              <el-option
+                v-for="item in liuAddresslist"
+                :key="item.id"
+                :label="item.name"
+                :value="item.name">
+              </el-option>
+           </el-select>
+        </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="LapsetoDialogVisible = false">取 消</el-button>
@@ -638,34 +679,32 @@
             :data="patientAllgicList"
             border
             style="width: 100%">
-            <el-table-column  prop="date" label="流转地"  width="180"  align="center">
+            <el-table-column  prop="date" label="序号"  width="100"  align="center">
               <template  slot-scope="scope">
-                 {{ scope.row.patient_address }}
-
+                {{ scope.$index + 1 }}
               </template>
             </el-table-column>
-            <el-table-column  prop="name" label="流转开始时间"  width="180"   align="center">
+            <el-table-column  prop="date" label="转归方式"  width="100"  align="center">
+              <template  slot-scope="scope">
+                 {{getPatientSource(scope.row.patient_source) }}
+              </template>
+            </el-table-column>
+            
+            <el-table-column  prop="name" label="开始时间"  width="180"   align="center">
               <template  slot-scope="scope"  >
                  {{ getTime(scope.row.start_time) }}
-
               </template>
             </el-table-column>
 
-            <el-table-column  prop="name" label="开始流转结束时间"  width="180"   align="center">
+            <el-table-column  prop="name" label="结束时间"  width="180"   align="center">
               <template  slot-scope="scope"  >
                 {{ getTime(scope.row.end_time) }}
-
-              </template>
-            </el-table-column>
-            <el-table-column  prop="address"  label="流转地址"   align="center">
-              <template  slot-scope="scope" >
-                {{ scope.row.patient_address }}
               </template>
             </el-table-column>
-
-            <el-table-column  prop="address"  label="备注"   align="center">
+            
+            <el-table-column  prop="date" label="转院地区"  width="180"  align="center">
               <template  slot-scope="scope">
-                {{ scope.row.remake }}
+                 {{ scope.row.patient_address }}
               </template>
             </el-table-column>
           </el-table>
@@ -689,7 +728,7 @@
   import { log } from 'util'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import UploadExcel from '@/xt_pages/components/UploadExcel'
-
+  import { getDataConfig } from "@/utils/data";
   export default {
     name: 'Patient',
     components: {
@@ -738,7 +777,14 @@
         lapsetoOptions: [
           { value: 1, label: '留治' },
           { value: 2, label: '转出' },
-          { value: 3,  label: "死亡" },
+          { value: 3, label: "死亡" },
+          { value: 4, label: "转院" },
+          { value: 5, label:"肾移植"},
+          { value: 6, label:"转腹透"},
+          { value:7,  label:"出院"},
+          { value:8,  label:"好转"},
+          { value:9,  label:"放弃治疗"},
+          { value:10, label:"其他状态"},
         ],
         systemType: 0,
         systemArr: [
@@ -761,16 +807,20 @@
           {value:0,label:"全部",source:0,lapeseto:0},
           {value:1,label:"门诊",source:1,lapeseto:1},
           {value:2,label:"住院",source:2,lapeseto:2},
-          {value:3,label:"请假",source:3,lapeseto:3},
-          {value:4,label:"流转",source:4,lapeseto:4}
+         
        ],
         lapsetoArr: [
           { value: 0, label: '全部', source: 0, lapseto: 0 },
           { value: 1, label: '转出', source: 0, lapseto: 2 },
           { value: 2, label: '留治', source: 0, lapseto: 1 },
           { value: 3, label: '死亡', source:0,  lapseto: 3 },
-          // { value: 3, label: "门诊", source: 1, lapseto: 1 },
-          // { value: 4, label: "住院", source: 2, lapseto: 1 }
+          { value: 4, label: "转院", source: 0, lapseto: 4 },
+          { value: 5, label: "肾移植", source: 0, lapseto: 5 },
+          { value: 6, label: "转腹透", source: 0, lapseto: 6 },
+          { value: 7, label: "出院", source: 0, lapseto: 7 },
+          { value: 8, label: "好转", source: 0, lapseto: 8 },
+          { value: 9, label: "放弃治疗", source: 0, lapseto: 9 },
+          { value: 10, label: "其他状态", source: 0, lapseto: 10 },
         ],
         scheduling: [
           {
@@ -839,10 +889,17 @@
         totalOne: 0,
         page: 1,
         limit: 5,
-        patientAllgicList:[]
+        patientAllgicList:[],
+        liuAddresslist:[],
+        form:{
+          patient_address:"",
+          patient_start_time:"",
+          patient_end_time:"",
+        }
       }
     },
     created() {
+      this.liuAddresslist = getDataConfig('hemodialysis', 'liu_address')
       if(sessionStorage.getItem('patientPageSize')){
         this.listQuery.limit = parseInt(sessionStorage.getItem('patientPageSize'))
       }
@@ -1272,10 +1329,14 @@
         return row.total_dialysis + row.user_sys_before_count
       },
       EditLapseto() {
-        if (this.lapsetoForm.lapseto_time == '') {
-          this.$message.error('请选择时间')
-          return
+
+        if(this.lapsetoForm.lapeseto ==2 || this.lapsetoForm.lapeseto == 3 ){
+          if (this.lapsetoForm.lapseto_time == '') {
+            this.$message.error('请选择时间')
+            return
+          }
         }
+      
         //  if(this.lapeseto == "留治"){
         //    this.lapsetoForm.lapseto_type = 1
         //  }
@@ -1286,7 +1347,7 @@
         //   this.lapsetoForm.lapseto_type = 3
         //  }
         console.log("22222",this.lapsetoForm)
-        EditLapseto(this.lapsetoForm.patient_id, this.lapsetoForm).then(
+        EditLapseto(this.lapsetoForm.patient_id, this.lapsetoForm,this.form.patient_start_time,this.form.patient_end_time,this.form.patient_address).then(
           response => {
             if (response.data.state === 1) {
               this.$notify({
@@ -1325,14 +1386,49 @@
       },
       LapsetoInfo(row) {
         console.log("row",row)
-        if (typeof row.lapseto === 'undefined' ||(row.lapseto !== 1 && row.lapseto !== 2 && row.lapseto !==3)) {
-          return '未设置'
-        } else if (row.lapseto === 1) {
+        if (row.lapseto === 1) {
           return '留治'
         } else if(row.lapseto === 2) {
           return '转出'
         }else if(row.lapseto === 3){
           return '死亡'
+        }else if(row.lapseto == 4){
+          return "转院"
+        }else if(row.lapseto == 5){
+          return "肾移植"
+        }else if(row.lapseto == 6){
+           return "转腹透"
+        }else if(row.lapseto == 7){
+           return "出院"
+        }else if(row.lapseto == 8){
+           return "好转"
+        }else if (row.lapseto == 9){
+           return "放弃治疗"
+        }else if (row.lapseto == 10){
+           return "其他状态"
+        }
+      },
+      getPatientSource(val){
+        if(val === 1) {
+          return '留治'
+        }else if(val === 2) {
+          return '转出'
+        }else if(val === 3){
+          return '死亡'
+        }else if(val == 4){
+          return "转院"
+        }else if(val == 5){
+          return "肾移植"
+        }else if(val == 6){
+           return "转腹透"
+        }else if(val == 7){
+           return "出院"
+        }else if(val== 8){
+           return "好转"
+        }else if (val == 9){
+           return "放弃治疗"
+        }else if (val == 10){
+           return "其他状态"
         }
       },
       openWechatBindDialog() {

src/xt_pages/workforce/components/tableWeeks.vue

@@ -907,7 +907,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){
+        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340 && this.org_id != 0 && this.org_id!=10375){
           var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []

src/xt_pages/workforce/next_remind_print.vue

@@ -35,6 +35,7 @@
                   <td width="100" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器</td>
                   <td width="120" v-if="printObj.anticoagulant==1">抗凝剂(商品名称)</td>
                   <td width="100" v-if="printObj.anticoagulant_zongliang == 1">总量</td>
+                  <td width="100" >血管通路</td>
                   <td width="300" v-if="printObj.doctor_advice == 1">长期医嘱</td>
                 </tr>
               </thead>
@@ -94,6 +95,9 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                 </td>
+                <td :width="td_1_width">
+                  <span>{{getBloodName(main_collection.dialysissolution.blood_access)  }}</span>
+                </td>
                 <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
                   <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctor_advice)}}</span>
                   <span style="white-space: pre" v-if="main_collection.hisdoctoradviceinfo.length>0">{{getAdviceOne(main_collection.hisdoctoradviceinfo)}}</span>
@@ -110,6 +114,7 @@
 
 <script>
   import { getNextScheduleWeekDay,getPrintList } from '@/api/schedule'
+  import { getDataConfig } from '@/utils/data'
   import { parseTime } from '@/utils'
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
@@ -141,13 +146,18 @@
         pre_status:0,
         printObj:{},
         loading: false,
+        blood_access_option:[],
       }
     },
     components: {
       BreadCrumb
     },
     created() {
-   
+      
+      this.blood_access_option = getDataConfig(
+          'hemodialysis',
+          'vascular_access_desc'
+       )
       this.getPrintList()
       this.org_id = this.$store.getters.xt_user.org.id
       this.currentDate = this.getCurrentDate()
@@ -168,6 +178,15 @@
     
     },
     methods: {
+      getBloodName(id){
+         var name= ""
+         for(let i=0;i<this.blood_access_option.length;i++){
+           if(id == this.blood_access_option[i].id){
+              name = this.blood_access_option[i].name
+           }
+         }
+         return name
+      },
       getTimestamp(time) { //把时间日期转成时间戳
         return (new Date(time)).getTime()
       },

src/xt_pages/workforce/remind_print.vue

@@ -32,8 +32,9 @@
                   <td width="70" v-if="printObj.number == 1">机号</td>
                   <td width="120" v-if="printObj.mode == 1">透析模式</td>
                   <td width="100" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器</td>
-                  <td width="120" v-if="printObj.anticoagulant==1">抗凝剂(商品名称)</td>
+                  <td width="100" v-if="printObj.anticoagulant==1">抗凝剂(商品名称)</td>
                   <td width="100" v-if="printObj.anticoagulant_zongliang == 1">总量</td>
+                  <td width="200">血管通路</td>
                   <td width="300" v-if="printObj.doctor_advice == 1">长期医嘱</td>
                 </tr>
               </thead>
@@ -63,18 +64,7 @@
                 </td>
 
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
-                  <!-- <span v-if="org_id!=9987">
-                     <span > 
-                       <span v-if="org_id!=10131 && org_id!=10215 && org_id!=10233 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
-                     
-                       <span v-if="org_id==10131 || org_id==9671 || org_id == 10215 || org_id == 10233">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
-                      </span>
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span> 
-                  </span>
-                    {{main_collection.prescription.dialysis_dialyszers}}
-                  <span v-if="main_collection.prescription.dialysis_dialyszers!=''&& main_collection.prescription.dialysis_irrigation!='' ">/</span>
-                  <span v-if="main_collection.prescription.dialysis_irrigation!=''">{{main_collection.prescription.dialysis_irrigation}}</span> -->
-                  
+                 
                   <span v-if="main_collection.prescription.dialysis_dialyszers == ''">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
                   <span v-if="main_collection.prescription.dialysis_dialyszers != ''">{{main_collection.prescription.dialysis_dialyszers}}</span>
 
@@ -104,6 +94,9 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                 </td>
+                <td :width="td_1_width">
+                   <span>{{getBloodName(main_collection.prescription.blood_access)  }}</span>
+                </td>
                 <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
                   <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctoradvice)}}</span>
                    <span style="white-space: pre" v-if="main_collection.hisdoctoradviceinfo.length>0">{{ getAdviceOne(main_collection.hisdoctoradviceinfo)}}</span>
@@ -120,6 +113,7 @@
 
 <script>
   import { getScheduleList,getPrintList } from '@/api/schedule'
+  import { getDataConfig } from '@/utils/data'
   import { parseTime } from '@/utils'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
@@ -146,6 +140,7 @@
         printObj:{},
         week_time:0,
         zone:0,
+        blood_access_option:[]
       }
     },
     components: {
@@ -154,6 +149,12 @@
     created() {
       this.getPrintList()
       this.org_id = this.$store.getters.xt_user.org.id
+
+      this.blood_access_option = getDataConfig(
+          'hemodialysis',
+          'vascular_access_desc'
+       )
+      
      //console.log("org_id23322323",this.org_id)
     //  this.currentDate = this.getCurrentDate()
       this.modeOptions = this.$store.getters.treatment_mode
@@ -414,6 +415,15 @@
         console.log('name', name)
         return name
       },
+      getBloodName(id){
+         var name= ""
+         for(let i=0;i<this.blood_access_option.length;i++){
+           if(id == this.blood_access_option[i].id){
+              name = this.blood_access_option[i].name
+           }
+         }
+         return name
+      }
     },
   }
 </script>

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -42,17 +42,14 @@
                     <span>{{getModeId(main_collection.mode_id)}}</span>
                   
                 </div>
-                <div class="printCell">
-                  <span v-if="org_id!=0&&org_id!=10375">抗凝剂：
-                    {{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}
-                  </span>
-                  <span v-if="org_id==0||org_id==10375">抗凝剂：
-                    {{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}}
-                  </span>
+                <div class="printCell" v-if="org_id!=10375">
+                  <span>抗凝剂：{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
                 </div>
-                <div class="printCell">
-                 <span v-if="org_id !=0&&org_id!=10375">首剂：
-                  <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
+                <div class="printCell" v-if="org_id==10375">
+                  <span>抗凝剂：{{ main_collection.prescription.anticoagulant ? anticoagulants_confit[main_collection.prescription.anticoagulant].name : ''}}</span>
+                </div>
+                <div class="printCell" v-if="org_id!=10375">
+                 首剂：<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>
@@ -83,10 +80,10 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
                     {{main_collection.dialysissolution.anticoagulant_shouji}}iu
                    </span>
-                  </span> 
-
-                  <span v-if="org_id ==0||org_id==10375">首剂：
-                  <span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_shouji}} mg</span>
+                 
+                </div>
+                <div class="printCell" v-if="org_id ==10375">
+                 首剂：<span v-if="main_collection.prescription.anticoagulant == 1">{{main_collection.prescription.anticoagulant_shouji}} mg</span>
                   <span v-if="main_collection.prescription.anticoagulant == 2">
                     {{main_collection.prescription.anticoagulant_shouji}}mg
                   </span>
@@ -117,9 +114,9 @@
                   <span v-if="main_collection.prescription.anticoagulant == 11">
                     {{main_collection.prescription.anticoagulant_shouji}}iu
                    </span>
-                  </span> 
+                 
                 </div>
-                <div class="printCell">
+                <div class="printCell" v-if="org_id!=10375">
                   维持：{{main_collection.dialysissolution.anticoagulant_weichi}}
                    <span v-if="main_collection.dialysissolution.anticoagulant == 1">
                     mg/h
@@ -156,8 +153,46 @@
                    </span>
               
                 </div>
+
+                <div class="printCell" v-if="org_id!=10375">
+                  维持：{{main_collection.prescription.anticoagulant_weichi}}
+                   <span v-if="main_collection.prescription.anticoagulant == 1">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 2">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 3">
+                   iu/h
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 4">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 5">
+                    mg/h
+                   </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 6">
+                   iu/h
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 7">
+                   iu/h
+                   </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 8">
+                    iu/h
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 9">
+                    iu/h
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 10">
+                    iu/h
+                    </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 11">
+                    iu/h
+                   </span>
+              
+                </div>
                
-                <div class="printCell">
+                <div class="printCell" v-if="org_id!=10375">
                   总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
                     mg
@@ -193,6 +228,44 @@
                    iu
                    </span>
           
+                </div>
+
+                <div class="printCell" v-if="org_id==10375">
+                  总量：{{main_collection.prescription.anticoagulant_zongliang}}
+                  <span v-if="main_collection.prescription.anticoagulant == 1">
+                    mg
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 2">
+                    mg
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 3">
+                    iu
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 4">
+                   mg
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 5">
+                    mg
+                   </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 6">
+                   iu
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 7">
+                    iu
+                   </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 8">
+                     iu
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 9">
+                   iu
+                  </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 10">
+                    iu
+                    </span>
+                  <span v-if="main_collection.prescription.anticoagulant == 11">
+                   iu
+                   </span>
+          
                 </div>
                 <div class="printCell" v-if="org_id==9671 || org_id==9675 || org_id==10340">
                     <span>上次脱水量：{{ main_collection.prescription.target_ultrafiltration }}ml</span>