From 6290afbf629c690b30c0e7ca03cbcb05f8823c80 Mon Sep 17 00:00:00 2001
From: zhangds <wuyunbaxyz@163.com>
Date: Thu, 16 May 2024 17:30:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/form-item/main.js          | 27 +++++++++--------------
 src/components/knockGold/index.jsx        |  2 +-
 src/components/knockGold/voucherBatch.jsx |  6 ++---
 src/pages/plan/add/edit.js                |  2 ++
 src/pages/plan/add/step2.js               | 15 ++-----------
 src/pages/plan/key/UseKeyAddEdit.jsx      |  4 ++--
 6 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/src/components/form-item/main.js b/src/components/form-item/main.js
index 6b74c980..f424f484 100644
--- a/src/components/form-item/main.js
+++ b/src/components/form-item/main.js
@@ -1,29 +1,24 @@
-import React from "react";
-import "./main.less";
+import React from "react"
+import "./main.less"
 
 export default class filterSelect extends React.Component {
   static defaultProps = {
     required: "*"
-  };
+  }
   constructor(props) {
-    super(props);
+    super(props)
   }
   render() {
-    const { labelname, prop, labelwidth, myClassName, id, required } =
-      this.props;
+    const { labelname, prop, labelwidth, myClassName, id, required, noLabel } = this.props
     return (
-      <div
-        className={myClassName ? myClassName + " form-Item" : "form-Item"}
-        id={id ? id : null}>
-        <div
-          className='form-label'
-          style={{ width: labelwidth ? labelwidth : "180px" }}>
+      <div className={myClassName ? myClassName + " form-Item" : "form-Item"} id={id ? id : null}>
+        <div className="form-label" style={{ width: labelwidth ? labelwidth : "180px" }}>
           {labelname}
-          {required ? <span className='mustwrite'>*</span> : null}
+          {required ? <span className="mustwrite">*</span> : null}
         </div>
-        <div className='form-compontent'>{this.props.children}</div>
-        <div className='form-expand'>{this.props.expand}</div>
+        <div className="form-compontent">{this.props.children}</div>
+        <div className="form-expand">{this.props.expand}</div>
       </div>
-    );
+    )
   }
 }
