修改导入表格判断

判断是否已经调整并返回提示

Areas/Admin/Controllers/MainServer/PosMachinesFeeChangeRecordController.cs

@@ -330,11 +330,11 @@ namespace MySystem.Areas.Admin.Controllers
                 var Amount = double.Parse(dr[1].ToString()); // 调整费率
                 int Kind = int.Parse(dr[2].ToString()); // 1 调升 2 调低
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosNo) ?? new PosMachinesTwo();
-                if (pos.UpFeeFlag == 1)
+                if (pos.UpFeeFlag == 1 && pos.DownFeeFlag == 0)
                 {
                     if (Kind != 2 || Amount != 0.6)
                     {
-                        warning += PosNo + ",该机具调低费率数值或类型不正确，请检查好后全部重新导入";
+                        warning += PosNo + ",该机具调低费率数值或类型不正确或已经调整，请检查好后全部重新导入";
                     }
                     else
                     {

wwwroot/layuiadmin/modules_main/PosMachinesFeeChangeRecord_Admin.js

@@ -69,7 +69,11 @@ layui.config({
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
         excel.importExcel(files, {}, function (data) {
-            ExcelData = data[0].Sheet1;
+            if(data[0].Sheet1) {
+                ExcelData = data[0].Sheet1;
+            } else {
+                ExcelData = data[0].sheet1;
+            }
         });
     });