Merge remote-tracking branch 'origin/old-version' into old-version
This commit is contained in:
donqi
commit
bd7bc74bdb
|
|
@ -513,22 +513,7 @@
|
|||
|
||||
function showOrderWorker(id) {
|
||||
var url = "/order/detail/orderWorker/" + id;
|
||||
layer.open({
|
||||
type: 2,
|
||||
area: ['600px', '360px'],
|
||||
fix: false,
|
||||
//不固定
|
||||
maxmin: true,
|
||||
shade: 0.3,
|
||||
title: '指派师傅',
|
||||
content: url,
|
||||
btn: ['关闭'],
|
||||
// 弹层外区域关闭
|
||||
shadeClose: true,
|
||||
cancel: function(index) {
|
||||
return true;
|
||||
}
|
||||
});
|
||||
$.modal.open("指派师傅", url, '800', '300');
|
||||
}
|
||||
|
||||
function selectRegion(regionLevelName, nextRegionLevelName) {
|
||||
|
|
|
|||
|
|
@ -1,210 +1,32 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<style>
|
||||
body {
|
||||
padding: 0 !important;
|
||||
}
|
||||
|
||||
.pane1 {
|
||||
padding-bottom: 0;
|
||||
}
|
||||
|
||||
.pane2 {
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
.template-div {
|
||||
display: inline-block;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.template-body {
|
||||
padding: 10px;
|
||||
border-radius: 5px 5px 0 0;
|
||||
border: 1px solid #1c84c6;
|
||||
}
|
||||
|
||||
.template-footer {
|
||||
background-color: #1c84c6;
|
||||
color: white;
|
||||
padding: 5px;
|
||||
border-radius: 0 0 5px 5px;
|
||||
border: 1px solid #1c84c6;
|
||||
}
|
||||
|
||||
.floor-text {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
flex-wrap: wrap;
|
||||
position: relative;
|
||||
top: 2px;
|
||||
}
|
||||
|
||||
.floor-input {
|
||||
width: 50px;
|
||||
}
|
||||
|
||||
.dropdown-btn {
|
||||
height: 31px;
|
||||
}
|
||||
|
||||
.oper-banner {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
padding: 15px;
|
||||
}
|
||||
|
||||
.oper-banner-start {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.oper-banner-end {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.yuan-symbol {
|
||||
color: red;
|
||||
font-size: large;
|
||||
}
|
||||
|
||||
.multiply-symbol {
|
||||
font-size: large;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.goodsNumList {
|
||||
padding: 5px 8px 14px 5px;
|
||||
min-height: 40px;
|
||||
border: 1px solid #dcdfe6;
|
||||
box-sizing: border-box;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.oneGoodsNumList {
|
||||
padding: 5px 8px 5px 5px;
|
||||
min-height: 40px;
|
||||
border: 1px solid #dcdfe6;
|
||||
box-sizing: border-box;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.goodsNum {
|
||||
margin: 2px 0;
|
||||
height: 24px;
|
||||
}
|
||||
|
||||
#categoryCxSelect {
|
||||
z-index: 101
|
||||
}
|
||||
|
||||
#categoryCxSelect .eo-cascader-menu:nth-child(-n+3) .has-child label {
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
|
||||
<head>
|
||||
<th:block th:include="include :: header('指派师傅')"/>
|
||||
<th:block th:include="include :: layout-latest-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="order-goods-form">
|
||||
<input name="id" type="hidden" th:value="${orderId}" />
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label is-required">商品：</label>
|
||||
<div class="col-sm-1 multiply-symbol">×</div>
|
||||
<div id="goodsNumList" class="col-sm-1 oneGoodsNumList">
|
||||
<input type="number" name="goodsNum" class="form-control" required>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">选择师傅：</label>
|
||||
<div class="col-sm-8">
|
||||
<select id="workerId" name="workerId" class="form-control control-label" required>
|
||||
<option th:each="worker:${workers}" th:value="${worker.workerId}" th:text="${worker.name}" ></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
<body class="white-bg">
|
||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||
<form class="form-horizontal m" id="form-change-provider">
|
||||
<input name="id" type="hidden" th:value="${orderId}"/>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">选择师傅：</label>
|
||||
<div class="col-sm-8">
|
||||
<select id="id" name="workerId" class="form-control control-label" required>
|
||||
<option th:each="worker:${workers}" th:value="${worker.workerId}" th:text="${worker.name}"></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-12 select-table table-striped">
|
||||
<table id="bootstrap-table"></table>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<th:block th:include="include :: footer"/>
|
||||
<th:block th:include="include :: layout-latest-js"/>
|
||||
|
||||
<script th:inline="javascript">
|
||||
|
||||
var prefix = ctx + "order/goods";
|
||||
var orderId = '[[${orderId}]]';
|
||||
|
||||
$(function () {
|
||||
var panehHidden = false;
|
||||
if ($(this).width() < 769) {
|
||||
panehHidden = true;
|
||||
<script type="text/javascript">
|
||||
function submitHandler() {
|
||||
if ($.validate.form()) {
|
||||
$.modal.loading("指派正在调试中......");
|
||||
// $.operate.save(ctx + "system/apply/changeGuide", $('#form-change-provider').serialize());
|
||||
}
|
||||
$('body').layout({initClosed: panehHidden, west__size: 185});
|
||||
// 回到顶部绑定
|
||||
if ($.fn.toTop !== undefined) {
|
||||
var opt = {
|
||||
win: $('.ui-layout-center'),
|
||||
doc: $('.ui-layout-center')
|
||||
};
|
||||
$('#scroll-up').toTop(opt);
|
||||
}
|
||||
queryOrderGoodsList();
|
||||
});
|
||||
|
||||
function queryOrderGoodsList() {
|
||||
var options = {
|
||||
url: prefix + "/list?orderDetailId=" + orderId,
|
||||
modalName: "订单商品",
|
||||
search: false,
|
||||
showSearch: false,
|
||||
showToggle: false,
|
||||
showColumns: false,
|
||||
showRefresh: false,
|
||||
columns: [
|
||||
{
|
||||
field: 'orderGoodsId',
|
||||
title: '订单商品id',
|
||||
visible: false
|
||||
},
|
||||
{
|
||||
field: 'orderId',
|
||||
title: '订单id',
|
||||
visible: false
|
||||
},
|
||||
{
|
||||
field: 'goodsName',
|
||||
title: '商品名称'
|
||||
},
|
||||
{
|
||||
field: 'goodsNum',
|
||||
title: '商品数量'
|
||||
},
|
||||
{
|
||||
field: 'serverGoodsNum',
|
||||
title: '已服务数量'
|
||||
}
|
||||
]
|
||||
};
|
||||
$.table.init(options);
|
||||
}
|
||||
|
||||
</script>
|
||||
</body>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue