update 文件冲突调整

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

@@ -33,7 +33,7 @@
 								</li>
 								<li>
 									<label>打印状态:</label>
-									<select name="prescriptionType"  th:with="type=${@dict.getType('sys_select_print_status')}">
+									<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>
@@ -49,20 +49,13 @@
 					</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>-->
-				<div class="btn-group-sm" id="toolbar" role="group">
+		        <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>
@@ -81,6 +74,7 @@
 	<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() {
@@ -106,6 +100,7 @@
 		        viewUrl: prefix + "/view/{id}",
 		        createUrl: prefix + "/add",
 		        updateUrl: prefix + "/edit/{id}",
+				detailUrl: prefix + "/detail/{id}",
 		        removeUrl: prefix + "/remove",
 		        exportUrl: prefix + "/export",
 		        sortName: "createTime",
@@ -148,9 +143,9 @@
 		            title: '操作',
 		            align: 'center',
 		            formatter: function(value, row, index) {
-		                if (row.id) {
+		                if (row.orderId) {
 		                	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-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 {