diff --git a/src/main/resources/templates/pages/depository/Inventory-view.html b/src/main/resources/templates/pages/depository/Inventory-view.html index 47aa90aa..05210a85 100644 --- a/src/main/resources/templates/pages/depository/Inventory-view.html +++ b/src/main/resources/templates/pages/depository/Inventory-view.html @@ -190,49 +190,33 @@ }); applicationOut = function () { - $.ajax({ - url: "/material/temporaryValue", - type: "post", - dataType: 'json', - data: JSON.stringify({"id": $("#id").val(),"type":"Out"}), - contentType: "application/json;charset=utf-8", - success: function (d) { - miniTab.openNewTabByIframeNew({ - href: "/application_Out_temporaryValue", - title: "出库申请" - }); - - } + var index = layer.open({ + title: '出库申请', + type: 2, + shade: 0.2, + maxmin: true, + shadeClose: true, + area: ['100%', '100%'], + content: '/application_out_back?code=' + $("#code").val() + "&depositoryId=" + $("#depositoryId").val() + }); + $(window).on("resize", function () { + layer.full(index); }); return false; }; applicationIn = function () { - // var index = layer.open({ - // title: '入库申请', - // type: 2, - // shade: 0.2, - // maxmin: true, - // shadeClose: true, - // area: ['100%', '100%'], - // content: '/application_in_back?mid=' + $("#id").val() + "&depositoryId=" + $("#depositoryId").val() - // }); - // $(window).on("resize", function () { - // layer.full(index); - // }); - $.ajax({ - url: "/material/temporaryValue", - type: "post", - dataType: 'json', - data: JSON.stringify({"id": $("#id").val(),"type":"In"}), - contentType: "application/json;charset=utf-8", - success: function (d) { - miniTab.openNewTabByIframeNew({ - href: "/application_In_temporaryValue", - title: "入库申请" - }); - - } + var index = layer.open({ + title: '入库申请', + type: 2, + shade: 0.2, + maxmin: true, + shadeClose: true, + area: ['100%', '100%'], + content: '/application_in_back?mid=' + $("#id").val() + "&depositoryId=" + $("#depositoryId").val() + }); + $(window).on("resize", function () { + layer.full(index); }); return false; } diff --git a/src/main/resources/templates/pages/depository/Inventory-view_mobile.html b/src/main/resources/templates/pages/depository/Inventory-view_mobile.html new file mode 100644 index 00000000..9bd0d891 --- /dev/null +++ b/src/main/resources/templates/pages/depository/Inventory-view_mobile.html @@ -0,0 +1,232 @@ + + + + + 分步表单 + + + + + + + + + + + + +
+ + +
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + +
+
+
+ + + + + + + \ No newline at end of file diff --git a/target/classes/templates/pages/material/selectDepositoryByCard.html b/target/classes/templates/pages/material/selectDepositoryByCard.html index 11ce984e..2305cdff 100644 --- a/target/classes/templates/pages/material/selectDepositoryByCard.html +++ b/target/classes/templates/pages/material/selectDepositoryByCard.html @@ -53,10 +53,13 @@ // 物料查询跳转入库 depositoryChildren = windowParent.childNodes[15]; } + console.log(windowParent.childNodes) + console.log(depositoryChildren) }else{ depositoryChildren = windowParent.childNodes[11]; } + var depositoryItem = depositoryChildren.childNodes[3].childNodes[1].childNodes; var depositoryName = depositoryItem[1]; var depositoryId = depositoryItem[3]; @@ -77,7 +80,6 @@ depositoryName.value = d.data.dname +"-"+ obj.data.title; } }); - depositoryId.value = did[0]; placeId.value = did[1]; }