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

src/xt_pages/dialysis/batch_print/batch_print_order_forty.vue

@@ -311,11 +311,12 @@
                         <tbody>
                         <tr>
                             <td width="70">穿刺方式:</td>
-                            <td width="220">
+                            <td width="250">
                             <div>
                               <label-box showValue="绳梯" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('绳梯')>-1 ? true : false"></label-box>&nbsp;
                               <label-box showValue="定点" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('定点')>-1 ? true : false"></label-box>&nbsp;
-                              <label-box showValue="直接穿刺" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('直接穿刺')>-1 ? true:false"></label-box>&nbsp;             
+                              <label-box showValue="直接穿刺" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('直接穿刺')>-1 ? true:false"></label-box>&nbsp;   
+                              <label-box showValue="扣眼" :isChecked="record.assessment_before_dislysis.puncture_way.indexOf('扣眼')>-1 ? true:false"></label-box>&nbsp;                       
                             </div>
                             </td>
                            <td width="60"></td>
@@ -946,16 +947,17 @@
                             </td>
                             <td width="35">min</td>
                             <td width="60">去向</td>
-                            <td width="200">
+                            <td width="250">
                             <div style="display:flex;justify-content:space-between;">
                                 <label-box :isChecked="record.assessment_after_dislysis.patient_gose == 1 ? true : false" showValue="回家"></label-box>
                                 <label-box :isChecked="record.assessment_after_dislysis.patient_gose == 2 ? true : false" showValue="留观"></label-box>
                                 <label-box :isChecked="record.assessment_after_dislysis.patient_gose == 3 ? true : false" showValue="住院"></label-box>
+                                <label-box :isChecked="record.assessment_after_dislysis.patient_gose == 4 ? true : false" showValue="门诊"></label-box>
                              </div>
                              </td>
-                              <td>
+                              <!-- <td>
                                  <div class="under-line">&nbsp;</div>
-                              </td>
+                              </td> -->
                             </tr>
                             </tbody>
                         </table>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -552,6 +552,10 @@
           width="100"
         ></el-table-column>
 
+        <el-table-column label="透前血压(kg)" align="center" width="120" prop="pressure_name">
+          
+        </el-table-column>
+
         <el-table-column
           prop="dry_weight"
           label="干体重(kg)"
@@ -564,6 +568,7 @@
           align="center"
           width="120"
         ></el-table-column>
+
         <el-table-column
           prop="dialysis_after_weight"
           label="透后称重(kg)"
