From a7ce98e167ae05c2ee00e39733b35521353218cd Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 26 Feb 2021 15:23:22 +0800
Subject: [PATCH] 增加模板读取的错误处理和生成SQL文件时的错误处理

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html |   51 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
index c6adb27..7c34ac0 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital_form_base.html
@@ -19,6 +19,22 @@
     </div>
     <div class="layui-form-item">
         <div class="layui-row">
+            <div class="layui-col-sm5">
+                <label class="layui-form-label">医院联系人</label>
+                <div class="layui-input-block">
+                    <input name="hospitalLink" type="text" class="layui-input" maxlength="20" style="width: 200px;" />
+                </div>
+            </div>
+            <div class="layui-col-sm5">
+                <label class="layui-form-label">医院电话</label>
+                <div class="layui-input-block">
+                    <input name="hospitalTel" id="hospitalTel" type="text" class="layui-input" maxlength="20" />
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-row">
             <div class="layui-col-sm4">
                 <label class="layui-form-label">科室名称</label>
                 <div class="layui-input-block">
@@ -27,15 +43,15 @@
                     &emsp;</div>
             </div>
             <div class="layui-col-sm3">
-                <label class="layui-form-label">联系电话</label>
+                <label class="layui-form-label">科室电话</label>
                 <div class="layui-input-block">
-                    <input name="hospitalTel" id="hospitalTel" type="text" class="layui-input" maxlength="20" />
+                    <input name="departmentTel" id="departmentTel" type="text" class="layui-input" maxlength="20" />
                 </div>
             </div>
             <div class="layui-col-sm3">
-                <label class="layui-form-label">联系人</label>
+                <label class="layui-form-label">科室联系人</label>
                 <div class="layui-input-block">
-                    <input name="hospitalLink" type="text" class="layui-input" maxlength="20" style="width: 200px;" />
+                    <input name="departmentLink" id="departmentLink" type="text" class="layui-input" maxlength="20" style="width: 200px;" />
                 </div>
             </div>
         </div>
@@ -233,13 +249,8 @@
                     if (data.data.length > 0) {
                         $.each(data.data, function (index, item) {
                             //往下拉菜单里添加元素
-                            if (!strUtil.isEmpty(selectVal) && selectVal == item.id) {
                                 $('#saleUserName').append(new Option(item.nickname, item.id,
-                                    false, true));
-                            } else {
-                                $('#saleUserName').append(new Option(item.nickname, item.id,
-                                    false, false));
-                            }
+                                    false, (!strUtil.isEmpty(selectVal) && selectVal == item.id)));
                         });
 
                         if (hosIdForEdit == "") {
@@ -254,7 +265,6 @@
                         time: 2000
                     });
                 }
-
             }, 'get');
         }
         //医院资质数据
@@ -267,13 +277,22 @@
         let edithospitalData = admin.getTempData('t_hospital');
         var hosIdForEdit = "";
         var departmentId = "";
+        //当前登录人员的id
+        var selectVal="";
         if (edithospitalData != null) {
             hosIdForEdit = edithospitalData.hospitalId;
             departmentId = edithospitalData.departmentId;
         }
+        else{
+            //先拿到当前登录用户的信息
+            var nowUser = config.getUser();
+            if (!strUtil.isEmpty(nowUser)) {
+                selectVal = nowUser.id;
+            }
+        }
         //装载销售人员 服务人员数据
-        loadServerUser();
-        loadSaleUser();
+        loadServerUser(selectVal);
+        loadSaleUser(selectVal);
 
         //装载市区数据
         form.on("select(hospitalProvince)", function (data) {
@@ -340,7 +359,9 @@
                             saleUserId: '' + $("#saleUserName").val(),
                             saleUserName: $("#saleUserName option:selected").text(),
                             saleUserTel: $("#saleUserTel").val(),
-                            accountsCount: $("#accountsCount").val()
+                            accountsCount: $("#accountsCount").val(),
+                            departmentTel: $("#departmentTel").val(),
+                            departmentLink: $("#departmentLink").val(),
                         };
                         admin.req('api-user/sysdepartment/'+data.data.id, JSON.stringify(departmentData),
                             function (data) {
@@ -466,6 +487,8 @@
                                         $("#accountsCount").val(departData[0]
                                             .accountsCount);
                                         $('#saleUserName').val(departData[0].saleUserId);
+                                        $('#departmentLink').val(departData[0].departmentLink);
+                                        $('#departmentTel').val(departData[0].departmentTel);
 
                                         if (hosIdForEdit != "") {
                                             $("#serverUserTel").val(departData[0]

--
Gitblit v1.8.0