Página inicial Explorar Ajuda
Registrar Entrar
bzd_lxf
/
health_manage
1
0
Fork 0
Arquivos Issues 0 Pull Requests 0 Wiki
Ver código fonte

update 文件冲突调整

bzd_lxf 6 meses atrás
pai
f2b847c927
commit
e63ee06564
9 arquivos alterados com 1195 adições e 13 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 2 2
      health-admin/src/main/resources/templates/DTP/cold/add.html
  2. 1 1
      health-admin/src/main/resources/templates/DTP/print/detail.html
  3. 156 0
      health-admin/src/main/resources/templates/dtp/configInfo/AssociatedPrescription.html
  4. 259 0
      health-admin/src/main/resources/templates/dtp/configInfo/addDrug.html
  5. 189 0
      health-admin/src/main/resources/templates/dtp/configInfo/drugList.html
  6. 156 0
      health-admin/src/main/resources/templates/dtp/configInfo/dtpHospital.html
  7. 250 0
      health-admin/src/main/resources/templates/dtp/configInfo/editDrug.html
  8. 177 0
      health-admin/src/main/resources/templates/dtp/configInfo/storeTag.html
  9. 5 10
      health-admin/src/main/resources/templates/dtp/recipe/view.html

+ 2 - 2
health-admin/src/main/resources/templates/DTP/cold/add.html
Ver arquivo 

@@ -13,14 +13,14 @@
 
             <div class="col-sm-3">
 
                 <div class="form-group">
 
                     <label>预计配送时间</label>
 
-                    <input type="text" class="time-input" id="expectedDeliveryTime"  name="expectedDeliveryTime" placeholder="预计配送时间" />
 
+                    <input type="text" class="styled-input time-input" id="expectedDeliveryTime"  name="expectedDeliveryTime" placeholder="预计配送时间" />
 
                 </div>
 
             </div>
 
             <div class="col-sm-3">
 
                 <div class="form-group">
 
                     <div class="form-group">
 
                         <label>实际配送时间</label>
 
-                        <input type="text" class="time-input" id="actualDeliveryTime" placeholder="实际配送时间" name="actualDeliveryTime"/>
 
+                        <input type="text" class="styled-input time-input" id="actualDeliveryTime" placeholder="实际配送时间" name="actualDeliveryTime"/>
 
                     </div>
 
                 </div>
 
             </div>

+ 1 - 1
health-admin/src/main/resources/templates/DTP/print/detail.html
Ver arquivo 

@@ -46,4 +46,4 @@
 
 
     </script>
 
 </body>
 
-</html>
 
+</html>

+ 156 - 0
health-admin/src/main/resources/templates/dtp/configInfo/AssociatedPrescription.html
Ver arquivo 

@@ -0,0 +1,156 @@
 
+<!DOCTYPE html>
 
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
+<head>
 
+	<th:block th:include="include :: header('DTP医院')" />
 
+	<th:block th:include="include :: layout-latest-css" />
 
+	<th:block th:include="include :: ztree-css" />
 
+</head>
 
+<body class="gray-bg">
 
+
 
+<div class="ui-layout-center">
 
+	<div class="container-div">
 
+		<div class="row">
 
+			<div class="col-sm-12 search-collapse">
 
+				<form id="tag-form">
 
+					<input type="hidden" id="deptId" name="deptId">
 
+					<input type="hidden" id="parentId" name="parentId">
 
+					<div class="select-list">
 
+						<ul>
 
+							<li>
 
+								医院名称：<input type="text"  class="styled-input" placeholder="请输入医院名称" name="standardName"/>
 
+							</li>
 
+							<li>
 
+								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
+								<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
+							</li>
 
+						</ul>
 
+					</div>
 
+				</form>
 
+			</div>
 
+			<div class="col-sm-12 select-table table-striped">
 
+				<table id="bootstrap-table"></table>
 
+			</div>
 
+		</div>
 
+	</div>
 
+</div>
 
+
 
+<th:block th:include="include :: footer" />
 
+<th:block th:include="include :: layout-latest-js" />
 
+<th:block th:include="include :: ztree-js" />
 
+<script th:inline="javascript">
 
+	var GLCF = [[${@permission.hasPermi('dtp:configInfo:view')}]];
 
+	var prefix = ctx + "dtp/configInfo";
 
+
 
+	$(function() {
 
+		var panehHidden = false;
 
+		if ($(this).width() < 1590) {
 
+			panehHidden = true;
 
+		}
 
+		$('body').layout({ initClosed: panehHidden, west__size: 185, resizeWithWindow: false });
 
+		// 回到顶部绑定
 
+		if ($.fn.toTop !== undefined) {
 
+			var opt = {
 
+				win:$('.ui-layout-center'),
 
+				doc:$('.ui-layout-center')
 
+			};
 
+			$('#scroll-up').toTop(opt);
 
+		}
 
+		queryUserList();
 
+	});
 
+
 
+	function queryUserList() {
 
+		var options = {
 
+			url: prefix + "/dtpHospitalList",
 
+			viewUrl: prefix + "/AssociatedPrescription/{id}",
 
+			sortName: "createTime",
 
+			sortOrder: "desc",
 
+			modalName: "医院名单",
 
+			columns: [
 
+				{
 
+					field: "id",
 
+					title: "医院主键",
 
+					align: 'center',
 
+					visible: true,
 
+				},{
 
+					field: "standardName",
 
+					title: "医院标准名称",
 
+					align: 'center',
 
+				},
 
+				{
 
+					"field": "address",
 
+					"title": "医院地址",
 
+					align: 'center',
 
+				},{
 
+					"field": "phone",
 
+					"title": "医院电话",
 
+					align: 'center',
 
+				} ,{
 
+					title: '操作',
 
+					align: 'center',
 
+					formatter: function(value, row, index) {
 
+						if (row.id) {
 
+							var actions = [];
 
+							actions.push('<a class="btn btn-success btn-xs' + GLCF + '" href="javascript:void(0)" onclick="viewPrescription(\'' + row.id + '\')"><i class="fa fa-search"></i>\t查看关联处方</a>');
 
+							return actions.join('');
 
+						} else {
 
+							return "";
 
+						}
 
+					}
 
+				}]
 
+		};
 
+		$.table.init(options);
 
+	}
 
