调整修改

master
wangjiuyun 2025-05-21 10:45:34 +08:00
parent 4a3c292d14
commit 773a718c5b
9 changed files with 288 additions and 132 deletions

View File

@ -3,6 +3,11 @@
<head>
<th:block th:include="include :: header('新增发货记录')" />
<th:block th:include="include :: datetimepicker-css" />
<style>
.radio-box {
padding-right: 3px !important;
}
</style>
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -23,7 +28,7 @@
<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>
<input disabled name="deliveryCode" class="form-control" type="text" placeholder="保存后自动生成">
</div>
</div>
</div>
@ -52,42 +57,45 @@
<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">
<select name="logisticsCompany" class="form-control" th:with="type=${@dict.getType('logistics_company')}">
<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>
<label class="col-sm-4 control-label is-required">物流单号:</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>
<input name="logisticsCode" 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="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>

View File

@ -3,6 +3,11 @@
<head>
<th:block th:include="include :: header('修改发货记录')" />
<th:block th:include="include :: datetimepicker-css" />
<style>
.radio-box {
padding-right: 3px !important;
}
</style>
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -24,7 +29,7 @@
<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>
<input disabled name="deliveryCode" th:field="*{deliveryCode}" class="form-control" type="text" placeholder="保存后自动生成">
</div>
</div>
</div>
@ -53,42 +58,44 @@
<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">
<select name="logisticsCompany" class="form-control" th:field="*{logisticsCompany}" th:with="type=${@dict.getType('logistics_company')}">
<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>
<label class="col-sm-4 control-label is-required">物流单号:</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>
<input name="logisticsCode" th:field="*{logisticsCode}" 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="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>

View File

@ -3,6 +3,7 @@
<head>
<th:block th:include="include :: header('发货清单列表')" />
</head>
<body class="gray-bg">
<div class="col-sm-12 select-table table-striped" >
<input id="uploadInput" type="file" accept=".xls,.xlsx" style="display: none">

View File

@ -100,10 +100,10 @@
</div>
<div class="col-sm-6">
<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="customerCode" class="form-control" type="text" required
<input name="customerName" class="form-control" type="text" required
onclick="selectCustomer()">
<span class="input-group-addon" style="width: 40px !important;"><i
class="fa fa-search"></i></span>
@ -114,9 +114,9 @@
<div class="col-sm-6">
<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">
<input name="customerName" class="form-control" type="text" required>
<input readonly name="customerCode" class="form-control" type="text" required>
</div>
</div>
</div>
@ -255,7 +255,7 @@
title: '折扣',
width: 70,
formatter: function (value, row, index) {
var html = $.common.sprintf("<input class='form-control discount' type='number' name='orderListList[%s].discount' value='%s' step='0.1' max='1' min='0'>", index, value);
var html = $.common.sprintf("<input readonly class='form-control discount' type='number' name='orderListList[%s].discount' value='%s' step='0.1' max='1' min='0'>", index, value);
return html;
}
},
@ -314,6 +314,7 @@
title: '选择客户',
width: "680",
url: url,
height:'600',
callBack: doSubmitCustomer
};
$.modal.openOptions(options);
@ -325,6 +326,7 @@
title: '选择代表处',
width: "680",
url: url,
height:'600',
callBack: doSubmitAgent
};
$.modal.openOptions(options);
@ -335,6 +337,7 @@
var options = {
title: '选择代理商',
width: "680",
height:'600',
url: url,
callBack: doSubmitPartner
};
@ -384,18 +387,21 @@
}
function downloadTem() {
var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象
xhr.open('post', prefix + '/list/export', true); // 设置请求类型和URL
// 当请求完成时执行的回调函数
$.modal.loading("正在下载,请稍候...");
$.post(prefix + "/list/export", {}, function (result) {
if (result.code == web_status.SUCCESS) {
window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
} else if (result.code == web_status.WARNING) {
$.modal.alertWarning(result.msg)
} else {
$.modal.alertError(result.msg);
}
xhr.onload = function (data) {
const url = window.URL.createObjectURL(data.currentTarget.response)
const a=document.createElement('a')
a.href= url
a.download='合同清单模板.xlsx'
document.append(a)
a.click()
a.remove()
$.modal.closeLoading();
})
}
xhr.send();
}
document.getElementById('uploadInput').addEventListener('change', function (event) {
@ -445,6 +451,9 @@
let res = Number((price * quantity * discount).toFixed(2))
$(ele).parent().parent().find('.amount').val(res)
}
$('[name="versionCode"]').on('focus',function (){
$(this).blur()
})
</script>
</body>
</html>

View File

@ -107,7 +107,7 @@
<label class="col-sm-4 control-label is-required">客户编码:</label>
<div class="col-sm-8">
<div class="input-group">
<input name="customerCode" th:field="*{customerCode}" class="form-control" type="text"
<input name="customerName" th:field="*{customerName}" class="form-control" type="text"
required onclick="selectCustomer()">
<span class="input-group-addon" style="width: 40px !important;"><i
class="fa fa-search"></i></span>
@ -119,8 +119,9 @@
<div class="form-group">
<label class="col-sm-4 control-label is-required">客户名称:</label>
<div class="col-sm-8">
<input name="customerName" th:field="*{customerName}" class="form-control" type="text"
<input readonly name="customerCode" th:field="*{customerCode}" class="form-control" type="text"
required >
</div>
</div>
@ -206,6 +207,8 @@
title: '选择客户',
width: "680",
url: url,
height:'600',
callBack: doSubmitCustomer
};
$.modal.openOptions(options);
@ -217,6 +220,8 @@
title: '选择代表处',
width: "680",
url: url,
height:'600',
callBack: doSubmitAgent
};
$.modal.openOptions(options);
@ -228,6 +233,8 @@
title: '选择代理商',
width: "680",
url: url,
height:'600',
callBack: doSubmitPartner
};
$.modal.openOptions(options);
@ -317,17 +324,21 @@
});
function downloadTem() {
var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象
xhr.open('post', prefix + '/list/export', true); // 设置请求类型和URL
// 当请求完成时执行的回调函数
$.modal.loading("正在下载,请稍候...");
$.post(prefix + "/list/export", {}, function (result) {
if (result.code == web_status.SUCCESS) {
window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
} else if (result.code == web_status.WARNING) {
$.modal.alertWarning(result.msg)
} else {
$.modal.alertError(result.msg);
}
xhr.onload = function (data) {
const url = window.URL.createObjectURL(data.currentTarget.response)
const a=document.createElement('a')
a.href= url
a.download='合同清单模板.xlsx'
document.append(a)
a.click()
a.remove()
$.modal.closeLoading();
})
}
xhr.send();
}
@ -411,7 +422,7 @@
align: 'center',
title: '折扣',
formatter: function (value, row, index) {
var html = $.common.sprintf("<input class='form-control discount' type='number' name='orderListList[%s].discount' value='%s' step='0.1' max='1' min='0'>", index, value);
var html = $.common.sprintf("<input readonly class='form-control discount' type='number' name='orderListList[%s].discount' value='%s' step='0.1' max='1' min='0'>", index, value);
return html;
}
},
@ -444,6 +455,9 @@
$(this).blur()
})
}
$('[name="versionCode"]').on('focus',function (){
$(this).blur()
})
</script>
</body>
</html>

