csx 2 vuotta sitten
vanhempi
commit
dec2bd28b9

+ 2 - 2
config/dev.env.js Näytä tiedosto

7
   NODE_ENV: '"development"',
7
   NODE_ENV: '"development"',
8
   ENV_CONFIG: '"dev"',
8
   ENV_CONFIG: '"dev"',
9
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
9
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
10
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
11
-  // BASE_API: '"http://localhost:9531"',
10
+  // BASE_API: '"http://api.xt.test.sgjyun.com"',
11
+  BASE_API: '"http://localhost:9531"',
12
   SSO_HOST: '"http://testsso.sgjyun.com"',
12
   SSO_HOST: '"http://testsso.sgjyun.com"',
13
   SRCM_HOST: '"http://test1.sgjyun.com"',
13
   SRCM_HOST: '"http://test1.sgjyun.com"',
14
   XT_HOST: '"http://xt.test.sgjyun.com"',
14
   XT_HOST: '"http://xt.test.sgjyun.com"',

+ 2 - 2
config/index.js Näytä tiedosto

29
 
29
 
30
     // host: 'xt.test.sgjyun.com',
30
     // host: 'xt.test.sgjyun.com',
31
     //  host: 'xt.kuyicloud.com',
31
     //  host: 'xt.kuyicloud.com',
32
-   host: 'xt.test.sgjyun.com',
33
-   // host: 'localhost',
32
+   // host: 'xt.test.sgjyun.com',
33
+   host: 'localhost',
34
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
34
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
35
     autoOpenBrowser: true,
35
     autoOpenBrowser: true,
36
     errorOverlay: true,
36
     errorOverlay: true,

+ 2 - 2
src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue Näytä tiedosto

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

+ 1 - 1
src/xt_pages/outpatientDoctorStation/template/printThree.vue Näytä tiedosto

48
             </div>
48
             </div>
49
             <div style="width: 33%; display: flex">
49
             <div style="width: 33%; display: flex">
50
               电脑号:<span class="under_line">{{
50
               电脑号:<span class="under_line">{{
51
-                faber && faber.transBody ? faber.transBody.aac999 : ""
51
+                newHisPatient.id_card_no
52
               }}</span>
52
               }}</span>
53
             </div>
53
             </div>
54
             <div style="width: 33%; display: flex">
54
             <div style="width: 33%; display: flex">

+ 5 - 3
src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue Näytä tiedosto

44
             </span>
44
             </span>
45
         </div>
45
         </div>
46
         <div style="width: 33%; display: flex">
46
         <div style="width: 33%; display: flex">
47
-          电脑号:<span class="under_line">{{
48
-            faber && faber.transBody ? faber.transBody.aac999 : ""
49
-          }}</span>
47
+          电脑号:  <span class="under_line">
48
+                <span>{{
49
+                    newHisPatient.id_card_no
50
+                  }}</span>
51
+            </span>
50
         </div>
52
         </div>
51
         <div style="width: 33%; display: flex">
53
         <div style="width: 33%; display: flex">
52
           处方编号:<span class="under_line">{{
54
           处方编号:<span class="under_line">{{