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

src/api/dialysis_record.js

@@ -47,7 +47,7 @@ export function editMonitor(patient_id, schedule_date, data, mode) {
   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id, nuclein_date, schedule_remark, order_remark,catheter_operation) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id, nuclein_date, schedule_remark, order_remark,catheter_operation,blood_flow_volume) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
@@ -72,7 +72,8 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
     nuclein_date: nuclein_date,
     schedule_remark: schedule_remark,
     order_remark: order_remark,
-    catheter_operation:catheter_operation
+    catheter_operation:catheter_operation,
+    blood_flow_volume:blood_flow_volume,
   }
   console.log('params', params)
   return request({

src/xt_pages/dialysis/batch_print/batch_print_order_seventy.vue

@@ -771,16 +771,15 @@
                         min
                       </div>
                     </div>
-                    <div
-                      class="row"
+
+                    <div class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
-
                       <div class="inline_block" style="flex:1">
                         透前症状：
                         <div
                           class="under_line"
-                          style="width: 130px; text-align: center"
+                          style="width: 80%; text-align: left"
                         >
                          <span v-if="record.assessment_before_dislysis&&record.assessment_before_dislysis.symptom_before_dialysis!=''">{{
                             record.assessment_before_dislysis &&
@@ -805,12 +804,17 @@
                           </span>
                         </div>
                       </div>
+                    </div>
+                    <div
+                      class="row"
+                      style="padding: 2px 0; line-height: 23px; display: flex"
+                    >   
 
                       <div class="inline_block" style="flex:1.4">
                         透析(滤)器：
                         <div
                           class="under_line"
-                          style="width: 100px; text-align: center"
+                          style="width: 60%; text-align: left"
                         >
 
                           {{
@@ -825,7 +829,7 @@
                         灌流器：
                         <div
                           class="under_line"
-                          style="width: 70px; text-align: center"
+                          style="width: 50%; text-align: left"
                         >
                           {{
                             record.prescription &&
@@ -840,7 +844,7 @@
                         滤过器：
                         <div
                           class="under_line"
-                          style="width: 70px; text-align: center"
+                          style="width: 50%; text-align: left"
                         >
                          {{
                              record.prescription.dialysis_strainer?record.prescription.dialysis_strainer:"/"

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -170,13 +170,13 @@
         </li> -->
 
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "ml" : "" }}</span>
         </li>
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  ">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "L" : "" }}</span>
@@ -310,6 +310,14 @@
           <span class="unit">{{ dialysate_flow != "0" ? "ml/min" : "" }}</span>
         </li>
 
+        <li v-if="isShow('透析液')">
+          <label>透析液 : </label>
+          <span class="content">{{
+            dialyzate != "0" ? dialyzate : ""
+          }}</span>
+          <span class="unit">{{ dialyzate != "0" ? "ml/min" : "" }}</span>
+        </li>
+
         <li v-if="isShow('维持') && getValueStr('anticoagulant', 'anticoagulant') != 5">
           <label>维持 : </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_weichi != "0" ? anticoagulant_weichi : "" }}</span>
@@ -762,6 +770,10 @@ export default {
       var v = this.getValueStr('blood_flow_volume', 'blood_flow_volume')
       return v.length == 0 ? '0' : v
     },
+    dialyzate:function(){
+      var v = this.getValueStr('dialyzate', 'dialyzate')
+      return v.length == 0 ? '0' : v
+    },
     replacement_way: function() {
       return this.getValueStr('replacement_way', 'replacement_way')
     },

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -333,6 +333,11 @@
           <label>输液量(ml): </label>
           <span class="content" >{{ this.record.transfusion_volume}}</span>
         </li>
+
+        <li v-if="isShow('灌流器凝血')">
+          <label>灌流器凝血: </label>
+          <span class="content" >{{ this.record.condenser}}</span>
+        </li>
       </ul>
     </div>
     <!-- <div class="note">

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

@@ -203,6 +203,16 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShow('灌流器凝血')">
+            <el-form-item label="灌流器凝血: " :prop="isName('灌流器凝血')" :rules="isCheckmust('灌流器凝血')">
+              <el-input
+                v-model="form.condenser "
+                readonly
+                @focus="showDialog('11')"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShow('管路凝血')">
             <el-form-item label="管路凝血: " :prop="isName('管路凝血')" :rules="isCheckmust('管路凝血')">
               <el-input
@@ -869,6 +879,7 @@ export default {
         after_urea:"",
         accumulated_blood_volume:"",
         transfusion_volume:"",
+        condenser:""
       },
       lapseList:[],
       leaveOfficeMethod:[],
@@ -1209,7 +1220,7 @@ export default {
           data["pip_coagulation"] = this.form.pip_coagulation
           data["accumulated_blood_volume"] = this.form.accumulated_blood_volume
           data["transfusion_volume"] = this.form.transfusion_volume
-
+          data["condenser"] = this.form.condenser
           console.log("Paramsquery",data)
 
           postAssessmentAfterDislysis(ParamsQuery, data)
@@ -1253,7 +1264,7 @@ export default {
       switch (val) {
         case '1':
           this.InnerDialogProps.values = this.cruorOptions
-          this.InnerDialogProps.titles = '凝血'
+          this.InnerDialogProps.titles = '透析器凝血'
           this.InnerDialogProps.type = 'cruor'
           this.InnerDialogProps.selected = this.form.cruor
           this.InnerDialogProps.isShowTextArea = false
@@ -1323,6 +1334,13 @@ export default {
           this.InnerDialogProps.selected = this.form.pip_coagulation
           this.InnerDialogProps.isShowTextArea = false
           break
+          case '11':
+          this.InnerDialogProps.values = this.cruorOptions
+          this.InnerDialogProps.titles = '灌流器凝血'
+          this.InnerDialogProps.type = 'condenser'
+          this.InnerDialogProps.selected = this.form.condenser
+          this.InnerDialogProps.isShowTextArea = false
+          break
       }
     },
     selectActualTreatmentHour(val) {
@@ -1363,8 +1381,12 @@ export default {
         case 'sealing_fluid_dispose':
           this.form.sealing_fluid_dispose = val.value.join(',')
           break
+        case 'condenser':
+          this.form.condenser = val.value.join(',')
+          break
         default:
           break
+        
       }
       // console.log(val);
     },

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

@@ -292,6 +292,19 @@
           </el-form-item>
 
 
+          <el-form-item
+            :prop="isName('血流量(ml/min)')"
+            :rules="isCheckmust('血流量')"
+            v-if="isShowFiled('血流量')"
+          >
+            <el-input
+              type="textarea"
+              v-model="form.blood_flow_volume"
+              :rows="4"
+            ></el-input>
+          </el-form-item>
+
+
         <el-form-item
           label="核酸检测日期:"
           style="width: 300px"
@@ -309,6 +322,8 @@
           ></el-date-picker>
         </el-form-item>
 
+
+
         <el-form-item
           label="上机时间 :"
           style="width: 300px"
@@ -460,7 +475,8 @@ export default {
       value2:"",
       infoDialogVisible:false,
       selected_date:"",
-      remark:""
+      remark:"",
+      blood_flow_volume:"" ,
     };
   },
   props: {
@@ -912,7 +928,8 @@ export default {
             this.form.dialysis_irrigation,
             this.form.blood_access_id,
             this.form.nuclein_date,
-            this.form.catheter_operation
+            this.form.catheter_operation,
+            this.form.blood_flow_volume
           ).then((rs) => {
             this.loading = false;
             var resp = rs.data;
@@ -965,6 +982,7 @@ export default {
       ParamsQuery["nuclein_date"] = this.form.nuclein_date;
       ParamsQuery["mode"] = "2";
       ParamsQuery['catheter_operation'] = this.form.catheter_operation
+      ParamsQuery["blood_flow_volume"] = this.form.blood_flow_volume
       if (this.dialysis_order.creator != this.$store.getters.xt_user.user.id) {
         ParamsQuery["mode"] = "3";
       }

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

@@ -138,7 +138,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612">
                         <el-form-item label="处方脱水量(ml)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -148,7 +148,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 ">
                         <el-form-item label="处方脱水量(L)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -191,6 +191,20 @@
                         </el-form-item>
                     </el-col>
 
+
+                    <el-col :span="8" v-if="isShows('透析液')">
+                        <el-form-item label="透析液:" prop="dialyzate" :rules="isCheckmust('透析液')">
+                           <el-select v-model="dialysisPrescription.dialyzate">
+                                <el-option
+                                        v-for="(item, index) in dialyzateList"
+                                        :label="item.name"
+                                        :value="item.name"
+                                        :key="index + 'q'"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
                     <el-col :span="8" v-if="isShows('单超时长') && dialysisPrescription.is_water == 1">
                         <el-form-item label="单超时长(h)：" prop="single_time" :rules="isCheckmust('单超时长')">
                             <el-input v-model="dialysisPrescription.single_time"></el-input>
@@ -1773,7 +1787,8 @@
           warsh_count:"",
           washing_time:"",
           blood_access_part_id:"",
-          anticoagulant_weichi_hour:""
+          anticoagulant_weichi_hour:"",
+          dialyzate:""
         },
 
         anticoagulant: {
@@ -1815,6 +1830,11 @@
           {id:1,name:"是"},
           {id:2,name:"否"}
         ],
+        dialyzateList:[
+          {id:0,name:"请选择"},
+          {id:1,name:"碳酸"},
+          {id:2,name:"醋酸"}
+        ],
         machineList:[
           {id:1,name:"是"},
           {id:2,name:"否"}

src/xt_pages/dialysis/details/dialysisComputer.vue

@@ -98,6 +98,12 @@
           <span class="content">{{catheter_operation}}</span>
         </li>
       </ul>
+      <ul>
+        <li v-if="isShow('血流量')">
+          <label>血流量 : </label>
+          <span class="content">{{blood_flow_volume}}</span>
+        </li>
+      </ul>
     </div>
     <div class="middleLine"></div>
   </div>
@@ -238,6 +244,13 @@
           return this.record.catheter_operation
         }
        
+      },
+      blood_flow_volume:function(){
+        if(this.record.id == 0){
+          return '-'
+        }else{
+          return this.record.blood_flow_volume
+        }
       }
     },
     methods: {

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -869,6 +869,18 @@
         >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 71">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1346,12 +1358,18 @@
           >
 
           </DialysisPrintOrderSeventy>
+          <DialysisPrintOrderseventyone
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 71"
+          >
+          </DialysisPrintOrderseventyone>
 
           <DialysisPrintOrderZero
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 199"
           >
           </DialysisPrintOrderZero>
+
         </div>
       </el-container>
     </div>
@@ -1440,6 +1458,7 @@ import DialysisPrintOrdersixtySeven from './template/DialysisPrintOrdersixtySeve
 import DialysisPrintOrderSixtyeight from './template/DialysisPrintOrderSixtyeight'
 import DialysisPrintOrderSixtynine from './template/DialysisPrintOrderSixtynine'
 import DialysisPrintOrderSeventy from './template/DialysisPrintOrderSeventy'
+import DialysisPrintOrderseventyone from './template/DialysisPrintOrderseventyone'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
@@ -1514,6 +1533,7 @@ export default {
     DialysisPrintOrderSixtyeight,
     DialysisPrintOrderSixtynine,
     DialysisPrintOrderSeventy,
+    DialysisPrintOrderseventyone,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
@@ -2153,7 +2173,14 @@ export default {
           style: style2,
           scanStyles: false,
         });
-      }else if (this.org_template_info.template_id == 199 ) {
+      }else if (this.org_template_info.template_id == 71) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false,
+        });
+      } else if (this.org_template_info.template_id == 199 ) {
         printJS({
           printable: "dialysis-print-box-1",
           type: "html",
@@ -2161,8 +2188,8 @@ export default {
           scanStyles: false,
         });
 
-
       }
+     
     },
     printThisOnePage() {
       var ptime = Math.round(new Date().getTime() / 1000);
@@ -2229,7 +2256,7 @@ export default {
       const style =
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       const style2 =
-        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
+        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line2 {display: inline-block;border-bottom: 1px solid #999;text-align: left;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
 
       // 雷州惠爱样式
       const style93 ='@page {margin-top:10px;}@media print {.dialysis-print-order{width:960px;margin:0 auto;margin-top:30px;} .dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr td{border-collapse:collapse;} .dialysis-print-order .print-table .short_tr th p{height:20px !important; line-height:20px !important;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;white-space:normal;height: fit-content;} .dialysis-print-order .td_div1{display:flex;white-space: normal;} .dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-table tr th p{height: 20px; line-height: 20px}  .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;}  .dialysis-print-order tbody .print-table tr{page-break-inside:avoid;} .dialysis-print-order tbody .print-table tr td{border: 1px solid #000;} ';

src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue

@@ -748,11 +748,35 @@
                     </div>
                   </div>
 
+                  <div class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                  >
+                  <div class="inline_block" style="flex: 1">
+                      透前症状：
+                      <div
+                        class="under_line"
+                        style="width: 80%; text-align: left"
+                      >
+                       <span v-if="predialysis&&predialysis.symptom_before_dialysis!=''">
+                        {{
+                          predialysis.symptom_before_dialysis
+                            ? predialysis.symptom_before_dialysis
+                            : "/"
+                        }}
+                       </span> 
+                       <span v-if="predialysis&&predialysis.symptom_before_dialysis_other!=''">
+                         {{ predialysis.symptom_before_dialysis_other?predialysis.symptom_before_dialysis_other:"/" }}
+                       </span>
+                       <span v-if="predialysis&&predialysis.symptom_before_dialysis==''&&predialysis.symptom_before_dialysis_other==''">/</span>
+                      </div>
+                    </div>
+                  </div>
+
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div class="inline_block" style="flex: 1">
+                    <!-- <div class="inline_block" style="flex: 1">
                       透前症状：
                       <div
                         class="under_line"
@@ -770,21 +794,16 @@
                        </span>
                        <span v-if="predialysis&&predialysis.symptom_before_dialysis==''&&predialysis.symptom_before_dialysis_other==''">/</span>
                       </div>
-                    </div>
+                    </div> -->
 
                     <div class="inline_block" style="flex: 1.2">
                       透析(滤)器：
                       <!--  透析(滤)器分开取值 -->
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 60%; text-align: left"
                       >
-                        <!-- {{
-                          prescription.dialyzer_perfusion_apparatus
-                            ? prescription.dialyzer_perfusion_apparatus
-                            : ""
-                        }} -->
-                        <!-- <span v-if="prescription.dialyzer_perfusion_apparatus&&prescription.dialyzer_perfusion_apparatus!=''">/</span> -->
+                       
                         {{
                           prescription.dialysis_dialyszers
                             ? prescription.dialysis_dialyszers
@@ -800,7 +819,7 @@
                       灌流器：
                       <div
                         class="under_line"
-                        style="width: 70px; text-align: center"
+                        style="width: 50%; text-align: left"
                       >
                         {{
                           prescription.dialysis_irrigation
@@ -814,7 +833,7 @@
                       滤过器：
                       <div
                         class="under_line"
-                        style="width: 70px; text-align: center"
+                        style="width: 50%; text-align: left"
                       >
                       {{
                            prescription.dialysis_strainer?
@@ -822,9 +841,7 @@
                          }}
                       </div>
                     </div>
-
                   </div>
-
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -234,7 +234,7 @@
                       alt
                       srcset
                       v-else -->
-                      <span v-if="setAdminUserES(advices[0].advice_doctor) == ''">
+                      <!-- <span v-if="setAdminUserES(advices[0].advice_doctor) == ''">
                         {{ getAdminUser(advices[0].advice_doctor) }}
                       </span>
                       <img
@@ -244,7 +244,35 @@
                         alt
                         srcset
                         v-else
-                    />
+                    /> -->
+
+                    <span v-if="advices[0]&&advices[0].advice_doctor>0 == 0">
+                        <span v-if="setAdminUserES(prescription.creater) == ''">
+                          {{ getAdminUser(prescription.creater) }}
+                        </span>
+                        <img
+                          class="es-img"
+                          style="height: 30px"
+                          :src="setAdminUserES(prescription.creater)"
+                          alt
+                          srcset
+                          v-else
+                        />
+                       </span>
+
+                       <span v-if="advices[0]&&advices[0].advice_doctor>0">
+                        <span v-if="setAdminUserES(advices[0].advice_doctor) == ''">
+                          {{ getAdminUser(advices[0].advice_doctor) }}
+                        </span>
+                        <img
+                          class="es-img"
+                          style="height: 30px"
+                          :src="setAdminUserES(advices[0].advice_doctor)"
+                          alt
+                          srcset
+                          v-else
+                        />
+                       </span>
                   </div>
                 </td>
               </tr>
@@ -664,18 +692,61 @@
                     </div>
                     <div style="display: inline-block; margin-left: 30px;">
                       医生签名：
-                       
-                      <span v-if="setAdminUserES(advices[0].advice_doctor) == ''">
-                        {{ getAdminUser(advices[0].advice_doctor) }}
-                      </span>
-                      <img
-                        class="es-img"
-                        style="height: 30px"
-                        :src="setAdminUserES(advices[0].advice_doctor)"
-                        alt
-                        srcset
-                        v-else
-                      />
+                      <span v-if="advices[0]&&advices[0].advice_doctor>0 == 0">
+                        <span v-if="setAdminUserES(prescription.creater) == ''">
+                          {{ getAdminUser(prescription.creater) }}
+                        </span>
+                        <img
+                          class="es-img"
+                          style="height: 30px"
+                          :src="setAdminUserES(prescription.creater)"
+                          alt
+                          srcset
+                          v-else
+                        />
+                       </span>
+
+                       <span v-if="advices[0]&&advices[0].advice_doctor>0">
+                        <span v-if="setAdminUserES(advices[0].advice_doctor) == ''">
+                          {{ getAdminUser(advices[0].advice_doctor) }}
+                        </span>
+                        <img
+                          class="es-img"
+                          style="height: 30px"
+                          :src="setAdminUserES(advices[0].advice_doctor)"
+                          alt
+                          srcset
+                          v-else
+                        />
+                       </span>
+                       <!-- <span v-if="advices[0]&&advices[0].advice_doctor>0 == 0">
+                        <span v-if="setAdminUserES(prescription.creater) == ''">
+                          {{ getAdminUser(prescription.creater) }}
+                        </span>
+                        <img
+                          class="es-img"
+                          style="height: 30px"
+                          :src="setAdminUserES(prescription.creater)"
+                          alt
+                          srcset
+                          v-else
+                        />
+                       </span>
+
+                       <span v-if="advices[0]&&advices[0].advice_doctor>0">
+                        <span v-if="setAdminUserES(advices[0].advice_doctor) == ''">
+                          {{ getAdminUser(advices[0].advice_doctor) }}
+                        </span>
+                        <img
+                          class="es-img"
+                          style="height: 30px"
+                          :src="setAdminUserES(advices[0].advice_doctor)"
+                          alt
+                          srcset
+                          v-else
+                        />
+                       </span> -->
+                      
                     </div>
                     <div style="display: inline-block; margin-left: 70px;">
                       护士签名：

src/xt_pages/outpatientDoctorStation/template/printTenOne.vue

@@ -151,7 +151,7 @@
               srcset=""
             />
           </p>
-
+          <p style="line-height: 50px;" v-if="org_id==10217||org_id==0">打印日期：{{ getTime(new Date()) ? getTime(new Date()) : "" }}</p>
         </div>
         <div class="actionBar">
           <p >审核、调配：</p>

src/xt_pages/role/admin.vue

@@ -25,12 +25,12 @@
         >医药师登记</el-button>
 
 
-       <!-- <el-button
+       <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toJiaBan">加班</el-button> -->
+          @click="toJiaBan">首拼</el-button>
 
 
           <!-- <el-button

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

@@ -398,7 +398,7 @@ export default {
             //   list[i].drugIn = this.getDrugWarehouseInfoOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
             //   list[i].drugInMoney = this.getDrugInMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
             //   list[i].drugSaleMoney = this.getSaleMoneyOne(list[i].DrugWarehouseInfoStart,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].DrugWarehouseOutInfoStart,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].WareStartStockCancelInfo)
-              list[i].drugInMoney = "/"
+              list[i].drugInMoney = list[i].last_price
               list[i].drugSaleMoney = "/"
 
               list[i].drugAdd = this.drugAddInfo(list[i].DrugWarehouseInfoStartEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareStartEndStockInventoryProfit)
@@ -418,8 +418,12 @@ export default {
             //   list[i].overDrug = this.getDrugWarehouseInfo(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
             //   list[i].overDrugPrice =  this.getDrugInMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
             //   list[i].oveDrugSaleMoney =  this.getSaleMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
-            //  list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
-             list[i].overDrug = this.GetDrugOver(list[i].DrugStatFlow.over_count,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
+            if(this.org_id == 0 || this.org_id == 10265){
+              list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
+            }else{
+              list[i].overDrug = this.GetDrugOver(list[i].DrugStatFlow.over_count,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
+            }
+            
              list[i].overDrugPrice = "/"
              list[i].oveDrugSaleMoney = "/"
             }
@@ -1292,6 +1296,7 @@ export default {
           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 = this.tableList[i].dose + this.tableList[i].dose_unit +"*"+this.tableList[i].min_number + this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
+          // this.tableList[i].drugInMoney = this.tableList[i].last_price
 
         }
         import('@/vendor/Export2Excel').then(excel => {

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

@@ -328,8 +328,11 @@ export default {
                 //   list[i].overDrug = this.getDrugWarehouseInfo(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
                 //   list[i].overDrugPrice =  this.getDrugInMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
                 //   list[i].oveDrugSaleMoney =  this.getSaleMoney(list[i].DrugWarehouseInfoEnd,list[i].DrugWarehouseOutInfoEnd,list[i].min_number,list[i].min_unit,list[i].max_unit,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].WareEndStockCancelInfo)
-                // list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
-                list[i].overDrug = this.GetDrugOver(list[i].DrugStatFlow.over_count,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
+                if(this.org_id == 0 || this.org_id ==10265){
+                  list[i].overDrug = this.GetDrugEndFlow(list[i].DrugEndFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit)
+                }else{
+                  list[i].overDrug = this.GetDrugOver(list[i].DrugStatFlow.over_count,list[i].drugAddOne,list[i].drugOutOne,list[i].min_number,list[i].min_unit,list[i].max_unit)
+                }
                 list[i].overDrugPrice = "/"
                 list[i].oveDrugSaleMoney = "/"
             }

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -286,8 +286,13 @@ export default {
               // list[i].overStock= this.getEndWarehouseInfo(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
               // list[i].overPrice= this.getEndOverPrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
               // list[i].overMoney = this.getEndSalePrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
-              // list[i].overStock = list[i].GoodEndFlowInfo.over_count
-              list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
+              if(this.org_id == 10265 || this.org_id == 0){
+                list[i].overStock = list[i].GoodEndFlowInfo.over_count
+              }else{
+                list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
+              }
+            
+            
               list[i].overPrice = "/"
               list[i].overMoney = "/"
              
@@ -1015,6 +1020,7 @@ export default {
           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
+          // this.tableList[i].stock_in_price = this.tableList[i].buy_price
         }
         import('@/vendor/Export2Excel').then(excel => {
            const multiHeader = [['序号', '查询日期',' 耗材类型','耗材名称','规格&单位','生产产商','经销商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -188,8 +188,13 @@ export default {
                     // list[i].overStock= this.getEndWarehouseInfo(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
                     // list[i].overPrice= this.getEndOverPrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
                     // list[i].overMoney = this.getEndSalePrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
-                    // list[i].overStock = list[i].GoodEndFlowInfo.over_count
-                    list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
+                    if(this.org_id ==0 || this.org_id ==10265){
+                      list[i].overStock = list[i].GoodEndFlowInfo.over_count
+                    }else{
+                        list[i].overStock = list[i].stockIn + list[i].stockAdd - list[i].outStock
+                    } 
+                  
+                  
                     list[i].overPrice = "/"
                     list[i].overMoney = "/"
                 

src/xt_pages/workforce/components/tableData.vue

@@ -91,7 +91,6 @@
         </el-switch>
       </div>
     </div>
-
     <!-- <el-dialog :visible.sync="searchTableVisible" width="80%" class="eldialog">
       <div style="position: relative;">
         <el-table
@@ -267,7 +266,7 @@
         show-summary
         :cell-class-name="cellClass"
         sum-text="总数"
-        height="600"
+        height="calc(100vh - 150px)"
         ref="table"
         style="table-layout: fixed;"
       >
@@ -737,7 +736,7 @@
 </template>
 
 <script>
-import Drag from '@/utils/move.js';
+// import Drag from '@/utils/move.js';
 import { uParseTime } from "@/utils/tools";
 import print from 'print-js'
 const moment = require('moment')
@@ -793,7 +792,7 @@ export default {
   },
   data() {
     return {
-      // tableContainHeight:"calc(100% - 50px)",
+      // tableContainHeight:null,
       value1:false,
       modename_value:true,
       weeks:weekOptions,
@@ -931,27 +930,27 @@ export default {
   },
 
   watch: {
-    // schedule_type:function (){
-    //   this.isShowShangWu = false
-    //   this.isShowXiaWu = false
-    //   this.isShowWanShang = false
-    //   if(this.schedule_type.length > 0) {
-    //     for (let i = 0; i < this.schedule_type.length; i++) {
-    //       if (this.schedule_type[i] == 1) {
-    //         this.isShowShangWu = true
-    //       } else if (this.schedule_type[i] == 2) {
-    //         this.isShowXiaWu = true
-    //       } else if (this.schedule_type[i] == 3) {
-    //         this.isShowWanShang = true
-    //       }
-    //     }
-    //   }else{
-    //     this.isShowShangWu = true
-    //     this.isShowXiaWu = true
-    //     this.isShowWanShang = true
-    //   }
+     schedule_type:function (){
+       this.isShowShangWu = false
+      this.isShowXiaWu = false
+      this.isShowWanShang = false
+      if(this.schedule_type.length > 0) {
+        for (let i = 0; i < this.schedule_type.length; i++) {
+          if (this.schedule_type[i] == 1) {
+            this.isShowShangWu = true
+          } else if (this.schedule_type[i] == 2) {
+            this.isShowXiaWu = true
+          } else if (this.schedule_type[i] == 3) {
+            this.isShowWanShang = true
+          }
+        }
+      }else{
+        this.isShowShangWu = true
+        this.isShowXiaWu = true
+        this.isShowWanShang = true
+      }
 
-    // },
+    },
      week_type:function () {
       // console.log(this.week_type)
       // console.log(this.schedule_type)
@@ -3464,7 +3463,7 @@ textarea{
 }
 
 #table_data {
-  min-height: calc(100vh - 350px);
+  //min-height: calc(100vh - 350px);
   .switch{
     margin-left: 10px;
   }