[fix]

基础资料 报销单
修改添加报销单供应商ID下拉框为可搜索；
修改各审批页面表格字段；
修改报销单设置节点变量service方法，修改经理角色登录后节点变量；

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")){
             //财务审核转到总经理

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
                 }
             });
 

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',},
             ],
         };

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',},
             ],
         };

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) {

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',},
             ],
         };

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',},
             ],
         };

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',},
       ],
     };