Compare commits
2 Commits
326dfe5810
...
7e47ffa2a3
| Author | SHA1 | Date |
|---|---|---|
rdpnr_hemingxia
|
7e47ffa2a3 | |
|
rdpnr_hemingxia
|
b5cb394b44 |
|
|
@ -1,177 +1,177 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
|
||||
<head>
|
||||
<th:block th:include="include :: header('新增发货记录')" />
|
||||
<th:block th:include="include :: datetimepicker-css" />
|
||||
</head>
|
||||
<body class="white-bg">
|
||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||
<form class="form-horizontal m" id="form-delivery-add">
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">关联合同：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group">
|
||||
<input style="display: none" name="orderId" class="form-control" readonly type="text" required>
|
||||
<input name="orderName" class="form-control" type="text" onclick="selectOrder()" required>
|
||||
<span class="input-group-addon"><i class="fa fa-search"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">发货单号：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="deliveryCode" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">发货日期：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group date">
|
||||
<input name="deliveryDate" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
|
||||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">发货方式：</label>
|
||||
<div class="col-sm-8">
|
||||
<select name="deliveryType" class="form-control" th:with="type=${@dict.getType('delivery_type')}" required>
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">物流公司：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="logisticsCompany" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">物流单号：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="logisticsCode" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">收货人姓名：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="receiverName" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">收货人电话：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="receiverPhone" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">收货地址：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="receiverAddress" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">发货状态：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="radio-box" th:each="dict : ${@dict.getType('delivery_status')}">
|
||||
<input type="radio" th:id="${'deliveryStatus_' + dict.dictCode}" name="deliveryStatus" th:value="${dict.dictValue}" th:checked="${dict.default}" required>
|
||||
<label th:for="${'deliveryStatus_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">签收时间：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group date">
|
||||
<input name="signTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
|
||||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">备注：</label>
|
||||
<div class="col-sm-8">
|
||||
<textarea name="remark" class="form-control"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<th:block th:include="include :: footer" />
|
||||
<th:block th:include="include :: datetimepicker-js" />
|
||||
<script th:inline="javascript">
|
||||
var prefix = ctx + "manage/delivery"
|
||||
var prefixOrder = ctx + "manage/order";
|
||||
let orderList=[]
|
||||
$("#form-delivery-add").validate({
|
||||
focusCleanup: true
|
||||
});
|
||||
$(function (){
|
||||
|
||||
})
|
||||
// function getOrderList() {
|
||||
// $.operate.post(prefixOrder + "/list",{isTable:0}, function (res){
|
||||
// orderList=res.rows
|
||||
// $("[name='orderId']").html(
|
||||
// orderList.map((ele)=>{
|
||||
// return `<option value="${ele.id}">${ele.orderName}</option>`
|
||||
// }).join('')
|
||||
// )
|
||||
//
|
||||
// })
|
||||
// }
|
||||
function submitHandler() {
|
||||
if ($.validate.form()) {
|
||||
$.operate.save(prefix + "/add", $('#form-delivery-add').serialize());
|
||||
}
|
||||
}
|
||||
|
||||
$("input[name='deliveryDate']").datetimepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
minView: "month",
|
||||
autoclose: true
|
||||
});
|
||||
|
||||
$("input[name='signTime']").datetimepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
minView: "month",
|
||||
autoclose: true
|
||||
});
|
||||
function selectOrder(id){
|
||||
var options = {
|
||||
title: "关联合同",
|
||||
url: prefix + '/selectOrder',
|
||||
skin: 'layui-layer-gray',
|
||||
btn: true,
|
||||
maxmin: false,
|
||||
full: false,
|
||||
index:1000
|
||||
};
|
||||
$.modal.openOptions(options)
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
|
||||
<head>
|
||||
<th:block th:include="include :: header('新增发货记录')" />
|
||||
<th:block th:include="include :: datetimepicker-css" />
|
||||
</head>
|
||||
<body class="white-bg">
|
||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||
<form class="form-horizontal m" id="form-delivery-add">
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">关联合同：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group">
|
||||
<input style="display: none" name="orderId" class="form-control" readonly type="text" required>
|
||||
<input name="orderName" class="form-control" type="text" onclick="selectOrder()" required>
|
||||
<span class="input-group-addon"><i class="fa fa-search"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">发货单号：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="deliveryCode" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">发货日期：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group date">
|
||||
<input name="deliveryDate" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
|
||||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">发货方式：</label>
|
||||
<div class="col-sm-8">
|
||||
<select name="deliveryType" class="form-control" th:with="type=${@dict.getType('delivery_type')}" required>
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">物流公司：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="logisticsCompany" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">物流单号：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="logisticsCode" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">收货人姓名：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="receiverName" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">收货人电话：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="receiverPhone" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">收货地址：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="receiverAddress" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">发货状态：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="radio-box" th:each="dict : ${@dict.getType('delivery_status')}">
|
||||
<input type="radio" th:id="${'deliveryStatus_' + dict.dictCode}" name="deliveryStatus" th:value="${dict.dictValue}" th:checked="${dict.default}" required>
|
||||
<label th:for="${'deliveryStatus_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">签收时间：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group date">
|
||||
<input name="signTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
|
||||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">备注：</label>
|
||||
<div class="col-sm-8">
|
||||
<textarea name="remark" class="form-control"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<th:block th:include="include :: footer" />
|
||||
<th:block th:include="include :: datetimepicker-js" />
|
||||
<script th:inline="javascript">
|
||||
var prefix = ctx + "manage/delivery"
|
||||
var prefixOrder = ctx + "manage/order";
|
||||
let orderList=[]
|
||||
$("#form-delivery-add").validate({
|
||||
focusCleanup: true
|
||||
});
|
||||
$(function (){
|
||||
|
||||
})
|
||||
// function getOrderList() {
|
||||
// $.operate.post(prefixOrder + "/list",{isTable:0}, function (res){
|
||||
// orderList=res.rows
|
||||
// $("[name='orderId']").html(
|
||||
// orderList.map((ele)=>{
|
||||
// return `<option value="${ele.id}">${ele.orderName}</option>`
|
||||
// }).join('')
|
||||
// )
|
||||
//
|
||||
// })
|
||||
// }
|
||||
function submitHandler() {
|
||||
if ($.validate.form()) {
|
||||
$.operate.save(prefix + "/add", $('#form-delivery-add').serialize());
|
||||
}
|
||||
}
|
||||
|
||||
$("input[name='deliveryDate']").datetimepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
minView: "month",
|
||||
autoclose: true
|
||||
});
|
||||
|
||||
$("input[name='signTime']").datetimepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
minView: "month",
|
||||
autoclose: true
|
||||
});
|
||||
function openList(id){
|
||||
var options = {
|
||||
title: "关联合同",
|
||||
url: prefix + '/selectOrder',
|
||||
skin: 'layui-layer-gray',
|
||||
btn: false,
|
||||
maxmin: false,
|
||||
full: false,
|
||||
index:1000
|
||||
};
|
||||
$.modal.openOptions(options)
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,180 +1,184 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
|
||||
<head>
|
||||
<th:block th:include="include :: header('修改发货记录')" />
|
||||
<th:block th:include="include :: datetimepicker-css" />
|
||||
</head>
|
||||
<body class="white-bg">
|
||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||
<form class="form-horizontal m" id="form-delivery-edit" th:object="${orderDelivery}">
|
||||
<input name="id" th:field="*{id}" type="hidden">
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">关联合同：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group">
|
||||
<input style="display: none" th:orderId="*{orderId}" name="orderId" class="form-control" readonly type="text" required>
|
||||
<input name="orderName" th:orderName="*{orderName}" class="form-control" type="text" onclick="selectOrder()" required>
|
||||
<span class="input-group-addon"><i class="fa fa-search"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">发货单号：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="deliveryCode" th:field="*{deliveryCode}" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">发货日期：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group date">
|
||||
<input name="deliveryDate" th:value="${#dates.format(orderDelivery.deliveryDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
|
||||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">发货方式：</label>
|
||||
<div class="col-sm-8">
|
||||
<select name="deliveryType" class="form-control" th:with="type=${@dict.getType('delivery_type')}" required>
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{deliveryType}"></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">物流公司：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="logisticsCompany" th:field="*{logisticsCompany}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">物流单号：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="logisticsCode" th:field="*{logisticsCode}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">收货人姓名：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="receiverName" th:field="*{receiverName}" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">收货人电话：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="receiverPhone" th:field="*{receiverPhone}" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">收货地址：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="receiverAddress" th:field="*{receiverAddress}" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">发货状态：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="radio-box" th:each="dict : ${@dict.getType('delivery_status')}">
|
||||
<input type="radio" th:id="${'deliveryStatus_' + dict.dictCode}" name="deliveryStatus" th:value="${dict.dictValue}" th:field="*{deliveryStatus}" required>
|
||||
<label th:for="${'deliveryStatus_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">签收时间：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group date">
|
||||
<input name="signTime" th:value="${#dates.format(orderDelivery.signTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
|
||||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">备注：</label>
|
||||
<div class="col-sm-8">
|
||||
<textarea name="remark" class="form-control">[[*{remark}]]</textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<th:block th:include="include :: footer" />
|
||||
<th:block th:include="include :: datetimepicker-js" />
|
||||
<script th:inline="javascript">
|
||||
var prefix = ctx + "manage/delivery";
|
||||
var prefixOrder = ctx + "manage/order";
|
||||
$("#form-delivery-edit").validate({
|
||||
focusCleanup: true
|
||||
});
|
||||
$(function (){
|
||||
setTimeout( getOrderList(),500)
|
||||
|
||||
})
|
||||
function getOrderList() {
|
||||
$.operate.post(prefixOrder + "/list",{isTable:0}, function (res){
|
||||
orderList=res.rows
|
||||
var orderId=$("[name='orderId']").attr('orderid')
|
||||
orderList.forEach((ele)=>{
|
||||
if(ele.id==orderId){
|
||||
$("[name='orderName']").val(ele.orderName)
|
||||
$("[name='orderId']").val(ele.id)
|
||||
}
|
||||
})
|
||||
|
||||
})
|
||||
}
|
||||
function submitHandler() {
|
||||
if ($.validate.form()) {
|
||||
$.operate.save(prefix + "/edit", $('#form-delivery-edit').serialize());
|
||||
}
|
||||
}
|
||||
|
||||
$("input[name='deliveryDate']").datetimepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
minView: "month",
|
||||
autoclose: true
|
||||
});
|
||||
|
||||
$("input[name='signTime']").datetimepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
minView: "month",
|
||||
autoclose: true
|
||||
});
|
||||
function selectOrder(){
|
||||
var options = {
|
||||
title: "关联合同",
|
||||
url: prefix + '/selectOrder',
|
||||
skin: 'layui-layer-gray',
|
||||
btn: true,
|
||||
maxmin: false,
|
||||
full: false,
|
||||
index:1000
|
||||
};
|
||||
$.modal.openOptions(options)
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
|
||||
<head>
|
||||
<th:block th:include="include :: header('修改发货记录')" />
|
||||
<th:block th:include="include :: datetimepicker-css" />
|
||||
</head>
|
||||
<body class="white-bg">
|
||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||
<form class="form-horizontal m" id="form-delivery-edit" th:object="${orderDelivery}">
|
||||
<input name="id" th:field="*{id}" type="hidden">
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">关联合同：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group">
|
||||
<input style="display: none" th:orderId="*{orderId}" name="orderId" class="form-control" readonly type="text" required>
|
||||
<input name="orderName" th:orderName="*{orderName}" class="form-control" type="text" onclick="selectOrder()" required>
|
||||
<span class="input-group-addon"><i class="fa fa-search"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">发货单号：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="deliveryCode" th:field="*{deliveryCode}" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">发货日期：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group date">
|
||||
<input name="deliveryDate" th:value="${#dates.format(orderDelivery.deliveryDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>
|
||||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">发货方式：</label>
|
||||
<div class="col-sm-8">
|
||||
<select name="deliveryType" class="form-control" th:with="type=${@dict.getType('delivery_type')}" required>
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{deliveryType}"></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">物流公司：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="logisticsCompany" th:field="*{logisticsCompany}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">物流单号：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="logisticsCode" th:field="*{logisticsCode}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">收货人姓名：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="receiverName" th:field="*{receiverName}" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">收货人电话：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="receiverPhone" th:field="*{receiverPhone}" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">收货地址：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="receiverAddress" th:field="*{receiverAddress}" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">发货状态：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="radio-box" th:each="dict : ${@dict.getType('delivery_status')}">
|
||||
<input type="radio" th:id="${'deliveryStatus_' + dict.dictCode}" name="deliveryStatus" th:value="${dict.dictValue}" th:field="*{deliveryStatus}" required>
|
||||
<label th:for="${'deliveryStatus_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">签收时间：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group date">
|
||||
<input name="signTime" th:value="${#dates.format(orderDelivery.signTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
|
||||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-6">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">备注：</label>
|
||||
<div class="col-sm-8">
|
||||
<textarea name="remark" class="form-control">[[*{remark}]]</textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<th:block th:include="include :: footer" />
|
||||
<th:block th:include="include :: datetimepicker-js" />
|
||||
<script th:inline="javascript">
|
||||
var prefix = ctx + "manage/delivery";
|
||||
var prefixOrder = ctx + "manage/order";
|
||||
$("#form-delivery-edit").validate({
|
||||
focusCleanup: true
|
||||
});
|
||||
$(function (){
|
||||
setTimeout( getOrderList(),500)
|
||||
|
||||
})
|
||||
function getOrderList() {
|
||||
$.operate.post(prefixOrder + "/list",{isTable:0}, function (res){
|
||||
orderList=res.rows
|
||||
var orderId=$("[name='orderId']").attr('orderid')
|
||||
orderList.forEach((ele)=>{
|
||||
if(ele.id==orderId){
|
||||
$("[name='orderName']").val(ele.orderName)
|
||||
$("[name='orderId']").val(ele.id)
|
||||
}
|
||||
})
|
||||
|
||||
})
|
||||
}
|
||||
function submitHandler() {
|
||||
if ($.validate.form()) {
|
||||
$.operate.save(prefix + "/edit", $('#form-delivery-edit').serialize());
|
||||
}
|
||||
}
|
||||
|
||||
$("input[name='deliveryDate']").datetimepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
minView: "month",
|
||||
autoclose: true
|
||||
});
|
||||
|
||||
$("input[name='signTime']").datetimepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
minView: "month",
|
||||
autoclose: true
|
||||
});
|
||||
function openList(){
|
||||
var options = {
|
||||
title: "关联合同",
|
||||
url: prefix + '/selectOrder',
|
||||
skin: 'layui-layer-gray',
|
||||
btn: true,
|
||||
btn: ['关闭'],
|
||||
yes:function(index){
|
||||
$.modal.close(index)
|
||||
},
|
||||
maxmin: false,
|
||||
full: false,
|
||||
index:1000
|
||||
};
|
||||
$.modal.openOptions(options)
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -4,12 +4,48 @@
|
|||
<th:block th:include="include :: header('关联合同')" />
|
||||
</head>
|
||||
<body class="gray-bg">
|
||||
<div class="col-sm-12 select-table table-striped" >
|
||||
<div>
|
||||
<form id="formId">
|
||||
<div class="select-list">
|
||||
<ul>
|
||||
<li>
|
||||
<label>合同编号：</label>
|
||||
<input type="text" name="orderCode"/>
|
||||
</li>
|
||||
<li>
|
||||
<label>合同名称：</label>
|
||||
<input type="text" name="orderName"/>
|
||||
</li>
|
||||
<li>
|
||||
<label>客户名称：</label>
|
||||
<input type="text" name="customerName"/>
|
||||
</li>
|
||||
<li>
|
||||
<label>合同类型：</label>
|
||||
<select name="orderType" th:with="type=${@dict.getType('order_type')}">
|
||||
<option value="">所有</option>
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
||||
</select>
|
||||
</li>
|
||||
<li>
|
||||
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
|
||||
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
<table id="bootstrap-table"></table>
|
||||
</div>
|
||||
<div class="col-sm-12 select-table table-striped" >
|
||||
<table id="bootstrap-table"></table>
|
||||
</div>
|
||||
|
||||
<th:block th:include="include :: footer" />
|
||||
|
||||
|
||||
<script>
|
||||
var prefixOrder = ctx + "manage/order";
|
||||
$(function() {
|
||||
|
|
@ -18,6 +54,8 @@
|
|||
showSearch:false,
|
||||
showColumns:false,
|
||||
showToggle:false,
|
||||
showRefresh:false,
|
||||
|
||||
showPageGo:true,
|
||||
params:{
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
.container {
|
||||
/*width: 100%;*/
|
||||
margin: 0;
|
||||
padding: 20px 0;
|
||||
padding: 10px 0;
|
||||
background-color: white;
|
||||
border-radius: 8px;
|
||||
display: flex;
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
display: flex;
|
||||
flex-direction: row;
|
||||
gap: 20px;
|
||||
margin: 20px 0;
|
||||
margin: 30px 0 10px;
|
||||
align-items: center;
|
||||
}
|
||||
.topBox .title{
|
||||
|
|
@ -77,10 +77,10 @@
|
|||
background: #ccc;
|
||||
}
|
||||
.table-striped thead th{
|
||||
padding: 8px;
|
||||
padding: 10px;
|
||||
}
|
||||
.table-striped tbody td{
|
||||
padding: 8px;
|
||||
padding: 10px;
|
||||
}
|
||||
.tabBtn{
|
||||
display: inline-block;
|
||||
|
|
@ -92,24 +92,23 @@
|
|||
<body class="gray-bg">
|
||||
<div class="col-sm-12 select-table table-striped" >
|
||||
<div class="topBox">
|
||||
<div class="title">单条查询</div>
|
||||
<div style="color: #dd242a">H3C产品保修条款</div>
|
||||
<div class="title">单条查询 <span>(不支持第三方信息查询)</span></div>
|
||||
<!-- <div style="color: #dd242a">H3C产品保修条款</div>-->
|
||||
</div>
|
||||
<p>(不支持第三方信息查询)</p>
|
||||
<div class="container">
|
||||
<div class="form-group">
|
||||
<label for="serialNumber">序列号</label>
|
||||
<input type="text" id="serialNumber" placeholder="请输入序列号">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="productCode">产品号</label>
|
||||
<input type="text" id="productCode" placeholder="请输入产品号">
|
||||
</div>
|
||||
<!-- <div class="form-group">-->
|
||||
<!-- <label for="productCode">产品号</label>-->
|
||||
<!-- <input type="text" id="productCode" placeholder="请输入产品号">-->
|
||||
<!-- </div>-->
|
||||
<button type="button" onclick="getData()">查询</button>
|
||||
|
||||
</div>
|
||||
<h2>查询结果</h2>
|
||||
<h4 style="margin-top: 20px;">产品信息</h4>
|
||||
<div style="font-size: 20px;text-align: left;width: 70vw;margin: 10px 0">查询结果</div>
|
||||
<div style="font-size: 16px;text-align: left;width: 70vw;font-weight: 600;">产品信息</div>
|
||||
<table class="tableBOx" id="tableBOx">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -126,7 +125,7 @@
|
|||
<div >
|
||||
<div style="margin: 20px 0;">
|
||||
<span id="btn1" class="tabBtn" onclick="changeTab(0)" style="background: #dd242a;color: #fff">合同</span>
|
||||
<!-- <span id="btn2" class="tabBtn" onclick="changeTab(1)">标准保修</span>-->
|
||||
<span id="btn2" class="tabBtn" onclick="changeTab(1)">标准保修</span>
|
||||
</div>
|
||||
<table class="tableBOx" id="tableBOx2">
|
||||
<thead>
|
||||
|
|
@ -149,11 +148,11 @@
|
|||
<table class="tableBOx" id="tableBOx3" style="display: none">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>硬件序列号</th>
|
||||
<th>产品号</th>
|
||||
<th>产品描述</th>
|
||||
<th>产品线描述</th>
|
||||
<th>区域</th>
|
||||
<th>服务项</th>
|
||||
<th>服务项描述</th>
|
||||
<th>开始时间</th>
|
||||
<th>结束时间</th>
|
||||
<th>状态</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -170,9 +169,7 @@
|
|||
});
|
||||
function getData() {
|
||||
let serialNumber=$('#serialNumber').val()
|
||||
let productCode=$('#productCode').val()
|
||||
|
||||
$.operate.get(`/system/product/query?productCode=${productCode}&serialNumber=${serialNumber}`, function (res){
|
||||
$.operate.get(`/system/product/product=${serialNumber}`, function (res){
|
||||
let str=`<tr><td colspan="5" style="text-align: center">暂无数据</td></tr>`
|
||||
if(res.data.length){
|
||||
str=``
|
||||
|
|
@ -188,14 +185,14 @@ let serialNumber=$('#serialNumber').val()
|
|||
}
|
||||
$('#tableBOx tbody').html(str)
|
||||
})
|
||||
$.operate.get(`/manage/order/query?productCode=${productCode}&serialNumber=${serialNumber}`, function (res){
|
||||
$.operate.get(`/manage/service/order=${serialNumber}`, function (res){
|
||||
let str=`<tr><td colspan="9" style="text-align: center">暂无数据</td></tr>`
|
||||
if(res.data.length){
|
||||
str=``
|
||||
res.data.forEach((ele)=>{
|
||||
str+=`<tr>
|
||||
<td></td>
|
||||
<td>${ele.orderType=='zq'?'直签合同':'代理合同'}</td>
|
||||
<td>${ele.orderType == 'zq' ? '直签合同' : '代理合同'}</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
|
|
@ -203,7 +200,7 @@ let serialNumber=$('#serialNumber').val()
|
|||
<td>${ele.createdAt}</td>
|
||||
<td></td>
|
||||
|
||||
<td>${ele.statua==0?'有效':'无效'}</td>
|
||||
<td>${ele.statua == 0 ? '有效' : '无效'}</td>
|
||||
|
||||
</tr>`
|
||||
})
|
||||
|
|
|
|||
Loading…
Reference in New Issue