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 4fe44d35..2ec02415 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html +++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html @@ -172,7 +172,7 @@ var options = { title: "选择合同", url: prefix + '/selectOrder', - skin: 'layui-layer-gray', + // skin: 'layui-layer-gray', maxmin: false, full: false, index:1000, diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html index d78e185a..bc227acf 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html +++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html @@ -145,7 +145,19 @@ $.table.init(options); }); function openList(id){ - $.modal.open('发货清单', prefix + `/import/${id}`) + var options = { + title: "发货清单", + url: prefix + `/import/${id}`, + // skin: 'layui-layer-gray', + maxmin: false, + full: false, + index:1000, + callBack: doClose + }; + $.modal.openOptions(options) + } + function doClose(index){ + $.modal.close(index); } diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html index 7f7adba7..ac17287f 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html +++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html @@ -174,7 +174,7 @@ var options = { title: "选择合同", url: prefix + '/selectOrder', - skin: 'layui-layer-gray', + // skin: 'layui-layer-gray', maxmin: false, full: false, index:1000,