浏览代码

修改华侨医院

csx 5 年前
父节点
当前提交
93485851b9

+ 1 - 2
config/dev.env.js 查看文件

@@ -7,8 +7,7 @@ module.exports = {
7 7
   NODE_ENV: '"development"',
8 8
   ENV_CONFIG: '"dev"',
9 9
   BASE_API: '"http://localhost:9529"',//'"http://localhost:9529"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
10
-
11
-  SSO_HOST: '"http://testsso.sgjyun.com"',
10
+  SSO_HOST: '"https://testsso.sgjyun.com"',
12 11
   SRCM_HOST: '"http://test1.sgjyun.com"',
13 12
   XT_HOST: '"http://xt.test.sgjyun.com"',
14 13
   MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',

+ 1 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_other.vue 查看文件

@@ -507,7 +507,7 @@
507 507
                           <span v-if="setAdminUserES(record.check, 'creater') == ''">{{getAdminUser(record.check, 'creater')}}</span>
508 508
                           <img class="es-img" :src="setAdminUserES(record.check, 'creater')" alt="" srcset="" v-else>
509 509
                         </div>
510
-                        <div class="under_line" style="width: 80px;text-align: left" v-if="record.dialysis_order.id != 0&&record.dialysis_order.start_nurse != record.check.modifier&&record.dialysis_order.start_nurse != record.check.creater/dialysis/print/batch/otherone">
510
+                        <div class="under_line" style="width: 80px;text-align: left" v-if="record.dialysis_order.id != 0&&record.dialysis_order.start_nurse != record.check.modifier&&record.dialysis_order.start_nurse != record.check.creater">
511 511
                           <span v-if="setAdminUserES(record.check, 'creater') == ''">{{getAdminUser(record.check, 'creater')}}</span>
512 512
                           <img class="es-img" :src="setAdminUserES(record.check, 'creater')" alt="" srcset="" v-else>
513 513
                         </div>

+ 4 - 0
src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue 查看文件

@@ -499,6 +499,10 @@
499 499
                     <span v-if="setAdminUserES(check==null?0:check.modifier) == ''">{{getAdminUser(check==null?0:check.modifier)}}</span>
500 500
                     <img class="es-img" :src="setAdminUserES(check==null?0:check.modifier)" alt="" srcset="" v-else>
501 501
                   </div>
502
+                  <div class="under_line" style="width: 80px;text-align: left" v-if="dialysisOrder != null && dialysisOrder.start_nurse != check.creater&&dialysisOrder.start_nurse != check.modifier">
503
+                    <span v-if="setAdminUserES(check==null?0:check.creater) == ''">{{getAdminUser(check==null?0:check.creater)}}</span>
504
+                    <img class="es-img" :src="setAdminUserES(check==null?0:check.creater)" alt="" srcset="" v-else>
505
+                  </div>
502 506
                 </div>
503 507
                 <div class="inline_block">
504 508
                   &emsp;核对时间: