diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/add.html b/ruoyi-admin/src/main/resources/templates/erp/material/add.html index 8bf4808b..6770a290 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/add.html @@ -9,15 +9,15 @@
- +
- +
- +
@@ -38,7 +38,7 @@
- +
-
- +
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/detail.html b/ruoyi-admin/src/main/resources/templates/erp/material/detail.html index ef845d50..8d9d9cde 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/detail.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/detail.html @@ -10,9 +10,9 @@
- +
- +
@@ -97,35 +97,31 @@
-
-
-
技术团队人员信息
-
-
- + +
+
+
技术团队人员信息
+
-
-
-
销售价历史
-
-
- +
+
+
+
销售价历史
+
-
-
-
采购价历史
-
-
+
+
+
+
采购价历史
+
-
-
-
操作历史
-
-
- +
+
+
+
操作历史
+
- - +
@@ -255,6 +251,8 @@ }) var prefix = ctx + "erp/material"; $(function(){ + var materialType = $("#materialType").val(); + $("#selectMaterialType").val(materialType).trigger("change"); var id = $("#id").val(); var materialNo = $("#materialNo").val(); // 技术团队人员信息 diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/edit.html b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html index 64899522..1788a063 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/edit.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html @@ -10,21 +10,21 @@
- +
- +
- +
- @@ -39,7 +39,7 @@
@@ -62,22 +62,22 @@
- +
- +
- +
- +
@@ -86,7 +86,7 @@
@@ -106,9 +106,9 @@
只能上传jpg/png文件,第一张图片为主图
- - - + + +
@@ -131,11 +131,7 @@ } }, mounted() { - // 控制下拉框选中 - var materialType = $("#materialType").val(); - $("#selectMaterialType").val(materialType).trigger("change"); - var that = this; // 页面渲染完成,可以执行需要的操作 console.log('页面已渲染完成'); @@ -220,7 +216,7 @@ } }, } - }) + }); var prefix = ctx + "erp/material"; $("#form-material-edit").validate({ onkeyup: false, @@ -255,6 +251,8 @@ focusCleanup: true }); $(function(){ + var materialType = $("#materialType").val(); + $("#selectMaterialType").val(materialType).trigger("change"); $.ajax({ url: ctx + 'erp/material/getEngineerList', type: 'get', @@ -271,7 +269,8 @@ } }); }) - + var materialType = $("#materialType").val(); + $("#selectMaterialType").val(materialType).trigger("change"); function submitHandler() { if ($.validate.form()) { var materialType = $('#selectMaterialType').select2('val'); diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/material.html b/ruoyi-admin/src/main/resources/templates/erp/material/material.html index 9b42b7d7..cc5928c8 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/material.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/material.html @@ -167,9 +167,12 @@ cancelUrl: prefix + "/cancel/{id}", restoreUrl: prefix + "/restore/{id}", detailUrl: prefix + "/detail/{id}", + pageList: [5, 10, 25, 50], + pageSize: 5, modalName: "物料信息", fixedColumns: true, // 启用冻结列 fixedRightNumber: 1, // 冻结右列个数 + height: $(window).height() - 100, columns: [ {checkbox: true}, {title: '主键ID',field: 'id',visible: false}, diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html index 8d9b635c..f6836703 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html @@ -36,9 +36,9 @@
- +
- +
@@ -47,7 +47,7 @@
-
+
@@ -88,31 +88,32 @@
- +
- +
- +
-
- +
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html index 625e56c6..ace21645 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html @@ -36,9 +36,9 @@
- +
- +
@@ -47,7 +47,7 @@
-
+
@@ -88,9 +88,10 @@
- +
- +
@@ -104,9 +105,9 @@
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html index 2ef0054a..aacd677a 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html @@ -37,18 +37,18 @@
- +
- +
- +
- +
-
+
- +
- @@ -89,31 +89,32 @@
- +
- +
- +
-
- +
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html index 7765c6cd..e5ef26af 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html @@ -36,18 +36,18 @@
- +
- +
- +
-
+
- +
- @@ -88,31 +88,32 @@
- +
- +
- +
-
- +
- +
- +
- +