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/listPrint.vue

     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <printOne v-if="org_id != 10106" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <printTwo v-if="org_id == 10106" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
     </div>
   </div>
 </template>
   import printOne from './listTemplate/printOne'
   import { getHisOrderDetail } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
+  import printTwo from './statementTemplate/printTwo'
+  import axios from 'axios'
 
   export default {
     name: 'listPrint',
     components: {
-      printOne
+      printOne,
+      printTwo
     },
     props: {
       paramsObj: Object
         patient:{},
         order:{},
         admin:{},
+
+
+        info:null,
+        p_admin:{},
+        charge_admin:{},
+        org_id:''
       }
     },
     created() {
       this.getInfo(this.paramsObj.id)
+      this.org_id = this.$store.getters.xt_user.org_id
+      if(this.org_id == 10106){
+        this.getInfo10106(this.paramsObj.id)
+      }
+      
     },
 
     methods: {
 
       },
       printThisPage() {
-
-        const style =
+        if(this.org_id != 10106){
+          const style =
           '@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: 40px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
-        printJS({
-          printable: 'list-print',
-          type: 'html',
-          style: style,
-          scanStyles: false
-        })
+          printJS({
+            printable: 'list-print',
+            type: 'html',
+            style: style,
+            scanStyles: false
+          })
+        }else{
+          const style =
+          '@media print {#statement-print{font-size:12px;width:600px;margin:0 auto;}.statementTitle{font-size: 22px;text-align: center;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
+          printJS({
+            printable: "statement-print",
+            type: "html",
+            style: style,
+            scanStyles: false
+          });
+        }
+        
 
         // if (this.org_template_info.template_id == 1) {
         //   printJS({
         //     scanStyles: false
         //   });
         // }
+      },
+      getInfo10106(order_id) {
+        if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4  || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 ||  this.$store.getters.xt_user.org_id == 9674 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
+
+          var that = this
+
+          axios.get('http://127.0.0.1:9532/api/settle/query', {
+            params: {
+              order_id: order_id,
+              admin_user_id:that.$store.getters.xt_user.user.id
+            }
+          })
+            .then(function (response) {
+              if (response.data.state == 0) {
+                this.$message.error(response.data.msg)
+                return false
+              } else {
+                console.log("logloglog")
+
+                console.log(response.data.data.info)
+                that.info = response.data.data.info
+                that.p_admin = response.data.data.printor_admin
+                that.charge_admin = response.data.data.charge_admin
+                that.order_infos = response.data.data
+
+
+                console.log(that.info)
+
+                that.info['bed_cost_total'] = response.data.data.bedCostTotal
+                that.info['bed_cost_self_total'] = response.data.data.bedCostSelfTotal
+                that.info['bed_cost_part_self_total'] = response.data.data.bedCostPartSelfTotal
+
+                that.info['operation_cost_total'] = response.data.data.operationCostTotal
+                that.info['operation_cost_self_total'] = response.data.data.operationCostSelfTotal
+                that.info['operation_cost_part_self_total'] = response.data.data.operationCostPartSelfTotal
+
+                that.info['other_cost_total'] = response.data.data.otherCostTotal
+                that.info['other_cost_self_total'] = response.data.data.otherCostSelfTotal
+                that.info['other_cost_part_self_total'] = response.data.data.otherCostPartSelfTotal
+
+                that.info['material_cost_total'] = response.data.data.materialCostTotal
+                that.info['material_cost_self_total'] = response.data.data.materialCostSelfTotal
+                that.info['material_cost_part_self_total'] = response.data.data.materialCostPartSelfTotal
+
+                that.info['western_medicine_cost_total'] = response.data.data.westernMedicineCostTotal
+                that.info['western_medicine_cost_self_total'] = response.data.data.westernMedicineCostSelfTotal
+                that.info['western_medicine_cost_part_self_total'] = response.data.data.westernMedicineCostPartSelfTotal
+
+                that.info['chinese_traditional_medicine_cost_total'] = response.data.data.chineseTraditionalMedicineCostTotal
+                that.info['chinese_traditional_medicine_cost_self_total'] = response.data.data.chineseTraditionalMedicineCostSelfTotal
+                that.info['chinese_traditional_medicine_cost_part_self_total'] = response.data.data.chineseTraditionalMedicineCostPartSelfTotal
+
+
+                that.info['check_cost_total'] = response.data.data.checkCostTotal
+                that.info['check_cost_self_total'] = response.data.data.checkCostSelfTotal
+                that.info['check_cost_part_self_total'] = response.data.data.checkCostPartSelfTotal
+
+
+                that.info['laboratory_cost_total'] = response.data.data.laboratoryCostTotal
+                that.info['laboratory_cost_self_total'] = response.data.data.laboratoryCostSelfTotal
+                that.info['laboratory_cost_part_self_total'] = response.data.data.laboratoryCostPartSelfTotal
+
+                that.info['treat_cost_total'] = response.data.data.treatCostTotal
+                that.info['treat_cost_self_total'] = response.data.data.treatCostSelfTotal
+                that.info['treat_cost_part_self_total'] = response.data.data.treatCostPartSelfTotal
+                console.log(this.info)
+              }
+            })
+            .catch(function (error) {
+
+            });
+        }
       }
     }
 

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

       </tr>
       <tr>
         <td>收款人:</td>
-        <td colspan="2">{{charge_admin.user_name}}</td>
+        <td colspan="2">{{charge_admin ? charge_admin.user_name : ''}}</td>
         <td>审核人:</td>
         <td colspan="2"></td>
         <td>制单人:</td>
-        <td colspan="2">{{p_admin.user_name}}</td>
+        <td colspan="2">{{p_admin ? p_admin.user_name : ''}}</td>
         <td>打印日期</td>
         <td colspan="2">{{getNowTime()}}</td>
       </tr>

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

           <table class="print-table" border="1">
             <tbody>
             <tr>
-              <td style="line-height: 50px" width="50">序号</td>
               <td style="line-height: 50px" width="250">药品名称</td>
               <td style="line-height: 50px" width="250">规格型号</td>
               <td style="line-height: 50px" width="50">单位</td>
-              <td style="line-height: 50px" width="80">数量</td>
-              <td style="line-height:50px" width="80">单价</td>
+              <td style="line-height: 50px" width="80">出货数量</td>
+              <td style="line-height:50px" width="80">出库价格</td>
               <td style="line-height: 50px" width="">总价</td>
+              <td style="line-height: 50px" width="">批次</td>
+              <td style="line-height: 50px" width="">生产日期</td>
+              <td style="line-height: 50px" width="">有效日期</td>
             </tr>
 
             <tr v-for="(item,index) in warehousingOutInfo.warehousingOutData" :key="item.id">
-              <td style="line-height: 50px">&nbsp;
-                {{index+1}}
-              </td>
               <td style="line-height: 50px">
                 <span v-if="item.drug_id != 0">{{item.drug.drug_name}}</span>
               </td>
              <td  style="line-height:50px">
                 {{(item.count * item.price).toFixed(2)}}
              </td>
+             <td></td>
+             <td></td>
+             <td></td>
             </tr>
              <tr>
                <td style="line-height:50px">合计</td>
-               <td colspan="5"></td>
+               <td colspan="7"></td>
                <td>{{allPrice.toFixed(2)}}</td>
              </tr>
             </tbody>
             <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
           </div>
           <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
+            <div style="width:70px;">科室：</div><div style="width:100px;"></div>
             <div style="width:70px;">领料人：</div><div style="width:100px;"></div>
             <div style="width:80px;">审批：</div><div style="width:100px;"></div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
     methods: {
       getDateTwo(){
         var ptime = Math.round(new Date().getTime() / 1000)
-        return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
+        return "打印日期："+uParseTime(ptime, '{y}-{m}-{d}')
       },
       getTime(value, temp) {
         if (value == 0) {

src/xt_pages/stock/stockOutOrderDetailPrint.vue

                         <span class="main_title">耗材出库登记单</span>
                     </div>
                     <div style="text-align:right;margin-bottom:1px;font-size: 18px;">
-                      打印时间：{{time_now}}
+                      打印日期：{{time_now}}
                     </div>
                     <div class="table_panel">
                         <table class="table">
                                     <td width="80">耗材名称</td>
                                     <td width="80">规格型号</td>
                                     <td width="80">单位</td>
-                                     <td width="80">出货价</td>
-                                    <td width="80">出库数量</td> 
+                                    <td width="80">出货数量</td> 
+                                    <td width="80">出库价格</td>
                                     <td width="80">总价</td>
+                                    <td width="80">批号</td>
+                                    <td width="80">生产日期</td>
+                                    <td width="80">有效日期</td>
                                 </tr>
                             </thead>
                             <tbody>
                                     <td><span v-if="item.good_id != 0">{{getTypeNameOne(item.good_id)}}</span></td>
                                     <td><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
                                     <td><span v-if="item.good_id!=0">{{getUnit(item.good_id)}}</span></td>
+                                    <td>{{getOutStockCount(item.good_id) + getWarehouseOutInfoCount(item.warehouse_out_id,item.good_id)}}</td>
                                     <td>{{item.price}}</td>
-                                    <td>{{getOutStockCount(item.good_id) + getWarehouseOutInfoCount(item.warehouse_out_id,item.good_id)}}</td> 
                                     <td>{{((getOutStockCount(item.good_id) +getWarehouseOutInfoCount(item.warehouse_out_id,item.good_id))*item.price).toFixed(2)}}</td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
                                 </tr>
                                 <tr>
                                   <td>合计</td>
-                                  <td colspan="4"></td>
+                                  <td colspan="7"></td>
                                   <td>{{allPrice.toFixed(2)}}</td>
                                </tr>
                             </tbody>
                           <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
                         </div>
                         <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
+                          <div style="width:70px;">科室：</div><div style="width:100px;"></div>
                           <div style="width:70px;">领料人：</div><div style="width:100px;"></div>
                           <div style="width:80px;">审批：</div><div style="width:100px;"></div>
                           <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>