@@ -1566,7 +1571,7 @@ export default {
         } else {
           this.loading = false;
           this.total = response.data.data.total;
-          console.log(response.data.data.schedule)
+          console.log("世界文化遗产",response.data.data.schedule)
           for (let i = 0; i < response.data.data.schedule.length; i++) {
 
             if (response.data.data.schedule[i].patient&&response.data.data.schedule[i].patient.id > 0) {
@@ -1614,6 +1619,14 @@ export default {
                 SchedualPatientsTable["dialysis_after_weight"] =response.data.data.schedule[i].assessment_after_dislysis.weight_after;
               }
 
+
+              if (response.data.data.schedule[i].assessment_before_dislysis != null) {
+                SchedualPatientsTable["pressure_name"] =response.data.data.schedule[i].assessment_before_dislysis.systolic_blood_pressure+"/"+ response.data.data.schedule[i].assessment_before_dislysis.diastolic_blood_pressure;
+              }
+           
+
+
+
               if(response.data.data.schedule[i].monitoring_record!=null &&response.data.data.schedule[i].monitoring_record.length >0 ){
                  SchedualPatientsTable["monitoring_record"]  = response.data.data.schedule[i].monitoring_record
               }

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

@@ -710,6 +710,34 @@
           </el-input>
         </el-form-item>
       </el-form>
+      <!-- 六次干体重调整记录 -->
+      <!-- <div  style="margin: 10px 50px;"><span style="font-weight: bold;">近六次干体重调整记录</span></div>
+      <div class="gantizhong">
+        <el-table
+          :data="tableData"
+          stripe
+          style="width: 100%">
+          <el-table-column
+            prop=""
+            label="时间"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop=""
+            label="干体重"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop=""
+            label="医生"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop=""
+            label="备注">
+          </el-table-column>
+        </el-table>
+      </div> -->
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancleDryWeight()">取 消</el-button>
         <el-button type="primary" @click="submitDryWeight()">保 存</el-button>
@@ -1667,6 +1695,9 @@
     margin-bottom: 10px;
     color:#fff;
   }
+  .gantizhong{
+    text-align: center;
+  }
 </style>
 <style lang="scss">
   .newDialog{

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -382,6 +382,7 @@
                       <label-box showValue="绳梯" :isChecked="predialysis.puncture_way.indexOf('绳梯')>-1 ? true : false"></label-box>&nbsp;
                       <label-box showValue="定点" :isChecked="predialysis.puncture_way.indexOf('定点')>-1 ? true : false"></label-box>&nbsp;
                       <label-box showValue="直接穿刺" :isChecked="predialysis.puncture_way.indexOf('直接穿刺')>-1 ? true:false"></label-box>&nbsp;
+                      <label-box showValue="扣眼" :isChecked="predialysis.puncture_way.indexOf('扣眼')>-1 ? true : false"></label-box>&nbsp;
                     </div>
                   </td>
                   <td width='20'></td>
@@ -1310,16 +1311,17 @@
                     </td>
                     <td width="20">min</td>
                     <td width="50">去向:</td>
-                      <td width="200">
+                      <td width="250">
                         <div style="display:flex;justify-content:space-between;">
                           <label-box :isChecked="afterdialysis.patient_gose == 1 ? true : false" showValue="回家"></label-box>
                           <label-box :isChecked="afterdialysis.patient_gose == 2 ? true : false" showValue="留观"></label-box>
                           <label-box :isChecked="afterdialysis.patient_gose == 3 ? true : false" showValue="住院"></label-box>
+                          <label-box :isChecked="afterdialysis.patient_gose == 4 ? true : false" showValue="门诊"></label-box>
                         </div>
                       </td>
-                      <td>
+                      <!-- <td>
                         <div class="under-line">&nbsp;</div>
-                      </td>
+                      </td> -->
                   </tr>
                   </tbody>
                 </table>

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -24,7 +24,7 @@
           :paramsObj="invoiceParams"
         ></printOne>
         <printTwo
-          v-if="org_id == 10215 "
+          v-if="org_id == 10215||org_id == 0"
           :paramsObj="invoiceParams"
         ></printTwo>
         <printThree

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

@@ -269,7 +269,7 @@
           </span>
         </span>
         <span style="position: absolute; top: 235px; left: 500px">{{
-          totalPrice.toFixed(2)
+          totalPrice
         }}</span>
       </div>
       <!-- <div style="position: absolute;top:300px;left:460px">现金：{{ list.psn_cash_money }}</div> -->
@@ -326,17 +326,7 @@ export default {
       getInvoice(params).then((res) => {
         this.$nextTick(() => {
           this.list = res.data.data;
-          this.totalPrice =
-            this.list.westernMedicineCostTotal +
-            this.list.checkCostTotal +
-            this.list.treatCostTotal +
-            this.list.bedCostTotal +
-            this.list.chineseTraditionalMedicineCostTotal +
-            this.list.laboratoryCostTotal +
-            this.list.operationCostTotal +
-            this.list.otherCostTotal +
-            this.list.materialCostTotal +
-            this.list.zhenChaCostTotal;
+          this.totalPrice =this.list.order.medfee_sumamt
           this.smalltoBIG(this.list.order.medfee_sumamt);
           var data = new Date(res.data.data.date * 1000);
           var month =

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -395,139 +395,7 @@
       searchAction() {
       },
       getInfo(order_id, obj) {
-        if( this.org_id  == 0){
-          console.log("12222444444")
-          let params = {
-            his_patient_id: obj.his_patient_id,
-            id: obj.order_id,
-            order_id: obj.order_id,
-            admin_user_id: this.$store.getters.xt_user.user.id,
-          };
-          getPrivateExpensesTwo(params).then((response) => {
-            if (response.data.state == 0) {
-              // this.$message.error(response.data.msg)
-
-              return false;
-            } else {
-              var that = this;
-              that.info = response.data.data.info;
-              that.info["p_admin"] = that.p_admin;
-              that.info["charge_admin"] = that.charge_admin;
-              that.info["order_number"] = response.data.data.order_number;
-              that.info["number"] = response.data.data.number;
-              that.info["fixmedins_name"] = response.data.data.org_name;
-              that.info["fixmedins_code"] = response.data.data.org_code;
-              that.info["bed_cost_total"] = response.data.data.bedCostTotal;
-              that.info["bed_cost_self_total"] =
-                response.data.data.bedCostSelfTotal;
-              that.info["bed_cost_part_self_total"] =
-                response.data.data.bedCostPartSelfTotal;
-
-              that.info["bedInscpTotal"] =
-                response.data.data.bedInscpTotal;
-              that.info["bedSelfTotal"] =
-                response.data.data.bedSelfTotal;
-
-
-              that.info["operationInscpTotal"] =
-                response.data.data.operationInscpTotal;
-              that.info["operationSelfTotal"] =
-                response.data.data.operationSelfTotal;
-
-              that.info["checkInscpTotal"] =
-                response.data.data.checkInscpTotal;
-              that.info["checkSelfTotal"] =
-                response.data.data.checkSelfTotal;
-
-              that.info["treatInscpTotal"] =
-                response.data.data.treatInscpTotal;
-              that.info["treatSelfTotal"] =
-                response.data.data.treatSelfTotal;
-
-
-              that.info["laboratoryInscpTotal"] =
-                response.data.data.laboratoryInscpTotal;
-              that.info["laboratorySelfTotal"] =
-                response.data.data.laboratorySelfTotal;
-
-
-              that.info["westernMedicineInscpTotal"] =
-                response.data.data.westernMedicineInscpTotal;
-              that.info["westernMedicineSelfTotal"] =
-                response.data.data.westernMedicineSelfTotal;
-
-              that.info["materialInscpTotal"] =
-                response.data.data.materialInscpTotal;
-              that.info["materialSelfTotal"] =
-                response.data.data.materialSelfTotal;
-
-              that.info["chineseTraditionalInscpTotal"] =
-                response.data.data.chineseTraditionalInscpTotal;
-              that.info["chineseTraditionalSelfTotal"] =
-                response.data.data.chineseTraditionalSelfTotal;
-
-              that.info["otherInscpTotal"] =
-                response.data.data.otherInscpTotal;
-              that.info["otherSelfTotal"] =
-                response.data.data.otherSelfTotal;
-
-              that.info["operation_cost_total"] =
-                response.data.data.operationCostTotal;
-              that.info["operation_cost_self_total"] =
-                response.data.data.operationCostSelfTotal;
-              that.info["operation_cost_part_self_total"] =
-                response.data.data.operationCostPartSelfTotal;
-
-              that.info["other_cost_total"] = response.data.data.otherCostTotal;
-              that.info["other_cost_self_total"] =
-                response.data.data.otherCostSelfTotal;
-              that.info["other_cost_part_self_total"] =
-                response.data.data.otherCostPartSelfTotal;
-
-              that.info["material_cost_total"] =
-                response.data.data.materialCostTotal;
-              that.info["material_cost_self_total"] =
-                response.data.data.materialCostSelfTotal;
-              that.info["material_cost_part_self_total"] =
-                response.data.data.materialCostPartSelfTotal;
-
-              that.info["western_medicine_cost_total"] =
-                response.data.data.westernMedicineCostTotal;
-              that.info["western_medicine_cost_self_total"] =
-                response.data.data.westernMedicineCostSelfTotal;
-              that.info["western_medicine_cost_part_self_total"] =
-                response.data.data.westernMedicineCostPartSelfTotal;
-
-              that.info["chinese_traditional_medicine_cost_total"] =
-                response.data.data.chineseTraditionalMedicineCostTotal;
-              that.info["chinese_traditional_medicine_cost_self_total"] =
-                response.data.data.chineseTraditionalMedicineCostSelfTotal;
-              that.info["chinese_traditional_medicine_cost_part_self_total"] =
-                response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
-
-              that.info["check_cost_total"] = response.data.data.checkCostTotal;
-              that.info["check_cost_self_total"] =
-                response.data.data.checkCostSelfTotal;
-              that.info["check_cost_part_self_total"] =
-                response.data.data.checkCostPartSelfTotal;
-
-              that.info["laboratory_cost_total"] =
-                response.data.data.laboratoryCostTotal;
-              that.info["laboratory_cost_self_total"] =
-                response.data.data.laboratoryCostSelfTotal;
-              that.info["laboratory_cost_part_self_total"] =
-                response.data.data.laboratoryCostPartSelfTotal;
-
-              that.info["treat_cost_total"] = response.data.data.treatCostTotal;
-              that.info["treat_cost_self_total"] =
-                response.data.data.treatCostSelfTotal;
-              that.info["treat_cost_part_self_total"] =
-                response.data.data.treatCostPartSelfTotal;
-              console.log(that.info)
 
-            }
-          });
-        }else{
           if (obj.balance_accounts_type == 2 ) {
             let params = {
               his_patient_id: obj.his_patient_id,
@@ -1387,7 +1255,7 @@
             }
           }
 
-        }
+
 
       },
     },

src/xt_pages/outpatientCharges/statementTemplate/privateChargePrint.vue

@@ -93,13 +93,13 @@
       </tr>
       <tr>
         <td>床位费</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.bed_cost_self_total}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_part_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_total.toFixed(2)}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.bed_cost_self_total.toFixed(2)}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_part_self_total.toFixed(2)}}</td>
         <td>西成药</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_self_total}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_part_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_total.toFixed(2)}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_self_total.toFixed(2)}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_part_self_total.toFixed(2)}}</td>
       </tr>
       <tr>
         <td>中药费</td>
