Kaynağa Gözat

add + update 新增 疾病类型 和 部位 关联 下来搜索查询 以及页调整

bzd_lxf 4 ay önce
ebeveyn
işleme
97ede9e77a

+ 1 - 1
health-admin/src/main/java/com/bzd/web/controller/dtp/PharmaceuticalServiceController.java

@@ -223,7 +223,7 @@ public class PharmaceuticalServiceController extends BaseController {
           Integer age = ServletUtils.calculateAge(dateBirth.toString());//根据出生日期字符串计算年龄
            pd.put("age",age);
        }
-        if (!pharmaceuticalService.checkPatientIsExist(pd))
+        if (pharmaceuticalService.checkPatientIsExist(pd))
         {
             return error("患者建档新增保存: '" + pd.getString("name") +"+"+ pd.getString("documentNumber") +"+" +pd.getString("phoneNumber")+"'失败,患者姓,身份证名或电话已存在");
         }

+ 27 - 0
health-admin/src/main/java/com/bzd/web/controller/spgl/SPConfigInfoController.java

@@ -7,6 +7,7 @@ import com.bzd.common.core.domain.AjaxResult;
 import com.bzd.common.core.page.TableDataInfo;
 import com.bzd.common.enums.BusinessType;
 import com.bzd.common.utils.StringUtils;
+import com.bzd.system.service.TypeDataService;
 import com.bzd.system.service.spgl.SPProductinfoService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.json.JSONObject;
@@ -36,6 +37,32 @@ public class SPConfigInfoController extends BaseController {
 
     @Autowired
     private SPProductinfoService sPProductinfoService;
+    @Autowired
+    private TypeDataService typeDataService;
+
+    @GetMapping("/typeDate")
+    @ResponseBody
+    public AjaxResult typeDate() throws Exception
+    {
+        AjaxResult ajax = new AjaxResult();
+        PageData pd = this.getPageData();
+        List<PageData> list = typeDataService.typeDate(pd);
+        ajax.put("code", 200);
+        ajax.put("value", list);
+        return ajax;
+    }
+
+    @GetMapping("/typeDate2")
+    @ResponseBody
+    public AjaxResult typeDate2(@RequestParam(value = "jbtype", required = false) String jbtype, ModelMap mmap) throws Exception {
+        AjaxResult ajax = new AjaxResult();
+        PageData pd = this.getPageData();
+        List<PageData> list = typeDataService.typeDate2(pd);
+        ajax.put("code", 200);
+        ajax.put("value", list);
+        return ajax;
+    }
+
 
     @RequiresPermissions("sp:sp:view")
     @GetMapping("/SPProductinfoListView")

+ 3 - 3
health-admin/src/main/resources/templates/dtp/archives/archivesEdit.html

@@ -437,7 +437,7 @@
                                            <div class="customize-form-group edit">
                                                <div style="/*display: flex;*/">
                                                <label style="width: auto;">家族史:</label>
-                                                   <button type="button"  data-toggle="modal" data-target="#myModal" class="btn-primary">新增</button>
+                                                   <button type="button"  data-toggle="modal" data-target="#myModal" class="btn btn-xs btn-primary">新增</button>
                                                    <table id="familyHistoryTable" style="width: 340px;">
                                                        <thead>
                                                        <tr>
@@ -513,7 +513,7 @@
                                              <div class="customize-form-group edit">
                                                  <div style="/*display: flex;*/">
                                                      <label style="width: auto;">当前用药情况:</label>
-                                                     <button type="button"  data-toggle="modal" data-target="#myModal2" class="btn-primary">新增</button>
+                                                     <button type="button"  data-toggle="modal" data-target="#myModal2" class="btn btn-xs btn-primary">新增</button>
                                                      <table id="yyqkTable" style="width: 340px;">
                                                          <thead>
                                                          <tr>
@@ -573,7 +573,7 @@
                                              <div class="customize-form-group edit">
                                                  <div style="/*display: flex;*/">
                                                      <label style="width: auto;">联系人:</label>
-                                                     <button type="button"  data-toggle="modal" data-target="#myModal3" class="btn-primary">新增</button>
+                                                     <button type="button"  data-toggle="modal" data-target="#myModal3" class="btn btn-xs btn-primary">新增</button>
                                                      <table id="relationTable"  style="width: 310px;">
                                                          <thead>
                                                          <tr>

+ 2 - 2
health-admin/src/main/resources/templates/dtp/followUpAssign/followUpAssignList.html

@@ -45,8 +45,8 @@
 				</div>
 
 			</div>
-			<button id="myButtonhzfp"  type="button" onclick="huanzhefp()">患者分配</button>
-			<button id="myButtonyglzjj"  type="button" onclick="yuanogngLZJJ()">员工离职交接</button>
+			<button id="myButtonhzfp" style="margin-left: 20px" type="button" onclick="huanzhefp()" >患者分配</button>
+			<button id="myButtonyglzjj" style="margin-left: 10px" type="button" onclick="yuanogngLZJJ()">员工离职交接</button>
 			<div class="rows" id="tabsDiv">
 				<ul class="nav nav-tabs" id="myTabs">
 					<li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">全部</a>

+ 196 - 120
health-admin/src/main/resources/templates/dtp/recipe/add.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns="http://www.w3.org/1999/html">
 <head>
     <th:block th:include="include :: header('新增处方')" />
     <th:block th:include="include :: select2-css" />
@@ -77,26 +77,21 @@
                         </li>
                         <li class="list-group-item">
                             <i class="fa fa-envelope-o"></i>
-                            <b class="font-noraml">疾病类型:</b>
+                            <b class="font-noraml">疾病类型:<i style="color: #307cc2;">可多选或直接输入疾病名称搜索</i></b>
                             <p class="pull-right">
-                            <div class="customize-form-group2 select-time">
-                                <select name="diseaseType" id="diseaseType" class="styled-input2"  th:with="type=${@dict.getType('sys_select_dtp_ysfw_mbzllx')}" required>
-                                    <option value="">请选择</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
+                            <div class="form-group2">
+                                <label for="category-select">疾病类型:</label>
+                                <select id="category-select" style="width: 100%"  class="form-control select2-multiple" multiple placeholder="请选择或输入搜索">
+                                    <option value="">请选择疾病大类</option>
                                 </select>
                             </div>
-                            <div class="customize-form-group2 select-time" id="specificDiseaseDiv1" style="display: none;" >
-                                <select name="specificDisease" id="specificDisease1" class="styled-input2"  th:with="type=${@dict.getType('sys_select_dtp_ysfw_mbzllx_mb')}" required>
-                                    <option value="">请选择</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
-                                </select>
-                            </div>
-                            <div class="customize-form-group2 select-time" id="specificDiseaseDiv2" style="display: none;">
-                                <select name="specificDisease" id="specificDisease2" class="styled-input2"  th:with="type=${@dict.getType('sys_select_dtp_ysfw_mbzllx_zl')}" required>
-                                    <option value="">请选择</option>
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
+                            <div class="form-group2">
+                                <label for="subcategory-select">小类:</label>
+                                <select id="subcategory-select" style="width: 100%" class="form-control select2-multiple" multiple placeholder="请选择或输入搜索">
+                                    <option value="">请选择子类别</option>
                                 </select>
                             </div>
+
                             </p>
                         </li>
 
@@ -130,7 +125,7 @@
                             </div>
                         </div>
                         <div class="col-sm-offset-5 col-sm-10">
-                            <button type="button"  onclick="selectUsersToParentCallBack2()" class="btn-danger">添加药品</button>
+                            <button type="button"  onclick="selectUsersToParentCallBack2()" class="btn btn-w-m btn-primary">添加药品</button>
                         </div>
                     </div>
                 </div>
@@ -138,7 +133,7 @@
         </div>
         </p>
         <div class="customize-form-group" style="justify-content: center;">
-        <button type="button"  onclick="bangding()" class="btn-primary">绑定患者</button>
+        <button type="button"  onclick="bangding()" class="btn btn-w-m btn-success">绑定患者</button>
         </div>
     </div>
 
@@ -175,6 +170,9 @@
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: select2-js" />
 <th:block th:include="include :: bootstrap-fileinput-js" />
+
+<th:block th:include="include :: bootstrap-suggest-js" />
+<th:block th:include="include :: bootstrap-typeahead-js" />
 <script>
     var prefix = ctx + "dtp/recipe";
     var prefix_bd = ctx + "dtp/recipe";
@@ -183,6 +181,99 @@
     var hzparam =[];
     var openId='';
     var data;
+
+    /* 读取 疾病大类 和小类 数据*/
+    $(document).ready(function() {
+        var clearSpan = $('.select2-selection-clear');
+        // 初始化 Select2 插件
+        $('#category-select').select2({
+            placeholder: "请选择或直接输入搜索",
+            //allowClear: true //在输入框最后 有一个 删除所有的X 但是会出现 第一个删除出现问题有空格
+        });
+        // Listen for the 'select2:select' event
+        $('#category-select').on('select2:select', function(e) {
+            var clearSpan = $('.select2-selection-clear');
+            if (clearSpan.length > 0) {
+                clearSpan.remove();
+            }
+        });
+
+        // 发送 AJAX 请求获取疾病大类数据
+        $.ajax({
+            url: ctx + 'sp/sp/typeDate',
+            method: 'GET',
+            dataType: 'json',
+            success: function(data) {
+                var options = $('#category-select');
+                // 清空已有选项(除了第一个默认选项)
+                options.find('option').not(':first').remove();
+                $('<option>', {
+                    value: '',
+                    text : '请选择疾病类型'
+                }).appendTo(options);
+                // 遍历返回的数据并添加选项
+                $.each(data.value, function(index, item) {
+                    $('<option>', {
+                        value: item.id,
+                        text : item.categoryName
+                    }).appendTo(options);
+                });
+
+                // 重新初始化 Select2 以反映新的选项
+                options.trigger('change');
+            },
+            error: function(xhr, status, error) {
+                console.error("Failed to load disease categories:", error);
+            }
+        });
+
+        // 初始化子类别下拉框
+        $('#subcategory-select').select2({
+            placeholder: "请选择或直接输入搜索",
+            //allowClear: true
+        });
+
+        // 监听第一个下拉框的选择事件
+        $('#category-select').on('change', function() {
+            var selectedCategory = $(this).val();
+            if (selectedCategory.length > 0) {
+                loadSubcategories(selectedCategory);
+            } else {
+                // 如果没有选择任何项,清空子类别下拉框
+                $('#subcategory-select').find('option').not(':first').remove();
+                $('#subcategory-select').trigger('change');
+            }
+        });
+    });
+
+    function loadSubcategories(categoryId) {
+        // 模拟从服务器获取子类别数据
+        $.ajax({
+            url: ctx + 'sp/sp/typeDate2?jbtype=' + categoryId, // 假设 ctx 是你的上下文路径
+            method: 'GET',
+            dataType: 'json',
+            success: function(data) {
+                var options = $('#subcategory-select');
+                // 清空已有选项(除了第一个默认选项)
+                options.find('option').not(':first').remove();
+
+                // 遍历返回的数据并添加选项
+                $.each(data.value, function(index, item) {
+                    $('<option>', {
+                        value: item.ida,
+                        text : item.categoryNamea
+                    }).appendTo(options);
+                });
+
+                // 重新初始化 Select2 以反映新的选项
+                options.trigger('change');
+            },
+            error: function(xhr, status, error) {
+                console.error("Failed to load subcategories:", error);
+            }
+        });
+    }
+
     function uploadImage(input) {
         if (input.files && input.files[0]) {
             var reader = new FileReader();
@@ -214,25 +305,25 @@
         });
     }
 
