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

config/dev.env.js

@@ -7,8 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  // BASE_API: '"http://api.xt.test.sgjyun.com"',
-  BASE_API: '"http://localhost:9531"',
+  BASE_API: '"http://api.xt.test.sgjyun.com"',
+  // BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -27,10 +27,10 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-    // host: 'xt.test.sgjyun.com',
+    host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
     // host: 'xt.test.sgjyun.com',
-    host: 'xt.test.sgjyun.com',
+    // host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -15,9 +15,8 @@
         <div class='dialysisPage' style="padding-top:40px;">
             <!--<printOne :info="info"></printOne>-->
 
-            <!--<print-one v-if="org_id != 9504"  :info="info"></print-one>-->
-            <!--<print-two v-else  :info="info"></print-two>-->
-            <print-one :info="info"></print-one>
+            <print-one v-if="org_id != 10138" :info="info"></print-one>
+            <print-two v-else  :info="info"></print-two>
         </div>
     </div>
 </template>
@@ -69,34 +68,34 @@
         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 =
+        // 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
-        //   });
-        // }
+        // 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",

src/xt_permission.js

@@ -13,18 +13,18 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 router.beforeEach((to, from, next) => {
   // 线上注释
   // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  //       store.dispatch('VerifyConfigList', []).then(() => {
+  //         next()
+  //       })
+  //     }
+  //     if (store.getters.permission_routers === undefined) {
+  //       store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //         next()
+  //       })
+  //     } else {
+  //       next()
+  //     }
+  //   return
   // 线上注释
 
   NProgress.start()