From d84989626d312b4a33cc2455bceb37257bc3fc46 Mon Sep 17 00:00:00 2001
From: zhangds <c664256297@163.com>
Date: Sat, 6 Apr 2024 14:07:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/knockGold/rules.js | 12 ++++++------
 src/pages/order/list/list.js      |  2 +-
 src/pages/order/list/utils.js     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/knockGold/rules.js b/src/components/knockGold/rules.js
index 92489eed..30c8634e 100644
--- a/src/components/knockGold/rules.js
+++ b/src/components/knockGold/rules.js
@@ -3,12 +3,12 @@ export default {
     batch_goods_name: [{ type: "required", message: "请输入批次商品名称" }], // 批次商品名称
     /* 批次号 */
     channel_activity_id: [
-      { type: "required", message: "请输入批次号" },
-      {
-        type: "regExp",
-        message: "请输入由数字或英文组成的批次号",
-        reg: "^[A-Za-z0-9]+$"
-      }
+      { type: "required", message: "请输入批次号" }
+      // {
+      //   type: "regExp",
+      //   message: "请输入由数字或英文组成的批次号",
+      //   reg: "^[A-Za-z0-9]+$"
+      // }
     ],
     /* 模板编号 */
     temp_no: [
diff --git a/src/pages/order/list/list.js b/src/pages/order/list/list.js
index 6304657a..924884e3 100644
--- a/src/pages/order/list/list.js
+++ b/src/pages/order/list/list.js
@@ -969,7 +969,7 @@ export default class orderList extends React.Component {
                 if (com == "opearo") {
                   return (
                     <div>
-                      {rowData.type === 2 ? (
+                      {rowData.type === 2 && rowData.product.entity.channel === 1 ? (
                         <span
                           className="grid-link"
                           onClick={() => this.getVoucher(rowData.order_number)}
diff --git a/src/pages/order/list/utils.js b/src/pages/order/list/utils.js
index 866ad8a3..b4b5a592 100644
--- a/src/pages/order/list/utils.js
+++ b/src/pages/order/list/utils.js
@@ -308,7 +308,7 @@ export const detailColumns = [
     width: "150px"
   },
   {
-    title: "渠道立减金ID",
+    title: "券ID",
     name: "channel_voucher_id",
     prop: "channel_voucher_id",
     type: "normal",