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

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

 
         <div class='dialysisPage' style="padding-top:40px;">
             <!--<printOne :info="info"></printOne>-->
-            <print-one :info="info"></print-one>
+
+            <print-one v-if="org_id != 0"  :info="info"></print-one>
+            <print-two v-else  :info="info"></print-two>
         </div>
     </div>
 </template>
   import BreadCrumb from "@/xt_pages/components/bread-crumb";
   import print from "print-js";
   import printOne from "./newTreatTemplate/printOne"
+  import printTwo from "./newTreatTemplate/printTwo"
   export default {
     name: "newStatementPrintTwo",
     components: {
       BreadCrumb,
-      printOne
+      printOne,
+      printTwo
     },
     props:{
       paramsObj:Object
         prescription_id:0,
         ids:'',
         info:null,
+        org_id:''
       };
     },
     methods:{
       printThisPage() {
         var ptime = Math.round(new Date().getTime() / 1000);
         this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
-
-        const style =
-        '@media print {.printTitle{font-size: 20px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;font-size:12px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;font-size:12px;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none;font-size:12px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;font-size:12px;}.actionBar div{width:150px;}}';
-        printJS({
-            printable: "prescription-print",
-            type: "html",
-            style: style,
-            scanStyles: false
-        });
-
+        if(this.org_id == 10138){
+          const style =
+          '@media print {#prescription-print{font-size:12px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}}';
+          printJS({
+              printable: "prescription-print",
+              type: "html",
+              style: style,
+              scanStyles: false
+          });
+        }else{
+          const style =
+          '@media print {.printTitle{font-size: 20px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;font-size:12px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;font-size:12px;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none;font-size:12px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;font-size:12px;}.actionBar div{width:150px;}}';
+          printJS({
+              printable: "prescription-print",
+              type: "html",
+              style: style,
+              scanStyles: false
+          });
+        }
         // if (this.org_template_info.template_id == 1) {
         //   printJS({
         //     printable: "dialysis-print-box",
     },
 
     created() {
+      this.org_id = this.$store.getters.xt_user.org_id
       this.getInfo(this.paramsObj)
     },
     watch:{

src/xt_pages/outpatientCharges/treatTemplate/printTwo.vue → src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue

                 <div>透析号：<span style="display:inline-block;width:200px;"></span></div>
             </div>
             <div style="display:flex;">
-                <div>姓名：<span style="display:inline-block;width:50px;">{{patient.name}}</span></div>
+                <div>姓名：<span style="display:inline-block;width:50px;">{{info.patient_name}}</span></div>
                 <div>性别：<span style="display:inline-block;width:30px;">{{patient.gender == 1 ? '男' : '女'}}</span></div>
                 <div>年龄：<span style="display:inline-block;width:50px;">{{patient.age}}岁</span></div>
                 <div>费别：<span style="display:inline-block;width:80px;"></span></div>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

             <div class="mainRight">
 
                 <div class="mainCell fixedCell" style="margin-bottom:10px;">
-                    <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138">
+                    <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 0">
                         <el-button v-loading="loadingone" size="small"
                                    @click="sz_open(1)"
                                    type="primary">挂号

src/xt_pages/outpatientCharges/treatPrint.vue

       >
     </template>
     <div class="app-container" style="padding-top:40px;">
-        <div class='dialysisPage'>
-            <printOne v-if="org_id != 10138" v-bind:childResponse="childResponse" :paramsObj="paramsObj"></printOne>
-            <printTwo v-else v-bind:childResponse="childResponse" :paramsObj="paramsObj"></printTwo>
-
-        </div>
+      <printOne v-bind:childResponse="childResponse" :paramsObj="paramsObj"></printOne>
     </div>
   </div>
 </template>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import print from "print-js";
 import printOne from "./treatTemplate/printOne"
-import printTwo from "./treatTemplate/printTwo"
 export default {
   name: "dialysisPrintOrder",
   components: {
     BreadCrumb,
     printOne,
-    printTwo
   },
   props:{
     paramsObj:Object
       var ptime = Math.round(new Date().getTime() / 1000);
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
-      if(this.org_id == 10138){
-        const style =
-        '@media print {#prescription-print{font-size:12px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}}';
-        printJS({
-            printable: "prescription-print",
-            type: "html",
-            style: style,
-            scanStyles: false
-        });
-      }else{
-        const style =
-        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
-        printJS({
-            printable: "prescription-print",
-            type: "html",
-            style: style,
-            scanStyles: false
-        });
-      }
+      const style =
+      '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
+      printJS({
+          printable: "prescription-print",
+          type: "html",
+          style: style,
+          scanStyles: false
+      });
       
 
       // if (this.org_template_info.template_id == 1) {

src/xt_pages/user/inspection.vue

   methods: {
     changeInput(item){
       
-      if(item.item_name == '血清铁蛋白' || item.item_name == '总铁结合力'){
+      if(item.item_name == '血清铁' || item.item_name == '总铁结合力'){
         let index1 = ''
         let index2 = ''
         this.form.formItem.map((it,index) => {
-          if(this.form.formItem[index].item_name == '血清铁蛋白'){
+          if(this.form.formItem[index].item_name == '血清铁'){
             index1 = index
           }
           if(this.form.formItem[index].item_name == '总铁结合力'){