View File

@ -3,10 +3,47 @@
<head>
<th:block th:include="include :: header('选择代表处')"/>
</head>
<style>
.select-list li{
display: inline-block;
}
.select-list li label{
width: 88px !important;
}
</style>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>办事处编码:</label>
<input type="text" name="agentCode"/>
</li>
<li>
<label>办公处名称:</label>
<input type="text" name="agentName"/>
</li>
<li style="width: 95%;text-align: right">
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer"/>
@ -15,12 +52,13 @@
$(function () {
var options = {
url: prefix + "/list",
showSearch:false,
showSearch: true,
showColumns: false,
showToggle: false,
showPageGo: true,
params:{
},
showRefresh: false,
search: false,
params: {},
columns: [{
radio: true
},
@ -44,6 +82,7 @@
};
$.table.init(options);
});
function getSelections() {
var rows = $('#bootstrap-table').bootstrapTable('getSelections');
return rows;

View File

@ -3,10 +3,50 @@
<head>
<th:block th:include="include :: header('选择客户')"/>
</head>
<style>
.select-list li {
display: inline-block;
}
.select-list li label {
width: 88px !important;
}
</style>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>客户编码:</label>
<input type="text" name="customerCode"/>
</li>
<li>
<label>客户名称:</label>
<input type="text" name="customerName"/>
</li>
<li>
<label>联系人:</label>
<input type="text" name="contactPerson"/>
</li>
<li style="width: 46%;text-align: right;">
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer"/>
@ -15,12 +55,13 @@
$(function () {
var options = {
url: prefix + "/list",
showSearch:false,
showSearch: true,
showColumns: false,
showToggle: false,
showPageGo: true,
params:{
},
showRefresh: false,
search: false,
params: {},
columns: [{
radio: true
},
@ -64,6 +105,7 @@
};
$.table.init(options);
});
function getSelections() {
var rows = $('#bootstrap-table').bootstrapTable('getSelections');
return rows;

View File

@ -3,10 +3,52 @@
<head>
<th:block th:include="include :: header('选择代理商')"/>
</head>
<style>
.select-list li{
display: inline-block;
}
.select-list li label{
width: 88px !important;
}
</style>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>代理商编码:</label>
<input type="text" name="partnerCode"/>
</li>
<li>
<label>代理商名称:</label>
<input type="text" name="partnerName"/>
</li>
<li>
<label>认证级别:</label>
<select name="level" th:with="type=${@dict.getType('identify_level')}">
<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>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer"/>
@ -16,12 +58,13 @@
$(function () {
var options = {
url: prefix + "/list",
showSearch:false,
showSearch: true,
showColumns: false,
showToggle: false,
showPageGo: true,
params:{
},
showRefresh: false,
search: false,
params: {},
columns: [{
radio: true
},
@ -57,6 +100,7 @@
};
$.table.init(options);
});
function getSelections() {
var rows = $('#bootstrap-table').bootstrapTable('getSelections');
return rows;

View File

@ -54,14 +54,6 @@
<label>创建时间:</label>
<input type="text" class="time-input" placeholder="请选择创建时间" name="createAt"/>
</li>
<!-- <li>-->
<!-- <label>更新时间:</label>-->
<!-- <input type="text" class="time-input" placeholder="请选择更新时间" name="updateAt"/>-->
<!-- </li>-->
<!-- <li>-->
<!-- <label>删除时间:</label>-->
<!-- <input type="text" class="time-input" placeholder="请选择删除时间" name="deleteAt"/>-->
<!-- </li>-->
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>