6 달 전 · 996dc386a2
--- a/health-admin/src/main/resources/templates/DTP/cold/add.html
+++ b/health-admin/src/main/resources/templates/DTP/cold/add.html
@@ -1,259 +0,0 @@
 
				-<!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="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="styled-input 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>
			
--- a/health-admin/src/main/resources/templates/DTP/cold/cold.html
+++ b/health-admin/src/main/resources/templates/DTP/cold/cold.html
@@ -1,307 +0,0 @@
 
				-<!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">
			
 
				-						<input type="hidden" id="deptId" name="deptId">
			
 
				-		                <input type="hidden" id="parentId" name="parentId">
			
 
				-						<div class="select-list">
			
 
				-							<ul>
			
 
				-								<li  class="select-time">
			
 
				-									<label>创建日期</label>
			
 
				-									<input type="text" class="time-input" id="creationTimeStart" placeholder="开始时间" name="creationTimeStart"/>
			
 
				-									<span>-</span>
			
 
				-									<input type="text" class="time-input" id="creationTimeEnd" placeholder="结束时间" name="creationTimeEnd"/>
			
 
				-								</li>
			
 
				-								<li  class="select-time">
			
 
				-									<label>实际送达</label>
			
 
				-									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="actualDeliveryTimeStart"/>
			
 
				-									<span>-</span>
			
 
				-									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="actualDeliveryTimeEnd"/>
			
 
				-								</li>
			
 
				-								<li>
			
 
				-									<label>订单号：</label>
			
 
				-									<input type="text" class="styled-input" placeholder="请输入订单号" name="orderNumber"/>
			
 
				-								</li>
			
 
				-								<li>
			
 
				-									<label>配送员：</label>
			
 
				-									<input type="text" class="styled-input" placeholder="请输入配送员" name="deliveryPerson"/>
			
 
				-								</li>
			
 
				-								<li>
			
 
				-									<label>收货人：</label>
			
 
				-									<input type="text" class="styled-input" placeholder="请输入收货人" name="recipientName"/>
			
 
				-								</li>
			
 
				-								<li>
			
 
				-									<label>收货电话：</label>
			
 
				-								<input type="text" class="styled-input" placeholder="请输入收货电话" name="recipientPhone"/>
			
 
				-								</li>
			
 
				-								<li>
			
 
				-									<label>配送状态:</label>
			
 
				-									<select name="deliveryStatus"  th:with="type=${@dict.getType('sys_select_pszt')}" class="styled-input">
			
 
				-										<option value="">全部</option>
			
 
				-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"></option>
			
 
				-									</select>
			
 
				-								</li>
			
 
				-								<li>
			
 
				-									<label>所属连锁:</label>
			
 
				-										<input name="chainName" class="styled-input" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店">
			
 
				-								</li>
			
 
				-								<li>
			
 
				-									<label>冷链类型:</label>
			
 
				-									<select name="coldChainType"  th:with="type=${@dict.getType('sys_select_cold_type')}" class="styled-input">
			
 
				-										<option value="">全部</option>
			
 
				-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
			
 
				-												></option>
			
 
				-									</select>
			
 
				-								</li>
			
 
				-								<li>
			
 
				-									<label>付款顺序:</label>
			
 
				-									<select name="paymentSequence"  th:with="type=${@dict.getType('sys_select_payment_sequence')}" class="styled-input">
			
 
				-										<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-success" onclick="$.operate.addTab()" shiro:hasPermission="dtp:cold:add">
			
 
				-		                <i class="fa fa-plus"></i> 新增
			
 
				-		            </a>
			
 
				-		             <a class="btn btn-primary single disabled" onclick="$.operate.editTab()" shiro:hasPermission="dtp:cold:edit">
			
 
				-			            <i class="fa fa-edit"></i> 修改
			
 
				-			        </a>
			
 
				-		            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="sdtp:cold:remove">
			
 
				-		                <i class="fa fa-remove"></i> 删除
			
 
				-		            </a>
			
 
				-<!--		            <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="dtp:recipe:import">-->
			
 
				-<!--			            <i class="fa fa-upload"></i> 导入-->
			
 
				-<!--			        </a>-->
			
 
				-		            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="dtp:cold: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('dtp:cold:edit')}]];
			
 
				-		var removeFlag = [[${@permission.hasPermi('dtp:cold:remove')}]];
			
 
				-		var prefix = ctx + "dtp/cold";
			
 
				-
			
 
				-
			
 
				-		$(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}",
			
 
				-		        removeUrl: prefix + "/remove",
			
 
				-		        exportUrl: prefix + "/export",
			
 
				-		        //importUrl: prefix + "/importData",
			
 
				-		        importTemplateUrl: prefix + "/importTemplate",
			
 
				-		        sortName: "createTime",
			
 
				-		        sortOrder: "desc",
			
 
				-		        modalName: "配送单列表",
			
 
				-		        columns: [{
			
 
				-		            checkbox: true
			
 
				-		        },
			
 
				-					{
			
 
				-						field: "id",
			
 
				-						title: "id",
			
 
				-						//hidden:false
			
 
				-						visible: false,
			
 
				-					},
			
 
				-					// {
			
 
				-					// 	"field": "createdBy",
			
 
				-					// 	"title": "创建人"
			
 
				-					// },
			
 
				-					{
			
 
				-						"field": "orderNumber",
			
 
				-						"title": "订单号"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "createdDate",
			
 
				-						"title": "创建日期"
			
 
				-					},
			
 
				-
			
 
				-					{
			
 
				-						"field": "creationTime",
			
 
				-						"title": "订单创建时间"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "expectedDeliveryTime",
			
 
				-						"title": "预计配送时间"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "actualDeliveryTime",
			
 
				-						"title": "实际配送时间"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "chainName",
			
 
				-						"title": "所属连锁"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "storeName",
			
 
				-						"title": "所属门店"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "deliveryStatus",
			
 
				-						"title": "配送状态"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "coldChainType",
			
 
				-						"title": "冷链类型"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "orderSource",
			
 
				-						"title": "订单来源"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "deliveryPerson",
			
 
				-						"title": "配送员"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "recipientName",
			
 
				-						"title": "收货人"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "recipientPhone",
			
 
				-						"title": "收货电话"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "recipientAddress",
			
 
				-						"title": "收货地址"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "departureTemperature",
			
 
				-						"title": "出发温度"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "arrivalTemperature",
			
 
				-						"title": "送达温度"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "signaturePhoto",
			
 
				-						"title": "签收照片"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "isOnlineSignature",
			
 
				-						"title": "是否线上签收"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "deliveryBoxNumber",
			
 
				-						"title": "配送箱编号"
			
 
				-					},
			
 
				-					{
			
 
				-						"field": "icePackNumber",
			
 
				-						"title": "冰排编号"
			
 
				-
			
 
				-					},
			
 
				-					// {
			
 
				-					// 	"field": "paymentSequence",
			
 
				-					// 	"title": "付款顺序"
			
 
				-					// },
			
 
				-					// {
			
 
				-					// 	"field": "create_time",
			
 
				-					// 	"title": "创建时间"
			
 
				-					// },
			
 
				-					// {
			
 
				-					// 	"field": "updatedTime",
			
 
				-					// 	"title": "更新时间"
			
 
				-					// },
			
 
				-
			
 
				-		        {
			
 
				-		            title: '操作',
			
 
				-		            align: 'center',
			
 
				-					fixed: true, // 固定列
			
 
				-		            formatter: function(value, row, index) {
			
 
				-		                if (row.id) {
			
 
				-		                	var actions = [];
			
 
				-			                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.id + '\')"><i class="fa fa-edit"></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);
			
 
				-		}
			
 
				-
			
 
				-		/* 用户管理-新增-选择部门树 */
			
 
				-		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();
			
 
				-			$("#user-form")[0].reset();
			
 
				-			$("#deptId").val("");
			
 
				-			$("#parentId").val("");
			
 
				-			$(".curSelectedNode").removeClass("curSelectedNode");
			
 
				-			$.table.search();
			
 
				-		}
			
 
				-	</script>
			
 
				-
			
 
				-</body>
			
 
				-
			
 
				-</html>
			
--- a/health-admin/src/main/resources/templates/DTP/cold/edit.html
+++ b/health-admin/src/main/resources/templates/DTP/cold/edit.html
@@ -1,250 +0,0 @@
 
				-<!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>
			
--- a/health-admin/src/main/resources/templates/DTP/configInfo/AssociatedPrescription.html
+++ b/health-admin/src/main/resources/templates/DTP/configInfo/AssociatedPrescription.html
@@ -1,156 +0,0 @@
 
				-<!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>
			
--- a/health-admin/src/main/resources/templates/DTP/configInfo/addDrug.html
+++ b/health-admin/src/main/resources/templates/DTP/configInfo/addDrug.html
@@ -1,259 +0,0 @@
 
				-<!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>
			
--- a/health-admin/src/main/resources/templates/DTP/configInfo/drugList.html
+++ b/health-admin/src/main/resources/templates/DTP/configInfo/drugList.html
@@ -1,189 +0,0 @@
 
				-<!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>
			
--- a/health-admin/src/main/resources/templates/DTP/configInfo/dtpHospital.html
+++ b/health-admin/src/main/resources/templates/DTP/configInfo/dtpHospital.html
@@ -1,156 +0,0 @@
 
				-<!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>
			
--- a/health-admin/src/main/resources/templates/DTP/configInfo/editDrug.html
+++ b/health-admin/src/main/resources/templates/DTP/configInfo/editDrug.html
@@ -1,250 +0,0 @@
 
				-<!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>
			
--- a/health-admin/src/main/resources/templates/DTP/configInfo/storeTag.html
+++ b/health-admin/src/main/resources/templates/DTP/configInfo/storeTag.html
@@ -1,177 +0,0 @@
 
				-<!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>
			
--- a/health-admin/src/main/resources/templates/DTP/print/detail.html
+++ b/health-admin/src/main/resources/templates/DTP/print/detail.html
@@ -1,49 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
			
 
				-<head>
			
 
				-	<th:block th:include="include :: header('配送单据打印详细')" />
			
 
				-	<th:block th:include="include :: jsonview-css" />
			
 
				-</head>
			
 
				-<body class="white-bg">
			
 
				-	<div class="wrapper wrapper-content animated fadeInRight ibox-content">
			
 
				-	<form class="form-horizontal m-t" id="signupForm" th:object="${detail}">
			
 
				-		<div class="form-group">
			
 
				-			<label class="col-sm-2 control-label">订单编号：</label>
			
 
				-			<div class="form-control-static" th:text="${orderId}">
			
 
				-			</div>
			
 
				-		</div>
			
 
				-		<div class="form-group">
			
 
				-			<label class="col-sm-2 control-label">配送时间：</label>
			
 
				-			<div class="form-control-static" th:text="${deliveryTime}">
			
 
				-			</div>
			
 
				-		</div>
			
 
				-		<div class="form-group">
			
 
				-			<label class="col-sm-2 control-label">配送人：</label>
			
 
				-			<div class="form-control-static" th:text="${deliverer}">
			
 
				-			</div>
			
 
				-		</div>
			
 
				-		<div class="form-group">
			
 
				-			<label class="col-sm-2 control-label">打印申请时间：</label>
			
 
				-			<div class="form-control-static" th:text="${printRequestTime}">
			
 
				-			</div>
			
 
				-		</div>
			
 
				-		<div class="form-group">
			
 
				-			<label class="col-sm-2 control-label">打印状态：</label>
			
 
				-			<div class="form-control-static" th:text="${status}">
			
 
				-			</div>
			
 
				-		</div>
			
 
				-
			
 
				-		<div class="form-group" th:style="'display:' + ${status == 0 ? 'none' : 'block'}">
			
 
				-			<label class="col-sm-2 control-label">订单数据：</label>
			
 
				-			<div class="form-control-static" th:text="${orderData}">
			
 
				-			</div>
			
 
				-		</div>
			
 
				-	</form>
			
 
				-    </div>
			
 
				-    <th:block th:include="include :: footer" />
			
 
				-    <th:block th:include="include :: jsonview-js" />
			
 
				-    <script th:inline="javascript">
			
 
				-
			
 
				-    </script>
			
 
				-</body>
			
 
				-</html>
			
--- a/health-admin/src/main/resources/templates/DTP/print/print.html
+++ b/health-admin/src/main/resources/templates/DTP/print/print.html
@@ -1,189 +0,0 @@
 
				-<!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>
			
--- a/health-admin/src/main/resources/templates/DTP/recipe/add.html
+++ b/health-admin/src/main/resources/templates/DTP/recipe/add.html
@@ -1,248 +0,0 @@
 
				-<!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-4">
			
 
				-                <div class="form-group">
			
 
				-                    <label class="col-sm-4 control-label is-required">患者姓名：</label>
			
 
				-                    <div class="col-sm-8">
			
 
				-                        <input name="patientName" placeholder="请输入患者姓名" class="form-control" type="text" maxlength="30" >
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-            <div class="col-sm-4">
			
 
				-                <div class="form-group">
			
 
				-                    <label class="col-sm-4 control-label is-required">手机号码：</label>
			
 
				-                    <div class="col-sm-8">
			
 
				-                        <div class="input-group">
			
 
				-                            <input id="patientPhone" name="patientPhone" placeholder="请输入手机号码" class="form-control" type="number" maxlength="11">
			
 
				-                            <span class="input-group-addon"><i class="fa fa-mobile"></i></span>
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-
			
 
				-            <div class="col-sm-4">
			
 
				-                <div class="form-group">
			
 
				-                    <label class="col-sm-4 control-label is-required">药品通用名：</label>
			
 
				-                    <div class="col-sm-8">
			
 
				-                        <input name="genericName" placeholder="请输入药品通用名" class="form-control" type="text" maxlength="30" >
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-        <div class="row">
			
 
				-            <div class="col-sm-4">
			
 
				-            <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="storeName" 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-4">
			
 
				-                <div class="form-group">
			
 
				-                    <label class="col-sm-4 control-label">厂家：</label>
			
 
				-                    <div class="col-sm-8">
			
 
				-                        <input id="manufacturer" name="manufacturer" placeholder="请输入厂家" class="form-control" type="text" maxlength="30">
			
 
				-                    </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="registrar" name="registrar" placeholder="请输入登记人" class="form-control" type="text" maxlength="30" >
			
 
				-                    </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">
			
 
				-                        <select name="specification" class="form-control" th:with="type=${@dict.getType('sys_select_specification')}">
			
 
				-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
			
 
				-                                    th:selected="${dict.dictLabel}==${specification}"></option>
			
 
				-                        </select>
			
 
				-                    </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="quantity" name="quantity" placeholder="请输入数量" class="form-control" type="number" maxlength="30" >
			
 
				-                        </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="productName" name="productName"  type="text" maxlength="100"  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">
			
 
				-                        <select name="prescriptionType" class="form-control" th:with="type=${@dict.getType('sys_select_prescription_ype')}">
			
 
				-                            <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-4">
			
 
				-                <div class="form-group">
			
 
				-                    <label class="col-sm-4 control-label">配送方式：</label>
			
 
				-                    <div class="col-sm-8">
			
 
				-                        <select name="deliveryMethod" class="form-control" th:with="type=${@dict.getType('sys_select_delivery_method')}">
			
 
				-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
			
 
				-                                    th:selected="${dict.dictLabel}==${deliveryMethod}"></option>
			
 
				-                        </select>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-            <div class="col-sm-4">
			
 
				-                <div class="form-group">
			
 
				-                    <label class="col-sm-4 control-label">MDM编码：</label>
			
 
				-
			
 
				-                    <div class="col-sm-8">
			
 
				-                        <input id="mdmCode" name="mdmCode" placeholder="请输入MDM编码" 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 is-required">医生：</label>
			
 
				-                    <div class="col-sm-8">
			
 
				-                        <input id="doctor" name="doctor" placeholder="请输入医生" class="form-control" type="text" maxlength="30" >
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-            <div class="col-sm-4">
			
 
				-                <div class="form-group">
			
 
				-                    <label class="col-sm-4 control-label is-required">医院：</label>
			
 
				-                    <div class="col-sm-8">
			
 
				-                        <input name="hospital" placeholder="请输入医院" class="form-control" type="text" maxlength="30" >
			
 
				-                    </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="department" name="department" placeholder="请输入科室" class="form-control" type="text" maxlength="50">
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-
			
 
				-        <h4 class="form-header h4">其他信息</h4>
			
 
				-        <div class="row">
			
 
				-            <div class="col-sm-4">
			
 
				-                <div class="form-group">
			
 
				-                    <label class="col-sm-6 control-label">pos会员姓名：</label>
			
 
				-                        <div class="col-sm-6">
			
 
				-                            <input id="posMemberName" name="posMemberName" placeholder="请输入pos会员姓名" class="form-control" type="text" maxlength="30" >
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-            </div>
			
 
				-                <div class="col-sm-4">
			
 
				-                    <div class="form-group">
			
 
				-                        <label class="col-sm-6 control-label">pos会员手机号：</label>
			
 
				-                            <div class="col-sm-6">
			
 
				-                                <input id="posMemberPhone" name="posMemberPhone" placeholder="请输入pos会员手机号" class="form-control" type="number" maxlength="11" >
			
 
				-                            </div>
			
 
				-                        </div>
			
 
				-                </div>
			
 
				-            <div class="col-sm-4">
			
 
				-                <div class="form-group">
			
 
				-
			
 
				-                </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/recipe";
			
 
				-
			
 
				-    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);
			
 
				-    }
			
 
				-
			
 
				-</script>
			
 
				-</body>
			
 
				-</html>
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
--- a/health-admin/src/main/resources/templates/DTP/recipe/edit.html
+++ b/health-admin/src/main/resources/templates/DTP/recipe/edit.html
@@ -1,240 +0,0 @@
 
				-<!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="${recipe}">
			
 
				-            <h4 class="form-header h4">处方信息</h4>
			
 
				-            <input type="hidden" id="id" name="id" th:value="${id}">
			
 
				-                <div class="row">
			
 
				-                    <div class="col-sm-4">
			
 
				-                        <div class="form-group">
			
 
				-                            <label class="col-sm-4 control-label is-required">患者姓名：</label>
			
 
				-                            <div class="col-sm-8">
			
 
				-                                <input name="patientName" placeholder="请输入患者姓名" class="form-control" type="text" maxlength="30" th:value="${patientName}" >
			
 
				-                            </div>
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-                    <div class="col-sm-4">
			
 
				-                        <div class="form-group">
			
 
				-                            <label class="col-sm-4 control-label is-required">手机号码：</label>
			
 
				-                            <div class="col-sm-8">
			
 
				-                                <div class="input-group">
			
 
				-                                    <input id="patientPhone" name="patientPhone" placeholder="请输入手机号码" class="form-control" type="number" maxlength="11" th:value="${patientPhone}">
			
 
				-                                    <span class="input-group-addon"><i class="fa fa-mobile"></i></span>
			
 
				-                                </div>
			
 
				-                            </div>
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-
			
 
				-                    <div class="col-sm-4">
			
 
				-                        <div class="form-group">
			
 
				-                            <label class="col-sm-4 control-label is-required">药品通用名：</label>
			
 
				-                            <div class="col-sm-8">
			
 
				-                                <input name="genericName" placeholder="请输入药品通用名" class="form-control" type="text" maxlength="30" th:value="${genericName}">
			
 
				-                            </div>
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-                <div class="row">
			
 
				-                    <div class="col-sm-4">
			
 
				-                        <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="storeName" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店" class="form-control"  th:value="${storeName}">
			
 
				-                                <span class="input-group-addon"><i class="fa fa-search"></i></span>
			
 
				-                                </div>
			
 
				-                            </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="manufacturer" name="manufacturer" placeholder="请输入厂家" class="form-control" type="text" maxlength="30" th:value="${manufacturer}">
			
 
				-                            </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="registrar" name="registrar" placeholder="请输入登记人" class="form-control" type="text" maxlength="30" th:value="${registrar}">
			
 
				-                            </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">
			
 
				-                                <select name="specification" class="form-control" th:with="type=${@dict.getType('sys_select_specification')}">
			
 
				-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
			
 
				-                                            th:selected="${dict.dictValue}==${specification}"></option>
			
 
				-                                </select>
			
 
				-                            </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="quantity" name="quantity" placeholder="请输入数量" class="form-control" type="number" maxlength="30" th:value="${quantity}">
			
 
				-                            </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="productName" name="productName"  type="text" maxlength="100"  class="form-control" placeholder="请输入商品名" th:value="${productName}">
			
 
				-                            </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">
			
 
				-                                <select name="prescriptionType" class="form-control" th:with="type=${@dict.getType('sys_select_prescription_ype')}">
			
 
				-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
			
 
				-                                            th:selected="${dict.dictValue}==${prescriptionType}"></option>
			
 
				-                                </select>
			
 
				-                            </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">
			
 
				-                                <select name="deliveryMethod" class="form-control" th:with="type=${@dict.getType('sys_select_delivery_method')}">
			
 
				-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
			
 
				-                                            th:selected="${dict.dictValue}==${deliveryMethod}"></option>
			
 
				-                                </select>
			
 
				-                            </div>
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-                    <div class="col-sm-4">
			
 
				-                        <div class="form-group">
			
 
				-                            <label class="col-sm-4 control-label">MDM编码：</label>
			
 
				-
			
 
				-                            <div class="col-sm-8">
			
 
				-                                <input id="mdmCode" name="mdmCode" placeholder="请输入MDM编码" class="form-control" type="text" maxlength="50" th:value="${mdmCode}" >
			
 
				-                            </div>
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-
			
 
				-
			
 
				-                </div>
			
 
				-                <div class="row">
			
 
				-                    <div class="col-sm-4">
			
 
				-                        <div class="form-group">
			
 
				-                            <label class="col-sm-4 control-label is-required">医生：</label>
			
 
				-                            <div class="col-sm-8">
			
 
				-                                <input id="doctor" name="doctor" placeholder="请输入医生" class="form-control" type="text" maxlength="30" th:value="${doctor}">
			
 
				-                            </div>
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-                    <div class="col-sm-4">
			
 
				-                        <div class="form-group">
			
 
				-                            <label class="col-sm-4 control-label is-required">医院：</label>
			
 
				-                            <div class="col-sm-8">
			
 
				-                                <input name="hospital" placeholder="请输入医院" class="form-control" type="text" maxlength="30" th:value="${hospital}">
			
 
				-                            </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="department" name="department" placeholder="请输入科室" class="form-control" type="text" maxlength="50" th:value="${department}">
			
 
				-                            </div>
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-
			
 
				-
			
 
				-            <h4 class="form-header h4">其他信息</h4>
			
 
				-            <div class="row">
			
 
				-                <div class="col-sm-4">
			
 
				-                    <div class="form-group">
			
 
				-                        <label class="col-sm-6 control-label">pos会员姓名：</label>
			
 
				-                        <div class="col-sm-6">
			
 
				-                            <input id="posMemberName" name="posMemberName" placeholder="请输入pos会员姓名" class="form-control" type="text" maxlength="30" th:value="${posMemberName}">
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-                <div class="col-sm-4">
			
 
				-                    <div class="form-group">
			
 
				-                        <label class="col-sm-6 control-label">pos会员手机号：</label>
			
 
				-                        <div class="col-sm-6">
			
 
				-                            <input id="posMemberPhone" name="posMemberPhone" placeholder="请输入pos会员手机号" class="form-control" type="number" maxlength="11" th:value="${posMemberPhone}">
			
 
				-                        </div>
			
 
				-                    </div>
			
 
				-                </div>
			
 
				-                <div class="col-sm-4">
			
 
				-                    <div class="form-group">
			
 
				-
			
 
				-                    </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/recipe";
			
 
				-        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>
			
