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

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/hospitalStation/invoiceTemplate/printfour.vue

@@ -4,136 +4,132 @@
         <span>个人编号:</span>
       </div>
       <div style="">
-        <div style="text-align: center;margin-bottom: 10px;">武穴市中医医院</div>
+        <div style="text-align: center;margin-bottom: 10px;">武穴源生堂血液透析中心</div>
           <!-- <div style="position: absolute;top:70px;left:70px;">{{ list.order_number }}</div> -->
           <!-- <div>{{ list.id_card_no }}</div> -->
       </div>
       <div style="display:flex;">
-          <div style="flex: 1;">医疗人员类别:</div>
-          <div style="flex: 1;">支付类别:城乡居民基本</div>
-          <div style="flex: 1;">医疗照顾人员:</div>
+          <div style="width: 300px;">医疗人员类别:</div>
+          <div style="width: 300px;">支付类别:城乡居民基本</div>
+          <div style="width: 300px;">医疗照顾人员:</div>
       </div>
       <div style="display:flex;margin: 10px 0;">
-          <div style="flex: 1;">{{ paramsObj.name }}</div>
-          <div style="flex: 1;"></div>
-          <div style="flex: 1;"></div>
+          <div style="width: 300px;">{{ paramsObj.name }}</div>
+          <div style="width: 300px;"></div>
+          <div style="width: 300px;"></div>
       </div>
       <div style="display:flex;">
-          <div style="flex: 1;">{{in_hosptial_time?in_hosptial_time.split(' ')[0]:''}}</div>
-          <div style="flex: 1;">{{out_hosptial_time?out_hosptial_time.split(' ')[0]:''}}</div>
-          <div style="flex: 1;"></div>
+          <div style="width: 300px;">{{in_hosptial_time?in_hosptial_time.split(' ')[0]:''}}</div>
+          <div style="width: 300px;">{{out_hosptial_time?out_hosptial_time.split(' ')[0]:''}}</div>
+          <div style="width: 300px;"></div>
       </div>
       <div style="display:flex;margin-top: 30px;">
-        <div style="flex: 1;">床位费</div>
-        <div style="flex: 1;">{{ list.bedCostTotal }}</div>
-        <div style="flex: 1;">治疗费</div>
-        <div style="flex: 1;">{{ list.treatCostTotal}}</div>
-        <div style="flex: 1;">西药费</div>
-        <div style="flex: 1;">{{ list.westernMedicineCostTotal }}</div>
-        <div style="flex: 1;">
-          <span >草药费</span>
-        </div>
-        <div style="flex: 1;">
-          <span >
-            0
-          </span>
+        <div style="width: 150px;">床位费 {{ list.bedCostTotal ? list.bedCostTotal :'0' }}</div>
+        <div style="width: 150px;margin:0 30px;">治疗费 {{ list.treatCostTotal ? list.treatCostTotal :'0'}}</div>
+        <div style="width: 150px;margin:0 30px;">西药费 {{ list.westernMedicineCostTotal }}</div>
+        <div style="width: 150px;margin:0 30px;">
+          <span >草药费 0</span>
         </div>
       </div>
       <div style="display:flex;margin-top: 10px;">
-        <div style="flex: 1;">
-          <span >护理费</span>
-        </div>
-        <div style="flex: 1;">
-          <span>
-            0
-          </span>
-        </div>
-        <div style="flex: 1;">中成药</div>
-        <div style="flex: 1;">{{ list.chineseTraditionalMedicineCostTotal }}</div>
-        <div style="flex: 1;">化验费</div>
-        <div style="flex: 1;">{{ list.laboratoryCostTotal }}</div>
-        <div style="flex: 1;">手术费</div>
-        <div style="flex: 1;">{{ list.operationCostTotal }}</div>
+        <div style="width: 150px;"><span >护理费</span> 0</div>
+        <div style="width: 150px;margin:0 30px;">中成药 {{ list.chineseTraditionalMedicineCostTotal }}</div>
+        <div style="width: 150px;margin:0 30px;">化验费 {{ list.laboratoryCostTotal }}</div>
+        <div style="width: 150px;margin:0 30px;">手术费 {{ list.operationCostTotal }}</div>
       </div>
       <div style="display:flex;margin-top: 10px;">
