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

src/lang/zh.js

@@ -269,7 +269,8 @@ export default {
     summary_tool: '项目消费明细汇总',
     labelPrint: '标签打印',
     faPiao: '发票设置',
-    chargeDetailManagement: '收费明细'
+    chargeDetailManagement: '收费明细',
+    yidiClear:'异地清分',
   },
   navbar: {
     logOut: '退出登录',

src/xt_pages/dialysis/template/DialysisPrintOrderFortySix.vue

@@ -91,61 +91,7 @@
             </div>
           </div>
         </div>
-        <div class="row" v-if="org_id != 10307">
-          <div class="inline_block">
-            入科方式：
-            <div
-              v-for="(item, index) in way_arr"
-              class="under_line"
-              v-if="receiverTreatmentAccess.way == item.id"
-              style="width: 180px; text-align: left"
-            >
-              {{ item.name }}
-            </div>
-            <!--<div-->
-            <!--class="under_line"-->
-            <!--v-if="receiverTreatmentAccess.way == 1"-->
-            <!--style="width: 180px;text-align: left"-->
-            <!--&gt;-->
-            <!--步行-->
-            <!--</div>-->
-            <!--<div-->
-            <!--class="under_line"-->
-            <!--v-if="receiverTreatmentAccess.way == 2"-->
-            <!--style="width: 180px;text-align: left"-->
-            <!--&gt;-->
-            <!--扶行-->
-            <!--</div>-->
-            <!--<div-->
-            <!--class="under_line"-->
-            <!--v-if="receiverTreatmentAccess.way == 3"-->
-            <!--style="width: 180px;text-align: left"-->
-            <!--&gt;-->
-            <!--轮椅-->
-            <!--</div>-->
-            <!--<div-->
-            <!--class="under_line"-->
-            <!--v-if="receiverTreatmentAccess.way == 4"-->
-            <!--style="width: 180px;text-align: left"-->
-            <!--&gt;-->
-            <!--平车-->
-            <!--</div>-->
-          </div>
-          <div class="inline_block" style="margin-left: 10px">
-            诊断：
-            <div
-              class="under_line"
-              style="
-                width: 640px;
-                text-align: left;
-                word-wrap: break-word;
-                white-space: inherit;
-              "
-            >
-              {{ patientInfo.diagnose }}
-            </div>
-          </div>
-        </div>
+  
 
         <div
           class="row"
@@ -1640,68 +1586,7 @@
               </div>
             </div>
           </div>
-          <div class="row" style="margin-bottom: 10px" v-if="org_id != 10307">
-            <div class="inline_block">
-              入科方式：
-              <!--<check-box v-for="item, index in nutrition_arr" :key="index" :text="item.name" :checked="receiverTreatmentAccess.nutrition == item.id?true:false"></check-box>-->
-              <div
-                v-for="(item, index) in way_arr"
-                class="under_line"
-                v-if="receiverTreatmentAccess.way == item.id"
-                style="width: 180px; text-align: left"
-              >
-                {{ item.name }}
-              </div>
-              <!--<div-->
-              <!--class="under_line"-->
-              <!--v-if="receiverTreatmentAccess.way == 0"-->
-              <!--style="width: 180px;text-align: left"-->
-              <!--&gt;</div>-->
-              <!--<div-->
-              <!--class="under_line"-->
-              <!--v-if="receiverTreatmentAccess.way == 1"-->
-              <!--style="width: 180px;text-align: left"-->
-              <!--&gt;-->
-              <!--步行-->
-              <!--</div>-->
-              <!--<div-->
-              <!--class="under_line"-->
-              <!--v-if="receiverTreatmentAccess.way == 2"-->
-              <!--style="width: 180px;text-align: left"-->
-              <!--&gt;-->
-              <!--扶行-->
-              <!--</div>-->
-              <!--<div-->
-              <!--class="under_line"-->
-              <!--v-if="receiverTreatmentAccess.way == 3"-->
-              <!--style="width: 180px;text-align: left"-->
-              <!--&gt;-->
-              <!--轮椅-->
-              <!--</div>-->
-              <!--<div-->
-              <!--class="under_line"-->
-              <!--v-if="receiverTreatmentAccess.way == 4"-->
-              <!--style="width: 180px;text-align: left"-->
-              <!--&gt;-->
-              <!--平车-->
-              <!--</div>-->
-            </div>
-            <div class="inline_block" style="margin-left: 10px">
-              诊断：
-              <div
-                class="under_line"
-                style="
-                  width: 640px;
-                  text-align: left;
-                  word-break: break-all;
-                  word-wrap: break-word;
-                  display: inline-block;
-                "
-              >
-                {{ patientInfo.diagnose }}
-              </div>
-            </div>
-          </div>
+
         </template>
         <div class="row" style="margin-top: -11px; position: relative">
           <table class="proj_table">
@@ -1820,664 +1705,6 @@
                 </tr>
               </template>
 
-              <tr v-if="org_id != 10307">
-                <td
-                  colspan="7"
-                  style="
-                    letter-spacing: 5px;
-                    text-align: center;
-                    font-weight: 520;
-                    font-size: 16px;
-                    padding: 6px 8px;
-                    line-height: 30px;
-                  "
-                >
-                  透析后情况
-                </td>
-              </tr>
-              <tr v-if="org_id != 10307">
-                <td colspan="7">
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                  >
-                    <div class="inline_block" style="flex: 1">
-                      T：
-                      <div
-                        class="under_line"
-                        style="width: 50px; text-align: center"
-                      >
-                        {{
-                          afterdialysis.temperature
-                            ? afterdialysis.temperature
-                            : "/"
-                        }}
-                      </div>
-                      °C
-                    </div>
-                    <div
-                      class="inline_block"
-                      style="margin-left: 10px; flex: 1"
-                    >
-                      P：
-                      <div
-                        class="under_line"
-                        style="width: 50px; text-align: center"
-                      >
-                        {{
-                          afterdialysis.pulse_frequency
-                            ? afterdialysis.pulse_frequency
-                            : "/"
-                        }}
-                      </div>
-                      次/分
-                    </div>
-                    <div
-                      class="inline_block"
-                      style="margin-left: 10px; flex: 1"
-                    >
-                      R：
-                      <div
-                        class="under_line"
-                        style="width: 50px; text-align: center"
-                      >
-                        {{
-                          afterdialysis.breathing_rate
-                            ? afterdialysis.breathing_rate
-                            : "/"
-                        }}
-                      </div>
-                      次/分
-                    </div>
-                    <div
-                      class="inline_block"
-                      style="margin-left: 10px; flex: 1.5"
-                    >
-                      BP：
-                      <div
-                        class="under_line"
-                        style="width: 50px; text-align: center"
-                      >
-                        {{
-                          afterdialysis.systolic_blood_pressure
-                            ? afterdialysis.systolic_blood_pressure
-                            : "/"
-                        }}
-                      </div>
-                      /
-                      <div
-                        class="under_line"
-                        style="width: 50px; text-align: center"
-                      >
-                        {{
-                          afterdialysis.diastolic_blood_pressure
-                            ? afterdialysis.diastolic_blood_pressure
-                            : "/"
-                        }}
-                      </div>
-                      mmHg
-                    </div>
-                    <div class="inline_block" style="flex: 1.5">
-                      实际治疗时间：
-                      <div
-                        class="under_line"
-                        style="width: 30px; text-align: center"
-                      >
-                        {{
-                          afterdialysis.actual_treatment_hour
-                            ? afterdialysis.actual_treatment_hour
-                            : "/"
-                        }}
-                      </div>
-                      h
-                      <div
-                        class="under_line"
-                        style="width: 30px; text-align: center"
-                      >
-                        {{
-                          afterdialysis.actual_treatment_minute
-                            ? afterdialysis.actual_treatment_minute
-                            : 0
-                        }}
-                      </div>
-                      min
-                    </div>
-                  </div>
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                  >
-                    <div class="inline_block" style="flex: 2.5">
-                      透析器凝血：
-                      <div
-                        class="under_line"
-                        style="
-                          width: 170px;
-                          text-align: center;
-                          white-space: normal;
-                        "
-                      >
-                        {{ afterdialysis.cruor ? afterdialysis.cruor : "/" }}
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 2">
-                      内瘘：
-                      <div
-                        class="under_line"
-                        style="
-                          width: 170px;
-                          text-align: center;
-                          white-space: normal;
-                        "
-                      >
-                        {{
-                          afterdialysis.internal_fistula
-                            ? afterdialysis.internal_fistula
-                            : "/"
-                        }}
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 4">
-                      导管：
-                      <div
-                        class="under_line"
-                        style="min-width: 120px; text-align: center"
-                      >
-                        {{
-                          afterdialysis.catheter ? afterdialysis.catheter : "/"
-                        }}
-                      </div>
-                    </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: 70px; text-align: center"
-                      >
-                        {{
-                          afterdialysis.weight_after
-                            ? parseFloat(
-                                afterdialysis.weight_after -
-                                  afterdialysis.additional_weight
-                              ).toFixed(1)
-                            : "/"
-                        }}
-                      </div>
-                      kg
-                    </div>
-
-                    <div class="inline_block" style="flex: 1">
-                      体重减少：
-                      <div
-                        class="under_line"
-                        style="width: 70px; text-align: center"
-                      >
-                        {{
-                          afterdialysis.weight_loss
-                            ? afterdialysis.weight_loss
-                            : "/"
-                        }}
-                      </div>
-                      kg
-                    </div>
-
-                    <div
-                      class="inline_block"
-                      style="flex: 1"
-                      v-if="org_id != 10223"
-                    >
-                      透析中入量：
-                      <div
-                        class="under_line"
-                        style="width: 70px; text-align: center"
-                      >
-                        {{
-                          afterdialysis.dialysis_intakes
-                            ? afterdialysis.dialysis_intakes
-                            : "/"
-                        }}
-                      </div>
-                      {{ getUnit(afterdialysis.dialysis_intakes_unit) }}
-                    </div>
-
-                    <div class="inline_block" style="flex: 1">
-                      实际超滤量：
-                      <div
-                        class="under_line"
-                        style="width: 70px; text-align: center"
-                      >
-                        {{
-                          afterdialysis.actual_ultrafiltration
-                            ? afterdialysis.actual_ultrafiltration
-                            : "/"
-                        }}
-                      </div>
-                      ml
-                    </div>
-                  </div>
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                    v-if="org_id == 10223"
-                  >
-                    <div class="inline_block" style="flex: 1">
-                      动脉管道：
-                      <div
-                        class="under_line"
-                        style="width: 100px; text-align: center"
-                      >
-                        <span v-if="afterdialysis.arterial_tube == 0">/</span>
-                        <span v-if="afterdialysis.arterial_tube == 1"
-                          >动脉管道0</span
-                        >
-                        <span v-if="afterdialysis.arterial_tube == 2"
-                          >动脉管道+</span
-                        >
-                        <span v-if="afterdialysis.arterial_tube == 3"
-                          >动脉管道++</span
-                        >
-                        <span v-if="afterdialysis.arterial_tube == 4"
-                          >动脉管道+++</span
-                        >
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      静脉管道：
-                      <div
-                        class="under_line"
-                        style="width: 100px; text-align: center"
-                      >
-                        <span v-if="afterdialysis.intravenous_tube == 0"
-                          >/</span
-                        >
-                        <span v-if="afterdialysis.intravenous_tube == 1"
-                          >静脉管道0</span
-                        >
-                        <span v-if="afterdialysis.intravenous_tube == 2"
-                          >静脉管道+</span
-                        >
-                        <span v-if="afterdialysis.intravenous_tube == 3"
-                          >静脉管道++</span
-                        >
-                        <span v-if="afterdialysis.intravenous_tube == 4"
-                          >静脉管道+++</span
-                        >
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      并发症：
-                      <div
-                        class="under_line"
-                        style="width: 170px; text-align: center"
-                      >
-                        {{
-                          afterdialysis.complication
-                            ? afterdialysis.complication
-                            : "/"
-                        }}
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                    v-if="org_id == 10223"
-                  >
-                    <div class="inline_block" style="flex: 1">
-                      穿刺处血肿：
-                      <div
-                        class="under_line"
-                        style="width: 50px; text-align: center"
-                      >
-                        <span v-if="afterdialysis.puncture_point_haematoma == 0"
-                          >/</span
-                        >
-                        <span v-if="afterdialysis.puncture_point_haematoma == 1"
-                          >有</span
-                        >
-                        <span v-if="afterdialysis.puncture_point_haematoma == 2"
-                          >无</span
-                        >
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      中心静脉封管(肝素-A端):
-                      <div
-                        class="under_line"
-                        style="width: 70px; text-align: center"
-                      >
-                        {{ afterdialysis.cvc_a ? afterdialysis.cvc_a : "/" }}
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      中心静脉封管(肝素-V端):
-                      <div
-                        class="under_line"
-                        style="width: 70px; text-align: center"
-                      >
-                        {{ afterdialysis.cvc_v ? afterdialysis.cvc_v : "/" }}
-                      </div>
-                    </div>
-                  </div>
-
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                  >
-                    <div
-                      class="inline_block"
-                      style="flex: 1; display: inline-block"
-                    >
-                      治疗小结：
-                      <div
-                        class="under_line"
-                        style="
-                          width: 860px;
-                          line-height: 25px;
-                          text-align: left;
-                          margin-left: 2px;
-                          display: inline-block;
-                          white-space: normal;
-                        "
-                      >
-                        {{
-                          summary.dialysis_summary
-                            ? summary.dialysis_summary
-                            : "/"
-                        }}
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                    v-if="org_id != 10223"
-                  >
-                    <div
-                      class="inline_block"
-                      style="flex: 1; display: inline-block"
-                    >
-                      备注：
-                      <div
-                        class="under_line"
-                        style="
-                          width: 860px;
-                          line-height: 25px;
-                          text-align: left;
-                          margin-left: 2px;
-                          display: inline-block;
-                          white-space: normal;
-                        "
-                      >
-                        {{ afterdialysis.remark ? afterdialysis.remark : "/" }}
-                      </div>
-                    </div>
-                  </div>
-                </td>
-              </tr>
-              <tr>
-                <td colspan="7">
-                  <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: 80px; text-align: center"
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            ) == ''
-                          "
-                        >
-                          {{
-                            getAdminUser(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            )
-                          }}</span
-                        >
-                        <img
-                          style="height: 30px"
-                          :src="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.puncture_nurse
-                            )
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      治疗护士：
-                      <div
-                        class="under_line"
-                        style="width: 80px; text-align: center"
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.start_nurse
-                            ) == ''
-                          "
-                        >
-                          {{
-                            getAdminUser(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.start_nurse
-                            )
-                          }}</span
-                        >
-                        <img
-                          style="height: 30px"
-                          :src="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.start_nurse
-                            )
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      核对人员：
-                      <div
-                        class="under_line"
-                        style="width: 80px; text-align: center"
-                        v-if="dialysisOrder == null"
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(check == null ? 0 : check.creater) ==
-                            ''
-                          "
-                        >
-                          {{ getAdminUser(check == null ? 0 : check.creater) }}
-                        </span>
-                        <img
-                          style="height: 30px"
-                          :src="
-                            setAdminUserES(check == null ? 0 : check.creater)
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                      <div
-                        class="under_line"
-                        style="width: 80px; text-align: center"
-                        v-if="
-                          dialysisOrder != null &&
-                          dialysisOrder.start_nurse == check.modifier
-                        "
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(check == null ? 0 : check.creater) ==
-                            ''
-                          "
-                        >
-                          {{ getAdminUser(check == null ? 0 : check.creater) }}
-                        </span>
-                        <img
-                          style="height: 30px"
-                          :src="
-                            setAdminUserES(check == null ? 0 : check.creater)
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                      <div
-                        class="under_line"
-                        style="width: 80px; text-align: center"
-                        v-if="
-                          dialysisOrder != null &&
-                          dialysisOrder.start_nurse == check.creater
-                        "
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(
-                              check == null ? 0 : check.modifier
-                            ) == ''
-                          "
-                        >
-                          {{ getAdminUser(check == null ? 0 : check.modifier) }}
-                        </span>
-                        <img
-                          style="height: 30px"
-                          :src="
-                            setAdminUserES(check == null ? 0 : check.modifier)
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                      <div
-                        class="under_line"
-                        style="width: 80px; text-align: center"
-                        v-if="
-                          dialysisOrder != null &&
-                          dialysisOrder.start_nurse != check.creater &&
-                          dialysisOrder.start_nurse != check.modifier
-                        "
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(check == null ? 0 : check.creater) ==
-                            ''
-                          "
-                        >
-                          {{ getAdminUser(check == null ? 0 : check.creater) }}
-                        </span>
-                        <img
-                          style="height: 30px"
-                          :src="
-                            setAdminUserES(check == null ? 0 : check.creater)
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      下机护士：
-                      <div
-                        class="under_line"
-                        style="width: 80px; text-align: center"
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.finish_nurse
-                            ) == ''
-                          "
-                        >
-                          {{
-                            getAdminUser(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.finish_nurse
-                            )
-                          }}
-                        </span>
-                        <img
-                          style="height: 30px"
-                          :src="
-                            setAdminUserES(
-                              dialysisOrder == null
-                                ? 0
-                                : dialysisOrder.finish_nurse
-                            )
-                          "
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                    </div>
-                    <div class="inline_block" style="flex: 1">
-                      治疗医生：
-                      <div
-                        class="under_line"
-                        style="width: 80px; text-align: center"
-                      >
-                        <span
-                          style="height: 30px; display: inline-block"
-                          v-if="setAdminUserES(prescription.creater) == ''"
-                        >
-                          {{ getAdminUser(prescription.creater) }}
-                        </span>
-                        <img
-                          style="height: 30px"
-                          :src="setAdminUserES(prescription.creater)"
-                          alt=""
-                          srcset=""
-                          v-else
-                        />
-                      </div>
-                    </div>
-                  </div>
-                </td>
-              </tr>
             </tbody>
           </table>
           <!-- <div  class="print-yema">1</div> -->

