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

src/api/data.js

 }
 
 export function createChildConfig(params) {
-  console.log("parasms22222",params)
+  console.log('parasms22222', params)
   return request({
     url: '/api/createchildconfig',
     method: 'post',
   })
 }
 
-
-
-
-export function createMedicineInsurancePercent(params,module) {
+export function createMedicineInsurancePercent(params, module) {
   return request({
-    url: '/api/medicineinsurancepercent/create?module='+module,
+    url: '/api/medicineinsurancepercent/create?module=' + module,
     method: 'post',
     data: params
   })
 }
 
-
-export function getMedicineInsurancePercent(type_id,module) {
+export function getMedicineInsurancePercent(type_id, module) {
   return request({
-    url: '/api/medicineinsurancepercent/get?type_id='+type_id+"&module="+module,
-    method: 'get',
+    url: '/api/medicineinsurancepercent/get?type_id=' + type_id + '&module=' + module,
+    method: 'get'
   })
 }
 
-
 export function createDrugUnitSafeguard(params) {
   return request({
     url: '/api/drugunitsafeguard/create',
   })
 }
 
-
-
 export function createMZSick(params) {
   return request({
     url: '/api/mz/sick/create',
   })
 }
 
-
-
-
-
 export function createAddition(params) {
   return request({
     url: '/api/addition/create',
   })
 }
 
-
-
-
-
 export function createDiagnose(params) {
   return request({
     url: '/api/diagnose/create',
   })
 }
 
-export function getAllDrugList(params){
-  
+export function getAllDrugList(params) {
   return request({
-    url:"/api/drug/getalldruglist",
-    method:"Get",
-    params:params
+    url: '/api/drug/getalldruglist',
+    method: 'Get',
+    params: params
   })
 }
 
-export function postSearchDrugList(keyword,params){
-  
+export function postSearchDrugList(keyword, storehouse_id, params) {
   return request({
-    url:"/api/drug/postsearchdruglist?keyword="+keyword,
-    method:"get",
-    params:params
+    url: '/api/drug/postsearchdruglist?keyword=' + keyword + '&storehouse_id=' + storehouse_id,
+    method: 'get',
+    params: params
   })
 }
 
-
-
-
-
-
-
-

src/api/drug/drug_stock.js

     params: params
   })
 }
+
+export function GetAllConfigOne() {
+  return request({
+    url: '/api/drugstock/config/list',
+    method: 'get'
+  })
+}

src/api/stock.js

   })
 }
 
-
 export function getManufacturerList(params) {
   return request({
     url: '/api/stock/manufacturer/list',
   })
 }
 
-export function postSearchGoodList(keyword, params) {
+export function postSearchGoodList(keyword, storehouse_id, params) {
   return request({
-    url: '/api/good/postsearchgoodlist?keyword=' + keyword,
+    url: '/api/good/postsearchgoodlist?keyword=' + keyword + '&storehouse_id=' + storehouse_id,
     method: 'Get',
     params: params
   })

src/xt_pages/data/components/drugs.vue

      },
 
       handleSuccessTwo({ results, header }) {
-         console.log("header22222",header)
         if (header != undefined && header.length > 0) {
 
           var isHasDrugName = header.includes('*药品名称');

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 == 52
+          org_template_info.template_id == 50 ||
+          org_template_info.template_id == 52 ||
+          org_template_info.template_id == 53
         "
       >
         <el-button
           >打印</el-button
         >
       </template>
-       <template v-if="org_template_info.template_id == 49">
+      <template v-if="org_template_info.template_id == 49">
         <el-button
           :loading="loading"
           size="small"
           >打印</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"-->
           >
           </DialysisPrintOrderFortySeven>
 
-           <DialysisPrintOrderFortyEight
+          <DialysisPrintOrderFortyEight
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 48"
           >
           </DialysisPrintOrderFortyEight>
 
-            <DialysisPrintOrderFortyNine
+          <DialysisPrintOrderFortyNine
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 49"
           >
 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"
+import DialysisPrintOrderFiftyTwo from "./template/DialysisPrintOrderFiftyTwo";
+import DialysisPrintOrderFiftyThree from "./template/DialysisPrintOrderFiftyThree";
 export default {
   name: "dialysisPrintOrder",
   components: {
       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 =
-      // 防止分页错位问题：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;}.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}';
+        // 防止分页错位问题：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}';
       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 =
         '@media print {#dialysis-print-box-1{margin:0 auto;}.dialysis-print-order{width:920px;margin:0 10px;font-size:10px;}.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: 940px;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;}@page {margin-top:5px;}.table-box1 tr {border-bottom: 1px solid #000;}';
       const style10 =
         '@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:40px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;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;line-height:35px} .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;}@page {margin-left:30px;margin-right:40px;}';
-      
+
       // 三明曙光样式
       const style11 =
         '@media print {.dialysis-print-order{width:960px;margin:100px 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:30px;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:15px}.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 style12 =
+        '@media print {.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}';
+
       if (this.org_template_info.template_id == 1) {
         printJS({
           printable: "dialysis-print-box",
         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 == 52
+        this.org_template_info.template_id == 51
       ) {
         printJS({
           printable: "dialysis-print-box-1",
           style: style11,
           scanStyles: false,
         });
-      } else if (this.org_template_info.template_id == 53) {
+      } else if (
+        this.org_template_info.template_id == 52
+      ) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
+      }else if (
+        this.org_template_info.template_id == 53
+      ) {
         printJS({
           printable: "dialysis-print-box",
           type: "html",
-          style: style,
+          style: style12,
           scanStyles: false,
         });
       }

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyTwo.vue

           <div class="inline_block">
             病区：
             <div class="under_line" style="width: 50px;text-align: center;">
-              <span v-if="org_id == 10121">{{ patientInfo.DialysisSchedule.device_zone.name ? patientInfo.DialysisSchedule.device_zone.name : '' }}</span>
-              <span v-else>{{ "/" }}</span>
+              <span>{{patientInfo.DialysisSchedule.device_zone.name? patientInfo.DialysisSchedule.device_zone.name: ""}}</span>
             </div>
           </div>
           <div class="inline_block">
             床号：
             <div class="under_line" style="width: 50px;text-align: center;">
-              <span v-if="org_id == 10121">{{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}</span>
-              <span v-else>{{ "/" }}</span>
+              <span>{{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}</span>
             </div>
           </div>
           <div class="inline_block">
             <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
               {{ receiverTreatmentAccess.admission_number }}
             </div>
+            <div class="under_line" style="width: 70px;text-align: left" v-else-if="patientInfo.admission_number">
+              {{ patientInfo.admission_number }}
+            </div>
             <div class="under_line" style="width: 70px;text-align: left" v-else>
               {{ "/" }}
             </div>
                         </span>
                         <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt="" srcset="" v-else />
                       </div>
-                      <div class="under_line" style="width: 80px;text-align: center" v-if="dialysisOrder != null && dialysisOrder.start_nurse == check.modifier">
-                        <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
-                          {{ getAdminUser(check == null ? 0 : check.modifier) }}
-                        </span>
-                        <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt="" srcset="" v-else />
-                      </div>
                       <div class="under_line" style="width: 80px;text-align: center" v-if="dialysisOrder != null && dialysisOrder.start_nurse != check.modifier && dialysisOrder.start_nurse != check.modifier">
                         <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                           {{ getAdminUser(check == null ? 0 : check.modifier) }}

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

        if(arr[i] == "肝素4ml"){
           strname = "肝素4ml"
         }
+       if(arr[i] == "肝素2ml"){
+          strname = "肝素2ml"
+        }
       }
       return strname
     },

src/xt_pages/hospitalStation/components/chargeDialog.vue

           }
           // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
 
-          this.form.pay_price = (parseFloat(this.form.private_price) * 10000 - parseFloat(this.form.tmp_decimal) * 10000) / 10000
+          this.form.pay_price = ((parseFloat(this.form.private_price) * 10000 - parseFloat(this.form.tmp_decimal) * 10000) / 10000).toFixed(2)
         },
         changedecimal() {
           // console.log("this.isshow前",this.isshow)
             }
             // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
             this.tmp_pay = this.form.pay_price
-            this.form.pay_price = (parseFloat(this.form.private_price) * 10000 - parseFloat(this.form.tmp_decimal) * 10000) / 10000
+            this.form.pay_price = ((parseFloat(this.form.private_price) * 10000 - parseFloat(this.form.tmp_decimal) * 10000) / 10000).toFixed(2)
           }
         },
         //查询用户当前的余额

src/xt_pages/outpatientCharges/components/chargeDialog.vue

         }
         // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
 
-        this.form.pay_price = (parseFloat(this.form.private_price)*10000 - parseFloat(this.form.tmp_decimal)*10000)/10000
+        this.form.pay_price = ((parseFloat(this.form.private_price)*10000 - parseFloat(this.form.tmp_decimal)*10000)/10000).toFixed(2)
       },
       changedecimal(){
         console.log("this.form.dec_way前",this.form.dec_way)
           }
           // this.form.private_price = parseFloat(this.form.tmp_decimal) + parseFloat(this.form.pay_price)
           this.tmp_pay = this.form.pay_price