@@ -107,11 +107,11 @@
         <td style="text-align:right;padding-right:10px;">0</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
         <td>中成药</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_total}}
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_total.toFixed(2)}}
         </td>
-        <td style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_self_total.toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">
-          {{info.chinese_traditional_medicine_cost_part_self_total}}
+          {{info.chinese_traditional_medicine_cost_part_self_total.toFixed(2)}}
         </td>
       </tr>
       <tr>
@@ -120,15 +120,15 @@
         <td style="text-align:right;padding-right:10px;">0</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
         <td>检查费</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.check_cost_self_total}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_part_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_total.toFixed(2)}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.check_cost_self_total.toFixed(2)}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_part_self_total.toFixed(2)}}</td>
       </tr>
       <tr>
         <td>治疗费</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.treat_cost_self_total}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_part_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_total.toFixed(2)}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.treat_cost_self_total.toFixed(2)}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_part_self_total.toFixed(2)}}</td>
         <td>放射费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
         <td style="text-align:right;padding-right:10px;">0</td>
@@ -136,13 +136,13 @@
       </tr>
       <tr>
         <td>手术费</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.operation_cost_self_total}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_part_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_total.toFixed(2)}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.operation_cost_self_total.toFixed(2)}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_part_self_total.toFixed(2)}}</td>
         <td>化验费</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.laboratory_cost_self_total}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_part_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_total.toFixed(2)}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.laboratory_cost_self_total.toFixed(2)}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_part_self_total.toFixed(2)}}</td>
       </tr>
       <tr>
         <td>输血费</td>
