From 35a617123c0d578772d9f4450bf27d3b52277384 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期二, 30 七月 2024 13:27:40 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

---
 CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/edit.html  |    4 ++--
 CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/index.html |    4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/edit.html
index b76dc4c..0598873 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/edit.html
@@ -162,12 +162,12 @@
                     {{ item.amount }}
                 </td>
                 <td>
-                    <input name="itemNumarray" lay-verType="tips" type="number" min="0" max="99999999" lay-verify="required|number" class="layui-input" placeholder="璇疯緭鍏ユ暟閲�" lay-reqText="璇疯緭鍏ユ暟閲�" value="{{ item.numsnew }}" onchange="changenum('{{ index }}')" />
+                    <input style="height:21px;" name="itemNumarray" lay-verType="tips" type="number" min="0" max="99999999" lay-verify="required|number" class="layui-input" placeholder="璇疯緭鍏ユ暟閲�" lay-reqText="璇疯緭鍏ユ暟閲�" value="{{ item.numsnew }}" onchange="changenum('{{ index }}')" />
                 </td>
                 <td>
 
 
-                    <input name="amount" type="number" class="layui-input" value="{{ item.amountnew }}" readonly="readonly" />
+                    <input style="height:21px;" name="amount" type="number" class="layui-input" value="{{ item.amountnew }}" readonly="readonly" />
                 </td>
             </tr>
                 {{# }); }}
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/index.html
index e91842f..246cb07 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/index.html
@@ -505,6 +505,10 @@
                 }
                 //鎵ц鍗曚釜鍒犻櫎
                 function doDelete(obj) {
+                    if (obj.data.status == 2) {
+                        layer.msg("宸茬粡閿佸崟锛�");
+                        return;
+                    }
                     layer.confirm('纭畾閿佸崟鍚楋紵',
                         function (index) {
                             coreHelper.Post("Api/CoreCmsPlanOrder/DoDelete", { id: obj.data.orderId }, function (e) {

--
Gitblit v1.9.1