src/xt_pages/hospitalStation/chargeDetailManagement.vue

@@ -1163,8 +1163,8 @@ export default {
                 prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                 medical_insurance_number: prescription.advices[b].med_list_codg,
 
-                code: prescription.advices[b].drug.medical_insurance_number,
                 spec: spec,
+                code: prescription.advices[b].drug.medical_insurance_number,
                 det_item_fee_sumamt: prescription.advices[b].order_info.det_item_fee_sumamt,
                 name_id: prescription.advices[b].drug.manufacturer,
                 fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt,

src/xt_pages/hospitalStation/checkTemplate/printOne.vue

@@ -40,7 +40,7 @@
                     </div>
                     <div>医生签字：{{ doctor ? doctor : '' }}</div>
                 </div>
-            </div>   
+            </div>
             <img style="width:100%;" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
         </div>
     </div>
@@ -56,7 +56,7 @@ export default {
       record_date:String,
       prescription_id:Number,
       ids:String
-    }, 
+    },
     data(){
       return {
         doctorList:[],
@@ -97,10 +97,10 @@ export default {
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
 
       getDoctor(id){
@@ -126,7 +126,8 @@ export default {
           patient_id:this.patient_id,
           record_date:this.record_date,
           prescription_id:this.prescription_id,
-          ids:this.ids
+          ids:this.ids,
+          p_type:1,
         }
         console.log("params",params)
        getPrescriptionPrint(params).then(response=>{
@@ -151,7 +152,7 @@ export default {
                             }
                         }
                   })
-                
+
               }
             })
             let data = []