+
 
+	$('#btnExpand').click(function() {
 
+		$._tree.expandAll(true);
 
+		$(this).hide();
 
+		$('#btnCollapse').show();
 
+	});
 
+
 
+	$('#btnCollapse').click(function() {
 
+		$._tree.expandAll(false);
 
+		$(this).hide();
 
+		$('#btnExpand').show();
 
+	});
 
+
 
+	$('#btnRefresh').click(function() {
 
+	});
 
+
 
+	/* 用户管理-新增-选择部门树 */
 
+	function selectDeptTree() {
 
+		var treeId = $("#treeId").val();
 
+		var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
 
+		var url = ctx + "system/user/selectDeptTree/" + deptId;
 
+		var options = {
 
+			title: '选择部门',
 
+			width: "380",
 
+			url: url,
 
+			callBack: doSubmit
 
+		};
 
+		$.modal.openOptions(options);
 
+	}
 
+
 
+	function doSubmit(index, layero){
 
+		var body = $.modal.getChildFrame(index);
 
+		$("#treeId").val(body.find('#treeId').val());
 
+		$("#treeName").val(body.find('#treeName').val());
 
+		$.modal.close(index);
 
+	}
 
+
 
+	/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
 
+	function resetPre() {
 
+		resetDate();
 
+		$("#tag-form")[0].reset();
 
+		$("#deptId").val("");
 
+		$("#parentId").val("");
 
+		$(".curSelectedNode").removeClass("curSelectedNode");
 
+		$.table.search();
 
+	}
 
+	function viewPrescription(id){
 
+		var url = prefix + "/AssociatedPrescription/" + id;
 
+		$.modal.openTab("关联处方", url);
 
+	}
 
+</script>
 
+</body>
 
+
 
+</html>

+ 259 - 0
health-admin/src/main/resources/templates/dtp/configInfo/addDrug.html
Ver arquivo 

@@ -0,0 +1,259 @@
 
+<!DOCTYPE html>
 
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 
+<head>
 
+    <th:block th:include="include :: header('新增处方')" />
 
+    <th:block th:include="include :: select2-css" />
 
+</head>
 
+<body>
 
+<div class="main-content">
 
+    <form id="form-user-add" class="form-horizontal">
 
+        <input name="deptId" type="hidden" id="treeId"/>
 
+        <h4 class="form-header h4">配送单信息</h4>
 
+        <div class="row">
 
+            <div class="col-sm-3">
 
+                <div class="form-group">
 
+                    <label>预计配送时间</label>
 
+                    <input type="text" class="time-input" id="expectedDeliveryTime"  name="expectedDeliveryTime" placeholder="预计配送时间" />
 
+                </div>
 
+            </div>
 
+            <div class="col-sm-3">
 
+                <div class="form-group">
 
+                    <div class="form-group">
 
+                        <label>实际配送时间</label>
 
+                        <input type="text" class="time-input" id="actualDeliveryTime" placeholder="实际配送时间" name="actualDeliveryTime"/>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+
 
+            <div class="col-sm-3">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label is-required">所属连锁：</label>
 
+                    <div class="col-sm-8">
 
+                        <div class="input-group">
 
+                        <input name="chainName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店" class="form-control">
 
+                        <span class="input-group-addon">
 
+                        <i class="fa fa-search"></i>
 
+                    </span>
 
+                        </div>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+            <div class="col-sm-3">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label is-required">所属门店：</label>
 
+                    <div class="col-sm-8">
 
+                        <select name="storeName" class="form-control" th:with="type=${@dict.getType('sys_select_store')}">
 
+                            <option value="">请选择</option>
 
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 
+                            ></option>
 
+                        </select>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+        <div class="row">
 
+            <div class="col-sm-3">
 
+                <div class="form-group">
 
+                    <label class="col-sm-6 control-label">是否线上签收：</label>
 
+                    <div class="col-sm-4">
 
+                        <select name="prescriptionType" class="form-control" th:with="type=${@dict.getType('sys_yes_no')}">
 
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 
+                            ></option>
 
+                        </select>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+
 
+            <div class="col-sm-3">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">配送状态：</label>
 
+                    <div class="col-sm-4">
 
+                        <select name="deliveryStatus"  class="form-control"  th:with="type=${@dict.getType('sys_select_pszt')}">
 
+                            <option value="">全部</option>
 
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
 
+                        </select>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+            <div class="col-sm-3">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">冷链类型：</label>
 
+                    <div class="col-sm-4">
 
+                        <select name="coldChainType"  class="form-control"  th:with="type=${@dict.getType('sys_select_cold_type')}">
 
+                            <option value="">全部</option>
 
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
 
+                            ></option>
 
+                        </select>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+            <div class="col-sm-3">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">订单来源：</label>
 
+                    <div class="col-sm-4">
 
+                        <select name="orderSource"  class="form-control"  th:with="type=${@dict.getType('sys_select_order_sources')}">
 
+                            <option value="">全部</option>
 
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
 
+                            ></option>
 
+                        </select>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+
 
+        </div>
 
+        <div class="row">
 
+            <div class="col-sm-4">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">收货人：</label>
 