@@ -156,9 +156,9 @@
       </tr>
       <tr>
         <td>其他</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.other_cost_self_total}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_part_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_total.toFixed(2)}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.other_cost_self_total.toFixed(2)}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_part_self_total.toFixed(2)}}</td>
         <td>麻醉费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
         <td style="text-align:right;padding-right:10px;">0</td>
@@ -166,9 +166,9 @@
       </tr>
       <tr>
         <td>材料费</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.material_cost_self_total}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_part_self_total}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_total.toFixed(2)}}</td>
+        <td style="text-align:right;padding-right:10px;">{{info.material_cost_self_total.toFixed(2)}}</td>
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_part_self_total.toFixed(2)}}</td>
         <td>特殊检查费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
         <td style="text-align:right;padding-right:10px;">0</td>
@@ -186,24 +186,24 @@
       </tr>
       <tr>
         <td>合计</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_total) +
-            parseFloat(info.operation_cost_total) + parseFloat(info.other_cost_total) +
-            parseFloat(info.material_cost_total) + parseFloat(info.western_medicine_cost_total) +
-            parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
-            parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total)).toFixed(2) }}
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_total.toFixed(2)) +
+            parseFloat(info.operation_cost_total.toFixed(2)) + parseFloat(info.other_cost_total.toFixed(2)) +
+            parseFloat(info.material_cost_total.toFixed(2)) + parseFloat(info.western_medicine_cost_total.toFixed(2)) +
+            parseFloat(info.chinese_traditional_medicine_cost_total.toFixed(2)) + parseFloat(info.check_cost_total.toFixed(2)) +
+            parseFloat(info.laboratory_cost_total.toFixed(2)) + parseFloat(info.treat_cost_total.toFixed(2))).toFixed(2) }}
         </td>
