new dtp管理 解决文件冲突问题

health-admin/src/main/resources/templates/dtp/cold/add.html

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

health-admin/src/main/resources/templates/dtp/cold/cold.html

@@ -18,46 +18,46 @@
 							<ul>
 								<li  class="select-time">
 									<label>创建日期</label>
-									<input type="text" class="time-input" id="creationTimeStart" placeholder="开始时间" name="creationTimeStart"/>
+									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
 									<span>-</span>
-									<input type="text" class="time-input" id="creationTimeEnd" placeholder="结束时间" name="creationTimeEnd"/>
+									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
 								</li>
 								<li  class="select-time">
 									<label>实际送达</label>
-									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="actualDeliveryTimeStart"/>
+									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
 									<span>-</span>
-									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="actualDeliveryTimeEnd"/>
+									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
 								</li>
 								<li>
 									<label>订单号：</label>
-									<input type="text" class="styled-input" placeholder="请输入订单号" name="orderNumber"/>
+									<input type="text" placeholder="请输入订单号" name="orderNumber"/>
 								</li>
 								<li>
 									<label>配送员：</label>
-									<input type="text" class="styled-input" placeholder="请输入配送员" name="deliveryPerson"/>
+									<input type="text"  placeholder="请输入配送员" name="deliveryPerson"/>
 								</li>
 								<li>
 									<label>收货人：</label>
-									<input type="text" class="styled-input" placeholder="请输入收货人" name="recipientName"/>
+									<input type="text" placeholder="请输入收货人" name="recipientName"/>
 								</li>
 								<li>
 									<label>收货电话：</label>
-								<input type="text" class="styled-input" placeholder="请输入收货电话" name="recipientPhone"/>
+								<input type="text" placeholder="请输入收货电话" name="recipientPhone"/>
 								</li>
 								<li>
 									<label>配送状态:</label>
-									<select name="deliveryStatus"  th:with="type=${@dict.getType('sys_select_pszt')}" class="styled-input">
+									<select name="deliveryStatus"  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>
 								</li>
 								<li>
 									<label>所属连锁:</label>
-										<input name="chainName" class="styled-input" onclick="selectDeptTree()" id="treeName" type="text" placeholder="请选择门店">
+										<input name="chainName" 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">
+									<select name="coldChainType"  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>
@@ -65,7 +65,7 @@
 								</li>
 								<li>
 									<label>付款顺序:</label>
-									<select name="paymentSequence"  th:with="type=${@dict.getType('sys_select_payment_sequence')}" class="styled-input">
+									<select name="paymentSequence"  th:with="type=${@dict.getType('sys_select_payment_sequence')}">
 										<option value="">全部</option>
 										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictLabel}"
 										></option>
@@ -237,7 +237,6 @@
 					{
 						"field": "icePackNumber",
 						"title": "冰排编号"
-
 					},
 					// {
 					// 	"field": "paymentSequence",
