From 52ab4669f47d7bbb59a7a1b948b4103249d3d683 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Fri, 30 Jun 2023 10:33:06 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=201=E3=80=81=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=88=B7=E6=96=B0=E7=BA=A2=E5=8C=85=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=E5=8F=B7=E7=89=B9=E6=80=A7=202=E3=80=81uuid=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E6=9B=B4=E5=94=AF=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/redPackets/index.jsx  | 13 ++++++++++---
 src/components/redPackets/index.less | 18 ++++++++++++++++++
 src/components/redPackets/static.js  |  2 +-
 src/tools/utils.js                   |  5 ++---
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/components/redPackets/index.jsx b/src/components/redPackets/index.jsx
index 0d79eefe..11fe245b 100644
--- a/src/components/redPackets/index.jsx
+++ b/src/components/redPackets/index.jsx
@@ -22,7 +22,8 @@ import {
   Tag,
   TimeRangePicker,
   DatePicker,
-  BlockHeader
+  BlockHeader,
+  Button
 } from "zent"
 import isArray from "lodash/isArray"
 import cloneDeep from "lodash/cloneDeep"
@@ -248,7 +249,7 @@ export default class addKnockGold extends Component {
       model.effect_date = []
       model.effect_date[0] = begin_time
       model.effect_date[1] = end_time
-      model.copy && (model.cash_activity_id = uuid()) /* 是否是复制 */
+      model.copy && (model.cash_activity_id = uuid(12)) /* 是否是复制 */
       /* 以下操作 筛选出输入框的预警值并经行填充 */
       const copy_early_per = early_per || []
       copy_early_per.map((item) => {
@@ -561,9 +562,15 @@ export default class addKnockGold extends Component {
                 labelWidth={"0px"}
                 maxLength={50}
                 height={"36px"}
-                width={"520px"}
+                width={"452px"}
                 alignment={"left"}
               />
+              <Button
+                type="icon"
+                icon="refresh"
+                onClick={() => this.onHandleChange(uuid(12), "cash_activity_id")}
+                disabled={this.state.isEdit}
+              ></Button>
             </FormItem>
             <FormItem labelname="批次商品名称" prop="batch_goods_name" id="batch_goods_name">
               <Ipt
diff --git a/src/components/redPackets/index.less b/src/components/redPackets/index.less
index 0042c9ad..064302a2 100644
--- a/src/components/redPackets/index.less
+++ b/src/components/redPackets/index.less
@@ -213,6 +213,24 @@
 		z-index: 1001 !important;
 	}
 
+	#batch_number {
+		.form-compontent {
+			display: flex;
+
+			.zent-btn {
+				height: 36px;
+				font-size: 18px;
+				color: #155bd4;
+			}
+
+			.zent-btn-disabled {
+				color: #ccc;
+				cursor: not-allowed;
+				pointer-events: all
+			}
+		}
+	}
+
 	.w-e-text-container {
 		border-bottom: 0 !important;
 	}
diff --git a/src/components/redPackets/static.js b/src/components/redPackets/static.js
index b7dad267..9d297761 100644
--- a/src/components/redPackets/static.js
+++ b/src/components/redPackets/static.js
@@ -25,7 +25,7 @@ export function model({ data }) {
     model: {
       channel: 1, // 渠道
       cash_amount_type: "1", // 红包类型
-      cash_activity_id: uuid(), // 红包批次号
+      cash_activity_id: uuid(12), // 红包批次号
       batch_goods_name: "", // 批次商品名称
       num: "", // 红包个数
       denomination: "", // 面额
diff --git a/src/tools/utils.js b/src/tools/utils.js
index 6498fbc4..768f05eb 100644
--- a/src/tools/utils.js
+++ b/src/tools/utils.js
@@ -9,7 +9,7 @@ export function deWeightThree(data, key) {
   return [...map.values()]
 }
 
-/* uuid生成器 */
+/* uuid生成器*/
 export function uuid(len, radix) {
   var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".split("")
   var uuid = [],
@@ -36,8 +36,7 @@ export function uuid(len, radix) {
       }
     }
   }
-
-  return uuid.join("")
+  return uuid.join("") + new Date().valueOf()
 }
 
 //计算两个时间差  返回天