-        <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+
-            parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
-            parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
-            parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
-            parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total)).toFixed(2)}}
+        <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total.toFixed(2) )+
+            parseFloat(info.operation_cost_self_total.toFixed(2)) + parseFloat(info.other_cost_self_total.toFixed(2)) +
+            parseFloat(info.material_cost_self_total.toFixed(2)) + parseFloat(info.western_medicine_cost_self_total.toFixed(2)) +
+            parseFloat(info.chinese_traditional_medicine_cost_self_total.toFixed(2)) + parseFloat(info.check_cost_self_total.toFixed(2)) +
+            parseFloat(info.laboratory_cost_self_total.toFixed(2)) + parseFloat(info.treat_cost_self_total.toFixed(2))).toFixed(2)}}
         </td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) +
-            parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +
-            parseFloat(info.material_cost_part_self_total) + parseFloat(info.western_medicine_cost_part_self_total) +
-            parseFloat(info.chinese_traditional_medicine_cost_part_self_total) +
-            parseFloat(info.check_cost_part_self_total) + parseFloat(info.laboratory_cost_part_self_total) +
-            parseFloat(info.treat_cost_part_self_total)).toFixed(2)}}
+        <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total.toFixed(2)) +
+            parseFloat(info.operation_cost_part_self_total.toFixed(2)) + parseFloat(info.other_cost_part_self_total.toFixed(2)) +
+            parseFloat(info.material_cost_part_self_total.toFixed(2)) + parseFloat(info.western_medicine_cost_part_self_total.toFixed(2)) +
+            parseFloat(info.chinese_traditional_medicine_cost_part_self_total.toFixed(2)) +
+            parseFloat(info.check_cost_part_self_total.toFixed(2)) + parseFloat(info.laboratory_cost_part_self_total.toFixed(2)) +
+            parseFloat(info.treat_cost_part_self_total.toFixed(2))).toFixed(2)}}
         </td>
         <td style="text-align:right;padding-right:10px;"></td>
         <td colspan="2" style="text-align:right;padding-right:10px;"></td>

src/xt_pages/workforce/appointment.vue