diff --git a/src/components/knockGold/index.jsx b/src/components/knockGold/index.jsx
index 68d13c0d..3f89e435 100644
--- a/src/components/knockGold/index.jsx
+++ b/src/components/knockGold/index.jsx
@@ -954,7 +954,7 @@ export default class addKnockGold extends Component {
 
             {/* 批量需改主体 */}
             {this.state.subjectList.length > 0 ? (
-              <FormItem>
+              <FormItem noLabel={true} required={false} labelwidth="0px">
                 <VoucherBatch
                   ref="voucherBatchRef"
                   isEdit={!!this.props.data?.id}
diff --git a/src/components/knockGold/voucherBatch.jsx b/src/components/knockGold/voucherBatch.jsx
index 6d003f3b..1037dfa4 100644
--- a/src/components/knockGold/voucherBatch.jsx
+++ b/src/components/knockGold/voucherBatch.jsx
@@ -270,8 +270,8 @@ const VoucherBatch = forwardRef((props, ref) => {
 
   return (
     <div>
-      <div style={{ margin: "20px 0 10px 0", display: "flex", alignItems: "center" }}>
-        <span style={{ paddingLeft: "21px" }}>
+      <div style={{ margin: "20px 0px 10px 0px", display: "flex", alignItems: "center" }}>
+        <span style={{ paddingLeft: "0" }}>
           立减金平台批次号<span style={{ color: "red" }}>*</span>
         </span>
         <Button style={{ margin: "0px 0 0px 46px" }} type="primary" onClick={addVoucherBatch}>
@@ -283,7 +283,7 @@ const VoucherBatch = forwardRef((props, ref) => {
         </Button> */}
       </div>
 
-      <div style={{ border: "1px solid #f0f0f0", margin: "0 20px 10px 20px" }}>
+      <div style={{ border: "1px solid #f0f0f0", margin: "0 20px 10px 0px" }}>
         <Grid columns={columns} datasets={datasets} size="large" />
       </div>
     </div>
diff --git a/src/pages/plan/add/edit.js b/src/pages/plan/add/edit.js
index 4a7d59c6..6db527ad 100644
--- a/src/pages/plan/add/edit.js
+++ b/src/pages/plan/add/edit.js
@@ -117,6 +117,7 @@ export default class add extends React.Component {
           res,
           (req, msg) => {
             try {
+              this.setState({ send_method: req.info.send_method })
               //获取分销商
               getReseller(req.info.reseller_id).then((res) => {
                 handelResponse(res, (req, msg) => {
@@ -173,6 +174,7 @@ export default class add extends React.Component {
         handelResponse(
           res,
           (req, msg) => {
+            this.setState({ send_method: req.info.send_method })
             //获取分销商
             getReseller(req.info.reseller_id).then((res) => {
               handelResponse(res, (req, msg) => {
diff --git a/src/pages/plan/add/step2.js b/src/pages/plan/add/step2.js
index 84a37f51..25b45025 100644
--- a/src/pages/plan/add/step2.js
+++ b/src/pages/plan/add/step2.js
@@ -282,7 +282,7 @@ export default class acclist extends React.Component {
   submit() {
     let valide = false
     if (this.props.send_method == 2 && this.state.model.val && this.state.model.person.length < 1) {
-      Notify.error("请选择预警人")
+      Notify.error("请选择预警人3")
       return false
     }
     if (this.state.expiration_type == 2 && this.state.expiration_value.length < 1) {
@@ -1314,7 +1314,6 @@ export default class acclist extends React.Component {
               </RadioButton>
             </RadioGroup>
           </FormItem>
-
           {this.state.isload && this.props.isSettlement === 1 ? (
             <FormItem labelname="成本价" prop="key_cost_price" id="key_cost_price">
               <Ipt
@@ -1334,7 +1333,6 @@ export default class acclist extends React.Component {
               />
             </FormItem>
           ) : null}
-
           {this.state.isload && this.props.isSettlement === 1 ? (
             <FormItem labelname="官方价" prop="key_official_price" id="key_official_price">
               <Ipt
@@ -1354,7 +1352,6 @@ export default class acclist extends React.Component {
               />
             </FormItem>
           ) : null}
-
           {this.state.isload ? (
             <FormItem labelname="key批次名称" prop="batch_name" id="batch_name">
               <Ipt
@@ -1412,8 +1409,7 @@ export default class acclist extends React.Component {
               </div>
             </FormItem>
           ) : null}
-
-          {this.props.send_method == 2 && this.state.isload ? (
+          {this.state.isload && this.props.send_method == 2 ? (
             <>
               <FormItem labelname="库存预警值" prop="warningValue" id="warningValue" required="">
                 <div className="warningValue">
@@ -1499,7 +1495,6 @@ export default class acclist extends React.Component {
               </FormItem>
             </>
           ) : null}
-
           <FormItem labelname="key码有效期" prop="expiration_type" id="expiration_type">
             <Radio.Group
               value={this.state.model.expiration_type}
@@ -1513,7 +1508,6 @@ export default class acclist extends React.Component {
               <Radio value={"3"}>接口调取后有效期</Radio>
             </Radio.Group>
           </FormItem>
-
           {this.state.model.expiration_type === "2" ? (
             <FormItem labelname="固定时间段">
               <DateRangePicker
@@ -1531,7 +1525,6 @@ export default class acclist extends React.Component {
               />
             </FormItem>
           ) : null}
-
           {this.state.model.expiration_type === "3" ? (
             <FormItem labelname="接口调取后有效期">
               <Input
@@ -1568,7 +1561,6 @@ export default class acclist extends React.Component {
               />
             </FormItem>
           ) : null}
-
           <FormItem labelname="绑定类型" prop="bind_object" id="bind_object">
             <Radio.Group
               value={this.props.keyType}
@@ -1584,7 +1576,6 @@ export default class acclist extends React.Component {
               </Radio>
             </Radio.Group>
           </FormItem>
-
           <FormItem labelname="" prop="btn" required={false}>
             {this.props.keyType === 1 ? (
               <>
@@ -1637,7 +1628,6 @@ export default class acclist extends React.Component {
               </Button>
             )}
           </FormItem>
-
           <FormItem labelname="绑定对象" prop="grid">
             <Grid
               headBackgroud="#f9fafc"
@@ -1696,7 +1686,6 @@ export default class acclist extends React.Component {
               <RadioButton value={0}>否</RadioButton>
             </RadioGroup>
           </FormItem>
-
           <FormItem labelname="是否允许亏损" id="allow_loss" prop="allow_loss">
             <RadioGroup onChange={(e) => this.onLossChange(e)} value={this.state.model.allow_loss}>
               <RadioButton value={1}>是</RadioButton>
diff --git a/src/pages/plan/key/UseKeyAddEdit.jsx b/src/pages/plan/key/UseKeyAddEdit.jsx
index 1be4b13c..ea72efe1 100644
--- a/src/pages/plan/key/UseKeyAddEdit.jsx
+++ b/src/pages/plan/key/UseKeyAddEdit.jsx
@@ -691,7 +691,7 @@ const UseKeyAddEdit = () => {
   // 商品弹窗提交
   const exchangeCouponBtnPop = () => {
     if (model.val && model.person.length < 1) {
-      Notify.error("请选择预警人")
+      Notify.error("请选择预警人1")
       return false
     }
     // 优惠券数据
@@ -849,7 +849,7 @@ const UseKeyAddEdit = () => {
   // 提交审核按钮
   const examineBtn = () => {
     if (model.val && model.person.length < 1) {
-      Notify.error("请选择预警人")
+      Notify.error("请选择预警人2")
       return false
     }