From 27705afb9bf42b6428486e47b830714aa16e5646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Thu, 12 Dec 2024 17:29:51 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99=20?= =?UTF-8?q?=E6=8A=A5=E9=94=80=E5=8D=95=20=E4=BF=AE=E6=94=B9=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=8A=A5=E9=94=80=E5=8D=95=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?ID=E4=B8=8B=E6=8B=89=E6=A1=86=E4=B8=BA=E5=8F=AF=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=90=84=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E9=A1=B5=E9=9D=A2=E8=A1=A8=E6=A0=BC=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=80=E5=8D=95?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=8A=82=E7=82=B9=E5=8F=98=E9=87=8Fservice?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=BB=8F=E7=90=86?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=99=BB=E5=BD=95=E5=90=8E=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=8F=98=E9=87=8F=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BaseExpenseAccountServiceImpl.java | 2 +- .../resources/templates/system/baseExpense/add.html | 10 +++++++--- .../templates/system/baseExpense/taskBxjlVerify.html | 2 +- .../templates/system/baseExpense/taskBxzgVerify.html | 2 +- .../templates/system/baseExpense/taskCwVerify.html | 3 ++- .../templates/system/baseExpense/taskFzjlVerify.html | 2 +- .../templates/system/baseExpense/taskYfzjVerify.html | 2 +- .../templates/system/baseExpense/taskZozjVerify.html | 2 +- 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java index 9abe7eff..862446e1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java @@ -505,7 +505,7 @@ public class BaseExpenseAccountServiceImpl implements IBaseExpenseAccountService ||roleKeys.contains("shjlRole") ||roleKeys.contains("cwzgRole") ||roleKeys.contains("zozjRole")){ // 角色包含业务经理、研发总监、副总经理、品质经理、售后经理、财务主管、总经总助、admin 直接到财务审核 - variables.put("jlExist",true); + variables.put("jlExist",false); } if(roleKeys.contains("cwshRole")){ //财务审核转到总经理 diff --git a/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html b/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html index 43ae2231..1fc53a16 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html @@ -184,14 +184,16 @@ allowClear: true, placeholder: "请选择供应商", ajax: { - url: '/system/supplier/getSupplier', + url: '/system/supplier/matchSupplierList', dataType: 'json', method: "post", delay: 250, processResults: function (res, params) { var options = []; if(res.code==0){ - var resultList = res.rows; + var resultList = res.data; + console.log(res); + console.log(resultList); for(let i in resultList){ var option = resultList[i]; option.id = resultList[i]["supplierCode"]; @@ -202,7 +204,9 @@ return { results: options }; - } + }, + escapeMarkup: function (markup) { return markup; }, + minimumInputLength: 1 } }); diff --git a/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskBxjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskBxjlVerify.html index 70bad5bc..ca657f42 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskBxjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskBxjlVerify.html @@ -183,7 +183,7 @@ }, {title: '报销时间',field: 'expenseTime',visible: false}, {title: '出差单号',field: 'evectionCode',}, - {title: '采购单号',field: 'purcahseCode',}, + {title: '采购单号',field: 'purchaseCode',}, {title: '委外单号',field: 'outsourceCode',}, ], }; diff --git a/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskBxzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskBxzgVerify.html index 9485362e..3c1696e3 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskBxzgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskBxzgVerify.html @@ -183,7 +183,7 @@ }, {title: '报销时间',field: 'expenseTime',visible: false}, {title: '出差单号',field: 'evectionCode',}, - {title: '采购单号',field: 'purcahseCode',}, + {title: '采购单号',field: 'purchaseCode',}, {title: '委外单号',field: 'outsourceCode',}, ], }; diff --git a/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskCwVerify.html b/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskCwVerify.html index 5667a749..9d26f49d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskCwVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskCwVerify.html @@ -183,11 +183,12 @@ }, {title: '报销时间',field: 'expenseTime',visible: false}, {title: '出差单号',field: 'evectionCode',}, - {title: '采购单号',field: 'purcahseCode',}, + {title: '采购单号',field: 'purchaseCode',}, {title: '委外单号',field: 'outsourceCode',}, ], }; $.table.init(options); + handleExpenseMethod(this); }); // 列中获取成本类型的下拉改变数据 function onCostTypeChange(selectElement, rowIndex) { diff --git a/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskFzjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskFzjlVerify.html index 9558faf6..0780f894 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskFzjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskFzjlVerify.html @@ -180,7 +180,7 @@ }, {title: '报销时间',field: 'expenseTime',visible: false}, {title: '出差单号',field: 'evectionCode',}, - {title: '采购单号',field: 'purcahseCode',}, + {title: '采购单号',field: 'purchaseCode',}, {title: '委外单号',field: 'outsourceCode',}, ], }; diff --git a/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskYfzjVerify.html b/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskYfzjVerify.html index 52cc2128..c3433468 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskYfzjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskYfzjVerify.html @@ -183,7 +183,7 @@ }, {title: '报销时间',field: 'expenseTime',visible: false}, {title: '出差单号',field: 'evectionCode',}, - {title: '采购单号',field: 'purcahseCode',}, + {title: '采购单号',field: 'purchaseCode',}, {title: '委外单号',field: 'outsourceCode',}, ], }; diff --git a/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskZozjVerify.html index 42b16171..0b281c54 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskZozjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseExpense/taskZozjVerify.html @@ -182,7 +182,7 @@ }, {title: '报销时间',field: 'expenseTime',visible: false}, {title: '出差单号',field: 'evectionCode',}, - {title: '采购单号',field: 'purcahseCode',}, + {title: '采购单号',field: 'purchaseCode',}, {title: '委外单号',field: 'outsourceCode',}, ], };