Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

         "hemodialysis",
         "dialysate_formulation"
       );
-      // this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
-      // console.log("0000000000", this.anticoagulantsConfit);
+       this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
+      console.log("0000000000", this.anticoagulantsConfit);
       var anticoagulantsConfitOne = this.$store.getters.anticoagulants_confit;
       console.log("333", anticoagulantsConfitOne);
       for (let i = 0; i < anticoagulantsConfitOne.length; i++) {
           }
         });
       });
-      // console.log("arrFour", arrFour);
+      console.log("arrFour", arrFour);
       this.anticoagulantsConfit = arrFour;
       this.dialysisList = this.devices;
 
       return uParseTime(val, "{y}-{m}-{d} {h}:{i}");
     },
     show(pre) {
+       console.log("pre--------",pre)
+       if(pre.id == 0){
+         this.dialysisPrescription.anticoagulant = "低分子肝素"
+       }
       if (pre.anticoagulant == 3) {
         this.dialysisPrescription.anticoagulant = "低分子肝素";
       }
       //入口
       var pre = pre;
-      console.log("pre是----", pre);
+    //  console.log("pre是----", pre);
       if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12) {
         this.zhiShow = true;
         this.huShow = true;
         this.totalShow = false;
       }
       this.pre = pre;
-      console.log("pre1", pre);
+     // console.log("pre1", pre);
       this.getPermission();
 
       let last_weight_after = 0;

src/xt_pages/dialysis/dialysisPrintOrder.vue

           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 13">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container ">
       <!--<div class="order-print-btn"-->
         v-bind:childResponse="childResponse"
         v-if="org_template_info.template_id == 12"
       ></DialysisPrintOrderTwelve>
+      <DialysisPrintOrderThirteen
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id == 13"
+      ></DialysisPrintOrderThirteen>
     </div>
   </div>
 </template>
 import DialysisPrintOrderTen from "./template/DialysisPrintOrderTen";
 import DialysisPrintOrderEleven from "./template/DialysisPrintOrderEleven";
 import DialysisPrintOrderTwelve from "./template/DialysisPrintOrderTwelve";
+import DialysisPrintOrderThirteen from "./template/DialysisPrintOrderThirteen";
 
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderThirteen,
     DialysisPrintOrderTwelve,
     DialysisPrintOrderEleven,
     DialysisPrintOrderTen,
         '@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 =
         '@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; } .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;}';
-
+      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: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;}.row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}';
       // const style3 =
       //   '@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; } .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: 16px;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: 5px 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: 16px;padding: 5px 5px;line-height: 18px;}.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-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.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%;}.print-yema5{position: absolute;top:1370px;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;}';
       //
           style: style,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 13) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style3,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

         <tr>
           <td style="text-align:left;">
             <span style="display:inline-block;margin-left:15px;">
-              {{
-              getDatge(queryParams.xtdate)
-              }}
+              {{getDatge(queryParams.xtdate)}}
             </span>
           </td>
           <td style="text-align:center;">

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

                     </div>
                     ml/min
                   </div>
-                  <div class="inline_block" style="margin-left:10px;flex:1;">
-                    透析时间：
-                    <div class="under_line" style="width: 50px;text-align: center">
-                      {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "/" }}
-                    </div>
-                    h
-                  </div>
                 </div>
                 <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                   <div class="inline_block" style="flex:1;">
                     </div>
                     kg
                   </div>
+                   <div class="inline_block" style="margin-left:10px;flex:1;">
+                    透析时间：
+                    <div class="under_line" style="width: 50px;text-align: center">
+                      {{ prescription.dialysis_duration_hour ? prescription.dialysis_duration_hour : "/" }}
+                    </div>h
+                     <div class="under_line" style="width: 50px;text-align: center">
+                      {{ prescription.dialysis_duration_minute ? prescription.dialysis_duration_minute : "/" }}
+                    </div>
+                    min
+                  </div>
                 </div>
 
                 <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressure.vue

               <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
             </el-form-item>
           </el-form>
-          <el-select
-            v-model="value"
-            placeholder="请选择"
-            @change="chooseType"
-            style="width:110px;margin-right:10px"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
           <el-select v-model="value" placeholder="请选择" style="width:110px;margin-right:10px">
             <el-option
               v-for="item in options"
               :value="item.value"
             ></el-option>
           </el-select>
-          <el-select
-            v-model="value"
-            placeholder="请选择"
-            @change="chooseType"
-            style="width:110px;margin-right:10px"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
           <label class="title">
             <span class="name">日期查询</span> :
           </label>