@@ -166,9 +167,9 @@ export default {
               if(item.team.id == 0){
                 data2.push(item)
               }
-              
+
             })
-          
+
             this.total = total
             this.pre_time = this.advicePrint[0].pre_time
             this.doctor = this.advicePrint[0].doctor
@@ -184,7 +185,7 @@ export default {
             let outputlist1Name = response.data.data.his.patient_info ? JSON.parse(response.data.data.his.patient_info) : {};
             this.faber = outputlist1Name
 
-            
+
           }
        })
      },
@@ -237,7 +238,7 @@ export default {
             }
               addtotal =  Math.floor(addtotal * 100) / 100
         }
-       
+
        }
 
       for (let i = 0; i < this.prescriptions.length; i++) {
@@ -247,7 +248,7 @@ export default {
                 total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
               }
             }
-          
+
             if (this.prescriptions[i].additionalcharge != null) {
               for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
@@ -259,7 +260,7 @@ export default {
 
         return total + addtotal
       },
-      
+
      getProjectName(id){
         var project_name = ""
         for(let i=0;i<this.projectList.length;i++){
@@ -274,14 +275,14 @@ export default {
         let newIds = ids.split(',').sort(function(a,b){
           return a-b;
         })
-        
+
         var name = ""
         let nameArr = []
         for(let i=0;i<this.diagnoses.length;i++){
           // if(id == this.diagnoses[i].id){
           //    name = this.diagnoses[i].class_name
           // }
-          
+
           if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
             // name += diagnoses[i].class_name + ' '
             nameArr.push(this.diagnoses[i].class_name)
@@ -291,7 +292,7 @@ export default {
         nameArr.map((item,index) => {
           if(item == '尿毒症'){
             newNameArr.push(item)
-            nameArr.splice(index,1,'') 
+            nameArr.splice(index,1,'')
           }
         })
         newNameArr.push(...nameArr)
@@ -315,7 +316,7 @@ export default {
             this.page = 1
             arr.push(item.advices.length)
             item.pageArr.push(arr)
-            
+
           }else if(item.advices.length > 5){
             this.page = parseInt(item.advices.length / 5)
             let num = item.advices.length % 5
@@ -413,7 +414,7 @@ export default {
       var xtuser = this.$store.getters.xt_user;
       this.orgname = xtuser.org.org_name;
       this.org_id = this.$store.getters.xt_user.org_id
-     
+
    },
    watch:{
      ids:function(val){
@@ -428,7 +429,7 @@ export default {
 <style lang="scss" scoped>
 .prescription-print{
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
     padding:20px 10px;
@@ -486,7 +487,7 @@ export default {
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/hospitalStation/components/ChargePrescriptionTable.vue

@@ -49,7 +49,7 @@
 
       <el-table-column align="center" prop="name" width="60" label="总价">
         <template slot-scope="scope">
-          <div> {{scope.row.retail_price * scope.row.prescribing_number}}元</div>
+          <div> {{(scope.row.retail_price * scope.row.prescribing_number).toFixed(2)}}元</div>
         </template>
       </el-table-column>
 
@@ -185,7 +185,7 @@
 
       <el-table-column align="center" prop="name" width="60" label="总价">
         <template slot-scope="scope">
-          <div> {{scope.row.total * scope.row.price}}元</div>
+          <div> {{(scope.row.total * scope.row.price).toFixed(2)}}元</div>
         </template>
       </el-table-column>
 

src/xt_pages/hospitalStation/components/chargeDialog.vue

@@ -166,19 +166,20 @@
       }
     },
     methods: {
-      show: function (total) {
+      show: function (total,order) {
         this.total = total;
         this.form.private_price = total;
         this.form.pay_price = total;
         this.form.total = total + this.form.medical_insurance_price;
         this.form.discount_price = 0.0;
         this.form.preferential_price = 0.0;
-
         this.form.fapiao_code ="";
         this.form.fapiao_number = "";
-
-
-
+        if(order&&order.id > 0){
+          this.total = order.medfee_sumamt;
+          this.form.private_price = order.medfee_sumamt;
+          this.form.pay_price = order.medfee_sumamt;
+        }
         this.visibility = true
 
       }, hide: function () {

src/xt_pages/hospitalStation/components/settlePrescriptionTable.vue

@@ -48,12 +48,41 @@
       </el-table-column>
       <el-table-column align="center" prop="name" width="60" label="总价">
         <template slot-scope="scope">
-          <div> {{scope.row.prescribing_number * scope.row.retail_price}}元</div>
+          <div> {{(scope.row.prescribing_number * scope.row.retail_price).toFixed(2)}}元</div>
 
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
       </el-table-column>
 
+      <el-table-column align="center" prop="name" width="60" label="全自费金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.fulamt_ownpay_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="超限价金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.overlmt_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="先行自付金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.preselfpay_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="符合正常范围金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.inscp_scp_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
 
 
       <el-table-column align="center" prop="name" width="50" label="备注">
@@ -118,11 +147,42 @@
 
       <el-table-column align="center" prop="name" width="60" label="总价">
         <template slot-scope="scope">
-          <div> {{scope.row.total * scope.row.price}}元</div>
+          <div> {{(scope.row.total * scope.row.price).toFixed(2)}}元</div>
 
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
       </el-table-column>
+
+      <el-table-column align="center" prop="name" width="60" label="全自费金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.fulamt_ownpay_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="超限价金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.overlmt_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="先行自付金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.preselfpay_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="60" label="符合正常范围金额">
+        <template slot-scope="scope">
+          <div> {{scope.row.inscp_scp_amt}}元</div>
+        </template>
+      </el-table-column>
+
+
+
       <el-table-column align="center" prop="name" width="50" label="备注">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.remark" readonly></el-input>-->

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -3967,7 +3967,8 @@
             record: this.record_date,
             prescription_id: this.prescription_id,
             ids: ids1,
-            patient_id: this.patientid
+            patient_id: this.patientid,
+            p_type:1
           }
           this.paramsObj = obj1
         }
@@ -3983,7 +3984,8 @@
             record: this.record_date,
             prescription_id: this.prescription_id,
             ids: ids2,
-            patient_id: this.patientid
+            patient_id: this.patientid,
+            p_type:1
           }
           this.paramsObj2 = obj2
         }
@@ -3997,7 +3999,8 @@
             record: this.record_date,
             prescription_id: this.prescription_id,
             ids: ids2,
-            patient_id: this.patientid
+            patient_id: this.patientid,
+            p_type:1
           }
           this.paramsObj3 = obj3
         }

src/xt_pages/hospitalStation/index.vue

@@ -87,7 +87,7 @@
                     <!--<el-form-item class="specialFormItem" label="医保卡号：">-->
                     <!--<div style="display:flex;">-->
                     <!--<el-input v-model="form.medicalInsuranceCard"></el-input>-->
-                    <el-button style="margin-left:10px;" type="primary" @click="check" v-if="form.id_card_no.length > 0">查待遇</el-button>
+<!--                    <el-button style="margin-left:10px;" type="primary" @click="check" v-if="form.id_card_no.length > 0">查待遇</el-button>-->
                     <!--</div>-->
                     <!--</el-form-item>-->
 
@@ -338,7 +338,6 @@
         },
         doctorList: [],
         departmentList: [],
-        check: 0,
         show: false,
         is_Name: false,
         patient: [],
@@ -358,7 +357,8 @@
         }
         var that = this
         let params={
-          id_card_no: this.form.id_card_no,
+          patient_id:this.form.id,
+        id_card_no: this.form.id_card_no,
           admin_user_id:this.$store.getters.xt_user.user.id,
           med_type: this.form.med_type,
           insutype: this.form.social_type
@@ -870,7 +870,7 @@
       }
       this.form.start_time =moment(new Date()).add('year',0).format("YYYY-MM-DD HH:mm:ss")
       this.getInitData()
-      //获取当前机构有人员信息
+      //获取当前机构有人员信息inde
       this.getAllDoctorList()
     }
   }

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -13,7 +13,6 @@
             :editable="false"
             style="width: 100%;"
             type="date"
-            :picker-options="pickerOptions"
             placeholder="选择开始时间"
             align="right"
             format="yyyy-MM-dd"
@@ -423,7 +422,7 @@ export default {
       department: [],
       invoiceVisible: false,
       invoiceParams: {},
-      out_hospital_time: ''
+      out_hospital_time: moment(new Date()).add('year',0).format("YYYY-MM-DD HH:mm:ss")
 
     }
   },
@@ -1427,7 +1426,7 @@ export default {
           return
         }
 
-        this.$refs.charge.show(this.getSettleTotal())
+        this.$refs.charge.show(this.getSettleTotal(),this.order)
 
       } else if (index == 4) {
         if (this.hisPatientInfo.balance_accounts_type == 2) {
@@ -2688,6 +2687,15 @@ export default {
             obj['id'] = drug_month_prescriptions.advices[a].drug_id
             // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
             obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price)
+
+
+            obj['code'] = drug_month_prescriptions.advices[a].drug.medical_insurance_number
+            obj['fulamt_ownpay_amt'] = drug_month_prescriptions.advices[a].order_info.fulamt_ownpay_amt
+            obj['overlmt_amt'] = drug_month_prescriptions.advices[a].order_info.overlmt_amt
+            obj['inscp_scp_amt'] = drug_month_prescriptions.advices[a].order_info.inscp_scp_amt
+            obj['preselfpay_amt'] = drug_month_prescriptions.advices[a].order_info.preselfpay_amt
+
+
             count = count + drug_month_prescriptions.advices[a].prescribing_number
 
           }
@@ -2716,6 +2724,12 @@ export default {
 
             }
 
+            obj['fulamt_ownpay_amt'] = project_month_prescriptions.project[a].order_info.fulamt_ownpay_amt
+            obj['overlmt_amt'] = project_month_prescriptions.project[a].order_info.overlmt_amt
+            obj['inscp_scp_amt'] = project_month_prescriptions.project[a].order_info.inscp_scp_amt
+            obj['preselfpay_amt'] = project_month_prescriptions.project[a].order_info.preselfpay_amt
+
+
             // obj['project_name'] = project_month_prescriptions.project[a].project.project_name;
             // obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification;
             obj['single_dose'] = project_month_prescriptions.project[a].single_dose
@@ -2729,6 +2743,9 @@ export default {
             // price = price + project_month_prescriptions.project[a].price
             obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
 
+
+
+
           }
         }
         obj['total'] = count
@@ -2906,6 +2923,8 @@ export default {
                 preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
                 inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt
 
+
+
               }
               tempAdvice.push(obj)
             }