--- a/health-admin/src/main/resources/templates/DTP/recipe/recipe.html
+++ b/health-admin/src/main/resources/templates/DTP/recipe/recipe.html
@@ -1,316 +0,0 @@
 
				-<!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">
			
 
				-						<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="query"/>
			
 
				-								</li>
			
 
				-								<li>
			
 
				-									药品：<input type="text" class="styled-input" name="genericName"/>
			
 
				-								</li>
			
 
				-								<li>
			
 
				-								<li>
			
 
				-									订单编号：<input type="text" class="styled-input" name="orderId"/>
			
 
				-								</li>
			
 
				-								<li>
			
 
				-									销售单号：<input type="text" class="styled-input" name="saleOrderNumber"/>
			
 
				-								</li>：
			
 
				-								</li>
			
 
				-								<li>
			
 
				-									处方单号：<input type="text" class="styled-input" name="prescriptionNumber"/>
			
 
				-								</li>
			
 
				-								<li>
			
 
				-									<label>处方类型</label>
			
 
				-									<select name="prescriptionType"  th:with="type=${@dict.getType('sys_select_prescription_ype')}" class="styled-input">
			
 
				-										<option value="">全部</option>
			
 
				-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
			
 
				-												></option>
			
 
				-									</select>
			
 
				-								</li>
			
 
				-								<li>
			
 
				-									<label>配送方式</label>
			
 
				-									<select name="deliveryMethod"  th:with="type=${@dict.getType('sys_select_delivery_method')}" class="styled-input">
			
 
				-										<option value="">全部</option>
			
 
				-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
			
 
				-												></option>
			
 
				-									</select>
			
 
				-								</li>
			
 
				-
			
 
				-								<li>
			
 
				-									<label>订单日期 </label>
			
 
				-									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
			
 
				-									<span>-</span>
			
 
				-									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
			
 
				-								</li>
			
 
				-
			
 
				-
			
 
				-								<li>
			
 
				-									<label>订单状态</label>
			
 
				-									<select name="status" th:with="type=${@dict.getType('sys_select_order_status')}" class="styled-input">
			
 
				-										<option value="">全部</option>
			
 
				-										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
			
 
				-										></option>
			
 
				-									</select>
			
 
				-								</li>
			
 
				-								</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-success" onclick="$.operate.addTab()" shiro:hasPermission="dtp:recipe:add">
			
 
				-		                <i class="fa fa-plus"></i> 新增
			
 
				-		            </a>
			
 
				-		             <a class="btn btn-primary single disabled" onclick="$.operate.editTab()" shiro:hasPermission="dtp:recipe:edit">
			
 
				-			            <i class="fa fa-edit"></i> 修改
			
 
				-			        </a>
			
 
				-		            <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-info" onclick="$.table.importExcel()" shiro:hasPermission="dtp:recipe:import">-->
			
 
				-<!--			            <i class="fa fa-upload"></i> 导入-->
			
 
				-<!--			        </a>-->
			
 
				-		            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="dtp:recipe: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 prefix = ctx + "dtp/recipe";
			
 
				-
			
 
				-
			
 
				-		$(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}",
			
 
				-		        removeUrl: prefix + "/remove",
			
 
				-		        exportUrl: prefix + "/export",
			
 
				-		        //importUrl: prefix + "/importData",
			
 
				-		        importTemplateUrl: prefix + "/importTemplate",
			
 
				-		        sortName: "createTime",
			
 
				-		        sortOrder: "desc",
			
 
				-		        modalName: "处方登记信息",
			
 
				-		        columns: [{
			
 
				-		            checkbox: true
			
 
				-		        },
			
 
				-					{
			
 
				-						field: "id",
			
 
				-						title: "id",
			
 
				-						//hidden:false
			
 
				-						visible: false,
			
 
				-					},
			
 
				-					{
			
 
				-						field: "orderId",
			
 
				-						title: "订单编号"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "saleOrderNumber",
			
 
				-						title: "销售单号"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "genericName",
			
 
				-						title: "药品通用名"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "productName",
			
 
				-						title: "商品名",
			
 
				-					},
			
 
				-					{
			
 
				-						field: "specification",
			
 
				-						title: "规格"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "quantity",
			
 
				-						title: "数量"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "manufacturer",
			
 
				-						title: "厂家"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "mdmCode",
			
 
				-						title: "MDM编码"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "posMemberName",
			
 
				-						title: "POS会员姓名"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "posMemberPhone",
			
 
				-						title: "POS会员手机号"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "prescriptionType",
			
 
				-						title: "处方类型"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "orderTime",
			
 
				-						title: "订单时间"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "prescriptionNumber",
			
 
				-						title: "处方单号"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "hospital",
			
 
				-						title: "医院"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "department",
			
 
				-						title: "科室"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "doctor",
			
 
				-						title: "医生"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "patientName",
			
 
				-						title: "患者姓名"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "patientPhone",
			
 
				-						title: "手机号"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "storeName",
			
 
				-						title: "门店"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "registrar",
			
 
				-						title: "登记人"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "completionTime",
			
 
				-						title: "完成时间"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "lastUpdated",
			
 
				-						title: "最后更新时间"
			
 
				-					},
			
 
				-					// {
			
 
				-					// 	field: "deliveryMethod",
			
 
				-					// 	title: "配送方式"
			
 
				-					// },
			
 
				-					// {
			
 
				-					// 	field: "paymentCode",
			
 
				-					// 	title: "付款代码"
			
 
				-					// },
			
 
				-					// {
			
 
				-					// 	field: "paymentMethod",
			
 
				-					// 	title: "付款方式"
			
 
				-					// },
			
 
				-					{
			
 
				-						field: "status",
			
 
				-						title: "状态"
			
 
				-					},
			
 
				-					{
			
 
				-						field: "createTime",
			
 
				-						title: "创建时间"
			
 
				-					},
			
 
				-		        /*{
			
 
				-		        	visible: editFlag == 'hidden' ? false : true,
			
 
				-		        	title: '用户状态',
			
 
				-		        	align: 'center',
			
 
				-		        	formatter: function (value, row, index) {
			
 
				-		        		return statusTools(row);
			
 
				-		        	}
			
 
				-		        },*/
			
 
				-
			
 
				-		        {
			
 
				-		            title: '操作',
			
 
				-		            align: 'center',
			
 
				-		            formatter: function(value, row, index) {
			
 
				-		                if (row.id) {
			
 
				-		                	var actions = [];
			
 
				-			                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.id + '\')"><i class="fa fa-edit"></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);
			
 
				-		}
			
 
				-
			
 
				-		function queryDeptTree()
			
 
				-		{
			
 
				-			var url = ctx + "dtp/recipe/deptTreeData";
			
 
				-			var options = {
			
 
				-		        url: url,
			
 
				-		        expandLevel: 2,
			
 
				-		        onClick : zOnClick
			
 
				-		    };
			
 
				-			$.tree.init(options);
			
 
				-
			
 
				-			function zOnClick(event, treeId, treeNode) {
			
 
				-				$("#deptId").val(treeNode.id);
			
 
				-				$("#parentId").val(treeNode.pId);
			
 
				-				$.table.search();
			
 
				-			}
			
 
				-		}
			
 
				-		/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
			
 
				-		function resetPre() {
			
 
				-			resetDate();
			
 
				-			$("#user-form")[0].reset();
			
 
				-			$("#deptId").val("");
			
 
				-			$("#parentId").val("");
			
 
				-			$(".curSelectedNode").removeClass("curSelectedNode");
			
 
				-			$.table.search();
			
 
				-		}
			
 
				-	</script>
			
 
				-</body>
			
 
				-
			
 
				-</html>
			
--- a/health-admin/src/main/resources/templates/DTP/recipe/view.html
+++ b/health-admin/src/main/resources/templates/DTP/recipe/view.html
@@ -1,452 +0,0 @@
 
				-<!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" />
			
 
				-    <script th:src="@{/health/js/echarts.min.js}"></script>
			
 
				-    <style>
			
 
				-        #chart-container {
			
 
				-            width: 100%;
			
 
				-            height: 500px;
			
 
				-        }
			
 
				-    </style>
			
 
				-</head>
			
 
				-<body class="gray-bg">
			
 
				-
			
 
				-    <div class="ui-layout-center">
			
 
				-        <div class="ant-card-head">
			
 
				-            <div class="ant-card-head-wrapper">
			
 
				-                <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="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">
			
 
				-                    <span class="ant-radio-button ant-radio-button-checked">
			
 
				-                        <input type="radio" class="ant-radio-button-input" value="1" checked="">
			
 
				-                        <span class="ant-radio-button-inner">
			
 
				-
			
 
				-                        </span>
			
 
				-                    </span>
			
 
				-                    <span>订单量模式</span>
			
 
				-                </label>
			
 
				-                <label class="ant-radio-button-wrapper">
			
 
				-                    <span class="ant-radio-button">
			
 
				-                        <input type="radio" class="ant-radio-button-input" value="2">
			
 
				-                        <span class="ant-radio-button-inner">
			
 
				-
			
 
				-                        </span>
			
 
				-                    </span>
			
 
				-                    <span>百分比模式</span>
			
 
				-                </label>
			
 
				-            </div>
			
 
				-                <div class="ant-radio-group ant-radio-group-outline">
			
 
				-                <label class="ant-radio-button-wrapper2">
			
 
				-                        <span class="ant-radio-button ant-radio-button-checked">
			
 
				-                            <input type="radio" class="ant-radio-button-input" value="7" checked="">
			
 
				-                            <span class="ant-radio-button-inner"></span>
			
 
				-                        </span><span>本周</span></label>
			
 
				-                <label class="ant-radio-button-wrapper2">
			
 
				-                        <span class="ant-radio-button">
			
 
				-                            <input type="radio" class="ant-radio-button-input" value="30">
			
 
				-                            <span class="ant-radio-button-inner">
			
 
				-
			
 
				-                            </span></span><span>本月</span></label>
			
 
				-                <label class="ant-radio-button-wrapper2">
			
 
				-                        <span class="ant-radio-button">
			
 
				-                            <input type="radio" class="ant-radio-button-input" value="60">
			
 
				-                            <span class="ant-radio-button-inner">
			
 
				-
			
 
				-                            </span></span><span>上月</span></label>
			
 
				-                <label class="ant-radio-button-wrapper2">
			
 
				-                        <span class="ant-radio-button">
			
 
				-                            <input type="radio" class="ant-radio-button-input" value="365">
			
 
				-                            <span class="ant-radio-button-inner">
			
 
				-
			
 
				-                            </span></span>
			
 
				-                    <span>本年</span>
			
 
				-                </label>
			
 
				-
			
 
				-                  <label>订单日期 </label>
			
 
				-									<input type="text" class="styled-input time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
			
 
				-									<span>-</span>
			
 
				-									<input type="text" class="styled-input time-input" id="endTime" placeholder="结束时间" name="endTime"/>
			
 
				-                    <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>
			
 
				-            </div>
			
 
				-
			
 
				-        </div>
			
 
				-        </form>
			
 
				-
			
 
				-        <div id="chart-container"></div>
			
 
				-        <div class="col-sm-12 select-table table-striped">
			
 
				-            <table id="bootstrap-table"></table>
			
 
				-        </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 prefix = ctx + "dtp/report";
			
 
				-    var names=[];
			
 
				-    var Xnames=[];
			
 
				-    var submitted=[];
			
 
				-    var unsubmitted=[];
			
 
				-    var retData=[];
			
 
				-
			
 
				-        // 初始化 ECharts 图表
			
 
				-        var myChart = echarts.init(document.getElementById('chart-container'));
			
 
				-        // 指定图表的配置项和数据
			
 
				-                var option = {
			
 
				-                title: {
			
 
				-                text: 'DTP 处方登记概览',
			
 
				-                left: 'center'
			
 
				-                },
			
 
				-                tooltip: {
			
 
				-                trigger: 'axis',
			
 
				-                axisPointer: {
			
 
				-                type: 'shadow'
			
 
				-               },
			
 
				-                formatter: function(params) {
			
 
				-                var submitted = retData[params[0].dataIndex].completedCount;
			
 
				-                var unsubmitted = retData[params[0].dataIndex].pendingCount;
			
 
				-                return '<p>' + params[0].name + '</p><p>已提交：' + submitted + ' 单 | 未提交：' + unsubmitted + ' 单</p>';
			
 
				-               }
			
 
				-               },
			
 
				-                legend: {
			
 
				-                data: ['已提交', '未提交']
			
 
				-               },
			
 
				-                xAxis: {
			
 
				-                 type: 'category',
			
 
				-                 data: names,
			
 
				-
			
 
				-                    name: '店铺名称', // X 轴的显示说明
			
 
				-                    nameLocation: 'end', // 名称的位置，可选值有 'start', 'middle', 'end'
			
 
				-                    nameGap: 30, // 名称与轴线之间的距离
			
 
				-                    nameTextStyle: {
			
 
				-                        fontSize: 14,
			
 
				-                        color: 'black'
			
 
				-                    },
			
 
				-                axisLabel: {
			
 
				-                    formatter: function (value, index) {
			
 
				-                        // 获取对应的数据点
			
 
				-                        var data = option.series[0].data[index];
			
 
				-                        // 判断 y 轴数值是否超过 250
			
 
				-                        if (data > 100) {
			
 
				-                            return `{red|${value}}`;
			
 
				-                        } else {
			
 
				-                            return value;
			
 
				-                        }
			
 
				-                    },
			
 
				-                    rich: {
			
 
				-                        red: {
			
 
				-                            color: 'red'
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-            },
			
 
				-                yAxis: {
			
 
				-                   type: 'value',
			
 
				-                    name: '订单量', // Y 轴的显示说明
			
 
				-                    nameLocation: 'end', // 名称的位置，可选值有 'start', 'middle', 'end'
			
 
				-                    nameGap: 30, // 名称与轴线之间的距离
			
 
				-                    nameTextStyle: {
			
 
				-                        fontSize: 14,
			
 
				-                        color: 'black'
			
 
				-                    },
			
 
				-                },
			
 
				-                series:  [
			
 
				-                    {
			
 
				-                        data:Xnames,
			
 
				-                        type: 'bar',
			
 
				-                        showBackground: true,
			
 
				-                        backgroundStyle: {
			
 
				-                            color: 'rgba(180, 180, 180, 0.2)'
			
 
				-                        },
			
 
				-                        itemStyle: {
			
 
				-                            color: function(params) {
			
 
				-                                // 根据 y 轴数值设置颜色
			
 
				-                                if (params.value > 100) {
			
 
				-                                    return 'red';
			
 
				-                                } else {
			
 
				-                                    return 'blue'; // 默认颜色
			
 
				-                                }
			
 
				-                            }
			
 
				-                        }
			
 
				-                    }
			
 
				-                ]
			
 
				-            };
			
 
				-
			
 
				-        // 使用刚指定的配置项和数据显示图表。
			
 
				-        myChart.setOption(option);
			
 
				-
			
 
				-    $(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}",
			
 
				-            exportUrl: prefix + "/export",
			
 
				-            importUrl: prefix + "/importData",
			
 
				-            importTemplateUrl: prefix + "/importTemplate",
			
 
				-            sortName: "createTime",
			
 
				-            sortOrder: "desc",
			
 
				-            modalName: "DTP处方登记概览",
			
 
				-            columns: [
			
 
				-                {
			
 
				-                    field: "id",
			
 
				-                    title: "id",
			
 
				-                    //hidden:false
			
 
				-                    visible: false,
			
 
				-                },
			
 
				-                {
			
 
				-                    field: "chain",
			
 
				-                    title: "连锁店",
			
 
				-                    align: "center",
			
 
				-                    sortable: true,
			
 
				-                    formatter: function(value, row, index) {
			
 
				-                        if (row.id) {
			
 
				-                            // 假设 row.id 是你要传递的 ID 参数
			
 
				-                            return '<a href="javascript:void(0)"   onclick="detail(\'' + row.id + '\')">' + value + '</a>';
			
 
				-                        }
			
 
				-                    }
			
 
				-
			
 
				-                },
			
 
				-                {
			
 
				-                    field: "orderCount",
			
 
				-                    title: "订单量",
			
 
				-                    align: "center"
			
 
				-                },
			
 
				-                {
			
 
				-                    field: "pendingCount",
			
 
				-                    title: "待完成订单数量",
			
 
				-                    align: "center"
			
 
				-                },
			
 
				-                {
			
 
				-                    field: "completedCount",
			
 
				-                    title: "已完成订单数量",
			
 
				-                    align: "center"
			
 
				-                },
			
 
				-                {
			
 
				-                    field: "completionRate",
			
 
				-                    title: "订单完成率(%)",
			
 
				-                    align: "center"
			
 
				-                }]
			
 
				-        };
			
 
				-        $.table.init(options);
			
 
				-    }
			
 
				-
			
 
				-        /*门店列表-详细*/
			
 
				-        function detail(id) {
			
 
				-            debugger
			
 
				-            $.ajax({
			
 
				-                type : "GET",
			
 
				-                async : true,            //异步请求（同步请求将会锁住浏览器，用户其他操作必须等待请求完成才可以执行）
			
 
				-                url : prefix + "/viewDetail/"+id,    //请求发送到TestServlet处
			
 
				-                data : {},
			
 
				-                dataType : "json",        //返回数据形式为json
			
 
				-                success : function(result) {
			
 
				-                    debugger
			
 
				-
			
 
				-                    //请求成功时执行该函数内容，result即为服务器返回的json对象
			
 
				-                    names=[];
			
 
				-                    Xnames=[];
			
 
				-                    unsubmitted=[];
			
 
				-                    submitted=[];
			
 
				-                    retData=[];
			
 
				-                    myChart = echarts.init(document.getElementById('chart-container'))
			
 
				-                    if (result.data.length>0) {
			
 
				-                        retData=result.data;
			
 
				-                        for(var i=0;i<retData.length;i++){
			
 
				-                            names.push(retData[i].chain);    //挨个取出类别并填入类别数组
			
 
				-                            Xnames.push(retData[i].orderCount);
			
 
				-                            unsubmitted.push(retData[i].pendingCount);
			
 
				-                            submitted.push(retData[i].completedCount);
			
 
				-                        }
			
 
				-                    }
			
 
				-                    var updatedOption = {
			
 
				-                        xAxis: {
			
 
				-                            data: names
			
 
				-                        },
			
 
				-                        series: [{
			
 
				-                            data: Xnames
			
 
				-                        }]
			
 
				-                    };
			
 
				-
			
 
				-                    // 使用新的数据更新图表
			
 
				-                    myChart.setOption(updatedOption);
			
 
				-                    $("#id").val(id);
			
 
				-                    queryUserList();
			
 
				-                },
			
 
				-                error : function(errorMsg) {
			
 
				-                    //请求失败时执行该函数
			
 
				-                    alert("图表请求数据失败!");
			
 
				-                    myChart.hideLoading();
			
 
				-                }
			
 
				-            })
			
 
				-        }
			
 
				-
			
 
				-    /* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
			
 
				-    function resetPre() {
			
 
				-        resetDate();
			
 
				-        $("#report-form")[0].reset();
			
 
				-        $("#deptId").val("");
			
 
				-        $("#parentId").val("");
			
 
				-        $(".curSelectedNode").removeClass("curSelectedNode");
			
 
				-        $.table.search();
			
 
				-    }
			
 
				-        $.ajax({
			
 
				-            type : "POST",
			
 
				-            async : true,            //异步请求（同步请求将会锁住浏览器，用户其他操作必须等待请求完成才可以执行）
			
 
				-            url : prefix + "/listReport",    //请求发送到TestServlet处
			
 
				-            data : {},
			
 
				-            dataType : "json",        //返回数据形式为json
			
 
				-            success : function(result) {
			
 
				-                debugger
			
 
				-                //请求成功时执行该函数内容，result即为服务器返回的json对象
			
 
				-
			
 
				-                if (result.data.length>0) {
			
 
				-                    retData=result.data;
			
 
				-                    for(var i=0;i<retData.length;i++){
			
 
				-                        names.push(retData[i].chain);    //挨个取出类别并填入类别数组
			
 
				-                        Xnames.push(retData[i].orderCount);
			
 
				-                        unsubmitted.push(retData[i].pendingCount);
			
 
				-                        submitted.push(retData[i].completedCount);
			
 
				-                    }
			
 
				-                    myChart.setOption(option);
			
 
				-                }
			
 
				-
			
 
				-            },
			
 
				-            error : function(errorMsg) {
			
 
				-                //请求失败时执行该函数
			
 
				-                alert("图表请求数据失败!");
			
 
				-                myChart.hideLoading();
			
 
				-            }
			
 
				-        })
			
 
				-</script>
			
 
				-<style>
			
 
				-    .ant-btn-primary {
			
 
				-        color: #fff;
			
 
				-        background-color: #1890ff;
			
 
				-        border-color: #1890ff;
			
 
				-        text-shadow: 0 -1px 0 rgb(0 0 0 / 12%);
			
 
				-        box-shadow: 0 2px 0 rgb(0 0 0 / 5%);
			
 
				-    }
			
 
				-
			
 
				-    .ant-radio-button-wrapper {
			
 
				-        position: relative;
			
 
				-        display: inline-block;
			
 
				-        height: 32px;
			
 
				-        margin: 0;
			
 
				-        padding: 0 15px;
			
 
				-        color: rgba(0,0,0,.65);
			
 
				-        line-height: 30px;
			
 
				-        background: #fff;
			
 
				-        border: 1px solid #d9d9d9;
			
 
				-        border-top-width: 1.02px;
			
 
				-        border-left: 0;
			
 
				-        cursor: pointer;
			
 
				-        transition: color .3s,background .3s,border-color .3s;
			
 
				-    }
			
 
				-    .ant-radio-button-wrapper2 {
			
 
				-        text-align: right;
			
 
				-        position: relative;
			
 
				-        display: inline-block;
			
 
				-        height: 32px;
			
 
				-        margin: 0;
			
 
				-        padding: 0 15px;
			
 
				-        color: rgba(0,0,0,.65);
			
 
				-        line-height: 30px;
			
 
				-        background: #fff;
			
 
				-        border: 1px solid #d9d9d9;
			
 
				-        border-top-width: 1.02px;
			
 
				-        border-left: 0;
			
 
				-        cursor: pointer;
			
 
				-        transition: color .3s,background .3s,border-color .3s;
			
 
				-    }
			
 
				-    .ant-card-head {
			
 
				-        min-height: 48px;
			
 
				-        margin-bottom: -1px;
			
 
				-        padding: 0 24px;
			
 
				-        color: rgba(0,0,0,.85);
			
 
				-        font-weight: 500;
			
 
				-        font-size: 16px;
			
 
				-        background: transparent;
			
 
				-        border-bottom: 1px solid #e8e8e8;
			
 
				-        border-radius: 2px 2px 0 0;
			
 
				-        zoom: 1;
			
 
				-    }
			
 
				-    .ant-card-head-wrapper {
			
 
				-        display: flex;
			
 
				-        align-items: center;
			
 
				-    }
			
 
				-    .ant-card-head-title {
			
 
				-        display: inline-block;
			
 
				-        flex: 1;
			
 
				-        padding: 16px 0;
			
 
				-        overflow: hidden;
			
 
				-        white-space: nowrap;
			
 
				-        text-overflow: ellipsis;
			
 
				-    }
			
 
				-    .index_title-2CoZR {
			
 
				-        width: 100%;
			
 
				-        justify-content: space-between;
			
 
				-        padding-left: 14px;
			
 
				-        border-left: 4px solid #e8514b;
			
 
				-    }
			
 
				-    .ChartAndTable_chart-and-table-3ib6R{
			
 
				-        display: flex;
			
 
				-        align-items: center;
			
 
				-        justify-content: space-between;
			
 
				-    }
			
 
				-    .ant-radio-group {
			
 
				-        box-sizing: border-box;
			
 
				-        margin: 0;
			
 
				-        padding: 0;
			
 
				-        color: rgba(0,0,0,.65);
			
 
				-        font-size: 14px;
			
 
				-        font-variant: tabular-nums;
			
 
				-        line-height: 1.5;
			
 
				-        list-style: none;
			
 
				-        font-feature-settings: "tnum";
			
 
				-        display: inline-block;
			
 
				-    }
			
 
				-    .ant-radio-button-wrapper>.ant-radio-button {
			
 
				-        width: 0;
			
 
				-        height: 0;
			
 
				-        margin-left: 0;
			
 
				-    }
			
 
				-
			
 
				-
			
 
				-
			
 
				-</style>
			
 
				-</body>
			
 
				-
			
 
				-</html>