-    document.getElementById('diseaseType').addEventListener('change', function() {
-        jbtype = this.value;
-            if(jbtype=='慢病'){
-                specificDiseaseDiv1
-                $('#specificDiseaseDiv1').show();
-                $('#specificDiseaseDiv2').hide();
-                $('#specificDisease2').prop('selectedIndex', 0);
-            }else if(jbtype=='肿瘤'){
-                $('#specificDiseaseDiv2').show();
-                $('#specificDiseaseDiv1').hide();
-                $('#specificDisease1').prop('selectedIndex', 0);
-            }else{
-                $('#specificDisease1').prop('selectedIndex', 0);
-                $('#specificDisease2').prop('selectedIndex', 0);
-                $('#specificDiseaseDiv2').hide();
-                $('#specificDiseaseDiv1').hide();
-            }
-        console.log('Selected value:', this.value);
-    });
+    // document.getElementById('diseaseType').addEventListener('change', function() {
+    //     jbtype = this.value;
+    //         if(jbtype=='慢病'){
+    //             specificDiseaseDiv1
+    //             $('#specificDiseaseDiv1').show();
+    //             $('#specificDiseaseDiv2').hide();
+    //             $('#specificDisease2').prop('selectedIndex', 0);
+    //         }else if(jbtype=='肿瘤'){
+    //             $('#specificDiseaseDiv2').show();
+    //             $('#specificDiseaseDiv1').hide();
+    //             $('#specificDisease1').prop('selectedIndex', 0);
+    //         }else{
+    //             $('#specificDisease1').prop('selectedIndex', 0);
+    //             $('#specificDisease2').prop('selectedIndex', 0);
+    //             $('#specificDiseaseDiv2').hide();
+    //             $('#specificDiseaseDiv1').hide();
+    //         }
+    //     console.log('Selected value:', this.value);
+    // });
     function submitHandler() {
             add();
     }
@@ -241,6 +332,31 @@
         //$('#prescriptionNumberItem').hide();//控制是第三方存入后 登记处方时的信息显示字段
         var formData = [];
         var flag = false;