-        <div style="flex: 1;">检查费</div>
-        <div style="flex: 1;">{{ list.checkCostTotal }}</div>
-        <div style="flex: 1;">材料费</div>
-        <div style="flex: 1;">{{ list.materialCostTotal}}</div>
-        <div style="flex: 1;">其他费</div>
-        <div style="flex: 1;">{{ list.otherCostTotal }}</div>
-        <div style="flex: 1;">
-        </div>
-        <div style="flex: 1;">
-        </div>
+        <div style="width: 150px;">检查费 {{ list.checkCostTotal }}</div>
+        <div style="width: 150px;margin:0 30px;">材料费 {{ list.materialCostTotal}}</div>
+        <div style="width: 150px;margin:0 30px;">其他费 {{ list.otherCostTotal }}</div>
       </div>
-      <div style="position: absolute;top:260px;left:540px">
+      <div style="position: absolute;top:220px;left:540px">
         {{ totalPrice }}
       </div>
 
-      <div style="position: absolute;top:290px;width: 100%;">
+      <div style="position: absolute;top:250px;width: 100%;">
         <div style="display: flex;">
-          <div style="flex: 1;"> 费用总额：</div>
-          <div style="flex: 1;">{{totalPrice?totalPrice:'0'}}</div>
-          <div style="flex: 1;">基本医疗统筹范围:</div>
-          <div style="flex: 1;"> {{list.order.hifp_pay?list.order.hifp_pay:'0'}}</div>
-          <div style="flex: 1;">自费费用:</div>
-          <div style="flex: 1;">{{ list.order.psn_cash_pay?list.order.psn_cash_pay:'0' }}</div>
-          <div style="flex: 1;">医院优惠:</div>
-          <div style="flex: 1;">0</div>
+          <div style="width: 230px;"> 费用总额：{{totalPrice?totalPrice:'0'}}</div>
+          <div style="width: 230px;margin-left: 20px;">
+            基本医疗统筹范围:
+            {{list.order.hifp_pay?list.order.hifp_pay:'0'}}
+          </div>
+          <div style="width: 230px;margin-left: 20px;">
+            自费费用:
+            {{ list.order.psn_cash_pay?list.order.psn_cash_pay:'0' }}
+          </div>
+          <div style="width: 230px;margin-left: 20px;">医院优惠: 0</div>
         </div>
       </div>
-      <div style="position: absolute;top:320px;width: 100%;">
+      <div style="position: absolute;top:270px;width: 100%;">
         <div style="display: flex;">
-          <div style="flex: 1;">报销总额:</div>
-          <div style="flex: 1;">{{ list.order.fund_pay_sumamt ? list.order.fund_pay_sumamt :'0'}}</div>
-          <div style="flex: 1;">统筹支付:</div>
-          <div style="flex: 1;"> {{list.order.hifp_pay?list.order.hifp_pay:'0'}}</div>
-          <div style="flex: 1;">公务员补助:</div>
-          <div style="flex: 1;">{{ list.order.cvlserv_pay?list.order.cvlserv_pay:'0' }}</div>
-          <div style="flex: 1;">居民大病支付:</div>
-          <div style="flex: 1;">{{list.order.hifmi_pay?list.order.hifmi_pay:'0' }}</div>
+          <div style="width: 230px;">
+            报销总额:
+            {{ list.order.fund_pay_sumamt ? list.order.fund_pay_sumamt :'0'}}
+          </div>
+          <div style="width: 230px;margin-left: 20px;">
+            统筹支付:
+            {{list.order.hifp_pay?list.order.hifp_pay:'0'}}
+          </div>
+          <div style="width: 230px;margin-left: 20px;">
+            公务员补助:
+            {{ list.order.cvlserv_pay?list.order.cvlserv_pay:'0' }}
+          </div>
+          <div style="width: 230px;margin-left: 20px;">
+            居民大病支付:
+            {{list.order.hifmi_pay?list.order.hifmi_pay:'0' }}
+          </div>
         </div>
       </div>
-
-      <div style="position: absolute;top:350px;width: 100%;">
+      <div style="position: absolute;top:290px;width: 100%;">
         <div style="display: flex;">
