diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
index ca809825..6b9a4264 100644
--- a/ruoyi-admin/src/main/resources/templates/index.html
+++ b/ruoyi-admin/src/main/resources/templates/index.html
@@ -4,7 +4,7 @@
- 若依系统首页
+ 应用管理系统首页
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
index 2507c8c0..f5a95e37 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
@@ -160,21 +160,28 @@
minView: "month",
autoclose: true
});
- function openList(id){
+ function openList(){
var options = {
- title: "关联合同",
+ title: "选择合同",
url: prefix + '/selectOrder',
skin: 'layui-layer-gray',
- btn: ['关闭'],
- yes:function(index){
- $.modal.close(index)
- },
maxmin: false,
full: false,
- index:1000
+ index:1000,
+ callBack: doSubmit
};
$.modal.openOptions(options)
}
+ function doSubmit(index, layero){
+ var rows = layero.find("iframe")[0].contentWindow.getSelections();
+ if (rows.length == 0) {
+ $.modal.alertWarning("请至少选择一条记录");
+ return;
+ }
+ $('[name="orderId"]').val(rows[0].id);
+ $(' [name="orderName"]').val(rows[0].orderName);
+ $.modal.close(index);
+ }