+        // 获取选中的值
+        var JBDLval = $('#category-select').val(); // 疾病大类
+        var JBXLval = $('#subcategory-select').val(); // 疾病小类
+        // 获取选中的选项对象集合
+        var selectedOptionsDL = $('#category-select option:selected');
+        var selectedOptionsXL = $('#subcategory-select option:selected');
+
+        // 使用 .map() 来创建一个包含选中选项文本的数组
+        var JBDL = selectedOptionsDL.map(function() { // 疾病大类
+            return $(this).text();
+        }).get(); // 获取的数据格式 [ "肿瘤治疗并发症与合并症名称", "风湿免疫疾病名称库" ]
+        var JBXL = selectedOptionsXL.map(function() { // 疾病小类
+            return $(this).text();
+        }).get(); // 获取的数据格式 [ "肿瘤治疗并发症与合并症名称", "风湿免疫疾病名称库" ]
+
+        // 同样地,如果你需要获取选中的 ID 和名称,可以这样做:
+//         var selectedData = selectedOptions.map(function() {
+//             return {
+//                 id: $(this).val(),
+//                 name: $(this).text()
+//             };
+//         }).get();  // 获取的数据格式 [{ id: "2", name: "肿瘤治疗并发症与合并症名称" }, { id: "3", name: "风湿免疫疾病名称库" }]
+
+
+            return;
         $('.ibox').each(function() {
             var productId = $(this).find('input[name="productId"]').val();
             var mdmCode = $(this).find('input[name="mdmCode"]').val();
@@ -311,8 +427,6 @@
             return;
         }
         hzparam.push({name:"openId",value:openId});//模拟微信扫码获取微信openId
-        console.log("hzparam========"+hzparam)
-        console.log("openId="+openId)
         $.ajax({
             cache: true,
             type: "POST",
@@ -387,68 +501,39 @@
         }
         rows.forEach(function(item, index) {
             // 生成 ibox 容器
-            var ibox = '<div class="ibox" id="ibox-' + item.productId[0] + '">' +
-                '<div class="ibox-title">' +
-                '<h5>' + item.mdmCode[0] + ' - ' + item.productName[0] + '</h5>' +
-                '<input name="isFlipItem" placeholder="是否为上翻品" id="isFlipItem-' + item.isFlipItem[0] + '"  class="styled-input3" type="hidden" value="' + item.isFlipItem[0] + '">' +
-                '<input name="productId" placeholder="商品id" id="productId-' + item.productId[0] + '"  class="styled-input3" type="hidden" value="' + item.productId[0] + '">' +
-                '<input name="genericName" placeholder="商品通用名" id="genericName-' + item.genericName[0] + '"  class="styled-input3" type="hidden" value="' + item.genericName[0] + '">' +
-                '<input name="productName" placeholder="商品名" id="productName-' + item.productName[0] + '"  class="styled-input3" type="hidden" value="' + item.productName[0] + '">' +
-                '<input name="mdmCode" placeholder="MD编码" id="mdmCode-' + item.mdmCode[0] + '"  class="styled-input3" type="hidden" value="' + item.mdmCode[0] + '">' +
-                '<input name="specification" placeholder="规格" id="specification-' + item.specification[0] + '"  class="styled-input3" type="hidden" value="' + item.specification[0] + '">' +
-                '</div>' +
-                '<div class="ibox-content">' +
-                '<table class="table table-bordered">' +
-                '<tbody>' +
-                '<tr>' +
-                '<td>通用名</td>' +
-                '<td>' + item.genericName[0] + '</td>' +
-                '</tr>' +
-                '<tr>' +
-                '<td>规格</td>' +
-                '<td>' + item.specification[0] + '</td>' +
-                '</tr>' +
-                '</tbody>' +
-                '</table>' +
-                '<div class="form-group row">' +
-                '<label class="col-sm-2">数量</label>' +
-                '<div class="col-sm-4">' +
-                '<input name="quantity" placeholder="数量" id="quantity-' + item.productId[0] + '"  class="styled-input3" type="number">' +
-                '</div>' +
-                '<label class="col-sm-2">用法</label>' +
-                '<div class="col-sm-4">' +
-                '<select name="usageMethod"  id="usageMethod-' + item.productId[0] + '" class="styled-input3">' +
-                '<option value="">请选择</option>' +
-                '<option value="口服">口服</option>' +
-                '<option value="注射">注射</option>' +
-                '</select>' +
-                '</div>' +
-                '</div>' +
-                '<div class="form-group row">' +
-                '<label class="col-sm-2">使用频次</label>' +
-                '<div class="col-sm-4">' +
-                '<select name="frequency"  id="frequency-' + item.productId[0] + '" class="styled-input4">' +
-                '<option value="">请选择</option>' +
-                '<option value="每日一次">每日一次</option>' +
-                '<option value="每日两次">每日两次</option>' +
-                '</select>' +
-                '</div>' +
-                '<label class="col-sm-2">单次用量</label>' +
-                '<div class="col-sm-4">' +
-                '<input name="wordUsage" placeholder="单次用量" id="wordUsage-' + item.productId[0] + '"  class="styled-input4" type="text">' +
-                '</div>' +
-                '</div>' +
-                '<div class="form-group row">' +
-                '<label class="col-sm-2">用药周期(天)</label>' +
-                '<div class="col-sm-4">' +
-                '<input name="medicationCycle" placeholder="用药周期" id="medicationCycle-' + item.productId[0] + '" class="styled-input4" type="text">' +
-                '</div>' +
-                '<div class="col-sm-6 text-right">' +
-                '<button onclick="deleteRow(\'' + item.productId[0] + '\')" class="btn btn-danger">删除</button>' +
-                '</div>' +
-                '</div>' +
-                '</div>' +
-                '</div>';
+            var ibox = `<div class="ibox" id="ibox-${item.productId[0]}">
+                <div class="ibox-title">
+                    <h5>${item.mdmCode[0]} - ${item.productName[0]}</h5>
+                    <!-- ... 其他隐藏输入字段 ... -->
+                </div>
+                <div class="ibox-content">
+                    <table class="table table-bordered">
+                        <tbody>
+                            <tr><td>通用名</td><td>${item.genericName[0]}</td></tr>
+                            <tr><td>规格</td><td>${item.specification[0]}</td></tr>
+                        </tbody>
+                    </table>
+                    <div class="form-group row">
+                        <label class="col-sm-1">数量</label>
+                        <div class="col-sm-2"><input name="quantity" placeholder="数量" id="quantity-${item.productId[0]}" class="styled-input3" type="number"></div>
+                        <label class="col-sm-1">单次用量</label>
+                        <div class="col-sm-2"><input name="wordUsage" placeholder="单次用量" id="wordUsage-${item.productId[0]}" class="styled-input4" type="text"></div>
+                    </div>
+                    <div class="form-group row">
+                        <label class="col-sm-1">使用频次</label>
+                        <div class="col-sm-2"><select name="frequency" id="frequency-${item.productId[0]}" class="styled-input4"><option value="">请选择</option><option value="每日一次">每日一次</option><option value="每日两次">每日两次</option></select></div>
+                        <label class="col-sm-1">用法</label>
+                        <div class="col-sm-2"><select name="usageMethod" id="usageMethod-${item.productId[0]}" class="styled-input3"><option value="">请选择</option><option value="口服">口服</option><option value="注射">注射</option></select></div>
+                    </div>
+                    <div class="form-group row">
+                        <label class="col-sm-1">用药周期(天)</label>
+                        <div class="col-sm-2"><input name="medicationCycle" placeholder="用药周期" id="medicationCycle-${item.productId[0]}" class="styled-input4" type="text"></div>
+                        <div class="col-sm-7 text-right">
+                            <button onclick="deleteRow('${item.productId[0]}')" class="btn btn-danger btn-sm">删除</button>
+                        </div>
+                    </div>
+                </div>
+            </div>`;
 
             // 添加到容器
             $('#iboxContainer').append(ibox);
@@ -492,7 +577,7 @@
         display: none;
     }
     .ibox {
-        width: 700px;
+        width: 680px;
         margin-bottom: 20px;
         border: 1px solid #e7eaec;
         border-radius: 4px;
@@ -509,15 +594,6 @@
     .ibox-content h4 {
         margin-top: 0;
     }
-    .customize-form-group2 {
-        display: inline-block;
-    }
-    .styled-input2 {
-        padding: 5px;
-        border: 1px solid #ccc;
-        border-radius: 4px;
-        width: 200px;
-    }
     .styled-input3 {
         display: inline-block;
         padding: 5px;
@@ -532,33 +608,33 @@
         border-radius: 4px;
         width: 100px;
     }
-    .col-sm-6 {
+    /*.col-sm-6 {
         width: 125%;
-    }
-    .form-horizontal .form-group {
+    }*/
+    /*.form-horizontal .form-group {
         margin-right: 384px;
         margin-left: 3px;
-    }
+    }*/
     input[type=file] {
         display: none;
     }
     .form-group {
-        margin-bottom: -1px;
+        margin-bottom:5px;
     }
     /* 添加一些基础样式 */
     body {
         font-family: Arial, sans-serif;
     }
-    table {
+    /*.ibox-content .table {
         width: 400px;
         border-collapse: collapse;
-    }
-    th, td {
+    }*/
+    .ibox-content.table th, td {
         text-align: left;
         padding: 8px;
         border-bottom: 1px solid #ddd;
     }
-    tr:nth-child(even) {
+    .ibox-content.table tbody tr:nth-child(even) {
         width: 15px;
         background-color: #f2f2f2;
     }

+ 4 - 4
health-admin/src/main/resources/templates/dtp/recipe/recipe.html

@@ -82,10 +82,10 @@
 		            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="sdtp:recipe:remove">
 		                <i class="fa fa-remove"></i> 删除
 		            </a>
-<!--					<a class="btn btn-success" onclick="budan()">-->
-<!--						<i class="fa btn-primary"></i> 补单-->
-<!--					</a>-->
-						<button type="button"  onclick="budan()" class="btn-primary">补单</button>
+					<a class="btn btn-primary" onclick="budan()">
+						<i class="fa fa-plus"></i> 补单
+					</a>
+						<!--<button type="button"  onclick="budan()" class="btn btn-sm btn-primary">补单</button>-->
 		        </div>
 
 				<div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: hidden;">

+ 1 - 1
health-admin/src/main/resources/templates/gxhpz/addRepurchasedGoods.html

@@ -46,7 +46,7 @@
                                                 <th class="hidden-column">给药方式</th>
                                                 <th class="hidden-column">说明书适应症</th>
                                                 <th class="hidden-column">用法用量</th>
-                                                <th>操作+<a type="button"  onclick="selectUsersToParentCallBack2()">添加药品</a></th>
+                                                <th>操作 + <a type="button" class="btn btn-xs btn-info"  onclick="selectUsersToParentCallBack2()">添加药品</a></th>
                                             </tr>
                                             </thead>
                                             <tbody>

+ 10 - 11
health-admin/src/main/resources/templates/gxhpz/drugconfigAdd.html

@@ -46,18 +46,17 @@
                 <label>厂家简称:</label>
                 <input name="manufacturerShortName" placeholder="请输入厂家简称" id="manufacturerShortName" class="styled-input" type="text">
             </div>
-            <div class=" panel panel-warning" style="width: 720px">
-                <div class="panel-heading">
-                    <i class="fa fa-info-circle"></i> 以下是选择项的说明
+                <div class=" panel panel-warning" style="width: 90%;margin-left: 8%">
+                    <div class="panel-heading">
+                        <i class="fa fa-info-circle"></i> 以下是选择项的说明
+                    </div>
+                    <div class="panel-body">
+                        <p>1.是否随访管品说明</p>
+                        <p>2.分是否冷链管理品说明</p>
+                        <p>3.是否登记管理品说明</p>
+                        <p>4.是否慈善援助管理品说明</p>
+                    </div>
                 </div>
-                <div class="panel-body">
-                    <p>是否随访管品说明</p>
-                    <p>分是否冷链管理品说明</p>
-                    <p>是否登记管理品说明</p>
-                    <p>是否慈善援助管理品说明</p>
-                </div>
-
-            </div>
             <div class="customize-form-group">
                 <label class="is-required">是否随访管理品:</label>
                 <select name="isFollowUpManaged" id="isFollowUpManaged" class="styled-input" th:with="type=${@dict.getType('sys_gxhpz_yes_no')}" required>

+ 46 - 52
health-admin/src/main/resources/templates/spgl/SPProductAdd.html

@@ -248,7 +248,7 @@
                         <div class="customize-form-group edit">
                             <label>DTP商品标识:</label>
                             <select name="dtp_flag" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}" >
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -421,7 +421,7 @@
                         <div class="customize-form-group edit">
                             <label>是否医保药品:</label>
                             <select name="is_insurance_drug" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -442,7 +442,7 @@
                         <div class="customize-form-group edit">
                             <label class="is-required">是否凭处方销售:</label>
                             <select name="prescription_required" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -451,7 +451,7 @@
                         <div class="customize-form-group edit">
                             <label>禁止请货:</label>
                             <select name="prohibit_ordering" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -472,7 +472,7 @@
                         <div class="customize-form-group edit">
                             <label class="is-required">登记品:</label>
                             <select name="registered_item" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -481,7 +481,7 @@
                         <div class="customize-form-group edit">
                             <label class="is-required">随访品:</label>
                             <select name="follow_up_item" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -490,7 +490,7 @@
                         <div class="customize-form-group edit">
                             <label class="is-required">冷链品:</label>
                             <select name="cold_chain_item" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -499,7 +499,7 @@
                         <div class="customize-form-group edit">
                             <label class="is-required">流向品:</label>
                             <select name="flow_item" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -508,7 +508,7 @@
                         <div class="customize-form-group edit">
                             <label>慈善援助品:</label>
                             <select name="charity_aid_item" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -529,7 +529,7 @@
                         <div class="customize-form-group edit">
                             <label>是否越库:</label>
                             <select name="is_direct_to_warehouse" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -560,7 +560,7 @@
                         <div class="customize-form-group edit">
                             <label>禁止采购:</label>
                             <select name="is_purchase_prohibited" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -577,7 +577,7 @@
                         <div class="customize-form-group edit">
                             <label>是否原研:</label>
                             <select name="is_original_research" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -594,7 +594,7 @@
                         <div class="customize-form-group edit">
                             <label>消费健康自有品牌商品:</label>
                             <select name="consumer_health_own_brand" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -618,7 +618,7 @@
                         <div class="customize-form-group edit">
                             <label>是否泛DTP:</label>
                             <select name="is_broad_dtp" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -656,7 +656,7 @@
                         <div class="customize-form-group edit">
                             <label>大仓是否正常备货:</label>
                             <select name="is_normal_stock_in_central_warehouse" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -666,7 +666,7 @@
                         <div class="customize-form-group edit">
                             <label>是否已首营:</label>
                             <select name="is_first_operation" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -690,7 +690,7 @@
                         <div class="customize-form-group edit">
                             <label>是否完成成分梳理:</label>
                             <select name="is_completed_component_analysis" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -707,7 +707,7 @@
                         <div class="customize-form-group edit">
                             <label>4+7标识:</label>
                             <select name="four_plus_seven_label" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -717,7 +717,7 @@
                         <div class="customize-form-group edit">
                             <label>平台共性首推:</label>
                             <select name="platform_common_recommendation" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -727,7 +727,7 @@
                         <div class="customize-form-group edit">
                             <label>商业大流通商品:</label>
                             <select name="commercial_large_circulation_product" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -765,7 +765,7 @@
                         <div class="customize-form-group edit">
                             <label>双通道药品:</label>
                             <select name="dual_channel_drug" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -789,7 +789,7 @@
                         <div class="customize-form-group edit">
                             <label>统筹报销商品:</label>
                             <select name="coordinated_reimbursement_product" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -806,7 +806,7 @@
                         <div class="customize-form-group edit">
                             <label>是否限制门店经营:</label>
                             <select name="is_store_operation_restricted" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -816,7 +816,7 @@
                         <div class="customize-form-group edit">
                             <label>是否可配加盟店:</label>
                             <select name="can_be_allocated_to_franchise_stores" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -826,7 +826,7 @@
                         <div class="customize-form-group edit">
                             <label>加盟店是否享受统采政策:</label>
                             <select name="franchise_stores_enjoy_unified_procurement_policy" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -854,7 +854,7 @@
                         <div class="customize-form-group edit">
                             <label>是否易碎:</label>
                             <select name="is_fragile" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -864,7 +864,7 @@
                         <div class="customize-form-group edit">
                             <label>是否危险品:</label>
                             <select name="is_hazardous" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -874,7 +874,7 @@
                         <div class="customize-form-group edit">
                             <label>是否异形品:</label>
                             <select name="is_odd_shape" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -926,7 +926,7 @@
                         <div class="customize-form-group edit">
                             <label>是否启用中包装:</label>
                             <select name="is_medium_package_enabled" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -947,7 +947,7 @@
                         <div class="customize-form-group edit">
                             <label>是否生产批号管理:</label>
                             <select name="is_production_batch_management" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1055,7 +1055,7 @@
                         <div class="customize-form-group edit">
                             <label>是否冷链药品:</label>
                             <select name="is_cold_chain_drug" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1065,7 +1065,7 @@
                         <div class="customize-form-group edit">
                             <label>是否二次验复:</label>
                             <select name="is_second_inspection" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1151,7 +1151,7 @@
                         <div class="customize-form-group edit">
                             <label>包装是否含追溯码:</label>
                             <select name="has_traceability_code" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1168,7 +1168,7 @@
                         <div class="customize-form-group edit">
                             <label>是否管理序列号:</label>
                             <select name="is_serial_number_managed" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1199,7 +1199,7 @@
                         <div class="customize-form-group edit">
                             <label>是否扫码追溯商品:</label>
                             <select name="is_scan_traceable" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1223,7 +1223,7 @@
                         <div class="customize-form-group edit">
                             <label>是否UDI扫码:</label>
                             <select name="is_udi_scanned" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1258,7 +1258,7 @@
                         <div class="customize-form-group edit">
                             <label>线上销售:</label>
                             <select name="online_sales" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1289,7 +1289,7 @@
                         <div class="customize-form-group edit">
                             <label>线上O2O:</label>
                             <select name="online_o2o" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1299,7 +1299,7 @@
                         <div class="customize-form-group edit">
                             <label>线上B2C:</label>
                             <select name="online_b2c" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1309,7 +1309,7 @@
                         <div class="customize-form-group edit">
                             <label>线上互医:</label>
                             <select name="online_mutual_medical" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1319,7 +1319,7 @@
                         <div class="customize-form-group edit">
                             <label>线上品牌健康:</label>
                             <select name="online_brand_health" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1350,7 +1350,7 @@
                         <div class="customize-form-group edit">
                             <label>禁止配送:</label>
                             <select name="prohibit_delivery" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1360,7 +1360,7 @@
                         <div class="customize-form-group edit">
                             <label>禁止返仓:</label>
                             <select name="prohibit_return_warehouse" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1370,7 +1370,7 @@
                         <div class="customize-form-group edit">
                             <label>禁止销售:</label>
                             <select name="prohibit_sales" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1380,7 +1380,7 @@
                         <div class="customize-form-group edit">
                             <label>是否可拆零:</label>
                             <select name="can_be_divided" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1411,7 +1411,7 @@
                         <div class="customize-form-group edit">
                             <label>促销审批:</label>
                             <select name="promotion_approval" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
-                                <option value=""></option>
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1632,7 +1632,6 @@
             $.modal.alertWarning("请选择【DTP属性】是否是否凭处方销售!");
             return null;
         }
-
         // 初始化合并后的数据数组
         var allData = [];
 
@@ -1649,11 +1648,6 @@
     function submitHandler() {
         if ($.validate.form()) {
             var allData = collectFormData();
-            if (allData.product_code === '') {
-                $.modal.alertWarning("请先填写产品编码!");
-                return;
-            }
-
             $.ajax({
                 url: prefix + "/ProductAdd", // 后台接口地址
                 type: "post",

+ 105 - 118
health-admin/src/main/resources/templates/spgl/SPProductEdit.html

@@ -210,13 +210,6 @@
                             <span class="span_line" readonly></span>
                         </div>
 
-                        <!-- 将最后的商品大类和商品中类字段改为备注字段 -->
-                        <div class="customize-form-group edit">
-                            <label>备注:</label>
-                            <textarea name="product_remarks" class="styled-input edit_inputs" th:text="${product_remarks}"></textarea>
-                            <span class="span_line" readonly></span>
-                        </div>
-
                         <!-- 商品大类 -->
                         <div class="customize-form-group edit">
                             <label>商品大类:</label>
@@ -256,6 +249,7 @@
                         <div class="customize-form-group edit">
                             <label>DTP商品标识:</label>
                             <select name="dtp_flag" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}" >
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${dtp_flag}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -405,6 +399,7 @@
                         <div class="customize-form-group edit">
                             <label>是否医保通用名:</label>
                             <select name="is_medical_generic_name" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}" >
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_medical_generic_name}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -433,6 +428,7 @@
                         <div class="customize-form-group edit">
                             <label>是否医保药品:</label>
                             <select name="is_insurance_drug" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_insurance_drug}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -456,6 +452,7 @@
                         <div class="customize-form-group edit">
                             <label class="is-required">是否凭处方销售:</label>
                             <select name="prescription_required" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${prescription_required}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -465,6 +462,7 @@
                         <div class="customize-form-group edit">
                             <label>禁止请货:</label>
                             <select name="prohibit_ordering" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${prohibit_ordering}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -488,6 +486,7 @@
                         <div class="customize-form-group edit">
                             <label class="is-required">登记品:</label>
                             <select name="registered_item" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${registered_item}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -497,6 +496,7 @@
                         <div class="customize-form-group edit">
                             <label class="is-required">随访品:</label>
                             <select name="follow_up_item" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${follow_up_item}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -506,6 +506,7 @@
                         <div class="customize-form-group edit">
                             <label class="is-required">冷链品:</label>
                             <select name="cold_chain_item" class="styled-input edit_inputs"  th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${cold_chain_item}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -515,6 +516,7 @@
                         <div class="customize-form-group edit">
                             <label class="is-required">流向品:</label>
                             <select name="flow_item" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${flow_item}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -524,6 +526,7 @@
                         <div class="customize-form-group edit">
                             <label>慈善援助品:</label>
                             <select name="charity_aid_item" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${charity_aid_item}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -544,6 +547,7 @@
                         <div class="customize-form-group edit">
                             <label>是否越库:</label>
                             <select name="is_direct_to_warehouse" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_direct_to_warehouse}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -574,6 +578,7 @@
                         <div class="customize-form-group edit">
                             <label>禁止采购:</label>
                             <select name="is_purchase_prohibited" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_purchase_prohibited}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -590,6 +595,7 @@
                         <div class="customize-form-group edit">
                             <label>是否原研:</label>
                             <select name="is_original_research" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_original_research}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -606,6 +612,7 @@
                         <div class="customize-form-group edit">
                             <label>消费健康自有品牌商品:</label>
                             <select name="consumer_health_own_brand" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${consumer_health_own_brand}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -629,6 +636,7 @@
                         <div class="customize-form-group edit">
                             <label>是否泛DTP:</label>
                             <select name="is_broad_dtp" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_broad_dtp}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -666,6 +674,7 @@
                         <div class="customize-form-group edit">
                             <label>大仓是否正常备货:</label>
                             <select name="is_normal_stock_in_central_warehouse" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_normal_stock_in_central_warehouse}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -675,6 +684,7 @@
                         <div class="customize-form-group edit">
                             <label>是否已首营:</label>
                             <select name="is_first_operation" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_first_operation}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -697,6 +707,7 @@
                         <div class="customize-form-group edit">
                             <label>是否完成成分梳理:</label>
                             <select name="is_completed_component_analysis" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_completed_component_analysis}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -713,6 +724,7 @@
                         <div class="customize-form-group edit">
                             <label>4+7标识:</label>
                             <select name="four_plus_seven_label" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${four_plus_seven_label}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -722,6 +734,7 @@
                         <div class="customize-form-group edit">
                             <label>平台共性首推:</label>
                             <select name="platform_common_recommendation" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${platform_common_recommendation}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -731,6 +744,7 @@
                         <div class="customize-form-group edit">
                             <label>商业大流通商品:</label>
                             <select name="commercial_large_circulation_product" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${commercial_large_circulation_product}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -768,6 +782,7 @@
                         <div class="customize-form-group edit">
                             <label>双通道药品:</label>
                             <select name="dual_channel_drug" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${dual_channel_drug}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -791,6 +806,7 @@
                         <div class="customize-form-group edit">
                             <label>统筹报销商品:</label>
                             <select name="coordinated_reimbursement_product" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${coordinated_reimbursement_product}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -807,6 +823,7 @@
                         <div class="customize-form-group edit">
                             <label>是否限制门店经营:</label>
                             <select name="is_store_operation_restricted" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_store_operation_restricted}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -816,6 +833,7 @@
                         <div class="customize-form-group edit">
                             <label>是否可配加盟店:</label>
                             <select name="can_be_allocated_to_franchise_stores" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${can_be_allocated_to_franchise_stores}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -825,6 +843,7 @@
                         <div class="customize-form-group edit">
                             <label>加盟店是否享受统采政策:</label>
                             <select name="franchise_stores_enjoy_unified_procurement_policy" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${franchise_stores_enjoy_unified_procurement_policy}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -852,6 +871,7 @@
                         <div class="customize-form-group edit">
                             <label>是否易碎:</label>
                             <select name="is_fragile" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_fragile}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -861,6 +881,7 @@
                         <div class="customize-form-group edit">
                             <label>是否危险品:</label>
                             <select name="is_hazardous" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_hazardous}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -870,6 +891,7 @@
                         <div class="customize-form-group edit">
                             <label>是否异形品:</label>
                             <select name="is_odd_shape" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_odd_shape}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -921,6 +943,7 @@
                         <div class="customize-form-group edit">
                             <label>是否启用中包装:</label>
                             <select name="is_medium_package_enabled" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_medium_package_enabled}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -941,6 +964,7 @@
                         <div class="customize-form-group edit">
                             <label>是否生产批号管理:</label>
                             <select name="is_production_batch_management" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_production_batch_management}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1048,6 +1072,7 @@
                         <div class="customize-form-group edit">
                             <label>是否冷链药品:</label>
                             <select name="is_cold_chain_drug" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_cold_chain_drug}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1057,6 +1082,7 @@
                         <div class="customize-form-group edit">
                             <label>是否二次验复:</label>
                             <select name="is_second_inspection" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_second_inspection}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1143,6 +1169,7 @@
                         <div class="customize-form-group edit">
                             <label>包装是否含追溯码:</label>
                             <select name="has_traceability_code" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${has_traceability_code}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1159,6 +1186,7 @@
                         <div class="customize-form-group edit">
                             <label>是否管理序列号:</label>
                             <select name="is_serial_number_managed" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_serial_number_managed}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1189,6 +1217,7 @@
                         <div class="customize-form-group edit">
                             <label>是否扫码追溯商品:</label>
                             <select name="is_scan_traceable" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_scan_traceable}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1212,6 +1241,7 @@
                         <div class="customize-form-group edit">
                             <label>是否UDI扫码:</label>
                             <select name="is_udi_scanned" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${is_udi_scanned}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1246,6 +1276,7 @@
                         <div class="customize-form-group edit">
                             <label>线上销售:</label>
                             <select name="online_sales" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${online_sales}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1276,6 +1307,7 @@
                         <div class="customize-form-group edit">
                             <label>线上O2O:</label>
                             <select name="online_o2o" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${online_o2o}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1285,6 +1317,7 @@
                         <div class="customize-form-group edit">
                             <label>线上B2C:</label>
                             <select name="online_b2c" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${online_b2c}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1294,6 +1327,7 @@
                         <div class="customize-form-group edit">
                             <label>线上互医:</label>
                             <select name="online_mutual_medical" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${online_mutual_medical}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1303,6 +1337,7 @@
                         <div class="customize-form-group edit">
                             <label>线上品牌健康:</label>
                             <select name="online_brand_health" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${online_brand_health}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1333,6 +1368,7 @@
                         <div class="customize-form-group edit">
                             <label>禁止配送:</label>
                             <select name="prohibit_delivery" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${prohibit_delivery}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1342,6 +1378,7 @@
                         <div class="customize-form-group edit">
                             <label>禁止返仓:</label>
                             <select name="prohibit_return_warehouse" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${prohibit_return_warehouse}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1351,6 +1388,7 @@
                         <div class="customize-form-group edit">
                             <label>禁止销售:</label>
                             <select name="prohibit_sales" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${prohibit_sales}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1360,6 +1398,7 @@
                         <div class="customize-form-group edit">
                             <label>是否可拆零:</label>
                             <select name="can_be_divided" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${can_be_divided}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1390,6 +1429,7 @@
                         <div class="customize-form-group edit">
                             <label>促销审批:</label>
                             <select name="promotion_approval" class="styled-input edit_inputs" th:with="type=${@dict.getType('sys_select_yes_no')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${promotion_approval}" th:text="${dict.dictLabel}"></option>
                             </select>
                             <span class="span_line" readonly></span>