-          <div style="flex: 1;">职工大病支付:</div>
-          <div style="flex: 1;">{{list.order.hifob_pay?list.order.hifob_pay:'0'}}</div>
-          <div style="flex: 1;">医院承担:</div>
-          <div style="flex: 1;"> {{list.order.hosp_part_amt ? list.order.hosp_part_amt :'0'}}</div>
-          <div style="flex: 1;">医疗救助:</div>
-          <div style="flex: 1;">{{ list.order.maf_pay?list.order.maf_pay:'0' }}</div>
-          <div style="flex: 1;">企业补充:</div>
-          <div style="flex: 1;">{{list.order.hifes_pay ? list.order.hifes_pay :'0'}}</div>
+          <div style="width: 230px;">
+            职工大病支付:
+            {{list.order.hifob_pay?list.order.hifob_pay:'0'}}
+          </div>
+          <div style="width: 230px;margin-left: 20px;">
+            医院承担:
+            {{list.order.hosp_part_amt ? list.order.hosp_part_amt :'0'}}
+          </div>
+          <div style="width: 230px;margin-left: 20px;">
+            医疗救助:{{ list.order.maf_pay?list.order.maf_pay:'0' }}
+          </div>
+          <div style="width: 230px;margin-left: 20px;">
+            企业补充:{{list.order.hifes_pay ? list.order.hifes_pay :'0'}}
+          </div>
         </div>
       </div>
-
-      <div style="position: absolute;top:380px;width: 100%;">
+      <div style="position: absolute;top:310px;width: 100%;">
         <div style="display: flex;">
-          <div style="flex: 1;">其他资金:</div>
-          <div style="flex: 1;">{{list.order.oth_pay ? list.order.oth_pay :'0' }}</div>
-          <div style="flex: 1;">应付费用:</div>
-          <div style="flex: 1;">{{list.order.psn_cash_pay?list.order.psn_cash_pay : '0'}}</div>
-          <div style="flex: 1;">预缴金:</div>
-          <div style="flex: 1;">{{(parseFloat(pre_pay_money) + parseFloat(list.order.decimal)).toFixed(2) }}</div>
-          <div style="flex: 1;">个人账户支付:</div>
-          <div style="flex: 1;">{{list.order.acct_pay?list.order.acct_pay:'0' }}</div>
+          <div style="width: 230px;">
+            其他资金:
+            {{list.order.oth_pay ? list.order.oth_pay :'0' }}
+          </div>
+          <div style="width: 230px;margin-left: 20px;">
+            应付费用:{{list.order.psn_cash_pay?list.order.psn_cash_pay : '0'}}
+          </div>
+          <div style="width: 230px;margin-left: 20px;">
+            预缴金:{{(parseFloat(pre_pay_money) + parseFloat(list.order.decimal)).toFixed(2) }}
+          </div>
+          <div style="width: 230px;margin-left: 20px;">
+            个人账户支付:{{list.order.acct_pay?list.order.acct_pay:'0' }}
+          </div>
         </div>
       </div>
-
-      <div style="position: absolute;top:410px;width: 100%;">
+      <div style="position: absolute;top:330px;width: 100%;">
         <div style="display: flex;">
-          <div style="flex: 1;">支付后账户余额:</div>
-          <div style="flex: 1;">{{list.order.balc ? list.order.balc :'0'}}</div>
-          <div style="flex: 1;">应收:</div>
-          <div style="flex: 1;">{{list.order.psn_cash_pay?list.order.psn_cash_pay : '0'}}</div>
-          <div style="flex: 1;">优抚账户:</div>
-          <div style="flex: 1;">0</div>
-          <div style="flex: 1;">优抚支付:</div>
-          <div style="flex: 1;">0</div>
+          <div style="width: 230px;">
+            支付后账户余额:{{list.order.balc ? list.order.balc :'0'}}
+          </div>
+          <div style="width: 230px;margin-left: 20px;">
+            应收:{{list.order.psn_cash_pay?list.order.psn_cash_pay : '0'}}
+          </div>
+          <div style="width: 230px;margin-left: 20px;">优抚账户:0</div>
+          <div style="width: 230px;margin-left: 20px;">优抚支付:0</div>
         </div>
       </div>
+      <div style="position: absolute;top:350px;left: 540px;">
+        {{ list.charge_admin_name }}
+      </div>
   </div>
 </template>
 

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>