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 selectSysSupperWithMaterial(); Object getId(); + + public List 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 = [];