[feat] 新增请购单修改页面缺少js

ruoyi-admin/src/main/resources/templates/system/requisitioning/taskFzjlVerify.html

@@ -103,6 +103,11 @@
   var prefix = ctx + "system/requisitioning";
   var taskId = [[${taskId}]];
   var requisitioningCode = [[${formData.requisitioningCode}]];
+  var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+  var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
+  var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];
+  var processMethodDatas = [[${@dict.getType('processMethod')}]];
+  var warehouseDeptDatas = [[${@dict.getType('warehouseDept')}]];
   $("#form-requisitioning-fzjl-audit").validate({focusCleanup: true});
 
   function submitHandler() {
@@ -149,7 +154,11 @@
             return $.table.selectDictLabel(processMethodDatas, value);
           }
         },
-        {title: '入库部门',field: 'warehouseDept',align: 'center',},
+        {title: '入库部门',field: 'warehouseDept',align: 'center',
+          formatter: function(value, row, index) {
+            $.table.selectDictLabel(warehouseDeptDatas, value);
+          }
+        },
         {title: '物料的数量', field: 'materialNum',align: 'center',},
         {title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',},
         {title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',},

ruoyi-admin/src/main/resources/templates/system/requisitioning/taskModifyApply.html

@@ -105,7 +105,7 @@
 <th:block th:include="include :: datetimepicker-js" />
 <script th:src="@{/js/activiti.js}"></script>
 <script th:inline="javascript">
-    var baseRequisitioningOrder = [[${baseRequisitioningOrder}]];
+    var baseRequisitioningOrder = [[${formData}]];
     var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
     var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
     var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];
@@ -170,11 +170,16 @@
                         return $.table.selectDictLabel(sysUnitClassDatas, value);
                     }
                 },
-                {title: '半成品类型',field: 'processMethod',align: 'center',
+                {title: '加工方式',field: 'processMethod',align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
                 },
+                {title: '入库部门',field: 'warehouseDept',align: 'center',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(warehouseDeptDatas, value);
+                    }
+                },
                 {title: '物料的数量', field: 'materialNum',align: 'center',editable: true,},
                 {title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',},
                 {title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',},

ruoyi-admin/src/main/resources/templates/system/requisitioning/taskQgjlVerify.html

@@ -102,6 +102,11 @@
     var prefix = ctx + "system/requisitioning";
     var taskId = [[${taskId}]];
     var requisitioningCode = [[${formData.requisitioningCode}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+    var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
+    var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var warehouseDeptDatas = [[${@dict.getType('warehouseDept')}]];
     $("#form-requisitioning-qgjl-audit").validate({focusCleanup: true});
     $(function() {
         var options = {
@@ -139,7 +144,11 @@
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
                 },
-                {title: '入库部门',field: 'warehouseDept',align: 'center',},
+                {title: '入库部门',field: 'warehouseDept',align: 'center',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(warehouseDeptDatas, value);
+                    }
+                },
                 {title: '物料的数量', field: 'materialNum',align: 'center',},
                 {title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',},
                 {title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',},

ruoyi-admin/src/main/resources/templates/system/requisitioning/taskQgzgVerify.html

@@ -103,6 +103,11 @@
     var prefix = ctx + "system/requisitioning";
     var taskId = [[${taskId}]];
     var requisitioningCode = [[${formData.requisitioningCode}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+    var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
+    var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var warehouseDeptDatas = [[${@dict.getType('warehouseDept')}]];
     $("#form-requisitioning-qgzg-audit").validate({focusCleanup: true});
     $(function() {
         var options = {
@@ -140,7 +145,11 @@
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
                 },
-                {title: '入库部门',field: 'warehouseDept',align: 'center',},
+                {title: '入库部门',field: 'warehouseDept',align: 'center',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(warehouseDeptDatas, value);
+                    }
+                },
                 {title: '物料的数量', field: 'materialNum',align: 'center',},
                 {title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',},
                 {title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',},

ruoyi-admin/src/main/resources/templates/system/requisitioning/taskZozjVerify.html

@@ -102,6 +102,11 @@
   var prefix = ctx + "system/requisitioning";
   var taskId = [[${taskId}]];
   var requisitioningCode = [[${formData.requisitioningCode}]];
+  var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+  var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
+  var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];
+  var processMethodDatas = [[${@dict.getType('processMethod')}]];
+  var warehouseDeptDatas = [[${@dict.getType('warehouseDept')}]];
   $("#form-requisitioning-zozj-audit").validate({focusCleanup: true});
   $(function() {
     var options = {
@@ -139,7 +144,11 @@
             return $.table.selectDictLabel(processMethodDatas, value);
           }
         },
-        {title: '入库部门',field: 'warehouseDept',align: 'center',},
+        {title: '入库部门',field: 'warehouseDept',align: 'center',
+          formatter: function(value, row, index) {
+            return $.table.selectDictLabel(warehouseDeptDatas, value);
+          }
+        },
         {title: '物料的数量', field: 'materialNum',align: 'center',},
         {title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',},
         {title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',},