+                    <div class="col-sm-8">
 
+                        <input id="recipientName" name="recipientName"  type="text" maxlength="100"  class="form-control" placeholder="请输入收货人">
 
+                    </div>
 
+                </div>
 
+            </div>
 
+            <div class="col-sm-4">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">收货电话：</label>
 
+                    <div class="col-sm-8">
 
+                        <input id="recipientPhone" name="recipientPhone"  type="number" maxlength="11"  class="form-control" placeholder="请输入收货电话">
 
+                    </div>
 
+                </div>
 
+            </div>
 
+
 
+            <div class="col-sm-4">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">冰排编号：</label>
 
+
 
+                    <div class="col-sm-8">
 
+                        <input id="icePackNumber" name="icePackNumber" placeholder="请输入冰排编号" class="form-control" type="text" maxlength="50" >
 
+                    </div>
 
+                </div>
 
+            </div>
 
+
 
+
 
+        </div>
 
+        <div class="row">
 
+            <div class="col-sm-4">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">收货地址：</label>
 
+                    <div class="col-sm-8">
 
+                        <input id="recipientAddress" name="recipientAddress"  type="text" maxlength="1000"  class="form-control" placeholder="请输入收货地址">
 
+                    </div>
 
+                </div>
 
+            </div>
 
+            <div class="col-sm-4">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">出发温度：</label>
 
+                    <div class="col-sm-8">
 
+                        <input id="departureTemperature" name="departureTemperature"  type="text" maxlength="10"  class="form-control" placeholder="请输入出发温度">
 
+                    </div>
 
+                </div>
 
+            </div>
 
+            <div class="col-sm-4">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">送达温度：</label>
 
+                    <div class="col-sm-8">
 
+                        <input id="arrivalTemperature" name="arrivalTemperature"  type="text" maxlength="10"  class="form-control" placeholder="请输入送达温度">
 
+                    </div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+        <div class="row">
 
+        <div class="col-sm-4">
 
+            <div class="form-group">
 
+                <label class="col-sm-4 control-label">签收照片：</label>
 
+                <div class="col-sm-8">
 
+                    <input id="signaturePhoto" name="signaturePhoto"  type="text" maxlength="1000"  class="form-control" placeholder="签收照片">
 
+                </div>
 
+            </div>
 
+        </div>
 
+            <div class="col-sm-4">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">配送员：</label>
 
+                    <div class="col-sm-8">
 
+                        <input id="deliveryPerson" name="deliveryPerson" placeholder="请输入配送员" class="form-control" type="text" maxlength="50" >
 
+                    </div>
 
+                </div>
 
+            </div>
 
+
 
+
 
+        <div class="col-sm-4">
 
+            <div class="form-group">
 
+                <label class="col-sm-4 control-label">配送箱编号：</label>
 
+                <div class="col-sm-8">
 
+                    <input id="deliveryBoxNumber" name="deliveryBoxNumber"  type="text" maxlength="25"  class="form-control" placeholder="配送箱编号">
 
+                </div>
 
+            </div>
 
+        </div>
 
+        </div>
 
+        <h4 class="form-header h4">其他信息</h4>
 
+        <div class="row">
 
+                <div class="col-sm-6">
 
+                    <div class="form-group">
 
+                        <label class="col-sm-4 control-label">付款顺序：</label>
 
+                        <div class="col-sm-8">
 
+                            <select name="paymentSequence" class="form-control" th:with="type=${@dict.getType('sys_select_payment_sequence')}">
 
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 
+                                ></option>
 
+                            </select>
 
+                        </div>
 
+                    </div>
 
+                </div>
 
+        </div>
 
+
 
+    </form>
 
+</div>
 
+
 
+<div class="row">
 
+    <div class="col-sm-offset-5 col-sm-10">
 
+        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
 
+        <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
 
+    </div>
 
+</div>
 
+<th:block th:include="include :: footer" />
 
+<th:block th:include="include :: select2-js" />
 
+<script>
 
+    var prefix = ctx + "dtp/cold";
 
+    var prescriptionTypes = [
 
+        { label: '电子处方', value: 'electronic' },
 
+        { label: '纸质处方', value: 'paper' }
 
+    ];
 
+
 
+
 
+    function submitHandler() {
 
+        if ($.validate.form()) {
 
+            var data = $("#form-user-add").serializeArray();
 
+
 
+            $.operate.saveTab(prefix + "/add", data);
 
+        }
 
+    }
 
+
 
+    /* 用户管理-新增-选择部门树 */
 
+    function selectDeptTree() {
 
+        var treeId = $("#treeId").val();
 
+        var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
 
+        var url = ctx + "system/user/selectDeptTree/" + deptId;
 
+        var options = {
 
+            title: '选择部门',
 
+            width: "380",
 
+            url: url,
 
+            callBack: doSubmit
 
+        };
 
+        $.modal.openOptions(options);
 
+    }
 
+
 
+    function doSubmit(index, layero){
 
+        var body = $.modal.getChildFrame(index);
 
+        $("#treeId").val(body.find('#treeId').val());
 
+        $("#treeName").val(body.find('#treeName').val());
 
+        $.modal.close(index);
 
+    }
 
+
 
+    $(function() {
 
+        $('#post').select2({
 
+            placeholder: "请选择岗位",
 
+            allowClear: true
 
+        });
 
+    })
 
+</script>
 
+</body>
 
+</html>

+ 189 - 0
health-admin/src/main/resources/templates/dtp/configInfo/drugList.html
Ver arquivo 

@@ -0,0 +1,189 @@
 
+<!DOCTYPE html>
 
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
+<head>
 
+	<th:block th:include="include :: header('配送单据打印列表')" />
 