@@ -255,7 +254,6 @@
 		        {
 		            title: '操作',
 		            align: 'center',
-					fixed: true, // 固定列
 		            formatter: function(value, row, index) {
 		                if (row.id) {
 		                	var actions = [];
@@ -271,6 +269,62 @@
 		    $.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() {
+			//queryDeptTree();
+		});
+		/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
+		function resetPre() {
+			resetDate();
+			$("#user-form")[0].reset();
+			$("#deptId").val("");
+			$("#parentId").val("");
+			$(".curSelectedNode").removeClass("curSelectedNode");
+			$.table.search();
+		}
+
+		/* 用户管理-部门 */
+		function dept() {
+			var url = ctx + "system/dept";
+			$.modal.openTab("部门管理", url);
+		}
+
+		/* 用户状态显示 */
+		function statusTools(row) {
+		    if (row.status == 1) {
+    			return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.userId + '\')"></i> ';
+    		} else {
+    			return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.userId + '\')"></i> ';
+    		}
+		}
+
+		/* 用户管理-停用 */
+		function disable(userId) {
+			$.modal.confirm("确认要停用用户吗？", function() {
+				$.operate.post(prefix + "/changeStatus", { "userId": userId, "status": 1 });
+		    })
+		}
+
+		/* 用户管理启用 */
+		function enable(userId) {
+			$.modal.confirm("确认要启用用户吗？", function() {
+				$.operate.post(prefix + "/changeStatus", { "userId": userId, "status": 0 });
+		    })
+		}
+
 		/* 用户管理-新增-选择部门树 */
 		function selectDeptTree() {
 			var treeId = $("#treeId").val();
@@ -291,15 +345,6 @@
 			$("#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>

health-admin/src/main/resources/templates/dtp/cold/edit.html

@@ -1,202 +1,188 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
-    <th:block th:include="include :: header('修改配送单')" />
+    <th:block th:include="include :: header('修改处方')" />
 </head>
 <body>
 <div class="main-content">
-    <form class="form-horizontal" id="form-server-edit" th:object="${cold}">
+    <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-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="col-sm-4">
                 <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}"/>
+                    <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-3">
+            <div class="col-sm-4">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">所属连锁：</label>
+                    <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>
+                            <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-3">
+
+            <div class="col-sm-4">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">所属门店：</label>
+                    <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>
+                        <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-3">
+            <div class="col-sm-4">
                 <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>
+                    <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-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="col-sm-4">
                 <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>
+                    <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-3">
+            <div class="col-sm-4">
                 <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>
+                    <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>
+                    <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}">
+                        <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>
+                    <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}">
+                        <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>
-
+                    <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}">
+                        <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>
+                    <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}">
+                        <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>
+                    <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}">
+                        <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">送达温度：</label>
+                    <label class="col-sm-4 control-label">MDM编码：</label>
+
                     <div class="col-sm-8">
-                        <input id="arrivalTemperature" name="arrivalTemperature"  type="text" maxlength="10"  class="form-control" placeholder="请输入送达温度" th:value="${arrivalTemperature}">
+                        <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">签收照片：</label>
+                    <label class="col-sm-4 control-label is-required">医生：</label>
                     <div class="col-sm-8">
-                        <input id="signaturePhoto" name="signaturePhoto"  type="text" maxlength="1000"  class="form-control" placeholder="签收照片" th:value="${signaturePhoto}">
+                        <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">配送员：</label>
+                    <label class="col-sm-4 control-label is-required">医院：</label>
                     <div class="col-sm-8">
-                        <input id="deliveryPerson" name="deliveryPerson" placeholder="请输入配送员" class="form-control" type="text" maxlength="50"  th:value="${deliveryPerson}">
+                        <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>
+                    <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}">
+                        <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-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">付款顺序：</label>
+                    <label class="col-sm-6 control-label">pos会员姓名：</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>
+                        <input id="posMemberName" name="posMemberName" placeholder="请输入pos会员姓名" class="form-control" type="text" maxlength="30" th:value="${posMemberName}">
                     </div>
                 </div>
             </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-6 control-label">pos会员手机号：</label>
+                    <div class="col-sm-8">
+                        <input id="posMemberPhone" name="posMemberPhone" placeholder="请输入pos会员手机号" class="form-control" type="number" maxlength="11" th:value="${posMemberPhone}">
+                    </div>
+                </div>
+            </div>
+
         </div>
     </form>
 </div>
