From 5e6560a378013664528d848f4926f0cb2a95ccbd Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Fri, 31 May 2024 14:21:23 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E6=8A=A5=E9=94=80=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BB=A9=E6=95=88=E5=9B=A2=E9=98=9F=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/controller/ErpUtbItemController.java  |  2 +-
 .../main/resources/templates/erp/utb/utb.html |  6 +-
 .../templates/financial/expense/expense.html  |  8 ---
 .../templates/system/baseExpense/add.html     | 55 ++++++++++++++++---
 .../system/baseExpense/baseExpense.html       |  3 +-
 .../templates/system/baseExpense/edit.html    |  1 +
 6 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpUtbItemController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpUtbItemController.java
index ddcab230..7156e625 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpUtbItemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpUtbItemController.java
@@ -86,7 +86,7 @@ public class ErpUtbItemController extends BaseController
      * 业务绩效系数表单
      * @return
      */
-    @RequestMapping("/utbcoef")
+    @RequestMapping("/coef")
     public String utbcoef()
     {
         return prefix + "/utbcoef";
diff --git a/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html b/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html
index c395b8c0..63f5bcf2 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html
@@ -45,7 +45,7 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="erp:utb:add">
                     <i class="fa fa-plus"></i> 添加业务团队
                 </a>
-                <a class="btn btn-success" onclick="showUtbCodf()" shiro:hasPermission="erp:utb:add">
+                <a class="btn btn-success" onclick="showUtbCoef()" shiro:hasPermission="erp:utb:add">
                     <i class="fa fa-plus"></i> 业务绩效系数配置
                 </a>
             </div>
@@ -155,8 +155,8 @@
             };
             $.table.init(options);
         });
-        function showUtbCodf(){
-            var url = prefix + "/utbcodf";
+        function showUtbCoef(){
+            var url = prefix + "/coef";
             $.modal.open("业务绩效系数配置", url);
         }
     </script>
diff --git a/ruoyi-admin/src/main/resources/templates/financial/expense/expense.html b/ruoyi-admin/src/main/resources/templates/financial/expense/expense.html
index 6352c32c..4ca04a5d 100644
--- a/ruoyi-admin/src/main/resources/templates/financial/expense/expense.html
+++ b/ruoyi-admin/src/main/resources/templates/financial/expense/expense.html
@@ -89,9 +89,6 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:baseExpense:add">
-                <i class="fa fa-plus"></i> 添加
-            </a>
         </div>
         <div class="col-sm-12 select-table table-striped">
             <table id="bootstrap-table"></table>
@@ -143,11 +140,6 @@
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.expenseId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.expenseId + '\')"><i class="fa fa-details"></i>详情</a> ');
-                        if(row.delFlag == '0'){
-                            actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
-                        }else{
-                            actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
-                        }
                         return actions.join('');
                     }
                 }
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 c15ed92d..0c603749 100644
--- a/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html
@@ -2,6 +2,9 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
     <th:block th:include="include :: header('新增报销单')" />
+    <th:block th:include="include :: datetimepicker-css" />
+    <th:block th:include="include :: select2-css" />
+    <th:block th:include="include :: bootstrap-editable-css" />
 </head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@@ -44,13 +47,17 @@
             <div class="form-group">
                 <label class="col-sm-6 control-label">是否是委外/采购采销：</label>
                 <div class="col-sm-6">
-                    <input name="isPurchaseOutsource" class="form-control" type="text">
+                    <select name="isPurchaseOutsource" class="form-control" th:with="dictOptions=${@dict.getType('sys_whether')}">
+                        <option th:each="dict : ${dictOptions}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-6 control-label">供应商ID：</label>
                 <div class="col-sm-6">
-                    <input name="supplierCode" class="form-control" type="text">
+                    <select name="supplierCode" class="form-control" th:with="supplierList=${@supplier.selectSysSupplierListAll()}">
+                        <option th:each="supplier : ${supplierList}" th:text="${supplier.supplierName}" th:value="${supplier.supplierCode}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">
@@ -109,6 +116,12 @@
             // 假设此函数返回供应商列表
 
         });
+        $('#supplierCode').on('select2:select', function (e) {
+            var data = e.params.data;
+            $("input[name='corporatePayee']").val(data.supplierName);
+            $("input[name='corporateReceivingAccount']").val(data.bankAccount);
+            $("input[name='publicAccountBanks']").val(data.depositBank);
+        });
         //获取子表信息
         $(function() {
             var options = {
@@ -135,12 +148,38 @@
                           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:'text',
+                            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 = [];
diff --git a/ruoyi-admin/src/main/resources/templates/system/baseExpense/baseExpense.html b/ruoyi-admin/src/main/resources/templates/system/baseExpense/baseExpense.html
index 35d9636c..72442d40 100644
--- a/ruoyi-admin/src/main/resources/templates/system/baseExpense/baseExpense.html
+++ b/ruoyi-admin/src/main/resources/templates/system/baseExpense/baseExpense.html
@@ -98,7 +98,8 @@
             </div>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
+     <th:block th:include="include :: footer" />
+     <th:block th:include="include :: bootstrap-table-editable-js" />
     <script th:inline="javascript">
         var costTypeDatas = [[${@category.getChildByCode('costType')}]];
         var editFlag = [[${@permission.hasPermi('system:baseExpense:edit')}]];
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 f3843aca..eae4f71f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/baseExpense/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/baseExpense/edit.html
@@ -84,6 +84,7 @@
         </div>
     </div>
     <th:block th:include="include :: footer" />
+    <th:block th:include="include :: bootstrap-table-editable-js" />
     <script th:inline="javascript">
         var prefix = ctx + "system/baseExpense"
         var costTypeDatas = [[${@category.getChildByCode('costType')}]];