+	<th:block th:include="include :: layout-latest-css" />
 
+	<th:block th:include="include :: ztree-css" />
 
+</head>
 
+<body class="gray-bg">
 
+
 
+	<div class="ui-layout-center">
 
+		<div class="container-div">
 
+			<div class="row">
 
+				<div class="col-sm-12 search-collapse">
 
+					<form id="user-form">
 
+						<div class="select-list">
 
+							<ul>
 
+
 
+								<li>
 
+									<label>配送时间 </label>
 
+									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="deliveryTimeStart"/>
 
+									<span>-</span>
 
+									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="deliveryTimeEnd"/>
 
+								</li>
 
+								<li>
 
+									<label style="width: 90px; float: left;">打印申请时间 </label>
 
+									<input type="text" class="time-input" id="startTimes" placeholder="开始时间" name="printRequestTimeStart"/>
 
+									<span>-</span>
 
+									<input type="text" class="time-input" id="endTimes" placeholder="结束时间" name="printRequestTimeEnd"/>
 
+								</li>
 
+								<li>
 
+									<label>配送人： </label>
 
+									<input type="text"  placeholder="请输入配送人姓名" name="deliverer"/>
 
+								</li>
 
+								<li>
 
+									<label>打印状态:</label>
 
+									<select name="status"  th:with="type=${@dict.getType('sys_select_print_status')}">
 
+										<option value="">全部</option>
 
+										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
 
+												></option>
 
+									</select>
 
+								</li>
 
+
 
+								<li>
 
+									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
+								    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
+								</li>
 
+							</ul>
 
+						</div>
 
+					</form>
 
+				</div>
 
+
 
+		        <div class="btn-group-sm" id="toolbar" role="group">
 
+
 
+		            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="sdtp:print:remove">
 
+		                <i class="fa fa-remove"></i> 删除
 
+		            </a>
 
+
 
+
 
+		            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="dtp:print:export">
 
+			            <i class="fa fa-download"></i> 打印
 
+			        </a>
 
+		        </div>
 
+
 
+		        <div class="col-sm-12 select-table table-striped">
 
+				    <table id="bootstrap-table"></table>
 
+				</div>
 
+			</div>
 
+		</div>
 
+	</div>
 
+
 
+	<th:block th:include="include :: footer" />
 
+	<th:block th:include="include :: layout-latest-js" />
 
+	<th:block th:include="include :: ztree-js" />
 
+	<script th:inline="javascript">
 
+		var editFlag = [[${@permission.hasPermi('system:user:edit')}]];
 
+		var removeFlag = [[${@permission.hasPermi('system:user:remove')}]];
 
+		var detailFlag = [[${@permission.hasPermi('dtp:print:view')}]];
 
+		var prefix = ctx + "dtp/print";
 
+
 
+		$(function() {
 
+		    var panehHidden = false;
 
+		    if ($(this).width() < 1590) {
 
+		        panehHidden = true;
 
+		    }
 
+		    $('body').layout({ initClosed: panehHidden, west__size: 185, resizeWithWindow: false });
 
+	     	// 回到顶部绑定
 
+	    	if ($.fn.toTop !== undefined) {
 
+	    		var opt = {
 
+	    			win:$('.ui-layout-center'),
 
+	    			doc:$('.ui-layout-center')
 
+	    		};
 
+	    		$('#scroll-up').toTop(opt);
 
+	    	}
 
+		    queryUserList();
 
+		});
 
+
 
+		function queryUserList() {
 
+		    var options = {
 
+		        url: prefix + "/list",
 
+		        viewUrl: prefix + "/view/{id}",
 
+		        createUrl: prefix + "/add",
 
+		        updateUrl: prefix + "/edit/{id}",
 
+				detailUrl: prefix + "/detail/{id}",
 
+		        removeUrl: prefix + "/remove",
 
+		        exportUrl: prefix + "/export",
 
+		        sortName: "createTime",
 
+		        sortOrder: "desc",
 
+		        modalName: "配送单据打印信息",
 
+		        columns: [{
 
+		            checkbox: true
 
+		        },
 
+					{
 
+						field: "id",
 
+						title: "id",
 
+						//hidden:false
 
+						visible: false,
 
+					},
 
+					{
 
+						field: "orderId",
 
+						title: "订单编号"
 
+					},
 
+					{
 
+						field: "deliverer",
 
+						title: "配送人"
 
+					},
 
+					{
 
+						field: "deliveryTime",
 
+						title: "配送时间"
 
+					},
 
+					{
 
+						field: "printRequestTime",
 
+						title: "打印申请时间"
 
+					},
 
+					{
 
+						field: "status",
 
+						title: "打印状态"
 
+					},
 
+					{
 
+						field: "createTime",
 
+						title: "创建时间"
 
+					},
 
+		        {
 
+		            title: '操作',
 
+		            align: 'center',
 
+		            formatter: function(value, row, index) {
 
+		                if (row.orderId) {
 
+		                	var actions = [];
 
+							actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-search"></i>详细</a>');
 
+			                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
 
+			                return actions.join('');
 
+		            	} else {
 
+		                    return "";
 
+		                }
 
+		            }
 
+		        }]
 
+		    };
 
+		    $.table.init(options);
 
+		}
 
+
 
+
 
+
 
+		$('#btnExpand').click(function() {
 
+			$._tree.expandAll(true);
 
+		    $(this).hide();
 
+		    $('#btnCollapse').show();
 
+		});
 
+
 
+		$('#btnCollapse').click(function() {
 
+			$._tree.expandAll(false);
 
+		    $(this).hide();
 
+		    $('#btnExpand').show();
 
+		});
 
+
 
+		$('#btnRefresh').click(function() {
 
+		});
 
