From d94e6071727e38446dfb925e5e9f721c8791e369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Wed, 7 Aug 2024 17:39:30 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99?= =?UTF-8?q?=20=E5=91=98=E5=B7=A5=E9=A2=86=E6=96=99=E5=8D=95=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=91=98=E5=B7=A5=E9=A2=86=E6=96=99=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=BB=93=E6=9E=84=EF=BC=9B=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=B7=BB=E5=8A=A0=E5=91=98=E5=B7=A5=E9=A2=86=E6=96=99?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=94=B3=E8=AF=B7=E4=BA=BA=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E3=80=81=E5=B2=97=E4=BD=8D=E3=80=81=E5=A7=93=E5=90=8D=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=A1=A8=E5=8D=95=E7=BB=93=E6=9E=84=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=A1=A8=E5=8D=95=E6=98=BE=E7=A4=BA=E7=BB=93=E6=9E=84?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=94=B3=E8=AF=B7=E4=BA=BA=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E3=80=81=E5=B2=97=E4=BD=8D=E3=80=81=E5=A7=93=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E6=96=B0=E5=A2=9E=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=91=98=E5=B7=A5=E9=A2=86=E6=96=99=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BA=BA=E9=83=A8=E9=97=A8=E3=80=81=E5=B2=97?= =?UTF-8?q?=E4=BD=8D=E3=80=81=E5=A7=93=E5=90=8D=E5=AD=97=E6=AE=B5=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E7=BB=93=E6=9E=84=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=8F=90=E4=BA=A4=E6=96=B9=E6=B3=95=EF=BC=9B=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E7=BB=8F=E7=90=86=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=98=BE=E7=A4=BA=EF=BC=9B=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E4=B8=BB=E7=AE=A1=E5=AE=A1=E6=89=B9=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/empRequisiteOrder/add.html | 35 +++++++++++++++---- .../system/empRequisiteOrder/detail.html | 20 ++++++++++- .../system/empRequisiteOrder/edit.html | 20 +++++++++++ .../empRequisiteOrder/empRequisiteOrder.html | 20 +++++------ .../empRequisiteOrder/taskScjlVerify.html | 30 ++++++++++++---- .../empRequisiteOrder/taskSczgVerify.html | 30 ++++++++++++---- 6 files changed, 123 insertions(+), 32 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html index 14e023e9..f9968c03 100644 --- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html @@ -8,10 +8,28 @@
-
- + + + + + + +
+ +
+ +
+
+
+ +
+ +
+
+
+
- +
@@ -56,7 +74,7 @@ $("#form-empRequisiteOrder-add").validate({focusCleanup: true}); //获取子表信息 $(function() { - getRequisitieCode(); + // getRequisitieCode(); // selectSaleOrder(); getSelections(); var options = { @@ -196,13 +214,16 @@ var baseEmpRequisiteOrderVO = {}; if ($.validate.form()) { var baseEmpRequisiteOrderChildList = []; + $("select[name='deptName']").removeAttr("disabled"); + $("select[name='postName']").removeAttr("disabled"); // 获取表单数据 const Data = $("#form-empRequisiteOrder-add").serializeArray().reduce((obj, item) => { obj[item.name] = item.value; return obj; }, {}); baseEmpRequisiteOrderVO = { - requisitieCode: Data.requisitieCode, + deptName: Data.deptName, + postName: Data.postName, correlationCode: Data.correlationCode, remark: Data.remark, materialAmount: 0, @@ -252,9 +273,9 @@ dataType: "json", success: function (data) { console.log(data); - $("select[name='dept']").append($('').val(data.deptName).html(data.deptName)); + $("select[name='deptName']").append($('').val(data.deptName).html(data.deptName)); $("select[name='userName']").append($('').val(data.userName).html(data.userName)); - $("select[name='post']").append($('').val(data.postName).html(data.postName)); + $("select[name='postName']").append($('').val(data.postName).html(data.postName)); // $select.trigger('change'); } }); diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/detail.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/detail.html index 3e2f661f..5d706366 100644 --- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/detail.html @@ -15,8 +15,26 @@
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html index cd6f3f65..7f8ad8fd 100644 --- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html @@ -15,6 +15,24 @@
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
@@ -200,6 +218,8 @@ baseEmpRequisiteOrderVO = { requisiteId: Data.requisiteId, requisitieCode: Data.requisitieCode, + deptName: Data.deptName, + postName: Data.postName, correlationCode: Data.correlationCode, remark: Data.remark, materialAmount: 0, diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html index 3b2a15db..c6907631 100644 --- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html +++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html @@ -91,17 +91,19 @@ {title: '领料状态',field: 'requisitieStatus', formatter: function(value, row, index) {return $.table.selectDictLabel(requisitieStatusDatas, value);} }, - {title: '领料单编号',field: 'requisitieCode',}, - {title: '领料人',field: 'createBy',}, - {title: '关联销售订单号',field: 'correlationCode',}, + {title: '领料单号',field: 'requisitieCode',}, + {title: '领料员',field: 'createBy',}, + {title: '关联订单号',field: 'correlationCode',}, {title: '物料合计',field: 'materialAmount', }, {title: '数量总计',field: 'materialSum',}, - {title: '不含税总价(RMB)',field: 'noRmbSum',}, - {title: '含税总价(RMB)',field: 'rmbSum',}, + {title: '不含税总价(RMB)',field: 'noRmbSum',visible: false}, + {title: '含税总价(RMB)',field: 'rmbSum',visible: false}, {title: '申请人',field: 'applyUser',visible: false}, {title: '录入时间',field: 'createTime',}, + {title: '更新人',field: 'updateBy',}, + {title: '上次更新时间',field: 'updateTime',}, {title: '备注',field: 'remark'}, - {title: '使用状态',field: 'useStatus', + {title: '使用状态',field: 'useStatus',visible: false, formatter: function(value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);} }, { @@ -124,14 +126,8 @@ // 进度查看 actions.push(' 进度查看 '); } - actions.push('编辑 '); actions.push('详情 '); - if(row.delFlag == '0'){ - actions.push('作废 '); - }else{ - actions.push('恢复 '); - } return actions.join(''); } } diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskScjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskScjlVerify.html index 22ca0fd4..ecf45fd2 100644 --- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskScjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskScjlVerify.html @@ -17,19 +17,37 @@
- +
- +
- + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
- +
@@ -119,7 +137,7 @@ return $.table.selectDictLabel(processMethodDatas, value); } }, - {title: '物料的数量', field: 'materialNum',align: 'center',editable: true,}, + {title: '物料的数量', field: 'materialNum',align: 'center',}, {title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',}, {title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',}, {title: '物料的含税总价(RMB)',field: 'materialNoRmbSum',align: 'center',}, @@ -128,7 +146,7 @@ {title: '录入时间',field: 'createTime',align: 'center',visible: false }, {title: '更新人',field: 'updateBy',align: 'center',visible: false}, {title: '上次更新时间',field: 'updateTime',align: 'center',visible: false}, - {title: '备注',field: 'remark',align: 'center',editable: true}, + {title: '备注',field: 'remark',align: 'center',}, ], onEditableSave:function(field, row, oldValue, $el){ row.materialNoRmbSum = Number(row.materialNum * Number(row.materialNoRmb)).toFixed(2); diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskSczgVerify.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskSczgVerify.html index f9b88463..a58de0d3 100644 --- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskSczgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskSczgVerify.html @@ -17,19 +17,37 @@
- +
- +
- + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
- +
@@ -120,7 +138,7 @@ return $.table.selectDictLabel(processMethodDatas, value); } }, - {title: '物料的数量', field: 'materialNum',align: 'center',editable: true,}, + {title: '物料的数量', field: 'materialNum',align: 'center',}, {title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',}, {title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',}, {title: '物料的含税总价(RMB)',field: 'materialNoRmbSum',align: 'center',}, @@ -129,7 +147,7 @@ {title: '录入时间',field: 'createTime',align: 'center',visible: false }, {title: '更新人',field: 'updateBy',align: 'center',visible: false}, {title: '上次更新时间',field: 'updateTime',align: 'center',visible: false}, - {title: '备注',field: 'remark',align: 'center',editable: true}, + {title: '备注',field: 'remark',align: 'center',}, ], }; console.log(options.data);