src/xt_pages/hospitalStation/print.vue

@@ -71,7 +71,8 @@
         prescription_id:"",
         ids:'',
         paramsObj:{},
-        org_id:''
+        org_id:'',
+        p_type:1,
       };
     },
     methods:{
@@ -190,6 +191,7 @@
       this.prescription_id = prescription_id
       this.patient_id = this.paramsObj.patient_id
       this.ids = this.paramsObj.ids
+
       // var record_date = this.$route.query.record
       // this.record_date = record_date
       // console.log("record_date",record_date)

src/xt_pages/hospitalStation/statementTemplate/printOne.vue

@@ -24,7 +24,7 @@
       </tr>
       <tr>
         <td width="90">就医登记号</td>
-        <td colspan="11">{{info.psn_no}}</td>
+        <td colspan="11">{{info.mdtrt_id}}</td>
       </tr>
       <tr>
         <td width="80">姓名</td>
@@ -36,7 +36,7 @@
         <td width="80">出生日期</td>
         <td width="100">{{info.brdy}}</td>
         <td width="90">个人电脑号</td>
-        <td width="110"></td>
+        <td width="110">{{info.psn_no}}</td>
         <td width="80">人员类别</td>
         <td colspan="3" v-if="info.psn_type == '11'">在职</td>
         <td colspan="3" v-if="info.psn_type == '1101'">职工在职</td>
@@ -77,7 +77,7 @@
         <td>单位名称</td>
         <td colspan="5">{{info.emp_name}}</td>
         <td width="80">联系电话</td>
-        <td width="110"></td>
+        <td width="110">{{}}</td>
         <td width="80">身份证号</td>
         <td colspan="3">{{info.certno}}</td>
       </tr>
@@ -93,7 +93,7 @@
         <td>出院日期</td>
         <td width="100">{{info.enddate}}</td>
         <td>住院天数</td>
-        <td>{{getDay(info.begndate,info.enddate)}}</td>
+        <td>{{getDay(info.begndate,info.enddate) + 1}}</td>
 
       </tr>
       <tr>
@@ -117,17 +117,18 @@
         <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '11'">普通门诊</td>
         <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '12'">门诊挂号</td>
         <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '13'">急诊</td>
-        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '14'">门诊特殊病</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '14'">门诊慢性病</td>
         <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '15'">门诊统筹</td>
-        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '16'">门诊慢性病</td>
+<!--        <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '16'">门诊慢性病</td>-->
         <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '21'">普通住院</td>
 
         <td>结算时间</td>
-        <td colspan="5" style="text-align:left;padding-left:10px;">{{info.setl_time}}</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;">{{info.setl_time.split(' ')[0]}}</td>
       </tr>
       <tr>
         <td colspan="12" style="text-align:left;padding-left:10px;">
           本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.psn_pay}}元。