+		/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
 
+		function resetPre() {
 
+			resetDate();
 
+			$("#user-form")[0].reset();
 
+			$("#deptId").val("");
 
+			$("#parentId").val("");
 
+			$(".curSelectedNode").removeClass("curSelectedNode");
 
+			$.table.search();
 
+		}
 
+
 
+	</script>
 
+</body>
 
+
 
+</html>

+ 156 - 0
health-admin/src/main/resources/templates/dtp/configInfo/dtpHospital.html
Ver arquivo 

@@ -0,0 +1,156 @@
 
+<!DOCTYPE html>
 
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
+<head>
 
+	<th:block th:include="include :: header('DTP医院')" />
 
+	<th:block th:include="include :: layout-latest-css" />
 
+	<th:block th:include="include :: ztree-css" />
 
+</head>
 
+<body class="gray-bg">
 
+
 
+<div class="ui-layout-center">
 
+	<div class="container-div">
 
+		<div class="row">
 
+			<div class="col-sm-12 search-collapse">
 
+				<form id="tag-form">
 
+					<input type="hidden" id="deptId" name="deptId">
 
+					<input type="hidden" id="parentId" name="parentId">
 
+					<div class="select-list">
 
+						<ul>
 
+							<li>
 
+								医院名称：<input type="text"  class="styled-input" placeholder="请输入医院名称" name="standardName"/>
 
+							</li>
 
+							<li>
 
+								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
+								<a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
+							</li>
 
+						</ul>
 
+					</div>
 
+				</form>
 
+			</div>
 
+			<div class="col-sm-12 select-table table-striped">
 
+				<table id="bootstrap-table"></table>
 
+			</div>
 
+		</div>
 
+	</div>
 
+</div>
 
+
 
+<th:block th:include="include :: footer" />
 
+<th:block th:include="include :: layout-latest-js" />
 
+<th:block th:include="include :: ztree-js" />
 
+<script th:inline="javascript">
 
+	var GLCF = [[${@permission.hasPermi('dtp:configInfo:view')}]];
 
+	var prefix = ctx + "dtp/configInfo";
 
+
 
+	$(function() {
 
+		var panehHidden = false;
 
+		if ($(this).width() < 1590) {
 
+			panehHidden = true;
 
+		}
 
+		$('body').layout({ initClosed: panehHidden, west__size: 185, resizeWithWindow: false });
 
+		// 回到顶部绑定
 
+		if ($.fn.toTop !== undefined) {
 
+			var opt = {
 
+				win:$('.ui-layout-center'),
 
+				doc:$('.ui-layout-center')
 
+			};
 
+			$('#scroll-up').toTop(opt);
 
+		}
 
+		queryUserList();
 
+	});
 
+
 
+	function queryUserList() {
 
+		var options = {
 
+			url: prefix + "/dtpHospitalList",
 
+			viewUrl: prefix + "/AssociatedPrescription/{id}",
 
+			sortName: "createTime",
 
+			sortOrder: "desc",
 
+			modalName: "医院名单",
 
+			columns: [
 
+				{
 
+					field: "id",
 
+					title: "医院主键",
 
+					align: 'center',
 
+					visible: true,
 
+				},{
 
+					field: "standardName",
 
+					title: "医院标准名称",
 
+					align: 'center',
 
+				},
 
+				{
 
+					"field": "address",
 
+					"title": "医院地址",
 
+					align: 'center',
 
+				},{
 
+					"field": "phone",
 
+					"title": "医院电话",
 
+					align: 'center',
 
+				} ,{
 
+					title: '操作',
 
+					align: 'center',
 
+					formatter: function(value, row, index) {
 
+						if (row.id) {
 
+							var actions = [];
 
+							actions.push('<a class="btn btn-success btn-xs' + GLCF + '" href="javascript:void(0)" onclick="viewPrescription(\'' + row.id + '\')"><i class="fa fa-search"></i>\t查看关联处方</a>');
 
+							return actions.join('');
 
+						} else {
 
+							return "";
 
+						}
 
+					}
 
+				}]
 
+		};
 
+		$.table.init(options);
 
+	}
 
+
 
+	$('#btnExpand').click(function() {
 
+		$._tree.expandAll(true);
 
+		$(this).hide();
 
+		$('#btnCollapse').show();
 
+	});
 
+
 
+	$('#btnCollapse').click(function() {
 
+		$._tree.expandAll(false);
 
+		$(this).hide();
 
+		$('#btnExpand').show();
 
+	});
 
+
 
+	$('#btnRefresh').click(function() {
 
+	});
 
+
 
+	/* 用户管理-新增-选择部门树 */
 
+	function selectDeptTree() {
 
+		var treeId = $("#treeId").val();
 
+		var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
 
+		var url = ctx + "system/user/selectDeptTree/" + deptId;
 
+		var options = {
 
+			title: '选择部门',
 
+			width: "380",
 
+			url: url,
 
+			callBack: doSubmit
 
+		};
 
+		$.modal.openOptions(options);
 
+	}
 
+
 
+	function doSubmit(index, layero){
 
+		var body = $.modal.getChildFrame(index);
 
+		$("#treeId").val(body.find('#treeId').val());
 
+		$("#treeName").val(body.find('#treeName').val());
 
+		$.modal.close(index);
 
+	}
 
+
 
+	/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
 
+	function resetPre() {
 
+		resetDate();
 
+		$("#tag-form")[0].reset();
 
+		$("#deptId").val("");
 
+		$("#parentId").val("");
 
+		$(".curSelectedNode").removeClass("curSelectedNode");
 
+		$.table.search();
 
+	}
 
+	function viewPrescription(id){
 
+		var url = prefix + "/AssociatedPrescription/" + id;
 
+		$.modal.openTab("关联处方", url);
 
+	}
 