@@ -1508,121 +1548,68 @@
             $("#form-server-edit12")
         ];
 
-        // 获取 product_code 并验证是否已填写
-        var productCodeData = $("#form-server-edit1").serializeArray().find(item => item.name === 'product_code');
-        if (productCodeData.value === '') {
-            $.modal.alertWarning("请先填写【基本属性】产品编码!");
-            return null;
-        }
-        var product_name = $("#form-server-edit1").serializeArray().find(item => item.name === 'product_name');
-        if (product_name.value === '') {
-            $.modal.alertWarning("请先填写【基本属性】商品名称!");
-            return null;
-        }
-        var manufacturer = $("#form-server-edit1").serializeArray().find(item => item.name === 'manufacturer');
-        if (manufacturer.value === '') {
-            $.modal.alertWarning("请先填写【基本属性】生产厂家!");
-            return null;
-        }
-        var product_status = $("#form-server-edit1").serializeArray().find(item => item.name === 'product_status');
-        if (product_status.value === '') {
-            $.modal.alertWarning("请先填写【基本属性】商品状态!");
-            return null;
-        }
-        var category_maj = $("#form-server-edit1").serializeArray().find(item => item.name === 'category_maj');
-        if (category_maj.value === '') {
-            $.modal.alertWarning("请先填写【基本属性】商品大类!");
-            return null;
-        }
-        var category_min = $("#form-server-edit1").serializeArray().find(item => item.name === 'category_min');
-        if (category_min.value === '') {
-            $.modal.alertWarning("请先填写【基本属性】商品小类!");
-            return null;
-        }
-        var specification = $("#form-server-edit1").serializeArray().find(item => item.name === 'specification');
-        if (specification.value === '') {
-            $.modal.alertWarning("请先填写【基本属性】规格!");
-            return null;
-        }
-        var packaging = $("#form-server-edit1").serializeArray().find(item => item.name === 'packaging');
-        if (packaging.value === '') {
-            $.modal.alertWarning("请先填【基本属性】写包装!");
-            return null;
-        }
-        var reference_purchase_price = $("#form-server-edit2").serializeArray().find(item => item.name === 'reference_purchase_price');
-        if (reference_purchase_price.value === '') {
-            $.modal.alertWarning("请先填写【采购属性】参考进价!");
-            return null;
-        }
-        var national_negotiated_price = $("#form-server-edit2").serializeArray().find(item => item.name === 'national_negotiated_price');
-        if (national_negotiated_price.value === '') {
-            $.modal.alertWarning("请先填写【采购属性】国谈价格!");
-            return null;
-        }
-        var storage_category = $("#form-server-edit3").serializeArray().find(item => item.name === 'storage_category');
-        if (storage_category.value === '') {
-            $.modal.alertWarning("请先填写【存储分类】存储分类!");
-            return null;
-        }
-
-        var approval_number_1 = $("#form-server-edit4").serializeArray().find(item => item.name === 'approval_number_1');
-        if (approval_number_1.value === '') {
-            $.modal.alertWarning("请先填写【质管属性】批准文号1!");
-            return null;
-        }
-        var reference_retail_price = $("#form-server-edit5").serializeArray().find(item => item.name === 'reference_retail_price');
-        if (reference_retail_price.value === '') {
-            $.modal.alertWarning("请先填写【销售属性】参考零售价!");
-            return null;
-        }
-        var platform_property = $("#form-server-edit6").serializeArray().find(item => item.name === 'platform_property');
-        if (platform_property.value === '') {
-            $.modal.alertWarning("请先填写【业态属性】平台属性!");
-            return null;
-        }
-
-        var follow_up_item = $("#form-server-edit12").serializeArray().find(item => item.name === 'follow_up_item');
-        if (follow_up_item.value === '') {
-            $.modal.alertWarning("请选择是【DTP属性】否随访品!");
-            return null;
-        }
-
-        var cold_chain_item = $("#form-server-edit12").serializeArray().find(item => item.name === 'cold_chain_item');
-        if (cold_chain_item.value === '') {
-            $.modal.alertWarning("请选择【DTP属性】是否冷链品!");
-            return null;
-        }
-
-        var registered_item = $("#form-server-edit12").serializeArray().find(item => item.name === 'registered_item');
-        if (registered_item.value === '') {
-            $.modal.alertWarning("请选择【DTP属性】是否登记品!");
-            return null;
-        }
-
-        var flow_item = $("#form-server-edit12").serializeArray().find(item => item.name === 'flow_item');
-        if (flow_item.value === '') {
-            $.modal.alertWarning("请选择【DTP属性】是否流向品!");
-            return null;
-        }
+        // 初始化合并后的数据对象
+        var formData = {};
 
