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

Compare commits

base: mula:69b8d1d8ab4b380e1cee433014880bdaaaabc9dc
Branches Tags
mula:master
mula:dev_1.0.0
..
compare: mula:264e8371a8726fc6ef20d43064b36dd68bc7e740
Branches Tags
mula:master
mula:dev_1.0.0

No commits in common. "69b8d1d8ab4b380e1cee433014880bdaaaabc9dc" and "264e8371a8726fc6ef20d43064b36dd68bc7e740" have entirely different histories.
69b8d1d8ab ... 264e8371a8

7 changed files with 9 additions and 104 deletions
Show Stats Expand all files Collapse all files

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

@ -1056,10 +1056,6 @@ 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,9 +11,7 @@
<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">
<select name="orderId" class="form-control" required> <input name="orderId" class="form-control" type="text" required>
</select>
</div> </div>
</div> </div>
</div> </div>
@ -122,26 +120,10 @@
<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());

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

@ -70,7 +70,6 @@
</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')}]];
@ -124,7 +123,6 @@
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="openList(\'' + 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('');
@ -133,9 +131,6 @@
}; };
$.table.init(options); $.table.init(options);
}); });
function openList(id){
$.modal.open('发货清单', prefix + `/import/${id}`)
}
</script> </script>
</body> </body>
</html> </html>

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

@ -12,9 +12,7 @@
<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">
<select name="orderId" class="form-control" th:orderId="*{orderId}" required> <input name="orderId" th:field="*{orderId}" class="form-control" type="text" required>
</select>
</div> </div>
</div> </div>
</div> </div>
@ -123,25 +121,10 @@
<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());

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

@ -1,51 +0,0 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('发货清单列表')" />
</head>
<body>
<script>
$(function() {
var options = {
url: prefix + "/list",
columns: [{
checkbox: true
},
{
field: 'id',
title: '主键，自增',
visible: false
},
{
field: 'orderId',
title: '关联合同id'
},
{
field: 'deliveryCode',
title: '发货单号'
},
{
field: 'deliveryDate',
title: '发货日期'
},
{
field: 'deliveryType',
title: '发货方式',
formatter: function(value, row, index) {
return $.table.selectDictLabel(deliveryTypeDatas, value);
}
},
{
field: 'deliveryStatus',
title: '发货状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(deliveryStatusDatas, value);
}
},
]
};
$.table.init(options);
});
</script>
</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="number" required> <input name="versionCode" class="form-control" type="text" 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-2 control-label">备注：</label> <label class="col-sm-4 control-label">备注：</label>
<div class="col-sm-10"> <div class="col-sm-8">
<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='number' name='orderListList[%s].quantity' value='%s'>", index, value); var html = $.common.sprintf("<input class='form-control' type='text' 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='number' name='orderListList[%s].price' value='%s'>", index, value); var html = $.common.sprintf("<input class='form-control' type='text' 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='number' name='orderListList[%s].amount' value='%s'>", index, value); var html = $.common.sprintf("<input class='form-control' type='text' name='orderListList[%s].amount' value='%s'>", index, value);
return html; return html;
} }
}, },