From 16ecb2cbdd1cbefff771ed1611a5a1ef5ba3d8b8 Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <279049017@qq.com> Date: Mon, 30 Nov 2020 19:00:19 +0800 Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev --- kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html index 05840bf..c5f67cb 100644 --- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html +++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html @@ -114,11 +114,14 @@ width: "8%", title: '联系方式' }, - // { - // field: 'enabled', width: 80, title: '状态', templet: function (d) { - // return d.hospitalState == 0 ? "试用" : "正式" - // } - // }, + { + field: 'orderType', width: 80, title: '状态', templet: function (d) { + if(d.orderType==null){ + return ""; + } + return d.orderType ? "试用" : "正式" + } + }, { field: 'isScreen', width: "4%", -- Gitblit v1.8.0