+</script>
 
+</body>
 
+
 
+</html>

+ 250 - 0
health-admin/src/main/resources/templates/dtp/configInfo/editDrug.html
Ver arquivo 

@@ -0,0 +1,250 @@
 
+<!DOCTYPE html>
 
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 
+<head>
 
+    <th:block th:include="include :: header('修改配送单')" />
 
+</head>
 
+<body>
 
+<div class="main-content">
 
+    <form class="form-horizontal" id="form-server-edit" th:object="${cold}">
 
+        <h4 class="form-header h4">处方信息</h4>
 
+        <input type="hidden" id="id" name="id" th:value="${id}">
 
+        <div class="row">
 
+            <div class="col-sm-3">
 
+                <label class="col-sm-4 control-label">预计配送时间</label>
 
+                <div class="form-group">
 
+                    <input type="text" class="styled-input time-input-new" id="expectedDeliveryTime"  name="expectedDeliveryTime" placeholder="预计配送时间" th:value="${expectedDeliveryTime}"/>
 
+                </div>
 
+            </div>
 
+            <div class="col-sm-3">
 
+                <div class="form-group">
 
+                    <div class="form-group">
 
+                        <label class="col-sm-4 control-label">实际配送时间</label>
 
+                        <input type="text" class="styled-input time-input-new" id="actualDeliveryTime" placeholder="实际配送时间" name="actualDeliveryTime" th:value="${expectedDeliveryTime}"/>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+
 
+            <div class="col-sm-3">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label is-required">所属连锁：</label>
 
+                    <div class="col-sm-8">
 
+                        <div class="input-group">
 
+                            <input name="chainName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店" class="form-control" th:value="${chainName}">
 
+                            <span class="input-group-addon">
 
+                        <i class="fa fa-search"></i>
 
+                    </span>
 
+                        </div>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+            <div class="col-sm-3">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label is-required">所属门店：</label>
 
+                    <div class="col-sm-8">
 
+                        <select name="storeName" class="form-control" th:with="type=${@dict.getType('sys_select_store')}">
 
+                            <option value="">请选择</option>
 
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${storeName}"
 
+                            ></option>
 
+                        </select>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+        <div class="row">
 
+            <div class="col-sm-3">
 
+                <div class="form-group">
 
+                    <label class="col-sm-6 control-label">是否线上签收：</label>
 
+                    <div class="col-sm-4">
 
+                        <select name="prescriptionType" class="form-control" th:with="type=${@dict.getType('sys_yes_no')}">
 
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${dict.dictLabel}==${prescriptionType}"
 
+                            ></option>
 
+                        </select>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+
 
+            <div class="col-sm-3">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">配送状态：</label>
 
+                    <div class="col-sm-4">
 
+                        <select name="deliveryStatus"  class="form-control"  th:with="type=${@dict.getType('sys_select_pszt')}">
 
+                            <option value="">全部</option>
 
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel}==${deliveryStatus}"></option>
 
+                        </select>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+            <div class="col-sm-3">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">冷链类型：</label>
 
+                    <div class="col-sm-4">
 
+                        <select name="coldChainType"  class="form-control"  th:with="type=${@dict.getType('sys_select_cold_type')}">
 
+                            <option value="">全部</option>
 
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel}==${coldChainType}"
 
+                            ></option>
 
+                        </select>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+            <div class="col-sm-3">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">订单来源：</label>
 
+                    <div class="col-sm-4">
 
+                        <select name="orderSource"  class="form-control"  th:with="type=${@dict.getType('sys_select_order_sources')}">
 
+                            <option value="">全部</option>
 
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}" th:selected="${dict.dictLabel}==${orderSource}"
 
+                            ></option>
 
+                        </select>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+
 
+        </div>
 
+        <div class="row">
 
+            <div class="col-sm-4">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">收货人：</label>
 
+                    <div class="col-sm-8">
 
+                        <input id="recipientName" name="recipientName"  type="text" maxlength="100"  class="form-control" placeholder="请输入收货人" th:value="${recipientName}">
 
+                    </div>
 
+                </div>
 
+            </div>
 
+            <div class="col-sm-4">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">收货电话：</label>
 
+                    <div class="col-sm-8">
 
+                        <input id="recipientPhone" name="recipientPhone"  type="number" maxlength="11"  class="form-control" placeholder="请输入收货电话" th:value="${recipientPhone}">
 
+                    </div>
 
+                </div>
 
+            </div>
 
+
 
+            <div class="col-sm-4">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">冰排编号：</label>
 
+
 
+                    <div class="col-sm-8">
 
+                        <input id="icePackNumber" name="icePackNumber" placeholder="请输入冰排编号" class="form-control" type="text" maxlength="50" th:value="${icePackNumber}">
 
+                    </div>
 
+                </div>
 
+            </div>
 
+
 
+
 
+        </div>
 
+        <div class="row">
 
+            <div class="col-sm-4">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">收货地址：</label>
 
+                    <div class="col-sm-8">
 
+                        <input id="recipientAddress" name="recipientAddress"  type="text" maxlength="1000"  class="form-control" placeholder="请输入收货地址" th:value="${recipientAddress}">
 
+                    </div>
 
+                </div>
 
+            </div>
 
+            <div class="col-sm-4">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">出发温度：</label>
 
+                    <div class="col-sm-8">
 
+                        <input id="departureTemperature" name="departureTemperature"  type="text" maxlength="10"  class="form-control" placeholder="请输入出发温度" th:value="${departureTemperature}">
 
+                    </div>
 
+                </div>
 
+            </div>
 
+            <div class="col-sm-4">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">送达温度：</label>
 