-        var prescription_required = $("#form-server-edit12").serializeArray().find(item => item.name === 'prescription_required');
-        if (prescription_required.value === '') {
-            $.modal.alertWarning("请选择【DTP属性】是否是否凭处方销售!");
-            return null;
-        }
-
-        // 初始化合并后的数据数组
-        var allData = [];
-
-        // 遍历每个表单并将数据添加到 allData 中
+        // 遍历每个表单并将数据添加到 formData 对象中
         forms.forEach(function(form) {
-            var formData = $(form).serializeArray();
-            // 确保 product_code 存在于每个表单数据中
-            formData.push({ name: 'product_code', value: productCodeData.value });
-            allData = allData.concat(formData);
+            form.find("[name]").each(function() {
+                var $this = $(this),
+                    name = $this.attr('name'),
+                    value;
+
+                // 获取不同类型的值
+                if ($this.is(':input') || $this.is('[contenteditable]')) {
+                    value = $this.is('[contenteditable]') ? $this.text().trim() : $this.val();
+
+                    // 处理多选框和复选框
+                    if ($this.is('select[multiple], input[type="checkbox"], input[type="radio"]')) {
+                        if ($this.is(':checked')) {
+                            if (!formData[name]) {
+                                formData[name] = [];
+                            }
+                            formData[name].push(value);
+                        }
+                    } else if (value !== null && value !== undefined && value !== '') {
+                        formData[name] = value;
+                    }
+                }
+            });
         });
 
