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

src/xt_pages/dialysis/dialysisPrintOrder.vue

       <template
         v-if="
           org_template_info.template_id == 6 ||
-            org_template_info.template_id == 10 ||  org_template_info.template_id == 11
+            org_template_info.template_id == 10 ||
+            org_template_info.template_id == 11
         "
       >
         <el-button
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 12">
+        <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-if="org_template_info.template_id == 10"
       ></DialysisPrintOrderTen>
 
-    <DialysisPrintOrderNine
+      <DialysisPrintOrderNine
         v-bind:childResponse="childResponse"
         v-if="org_template_info.template_id == 9"
       ></DialysisPrintOrderNine>
 
-    <DialysisPrintOrderEleven
-      v-bind:childResponse="childResponse"
-      v-if="org_template_info.template_id == 11"
-    ></DialysisPrintOrderEleven>
+      <DialysisPrintOrderEleven
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id == 11"
+      ></DialysisPrintOrderEleven>
+      <DialysisPrintOrderTwelve
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id == 12"
+      ></DialysisPrintOrderTwelve>
     </div>
   </div>
 </template>
 import DialysisPrintOrderNine from "./template/DialysisPrintOrderNine";
 import print from "print-js";
 import DialysisPrintOrderTen from "./template/DialysisPrintOrderTen";
-import DialysisPrintOrderEleven from './template/DialysisPrintOrderEleven'
+import DialysisPrintOrderEleven from "./template/DialysisPrintOrderEleven";
+import DialysisPrintOrderTwelve from "./template/DialysisPrintOrderTwelve";
 
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderTwelve,
     DialysisPrintOrderEleven,
     DialysisPrintOrderTen,
     DialysisPrintOrderOne,
       const style =
         '@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;}';
+        '@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 {.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;}';
         });
       } else if (
         this.org_template_info.template_id == 6 ||
-        this.org_template_info.template_id == 10 ||  this.org_template_info.template_id == 11
+        this.org_template_info.template_id == 10 ||
+        this.org_template_info.template_id == 11
       ) {
         printJS({
           printable: "dialysis-print-box-1",
           style: style5,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 12) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {
 .print-template-two tr {
   line-height: 30px;
 }
+
+.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;
+}
 </style>

src/xt_pages/management/components/UserForm.vue

 <template>
   <div id="user-form">
     <el-row class="c">
-      <el-col :span="11">
+      <el-col :span="12">
         <span class="machineClass">日期查询:</span>
         <el-date-picker
           v-model="form.start_time"
           placeholder="请选择"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          style="width:145px"
+          style="width:130px"
         ></el-date-picker
         >-
         <el-date-picker
           placeholder="请选择"
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
-          style="width:145px"
+          style="width:130px"
         ></el-date-picker>
       </el-col>
       <el-col :span="5">
           ></el-option>
         </el-select>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="5">
         <span class="machineClass">机位号:</span>
-        <el-select style="width:145px" v-model="form.bed">
+        <el-select style="width:110px" v-model="form.bed">
           <el-option
             v-for="item in this.bedNumberTwo"
             :key="item.id"
   .el-dialog__footer {
     text-align: right;
   }
+  .el-input--prefix .el-input__inner {
+    padding-left: 15px;
+  }
+  .el-input--prefix .el-input__inner {
+    padding-right: 15px;
+  }
 }
 </style>

src/xt_pages/role/components/EditRole.vue

 <template>
   <el-dialog
     title="新增员工"
-    width="750px"
+    width="660px"
     :visible.sync="visible"
     :before-close="_close"
   >
 
           <el-input  v-model="ruleForm.phone"  maxlength="11"></el-input>
         </el-form-item>
-        <el-form-item label="角色" prop="role" label-width="70px">
-
-           <el-checkbox-group v-model="ruleForm.role">
-            <el-checkbox label="子管理员" name="type"></el-checkbox>
-            <el-checkbox label="医生" name="type"></el-checkbox>
-            <el-checkbox label="护士" name="type"></el-checkbox>
-            <el-checkbox label="技师" name="type"></el-checkbox>
-            <el-checkbox label="运营" name="type"></el-checkbox>
-            <el-checkbox label="库存" name="type"></el-checkbox>
-            <el-checkbox label="院长" name="type"></el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
 
         <el-form-item label="职称 : " label-width="50px">
           <el-select v-model="ruleForm.user_type" placeholder="用户类型">
         rules: {
           phone: [{ required: true, validator: checkMobile, trigger: 'blur' }],
           name: [{ required: true, validator: checkName, trigger: 'blur' }],
-          intro: [{ required: true, message: '请输入角色说明', trigger: 'blur' }],
+          intro: [{ required: true, message: '请输入角色说明', trigger: 'blur' }]
         },
         admin_user: [],
         is_check_admin_user: [],
           name: [
             { required: true, message: '请输入用户名字', trigger: 'blur' },
             { max: 10, message: '10个字以内', trigger: 'blur' }
-          ],
-          role: [{ required: true, message: '请选择角色', trigger: 'blur' }]
+          ]
         }
       }
     },