新分支

src/api/role/admin.js

@@ -354,4 +354,13 @@ export function toAutoJiaYou(params){
     method:"get",
     params:params,
   })
+}
+
+export function GetFiledConfigList(params){
+  
+  return request({
+    url:"/api/device/getfieldconfiglist",
+    method:"Get",
+    params:params,
+  })
 }

src/xt_pages/dialysis/batch_print/batch_print_order_fortyOne.vue

@@ -637,6 +637,7 @@
                                 </tr>
 
                                 <tr v-for="(advice, advice_index) in record.advices" :key="advice_index">
+                                 
                                 <td height="30px" style="padding:4px 5px;">
                                     <span v-if="advice[0].start_time">
                                         {{ getTime(advice[0].start_time, "{h}:{i}") }}
@@ -1137,6 +1138,13 @@ export default {
           }
 
           console.log(' this.records[recordIndex].advices', this.records)
+            
+          for(let i=0;i<this.records.length;i++){
+            for(let j=0;j<this.records[i].advices.length;j++){
+              console.log("hahhahah",this.records[i].advices[j])
+            }
+          }
+
           this.operators = resp.data.medical_staffs
           if (this.operators.length > 0) {
             var operatorsLen = this.operators.length

src/xt_pages/dialysis/batch_print/batch_print_order_twentyFive.vue

@@ -451,6 +451,9 @@
                             <td width="80">
                             <label-box :isChecked="record.prescription.anticoagulant == 2 ? true : false" showValue="普通肝素:"></label-box>
                             </td>
+                            <td width="80">
+                            <label-box :isChecked="record.prescription.anticoagulant == 4 ? true : false" showValue="阿加曲班:"></label-box>
+                            </td>
                             <td width="35">首剂</td>
                             <td width="40">
                             <div class="under-line">

src/xt_pages/dialysis/details/consumable/signPrint.vue

@@ -100,7 +100,7 @@
                   <span>抗凝剂：{{ main_collection.dialysis_solution.anticoagulant ? anticoagulants_confit[main_collection.dialysis_solution.anticoagulant].name : ''}}</span>
                 </div>
                 <div class="printCell">
-                  <span>净重值：{{ main_collection.assessment_befor_dislysis.weight_before - main_collection.assessment_befor_dislysis.additional_weight }}Kg</span>
+                  <span>净重值：{{ (main_collection.assessment_befor_dislysis.weight_before - main_collection.assessment_befor_dislysis.additional_weight).toFixed(2) }}Kg</span>
                  首剂：<span v-if="main_collection.dialysis_solution.anticoagulant == 1">{{main_collection.dialysis_solution.anticoagulant_shouji}} mg</span>
                   <span v-if="main_collection.dialysis_solution.anticoagulant == 2">
                     {{main_collection.dialysis_solution.anticoagulant_shouji}}mg

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

@@ -3,7 +3,7 @@
         <el-dialog
                 title="透析处方"
                 :visible.sync="isVisibility"
-                width="68%"
+                width="72%"
                 :modal = 'false'
                 :modal-append-to-body="false"
                 :close-on-click-modal="false"

src/xt_pages/dialysis/details/index.vue

@@ -300,7 +300,7 @@
 
                 </div>
                 <div class="printCell" style="display:flex;">
-                  <span style="display: block;width: 45%;">净重值：{{ main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.additional_weight }}Kg</span>
+                  <span style="display: block;width: 45%;">净重值：{{ (main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.additional_weight).toFixed(2) }}Kg</span>
 
                   <span style="display: block;width: 50%;" v-if="org_id!=10598">
                     首剂： <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue

@@ -531,9 +531,12 @@
                   <td width="70">
                     <label-box :isChecked="prescription.anticoagulant == 1 ? true : false" showValue="无肝素"></label-box>
                   </td>
-                  <td width="80">
+                  <td width="100">
                     <label-box :isChecked="prescription.anticoagulant == 2 ? true : false" showValue="普通肝素:"></label-box>
                   </td>
+                  <td width="100">
+                    <label-box :isChecked="prescription.anticoagulant == 4 ? true : false" showValue="阿加曲班:"></label-box>
+                  </td>
                   <td width="35">首剂</td>
                   <td width="40">
                     <div class="under-line">

src/xt_pages/role/admin.vue

@@ -233,6 +233,13 @@
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toAutoDiagnose">自动脚本</el-button> -->
+
+        <!-- <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-circle-plus-outline"
+          style="float:left"
+          @click="toZiDuanJiaoBen">字段脚本</el-button> -->
      </div>
 
 
@@ -538,7 +545,7 @@
 
 <script>
 import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight,toTestNight,toTestTen,toTestElement,toTestThrityMent,saveEnterprise,getEnterPriseById,getMobileCode,savePersionEnterPrise,getPerseEnterPriseById,CreatePersionSeal,CreateNewEnterPrise,toTestThrity,toEndEnterPrise,getEnterPriseDetail
-  ,CreateQianshuUserName,CreateSKDSendInformation,toSavePDFInformation,toCheckPDFInformation,getdruginfoInformation,toAutoDrug,toAutoDiagnose,toAutoJiaYou} from "@/api/role/admin";
+  ,CreateQianshuUserName,CreateSKDSendInformation,toSavePDFInformation,toCheckPDFInformation,getdruginfoInformation,toAutoDrug,toAutoDiagnose,toAutoJiaYou,GetFiledConfigList} from "@/api/role/admin";
 import { getRoles } from "@/api/role/role";
 import { UploadPrintOrder } from "@/api/role/admin"
 import { parseTime } from "@/utils";
