mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单基本完成

master
wangjiuyun 2025-06-09 14:17:32 +08:00
parent 543dfc25f8
commit e6e41c6da0
10 changed files with 428 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
View File

@ -931,7 +931,10 @@ var table = {
}, },
success: function () { success: function () {
$(':focus').blur(); $(':focus').blur();
} },
end: function () {
$.common.isEmpty(options.end) ? '' : options.end();
},
}, btnCallback)); }, btnCallback));
if ($.common.isNotEmpty(options.full) && options.full === true) { if ($.common.isNotEmpty(options.full) && options.full === true) {
top.layer.full(index); top.layer.full(index);

103
ruoyi-admin/src/main/resources/templates/project/info/add.html
View File

@ -66,9 +66,22 @@
input, textarea, .productTable td { input, textarea, .productTable td {
position: relative; position: relative;
} }
.productTable label[id*="iscount"] { .productTable label[id*="iscount"] {
top: -30px !important; top: -30px !important;
} }
table tr:nth-child(odd) {
background: #f3f3f3;
}
input[type=checkbox], input[type=radio] {
margin-top: 0;
}
label {
margin-bottom: 0 !important;
}
</style> </style>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -77,15 +90,15 @@
<table> <table>
<tr> <tr>
<td class="shortTd">项目编码<span class="is-required">*</span></td> <td class="shortTd">项目编码<span class="is-required">*</span></td>
<td><input type="text" name="projectCode" class="form-control" placeholder="保存后自动生成" readonly> <td><input type="text" name="projectCode" class="form-control" placeholder="保存后自动生成"
readonly>
</td> </td>
<td class="shortTd">项目名称<span class="is-required">*</span></td> <td class="shortTd">项目名称<span class="is-required">*</span></td>
<td><input type="text" name="projectName" maxlength="40" placeholder="限制40个字符" <td><input type="text" name="projectName" maxlength="40" placeholder="限制40个字符"
class="form-control"></td> class="form-control"></td>
<td class="shortTd">最终客户<span class="is-required">*</span></td> <td>预计金额(元)<span class="is-required">*</span></td>
<td><input name="customerName" class="form-control" type="text" required onclick="selectCustomer()"> <td><input type="number" name="estimatedAmount" class="form-control" required></td>
<input name="customerCode" class="form-control" type="hidden"></td>
</tr>
<tr> <tr>
<td class="shortTd">BG<span class="is-required">*</span></td> <td class="shortTd">BG<span class="is-required">*</span></td>
<td> <td>
@ -137,6 +150,18 @@
onclick="selectPeople()"> onclick="selectPeople()">
<input name="hzSupportUser" class="form-control" type="hidden"></td> <input name="hzSupportUser" class="form-control" type="hidden"></td>
</tr> </tr>
<tr>
<td class="shortTd">最终客户<span class="is-required">*</span></td>
<td><input name="customerName" class="form-control" type="text" required onclick="selectCustomer()">
<input name="customerCode" class="form-control" type="hidden"></td>
<td class="shortTd">联系人</td>
<td><input name=" customerUserName" class="form-control" type="text">
</td>
<td class="shortTd">联系方式</td>
<td><input name="customerPhone" class="form-control" type="text">
</td>
</tr>
</tr>
<tr> <tr>
<td>合作渠道</td> <td>合作渠道</td>
<td> <td>
@ -158,30 +183,46 @@
<td><input type="text" name="contactWay" class="form-control" placeholder="姓名+电话"></td> <td><input type="text" name="contactWay" class="form-control" placeholder="姓名+电话"></td>
</tr> </tr>
<tr> <tr>
<td>预计金额(元)<span class="is-required">*</span></td>
<td><input type="number" name="estimatedAmount" class="form-control" required></td>
<td>预计下单时间</td> <td>预计下单时间</td>
<td><input name="estimatedOrderTime" class="form-control" placeholder="yyyy-MM-dd"> <td><input name="estimatedOrderTime" class="form-control" placeholder="yyyy-MM-dd">
</td> </td>
<td>预计发货时间</td> <td>预计发货时间</td>
<td><input name="estimatedDeliverTime" class="form-control" placeholder="yyyy-MM-dd" <td><input name="estimatedDeliverTime" class="form-control" placeholder="yyyy-MM-dd"
></td> ></td>
<td>POC测试</td>
<td>
<select name="countryProduct" class="form-control">
<option value="">请选择</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</td>
</tr> </tr>
<tr> <tr>
<td>竞争对手</td> <td>竞争对手</td>
<td colspan="5" class="checkbox-group"> <td colspan="3" class="checkbox-group">
<div class="checkbox-box"> <div class="checkbox-box">
<label><input type="checkbox" name="competitorList[0]" value="华为">华为</label> <label><input type="checkbox" name="competitorList[0]" value="华为">华为</label>
<label><input type="checkbox" name="competitorList[1]" value="锐捷">锐捷</label> <label><input type="checkbox" name="competitorList[1]" value="锐捷">锐捷</label>
<label><input type="checkbox" name="competitorList[2]" value="深信服">深信服</label> <label><input type="checkbox" name="competitorList[2]" value="深信服">深信服</label>
<label><input type="checkbox" name="competitorList[3]" value="中兴">中兴</label> <label><input type="checkbox" name="competitorList[3]" value="中兴">中兴</label>
<label><input type="checkbox" name="competitorList[4]" value="曙云">曙云</label> <label><input type="checkbox" name="competitorList[4]" value="曙云">曙云</label>
<div style="float: right;display: flex;flex-display:row;align-items: center">
<span>其它：</span><input type="text" name="competitorList[5]" class="form-control"
style="width: 400px">
</div>
</div> </div>
<div>
其它：<input type="text" name="competitorList[5]" class="form-control" style="width: 400px"> </td>
</div> <td>是否国产</td>
<td>
<select name="countryProduct" class="form-control">
<option value="">请选择</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -196,8 +237,13 @@
placeholder="限制200个字符"></textarea> placeholder="限制200个字符"></textarea>
</td> </td>
</tr> </tr>
</table> <tr>
<td>服务器配置</td>
<td colspan="5"><textarea name="serverConfiguration" class="form-control" maxlength="200"
placeholder="限制200个字符"></textarea></td>
</tr>
</table>
<div class="section-title">配置信息</div> <div class="section-title">配置信息</div>
<h3>软件</h3> <h3>软件</h3>
<button type="button" class="add-btn" onclick="addProduct()">添加</button> <button type="button" class="add-btn" onclick="addProduct()">添加</button>
@ -268,26 +314,13 @@
<tbody> <tbody>
</tbody> </tbody>
</table> </table>
<div> <div class="layui-tab">
<table> <ul class="layui-tab-title">
<tr> <li class="layui-this" lay-id="11">工作进度</li>
<td>服务器配置</td> <li lay-id="22">POC测试</li>
<td><textarea name="serverConfiguration" class="form-control" maxlength="200" </ul>
placeholder="限制200个字符"></textarea></td> <div class="layui-tab-content">
<td>是否国产</td> <div class="layui-tab-item layui-show">
<td>
<select name="countryProduct" class="form-control">
<option value="">请选择</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</td>
</tr>
</table>
</div>
<div class="section-title">工作进度</div>
<button type="button" class="add-btn" onclick="addLog()">添加</button> <button type="button" class="add-btn" onclick="addLog()">添加</button>
<table id="workLog"> <table id="workLog">
<thead> <thead>
@ -301,6 +334,10 @@
<tbody></tbody> <tbody></tbody>
<!-- 可动态添加行 --> <!-- 可动态添加行 -->
</table> </table>
</div>
<div class="layui-tab-item"></div>
</div>
</div>
</form> </form>
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>

105
ruoyi-admin/src/main/resources/templates/project/info/edit.html
View File

@ -66,9 +66,22 @@
input, textarea, .productTable td { input, textarea, .productTable td {
position: relative; position: relative;
} }
.productTable label[id*="iscount"] { .productTable label[id*="iscount"] {
top: -30px !important; top: -30px !important;
} }
table tr:nth-child(odd) {
background: #f3f3f3;
}
input[type=checkbox], input[type=radio] {
margin-top: 0;
}
label {
margin-bottom: 0 !important;
}
</style> </style>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -85,10 +98,9 @@
<td><input type="text" th:field="*{projectName}" name="projectName" maxlength="40" <td><input type="text" th:field="*{projectName}" name="projectName" maxlength="40"
placeholder="限制40个字符" placeholder="限制40个字符"
class="form-control"></td> class="form-control"></td>
<td class="shortTd">最终客户<span class="is-required">*</span></td> <td>预计金额（RMB）<span class="is-required">*</span></td>
<td><input name="customerName" th:field="*{customerName}" class="form-control" type="text" required <td><input type="number" name="estimatedAmount" class="form-control" th:field="*{estimatedAmount}"
onclick="selectCustomer()"> required></td>
<input name="customerCode" th:field="*{customerCode}" class="form-control" type="hidden"></td>
</tr> </tr>
<tr> <tr>
<td class="shortTd">BG<span class="is-required">*</span></td> <td class="shortTd">BG<span class="is-required">*</span></td>
@ -143,6 +155,18 @@
onclick="selectPeople()" th:field="*{hzSupportUserName}"> onclick="selectPeople()" th:field="*{hzSupportUserName}">
<input name="hzSupportUser" class="form-control" type="hidden" th:field="*{hzSupportUser}"></td> <input name="hzSupportUser" class="form-control" type="hidden" th:field="*{hzSupportUser}"></td>
</tr> </tr>
<tr>
<td class="shortTd">最终客户<span class="is-required">*</span></td>
<td><input name="customerName" class="form-control" th:field="*{customerName}" type="text" required
onclick="selectCustomer()">
<input name="customerCode" class="form-control" th:field="*{customerCode}" type="hidden"></td>
<td class="shortTd">联系人</td>
<td><input name=" customerUserName" class="form-control" type="text" th:field="*{customerUserName}">
</td>
<td class="shortTd">联系方式</td>
<td><input name="customerPhone" class="form-control" type="text" th:field="*{customerPhone}">
</td>
</tr>
<tr> <tr>
<td>合作渠道</td> <td>合作渠道</td>
<td> <td>
@ -165,9 +189,7 @@
th:field="*{contactWay}"></td> th:field="*{contactWay}"></td>
</tr> </tr>
<tr> <tr>
<td>预计金额（RMB）<span class="is-required">*</span></td>
<td><input type="number" name="estimatedAmount" class="form-control" th:field="*{estimatedAmount}"
required></td>
<td>预计下单时间</td> <td>预计下单时间</td>
<td><input name="estimatedOrderTime" class="form-control" placeholder="yyyy-MM-dd" <td><input name="estimatedOrderTime" class="form-control" placeholder="yyyy-MM-dd"
th:value="${#dates.format(projectInfo.estimatedOrderTime, 'yyyy-MM-dd')}"> th:value="${#dates.format(projectInfo.estimatedOrderTime, 'yyyy-MM-dd')}">
@ -175,24 +197,38 @@
<td>预计发货时间</td> <td>预计发货时间</td>
<td><input name="estimatedDeliverTime" class="form-control" placeholder="yyyy-MM-dd" <td><input name="estimatedDeliverTime" class="form-control" placeholder="yyyy-MM-dd"
th:value="${#dates.format(projectInfo.estimatedDeliverTime, 'yyyy-MM-dd')}"></td> th:value="${#dates.format(projectInfo.estimatedDeliverTime, 'yyyy-MM-dd')}"></td>
<td>POC测试</td>
<td>
<select name="countryProduct" class="form-control" th:field="*{countryProduct}" readonly="">
<option value="">根据POC记录变化</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</td>
</tr> </tr>
<tr> <tr>
<td>竞争对手</td> <td>竞争对手</td>
<td colspan="5" class="checkbox-group"> <td colspan="3" class="checkbox-group">
<div class="checkbox-box"> <div class="checkbox-box">
<label><input type="checkbox" name="competitorList[0]" value="华为">华为</label> <label><input type="checkbox" name="competitorList[0]" value="华为">华为</label>
<label><input type="checkbox" name="competitorList[1]" value="锐捷">锐捷</label> <label><input type="checkbox" name="competitorList[1]" value="锐捷">锐捷</label>
<label><input type="checkbox" name="competitorList[2]" value="深信服">深信服</label> <label><input type="checkbox" name="competitorList[2]" value="深信服">深信服</label>
<label><input type="checkbox" name="competitorList[3]" value="中兴">中兴</label> <label><input type="checkbox" name="competitorList[3]" value="中兴">中兴</label>
<label><input type="checkbox" name="competitorList[4]" value="曙云">曙云</label> <label><input type="checkbox" name="competitorList[4]" value="曙云">曙云</label>
<div style="float: right;display: flex;flex-display:row;align-items: center">
<span>其它：</span><input type="text" name="competitorList[5]" class="form-control"
style="width: 400px">
</div> </div>
<div>
其它：<input type="text" name="competitorList[5]"
class="form-control" style="width: 400px">
</div> </div>
</td> </td>
<td>是否国产</td>
<td>
<select name="countryProduct" class="form-control" th:field="*{countryProduct}">
<option value="">请选择</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</td>
</tr> </tr>
<tr> <tr>
<td>关键技术问题</td> <td>关键技术问题</td>
@ -207,6 +243,12 @@
placeholder="限制200个字符" th:field="*{projectDesc}"></textarea> placeholder="限制200个字符" th:field="*{projectDesc}"></textarea>
</td> </td>
</tr> </tr>
<tr>
<td>服务器配置</td>
<td colspan="5"><textarea name="serverConfiguration" class="form-control" maxlength="200"
placeholder="限制200个字符" th:field="*{serverConfiguration}"></textarea></td>
</tr>
</table> </table>
<div class="section-title">配置信息</div> <div class="section-title">配置信息</div>
@ -279,26 +321,14 @@
<tbody> <tbody>
</tbody> </tbody>
</table> </table>
<div> <div class="layui-tab">
<table> <ul class="layui-tab-title">
<tr> <li class="layui-this" lay-id="11">工作进度</li>
<td>服务器配置</td> <li lay-id="22">操作日志</li>
<td><textarea name="serverConfiguration" class="form-control" maxlength="200" <li lay-id="33">POC测试</li>
placeholder="限制200个字符" th:field="*{serverConfiguration}"></textarea></td> </ul>
<td>是否国产</td> <div class="layui-tab-content">
<td> <div class="layui-tab-item layui-show">
<select name="countryProduct" class="form-control" th:field="*{countryProduct}">
<option value="">请选择</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</td>
</tr>
</table>
</div>
<div class="section-title">工作进度</div>
<button type="button" class="add-btn" onclick="addLog({})">添加</button> <button type="button" class="add-btn" onclick="addLog({})">添加</button>
<table id="workLog"> <table id="workLog">
<thead> <thead>
@ -312,7 +342,8 @@
<tbody></tbody> <tbody></tbody>
<!-- 可动态添加行 --> <!-- 可动态添加行 -->
</table> </table>
<div class="section-title">操作日志</div> </div>
<div class="layui-tab-item">
<table id="sysLog"> <table id="sysLog">
<thead> <thead>
<tr> <tr>
@ -324,6 +355,12 @@
</thead> </thead>
<tbody></tbody> <tbody></tbody>
</table> </table>
</div>
<div class="layui-tab-item">
</div>
</div>
</div>
</form> </form>
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>

11
ruoyi-admin/src/main/resources/templates/project/info/project.html
View File

@ -417,11 +417,12 @@
yes: function (index, layero) { yes: function (index, layero) {
let body = parent.layer.getChildFrame('body', index) let body = parent.layer.getChildFrame('body', index)
if ($(body.find('#form-order-add').get(0)).validate().form()) { if ($(body.find('#form-order-add').get(0)).validate().form()) {
$.operate.save( ctx + "project/order/add", body.find('#form-order-add').serialize(), function (res) { layero.find('iframe')[0].contentWindow.saveSelect()
if (res.code == web_status.SUCCESS) { // $.operate.save( ctx + "project/order/add", body.find('#form-order-add').serialize(), function (res) {
parent.layer.close(index) // if (res.code == web_status.SUCCESS) {
} // parent.layer.close(index)
}); // }
// });
}else{ }else{
$.modal.alertWarning("请完善表单"); $.modal.alertWarning("请完善表单");

3
ruoyi-admin/src/main/resources/templates/project/info/selectAgent.html
View File

@ -61,6 +61,9 @@
full: false, full: false,
index: 1000, index: 1000,
width: 800, width: 800,
end:function(){
window.localStorage.removeItem('layerTable')
},
yes: function (index, layero) { yes: function (index, layero) {
let body = parent.layer.getChildFrame('body', index) let body = parent.layer.getChildFrame('body', index)
if ($(body.find('#form-agent-add').get(0)).validate().form()) { if ($(body.find('#form-agent-add').get(0)).validate().form()) {

3
ruoyi-admin/src/main/resources/templates/project/info/selectCustomer.html
View File

@ -76,6 +76,9 @@
full: false, full: false,
index: 1000, index: 1000,
width: 800, width: 800,
end:function(){
window.localStorage.removeItem('layerTable')
},
yes: function (index, layero) { yes: function (index, layero) {
let body = parent.layer.getChildFrame('body', index) let body = parent.layer.getChildFrame('body', index)
if ($(body.find('#form-info-add').get(0)).validate().form()) { if ($(body.find('#form-info-add').get(0)).validate().form()) {

3
ruoyi-admin/src/main/resources/templates/project/info/selectPartner.html
View File

@ -67,6 +67,9 @@
full: false, full: false,
index: 1000, index: 1000,
width: 800, width: 800,
end:function(){
window.localStorage.removeItem('layerTable')
},
yes: function (index, layero) { yes: function (index, layero) {
let body = parent.layer.getChildFrame('body', index) let body = parent.layer.getChildFrame('body', index)
if ($(body.find('#form-partner-add').get(0)).validate().form()) { if ($(body.find('#form-partner-add').get(0)).validate().form()) {

82
ruoyi-admin/src/main/resources/templates/project/order/add.html
View File

@ -75,9 +75,24 @@
margin-left: 20px; margin-left: 20px;
display: inline-block; display: inline-block;
} }
.productTable label[id*="iscount"] { .productTable label[id*="iscount"] {
top: -30px !important; top: -30px !important;
} }
table tr:nth-child(odd) {
background: #f3f3f3;
}
.saveBox {
padding: 30px 40px;
width: 300px;
}
.saveRemark {
font-size: 10px;
color: #999999;
}
</style> </style>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -89,6 +104,8 @@
<td> <td>
<input name="projectId" class="form-control" type="hidden"> <input name="projectId" class="form-control" type="hidden">
<input name="orderId" class="form-control" type="hidden"> <input name="orderId" class="form-control" type="hidden">
<input name="processType" value="0" class="form-control" type="hidden">
<input name="orderStatus" value="1" class="form-control" type="hidden">
<input type="text" name="projectCode" placeholder="请选择" class="form-control" <input type="text" name="projectCode" placeholder="请选择" class="form-control"
onclick="searchProject()"> onclick="searchProject()">
</td> </td>
@ -187,9 +204,9 @@
</tr> </tr>
<tr> <tr>
<td>汇智责任人</td> <td>汇智责任人</td>
<td><input name="duty" class="form-control" type="text" <td><input name="dutyName" class="form-control" type="text"
onclick="selectPeople()"> onclick="selectPeople()">
<!-- <input name="duty" class="form-control" type="hidden"></td>--> <input name="duty" class="form-control" type="hidden"></td>
<td>Email</td> <td>Email</td>
<td><input type="text" name="dutyEmail" <td><input type="text" name="dutyEmail"
class="form-control"></td> class="form-control"></td>
@ -225,7 +242,7 @@
</tr> </tr>
<tr> <tr>
<td>进货商联系人</td> <td>进货商联系人</td>
<td><input name="partnerName" class="form-control" type="text"></td> <td><input name="partnerUserName" class="form-control" type="text"></td>
<td>Email</td> <td>Email</td>
<td><input type="text" name="partnerEmail" <td><input type="text" name="partnerEmail"
class="form-control"></td> class="form-control"></td>
@ -406,9 +423,39 @@
} }
function saveSelect() {
var options = {
title: "确认并提交订单",
maxmin: false,
full: false,
type: 1,
btn: ['确认', '取消'],
content: `
<div class="saveBox">
<div><input type="radio" name="saveType" checked onclick="changeSaveType(0)">电子订单流程</div>
<div class="saveRemark">进货商已经签订框架协议</div>
<div><input type="radio" name="saveType" onclick="changeSaveType(1)">纸质合同流程</div>
<div class="saveRemark">进货商未签订框架协议</div>
<div style="margin-top: 10px"><span style="margin-right: 5px;">保存草稿</span><input type="radio" name="orderCheck" checked onclick="changeStatus(1)"><span>否</span>&nbsp;&nbsp;<input type="radio" name="orderCheck" onclick="changeStatus(0)"><span>是</span></div>
</div>
`,
yes: function (index, layero) {
$.operate.save(prefix + "/add", $('#form-order-add').serialize());
},
};
layer.open(options)
}
function changeSaveType(val) {
$('[name="processType"]').val(val)
}
function changeStatus(val) {
$('[name="orderStatus"]').val(val)
}
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-order-add').serialize()); saveSelect()
} else { } else {
$.modal.alertWarning("请完善表单"); $.modal.alertWarning("请完善表单");
} }
@ -501,7 +548,7 @@
function selectPeople() { function selectPeople() {
var url = prefix + "/selectPeople"; var url = prefix + "/selectPeople";
var options = { var options = {
title: '选择代理商', title: '选择责任人',
width: "680", width: "680",
height: '600', height: '600',
url: url, url: url,
@ -540,7 +587,7 @@
$('[name="partnerCode"]').val(rows[0].partnerCode); $('[name="partnerCode"]').val(rows[0].partnerCode);
$('[name="partnerName"]').val(rows[0].partnerName); $('[name="partnerName"]').val(rows[0].partnerName);
$('[name="level"]').val(rows[0].level); $('[name="level"]').val(rows[0].level);
$('[name="partnerPeople"]').val(rows[0].contactPerson); $('[name="partnerUserName"]').val(rows[0].contactPerson);
$('[name="partnerPhone"]').val(rows[0].contactPhone); $('[name="partnerPhone"]').val(rows[0].contactPhone);
@ -550,11 +597,11 @@
function doSubmitPeople(index, layero) { function doSubmitPeople(index, layero) {
var rows = layero.find("iframe")[0].contentWindow.getSelections(); var rows = layero.find("iframe")[0].contentWindow.getSelections();
if (rows.length == 0) { if (rows.length == 0) {
$.modal.alertWarning("请选择一个代理商"); $.modal.alertWarning("请选择一个责任人");
return; return;
} }
// $('[name="duty"]').val(rows[0].userId); $('[name="duty"]').val(rows[0].userId);
$('[name="duty"]').val(rows[0].userName); $('[name="dutyName"]').val(rows[0].userName);
$('[name="dutyPhone"]').val(rows[0].phonenumber); $('[name="dutyPhone"]').val(rows[0].phonenumber);
$('[name="dutyEmail"]').val(rows[0].email); $('[name="dutyEmail"]').val(rows[0].email);
@ -891,7 +938,7 @@ ${
<input value="${data.fileName || ''}" name="contractFileList[${length}].fileName" readonly class="form-control"></td> <input value="${data.fileName || ''}" name="contractFileList[${length}].fileName" readonly class="form-control"></td>
<td><input value="${data.createByName || ''}" name="contractFileList[${length}].createBy" readonly class="form-control"></td> <td><input value="${data.createByName || ''}" name="contractFileList[${length}].createBy" readonly class="form-control"></td>
<td><input value="${data.uploadTime || ''}" name="contractFileList[${length}].uploadTime" readonly class="form-control" ></td> <td><input value="${data.uploadTime || ''}" name="contractFileList[${length}].uploadTime" readonly class="form-control" ></td>
<td><span style="cursor:pointer;color: #1686d8;margin-right: 5px;" onclick="preview('${data.filePath}')">预览</span><span style="cursor:pointer;color: #1686d8;margin-right: 5px;" onclick="downFile('${data.filePath}')">下载</span><span style="cursor:pointer;color: #dd242a" class="delfile">删除</span></td> <td><span style="cursor:pointer;color: #1686d8;margin-right: 5px;" onclick="preview('${data.filePath}','${data.fileName}')">预览</span><span style="cursor:pointer;color: #1686d8;margin-right: 5px;" onclick="downFile('${data.filePath}','${data.fileName}')">下载</span><span style="cursor:pointer;color: #dd242a" class="delfile">删除</span></td>
</tr>`) </tr>`)
$('#fileBox tbody').append(tr) $('#fileBox tbody').append(tr)
$('.delfile').on('click', function () { $('.delfile').on('click', function () {
@ -918,16 +965,15 @@ ${
}) })
} }
function downFile(filePath) { function downFile(filePath, fileName) {
$.operate.get(prefix + `/file/download?filePath=${filePath}`, function (res) { window.location.href = prefix + `/file/download?filePath=` + encodeURI(filePath) + '&fileName=' + encodeURI(fileName);
window.location.href = res.data
})
} }
function preview(filePath) { function preview(filePath, fileName) {
$.operate.get(prefix + `/file/download?filePath=${filePath}`, function (res) { let iframe = window.open('', 'iframe')
window.open(res.data) let url = ctx+prefix + `/file/download?filePath=` + encodeURI(filePath) + '&fileName=' + encodeURI(fileName)
}) iframe.document.write(`<iframe src='${url}' style="width: 100%;height
:100%">`)
} }
</script> </script>
</body> </body>

146
ruoyi-admin/src/main/resources/templates/project/order/edit.html
View File

@ -46,12 +46,6 @@
cursor: pointer; cursor: pointer;
} }
.checkbox-box {
display: flex;
flex-direction: row;
gap: 10px;
}
.checkbox-box label { .checkbox-box label {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -75,9 +69,24 @@
margin-left: 20px; margin-left: 20px;
display: inline-block; display: inline-block;
} }
.productTable label[id*="iscount"] { .productTable label[id*="iscount"] {
top: -30px !important; top: -30px !important;
} }
table tr:nth-child(odd) {
background: #f3f3f3;
}
.saveBox {
padding: 30px 40px;
width: 300px;
}
.saveRemark {
font-size: 10px;
color: #999999;
}
</style> </style>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -89,6 +98,9 @@
<td> <td>
<input name="projectId" class="form-control" type="hidden" th:field="*{projectId}"> <input name="projectId" class="form-control" type="hidden" th:field="*{projectId}">
<input name="id" class="form-control" type="hidden" th:field="*{id}"> <input name="id" class="form-control" type="hidden" th:field="*{id}">
<input name="processType" class="form-control" type="hidden" th:field="*{processType}">
<input name="orderStatus" class="form-control" type="hidden" th:field="*{orderStatus}">
<input type="text" name="projectCode" th:field="*{projectCode}" placeholder="请选择" <input type="text" name="projectCode" th:field="*{projectCode}" placeholder="请选择"
class="form-control" class="form-control"
onclick="searchProject()"> onclick="searchProject()">
@ -100,18 +112,17 @@
<td><input name="customerName" class="form-control" th:field="*{customerName}" type="text" readonly <td><input name="customerName" class="form-control" th:field="*{customerName}" type="text" readonly
placeholder="选择项目后带入" placeholder="选择项目后带入"
required> required>
<!-- <input name="customerCode" class="form-control" th:field="*{customerCode}" type="hidden"></td>-->
</tr> </tr>
<tr> <tr>
<td>BG<span class="is-required">*</span></td> <td>BG<span class="is-required">*</span></td>
<td> <td>
<!-- <select name="bgProperty" class="form-control" th:field="*{bgProperty}"--> <select name="bgProperty" class="form-control" th:field="*{bgProperty}"
<!-- th:with="type=${@dict.getType('bg_type')}"--> th:with="type=${@dict.getType('bg_type')}"
<!-- readonly required>--> readonly required>
<!-- <option value="">请选择BG</option>--> <option value="">请选择BG</option>
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}"--> <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
<!-- th:value="${dict.dictValue}"></option>--> th:value="${dict.dictValue}"></option>
<!-- </select>--> </select>
</td> </td>
<td>行业<span class="is-required">*</span></td> <td>行业<span class="is-required">*</span></td>
<td id="industryTypeBox"> <td id="industryTypeBox">
@ -122,8 +133,7 @@
</td> </td>
<td>代表处<span class="is-required">*</span></td> <td>代表处<span class="is-required">*</span></td>
<td colspan="3"> <td colspan="3">
<!-- <input name="agentName" class="form-control" th:field="*{agentName}" type="text" readonly required>--> <input name="agentName" class="form-control" th:field="*{agentName}" type="text" readonly required>
<!-- <input name="agentCode" class="form-control" th:field="*{agentCode}" type="hidden">-->
</td> </td>
</tr> </tr>
<tr> <tr>
@ -163,7 +173,9 @@
</td> </td>
<td>执行单有效截止时间<span class="is-required">*</span></td> <td>执行单有效截止时间<span class="is-required">*</span></td>
<td colspan="3"> <td colspan="3">
<input name="orderEndTime" class="form-control" th:value="${#dates.format(projectOrderInfo.orderEndTime, 'yyyy-MM-dd')}" placeholder="yyyy-MM-dd" <input name="orderEndTime" class="form-control"
th:value="${#dates.format(projectOrderInfo.orderEndTime, 'yyyy-MM-dd')}"
placeholder="yyyy-MM-dd"
required> required>
</td> </td>
</tr> </tr>
@ -171,7 +183,9 @@
<td>要求到货时间<span class="is-required">*</span></td> <td>要求到货时间<span class="is-required">*</span></td>
<td> <td>
<input name="deliveryTime" class="form-control" th:value="${#dates.format(projectOrderInfo.deliveryTime, 'yyyy-MM-dd')}" placeholder="yyyy-MM-dd" <input name="deliveryTime" class="form-control"
th:value="${#dates.format(projectOrderInfo.deliveryTime, 'yyyy-MM-dd')}"
placeholder="yyyy-MM-dd"
required> required>
</td> </td>
<td>公司直发</td> <td>公司直发</td>
@ -198,9 +212,9 @@
</tr> </tr>
<tr> <tr>
<td>汇智责任人</td> <td>汇智责任人</td>
<td><input name="duty" class="form-control" type="text" <td><input name="dutyName" class="form-control" type="text"
onclick="selectPeople()"> onclick="selectPeople()" th:field="*{dutyName}">
<!-- <input name="duty" class="form-control" th:field="*{duty}" type="hidden">--> <input name="duty" class="form-control" th:field="*{duty}" type="hidden">
</td> </td>
<td>Email</td> <td>Email</td>
<td><input type="text" name="dutyEmail" th:field="*{dutyEmail}" <td><input type="text" name="dutyEmail" th:field="*{dutyEmail}"
@ -235,16 +249,16 @@
</select> </select>
</td> </td>
</tr> </tr>
<!-- <tr>--> <tr>
<!-- <td>进货商联系人</td>--> <td>进货商联系人</td>
<!-- <td><input name="partnerPeople" class="form-control" type="text" th:field="*{partnerName}"></td>--> <td><input name="partnerUserName" class="form-control" type="text" th:field="*{partnerUserName}"></td>
<!-- <td>Email</td>--> <td>Email</td>
<!-- <td><input type="text" name="partnerEmail" th:field="*{partnerEmail}"--> <td><input type="text" name="partnerEmail" th:field="*{partnerEmail}"
<!-- class="form-control"></td>--> class="form-control"></td>
<!-- <td>联系方式<span class="is-required">*</span></td>--> <td>联系方式<span class="is-required">*</span></td>
<!-- <td><input name="partnerPhone" class="form-control" type="text" required th:field="*{partnerPhone}">--> <td><input name="partnerPhone" class="form-control" type="text" required th:field="*{partnerPhone}">
<!-- </td>--> </td>
<!-- </tr>--> </tr>
<tr> <tr>
<td>供货商<span class="is-required">*</span></td> <td>供货商<span class="is-required">*</span></td>
<td colspan="5"> <td colspan="5">
@ -425,14 +439,52 @@
}) })
} }
function changeSaveType(val) {
$('[name="processType"]').val(val)
}
function saveSelect() {
let value = [[${projectOrderInfo.processType}]]
let value2 = [[${projectOrderInfo.orderStatus}]]
var options = {
title: "确认并提交订单",
maxmin: false,
full: false,
type: 1,
btn: ['确认', '取消'],
content: `
<div class="saveBox">
<div><input type="radio" name="saveType" ${value == 0 ? 'checked' : ''} onclick="changeSaveType(0)">电子订单流程</div>
<div class="saveRemark">进货商已经签订框架协议</div>
<div><input type="radio" name="saveType" ${value == 1 ? 'checked' : ''} onclick="changeSaveType(1)">纸质合同流程</div>
<div class="saveRemark">进货商未签订框架协议</div>
<div style="margin-top: 10px"><span style="margin-right: 5px;">保存草稿</span><input type="radio" name="orderCheck" ${value2 == 1 ? 'checked' : ''} onclick="changeStatus(1)"><span>否</span>&nbsp;&nbsp;<input type="radio" ${value2 == 0 ? 'checked' : ''} name="orderCheck" onclick="changeStatus(0)"><span>是</span></div>
</div>
`,
yes: function (index, layero) {
$.operate.save(prefix + "/edit", $('#form-order-edit').serialize());
},
end: function () {
parent.$('.layui-layer-btn').show()
}
};
layer.open(options)
}
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-order-edit').serialize()); parent.$('.layui-layer-btn').hide()
saveSelect()
} else { } else {
$.modal.alertWarning("请完善表单"); $.modal.alertWarning("请完善表单");
} }
} }
function changeStatus(val) {
$('[name="orderStatus"]').val(val)
}
$(function () { $(function () {
initProductList() initProductList()
$("input[name='estimatedOrderTime']").datetimepicker({ $("input[name='estimatedOrderTime']").datetimepicker({
@ -495,7 +547,7 @@
function selectPeople() { function selectPeople() {
var url = prefix + "/selectPeople"; var url = prefix + "/selectPeople";
var options = { var options = {
title: '选择代理商', title: '选择责任人',
width: "680", width: "680",
height: '600', height: '600',
url: url, url: url,
@ -511,7 +563,6 @@
return; return;
} }
$('#projectNameBox').text(rows[0].projectName) $('#projectNameBox').text(rows[0].projectName)
$('[name="customerCode"]').val(rows[0].customerCode);
$('[name="customerName"]').val(rows[0].customerName); $('[name="customerName"]').val(rows[0].customerName);
$('[name="projectCode"]').val(rows[0].projectCode); $('[name="projectCode"]').val(rows[0].projectCode);
$('[name="projectId"]').val(rows[0].id); $('[name="projectId"]').val(rows[0].id);
@ -534,7 +585,7 @@
$('[name="partnerCode"]').val(rows[0].partnerCode); $('[name="partnerCode"]').val(rows[0].partnerCode);
$('[name="partnerName"]').val(rows[0].partnerName); $('[name="partnerName"]').val(rows[0].partnerName);
$('[name="level"]').val(rows[0].level); $('[name="level"]').val(rows[0].level);
$('[name="partnerPeople"]').val(rows[0].contactPerson); $('[name="partnerUserName"]').val(rows[0].contactPerson);
$('[name="partnerPhone"]').val(rows[0].contactPhone); $('[name="partnerPhone"]').val(rows[0].contactPhone);
@ -543,16 +594,18 @@
function initData() { function initData() {
changeBg() changeBg()
$('[name="industryType"]').val([[${projectOrderInfo.industryType}]]);
$('#projectNameBox').text([[${projectOrderInfo.projectName}]])
} }
function doSubmitPeople(index, layero) { function doSubmitPeople(index, layero) {
var rows = layero.find("iframe")[0].contentWindow.getSelections(); var rows = layero.find("iframe")[0].contentWindow.getSelections();
if (rows.length == 0) { if (rows.length == 0) {
$.modal.alertWarning("请选择一个代理商"); $.modal.alertWarning("请选择一个责任人");
return; return;
} }
// $('[name="duty"]').val(rows[0].userId); $('[name="dutyName"]').val(rows[0].userName);
$('[name="duty"]').val(rows[0].userName); $('[name="duty"]').val(rows[0].userId);
$('[name="dutyPhone"]').val(rows[0].phonenumber); $('[name="dutyPhone"]').val(rows[0].phonenumber);
$('[name="dutyEmail"]').val(rows[0].email); $('[name="dutyEmail"]').val(rows[0].email);
@ -889,7 +942,7 @@ ${
<input value="${data.fileName || ''}" name="contractFileList[${length}].fileName" readonly class="form-control"></td> <input value="${data.fileName || ''}" name="contractFileList[${length}].fileName" readonly class="form-control"></td>
<td><input value="${data.createByName || ''}" name="contractFileList[${length}].createBy" readonly class="form-control"></td> <td><input value="${data.createByName || ''}" name="contractFileList[${length}].createBy" readonly class="form-control"></td>
<td><input value="${data.uploadTime || ''}" name="contractFileList[${length}].uploadTime" readonly class="form-control" ></td> <td><input value="${data.uploadTime || ''}" name="contractFileList[${length}].uploadTime" readonly class="form-control" ></td>
<td><span style="cursor:pointer;color: #1686d8;margin-right: 5px;" onclick="preview('${data.filePath}')">预览</span><span style="cursor:pointer;color: #1686d8;margin-right: 5px;" onclick="downFile('${data.filePath}')">下载</span><span style="cursor:pointer;color: #dd242a" class="delfile">删除</span></td> <td><span style="cursor:pointer;color: #1686d8;margin-right: 5px;" onclick="preview('${data.filePath}','${data.fileName}')">预览</span><span style="cursor:pointer;color: #1686d8;margin-right: 5px;" onclick="downFile('${data.filePath}','${data.fileName}')">下载</span><span style="cursor:pointer;color: #dd242a" class="delfile">删除</span></td>
</tr>`) </tr>`)
$('#fileBox tbody').append(tr) $('#fileBox tbody').append(tr)
$('.delfile').on('click', function () { $('.delfile').on('click', function () {
@ -916,16 +969,15 @@ ${
}) })
} }
function downFile(filePath) { function downFile(filePath, fileName) {
$.operate.get(prefix + `/file/download?filePath=${filePath}`, function (res) { window.location.href = prefix + `/file/download?filePath=` + encodeURI(filePath) + '&fileName=' + encodeURI(fileName);
window.location.href = res.data
})
} }
function preview(filePath) { function preview(filePath, fileName) {
$.operate.get(prefix + `/file/download?filePath=${filePath}`, function (res) { let iframe = window.open('', 'iframe')
window.open(res.data) let url = prefix + `/file/download?filePath=` + encodeURI(filePath) + '&fileName=' + encodeURI(fileName)
}) iframe.document.write(`<iframe src='${url}' style="width: 100%;height
:100%">`)
} }
</script> </script>
</body> </body>

22
ruoyi-admin/src/main/resources/templates/project/order/order.html
View File

@ -29,7 +29,7 @@
</li> </li>
<li> <li>
<label>订单状态：</label> <label>订单状态：</label>
<select name="bgProperty" class="form-control"> <select name="orderStatus" class="form-control">
<option value="">请选择</option> <option value="">请选择</option>
<option value="0">草稿</option> <option value="0">草稿</option>
<option value="1">待审批</option> <option value="1">待审批</option>
@ -121,28 +121,20 @@
field: 'createTime', field: 'createTime',
title: '下单时间' title: '下单时间'
}, },
{ // {
field: 'orderStatus', // field: 'orderStatus',
title: '订单状态' // title: '订单状态'
}, // },
{
field: 'a',
title: '物流状态'
},
{
field: 'province',
title: '属地'
},
{ {
field: 'dutyName', field: 'dutyName',
title: '汇智负责人' title: '汇智负责人'
}, },
{ {
field: 'notifierName', field: 'notifier',
title: '通知人' title: '通知人'
}, },
{ {
field: 'notifierEmail', field: 'partnerName',
title: '进货商' title: '进货商'
}, },
{ {