+          (起付线 {{info.act_pay_dedc}}元, 先自付 {{info.preselfpay_amt}}元, 段内自付 {{info.psn_pay - info.preselfpay_amt}} )
         </td>
       </tr>
       <tr>

src/xt_pages/hospitalStation/template/printFive.vue

@@ -203,7 +203,9 @@ export default {
         patient_id: this.patient_id,
         record_date: this.record_date,
         prescription_id: this.prescription_id,
-        ids: this.ids
+        ids: this.ids,
+        p_type:1,
+
       }
       console.log('params', params)
       getPrescriptionPrint(params).then(response => {

src/xt_pages/hospitalStation/template/printFour.vue

@@ -148,8 +148,10 @@ export default {
           patient_id:this.patient_id,
           record_date:this.record_date,
           prescription_id:this.prescription_id,
-          ids:this.ids
-        }
+          ids:this.ids,
+           p_type:1,
+
+         }
         console.log("params",params)
        getPrescriptionPrint(params).then(response=>{
          if(response.data.state == 1){

src/xt_pages/hospitalStation/template/printOne.vue

@@ -149,7 +149,8 @@ export default {
           patient_id:this.patient_id,
           record_date:this.record_date,
           prescription_id:this.prescription_id,
-          ids:this.ids
+          ids:this.ids,
+          p_type:1,
         }
         console.log("params",params)
        getPrescriptionPrint(params).then(response=>{
@@ -169,7 +170,7 @@ export default {
      },
      getHisPatientDetail(){
           const params = {
-              patient_id:this.patient_id
+              patient_id:this.patient_id,
           }
        getHisPatientDetail(params).then(response=>{
           if(response.data.state == 1){

src/xt_pages/hospitalStation/template/printThree.vue

@@ -171,8 +171,10 @@ export default {
           patient_id:this.patient_id,
           record_date:this.record_date,
           prescription_id:this.prescription_id,
-          ids:this.ids
-        }
+          ids:this.ids,
+           p_type:1,
+
+         }
         console.log("params",params)
        getPrescriptionPrint(params).then(response=>{
          if(response.data.state == 1){

src/xt_pages/hospitalStation/template/printTwo.vue

@@ -130,7 +130,9 @@ export default {
           patient_id:this.patient_id,
           record_date:this.record_date,
           prescription_id:this.prescription_id,
-        }
+           p_type:1,
+
+         }
         console.log("params---",params)
        getPrescriptionPrint(params).then(response=>{
          if(response.data.state == 1){

src/xt_pages/hospitalStation/treatTemplate/printOne.vue

@@ -317,7 +317,9 @@
           patient_id: this.patient_id,
           record_date: this.record_date,
           prescription_id: this.prescription_id,
-          ids: this.ids
+          ids: this.ids,
+          p_type:1,
+
         }
         console.log('999999', params)
         getPrescriptionPrint(params).then(response => {

src/xt_pages/hospitalStation/treatTemplate/printTwo.vue

@@ -308,7 +308,9 @@ export default {
           record_date:this.record_date,
           prescription_id:this.prescription_id,
           ids:this.ids,
-        }
+           p_type:1,
+
+         }
         console.log("999999",params)
        getPrescriptionPrint(params).then(response=>{
          if(response.data.state == 1){

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -89,6 +89,11 @@
             >结算单
             </el-button>
 
+            <el-button v-if="this.radio == 2   && this.order.order_status == 2" size="small"
+                       @click="open(30)" type="primary"
+            >打印发票
+            </el-button>
+
             <el-button
                 size="small" @click="open(10)" type="primary"
             >退号
@@ -801,6 +806,14 @@
       </div>
     </el-dialog>
 
+    <el-dialog
+        class="centerDialog"
+        width="1200px"
+        title="打印"
+        :visible.sync="invoiceVisible">
+      <invoice-print ref="print" :invoiceParams='invoiceParams'></invoice-print>
+    </el-dialog>
+
   </div>
 
 </template>
@@ -808,13 +821,15 @@
 
 <script>
 import axios from 'axios'
-
+import invoicePrint from './invoicePrint'
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import noCharge from './components/noCharge'
 import charged from './components/charged'
 import medicalInsuranceRefund from './components/medicalInsuranceRefund'
 import prescriptionTable from './components/prescriptionTable'
 import additionalCharges from './components/additionalCharges'
+import { fetchAllAdminUsers } from '@/api/doctor'
+
 import {
   changeMedType,
   getChargeHisPatientInfo,
@@ -826,7 +841,8 @@ import {
   Refund,
   refundNumber,
   register,
-  upload
+  upload,
+
 } from '@/api/his/his'
 import RegisterDialog from './components/registerDialog'
 import treatPrint from './treatPrint'
@@ -854,11 +870,14 @@ export default {
     prescriptionTable,
     additionalCharges,
     treatPrint,
-    statementPrint
+    statementPrint,
+    invoicePrint
 
   },
   data() {
     return {
+      invoiceVisible:false,
+      invoiceParams:null,
       temp_med_type: '',
       dialogVisible: false,
       pwdFormVisible: false,
@@ -949,7 +968,7 @@ export default {
 
       other_start_time_two: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
       other_end_time_two: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
-
+      adminUserOptions:[],
       curMonthPrescriptions: null,
       newCurMonthPrescriptions: null,
       big_month_prescriptions: [],
@@ -1025,6 +1044,7 @@ export default {
     }
   },
   created() {
+    this.fetchAllAdminUsers()
     const tableHeight = document.body.clientHeight - 290
     this.tableHeight = tableHeight
     var nowDate = new Date()
@@ -1056,6 +1076,14 @@ export default {
     this.getPatientList()
   },
   methods: {
+    fetchAllAdminUsers() {
+      fetchAllAdminUsers().then(response => {
+        if (response.data.state == 1) {
+          this.adminUserOptions = response.data.data.users
+
+        }
+      })
+    },
     changeTimeTwo() {
       this.getPatientList()
       this.form.diagnosis_time = this.record_date + ' ' + '00:00:00'
@@ -2986,7 +3014,29 @@ export default {
             .catch(function(error) {
             })
 
+      } else if(index == 30){
+
+        let paramsObj = {
+          order_id: this.order.id,
+          patient_id: this.order.patient_id,
+          number: this.order.mdtrt_id,
+          name: this.patientInfo.name,
+          age: this.order.age,
+          gend: this.order.gend,
+          setl_time: this.order.setl_time,
+          chargeName: this.getName(this.order.creator)
+        }
+        this.invoiceParams = paramsObj
+        this.invoiceVisible = true
+
       }
+    }, getName(admin_user_id) {
+      for (let i = 0; i < this.adminUserOptions.length; i++) {
+        if (this.adminUserOptions[i].id == admin_user_id) {
+          return this.adminUserOptions[i].name
+        }
+      }
+
     },
     choosePatient() {
       this.radioStatus = id

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -40,7 +40,7 @@
                     </div>
                     <div>医生签字：{{ doctor ? doctor : '' }}</div>
                 </div>
-            </div>   
+            </div>
             <img style="width:100%;" v-if="org_id == 10138 || org_id == 10278" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
         </div>
     </div>
@@ -56,7 +56,7 @@ export default {
       record_date:String,
       prescription_id:Number,
       ids:String
-    }, 
+    },
     data(){
       return {
         doctorList:[],
@@ -97,10 +97,10 @@ export default {
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){
                var doctor =  response.data.data.doctor
-               
+
                this.doctorList = doctor
              }
-         })   
+         })
      },
 
       getDoctor(id){
@@ -126,8 +126,10 @@ export default {
           patient_id:this.patient_id,
           record_date:this.record_date,
           prescription_id:this.prescription_id,
-          ids:this.ids
-        }
+          ids:this.ids,
+           p_type:2,
+
+         }
         console.log("params",params)
        getPrescriptionPrint(params).then(response=>{
          if(response.data.state == 1){
@@ -152,7 +154,7 @@ export default {
                             }
                         }
                   })
-                
+
               }
             })
             let data = []
@@ -167,9 +169,9 @@ export default {
               if(item.team.id == 0){
                 data2.push(item)
               }
-              
+
             })
-          
+
             this.total = total.toFixed(2)
             this.pre_time = this.advicePrint[0].pre_time
             this.doctor = this.advicePrint[0].doctor
@@ -185,7 +187,7 @@ export default {
             let outputlist1Name = response.data.data.his.patient_info ? JSON.parse(response.data.data.his.patient_info) : {};
             this.faber = outputlist1Name
 
-            
+
           }
        })
      },
@@ -238,7 +240,7 @@ export default {
             }
               addtotal =  Math.floor(addtotal * 100) / 100
         }
-       
+
        }
 
       for (let i = 0; i < this.prescriptions.length; i++) {
@@ -248,7 +250,7 @@ export default {
                 total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
               }
             }
-          
+
             if (this.prescriptions[i].additionalcharge != null) {
               for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
                 addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
@@ -260,7 +262,7 @@ export default {
 
         return total + addtotal
       },
-      
+
      getProjectName(id){
         var project_name = ""
         for(let i=0;i<this.projectList.length;i++){
@@ -275,14 +277,14 @@ export default {
         let newIds = ids.split(',').sort(function(a,b){
           return a-b;
         })
-        
+
         var name = ""
         let nameArr = []
         for(let i=0;i<this.diagnoses.length;i++){
           // if(id == this.diagnoses[i].id){
           //    name = this.diagnoses[i].class_name
           // }
-          
+
           if(newIds.indexOf(this.diagnoses[i].id.toString()) > -1){
             // name += diagnoses[i].class_name + ' '
             nameArr.push(this.diagnoses[i].class_name)
@@ -292,7 +294,7 @@ export default {
         nameArr.map((item,index) => {
           if(item == '尿毒症'){
             newNameArr.push(item)
-            nameArr.splice(index,1,'') 
+            nameArr.splice(index,1,'')
           }
         })
         newNameArr.push(...nameArr)
@@ -316,7 +318,7 @@ export default {
             this.page = 1
             arr.push(item.advices.length)
             item.pageArr.push(arr)
-            
+
           }else if(item.advices.length > 5){
             this.page = parseInt(item.advices.length / 5)
             let num = item.advices.length % 5
@@ -414,7 +416,7 @@ export default {
       var xtuser = this.$store.getters.xt_user;
       this.orgname = xtuser.org.org_name;
       this.org_id = this.$store.getters.xt_user.org_id
-     
+
    },
    watch:{
      ids:function(val){
@@ -429,7 +431,7 @@ export default {
 <style lang="scss" scoped>
 .prescription-print{
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
     margin-bottom: 20px;
     padding:20px 10px;
@@ -487,7 +489,7 @@ export default {
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -14,9 +14,9 @@
                         format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd"
                         placeholder="选择日期时间" align="right"></el-date-picker>
-        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(1)">处方筏批量打印</el-button>
-        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(2)">治疗单批量打印</el-button>
-        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(3)">检验单批量打印</el-button>
+<!--        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(1)">处方筏批量打印</el-button>-->
+<!--        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(2)">治疗单批量打印</el-button>-->
+<!--        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(3)">检验单批量打印</el-button>-->
       </div>
       <el-table :data="tableData" border ref="table" style="width: 100%;" :row-style="{ color: '#303133' }" @selection-change="handleSelectionChange"
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>

src/xt_pages/outpatientDoctorStation/template/printFive.vue

@@ -167,8 +167,10 @@ export default {
           patient_id:this.patient_id,
           record_date:this.record_date,
           prescription_id:this.prescription_id,
-          ids:this.ids
-        }
+          ids:this.ids,
+           p_type:2,
+
+         }
         console.log("params",params)
        getPrescriptionPrint(params).then(response=>{
          if(response.data.state == 1){

src/xt_pages/outpatientDoctorStation/template/printFour.vue

@@ -147,8 +147,10 @@ export default {
           patient_id:this.patient_id,
           record_date:this.record_date,
           prescription_id:this.prescription_id,
-          ids:this.ids
-        }
+          ids:this.ids,
+           p_type:2,
+
+         }
         console.log("params",params)
        getPrescriptionPrint(params).then(response=>{
          if(response.data.state == 1){

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -165,8 +165,10 @@ export default {
           patient_id:this.patient_id,
           record_date:this.record_date,
           prescription_id:this.prescription_id,
-          ids:this.ids
-        }
+          ids:this.ids,
+           p_type:2,
+
+         }
         console.log("params",params)
        getPrescriptionPrint(params).then(response=>{
          if(response.data.state == 1){

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -184,8 +184,10 @@ export default {
           patient_id:this.patient_id,
           record_date:this.record_date,
           prescription_id:this.prescription_id,
-          ids:this.ids
-        }
+          ids:this.ids,
+           p_type:2,
+
+         }
         console.log("params",params)
        getPrescriptionPrint(params).then(response=>{
          if(response.data.state == 1){

src/xt_pages/outpatientDoctorStation/template/printTwo.vue

@@ -112,7 +112,9 @@ export default {
           patient_id:this.patient_id,
           record_date:this.record_date,
           prescription_id:this.prescription_id,
-        }
+           p_type:2,
+
+         }
         console.log("params---",params)
        getPrescriptionPrint(params).then(response=>{
          if(response.data.state == 1){

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -317,7 +317,8 @@
           patient_id: this.patient_id,
           record_date: this.record_date,
           prescription_id: this.prescription_id,
-          ids: this.ids
+          ids: this.ids,
+          p_type:2,
         }
         console.log('999999', params)
         getPrescriptionPrint(params).then(response => {

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -247,7 +247,7 @@ export default {
       //   age++
       // }
       // return age
-      var nowTime = new Date().getTime(); 
+      var nowTime = new Date().getTime();
       //一年毫秒数(365 * 86400000 = 31536000000)
       return Math.ceil((nowTime-(birthday * 1000))/31536000000);
     },
@@ -321,7 +321,9 @@ export default {
           record_date:this.record_date,
           prescription_id:this.prescription_id,
           ids:this.ids,
-        }
+           p_type:2,
+
+         }
         console.log("999999",params)
        getPrescriptionPrint(params).then(response=>{
          if(response.data.state == 1){

src/xt_pages/outpatientTool/yidiClear.vue

@@ -7,15 +7,11 @@
     <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
       <div>
 
-        <el-date-picker
-            v-model="year"
-            type="year"
-            placeholder="选择年">
-        </el-date-picker>
+
         <el-date-picker
             v-model="month"
             type="month"
-            placeholder="选择月">
+            placeholder="选择年月">
         </el-date-picker>
       </div>
       <div>
@@ -98,8 +94,8 @@ export default {
     getYidiClear(){
       var that = this;
       let params = {
-        'year':year,
-        'month':month,
+        'year':this.month.split("-")[0],
+        'month':this.month.split("-")[1],
         'admin_user_id':this.$store.getters.xt_user.user.id,
       };
       axios.get('http://127.0.0.1:9532/api/allopatry/get',{params:params}).then(function(response) {
@@ -127,8 +123,8 @@ export default {
     },comfirmClear(){
       var that = this;
       let params = {
-        'year':year,
-        'month':month,
+        'year':this.month.split("-")[0],
+        'month':this.month.split("-")[1],
         'admin_user_id':this.$store.getters.xt_user.user.id,
       };
       axios.post('http://127.0.0.1:9532/api/comfirmallopatry/post',{params:params}).then(function(response) {

src/xt_pages/supply/components/addSupply.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="40%" :show-close="false">
+  <el-dialog :title="title" :visible.sync="dialogVisible" width="40%" :before-close="closePop" >
     <!-- :before-close="handleClose" 如需要可添加进上方 -->
     <div>
       <el-form

src/xt_pages/supply/supplyQuery.vue

@@ -181,7 +181,7 @@ export default {
       page: 1,
       limit: 10,
 
-      type_name: "请选择",
+      type_name: "",
       crumbs: [
         { path: false, name: "采购管理" },
         { path: "/supply/good/order/query", name: "供应商管理" },