src/xt_pages/qcd/indicatorControlAnalysis/monitor.vue

               :value="item.value"
             ></el-option>
           </el-select>
-          <el-select
-            v-model="value"
-            placeholder="请选择"
-            @change="chooseType"
-            style="width:110px;margin-right:10px"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-          <el-select v-model="value" placeholder="请选择" style="width:110px;margin-right:10px">
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-          <el-select
-            v-model="value"
-            placeholder="请选择"
-            @change="chooseType"
-            style="width:110px;margin-right:10px"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
           <label class="title">
             <span class="name">日期查询</span> :
           </label>

src/xt_pages/qcd/indicatorControlAnalysis/process.vue

               :value="item.value"
             ></el-option>
           </el-select>
-          <el-select
-            v-model="value"
-            placeholder="请选择"
-            @change="chooseType"
-            style="width:110px;margin-right:10px"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-          <el-select v-model="value" placeholder="请选择" style="width:110px;margin-right:10px">
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-          <el-select
-            v-model="value"
-            placeholder="请选择"
-            @change="chooseType"
-            style="width:110px;margin-right:10px"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
           <label class="title">
             <span class="name">日期查询</span> :
           </label>

src/xt_pages/qcd/indicatorControlAnalysis/weight.vue

               <el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
             </el-form-item>
           </el-form>
-          <el-select
-            v-model="value"
-            placeholder="请选择"
-            @change="chooseType"
-            style="width:110px;margin-right:10px"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
           <el-select v-model="value" placeholder="请选择" style="width:110px;margin-right:10px">
             <el-option
               v-for="item in options"
               :value="item.value"
             ></el-option>
           </el-select>
-          <el-select
-            v-model="value"
-            placeholder="请选择"
-            @change="chooseType"
-            style="width:110px;margin-right:10px"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
           <label class="title">
             <span class="name">日期查询</span> :
           </label>

src/xt_pages/qcd/patientControlAnalysis.vue

               :value="item.value"
             ></el-option>
           </el-select>
-          <el-select v-model="value" placeholder="请选择" style="margin-right:20px;width:100px">
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
           <label class="title">
             <span class="name">日期查询</span> :
           </label>

src/xt_pages/qcd/treatmentControlAnalysis/components/CheckAll.vue

           :value="item.value"
         ></el-option>
       </el-select>
-      <el-select
-        v-model="value"
-        placeholder="请选择"
-        @change="chooseType"
-        style="width:120px;margin-right:20px"
-      >
-        <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        ></el-option>
-      </el-select>
       <label class="title">
         <span class="name">日期查询</span> :
       </label>

src/xt_pages/qcd/treatmentControlAnalysis/components/CheckPersonal.vue

           :value="item.value"
         ></el-option>
       </el-select>
-      <el-select
-        v-model="value"
-        placeholder="请选择"
-        @change="chooseType"
-        style="width:120px;margin-right:20px"
-      >
-        <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        ></el-option>
-      </el-select>
       <label class="title">
         <span class="name">日期查询</span> :
       </label>

src/xt_pages/qcd/treatmentControlAnalysis/components/TimeAll.vue

 <template>
   <div class="page_timeAll">
     <div class="cell clearfix">
-      <el-select v-model="value" placeholder="请选择" style="width:120px;margin-right:20px">
-        <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        ></el-option>
-      </el-select>
       <el-select
         v-model="value"
         placeholder="请选择"

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

           :value="item.value"
         ></el-option>
       </el-select>
-      <el-select
-        v-model="value"
-        placeholder="请选择"
-        @change="chooseType"
-        style="width:120px;margin-right:20px"
-      >
-        <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        ></el-option>
-      </el-select>
       <label class="title">
         <span class="name">日期查询</span> :
       </label>

src/xt_pages/user/patients.vue

       :visible.sync="dialogVisible"
       width="40%"
     >
-      <span>您提交的文档不是系统标准导入模板，请检查您的文档或重新 <a href="https://kuyi.shengws.com/patient_template.xlsx" style="color: blue"
-                                           download="template">下载导入模板</a></span>
+<!--      <span>您提交的文档不是系统标准导入模板，请检查您的文档或重新 <a href="https://kuyi.shengws.com/patient_template.xlsx" style="color: blue"-->
+<!--                                           download="template">下载导入模板</a></span>-->
       <span slot="footer" class="dialog-footer">
     <el-button @click="dialogVisible = false">取 消</el-button>
     <el-button type="primary" @click="dialogVisible = false">确 定</el-button>