@@ -235,7 +221,7 @@
 
 
     function submitHandler() {
-        var prefix = ctx + "dtp/cold";
+        var prefix = ctx + "dtp/recipe";
         if ($.validate.form()) {
             var data = $("#form-server-edit").serializeArray();
             /*var status = $("input[id='status']").is(':checked') == true ? 0 : 1;

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

@@ -170,27 +170,22 @@
 
         <h4 class="form-header h4">其他信息</h4>
         <div class="row">
-            <div class="col-sm-4">
+            <div class="col-sm-6">
                 <div class="form-group">
                     <label class="col-sm-6 control-label">pos会员姓名：</label>
-                        <div class="col-sm-6">
+                        <div class="col-sm-8">
                             <input id="posMemberName" name="posMemberName" placeholder="请输入pos会员姓名" class="form-control" type="text" maxlength="30" >
                     </div>
                 </div>
             </div>
-                <div class="col-sm-4">
+                <div class="col-sm-6">
                     <div class="form-group">
                         <label class="col-sm-6 control-label">pos会员手机号：</label>
-                            <div class="col-sm-6">
+                            <div class="col-sm-8">
                                 <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>
 
@@ -209,6 +204,54 @@
 <th:block th:include="include :: select2-js" />
 <script>
     var prefix = ctx + "dtp/recipe";
+    var prescriptionTypes = [
+        { label: '电子处方', value: 'electronic' },
+        { label: '纸质处方', value: 'paper' }
+    ];
+    // $("#form-user-add").validate({
+    //     onkeyup: false,
+    //     rules:{
+    //         patientName:{
+    //             minlength: 3,
+    //             maxlength: 20,
+    //             remote: {
+    //                 url: prefix + "/checkPatientNameAndPhoneUnique",
+    //                 type: "post",
+    //                 dataType: "json",
+    //                 data: {
+    //                     "patientName": function() {
+    //                         return $.common.trim($("#patientName").val());
+    //                     },
+    //                     "patientPhone": function() {
+    //                         return $.common.trim($("#patientPhone").val());
+    //                     }
+    //                 }
+    //             }
+    //         },
+    //         patientPhone:{
+    //             isPhone:true,
+    //             remote: {
+    //                 url: prefix + "/checkPhoneUnique",
+    //                 type: "post",
+    //                 dataType: "json",
+    //                 data: {
+    //                     "patientPhone": function () {
+    //                         return $.common.trim($("#patientPhone").val());
+    //                     }
+    //                 }
+    //             }
+    //         },
+    //     },
+    //     messages: {
+    //         "patientName": {
+    //             remote: "患者已经存在"
+    //         },
+    //         "patientPhone":{
+    //             remote: "患者手机号码已经存在"
+    //         }
+    //     },
+    //     focusCleanup: true
+    // });
 
     function submitHandler() {
         if ($.validate.form()) {
@@ -239,10 +282,14 @@
         $.modal.close(index);
     }
 
+    $(function() {
+        $('#post').select2({
+            placeholder: "请选择岗位",
+            allowClear: true
+        });
+    })
 </script>
 </body>
 </html>
 
 
-
-

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

@@ -166,27 +166,23 @@
 
             <h4 class="form-header h4">其他信息</h4>
             <div class="row">
-                <div class="col-sm-4">
+                <div class="col-sm-6">
                     <div class="form-group">
                         <label class="col-sm-6 control-label">pos会员姓名：</label>
-                        <div class="col-sm-6">
+                        <div class="col-sm-8">
                             <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="col-sm-6">
                     <div class="form-group">
                         <label class="col-sm-6 control-label">pos会员手机号：</label>
-                        <div class="col-sm-6">
+                        <div class="col-sm-8">
                             <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>

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

@@ -17,25 +17,25 @@
 						<div class="select-list">
 							<ul>
 								<li>
-									患者信息：<input type="text" class="styled-input" placeholder="请输入患者姓名或手机号" name="query"/>
+									患者信息：<input type="text"  placeholder="请输入患者姓名或手机号" name="query"/>
 								</li>
 								<li>
-									药品：<input type="text" class="styled-input" name="genericName"/>
+									药品：<input type="text" name="genericName"/>
 								</li>
 								<li>
 								<li>
-									订单编号：<input type="text" class="styled-input" name="orderId"/>
+									订单编号：<input type="text" name="orderId"/>
 								</li>
 								<li>
-									销售单号：<input type="text" class="styled-input" name="saleOrderNumber"/>
+									销售单号：<input type="text" name="saleOrderNumber"/>
 								</li>：
 								</li>
 								<li>
-									处方单号：<input type="text" class="styled-input" name="prescriptionNumber"/>
+									处方单号：<input type="text" name="prescriptionNumber"/>
 								</li>
 								<li>
 									<label>处方类型</label>
-									<select name="prescriptionType"  th:with="type=${@dict.getType('sys_select_prescription_ype')}" class="styled-input">
+									<select name="prescriptionType"  th:with="type=${@dict.getType('sys_select_prescription_ype')}">
 										<option value="">全部</option>
 										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 												></option>
@@ -43,7 +43,7 @@
 								</li>
 								<li>
 									<label>配送方式</label>
-									<select name="deliveryMethod"  th:with="type=${@dict.getType('sys_select_delivery_method')}" class="styled-input">
+									<select name="deliveryMethod"  th:with="type=${@dict.getType('sys_select_delivery_method')}">
 										<option value="">全部</option>
 										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 												></option>
@@ -52,15 +52,15 @@
 
 								<li>
 									<label>订单日期 </label>
-									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
+									<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
 									<span>-</span>
-									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
+									<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
 								</li>
 
 
 								<li>
 									<label>订单状态</label>
-									<select name="status" th:with="type=${@dict.getType('sys_select_order_status')}" class="styled-input">
+									<select name="status" th:with="type=${@dict.getType('sys_select_order_status')}">
 										<option value="">全部</option>
 										<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"
 										></option>
@@ -126,6 +126,7 @@
 	    		$('#scroll-up').toTop(opt);
 	    	}
 		    queryUserList();
+		    //queryDeptTree();
 		});
 
 		function queryUserList() {
@@ -164,7 +165,7 @@
 					},
 					{
 						field: "productName",
-						title: "商品名",
+						title: "商品名"
 					},
 					{
 						field: "specification",
@@ -271,7 +272,7 @@
 		            title: '操作',
 		            align: 'center',
 		            formatter: function(value, row, index) {
-		                if (row.id) {
+		                if (row.id != 1) {
 		                	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> ');
@@ -301,6 +302,22 @@
 				$.table.search();
 			}
 		}
+
+		$('#btnExpand').click(function() {
+			$._tree.expandAll(true);
+		    $(this).hide();
+		    $('#btnCollapse').show();
+		});
+
+		$('#btnCollapse').click(function() {
+			$._tree.expandAll(false);
+		    $(this).hide();
+		    $('#btnExpand').show();
+		});
+
+		$('#btnRefresh').click(function() {
+			//queryDeptTree();
+		});
 		/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
 		function resetPre() {
 			resetDate();
@@ -310,6 +327,35 @@
 			$(".curSelectedNode").removeClass("curSelectedNode");
 			$.table.search();
 		}
+
+		/* 用户管理-部门 */
+		function dept() {
+			var url = ctx + "system/dept";
+			$.modal.openTab("部门管理", url);
+		}
+
+		/* 用户状态显示 */
+		function statusTools(row) {
+		    if (row.status == 1) {
+    			return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.userId + '\')"></i> ';
+    		} else {
+    			return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.userId + '\')"></i> ';
+    		}
+		}
+
+		/* 用户管理-停用 */
+		function disable(userId) {
+			$.modal.confirm("确认要停用用户吗？", function() {
+				$.operate.post(prefix + "/changeStatus", { "userId": userId, "status": 1 });
+		    })
+		}
+
+		/* 用户管理启用 */
+		function enable(userId) {
+			$.modal.confirm("确认要启用用户吗？", function() {
+				$.operate.post(prefix + "/changeStatus", { "userId": userId, "status": 0 });
+		    })
+		}
 	</script>
 </body>