-        return allData;
+        // 定义必填字段及其对应的提示信息
+        var requiredFields = {
+            'product_code': "请先填写【基本属性】产品编码!",
+            'product_name': "请先填写【基本属性】商品名称!",
+            'manufacturer': "请先填写【基本属性】生产厂家!",
+            'product_status': "请先填写【基本属性】商品状态!",
+            'category_maj': "请先填写【基本属性】商品大类!",
+            'category_min': "请先填写【基本属性】商品小类!",
+            'specification': "请先填写【基本属性】规格!",
+            'packaging': "请先填写【基本属性】包装!",
+            'reference_purchase_price': "请先填写【采购属性】参考进价!",
+            'national_negotiated_price': "请先填写【采购属性】国谈价格!",
+            'storage_category': "请先填写【存储分类】存储分类!",
+            'approval_number_1': "请先填写【质管属性】批准文号1!",
+            'reference_retail_price': "请先填写【销售属性】参考零售价!",
+            'platform_property': "请先填写【业态属性】平台属性!",
+            'follow_up_item': "请选择是【DTP属性】否随访品!",
+            'cold_chain_item': "请选择【DTP属性】是否冷链品!",
+            'registered_item': "请选择【DTP属性】是否登记品!",
+            'flow_item': "请选择【DTP属性】是否流向品!",
+            'prescription_required': "请选择【DTP属性】是否凭处方销售!"
+        };
+
+        // 验证必填字段
+        for (var field in requiredFields) {
+            if (!formData[field] || (Array.isArray(formData[field]) && formData[field].length === 0)) {
+                $.modal.alertWarning(requiredFields[field]);
+                return null;
+            }
+        }
+
+        // 返回最终的数据对象
+        return formData;
     }
     function submitHandler() {
         if ($.validate.form()) {

+ 11 - 1
health-admin/src/main/resources/templates/spgl/SPProductinfoList.html

@@ -47,8 +47,14 @@
             </div>
 
             <div class="col-sm-12 select-table table-striped" style="width: 100%; overflow-x: hidden;">
-                <table id="bootstrap-table" class="fixed-layout-table"></table>
+                <table id="bootstrap-table" class="fixed-layout-table" data-reorderable-columns="true"></table>
             </div>
+            <!--拖拽表格-->
+            <!--<div class="col-sm-12 select-table table-bordered">
+                <p class="select-title">按住表格列拖拽</p>
+                <table id="bootstrap-table" data-reorderable-columns="true"></table>
+            </div>-->
+            <!--拖拽表格-->
         </div>
     </div>
 </div>
@@ -56,6 +62,10 @@
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: layout-latest-js" />
 <th:block th:include="include :: bootstrap-table-fixed-columns-js" />
+<!--拖拽表格-->
+<script th:src="@{/js/jquery-ui-1.10.4.min.js}"></script>
+<th:block th:include="include :: bootstrap-table-reorder-columns-js" />
+<!--拖拽表格-->
 <th:block th:include="include :: ztree-js" />
 <script th:inline="javascript">
     var editFlag = [[${@permission.hasPermi('sp:sp:edit')}]];

+ 2 - 2
health-system/src/main/java/com/bzd/system/service/PharmaceuticalService.java

@@ -318,8 +318,8 @@ public class PharmaceuticalService {
     }
 
     public boolean checkPatientIsExist(PageData pd) throws Exception{
-        Object PageData =daoSupport.findForList("PharmaceuticalServiceMapper.checkPatientIsExist", pd);
-        return StringUtils.isNull(PageData);
+        Object pageData =daoSupport.findForList("PharmaceuticalServiceMapper.checkPatientIsExist", pd);
+        return StringUtils.isNull(pageData);
 
     }
     public Object selectPatientById(PageData pd) throws Exception{

+ 40 - 0
health-system/src/main/java/com/bzd/system/service/TypeDataService.java

@@ -0,0 +1,40 @@
+package com.bzd.system.service;
+
+import com.bzd.common.config.dao.DaoBase;
+import com.bzd.common.config.dao.DaoSupport;
+import com.bzd.common.config.dao.PageData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+/**
+*
+* 门店积分商品列表 service
+* @author LiXiangFei
+* @since 2024-10-15
+*/
+
+@Service
+public class TypeDataService {
+
+    @Autowired
+    private DaoBase dao;
+
+    @Resource(name = "daoSupport")
+    private DaoSupport daoSupport;
+
+
+    public List<PageData> typeDate(PageData pd) throws Exception{
+        if (pd==null || pd.size()==0){
+            pd.put("dict_key",'0');
+        }
+        return (List<PageData>) daoSupport.findForList("TypeDateMapper.typeDate", pd);
+    }
+    public List<PageData> typeDate2(PageData pd) throws Exception{
+        return (List<PageData>) daoSupport.findForList("TypeDateMapper.typeDate2", pd);
+    }
+}

+ 18 - 0
health-system/src/main/resources/mapper/spgl/TypeDateMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="TypeDateMapper" >
+    <!-- 通用查询映射结果 -->
+    <select id="typeDate" parameterType="pd" resultType="pd">
+        select type as id,categoryName
+        from s_gxhpz_zd_attributecategory
+        where 1=1
+            and dict_key = '0'
+    </select>
+    <select id="typeDate2" parameterType="pd" resultType="pd">
+        select id as ida,categoryName as categoryNamea
+        from s_gxhpz_zd_attributecategory
+        where 1=1
+            and dict_key in( ${jbtype})
+    </select>
+
+</mapper>