合并带嘛

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

@@ -29,8 +29,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-   host: 'xt.test.sgjyun.com',
-   // host: 'localhost',
+   // 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/hospitalStation/invoiceTemplate/printThree.vue

@@ -180,9 +180,9 @@
           <!-- 医疗救助 -->
         </div>
         <!-- 大病 -->
-        <!-- <div style="position: absolute;top:340px;left:500px">
+        <div style="position: absolute;top:340px;left:500px">
           {{list.order.hifmi_pay?list.order.hifmi_pay:''}}
-        </div> -->
+        </div>
         <!-- 其他基金支付 -->
         <div style="position: absolute;top:340px;left:560px">
           预交押金:{{(parseFloat(pre_pay_money) + parseFloat(list.order.decimal)).toFixed(2)}}

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -48,7 +48,7 @@
             </div>
             <div style="width: 33%; display: flex">
               电脑号：<span class="under_line">{{
-                faber && faber.transBody ? faber.transBody.aac999 : ""
+                newHisPatient.id_card_no
               }}</span>
             </div>
             <div style="width: 33%; display: flex">

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -44,9 +44,11 @@
             </span>
         </div>
         <div style="width: 33%; display: flex">
-          电脑号：<span class="under_line">{{
-            faber && faber.transBody ? faber.transBody.aac999 : ""
-          }}</span>
+          电脑号：  <span class="under_line">
+                <span>{{
+                    newHisPatient.id_card_no
+                  }}</span>
+            </span>
         </div>
         <div style="width: 33%; display: flex">
           处方编号：<span class="under_line">{{