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

src/xt_pages/outpatientCharges/allListPrint.vue

     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne  v-if="org_id != 10215 && org_id != 0 && org_id !=9671" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
-      <summary-print v-if="org_id == 10215|| org_id == 0 || org_id ==9671" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
+      <printOne  v-if="org_id != 10215 && org_id != 0 && org_id !=9671&&org_id !=9675" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
+      <summary-print v-if="org_id == 10215|| org_id == 0 || org_id ==9671 ||org_id ==9675" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
 
 <!--      <list-print-two :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></list-print-two>-->
     </div>
 
       },
       printThisPage() {
-
         const style =
           '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+         const style1 =
+          '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr td {padding: 0 5px;} .allListTable .allListTable_1{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable_1 tr{page-break-inside:avoid;} .allListTable_1 tr td {padding: 0 5px;border: 1px solid #000;} .tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+        
+        if(this.org_id == 10215 || this.org_id == 0 ||this.org_id == 9675){
+          printJS({
+          printable: 'allList-print',
+          type: 'html',
+          style: style1,
+          scanStyles: false
+        })
+        }else{
         printJS({
           printable: 'allList-print',
           type: 'html',
           style: style,
           scanStyles: false
         })
+        }
+
+        
+        
 
         // if (this.org_template_info.template_id == 1) {
         //   printJS({

src/xt_pages/outpatientCharges/allListTemplate/summaryPrint.vue

 <template>
   <div id="allList-print" class="allList-print">
-    <div class="allListTitle">
-      {{ $store.getters.xt_user.org.org_name }}汇总清单
-    </div>
-    <div class="allListInfo" style="border-top: 1px solid;">
-      <div>科别：门诊</div>
-      <div>床号：</div>
-      <div>门诊号：{{ order.mdtrt_id }}</div>
-      <div>姓名：{{ patient.name }}</div>
-    </div>
-
-    <div class="allListInfo" style="border-bottom: 1px solid;">
-      <div>预交款：</div>
-      <div>总费用：{{ order.medfee_sumamt }}</div>
-      <div>门诊日期：{{ hospital.in_hosptial_time? hospital.in_hosptial_time.split(' ')[0]:''}}</div>
-    </div>
-
-    <div class="allListInfo">
-      <div>
-        西药:&nbsp;&nbsp;&nbsp;{{
-          order.westernMedicineCostTotal? order.westernMedicineCostTotal.toFixed(2)  : ""
-        }}
-      </div>
-      <div>
-        中成药:{{
-          order.chineseTraditionalMedicineCostTotal
-            ? order.chineseTraditionalMedicineCostTotal.toFixed(2)
-              : ""
-        }}
-      </div>
-      <div>中草药:</div>
-    </div>
-
-    <div class="allListInfo">
-      <div>检查费:{{ order.checkCostTotal ? order.checkCostTotal.toFixed(2)  : "" }}</div>
-      <div>输氧费:</div>
-      <div>
-        手术费:{{ order.operationCostTotal ? order.operationCostTotal.toFixed(2)  : "" }}
-      </div>
-    </div>
-
-    <div class="allListInfo">
-      <div>
-        化验费:{{ order.laboratoryCostTotal ? order.laboratoryCostTotal.toFixed(2)  : "" }}
-      </div>
-      <div>输血费:</div>
-      <div>
-        诊察费:{{ order.zhenChaCostTotal ? order.zhenChaCostTotal.toFixed(2)  : "" }}
-      </div>
-    </div>
-
-    <div class="allListInfo">
-      <div>治疗费:{{ order.treatCostTotal ? order.treatCostTotal.toFixed(2)  : "" }}</div>
-      <div>护理费:</div>
-      <div>床位费:{{ order.bedCostTotal ? order.bedCostTotal.toFixed(2)  : "" }}</div>
-    </div>
-    <div class="allListInfo">
-      <div>麻醉费:</div>
-      <div>
-        材料费:{{ order.materialCostTotal ? order.materialCostTotal.toFixed(2)  : "" }}
-      </div>
-      <div>其他:{{ order.otherCostTotal ? order.otherCostTotal.toFixed(2)  : "" }}</div>
-    </div>
-    <!--    <div style="display:flex;justify-content: space-between;">-->
-    <!--          <div style="position: absolute;top:160px;left:40px">西药</div>-->
-    <!--          <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>-->
-    <!--          <div style="position: absolute;top:160px;left:180px">检查费</div>-->
-    <!--          <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>-->
-    <!--          <div style="position: absolute;top:160px;left:340px">化验费</div>-->
-    <!--          <div style="position: absolute;top:160px;left:420px">{{ list.treatCostTotal }}</div>-->
-    <!--          <div style="position: absolute;top:160px;left:500px">治疗费</div>-->
-    <!--          <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
-    <!--          <div style="position: absolute;top:160px;left:500px">麻醉费</div>-->
-    <!--          <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
-    <!--    </div>-->
-    <!--    <div style="display:flex;justify-content: space-between;">-->
-    <!--      <div style="position: absolute;top:190px;left:40px">中成药</div>-->
-    <!--      <div style="position: absolute;top:190px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>-->
-    <!--      <div style="position: absolute;top:190px;left:180px">输氧费</div>-->
-    <!--      <div style="position: absolute;top:190px;left:260px">{{ list.laboratoryCostTotal }}</div>-->
-    <!--      <div style="position: absolute;top:190px;left:340px">输血费</div>-->
-    <!--      <div style="position: absolute;top:190px;left:420px">{{ list.operationCostTotal }}</div>-->
-    <!--      <div style="position: absolute;top:190px;left:500px">护理费</div>-->
-    <!--      <div style="position: absolute;top:190px;left:580px">{{ list.otherCostTotal }}</div>-->
-
-    <!--      <div style="position: absolute;top:160px;left:500px">材料费</div>-->
-    <!--      <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
-    <!--    </div>-->
-    <!--    <div style="display:flex;justify-content: space-between;">-->
-    <!--      <div style="position: absolute;top:210px;left:40px">中草药</div>-->
-    <!--      <div style="position: absolute;top:210px;left:110px"></div>-->
-    <!--      <div style="position: absolute;top:210px;left:180px">手术费</div>-->
-    <!--      <div style="position: absolute;top:210px;left:260px"></div>-->
-    <!--      <div style="position: absolute;top:210px;left:340px">诊察费</div>-->
-    <!--      <div style="position: absolute;top:210px;left:420px">{{ list.materialCostTotal }}</div>-->
-    <!--      <div style="position: absolute;top:210px;left:500px">床位费</div>-->
-    <!--      <div style="position: absolute;top:210px;left:580px"></div>-->
-    <!--      <div style="position: absolute;top:160px;left:500px">其他</div>-->
-    <!--      <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
-    <!--    </div>-->
-
-    <table class="allListTable" border="1">
-      <tr>
-        <td style="width: 10%">费用类别</td>
-        <td style="width: 35%">项目名称</td>
-        <td style="width: 5%">单位</td>
-        <td style="width: 10%">数量</td>
-        <td style="width: 10%">单价</td>
-        <td style="width: 10%">金额</td>
-        <td style="width: 10%">医保类型</td>
-      </tr>
-      <template v-for="(item, index) in list">
-        <tr v-if="item.is_total == 2">
-          <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
-          <td
-            style="
-              width: 35%;
-              white-space: nowrap;
-              overflow: hidden;
-              text-overflow: ellipsis;
-            "
+    <table
+      class="allListTable"
+      border="0"
+      cellspacing="0"
+      style="font-size: 14px"
+      align="center"
+    >
+      <THEAD
+        style="
+          display: table-header-group;
+          font-weight: bold;
+        "
+      >
+        <TR style="border-bottom: 1px solid">
+          <TD colspan="4" align="center" style="font-size: 20px">
+            {{ $store.getters.xt_user.org.org_name }}汇总清单
+          </TD>
+        </TR>
+        <TR>
+          <TD colspan="1">科别：门诊</TD>
+          <TD width="130">床号：</TD>
+          <TD>门诊号：{{ order.mdtrt_id }}</TD>
+          <TD>姓名：{{ patient.name }}</TD>
+        </TR>
+        <TR style="border-bottom: 1px solid">
+          <TD colspan="2"> 预交款：</TD>
+          <TD>总费用：{{ order.medfee_sumamt }} </TD>
+          <TD
+            >门诊日期：{{
+              hospital.in_hosptial_time
+                ? hospital.in_hosptial_time.split(" ")[0]
+                : ""
+            }}</TD
+          >
+        </TR>
+        <TR>
+          <TD colspan="2">
+            西药:&nbsp;&nbsp;&nbsp;{{
+              order.westernMedicineCostTotal
+                ? order.westernMedicineCostTotal.toFixed(2)
+                : ""
+            }}</TD
+          >
+          <TD
+            >中成药:{{
+              order.chineseTraditionalMedicineCostTotal
+                ? order.chineseTraditionalMedicineCostTotal.toFixed(2)
+                : ""
+            }}</TD
+          >
+          <TD>中草药:</TD>
+        </TR>
+        <TR>
+          <TD colspan="2">
+            检查费:{{
+              order.checkCostTotal ? order.checkCostTotal.toFixed(2) : ""
+            }}</TD
+          >
+          <TD>输氧费:</TD>
+          <TD
+            >手术费:{{
+              order.operationCostTotal
+                ? order.operationCostTotal.toFixed(2)
+                : ""
+            }}</TD
+          >
+        </TR>
+        <TR>
+          <TD colspan="2"
+            >化验费:{{
+              order.laboratoryCostTotal
+                ? order.laboratoryCostTotal.toFixed(2)
+                : ""
+            }}</TD
+          >
+          <TD>输血费:</TD>
+          <TD
+            >诊察费:{{
+              order.zhenChaCostTotal ? order.zhenChaCostTotal.toFixed(2) : ""
+            }}</TD
+          >
+        </TR>
+        <TR>
+          <TD colspan="2"
+            >治疗费:{{
+              order.treatCostTotal ? order.treatCostTotal.toFixed(2) : ""
+            }}</TD
+          >
+          <TD>护理费:</TD>
+          <TD
+            >床位费:{{
+              order.bedCostTotal ? order.bedCostTotal.toFixed(2) : ""
+            }}</TD
           >
-            {{ item.name }}{{ item.spec }}
-          </td>
-          <td style="width: 5%">{{ item.unit }}</td>
-          <td style="width: 10%; text-align: right">{{ item.count }}</td>
-          <td style="width: 10%; text-align: right">
-            {{ item.price.toFixed(4) }}
-          </td>
-          <td style="width: 10%; text-align: right">
-            {{ (item.price * item.count).toFixed(2) }}
-          </td>
-          <td style="width: 10%">{{ item.medicine_insurance_kind }}</td>
-        </tr>
-        <tr v-if="item.is_total == 1">
-          <td style="width: 10%"></td>
-          <td
-            style="
-              width: 35%;
-              white-space: nowrap;
-              overflow: hidden;
-              text-overflow: ellipsis;
-            "
+        </TR>
+        <TR>
+          <TD colspan="2">麻醉费:</TD>
+          <TD
+            >材料费:{{
+              order.materialCostTotal ? order.materialCostTotal.toFixed(2) : ""
+            }}</TD
           >
-            合计
-          </td>
-          <td style="width: 5%"></td>
-          <td style="width: 10%; text-align: right"></td>
-          <td style="width: 10%; text-align: right"></td>
-          <td style="width: 10%; text-align: right">{{ item.total }}</td>
-          <td style="width: 10%"></td>
-        </tr>
-      </template>
+          <TD
+            >其他:{{
+              order.otherCostTotal ? order.otherCostTotal.toFixed(2) : ""
+            }}</TD
+          >
+        </TR>
+      </THEAD>
+
+      <TBODY style="text-align: center">
+        <TR>
+          <TD colspan="4">
+            <Table class="allListTable_1" border="1">
+              <TR>
+                <TH width="70"> 费用类别 </TH>
+                <TH width="70"> 项目名称 </TH>
+                <TH width="70">单位</TH>
+                <TH width="70">数量</TH>
+                <TH width="70">单价</TH>
+                <TH width="70">金额</TH>
+                <TH width="70">医保类型</TH>
+              </TR>
+              <template v-for="(item, index) in list">
+                <tr v-if="item.is_total == 2">
+                  <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
+                  <td
+                    style="
+                      width: 35%;
+                      white-space: nowrap;
+                      overflow: hidden;
+                      text-overflow: ellipsis;
+                    "
+                  >
+                    {{ item.name }}{{ item.spec }}
+                  </td>
+                  <td style="width: 5%">{{ item.unit }}</td>
+                  <td style="width: 10%; text-align: right">
+                    {{ item.count }}
+                  </td>
+                  <td style="width: 10%; text-align: right">
+                    {{ item.price.toFixed(4) }}
+                  </td>
+                  <td style="width: 10%; text-align: right">
+                    {{ (item.price * item.count).toFixed(2) }}
+                  </td>
+                  <td style="width: 10%">{{ item.medicine_insurance_kind }}</td>
+                </tr>
+                <tr v-if="item.is_total == 1">
+                  <td style="width: 10%"></td>
+                  <td
+                    style="
+                      width: 35%;
+                      white-space: nowrap;
+                      overflow: hidden;
+                      text-overflow: ellipsis;
+                    "
+                  >
+                    合计
+                  </td>
+                  <td style="width: 5%"></td>
+                  <td style="width: 10%; text-align: right"></td>
+                  <td style="width: 10%; text-align: right"></td>
+                  <td style="width: 10%; text-align: right">
+                    {{ item.total }}
+                  </td>
+                  <td style="width: 10%"></td>
+                </tr>
+              </template>
+            </Table>
+          </TD>
+        </TR>
+      </TBODY>
     </table>
   </div>
 </template>
   },
   watch: {
     list: {
-     
       handler(newVal) {
         this.getPage();
       },
   margin: 10px 0;
 }
 
-.allListInfo div{
+.allListInfo div {
   min-width: 200px;
 }
 
   padding: 0 5px;
 }
 
+.allListTable_1 {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 20px;
+  font-size: 14px;
+  border-color: #000;
+  text-align: left;
+}
+
+.allListTable_1 tr td {
+  padding: 0 5px;
+}
+
 .tableBottom {
   font-size: 16px;
   display: flex;
 .tableBottomOne {
   margin-right: 40px;
 }
+
 </style>

src/xt_pages/outpatientCharges/listPrint.vue

     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne v-if="org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id != 0" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <printOne v-if="org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id != 0 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <printTwo 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"></printTwo>
       <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 " :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
-      <print-two10265  v-if="org_id == 10265 || org_id == 0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
+      <list-print-two v-if="org_id == 10215 || org_id == 0 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
+      <print-two10265  v-if="org_id == 10265 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>
 </template>
               }
 
               this.list.sort((a,b) => a.sort < b.sort ? 1 : a.sort > b.sort ? -1 : 0)
-              console.log(this.list)
+              console.log(this.list,'sssss')
 
             }else{
               this.order = response.data.data.order
 
       printThisPage() {
         if(this.org_id != 10106){
-          if(this.org_id == 10215){
+          if(this.org_id == 10215 || this.org_id == 0|| this.org_id == 9675){
             const style =
-                '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+                '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}  .listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;} .allListTable{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr{page-break-inside:avoid;} .allListTable tr td {padding: 0 5px;border: 1px solid #000;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
             printJS({
               printable: 'allList-print',
               type: 'html',
                 '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;}}'
             printJS({
               printable: 'list-print',
-              type: 'html',
+              type: 'html', 
               style: style,
               scanStyles: false
             })

src/xt_pages/outpatientCharges/listTemplate/listPrintTwo.vue

 <template>
   <div id="allList-print" class="allList-print">
-    <div class="allListTitle">
-      {{ $store.getters.xt_user.org.org_name }}费用清单
-    </div>
-    <div class="allListInfo">
+    <table
+      class="listTable"
+      border="0"
+      cellspacing="0"
+      style="font-size: 14px"
+      align="center"
+    >
+      <THEAD
+        style="
+          display: table-header-group;
+          font-weight: bold;
+        "
+      >
+        <TR>
+          <TD colspan="3" align="center" style="font-size: 20px">
+            {{ $store.getters.xt_user.org.org_name }}费用清单
+          </TD>
+        </TR>
+        <TR>
+          <TD colspan="1">患者姓名：{{ patient.name }}</TD>
+          <TD>性别：{{ patient.gender == 1 ? "男" : "女" }}</TD>
+          <TD
+            >结算类型：{{
+              order.is_medicine_insurance == 1 ? "医保" : "自费"
+            }}</TD
+          >
+        </TR>
+        <TR>
+          <TD> 住院/门诊号：{{ order.mdtrt_id }} </TD>
+          <TD>科室：血透 </TD>
+          <TD>就诊流水号：{{ order.mdtrt_id }}</TD>
+        </TR>
+        <TR>
+          <TD> 总费用：{{ order.medfee_sumamt }} </TD>
+          <TD>个人支付：{{ order.psn_part_amt }} </TD>
+          <TD>基金支付记账：{{ order.fund_pay_sumamt }}</TD>
+        </TR>
+        <TR>
+          <TD>补充医疗支付记账：0.00</TD>
+          <TD>救助支付金额：{{ order.maf_pay }}</TD>
+          <TD></TD>
+        </TR>
+      </THEAD>
+
+      <TBODY style="text-align: center">
+        <TR>
+          <TD colspan="3">
+            <Table class="allListTable" border="1">
+              <TR>
+                <TD style="width: 5%">序号</TD>
+                <TD style="width: 15%">处方日期</TD>
+                <TD style="width: 10%">费用编号</TD>
+                <TD style="width: 40%">费用名称</TD>
+                <TD style="width: 5%">单位</TD>
+                <TD style="width: 5%">数量</TD>
+                <TD style="width: 10%">单价</TD>
+                <TD style="width: 10%">金额</TD>
+              </TR>
+              <template v-for="(item, index) in list">
+                <tr v-if="item.is_total == 0">
+                  <td style="width: 5%">{{ index + 1 }}</td>
+                  <td style="width: 15%">{{ item.p_time }}</td>
+                  <td style="width: 10%">
+                    {{ item.feedetl_sn.split("-")[2] }}
+                  </td>
+                  <td style="width: 30%; white-space: nowrap; overflow: hidden">
+                    {{ item.name }}{{ item.spec }}
+                  </td>
+                  <td style="width: 5%">{{ item.unit }}</td>
+                  <td style="width: 5%; text-align: right">{{ item.count }}</td>
+                  <td style="width: 10%; text-align: right">
+                    {{ item.price }}
+                  </td>
+                  <td style="width: 10%; text-align: right">
+                    {{ (item.price * item.count).toFixed(2) }}
+                  </td>
+                </tr>
+                <tr v-if="item.is_total == 1">
+                  <td style="width: 5%"></td>
+                  <td style="width: 15%"></td>
+                  <td style="width: 10%"></td>
+                  <td style="width: 30%; white-space: nowrap; overflow: hidden">
+                    {{ item.name }}
+                  </td>
+                  <td style="width: 5%"></td>
+                  <td style="width: 5%"></td>
+                  <td style="width: 10%; text-align: right"></td>
+                  <td style="width: 10%; text-align: right">
+                    {{ item.price }}
+                  </td>
+                </tr>
+              </template>
+            </Table>
+          </TD>
+        </TR>
+      </TBODY>
+    </table>
+    <!-- <div class="allListTitle">
+      
+    </div> -->
+    <!-- <div class="allListInfo">
       <div style="text-align: left">患者姓名：{{ patient.name }}</div>
       <div style="text-align: left; padding-left: -20px">
         性别：{{ patient.gender == 1 ? "男" : "女" }}
       <div style="text-align: left">
         结算类型：{{ order.is_medicine_insurance == 1 ? "医保" : "自费" }}
       </div>
-      <!--        <div>发票号码：</div>-->
-    </div>
+    </div> 
 
-    <div class="allListInfo">
+     <div class="allListInfo">
       <div style="text-align: left">住院/门诊号：{{ order.mdtrt_id }}</div>
       <div style="text-align: left">科室：血透</div>
       <div style="text-align: left">就诊流水号：{{ order.mdtrt_id }}</div>
       <div style="text-align: left">
         基金支付记账：{{ order.fund_pay_sumamt }}
       </div>
-    </div>
+    </div> 
 
     <div class="allListInfo">
       <div style="text-align: left">补充医疗支付记账：0.00</div>
       <div style="text-align: left">救助支付金额：{{ order.maf_pay }}</div>
       <div></div>
-    </div>
-    <table class="allListTable" border="1">
-      <tr>
-        <td style="width: 5%">序号</td>
-        <td style="width: 15%">处方日期</td>
-        <td style="width: 10%">费用编号</td>
-        <td style="width: 40%">费用名称</td>
-        <td style="width: 5%">单位</td>
-        <td style="width: 5%">数量</td>
-        <td style="width: 10%">单价</td>
-        <td style="width: 10%">金额</td>
-      </tr>
-      <template v-for="(item, index) in list">
-        <tr v-if="item.is_total == 0">
-          <td style="width: 5%">{{ index + 1 }}</td>
-          <td style="width: 15%">{{ item.p_time }}</td>
-          <td style="width: 10%">{{ item.feedetl_sn.split("-")[2] }}</td>
-          <td style="width: 30%; white-space: nowrap; overflow: hidden">
-            {{ item.name }}{{ item.spec }}
-          </td>
-          <td style="width: 5%">{{ item.unit }}</td>
-          <td style="width: 5%; text-align: right">{{ item.count }}</td>
-          <td style="width: 10%; text-align: right">{{ item.price }}</td>
-          <td style="width: 10%; text-align: right">
-            {{ (item.price * item.count).toFixed(2) }}
-          </td>
-        </tr>
-        <tr v-if="item.is_total == 1">
-          <td style="width: 5%"></td>
-          <td style="width: 15%"></td>
-          <td style="width: 10%"></td>
-          <td style="width: 30%; white-space: nowrap; overflow: hidden">
-            {{ item.name }}
-          </td>
-          <td style="width: 5%"></td>
-          <td style="width: 5%"></td>
-          <td style="width: 10%; text-align: right"></td>
-          <td style="width: 10%; text-align: right">{{ item.price }}</td>
-        </tr>
-      </template>
-    </table>
+    </div>-->
   </div>
 </template>
 
   margin-top: 20px;
 }
 
+.tableBottomOne {
+  margin-right: 40px;
+}
+
+.listTable {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 40px;
+  font-size: 14px;
+  border-color: #000;
+  text-align: left;
+}
+.listTable thead {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 40px;
+  font-size: 14px;
+  border-color: #000;
+  text-align: left;
+}
+.listTable thead tr td {
+  padding: 0 5px;
+}
+.tableBottom {
+  font-size: 16px;
+  display: flex;
+  margin-top: 20px;
+}
 .tableBottomOne {
   margin-right: 40px;
 }

src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue

           <TR
             ><TD colspan="4" align="center" style="font-size: 20px"
               >{{ $store.getters.xt_user.org.org_name }}费用清单</TD
-            ></TR
-          >
+            ></TR>
+          
           <TR>
             <TD colspan="1">个人编码:{{ order.psn_no }}</TD>
             <TD>住院号：{{ order.mdtrt_id }}</TD>

src/xt_pages/outpatientTool/components/detailStatistics.vue

       }
     },
     searchAction() {
-      // let table_id = this.$store.getters.pagedata.list.table_id;
-      // if (table_id == undefined) {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: 0,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // } else {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: table_id,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // }
+      let table_id = this.$store.getters.pagedata.list.table_id;
+      if (table_id == undefined) {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: 0,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      } else {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: table_id,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      }
       this.getHisSummaryDetailList();
     },
     changeDate() {
     },
     changeItem(id) {
       this.id = id;
-      // let table_id = this.$store.getters.pagedata.list.table_id;
-      // if (table_id == undefined) {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: 0,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // } else {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: table_id,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // }
+      let table_id = this.$store.getters.pagedata.list.table_id;
+      if (table_id == undefined) {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: 0,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      } else {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: table_id,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      }
       this.getHisSummaryDetailList();
     },
     getHisSummaryDetailList() {
 
           var new_arr = [];
 
-          
+          let list_1 = this.$store.getters.pagedata.list;
+          if (list_1.keywords == undefined) {
+            this.keywords = "";
+          } else {
+            this.keywords = list_1.keywords;
+          }
+          this.id = list_1.type_id;
+          this.item_type = this.id;
+          if(this.item_type == undefined){
+            this.item_type = "0"
+          }else{
+            this.item_type = this.id;
+          }
 
+          
           if (this.keywords != "") {
             for (let i = 0; i < this.tableData.length; i++) {
               if (this.tableData[i].index != "合计") {
       // start_time: this.chargeDate[0],
       // end_time: this.chargeDate[1],
       // patient_id:this.patient_id
-      // let table_id = this.$store.getters.pagedata.list.table_id;
-      // if (table_id == undefined) {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: 0,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // } else {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: table_id,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // }
+      let table_id = this.$store.getters.pagedata.list.table_id;
+      if (table_id == undefined) {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: 0,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      } else {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: table_id,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      }
     },
     getPrice(val) {
       var total_price = 0;
     },
   },
   created() {
-    // let list_1 = this.$store.getters.pagedata.list;
-    //       if (list_1.start_time == "") {
-    //         this.chargeDate[0] = this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");;
-    //       } else {
-    //         this.chargeDate[0] = list_1.start_time;
-    //       }
-    //        if (list_1.end_time == "") {
-    //         this.chargeDate[1] = this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");;
-    //       } else {
-    //         this.chargeDate[1] = list_1.end_time;
-    //       }
+    let list_1 = this.$store.getters.pagedata.list;
+          if (!list_1.start_time ||list_1.start_time == "") {
+            this.chargeDate[0] = this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");;
+          } else {
+            this.chargeDate[0] = list_1.start_time;
+          }
+           if (!list_1.end_time ||list_1.end_time == "") {
+            this.chargeDate[1] = this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");;
+          } else {
+            this.chargeDate[1] = list_1.end_time;
+          }
     this.start_time = this.chargeDate[0];
     this.end_time = this.chargeDate[1];
     this.getHisSummaryDetailList();

src/xt_pages/outpatientTool/components/gatherStatistics.vue

   },
   methods: {
     searchAction() {
-    //  let table_id = this.$store.getters.pagedata.list.table_id;
-    //   if (table_id == undefined) {
-    //     this.$store.commit("SET_PAGEDATA", {
-    //       table_id: 0,
-    //       type_id: this.id,
-    //       keywords: this.keywords,
-    //       start_time: this.chargeDate[0],
-    //       end_time: this.chargeDate[1],
-    //       patient_id: this.patient_id,
-    //     });
-    //   } else {
-    //     this.$store.commit("SET_PAGEDATA", {
-    //       table_id: table_id,
-    //       type_id: this.id,
-    //       keywords: this.keywords,
-    //       start_time: this.chargeDate[0],
-    //       end_time: this.chargeDate[1],
-    //       patient_id: this.patient_id,
-    //     });
-    //   }
+      let table_id = this.$store.getters.pagedata.list.table_id;
+      if (table_id == undefined) {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: 0,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      } else {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: table_id,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      }
       this.tableList = [];
       this.getGatherDetailList();
-      console.log(this.tableList, "查看条约");
+      // console.log(this.tableList, "查看条约");
     },
     getPrice(val) {
       var total_price = 0;
     },
     changeItem(id) {
       this.id = id;
-      // let table_id = this.$store.getters.pagedata.list.table_id;
-      // if (table_id == undefined) {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: 0,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // } else {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: table_id,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // }
+      let table_id = this.$store.getters.pagedata.list.table_id;
+      if (table_id == undefined) {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: 0,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      } else {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: table_id,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      }
       this.tableList = [];
       this.getGatherDetailList();
     },
           this.medicalInsuranceLevelList =
             response.data.data.medicalInsuranceLevelList;
 
-          // let list_1 = this.$store.getters.pagedata.list;
-          // if (list_1.keywords == undefined) {
-          //   this.keywords = "";
-          // } else {
-          //   this.keywords = list_1.keywords;
-          // }
-          // this.id = list_1.type_id;
-          // this.item_type = this.id
+          let list_1 = this.$store.getters.pagedata.list;
+          if (list_1.keywords == undefined) {
+            this.keywords = "";
+          } else {
+            this.keywords = list_1.keywords;
+          }
+          this.id = list_1.type_id;
+          this.item_type = this.id;
+          if(this.item_type == undefined){
+            this.item_type = "0"
+          }else{
+            this.item_type = this.id;
+          }
+          console.log(this.item_type,'this.item_type')
+          
 
-          if(this.keywords!=""){
-          for(let i=0;i<this.tableList.length;i++){
-          if(this.tableList[i].name.indexOf(this.keywords) >-1){
-              new_arr.push(this.tableList[i])
+          if (this.keywords != "") {
+            for (let i = 0; i < this.tableList.length; i++) {
+              if (this.tableList[i].name.indexOf(this.keywords) > -1) {
+                new_arr.push(this.tableList[i]);
+              }
+            }
+            var obj = { index: "合计", is_total: 1, total: 0 };
+            obj.total = this.getPrice(new_arr);
+            this.tableList = [];
+            this.tableList = new_arr;
           }
-        }
-        var obj ={index:"合计",is_total:1,total:0}
-        obj.total = this.getPrice(new_arr)
-        this.tableList = []
-        this.tableList = new_arr
-      }
           if (this.id == 1) {
             var new_arr = [];
             for (let i = 0; i < this.tableList.length; i++) {
           "&id=" +
           this.id,
       });
-      //   let table_id = this.$store.getters.pagedata.list.table_id;
-      // if (table_id == undefined) {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: 0,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // } else {
-      //   this.$store.commit("SET_PAGEDATA", {
-      //     table_id: table_id,
-      //     type_id: this.id,
-      //     keywords: this.keywords,
-      //     start_time: this.chargeDate[0],
-      //     end_time: this.chargeDate[1],
-      //     patient_id: this.patient_id,
-      //   });
-      // }
+      let table_id = this.$store.getters.pagedata.list.table_id;
+      if (table_id == undefined) {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: 0,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      } else {
+        this.$store.commit("SET_PAGEDATA", {
+          table_id: table_id,
+          type_id: this.id,
+          keywords: this.keywords,
+          start_time: this.chargeDate[0],
+          end_time: this.chargeDate[1],
+          patient_id: this.patient_id,
+        });
+      }
     },
     toPrintInvoice() {
       this.$router.push({
       return name;
     },
   },
-  created() {  
-    // let list_1 = this.$store.getters.pagedata.list;
-    //       if (list_1.start_time == "") {
-    //         this.chargeDate[0] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");
-    //       } else {
-    //         this.chargeDate[0] = list_1.start_time;
-    //       }
-    //        if (list_1.end_time == "") {
-    //         this.chargeDate[1] = moment(new Date()).add("year", 0).format("YYYY-MM-DD");
-    //       } else {
-    //         this.chargeDate[1] = list_1.end_time;
-    // }
+  created() {
+    let list_1 = this.$store.getters.pagedata.list;
+    if (!list_1.start_time || list_1.start_time == "") {
+      this.chargeDate[0] = moment(new Date())
+        .add("year", 0)
+        .format("YYYY-MM-DD");
+    } else {
+      this.chargeDate[0] = list_1.start_time;
+    }
+    if (!list_1.end_time || list_1.end_time == "") {
+      this.chargeDate[1] = moment(new Date())
+        .add("year", 0)
+        .format("YYYY-MM-DD");
+    } else {
+      this.chargeDate[1] = list_1.end_time;
+    }
 
-    console.log(this.chargeDate[0],'测试测试')  
-    
     this.start_time = this.chargeDate[0];
     this.end_time = this.chargeDate[1];
     this.tableList = [];
     this.getGatherDetailList();
-    // console.log(this.start_time,this.end_time,'ooooooo')
-    
   },
   watch: {
     patient_id: function () {

src/xt_pages/outpatientTool/detailPrint.vue

       <el-button type="primary" @click="printtpage">打印</el-button>
     </div>
     <div id="list-print" class="list-print">
-      <div class="listTitle">
+      <table class="listTable"
+        border="0"
+        cellspacing="0"
+        style="font-size: 14px"
+        align="center">
+        <thead style="display: table-header-group; font-weight: bold;border-bottom: 1px solid;">
+          <tr
+            ><td colspan="4" align="center" style="font-size: 20px"
+              >{{ $store.getters.xt_user.org.org_name }}费用清单</td
+            ></tr
+          >
+          <tr>
+            <td>患者姓名：{{ patient.name }}</td>
+            <td>性别：{{ patient.gender == 1 ? "男" : "女" }}</td>
+            <td>结算类别：
+          <!-- {{ getType(his_patient.balance_accounts_type) }} -->
+          {{getType(his_record_patient.balance_accounts_type)}}</td>
+            <td>发票号码：{{order.fa_piao_number}}</td>
+          </tr>
+          <tr>
+            <td>住院/门诊号：
+          <!-- {{his_patient.number}} -->
+          {{his_record_patient.ipt_otp_no}}</td>
+            <td>科室：
+          <!-- {{ getDepartment(his_patient.departments) }} -->
+          {{ getDepartment(his_record_patient.departments) }}</td>
+            <td>就诊流水号：
+          <!-- {{ his_patient.number }} -->
+          {{his_record_patient.number}}</td>
+          </tr>
+          <tr>
+            <td>总费用：{{ getAllPice() }}</td>
+            <td>个人支付：
+          <!-- <span v-if="this.$route.query.balance_accounts_type == 2 && his_patient.id >0">{{ getAllPice() }}</span>
+          <span v-if="this.$route.query.balance_accounts_type != 2 && his_patient.id >0">{{ getActPay() }}</span> -->
+          
+          <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
+          <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
+            </td>
+            <td>基金支付记账：{{ getFundPaySumamt() }}</td>
+            <td>补充医疗支付记账：{{ getHifesPay() }}</td>
+          </tr>
+          <tr>
+            <td>
+              救助支付金额：{{ getMafPay() }}
+            </td>
+          </tr>
+        </thead>
+      </table>
+
+      <!-- <div class="listTitle">
         {{ $store.getters.xt_user.org.org_name }}费用清单
-      </div>
-      <div class="listInfo">
+      </div> -->
+
+      <!-- <div class="listInfo">
         <div>患者姓名：{{ patient.name }}</div>
         <div>性别：{{ patient.gender == 1 ? "男" : "女" }}</div>
         <div>结算类别：
-          <!-- {{ getType(his_patient.balance_accounts_type) }} -->
+          
           {{getType(his_record_patient.balance_accounts_type)}}
         </div>
         <div style="min-width:300px;">发票号码：{{order.fa_piao_number}}</div>
-      </div>
-      <div class="listInfo">
+      </div> -->
+      <!-- <div class="listInfo">
         <div>住院/门诊号：
-          <!-- {{his_patient.number}} -->
           {{his_record_patient.ipt_otp_no}}
         </div>
         <div>科室：
-          <!-- {{ getDepartment(his_patient.departments) }} -->
           {{ getDepartment(his_record_patient.departments) }}
         </div>
         <div style="min-width:350px;">就诊流水号：
-          <!-- {{ his_patient.number }} -->
+       
           {{his_record_patient.number}}
         </div>
-      </div>
-      <div class="listInfo">
+      </div> -->
+      <!-- <div class="listInfo">
         <div>总费用：{{ getAllPice() }}</div>
         <div>个人支付：
-          <!-- <span v-if="this.$route.query.balance_accounts_type == 2 && his_patient.id >0">{{ getAllPice() }}</span>
-          <span v-if="this.$route.query.balance_accounts_type != 2 && his_patient.id >0">{{ getActPay() }}</span> -->
-          
           <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
           <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
 
         </div>
         <div>基金支付记账：{{ getFundPaySumamt() }}</div>
         <div style="min-width:300px;">补充医疗支付记账：{{ getHifesPay() }}</div>
-      </div>
-      <div class="listInfo">
+      </div> -->
+      <!-- <div class="listInfo">
         <div>救助支付金额：{{ getMafPay() }}</div>
-      </div>
+      </div> -->
       <table class="listTable" border="1">
         <tr style="height:45px">
           <td width="100" style="text-align: center">序号</td>

src/xt_pages/outpatientTool/statistics.vue

 
     onRowClick(row, event, column) {
       this.currentRowIndex = row.row_index;
-      console.log(this.currentRowIndex, "this.currentRowIndex");
       this.$store.commit("SET_PAGEDATA", {
         table_id: this.currentRowIndex,
       });
-      console.log(this.$store.getters.pagedata.list.table_id, "kk");
+      // console.log(this.$store.getters.pagedata.list.table_id, "列表行id");
     },
     searchAction() {
       this.getPatientList();

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

                    <span>{{ item.warehousing_count }}</span>
               </td>
               <td style="line-height: 18px">
-                <span>{{item.max_unit}}</span>
+                <span>{{item.limax_unit}}</span>
               </td>
               <td style="line-height:18px">
                   <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>