@@ -1211,6 +1218,14 @@ export default {
       toAutoJiaYou().then(response=>{
 
       })
+    },
+    toZiDuanJiaoBen(){
+      GetFiledConfigList().then(response=>{
+        if(response.data.state ==1){
+         var msg = response.data.data.msg
+         this.$message.success("脚本成功")
+        }
+      })
     }
 
   },

src/xt_pages/workforce/components/tableWeeks.vue

@@ -886,7 +886,7 @@
       },
       signPrint() {
 //
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340  || this.org_id == 10375 || this.org_id ==10517){
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340  || this.org_id == 10375 || this.org_id ==10517 || this.org_id ==0){
          var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []
@@ -905,7 +905,7 @@
             path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1+"&ids="+this.ids
           })
         }
-        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340  && this.org_id!=10375 && this.org_id!=10469 && this.org_id!=10517){
+        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340  && this.org_id!=10375 && this.org_id!=10469 && this.org_id!=10517 && this.org_id!=0){
           var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -209,7 +209,7 @@
               
                 </div>
 
-                <div class="printCell" v-if="org_id!=9671">
+                <!-- <div class="printCell" v-if="org_id!=9671 && org_id!=10375  && org_id!=0">
                   维持：{{main_collection.prescription.anticoagulant_weichi}}
                    <span v-if="main_collection.prescription.anticoagulant == 1">
                     mg/h
@@ -263,7 +263,7 @@
                     mg/h
                    </span>
               
-                </div>
+                </div> -->
                
                 <div class="printCell" v-if="org_id!=9671">
                   总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
@@ -392,13 +392,13 @@
                 </div>
                 <div class="printCell">
                    透析器:
-                    <span v-if="org_id!=10375">
+                    <span v-if="org_id!=10375 && org_id!=0 && org_id!=10517">
                       <span v-if="type ==1">{{main_collection.dialysis_order.dialysis_dialyszers}} </span>
                       <span v-if="type ==2">{{main_collection.dialysis_order.dialysis_dialyszers}} </span>
                     </span>
                    
 
-                    <span v-if="org_id ==10375">
+                    <span v-if="org_id ==10375 || org_id == 0 || org_id == 10517">
                       <span v-if="type ==1">{{main_collection.dialysissolution.dialysis_dialyszers}} </span>
                       <span v-if="type ==2">{{main_collection.dialysissolution.dialysis_dialyszers}} </span>
                     </span>
@@ -406,13 +406,13 @@
                 </div>
                 <div class="printCell">
                    灌流器:
-                   <span v-if="org_id!=10375">
+                   <span v-if="org_id!=10375 && org_id!=0 && org_id!=10517">
                     <span v-if="type ==1">{{main_collection.dialysis_order.dialysis_irrigation}} </span>
                     <span v-if="type ==2">{{main_collection.dialysis_order.dialysis_irrigation}} </span>
                    </span>
                  
 
-                    <span v-if="org_id == 10375"> 
+                    <span v-if="org_id == 10375 || org_id == 0 || org_id == 10517"> 
                       <span v-if="type ==1">{{main_collection.dialysissolution.dialysis_irrigation}} </span>
                       <span v-if="type ==2">{{main_collection.dialysissolution.dialysis_irrigation}} </span>
                     </span>