-          this.form.pay_price = (parseFloat(this.form.private_price)*10000 - parseFloat(this.form.tmp_decimal)*10000)/10000
+          this.form.pay_price = ((parseFloat(this.form.private_price)*10000 - parseFloat(this.form.tmp_decimal)*10000)/10000).toFixed(2)
         }
       },
       //查询用户当前的余额

src/xt_pages/stock/cancelStockOrderAdd.vue

       if (keyword != undefined) {
         key = keyword
       }
-    postSearchGoodList(key).then(response => {
+    postSearchGoodList(key,this.storehouse_id).then(response => {
         if (response.data.state == 1) {
             var list = response.data.data.list
            

src/xt_pages/stock/cancelStockOrderEdit.vue

         if (keyword != undefined) {
           key = keyword
         }
-        postSearchGoodList(key).then(response => {
+        postSearchGoodList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
            
              var list = response.data.data.list

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

           key = keyword
         }
         let searchArray = [];
-        postSearchDrugList(key).then(response => {
+        postSearchDrugList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
             searchArray = response.data.data.list;
             

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

           key = keyword
         }
         let searchArray = [];
-        postSearchDrugList(key).then(response => {
+        postSearchDrugList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
             searchArray = response.data.data.list;
             

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

           key = keyword
         }
         let searchArray = [];
-        postSearchDrugList(key).then(response => {
+        postSearchDrugList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
             searchArray = response.data.data.list;
             

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

           key = keyword
         }
         let searchArray = [];
-        postSearchDrugList(key).then(response => {
+        postSearchDrugList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
              searchArray = response.data.data.list;
              var list = response.data.data.list

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

           </el-table-column>
 
 
-          <!-- <el-table-column width="150" align="center">
+          <el-table-column width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>剩余库存</span>
             </template>
                 </div>
               </el-form-item>
             </template>
-          </el-table-column> -->
+          </el-table-column>
           
           <el-table-column width="200" align="center">
             <template slot="header" slot-scope="scope">
               >
                 <div style="display:flex;">
                   <el-input
+                   @input="getSupplyCount(scope.row.count,scope.row.max_unit,scope.row.min_number,scope.$index,scope.row.total_count,scope.row.max_unit_fisrt,scope.row.min_unit_fisrt)"
                     oninput="value=value.replace(/\D|^0/g,'')"
                     style="width:80px"
                     placeholder="请输入出库数量"
           key = keyword
         }
         let searchArray = [];
-        postSearchDrugList(key).then(response => {
+        postSearchDrugList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
             searchArray = response.data.data.list;
              var list = response.data.data.list
       return total
     },
     getSupplyCount(count,max_unit,min_number,index,total_count,max_unit_fisrt,min_unit_fisrt){
-     
+   
       var count_total = 0
       if(max_unit == max_unit_fisrt){
         count_total = count * min_number
       if(max_unit == min_unit_fisrt){
         count_total = count 
       }
-
+    
       if(count_total > total_count){
         this.$message.error("出库数量不能大于剩余库存")
         for(let i=0;i<this.recordInfo.recordData.length;i++){

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

                   </el-form-item>
               </template>
           </el-table-column> -->
-<!--          
+         
          <el-table-column width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>剩余库存</span>
                 </div>
               </el-form-item>
             </template>
-          </el-table-column> -->
+          </el-table-column> 
            <el-table-column width="200" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
                     placeholder="请输入出库数量"
                     type="number"
                     v-model="scope.row.count"
-
+                    @input="getSupplyCount(scope.row.count,scope.row.max_unit,scope.row.min_number,scope.$index,scope.row.total_count,scope.row.max_unit_fisrt,scope.row.min_unit_fisrt)"
                   ></el-input>
                   <el-select v-model="scope.row.count_unit" filterable placeholder="请选择单位" style="width:80px" :disabled="unitShow">
                     <el-option
 <script>
   import { uParseTime } from '@/utils/tools'
 
-  import { deleteDrugWarehouseOutInfo, editDrugWarehouseoutInfo, getDrugWarehouseOutInfo,GetAllConfig,GetAllDrugInfoByID,getDrugBatchNumber } from '@/api/drug/drug_stock'
+  import { deleteDrugWarehouseOutInfo, editDrugWarehouseoutInfo, getDrugWarehouseOutInfo,GetAllConfigOne,GetAllDrugInfoByID,getDrugBatchNumber } from '@/api/drug/drug_stock'
   import BreadCrumb from '../../components/bread-crumb'
   import DrugsStockDialog from './drugsStockDialog/index'
   import {postSearchDrugList } from "@/api/data"
           spinner: "el-icon-loading",
           background: "rgba(0, 0, 0, 0.7)"
         });
-        GetAllConfig().then(response => {
+        GetAllConfigOne().then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
             return false;
           } else {
             this.manufacturer = response.data.data.manufacturer;
             this.dealer = response.data.data.dealer;
-            for(let i = 0; i<  response.data.data.drugs.length;i++){
-              this.goodType.push(response.data.data.drugs[i])
-              if(response.data.data.drugs[i].drug_specs != null) {
-                for (let b = 0; b < response.data.data.drugs[i].drug_specs.length; b++) {
-                  this.goodInfo.push(response.data.data.drugs[i].drug_specs[b])
-                }
-              }
-            }
+            // for(let i = 0; i<  response.data.data.drugs.length;i++){
+            //   this.goodType.push(response.data.data.drugs[i])
+            //   if(response.data.data.drugs[i].drug_specs != null) {
+            //     for (let b = 0; b < response.data.data.drugs[i].drug_specs.length; b++) {
+            //       this.goodInfo.push(response.data.data.drugs[i].drug_specs[b])
+            //     }
+            //   }
+            // }
             this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
             this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
           }
             var manulist = response.data.data.manulist
             this.manufacturerList = manulist
             this.dealerList =  response.data.data.dealerList
+           
             for (let i = 0; i < response.data.data.list.length; i++) {
+
               response.data.data.list[i].drug_name = response.data.data.list[i].drug.drug_name,
               response.data.data.list[i].drug_type = response.data.data.list[i].drug.drug_type
               response.data.data.list[i].name = response.data.data.list[i].drug.dose + response.data.data.list[i].drug.dose_unit +"*"+response.data.data.list[i].drug.min_number+response.data.data.list[i].drug.min_unit + "/" + response.data.data.list[i].drug.max_unit
-              if(response.data.data.list[i].number == "0" || response.data.data.list[i].number == 0){
+              if(response.data.data.list[i].count%response.data.data.list[i].drug.min_number == 0){
+                 response.data.data.list[i].count = response.data.data.list[i].count/response.data.data.list[i].drug.min_number
+                 response.data.data.list[i].count_unit = response.data.data.list[i].drug.max_unit
+              }
+             if(response.data.data.list[i].number == "0" || response.data.data.list[i].number == 0){
                   response.data.data.list[i].number = ""
               }else{
                 response.data.data.list[i].number = response.data.data.list[i].number
               response.data.data.list[i].last_price = response.data.data.list[i].last_price
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
+            console.log("我爱的我的2级大风32323232323",this.recordInfo.recordData)
              for(let j=0;j<this.recordInfo.recordData.length;j++){
                for(let i=0;i<manulist.length;i++){
                   if(this.recordInfo.recordData[j].manufacturer == manulist[i].id){
                  }
                }
               }
-
+            console.log("wode 23232323232322323",this.recordInfo.recordData)
             this.warehouseOut = response.data.data.info
             this.storehouse_id = response.data.data.info.storehouse_id
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
           key = keyword
         }
         let searchArray = [];
-        postSearchDrugList(key).then(response => {
+      
+        postSearchDrugList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
             searchArray = response.data.data.list;
 
     },
     created() {
       this.drugTypeList = getDictionaryDataConfig('system','drug_type')
-      this.GetConfigInfo()
+      // this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit
       const order_id = this.$route.query.id
       this.GetOrderDetail(order_id)

src/xt_pages/stock/stockInOrderAdd.vue

         if (keyword != undefined) {
           key = keyword
         }
-        postSearchGoodList(key).then(response => {
+        postSearchGoodList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
            
              var list = response.data.data.list

src/xt_pages/stock/stockInOrderEdit.vue

         if (keyword != undefined) {
           key = keyword
         }
-        postSearchGoodList(key).then(response => {
+        postSearchGoodList(key,this.storehouse_id).then(response => {
           if (response.data.state == 1) {
           
             var list = response.data.data.list

src/xt_pages/stock/stockOutOrderAdd.vue

             </template>
           </el-table-column>
           
-          <!-- <el-table-column  width="150" align="center">
+          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>剩余库存</span>
             </template>
               </el-form-item>
             </template>
           </el-table-column>
-       -->
+      
 
          <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
                 style="padding-top: 17px"
               >
                 <el-input
+                 @input="getSupplyCount(scope.row.count,scope.row.stock_count,scope.$index)"
                  oninput="value=value.replace(/\D|^0/g,'')"
                   placeholder="请输入出库数量"
                   type="number"
         key = keyword
       }
 
-      postSearchGoodList(key).then(response => {
+      postSearchGoodList(key,this.storehouse_id).then(response => {
         if (response.data.state == 1) {
             var list = response.data.data.list
           

src/xt_pages/stock/stockOutOrderEdit.vue

             </template>
           </el-table-column>
 
-          <!-- <el-table-column  width="150" align="center">
+           <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>剩余库存</span>
             </template>
                 ></el-input>
               </el-form-item>
             </template>
-          </el-table-column> -->
+          </el-table-column> 
 
           <el-table-column width="150" align="center">
             <template slot="header" slot-scope="scope">
             <template slot-scope="scope">
               <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
                             style="padding-top: 17px">
-                <el-input type="number" v-model="scope.row.count"  :disabled="stockShow"   oninput="value=value.replace(/\D|^0/g,'')"></el-input>
+                <el-input type="number" v-model="scope.row.count"  :disabled="stockShow"   oninput="value=value.replace(/\D|^0/g,'')"  @input="getSupplyCount(scope.row.count,scope.row.stock_count,scope.$index)"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
         key = keyword
       }
 
-      postSearchGoodList(key).then(response => {
+      postSearchGoodList(key,this.storehouse_id).then(response => {
         if (response.data.state == 1) {
 
             var list = response.data.data.list

src/xt_pages/stock/stockQuery.vue

               :value="item.id">
             </el-option>
           </el-select> -->
-          <!-- <el-date-picker
+          <el-date-picker
             size="small"
             v-model="start_time"
             prefix-icon="el-icon-date"
             :editable="false"
-            style="width: 196px;"
+            style="width: 150px;"
             type="date"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             @change="startTimeChange"
-           ></el-date-picker>-
+            v-if="org_id == 3907 || org_id == 9671"
+           ></el-date-picker> 
+            <span v-if="org_id == 3907 || org_id == 9671">-</span> 
             <el-date-picker
               size="small"
               v-model="end_time"
               prefix-icon="el-icon-date"
               :editable="false"
-              style="width: 196px;"
+              style="width: 150px;"
               type="date"
               placeholder="选择日期时间"
               align="right"
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               @change="endTimeChange"
-          ></el-date-picker> -->
+              v-if="org_id == 3907 || org_id == 9671"
+          ></el-date-picker>
           <!-- <el-input
             size="small"
             style="width: 200px;margin-left:10px;"
        </el-table-column>
        <el-table-column label="出库数量" align="center">
          <template slot-scope="scope">
-          <span v-if="org_id == 9675 || org_id == 3907 || org_id == 9583">{{ getAutoCount(scope.row.id) + getOutCount(scope.row.id) }}</span>
-          <span v-if="org_id!=9675 && org_id!=3907 && org_id!=9583">
+          <span v-if="org_id == 3907 || org_id == 9583">{{ getAutoCount(scope.row.id) + getOutCount(scope.row.id) }}</span>
+          <span v-if="org_id!=3907 && org_id!=9583">
              <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
               <td style="border-right: none; border-inline-end: none;text-align: center">
               {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id) - getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;
 
         <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
-           <span v-if="org_id == 9675 || org_id == 3907 || org_id == 9583">
+           <span v-if="org_id == 3907 || org_id == 9583">
              {{
               getWareInfo(scope.row.xt_warehouse_info) -
               getAutoCount(scope.row.id) -
               getCancelCount(scope.row.id)
               }}
           </span>
-          <span v-if="org_id!=9675 && org_id!=3907 && org_id!=9583">
+          <span v-if="org_id!=3907 && org_id!=9583">
              <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
               <td style="border-right: none; border-inline-end: none;text-align: center">
                {{getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}&nbsp;&nbsp;