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

发货记录调整

master
rdpnr_hemingxia 2025-04-11 16:06:19 +08:00
parent 07daa8bcc5
commit ff523028ae
7 changed files with 61 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -10,7 +10,7 @@
<name>ruoyi</name> <name>ruoyi</name>
<url>http://sip.unissens.tech</url> <url>http://sip.unissens.tech</url>
<description>汇智SIP管理系统</description> <description>汇智SIP管理系统</description>
<properties> <properties>
<ruoyi.version>4.8.0</ruoyi.version> <ruoyi.version>4.8.0</ruoyi.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@ -1056,6 +1056,10 @@ var table = {
if (typeof callback == "function") { if (typeof callback == "function") {
callback(result); callback(result);
} }
if(data.isTable===0){
$.modal.closeLoading();
return
}
$.operate.ajaxSuccess(result); $.operate.ajaxSuccess(result);
} }
}; };

20
ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
View File

@ -11,7 +11,9 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">关联合同id：</label> <label class="col-sm-4 control-label is-required">关联合同id：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="orderId" class="form-control" type="text" required> <select name="orderId" class="form-control" required>
</select>
</div> </div>
</div> </div>
</div> </div>
@ -120,10 +122,26 @@
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "manage/delivery" var prefix = ctx + "manage/delivery"
var prefixOrder = ctx + "manage/order";
let orderList=[]
$("#form-delivery-add").validate({ $("#form-delivery-add").validate({
focusCleanup: true focusCleanup: true
}); });
$(function (){
getOrderList()
})
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() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-delivery-add').serialize()); $.operate.save(prefix + "/add", $('#form-delivery-add').serialize());

3
ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
View File

@ -70,6 +70,7 @@
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<script th:inline="javascript"> <script th:inline="javascript">
var listFlag = [[${@permission.hasPermi('manage:delivery:list')}]];
var editFlag = [[${@permission.hasPermi('manage:delivery:edit')}]]; var editFlag = [[${@permission.hasPermi('manage:delivery:edit')}]];
var removeFlag = [[${@permission.hasPermi('manage:delivery:remove')}]]; var removeFlag = [[${@permission.hasPermi('manage:delivery:remove')}]];
var deliveryTypeDatas = [[${@dict.getType('delivery_type')}]]; var deliveryTypeDatas = [[${@dict.getType('delivery_type')}]];
@ -83,6 +84,7 @@
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove", removeUrl: prefix + "/remove",
exportUrl: prefix + "/export", exportUrl: prefix + "/export",
importUrl: prefix + "/import",
modalName: "发货记录", modalName: "发货记录",
columns: [{ columns: [{
checkbox: true checkbox: true
@ -123,6 +125,7 @@
align: 'center', align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + listFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-list"></i>发货清单</a> ');
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>'); actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join(''); return actions.join('');

19
ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
View File

@ -12,7 +12,9 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">关联合同id：</label> <label class="col-sm-4 control-label is-required">关联合同id：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="orderId" th:field="*{orderId}" class="form-control" type="text" required> <select name="orderId" class="form-control" th:orderId="*{orderId}" required>
</select>
</div> </div>
</div> </div>
</div> </div>
@ -121,10 +123,25 @@
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "manage/delivery"; var prefix = ctx + "manage/delivery";
var prefixOrder = ctx + "manage/order";
$("#form-delivery-edit").validate({ $("#form-delivery-edit").validate({
focusCleanup: true focusCleanup: true
}); });
$(function (){
getOrderList()
})
function getOrderList() {
$.operate.post(prefixOrder + "/list",{isTable:0}, function (res){
orderList=res.rows
var orderId=$("[name='orderId']").attr('orderid')
$("[name='orderId']").html(
orderList.map((ele)=>{
return `<option value="${ele.id}" ${orderId==ele.id?'selected':''}>${ele.orderName}</option>`
}).join('')
)
})
}
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-delivery-edit').serialize()); $.operate.save(prefix + "/edit", $('#form-delivery-edit').serialize());

10
ruoyi-admin/src/main/resources/templates/manage/delivery/import.html 100644
View File

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
</body>
</html>

12
ruoyi-admin/src/main/resources/templates/manage/order/add.html
View File

@ -28,7 +28,7 @@
<div class="form-group"> <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="col-sm-8">
<input name="versionCode" class="form-control" type="text" required> <input name="versionCode" class="form-control" type="number" required>
</div> </div>
</div> </div>
</div> </div>
@ -111,8 +111,8 @@
</div> </div>
<div class="col-xs-12"> <div class="col-xs-12">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">备注：</label> <label class="col-sm-2 control-label">备注：</label>
<div class="col-sm-8"> <div class="col-sm-10">
<textarea name="remark" class="form-control"></textarea> <textarea name="remark" class="form-control"></textarea>
</div> </div>
</div> </div>
@ -183,7 +183,7 @@
align: 'center', align: 'center',
title: '数量', title: '数量',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='orderListList[%s].quantity' value='%s'>", index, value); var html = $.common.sprintf("<input class='form-control' type='number' name='orderListList[%s].quantity' value='%s'>", index, value);
return html; return html;
} }
}, },
@ -192,7 +192,7 @@
align: 'center', align: 'center',
title: '单价', title: '单价',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='orderListList[%s].price' value='%s'>", index, value); var html = $.common.sprintf("<input class='form-control' type='number' name='orderListList[%s].price' value='%s'>", index, value);
return html; return html;
} }
}, },
@ -201,7 +201,7 @@
align: 'center', align: 'center',
title: '总价', title: '总价',
formatter: function(value, row, index) { formatter: function(value, row, index) {
var html = $.common.sprintf("<input class='form-control' type='text' name='orderListList[%s].amount' value='%s'>", index, value); var html = $.common.sprintf("<input class='form-control' type='number' name='orderListList[%s].amount' value='%s'>", index, value);
return html; return html;
} }
}, },