+                    <div class="col-sm-8">
 
+                        <input id="arrivalTemperature" name="arrivalTemperature"  type="text" maxlength="10"  class="form-control" placeholder="请输入送达温度" th:value="${arrivalTemperature}">
 
+                    </div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+        <div class="row">
 
+            <div class="col-sm-4">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">签收照片：</label>
 
+                    <div class="col-sm-8">
 
+                        <input id="signaturePhoto" name="signaturePhoto"  type="text" maxlength="1000"  class="form-control" placeholder="签收照片" th:value="${signaturePhoto}">
 
+                    </div>
 
+                </div>
 
+            </div>
 
+            <div class="col-sm-4">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">配送员：</label>
 
+                    <div class="col-sm-8">
 
+                        <input id="deliveryPerson" name="deliveryPerson" placeholder="请输入配送员" class="form-control" type="text" maxlength="50"  th:value="${deliveryPerson}">
 
+                    </div>
 
+                </div>
 
+            </div>
 
+
 
+
 
+            <div class="col-sm-4">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">配送箱编号：</label>
 
+                    <div class="col-sm-8">
 
+                        <input id="deliveryBoxNumber" name="deliveryBoxNumber"  type="text" maxlength="25"  class="form-control" placeholder="配送箱编号" th:value="${deliveryBoxNumber}">
 
+                    </div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+        <h4 class="form-header h4">其他信息</h4>
 
+        <div class="row">
 
+            <div class="col-sm-6">
 
+                <div class="form-group">
 
+                    <label class="col-sm-4 control-label">付款顺序：</label>
 
+                    <div class="col-sm-8">
 
+                        <select name="paymentSequence" class="form-control" th:with="type=${@dict.getType('sys_select_payment_sequence')}">
 
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:selected="${dict.dictValue}==${paymentSequence}"
 
+                            ></option>
 
+                        </select>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+    </form>
 
+</div>
 
+<div class="main-content">
 
+    <div class="col-sm-offset-5 col-sm-10">
 
+        <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
 
+        <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
 
+    </div>
 
+</div>
 
+<th:block th:include="include :: footer" />
 
+</body>
 
+</html>
 
+
 
+<script>
 
+
 
+    /* 用户管理-新增-选择部门树 */
 
+    function selectDeptTree() {
 
+        var treeId = $("#treeId").val();
 
+        var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
 
+        var url = ctx + "system/user/selectDeptTree/" + deptId;
 
+        var options = {
 
+            title: '选择部门',
 
+            width: "380",
 
+            url: url,
 
+            callBack: doSubmit
 
+        };
 
+        $.modal.openOptions(options);
 
+    }
 
+
 
+    function doSubmit(index, layero){
 
+        var body = $.modal.getChildFrame(index);
 
+        $("#treeId").val(body.find('#treeId').val());
 
+        $("#treeName").val(body.find('#treeName').val());
 
+        $.modal.close(index);
 
+    }
 
+
 
+
 
+    function submitHandler() {
 
+        var prefix = ctx + "dtp/cold";
 
+        if ($.validate.form()) {
 
+            var data = $("#form-server-edit").serializeArray();
 
+            /*var status = $("input[id='status']").is(':checked') == true ? 0 : 1;
 
+            var roleIds = $.form.selectCheckeds("role");
 
+            var postIds = $.form.selectSelects("post");
 
+            data.push({"name": "status", "value": status});
 
+            data.push({"name": "roleIds", "value": roleIds});
 
+            data.push({"name": "postIds", "value": postIds});*/
 
+            $.operate.saveTab(prefix + "/edit", data);
 
+        }
 
+    }
 
+</script>

+ 177 - 0
health-admin/src/main/resources/templates/dtp/configInfo/storeTag.html
Ver arquivo 

@@ -0,0 +1,177 @@
 
+<!DOCTYPE html>
 
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
+<head>
 
+	<th:block th:include="include :: header('一店一目标签')" />
 
+	<th:block th:include="include :: layout-latest-css" />
 
+	<th:block th:include="include :: ztree-css" />
 
+</head>
 
+<body class="gray-bg">
 
+
 
+	<div class="ui-layout-center">
 
+		<div class="container-div">
 
+			<div class="row">
 
+				<div class="col-sm-12 search-collapse">
 
+					<form id="tag-form">
 
+						<input type="hidden" id="deptId" name="deptId">
 
+						<input type="hidden" id="parentId" name="parentId">
 
+						<div class="select-list">
 
+							<ul>
 
+								<li>
 
+									MDM编码：<input type="text"  class="styled-input" placeholder="请输入MDM编码" name="mdmCode"/>
 
+								</li>
 
+								<li>
 
+									<label>门店:</label>
 
+									<input name="storeName" class="styled-input" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店">
 
+								</li>
 
+
 
+								<li>
 
+									<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
+								    <a class="btn btn-warning btn-rounded btn-sm" onclick="resetPre()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
+								</li>
 
+							</ul>
 
+						</div>
 
+					</form>
 
+				</div>
 
+		        <div class="col-sm-12 select-table table-striped">
 
+				    <table id="bootstrap-table"></table>
 
+				</div>
 
+			</div>
 
+		</div>
 
+	</div>
 
+
 
+	<th:block th:include="include :: footer" />
 
+	<th:block th:include="include :: layout-latest-js" />
 
+	<th:block th:include="include :: ztree-js" />
 
+	<script th:inline="javascript">
 
+		var viewFlag = [[${@permission.hasPermi('dtp:configInfo:list')}]];
 
+		var prefix = ctx + "dtp/configInfo";
 
+
 
