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

src/api/his/advice.js

     params: params
   })
 }
+
+export function updatePharmacyBaseDrug(params) {
+  return request({
+    url: '/api/advice/updatepharmacybasedrug',
+    method: 'Get',
+    params: params
+  })
+}

src/xt_pages/dialysis/dialysisPrintOrder.vue

           org_template_info.template_id == 6 ||
           org_template_info.template_id == 10 ||
           org_template_info.template_id == 11 ||
-          org_template_info.template_id == 50
+          org_template_info.template_id == 50 || 
+          org_template_info.template_id == 52
         "
       >
         <el-button
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 53">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
             v-if="org_template_info.template_id == 51"
           >
           </DialysisPrintOrderFiftyOne>
+          <DialysisPrintOrderFiftyTwo
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 52"
+          >
+          </DialysisPrintOrderFiftyTwo>
+          <DialysisPrintOrderFiftyThree
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 53"
+          >
+          </DialysisPrintOrderFiftyThree>
         </div>
       </el-container>
     </div>
 import DialysisPrintOrderFortyNine from "./template/DialysisPrintOrderFortyNine";
 import DialysisPrintOrderFifty from "./template/DialysisPrintOrderFifty";
 import DialysisPrintOrderFiftyOne from "./template/DialysisPrintOrderFiftyOne";
+import DialysisPrintOrderFiftyTwo from "./template/DialysisPrintOrderFiftyTwo"
+import DialysisPrintOrderFiftyThree from "./template/DialysisPrintOrderFiftyThree"
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderFiftyThree,
+    DialysisPrintOrderFiftyTwo,
     DialysisPrintOrderFiftyOne,
     DialysisPrintOrderFifty,
     DialysisPrintOrderFortyNine,
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       const style2 =
       // 防止分页错位问题：table设置border: none；.tr设置page-break-inside:avoid; // 防止table数据太多，tr分页错乱 td设置border: 1px solid #000;// 防止部分分页的tr边框线没有
-        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}';
+        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;}.check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}';
       const style3 =
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:16px;border-color: #000;}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #000;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}.row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line {display: inline-block;border-bottom: 1px solid #000;text-align: center;white-space: nowrap; width: 50%;}';
       // const style3 =
         this.org_template_info.template_id == 11 ||
         this.org_template_info.template_id == 49 ||
         this.org_template_info.template_id == 50 ||
-        this.org_template_info.template_id == 51
+        this.org_template_info.template_id == 51 ||
+        this.org_template_info.template_id == 52
       ) {
         printJS({
           printable: "dialysis-print-box-1",
           style: style11,
           scanStyles: false,
         });
-      } 
+      } else if (this.org_template_info.template_id == 53) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false,
+        });
+      }
     },
     printThisOnePage() {
       var ptime = Math.round(new Date().getTime() / 1000);

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

           </div>
         </div>
 
-        <div class="row" :style="this.totollength >= 13 ? 'margin-bottom:70px;' : ''">
+        <div class="row" :style="this.totollength > 13 ? 'margin-bottom:400px;' : ''">
           <table class="proj_table">
             <tbody>
               <tr>
             </tbody>
           </table>
         </div>
-        <template v-if="this.totollength >= 13">
+        <template v-if="this.totollength > 13">
           <div style="display:inline-block;width:100%;text-align:center;">
             <div class="order-yy-name" style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;">
               {{ orgname }}

src/xt_pages/dialysis/template/dialysisPrintOrderFive.vue

                       <td width="100">BP<br />mmHg</td>
                       <td width="60">静脉压/动脉压<br />mmHg</td>
                       <td width="80">血流量<br />ml/min</td>
-                      <td width="90">超滤量累计L</td>
+                      <td width="90" v-if="org_id!=10210">超滤量累计L</td>
+                      <td width="90" v-else>超滤量累计ml</td>
                       <td width="90">置换液流量ml/h</td>
                       <td width="80">钠浓度<br />mmol/L</td>
                       <td width="240">
                       <td width="100">BP<br />mmHg</td>
                       <td width="60">静脉压/动脉压<br />mmHg</td>
                       <td width="80">血流量<br />ml/min</td>
-                      <td width="90">超滤量累计L</td>
+                      <td width="90" v-if="org_id!=10210">超滤量累计L</td>
+                      <td width="90" v-else>超滤量累计ml</td>
+                 
                       <td width="90">置换液流量ml/h</td>
                       <td width="80">钠浓度<br />mmol/L</td>
                       <td width="240">
       advice_groups: [],
       advice_groups_2: [],
       print_length: 0,
+      org_id:0,
 
       AlPanel: {
         id: 0,
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
 
     var xtuser = this.$store.getters.xt_user;
+    this.org_id = xtuser.org_id
     this.orgname = xtuser.org.org_name;
     // this.orgname = "遂溪方济医院";
     this.modeOptions = this.$store.getters.treatment_mode;

src/xt_pages/stock/test.vue

       </div>
       <div class="mainRight">
         <el-tabs v-model="titleType">
+           <el-button type="primary" @click="toSend">发药</el-button>
           <el-tab-pane label="明细" name="明细">
-           
+            
            <el-table
             :data="tableData"
             border
             style="width: 100%">
-            <el-table-column prop="date" label="序号" width="180">
+            <el-table-column prop="date" label="序号" width="180" align="center">
               <template slot-scope="scope">
-
+                 {{scope.$index + 1}}
               </template>
             </el-table-column>
-            <el-table-column  prop="name" label="单据编码" width="180">
+           
+            <el-table-column prop="address" label="患者姓名" align="center">
+               <template slot-scope="scope">
+                 {{getPatientName(scope.row.patient_id)}}
+              </template>
             </el-table-column>
-            <el-table-column prop="address" label="患者姓名">
+            <el-table-column prop="address" label="单次用量" align="center">
+              <template  slot-scope="scope">
+                 {{scope.row.single_dose}}
+               </template>
             </el-table-column>
-            <el-table-column prop="address" label="单次用量">
+             <el-table-column prop="address" label="用法" align="center">
+               <template  slot-scope="scope">
+                 {{scope.row.delivery_way}}
+               </template>
             </el-table-column>
-             <el-table-column prop="address" label="用法">
+             <el-table-column prop="address" label="频率" align="center">
+               <template  slot-scope="scope">
+                 {{scope.row.execution_frequency}}
+               </template>
             </el-table-column>
-             <el-table-column prop="address" label="频率">
+             <el-table-column prop="address" label="天数" align="center">
+                <template  slot-scope="scope">
+                 {{scope.row.day}}
+               </template>
             </el-table-column>
-             <el-table-column prop="address" label="天数">
+            <el-table-column prop="address" label="总量" align="center">
+               <template  slot-scope="scope">
+                 {{scope.row.prescribing_number}}
+               </template>
             </el-table-column>
-            <el-table-column prop="address" label="总量">
+            <el-table-column  prop="name" label="数据来源" width="180" align="center">
+                <template  slot-scope="scope">
+                 <span v-if="scope.row.type == 1">血透</span>
+                 <span v-if="scope.row.type == 2">HIS</span>
+               </template>
             </el-table-column>
           </el-table>
 
 </template>
 
 <script>
-import { getTodayAdviceList,getPharmacyBaseDrug } from "@/api/his/advice";
+import { getTodayAdviceList,getPharmacyBaseDrug,updatePharmacyBaseDrug } from "@/api/his/advice";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 const moment = require('moment')
 export default {
       keywords: "",
       start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
       tableData:[],
+      patientList:[],
     };
   },
 
         if(response.data.state == 1){
            var advicelist = response.data.data.advicelist
            console.log("advicelist23323232323323",advicelist)
+           for(let i=0;i<advicelist.length;i++){
+             advicelist[i].type = 1
+             advicelist[i].day = " "
+             this.tableData.push(advicelist[i])
+           }
            var hisAdviceList = response.data.data.hisAdviceList
            console.log("hisadvicelist23233232233",hisAdviceList)
+           for(let i=0;i<hisAdviceList.length;i++){
+             hisAdviceList[i].type = 2
+             this.tableData.push(hisAdviceList[i])
+           }
            var patient = response.data.data.patient
            console.log("patient23322323232332",patient)
+           console.log("tabedaadddddddd",this.tableData)
+           this.patientList = patient
+        }
+      })
+    },
+    getPatientName(id){
+       var name = ""
+       for(let i=0;i<this.patientList.length;i++){
+          if(id == this.patientList[i].id){
+             name = this.patientList[i].name
+          }
+       }
+       return name
+    },
+    toSend(){
+      var blood_ids = []
+      var his_ids = []
+      var bloodStr = ""
+      var hisStr = ""
+      console.log("table3223233232322323",this.tableData)
+      for(let i=0;i<this.tableData.length;i++){
+        if(this.tableData[i].type == 1){
+          blood_ids.push(this.tableData[i].id)
+        }
+        if(this.tableData[i].type == 2){
+          his_ids.push(this.tableData[i].id)
         }
+      }
+
+      console.log("blood_ids223我",blood_ids)
+      console.log("his_ids22222我",his_ids)
+      bloodStr = blood_ids.join(",")
+      hisStr =  his_ids.join(",")
+       var params = {
+         bloodStr:bloodStr,
+         hisStr:hisStr,
+       }
+      updatePharmacyBaseDrug(params).then(response=>{
+
       })
     }
   },