diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/detail.html b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/detail.html index c420dadd..c3c4c535 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/detail.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/detail.html @@ -30,10 +30,10 @@
- + - 代码生成请选择字典属性
@@ -66,40 +66,6 @@
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html index 4c881cb0..2d688795 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html @@ -73,7 +73,7 @@ var processMethodDatas = [[${@dict.getType('processMethod')}]]; var sysUnitClassDatas = [[${@dict.getType('sysUnitClassDatas')}]]; var purchasePlanTypeDatas = [[${@dict.getType('purchase_plan_source')}]]; - var prefix = ctx + "purchase/plan"; + var prefix = ctx + "purchase/purchasePlan"; $(function() { var options = { url: prefix + "/list", @@ -94,7 +94,7 @@ '
' ).find('table'); // 一阶 - initOneLevelTable(index,row,$detail); + initChildTable(index,row,$detail); }, columns: [ {checkbox: true}, @@ -126,14 +126,14 @@ $.table.init(options); }); //采购计划物料清单 - initOneLevelTable = function(index, row, $detail) { + initChildTable = function(index, row, $detail) { $("#"+"purchase_plan_"+row.id).bootstrapTable({ - url: prefix + "/oneLevelList", + url: ctx + "purchase/purchasePlanChild/list", method: 'post', sidePagination: "server", contentType: "application/x-www-form-urlencoded", queryParams : { - parentId: row.id + purchasePlanCode: row.purchasePlanCode }, columns: [ {field: 'purchasePlanId',title: '主键id',visible: false}, diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlanChild/purchasePlanChild.html b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlanChild/purchasePlanChild.html index 29392df8..7b06b68f 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlanChild/purchasePlanChild.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlanChild/purchasePlanChild.html @@ -18,10 +18,6 @@ -
  • - - -
  • @@ -34,7 +30,6 @@