+		$(function() {
 
+		    var panehHidden = false;
 
+		    if ($(this).width() < 1590) {
 
+		        panehHidden = true;
 
+		    }
 
+		    $('body').layout({ initClosed: panehHidden, west__size: 185, resizeWithWindow: false });
 
+	     	// 回到顶部绑定
 
+	    	if ($.fn.toTop !== undefined) {
 
+	    		var opt = {
 
+	    			win:$('.ui-layout-center'),
 
+	    			doc:$('.ui-layout-center')
 
+	    		};
 
+	    		$('#scroll-up').toTop(opt);
 
+	    	}
 
+		    queryUserList();
 
+		});
 
+
 
+		function queryUserList() {
 
+		    var options = {
 
+		        url: prefix + "/storeTagList",
 
+		        viewUrl: prefix + "/view/{id}",
 
+		        exportUrl: prefix + "/export",
 
+		        sortName: "createTime",
 
+		        sortOrder: "desc",
 
+		        modalName: "一店一目查询",
 
+		        columns: [
 
+					{
 
+						field: "id",
 
+						title: "id",
 
+						//hidden:false
 
+						visible: false,
 
+					},
 
+					{
 
+						field: "storeId",
 
+						title: "门店id"
 
+					},{
 
+						field: "storeCode",
 
+						title: "门店编码"
 
+					},
 
+					{
 
+						"field": "storeName",
 
+						"title": "门店名称"
 
+					},{
 
+						"field": "mdmCode",
 
+						"title": "MDM编码"
 
+					},{
 
+						"field": "productName",
 
+						"title": "药品商品名"
 
+					},{
 
+						"field": "genericName",
 
+						"title": "药品通用名"
 
+					},{
 
+						"field": "manufacturer",
 
+						"title": "厂家"
 
+					},{
 
+						"field": "specification",
 
+						"title": "规格"
 
+					},{
 
+						"field": "isPrescriptionItem",
 
+						"title": "是否为处方登记品"
 
+					},{
 
+						"field": "isFlipItem",
 
+						"title": "是否为上翻品"
 
+					},{
 
+						"field": "isFollowUpItem",
 
+						"title": "是否为随访品"
 
+					},
 
+					{
 
+						"field": "isMandatoryRegistration",
 
+						"title": "是否强制登记"
 
+					},
 
+					{
 
+						"field": "isColdChainItem",
 
+						"title": "是否为冷链品"
 
+					}]
 
+		    };
 
+		    $.table.init(options);
 
+		}
 
+
 
+		$('#btnExpand').click(function() {
 
+			$._tree.expandAll(true);
 
+		    $(this).hide();
 
+		    $('#btnCollapse').show();
 
+		});
 
+
 
+		$('#btnCollapse').click(function() {
 
+			$._tree.expandAll(false);
 
+		    $(this).hide();
 
+		    $('#btnExpand').show();
 
+		});
 
+
 
+		$('#btnRefresh').click(function() {
 
+		});
 
+
 
+		/* 用户管理-新增-选择部门树 */
 
+		function selectDeptTree() {
 
+			var treeId = $("#treeId").val();
 
+			var deptId = $.common.isEmpty(treeId) ? "100" : $("#treeId").val();
 
+			var url = ctx + "system/user/selectDeptTree/" + deptId;
 
+			var options = {
 
+				title: '选择部门',
 
+				width: "380",
 
+				url: url,
 
+				callBack: doSubmit
 
+			};
 
+			$.modal.openOptions(options);
 
+		}
 
+
 
+		function doSubmit(index, layero){
 
+			var body = $.modal.getChildFrame(index);
 
+			$("#treeId").val(body.find('#treeId').val());
 
+			$("#treeName").val(body.find('#treeName').val());
 
+			$.modal.close(index);
 
+		}
 
+
 
+		/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
 
+		function resetPre() {
 
+			resetDate();
 
+			$("#tag-form")[0].reset();
 
+			$("#deptId").val("");
 
+			$("#parentId").val("");
 
+			$(".curSelectedNode").removeClass("curSelectedNode");
 
+			$.table.search();
 
+		}
 
+
 
+	</script>
 
+</body>
 
+
 
+</html>

+ 5 - 10
health-admin/src/main/resources/templates/dtp/recipe/view.html
Ver arquivo 

@@ -20,14 +20,15 @@
 
                 <div class="ant-card-head-title">
 
                     <div class="index_title-2CoZR">
 
                         <h1>DTP处方登记概览</h1>
 
-
 
+                        <button onclick="" class="ant-btn-primary">导出订单</button>
 
+                    </div>
 
                 </div>
 
             </div>
 
 
         </div>
 
         <div class="container-div">
 
         <form id="report-form">
 
-            <input type="hidden"  class="form-control"  name="id" id="id">
 
+            <input type="text" class="" hidden="true" value="" name="id">
 
         <div class="ChartAndTable_chart-and-table-3ib6R">
 
             <div class="ant-radio-group ant-radio-group-outline">
 
                 <label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked">
 
@@ -264,9 +265,6 @@
 
 
         /*门店列表-详细*/
 
         function detail(id) {
 
-            $("#id").val(id);
 
-            $.table.search();
 
-            $("#id").val("");
 
             debugger
 
             $.ajax({
 
                 type : "GET",
 
@@ -302,12 +300,10 @@
 
                         }]
 
                     };
 
 
-
 
-
 
                     // 使用新的数据更新图表
 
                     myChart.setOption(updatedOption);
 
-
 
-
 
+                    $("#id").val(id);
 
+                    queryUserList();
 
                 },
 
                 error : function(errorMsg) {
 
                     //请求失败时执行该函数
 
@@ -315,7 +311,6 @@
 
                     myChart.hideLoading();
 
                 }
 
             })
 
-
 
         }
 
 
     /* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */