clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

feat

This commit is contained in:
donqi 2023-06-04 01:57:21 +08:00
parent 5b54770a40
commit de669894fc
3 changed files with 31 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html
View File

@ -586,7 +586,9 @@
contentType: 'application/json', contentType: 'application/json',
success: function (result) { success: function (result) {
if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
$.modal.msgSuccess("提交成功") $.modal.confirm('发单成功，是否前往发单管理？', function() {
$.modal.parentTab('发单管理', 'order/master/pc');
})
} else { } else {
$.modal.msgError("请求失败") $.modal.msgError("请求失败")
} }

172
ghy-admin/src/main/resources/templates/order/pc-master.html
View File

@ -50,6 +50,12 @@
.long-input { .long-input {
width: 400px; width: 400px;
} }
.active-condition-btn {
background-color: #1c84c6;
border-color: #1c84c6;
color: #fff;
}
</style> </style>
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
@ -61,56 +67,50 @@
<form id="order-form" class="m"> <form id="order-form" class="m">
<input type="hidden" id="deptId" name="deptId"> <input type="hidden" id="deptId" name="deptId">
<input type="hidden" id="parentId" name="parentId"> <input type="hidden" id="parentId" name="parentId">
<div> <div class="condition-btn">
<select id="allOrServing"> <select id="allOrServing">
<option value="">全部</option> <option value="">全部</option>
<option value="">在途</option> <option value="">在途</option>
</select> </select>
<a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 0, sysPayStatus: 0, orderMode: '02'})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 0, sysPayStatus: 0, orderMode: '02'})">
待付款 待付款
</a> </a>
<a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 0, workerId: -1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 0, workerId: -1})">
已发布 已发布
</a> </a>
<a class="btn btn-default btn-outline"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall: '01'})">
未约时 未约时
</a> </a>
<a class="btn btn-default btn-outline"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall: '02'})">
未排班 未排班
</a> </a>
<a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 2})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 2})">
待上门 待上门
</a> </a>
<a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 3})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 3})">
进行中 进行中
</a> </a>
<a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 4})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 4})">
确认审核 确认审核
</a> </a>
<a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 5})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 5})">
完成 完成
</a> </a>
<a class="btn btn-default btn-outline" onclick="searchOrderList({orderStatus: 6})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 6})">
关闭 关闭
</a> </a>
<a class="btn btn-default btn-outline" onclick=""> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this)">
今日待上门 今日待上门
</a> </a>
<a class="btn btn-default btn-outline" onclick=""> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this)">
明日待上门 明日待上门
</a> </a>
<a class="btn btn-default btn-outline" onclick=""> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this)">
售后 售后
</a> </a>
<a class="btn btn-default btn-outline" onclick=""> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this)">
急报中 急报中
</a> </a>
<a class="btn btn-default btn-outline" onclick="">
退单
</a>
<a class="btn btn-default btn-outline" onclick="">
售后纠纷
</a>
</div> </div>
<div class="flex-board"> <div class="flex-board">
<div class="flex-board m-t"> <div class="flex-board m-t">
@ -122,42 +122,6 @@
<select class="street form-control cx-select-input m-r" name="streetId" id="streetId" data-first-title="选择街道" ></select> <select class="street form-control cx-select-input m-r" name="streetId" id="streetId" data-first-title="选择街道" ></select>
</div> </div>
</div> </div>
<div class="flex-board m-t">
创建时间：
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input type="text" class="form-control date-input" placeholder="开始日期">
</div>
至
<div class="input-group date m-r">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input type="text" class="form-control date-input" placeholder="结束日期">
</div>
</div>
<div class="flex-board m-t">
服务时间：
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input type="text" class="form-control date-input" placeholder="开始日期">
</div>
至
<div class="input-group date m-r">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input type="text" class="form-control date-input" placeholder="结束日期">
</div>
</div>
<div class="flex-board m-t">
完成时间：
<div class="input-group date">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input type="text" class="form-control date-input" placeholder="开始日期">
</div>
至
<div class="input-group date m-r">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<input type="text" class="form-control date-input" placeholder="结束日期">
</div>
</div>
<div class="flex-board m-t"> <div class="flex-board m-t">
类别筛选： 类别筛选：
<div id="categoryCxSelect" class="flex-board-no-wrap"> <div id="categoryCxSelect" class="flex-board-no-wrap">
@ -167,61 +131,6 @@
<select class="category4 form-control cx-select-input m-r" name="category4" id="category4" data-first-title="选择四类" ></select> <select class="category4 form-control cx-select-input m-r" name="category4" id="category4" data-first-title="选择四类" ></select>
</div> </div>
</div> </div>
<div class="flex-board-no-wrap m-t">
<label class="form-control-label">后台人员：</label>
<input type="text" class="form-control normal-input m-r">
</div>
<div class="flex-board-no-wrap m-t">
<label class="form-control-label">商家名称：</label>
<input type="text" class="form-control normal-input m-r">
</div>
<div class="flex-board-no-wrap m-t">
<label class="form-control-label">商家电话：</label>
<input type="text" class="form-control normal-input m-r">
</div>
<div class="flex-board-no-wrap m-t">
<label class="form-control-label">接单师傅名称：</label>
<input type="text" class="form-control normal-input m-r">
</div>
<div class="flex-board-no-wrap m-t">
<label class="form-control-label">接单师傅电话：</label>
<input type="text" class="form-control normal-input m-r">
</div>
<div class="flex-board-no-wrap m-t">
<label class="form-control-label">师傅类型：</label>
<select class="form-control normal-select-input m-r">
<option value="">全部</option>
<option value="">大师傅</option>
<option value="">小师傅</option>
</select>
<input type="text" class="form-control normal-input m-r" placeholder="师傅姓名电话">
</div>
<div class="flex-board-no-wrap m-t">
<label class="form-control-label">订单模式：</label>
<select id="orderMode" class="form-control normal-select-input m-r" onchange="changeOrderMode(this.options[this.options.selectedIndex].value)">
<option value="0">全部</option>
<option value="B2B">B2B</option>
<option value="B2C">B2C</option>
</select>
<select id="B2BOptions" class="form-control normal-select-input m-r">
<option value="">全部</option>
<option value="">常规单</option>
<option value="">赠送单</option>
<option value="">合规单</option>
</select>
<select id="B2COptions" class="form-control normal-select-input m-r">
<option value="">全部</option>
<option value="">商品配件类目</option>
<option value="">服务类目</option>
<option value="">社区类目</option>
</select>
</div>
<div class="flex-board-no-wrap m-t">
<label class="form-control-label">订单标签：</label>
<select class="form-control normal-select-input m-r">
<option value="">全部</option>
</select>
</div>
<div class="flex-board-no-wrap m-t"> <div class="flex-board-no-wrap m-t">
<label class="form-control-label">订单查询：</label> <label class="form-control-label">订单查询：</label>
<input type="text" class="form-control long-input m-r" placeholder="请输入订单号、姓名、电话或地址、品牌、规格"> <input type="text" class="form-control long-input m-r" placeholder="请输入订单号、姓名、电话或地址、品牌、规格">
@ -233,41 +142,6 @@
class="fa fa-refresh"></i>&nbsp;重置</a> class="fa fa-refresh"></i>&nbsp;重置</a>
</div> </div>
</div> </div>
<div class="m-t">
<a class="btn btn-default btn-outline" onclick="searchByOrderStatus(0)">
新订单
</a>
<a class="btn btn-default btn-outline" onclick="">
接单超时
</a>
<a class="btn btn-default btn-outline" onclick="">
约单超时
</a>
<a class="btn btn-default btn-outline" onclick="">
排单超时
</a>
<a class="btn btn-default btn-outline" onclick="">
无法排单
</a>
<a class="btn btn-default btn-outline" onclick="">
待上门超时
</a>
<a class="btn btn-default btn-outline" onclick="">
进行超时
</a>
<a class="btn btn-default btn-outline" onclick="">
售后超时
</a>
<a class="btn btn-default btn-outline" onclick="">
客诉中
</a>
<a class="btn btn-default btn-outline" onclick="">
审核中
</a>
<a class="btn btn-default btn-outline" onclick="">
一票价未改价
</a>
</div>
</form> </form>
</div> </div>
@ -546,6 +420,12 @@
}); });
} }
function selectConditionBtn(e, params) {
$('.condition-btn .btn').removeClass('active-condition-btn');
$(e).addClass('active-condition-btn');
searchOrderList(params)
}
function searchOrderList(params) { function searchOrderList(params) {
customParams = params; customParams = params;
$.table.search(); $.table.search();

4
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -181,7 +181,7 @@
AND om.timeout_ = #{timeout} AND om.timeout_ = #{timeout}
</if> </if>
<if test="isCall != null"> <if test="isCall != null">
AND om.ic_call = #{isCall} AND om.is_call = #{isCall}
</if> </if>
</where> </where>
order by om.create_time order by om.create_time
@ -246,7 +246,7 @@
AND om.id in (${orderMasterIds}) AND om.id in (${orderMasterIds})
</if> </if>
<if test="isCall != null"> <if test="isCall != null">
AND om.ic_call = #{isCall} AND om.is_call = #{isCall}
</if> </if>
</where> </where>
</select> </select>