From 9fbb256ef84a13d3730b09e790e881f6b20fa004 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Fri, 24 May 2024 18:54:00 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86:?=
 =?UTF-8?q?=E5=88=9B=E7=AB=8B=E6=8A=A5=E4=BB=B7=E9=9C=80=E8=A6=81=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E6=9F=A5=E8=AF=A2=E5=88=B0=E7=9A=84=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E4=B8=8B=E6=8B=89=E6=A1=86=E6=9F=A5=E8=AF=A2,server?=
 =?UTF-8?q?=E5=B1=82=E7=BA=A7=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/service/ISysSupplierService.java |  6 +++++-
 .../templates/system/baseExpense/edit.html        | 15 ++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSupplierService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSupplierService.java
index 2fe3295c..d3c388e5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSupplierService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSupplierService.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.service;
 
 import com.ruoyi.system.domain.SysSupplier;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -10,7 +11,8 @@ import java.util.List;
  * @author ruoyi
  * @date 2022-11-02
  */
-public interface ISysSupplierService 
+@Service("supplier")
+public interface ISysSupplierService
 {
     /**
      * 查询供应商资料
@@ -68,4 +70,6 @@ public interface ISysSupplierService
     public List<SysSupplier> selectSysSupperWithMaterial();
 
     Object getId();
+
+    public List<SysSupplier> selectSysSupplierListAll();
 }
diff --git a/ruoyi-admin/src/main/resources/templates/system/baseExpense/edit.html b/ruoyi-admin/src/main/resources/templates/system/baseExpense/edit.html
index 7ca6b9a3..f3843aca 100644
--- a/ruoyi-admin/src/main/resources/templates/system/baseExpense/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/baseExpense/edit.html
@@ -107,7 +107,7 @@
         $(function() {
             var options = {
                 id:'bootstrap-sub-table-expense',
-                url:prefix + "/getChildList",
+                url: ctx + "system/expenseChild/list",
                 queryParams: function(params) {
                     return {
                         quoteId: $("#expenseCode").val()
@@ -116,6 +116,7 @@
                 pagination: false,
                 sidePagination: "client",
                 model: "报销单数据",
+                editable: true,
                 columns: [
                     {checkbox: true},
                     {title: '主键',field: 'index',visible: false,
@@ -135,12 +136,12 @@
                             return getCostSmallType(value,row,index)
                         }
                     },
-                    {title: '用途',field: 'purpose',editable:{type:'text',options:{maxlength:100}}},
-                    {title: '金额',field: 'amounts',editable: {type:'text',options:{maxlength:100}}},
-                    {title: '报销时间',field: 'expenseTime',editable:{type:'date'}},
-                    {title: '出差单号',field: 'evectionCode',},
-                    {title: '采购单号',field: 'purcahseCode',},
-                    {title: '委外单号',field: 'outsourceCode',},
+                    {title: '用途',field: 'purpose',editable:{type:'text',mode:'inline'}},
+                    {title: '金额',field: 'amounts',editable: {type:'text',mode:'inline'}},
+                    {title: '报销时间',field: 'expenseTime',editable:{type:'date',mode:'inline',}},
+                    {title: '出差单号',field: 'evectionCode',editable: {type:'text',mode:'inline'}},
+                    {title: '采购单号',field: 'purcahseCode',editable: {type:'text',mode:'inline',}},
+                    {title: '委外单号',field: 'outsourceCode',editable: {type:'text',mode:'inline',}},
                     {title: '操作', align: 'center',
                         formatter: function (value, row, index) {
                             var actions = [];