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

src/xt_pages/outpatientCharges/components/otherPrescriptionTable.vue

@@ -0,0 +1,443 @@
+<template>
+  <div class="prescriptionTable">
+    <el-table
+      v-if="prescription.type == 1"
+      :data="prescription.advices"
+      border
+      ref="multipleTable"
+      height="370"
+      style="width: 99%"
+      :row-style="changColor"
+      :header-cell-style="{
+        color: '#606266',
+      }"
+      highlight-current-row
+
+    >
+      <el-table-column
+        fixed
+        align="center"
+        type="index"
+        width="50"
+        label="序号"
+      ></el-table-column>
+      <el-table-column
+        fixed
+        align="center"
+        prop="name"
+        width="300"
+        label="名称"
+      >
+        <template slot-scope="scope"
+        ><span :title="scope.row.drug_name">{{
+            scope.row.drug_name
+          }}</span></template
+        >
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="80" label="规格/型号">
+        <template slot-scope="scope">
+          <div>{{ scope.row.spec }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="80" label="单次用量">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
+          <div>{{ scope.row.single_dose }}{{ scope.row.single_dose_unit }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="80" label="用法">
+        <template slot-scope="scope">
+          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
+          <div>{{ scope.row.delivery_way }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="80" label="频率">
+        <template slot-scope="scope">
+          <div>{{ scope.row.execution_frequency }}</div>
+
+          <!--<el-input v-model="scope.row.execution_frequency" readonly></el-input>-->
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="day" width="80" label="天数">
+        <template slot-scope="scope">{{ scope.row.day }}天</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="80" label="总量">
+        <template slot-scope="scope">{{ scope.row.prescribing_number }}{{scope.row.prescribing_number_unit}}</template>
+      </el-table-column>
+      <el-table-column align="center" prop="name" width="80" label="单价">
+        <template slot-scope="scope">
+          <div>{{ scope.row.retail_price }}元</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="220" label="医保编码">
+        <template slot-scope="scope">
+          <div>{{ scope.row.code }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="60" label="金额">
+        <template slot-scope="scope">
+          <div>{{ scope.row.det_item_fee_sumamt }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="120" label="生产厂家">
+        <template slot-scope="scope">
+          <div>{{ getName(scope.row.name_id) }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="90" label="全自费金额">
+        <template slot-scope="scope">
+          <div>{{ scope.row.fulamt_ownpay_amt }}元</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="90" label="超限价金额">
+        <template slot-scope="scope">
+          <div>{{ scope.row.overlmt_amt }}元</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="name"
+        width="90"
+        label="先行自付金额"
+      >
+        <template slot-scope="scope">
+          <div>{{ scope.row.preselfpay_amt }}元</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="name"
+        width="130"
+        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" :title="scope.row.remark" placeholder="" readonly></el-input>-->
+          <div>{{ scope.row.remark }}</div>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-table
+      v-if="prescription.type == 2"
+      :data="prescription.project"
+      border
+      height="370"
+      ref="multipleTable"
+      style="width: 99%"
+      :row-style="changColor"
+      :header-cell-style="{
+        backgroundColor: 'rgb(245, 247, 250)',
+        color: '#606266',
+      }"
+      highlight-current-row
+    >
+      <el-table-column
+        fixed
+        align="center"
+        type="index"
+        width="50"
+        label="序号"
+      ></el-table-column>
+      <el-table-column
+        fixed
+        align="center"
+        prop="project_name"
+        width="280"
+        label="名称"
+      >
+        <template slot-scope="scope">{{ scope.row.project_name }}</template>
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="statistical_classification"
+        width="80"
+        label="组"
+      >
+        <template slot-scope="scope">{{
+            scope.row.type == 2
+              ? getGroup(scope.row.statistical_classification)
+              : "耗材"
+          }}</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="80" label="规格/型号">
+        <template slot-scope="scope">
+          <div>{{ scope.row.spec }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="single_dose"
+        width="80"
+        label="单次用量"
+      >
+        <template slot-scope="scope"
+        >{{ scope.row.single_dose }}{{ scope.row.unit }}</template
+        >
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="delivery_way"
+        width="80"
+        label="用法"
+      >
+        <template slot-scope="scope">{{ scope.row.delivery_way }}</template>
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="execution_frequency"
+        width="80"
+        label="频率"
+      >
+        <template slot-scope="scope">{{
+            scope.row.execution_frequency
+          }}</template>
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="number_days"
+        width="50"
+        label="天数"
+      >
+        <template slot-scope="scope">{{ scope.row.number_days }}天</template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="total" width="50" label="总量">
+        <template slot-scope="scope">
+          <div>{{ scope.row.total }} {{ scope.row.unit }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="50" label="单价">
+        <template slot-scope="scope">{{ scope.row.price }}元</template>
+      </el-table-column>
+
+
+      <el-table-column align="center" prop="name" width="220" label="医保编码">
+        <template slot-scope="scope">
+          <div>{{ scope.row.medical_code }}</div>
+        </template>
+      </el-table-column>
+
+
+
+      <el-table-column align="center" prop="name" width="60" label="金额">
+        <template slot-scope="scope">
+          <div>{{ scope.row.det_item_fee_sumamt }}元</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="120" label="生产厂家">
+        <template slot-scope="scope">
+          <div>{{ getName(scope.row.name_id) }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="90" label="全自费金额">
+        <template slot-scope="scope">
+          <div>{{ scope.row.fulamt_ownpay_amt }}元</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" prop="name" width="90" label="超限价金额">
+        <template slot-scope="scope">
+          <div>{{ scope.row.overlmt_amt }}元</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="name"
+        width="90"
+        label="先行自付金额"
+      >
+        <template slot-scope="scope">
+          <div>{{ scope.row.preselfpay_amt }}元</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        align="center"
+        prop="name"
+        width="130"
+        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">{{ scope.row.remark }}</template>
+      </el-table-column>
+    </el-table>
+
+    <div class="additionalBox">
+      <div
+        class="additionalOne"
+        v-for="(item, index) in prescription.addition"
+        :key="index"
+      >
+        <span :title="item.item_name">{{ item.item_name }}</span>
+        <el-input
+          v-model="item.price"
+          placeholder=""
+          style="width: 50px"
+          readonly
+        ></el-input>
+        共
+        <el-input
+          v-model="item.count"
+          placeholder=""
+          style="width: 50px"
+          readonly
+        ></el-input>
+        次
+        <!--<i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>-->
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getInitData } from "@/api/his/his";
+import { getDictionaryDataConfig } from "@/utils/data";
+
+export default {
+  props: {
+    prescription: Object,
+    his_patient: Object,
+    schedule: Object,
+    manufacturers: Array,
+  },
+  data() {
+    return {
+      drugways: [],
+      efs: [],
+    };
+  },
+  mounted() {
+    // getInitData().then(response => {
+    //   if (response.data.state == 0) {
+    //     this.$message.error(response.data.msg)
+    //     return false
+    //   } else {
+    //     this.drugways = response.data.data.drugways
+    //     this.efs = response.data.data.efs
+    //   }
+    // })
+  },
+  methods: {
+    changColor({ row, rowIndex }) {
+      if (rowIndex % 2 == 1) {
+        // 变颜色的条件
+        return {
+          backgroundColor: "#C4E1FF",
+          color: "#303133", // 这个return的就是样式 可以是color 也可以是backgroundColor
+        };
+      } else {
+        return {
+          backgroundColor: "#ACD6FF",
+          color: "#303133",
+        };
+      }
+    },
+
+    getName(id) {
+      let name = "";
+      for (let i = 0; i < this.manufacturers.length; i++) {
+        if (id == this.manufacturers[i].id) {
+          name = this.manufacturers[i].manufacturer_name;
+        }
+      }
+      return name;
+    },
+    getGroup(id) {
+      var name = "";
+      var statistics_category = getDictionaryDataConfig(
+        "system",
+        "statistics_category"
+      );
+      // console.log("2235", statistics_category);
+      for (let i = 0; i < statistics_category.length; i++) {
+        if (id == statistics_category[i].id) {
+          name = statistics_category[i].name;
+        }
+      }
+      return name;
+    },
+  },
+  watch:{
+    prescription:function(){
+      this.$nextTick(() => {
+        this.$refs.multipleTable.doLayout();
+        // table加ref="multipleTable"
+      })
+    }
+  },
+  created(){
+    console.log('prescription',this.prescription);
+  }
+};
+</script>
+
+
+<style lang="scss">
+.prescriptionTable {
+.additionalBox {
+  margin-top: 20px;
+  display: flex;
+  flex-wrap: wrap;
+.additionalOne {
+  margin-right: 20px;
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+> span {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 80px;
+  display: inline-block;
+  font-size: 14px;
+}
+}
+.deleteIcon {
+  color: red;
+  margin-left: 5px;
+}
+}
+.el-table th .cell,
+.el-table td .cell {
+  padding: 0 2px;
+  white-space: pre-line;
+}
+.el-icon-delete {
+  color: red;
+}
+}
+</style>

src/xt_pages/outpatientCharges/listPrint.vue

@@ -14,8 +14,8 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      
-      <listPrintforu v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485 && org_id != 10191 "
+
+      <listPrintforu v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485 && org_id != 10191 && org_id != 0"
         :list="list" :patient="patient" :order="order" :admin="admin">
       </listPrintforu>
       <printOne v-if="org_id == 10191" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
@@ -23,7 +23,7 @@
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
 <!--      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>-->
      <list-print-three v-if="org_id == 10215 || org_id==9675  || org_id ==10485" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
-      <print-two10265  v-if="org_id == 10265 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
+      <print-two10265  v-if="org_id == 10265 || org_id == 0 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>
 </template>
@@ -101,7 +101,7 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            if(this.org_id == 10265){
+            if(this.org_id == 10265 || this.org_id == 0){
               this.order = response.data.data.order
               this.patient = response.data.data.patient
               this.admin = response.data.data.admin_info
@@ -186,7 +186,7 @@
                     obj['spec'] = ''
                     obj['unit'] =  infos.project.project.unit
                     obj['is_total']= 0
-
+                    obj['record_date'] = infos.project.record_date
 
                   }else if (infos.project.type == 3){
                     obj['name'] = infos.project.good_info.good_name
@@ -194,7 +194,7 @@
                     obj['code'] = infos.project.good_info.medical_insurance_number
                     obj['unit'] = infos.project.good_info.packing_unit
                     obj['is_total']= 0
-
+                    obj['record_date'] = infos.project.record_date
                   }
 
                 }
@@ -207,7 +207,7 @@
                   obj['feedetl_sn'] =  infos.feedetl_sn
                   obj['spec'] =  infos.advice.drug.dose +  infos.advice.drug.dose_unit+"*" + infos.advice.drug.min_number +  infos.advice.drug.min_unit+"/"+infos.advice.drug.max_unit
                   obj['is_total']= 0
-
+                  obj['record_date'] = infos.advice.record_date
                   // v-if="scope.row.min_unit != scope.row.dose_unit">{{ scope.row.dose }}{{ scope.row.dose_unit }}&nbsp;* &nbsp;</span>{{ scope.row.min_number }}{{ scope.row.min_unit }}/{{ scope.row.max_unit }}
 
 
@@ -380,7 +380,7 @@
         let drug_ids = []
         let project_ids = []
         console.log('details12121212',details);
-        
+
         for (let i = 0; i < details.length; i++) {
           if (details[i].advice && details[i].advice.id > 0 && details[i].advice.prescription && details[i].advice.prescription.type == 1) { //药品
             let obj = {

src/xt_pages/outpatientCharges/listTemplate/listPrintforu.vue

@@ -24,7 +24,7 @@
         
         <table class="listTable" style="text-align: center;">
             <tr style="border-bottom: 1px solid black;">
-              <td style="width:12%" v-if="org_id==10489">开方日期</td>
+              <td style="width:12%" v-if="org_id==10489 || org_id==0">开方日期</td>
               <td style="width:20%">医保编码</td>
               <td style="width:20%">项目名称</td>
               <td style="width:13%">规格</td>
@@ -35,7 +35,9 @@
               <td style="width:8%">自付比例</td>
             </tr>
             <tr v-for="(item,index) in list" style="line-height: 30px;">
-                <td style="width:12%" v-if="org_id==10489">{{getTimes(order.settle_accounts_date) }}</td>
+                <td style="width:12%" v-if="org_id==10489|| org_id==0">
+                  <span v-if="item.code!=undefined">{{getTimes(item.record_date) }}</span>
+                </td>
                 <td style="width:20%">{{item.code}}</td>
                 <td style="width:20%">{{item.name}}</td>
                 <td style="width:13%">{{item.spec}}</td>

src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue

@@ -13,7 +13,7 @@
             ><TD colspan="4" align="center" style="font-size: 20px"
               >{{ $store.getters.xt_user.org.org_name }}费用清单</TD
             ></TR>
-          
+
           <TR>
             <TD colspan="2">个人编码:{{ order.psn_no }}</TD>
             <TD colspan="2">住院号：{{ order.mdtrt_id }}</TD>
@@ -33,7 +33,21 @@
             <TD v-if="order && order.insutype == '310'">
               费别：职工基本医疗保险
             </TD>
-            <TD></TD>
+            <TD> 结算类型：{{order.is_medicine_insurance == 1 ? "医保" : "自费"}} </TD>
+          </TR>
+          <TR>
+            <TD> 就诊流水号：{{ order.mdtrt_id }} </TD>
+            <TD>
+              透析号：{{patient.dialysis_no}}
+            </TD>
+            <TD> 总金额：{{ order.medfee_sumamt }} </TD>
+            <TD> 个人支付金额：{{ order.psn_part_amt }}</TD>
+          </TR>
+          <TR>
+            <TD>
+              基金支付金额：{{ order.fund_pay_sumamt}}
+            </TD>
+            <TD>收费日期：{{getTimes(order.ctime)}}</TD>
           </TR>
         </THEAD>
         <TBODY style="text-align: center">
@@ -58,7 +72,7 @@
                   <TD width="80">单价(元)</TD>
                   <TD width="80">数量</TD>
                   <TD width="80">金额(元)</TD>
-                  <td width="80">自负比例</td>
+<!--                  <td width="80">自负比例</td>-->
                 </TR>
                 <TR v-for="subItem in item.details" :key="subItem">
                   <TD style="white-space: nowrap">{{
@@ -76,10 +90,10 @@
                   <TD>{{
                     (subItem.price * subItem.count).toFixed(2)
                   }}</TD>
-                  <td>
-                    {{(subItem.selfpay_prop)*100}}
-                    <span v-if="subItem.selfpay_prop !=''">%</span>
-                  </td>
+<!--                  <td>-->
+<!--                    {{(subItem.selfpay_prop)*100}}-->
+<!--                    <span v-if="subItem.selfpay_prop !=''">%</span>-->
+<!--                  </td>-->
                 </TR>
                 <TR>
                   <TD style="white-space: nowrap"

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -28,7 +28,7 @@
           <el-radio-group v-model="radio" @change="changeRadio">
             <el-radio :label=1>未收费<span
               style="color: red;margin-bottom:10px;display: inline-block;">{{ cal_one }}</span>人
-            </el-radio>
+            </el-radio>,
             <el-radio :label=2>已收费<span
               style="color: red;margin-bottom:10px;display: inline-block;">{{ cal_two }}</span>人
             </el-radio>
@@ -729,9 +729,12 @@
                           </el-tab-pane>
 
 
-                          <prescription-table ref="prescription_tables"
+                          <prescription-table v-if="activeName == 'first' || activeName == 'second'"  ref="prescription_tables"
                                               :prescription="items.curPrescriptions"
                                               :manufacturers="manufacturers"></prescription-table>
+                          <other-prescription-table v-if="activeName == 'third'" ref="prescription_tables"
+                                                    :prescription="items.curPrescriptions"
+                                                    :manufacturers="manufacturers"></other-prescription-table>
                           <!--</el-radio-group>-->
                         </el-tabs>
                       </div>
@@ -1022,10 +1025,12 @@ import cryptoJs from 'crypto-js'
 import NewStatementPrintThree from './newStatementPrintThree.vue'
 import CallUnAssociationPrescription from './components/callUnAssociationPrescription.vue'
 import { associationprescription, checkHISPatient } from '../../api/his/his_tools'
+import OtherPrescriptionTable from './components/otherPrescriptionTable.vue'
 
 const moment = require('moment')
 export default {
   components: {
+    OtherPrescriptionTable,
     CallUnAssociationPrescription,
     NewStatementPrintThree,
     RegisterDialog9504,