From 0d06d4e76f69984cb832c92b9d0733f055e338ed Mon Sep 17 00:00:00 2001
From: dougang <78125310@kidgrow.com>
Date: Tue, 13 Apr 2021 16:02:35 +0800
Subject: [PATCH] 修改页面细节

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager.html      |    5 +-
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryDoctor_form.html  |   11 ++---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager_form.html |   36 ++++++++++++-----
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisorySummary.html      |   60 +++++++++++++++---------------
 4 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryDoctor_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryDoctor_form.html
index a95fcfe..d838f0c 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryDoctor_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryDoctor_form.html
@@ -37,7 +37,7 @@
                 </div>
             </div>
             <div class="layui-inline">
-                <label class="layui-form-label">开通服务</label>
+                <label class="layui-form-label">服务类型</label>
                 <div class="layui-input-block" style="width: 150px;">
                     <select id="service" name="service" lay-filter="service" placeholder="请选择服务"
                             lay-verify="required" required>
@@ -60,7 +60,7 @@
             <div class="layui-inline">
                 <label class="layui-form-label" style="width: 80px;">客服渠道</label>
                 <div class="layui-input-block" style="width: 150px;">
-                    <input name="price" id="channel" lay-verify="required" required placeholder="客服渠道地址" class="layui-input"  maxlength="50"/>
+                    <input name="price" id="channel" placeholder="客服渠道地址" class="layui-input"  maxlength="50"/>
                 </div>
             </div>
         </div>
@@ -165,7 +165,6 @@
         var form = layui.form;
         var config = layui.config;
         var layer = layui.layer;
-        var util = layui.util;
         var admin = layui.admin;
         var autocomplete = layui.autocomplete;
         var formSelects = layui.formSelects;
@@ -334,12 +333,13 @@
           getdepartment(adisoryDoctor.hospitalId,adisoryDoctor.deptId);
 
           form.val('app-form-add', adisoryDoctor);
+
           $("#price").val(adisoryDoctor.price / 100);
           $("#doctorName").val(adisoryDoctor.doctorName);
           $("#bindPhone").attr("Readonly",true);
+          form.render();
 
-        admin.req('api-opration/appointment/queryByAdvisoryId/'+$("#id").val(), {
-
+          admin.req('api-opration/appointment/queryByAdvisoryId/'+$("#id").val(), {
         }, function (data) {
             layer.closeAll('loading');
             if (0 === data.code) {
@@ -356,7 +356,6 @@
                 });
             }
         }, 'get');
-
 
           form.render();
         }
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager.html
index f3ce5c8..79ef8cc 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager.html
@@ -11,10 +11,9 @@
             <div class="layui-form-item">
                 <div class="layui-inline">
                     <select id="type" lay-filter="role_clients">
-                        <option value="">咨询类型</option>
+                        <option value="">服务类型</option>
                         <option value="1">图文</option>
                         <option value="2">电话</option>
-                        <option value="3">图文/电话</option>
                     </select>
                     <select id="status" lay-filter="role_clients">
                         <option value="">咨询状态</option>
@@ -81,7 +80,7 @@
                     },{
                         field: 'type',
                         width: "90",
-                        title: '类型',
+                        title: '服务类型',
                         fixed: 'left',
                         templet: function (d) {
                             if (d.type == 1) {
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager_form.html
index 9158dc4..d2dbe47 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisoryManager_form.html
@@ -19,7 +19,7 @@
                 <div class="layui-input-block" id="createTime" style="width: 245px;"/>
             </div>
             <div class="layui-inline">
-                <label class="layui-form-label">开通服务</label>
+                <label class="layui-form-label">咨询状态</label>
                 <div class="layui-input-block" id="service"/>
             </div>
         </div>
@@ -48,7 +48,7 @@
         <div class="layui-form-item">
             <div class="layui-inline">
                 <label class="layui-form-label" style="width: 10px;"></label>
-                <div style="width: 450px;height:100px; padding-left: 40px; text-align: left" id="img"/>
+                <div style="width: 450px;max-height:100px; min-height: 10px; padding-left: 40px; text-align: left" id="img"/>
             </div>
         </div>
     </div>
@@ -140,14 +140,16 @@
 
             $("#createTime").html(adisory.createTime);
 
-            if (adisory.type == 1) {
+            if (adisory.consultationStatus == 1) {
                 $("#service").html("待咨询");
-            } else if (adisory.type == 2) {
+            } else if (adisory.consultationStatus == 2) {
                 $("#service").html("咨询中");
-            } else if (adisory.type == 3) {
+            } else if (adisory.consultationStatus == 3) {
                 $("#service").html("待完成");
-            } else if (adisory.type == 4) {
+            } else if (adisory.consultationStatus == 4) {
                 $("#service").html("已完成");
+            } else if (adisory.consultationStatus == -1) {
+                $("#service").html("已取消");
             }
 
             $("#doctor").html(adisory.doctorName);
@@ -158,16 +160,18 @@
             if (adisory.img !== null) {
                 var url = adisory.img.split(",");
                 for (var i = 0; i < url.length; i++) {
-                    content += "<img src='" + url[i] + "' style='width: 25%;height: 100%;cursor:pointer;' onclick='tipImg(this,1)'/> &nbsp;";
+                    if(url[i] != ''){
+                        content += "<img src='" + url[i] + "' style='width: 25%;height: 100%;cursor:pointer;' onclick='tipImg(this,1)'/> &nbsp;";
+                    }
                 }
             }
             $("#img").html(content);
 
             $("#one").html(adisory.age + "/" + adisory.childSex == 0 ? "女" : "男");
-            $("#two").html(adisory.targetHeight + "/" + adisory.targetHeightPer);
-            $("#three").html(adisory.height + "/" + adisory.heightPer);
-            $("#four").html(adisory.weight + "/" + adisory.bmi);
-            $("#five").html(adisory.foreastHeight);
+            $("#two").html(keepOneDecimal(adisory.targetHeight) + "/" + keepOneDecimal(adisory.targetHeightPer));
+            $("#three").html(keepOneDecimal(adisory.height) + "/" + keepOneDecimal(adisory.heightPer));
+            $("#four").html(keepOneDecimal(adisory.weight) + "/" + keepOneDecimal(adisory.bmi));
+            $("#five").html(keepOneDecimal(adisory.foreastHeight));
 
             if(adisory.type == 2) {
                 $("#appointmentTime").html(adisory.appointmentTime);
@@ -222,4 +226,14 @@
         }
 
     }
+
+    function keepOneDecimal(obj){
+        if(obj == '' || obj == null){
+            return "";
+        }
+        if(isNaN(obj)){
+            return obj;
+        }
+        return parseFloat(obj).toFixed(1);
+    }
 </script>
\ No newline at end of file
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisorySummary.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisorySummary.html
index ce8e403..da75a5d 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisorySummary.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/keaigao/AdvisorySummary.html
@@ -164,40 +164,40 @@
                         }, {
                             field: 'graphicAdvisoryCount',
                             width: "150",
-                            title: '图文咨询当日创建',
+                            title: '图文当日创建',
                             align: 'center',
                             fixed: 'left'
                         }, {
                             field: 'graphicAdvisoryDoneCount',
-                            width: "100",
-                            title: '当日完成',
+                            width: "150",
+                            title: '图文当日完成',
                             align: 'center',
                             fixed: 'left',
                         }, {
                             field: 'phoneAdvisoryCount',
                             width: "150",
-                            title: '电话咨询当日创建',
+                            title: '电话当日创建',
                             align: 'center',
                             fixed: 'left',
                         }, {
                             field: 'phoneAdvisoryConnectCount',
-                            width: "100",
+                            width: "150",
                             align: 'center',
-                            title: '当日通话',
+                            title: '电话当日通话',
                             fixed: 'left',
                         },
                             {
                                 field: 'phoneAdvisoryDoneCount',
-                                width: "100",
+                                width: "150",
                                 align: 'center',
-                                title: '当日完成',
+                                title: '电话当日完成',
                                 fixed: 'left',
                             },
                             {
                                 field: 'phoneAdvisoryCanncelCount',
-                                width: "100",
+                                width: "150",
                                 align: 'center',
-                                title: '当日取消',
+                                title: '电话当日取消',
                                 fixed: 'left'
                             }
                         ]
@@ -232,40 +232,40 @@
                         }, {
                             field: 'graphicAdvisoryCount',
                             width: "150",
-                            title: '图文咨询当日创建',
+                            title: '图文当日创建',
                             align: 'center',
                             fixed: 'left'
                         }, {
                             field: 'graphicAdvisoryDoneCount',
-                            width: "100",
-                            title: '当日完成',
+                            width: "150",
+                            title: '图文当日完成',
                             align: 'center',
                             fixed: 'left',
                         }, {
                             field: 'phoneAdvisoryCount',
                             width: "150",
-                            title: '电话咨询当日创建',
+                            title: '电话当日创建',
                             align: 'center',
                             fixed: 'left',
                         }, {
                             field: 'phoneAdvisoryConnectCount',
-                            width: "100",
+                            width: "150",
                             align: 'center',
-                            title: '当日通话',
+                            title: '电话当日通话',
                             fixed: 'left',
                         },
                             {
                                 field: 'phoneAdvisoryDoneCount',
-                                width: "100",
+                                width: "150",
                                 align: 'center',
-                                title: '当日完成',
+                                title: '电话当日完成',
                                 fixed: 'left',
                             },
                             {
                                 field: 'phoneAdvisoryCanncelCount',
-                                width: "100",
+                                width: "150",
                                 align: 'center',
-                                title: '当日取消',
+                                title: '电话当日取消',
                                 fixed: 'left'
                             }
                         ]
@@ -318,40 +318,40 @@
                         }, {
                             field: 'graphicAdvisoryCount',
                             width: "150",
-                            title: '图文咨询当日创建',
+                            title: '图文当日创建',
                             align: 'center',
                             fixed: 'left'
                         }, {
                             field: 'graphicAdvisoryDoneCount',
-                            width: "100",
-                            title: '当日完成',
+                            width: "150",
+                            title: '图文当日完成',
                             align: 'center',
                             fixed: 'left',
                         }, {
                             field: 'phoneAdvisoryCount',
                             width: "150",
-                            title: '电话咨询当日创建',
+                            title: '电话当日创建',
                             align: 'center',
                             fixed: 'left',
                         }, {
                             field: 'phoneAdvisoryConnectCount',
-                            width: "100",
+                            width: "150",
                             align: 'center',
-                            title: '当日通话',
+                            title: '电话当日通话',
                             fixed: 'left',
                         },
                             {
                                 field: 'phoneAdvisoryDoneCount',
-                                width: "100",
+                                width: "150",
                                 align: 'center',
-                                title: '当日完成',
+                                title: '电话当日完成',
                                 fixed: 'left',
                             },
                             {
                                 field: 'phoneAdvisoryCanncelCount',
-                                width: "100",
+                                width: "150",
                                 align: 'center',
-                                title: '当日取消',
+                                title: '电话当日取消',
                                 fixed: 'left'
                             }
                         ]

--
Gitblit v1.8.0