edit

SiteCore/Handler/sync.shop.cs

@@ -202,10 +202,16 @@ namespace SiteCore.Handler
                 entity.PCraft = GetPostString("PCraft");
                 entity.UpdateTime = DateTime.Now;
                 entity.UpdateUserName = CurrentUser.UserName;
-
+                entity.uuid = entity.PType;
                 if (eid > 0) entity.Update();
                 else
                 {
+                    CeErpProduct old = CeErpProduct.GetByName(entity.PType);
+                    if (old != null)
+                    {
+                        returnErrorMsg("已存在产品");
+                        return;
+                    }
                     entity.CreateTime = entity.UpdateTime;
                     entity.CreateUserName = entity.UpdateUserName;
                     entity.Create();

Web/EOrder/OrderList.aspx

@@ -701,7 +701,7 @@
             <tr>
                 <td class="td1"></td>
                 <td class="td2">
-                    <input type="file" id="address_file" />
+                    <input type="file" id="address_file" accept="xlsx,xls" />
                 </td>
             </tr>
             <tr>

Web/EOrder/js/p_order.js

@@ -44,7 +44,7 @@ function orderAction(e) {
     }
 
     if (record.OrderState == -1) {
-        html += getGridBtn("memo", "通过审核", "passToOrder('" + id + "')");
+        html += getGridBtn("memo2", "通过审核", "passToOrder('" + id + "')");
     }
     if (record.seller_memo.indexOf("S_") > -1) {
         if (userPostCode == "AfterSaleMaster" || userPostCode == "SysAdmin" || userPostCode == "AfterSale" || userId == "82" || userId == "2846") {
@@ -54,7 +54,9 @@ function orderAction(e) {
     if (!record.spu_id) {
         html += getGridBtn("edit", "spu", "changeSpuId('" + record.tid + "','" + id + "')");
     }
-    html += getGridBtn("upload", "上传地址", "uploaderAddress('" + record.tid + "')");
+    if (record.OrderState < 7) {
+        html += getGridBtn("import", "上传地址", "uploaderAddress('" + record.tid + "')");
+    }
     //html += getGridBtn("edit", "删除", "deleteFn('" + id + "')");
     //html += getGridBtn("edit", "重置", "resetFn('" + id + "')");
     return html;