@@ -720,6 +720,7 @@ export default {
     changeZone(val){
     },
     setScheduleTemplateAction: function () {
+      this.schedulingTableVisible=true
       this.$router.push({path: '/workforce/template'})
     },
     export_file: function () {
@@ -2021,7 +2022,8 @@ export default {
           break
       }
 
-    }, getDateByResultsStr(key) {
+    }, 
+    getDateByResultsStr(key) {
 
       switch (key) {
         case '周一' + "(" + this.days[0] + ")" : //本周一

src/xt_pages/workforce/components/template_table.vue

@@ -1,6 +1,7 @@
 <template>
-  <div>
-    <div id="table_data">
+  <div  >
+    <div id="tem_table_data" v-show="schedulingTableVisible">
+      <slot></slot>
       <div class="table_contain">
         <div class="left_contain">
           <div
@@ -1269,6 +1270,7 @@ export default {
   },
   data() {
     return {
+      schedulingTableVisible:true,//全屏
       changeLoadingOne:false,
       changeLoadingTwo:false,
       tipDialogVisibleTwo:false,
@@ -3131,7 +3133,8 @@ export default {
       }
 
       this.$message.error("设备不存在");
-    },  will_add_schedule_action_four: function(patient_id, treat_mode, weekday, time_type, device_number_id) {
+    }, 
+     will_add_schedule_action_four: function(patient_id, treat_mode, weekday, time_type, device_number_id) {
       var patient = null
       for (let index = 0; index < this.patients.length; index++) {
         const p = this.patients[index]
@@ -4550,6 +4553,7 @@ export default {
 <style lang="scss">
 .table_contain {
   display: flex;
+  margin-top: 30px;
 .left_contain {
   width: 14%;
   margin-right: 50px;
@@ -4620,15 +4624,26 @@ export default {
   white-space: normal !important;
 }
 
-#table_data {
+#tem_table_data {
   /*min-height: calc(100vh - 350px);*/
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  overflow: auto;
+  margin: 0;
+  background: #fff;
+  padding: 20px;
+  z-index:2000;
+  height: 100%;
 }
 
-#table_data ::-webkit-scrollbar {
+#tem_table_data ::-webkit-scrollbar {
   height: 15px;
 }
 
-#table_data {
+#tem_table_data {
 .el-table__body tr.current-row > td {
   background-color: #ecf5ff !important;
   color: #3a8ee6;
@@ -4652,7 +4667,7 @@ export default {
 //   min-height: calc(100vh - 350px);
 // }
 
-#table_data ::-webkit-scrollbar {
+#tem_table_data ::-webkit-scrollbar {
   height: 15px;
 }
 
@@ -4670,11 +4685,11 @@ export default {
 // }
 // }
 
-#table_data {
+#tem_table_data {
   min-height: calc(100vh - 350px);
 }
 
-#table_data ::-webkit-scrollbar {
+#tem_table_data ::-webkit-scrollbar {
   height: 15px;
 }
 

src/xt_pages/workforce/template.vue

@@ -112,47 +112,48 @@
       <!-- </el-col> -->
     </div>
     <div class="app-container">
-      <el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick">
+      
+      <!-- <el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick"> -->
 <!--        <el-tab-pane name="schedules">-->
 <!--          <span slot="label"> 排班信息 </span>-->
 <!--          <template-table :editable="false" :device_numbers="device_numbers" :template="this_week_schedules" :is_editing="false"-->
 <!--                          :patients="patients" :data="data"></template-table>-->
 <!--        </el-tab-pane>-->
-        <el-tab-pane name="first" :disabled="template_mode.mode == 0" >
+        <!-- <el-tab-pane name="first" :disabled="template_mode.mode == 0" > -->
 <!--          <span slot="label">-->
 <!--          </span>-->
-          <span slot="label"> {{first_template.week?'一周模版':'一周模版'}}
+          <!-- <span slot="label"> {{first_template.week?'一周模版':'一周模版'}} -->
 <!--             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>-->
 <!--             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>-->
 
-             <span v-if="schedule.mode ==1">(本周)</span>
+             <!-- <span v-if="schedule.mode ==1">(本周)</span>
              <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>
              <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>
           </span>
 
         </el-tab-pane>
 
-        <el-tab-pane  name="second" :disabled="template_mode.mode != 2 && template_mode.mode != 3 && template_mode.mode  != 4">
+        <el-tab-pane  name="second" :disabled="template_mode.mode != 2 && template_mode.mode != 3 && template_mode.mode  != 4"> -->
 <!--          <template-table   ref="table_two"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="first_template"-->
 <!--                           :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"></template-table>-->
-          <span slot="label"> {{second_template.week?'二周模版':'二周模版'}}
+          <!-- <span slot="label"> {{second_template.week?'二周模版':'二周模版'}} -->
 <!--             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>-->
 <!--             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>-->
 <!--            -->
-              <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
+              <!-- <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
              <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(下一周)</span>
           </span>
-        </el-tab-pane>
+        </el-tab-pane> -->
 
 
 
-        <el-tab-pane :label="  third_template.week? '三周模版':'三周模版'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
+        <!-- <el-tab-pane :label="  third_template.week? '三周模版':'三周模版'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4"> -->
 
 <!--          <template-table  ref="table_three"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="first_template"-->
 <!--                           :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"></template-table>-->
-        </el-tab-pane>
+        <!-- </el-tab-pane> -->
 
-      <el-tab-pane :label="four_template.week?'四周模版':'四周模版'" name="four" :disabled="template_mode.mode  != 4 ">
+      <!-- <el-tab-pane :label="four_template.week?'四周模版':'四周模版'" name="four" :disabled="template_mode.mode  != 4 "> -->
 <!--          <span slot="label"> 四周模版 {{ four_template.week?four_template.week+'周':""}}-->
 <!--             <span v-if="schedule.execute_times%2==0">(下一周)</span>-->
 <!--             <span v-if="schedule.execute_times%2!=0">(本周)</span>-->
@@ -164,7 +165,7 @@
 <!--        <template-table   ref="table_four"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="first_template"-->
 <!--                         :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"></template-table>-->
 
-        </el-tab-pane>
+        <!-- </el-tab-pane> -->
 
 
 <!--        <template-table-two   v-show="activeName =='second'"  ref="table_two"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="second_template"-->
@@ -175,9 +176,70 @@
 <!--                               :modes="modes"    :patients="patients" :data="data" @cancel_sch="refresh"  :template_mode="template_mode" @saveSuccess="refresh" @cur_info="cur_info" @saveData="saveData"   @saveSuccessTwo="refresh"></template-table-four>-->
 
 
-      </el-tabs>
+      <!-- </el-tabs> -->
       <template-table  v-loading="dataloading"  ref="table"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="template"
-                        :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh" @setTemplate="setTemplate" @changeLoading="changeLoading"></template-table>
+                        :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode" 
+                         @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh" 
+                         @setTemplate="setTemplate" @changeLoading="changeLoading">
+            <div class="position">
+              <div>
+                <el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick">
+
+        <el-tab-pane name="first" :disabled="template_mode.mode == 0" >
+
+          <span slot="label"> {{first_template.week?'一周模版':'一周模版'}}
+
+             <span v-if="schedule.mode ==1">(本周)</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>
+          </span>
+
+        </el-tab-pane>
+
+        <el-tab-pane  name="second" :disabled="template_mode.mode != 2 && template_mode.mode != 3 && template_mode.mode  != 4">
+
+          <span slot="label"> {{second_template.week?'二周模版':'二周模版'}}
+
+              <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(下一周)</span>
+          </span>
+        </el-tab-pane>
+
+        <el-tab-pane :label="  third_template.week? '三周模版':'三周模版'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
+
+        </el-tab-pane>
+
+      <el-tab-pane :label="four_template.week?'四周模版':'四周模版'" name="four" :disabled="template_mode.mode  != 4 ">
+        </el-tab-pane>
+      </el-tabs>
+              </div>
+              <div style="display:flex;align-items:center">
+
+                <!--<upload-excel style="float:right;" :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>-->
+                <schedule-template-upload-excel style="margin-right:10px;"
+                                                :on-success='handleSuccess'></schedule-template-upload-excel>
+
+                <!-- <el-col :span="3" style="text-align: right;"> -->
+                <el-button v-loading="downloadLoading" v-if="template_mode"
+                          size="small" icon="el-icon-setting" type="primary" @click="import_file()">下载模版
+                </el-button>
+                <el-button size="small" icon="el-icon-setting" type="primary" @click="setData" v-if="template_mode.mode>0">同步数据</el-button>
+                <el-button size="small" icon="el-icon-setting" type="primary" @click="setScheduleTemplateAction">设置</el-button>
+
+                <el-button size="small" icon="el-icon-setting" type="primary" @click="editClick">智能排班</el-button>
+                <el-button size="small" icon="el-icon-setting" type="primary" @click="saveClick">保存并退出</el-button>
+
+                <el-button
+                    @click="generateLog()"
+                    class="filter-item"
+                    type="primary"
+                    size="small"
+                    v-loading="generateLoading"
+                >下载日志
+                </el-button>
+              </div>
+            </div>
+      </template-table>
 
 
 <!--      <template-table  ref="table" :editable="true" :device_numbers="device_numbers" :template="tar_template" :is_editing="is_editing"-->
@@ -271,6 +333,7 @@ export default {
   },
   data: function () {
     return {
+      schedulingTableVisible:false,
       dataloading:true,
       is_editing:true,
       editable:false,
@@ -1510,7 +1573,8 @@ export default {
 
       }
 
-    },getInitData(){
+    },
+    getInitData(){
       let params = {
         patitionid:""
       }
@@ -3121,7 +3185,8 @@ export default {
 
       }
 
-    },changeZone(val){
+    },
+    changeZone(val){
       this.getWeekPanels(val)
       let params = {
         patitionid:val
@@ -3197,7 +3262,8 @@ export default {
       })
 
 
-    },saveData(val,del_data){
+    },
+    saveData(val,del_data){
       var tempDataOne = []
       for(let i = 0; i < val.length; i++){
           tempDataOne.push(val[i])
@@ -3377,7 +3443,8 @@ export default {
           })
         }
       })
-    },editClick:function (){
+    },
+    editClick:function (){
       this.$nextTick(function() {
         if(this.activeName == "first"){
           this.activeName = "first"
@@ -3394,15 +3461,18 @@ export default {
         }
       })
 
-    },saveClick:function (){
+    },
+    // 退出排班模板
+    saveClick:function (){
       if(this.template_mode.mode == 0){
         // this.$router.go(-1)
         this.$router.back()
 
       }else{
+        this.schedulingTableVisible=false
         this.$message.success("保存成功")
         this.$router.back()
-
+        
       }
 
     },