Merge branch 'feat/constructionOne' into feature/20230327_public_takeaway

* feat/constructionOne:
  feat: 临时添加禁止修改逻辑

src/pages/businessManage/info/data.js

@@ -261,7 +261,8 @@ export function renderServiceTags() {
         that.state.businessInfo.customList.map(tag => {
           const isLongTag = tag.length > 20;
           const tagElem = (
-            <Tag key={tag} closable onClose={() => handleClose.call(that, tag)}>
+            // closable 二期放开
+            <Tag key={tag} onClose={() => handleClose.call(that, tag)}>
               {isLongTag ? `${tag.slice(0, 20)}...` : tag}
             </Tag>
           );
@@ -286,14 +287,15 @@ export function renderServiceTags() {
           onPressEnter={e => handleInputConfirm.call(that, e)}
         />
       )}
-      {!that.state.tagVisible && (
+      {/* 二期放开 */}
+      {/* {!that.state.tagVisible && (
         <Tag
           onClick={() => showInput.call(that)}
           style={{ background: '#fff', borderStyle: 'dashed' }}
         >
           <PlusOutlined /> 新增
         </Tag>
-      )}
+      )} */}
     </div>
   );
 }

src/pages/businessManage/info/index.jsx

@@ -64,12 +64,13 @@ class BusinessInfo extends Component {
     serviceFacilitys: [], // 服务设施
     bankList: [], // 开户行
     settlementType: 1,
-    loading: false,
+    // loading: false,
     visibleLoading: false,
     checkboxDisabled: false,
     mainCategoryId: null,
     companyNamedis: false, // 公司名称
     companyType: null, // 企业类型
+    disabled: true, // 二期放开
   };
 
   async componentDidMount() {
@@ -221,16 +222,16 @@ class BusinessInfo extends Component {
         obj.socialCode = obj.socialCode?.toLocaleUpperCase() || '';
         obj.id = this.state.id;
         obj.headImage = obj.primaryImage;
-        this.setState({
-          loading: true,
-        });
+        // this.setState({
+        //   loading: true,
+        // });
         const data = await apiEditStoreInfo(obj);
         if (data.businessCode === '0000') {
           notification.success({ message: `${data.msg}！～` });
         }
-        this.setState({
-          loading: false,
-        });
+        // this.setState({
+        //   loading: false,
+        // });
       } else {
         const message = getErrorMessage(err);
         notification.warning({ message });
@@ -341,6 +342,7 @@ class BusinessInfo extends Component {
       mainCategoryId,
       companyNamedis,
       companyType,
+      disabled,
     } = this.state;
     return (
       <div className={styles.infoBox}>
@@ -356,7 +358,7 @@ class BusinessInfo extends Component {
                     <Checkbox.Group
                       options={businessModel}
                       onChange={e => this.onChangeBusinessModel(e)}
-                      disabled={+mainCategoryId === carID}
+                      disabled={+mainCategoryId === carID || disabled}
                     />,
                   )}
                 </FormItem>
@@ -373,7 +375,7 @@ class BusinessInfo extends Component {
                       filterOption={(input, option) =>
                         option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
                       }
-                      disabled={+businessInfo.mainCategoryId === 301008}
+                      disabled={+businessInfo.mainCategoryId === 301008 || disabled}
                     >
                       {this.state.categoryList.map(item => (
                         <Option value={item.id} key={item.id}>
@@ -389,7 +391,7 @@ class BusinessInfo extends Component {
                   {getFieldDecorator('name', {
                     rules: [{ required: true, message: '请输入商户名称!' }],
                     initialValue: businessInfo.name,
-                  })(<Input maxLength={32} />)}
+                  })(<Input maxLength={32} disabled={disabled} />)}
                 </FormItem>
               </Col>
               <Col span={24}>
@@ -402,6 +404,7 @@ class BusinessInfo extends Component {
                       options={this.state.areaAddr}
                       loadData={e => loadData.call(this, e)}
                       changeOnSelect
+                      disabled={disabled}
                     />,
                   )}
                 </FormItem>
@@ -411,7 +414,7 @@ class BusinessInfo extends Component {
                   {getFieldDecorator('detailAddress', {
                     rules: [{ required: true, message: '请输入经营地址!' }],
                     initialValue: businessInfo.detailAddress,
-                  })(<Input maxLength={500} />)}
+                  })(<Input maxLength={500} disabled={disabled} />)}
                 </FormItem>
               </Col>
               <Col span={12}>
@@ -422,7 +425,7 @@ class BusinessInfo extends Component {
                       { pattern: /^[A-Za-z\u4e00-\u9fa5]+$/, message: '请输入汉字或字母!' },
                     ],
                     initialValue: businessInfo.contactName,
-                  })(<Input />)}
+                  })(<Input disabled={disabled} />)}
                 </FormItem>
               </Col>
               <Col span={12}>
@@ -433,7 +436,7 @@ class BusinessInfo extends Component {
                       { validator: validatePhone, message: '请输入正确的手机号!' },
                     ],
                     initialValue: businessInfo.contactPhone,
-                  })(<Input maxLength={11} />)}
+                  })(<Input maxLength={11} disabled={disabled} />)}
                 </FormItem>
               </Col>
               <Col span={12}>
@@ -444,7 +447,7 @@ class BusinessInfo extends Component {
                       { validator: validateEMail, message: '请输入正确的邮箱！' },
                     ],
                     initialValue: businessInfo.contactEmail,
-                  })(<Input />)}
+                  })(<Input disabled={disabled} />)}
                 </FormItem>
               </Col>
               {+mainCategoryId !== carID && (
@@ -454,7 +457,7 @@ class BusinessInfo extends Component {
                       {getFieldDecorator('servicePhone', {
                         rules: [{ required: true, message: '请输入客服电话!' }],
                         initialValue: businessInfo.servicePhone,
-                      })(<Input maxLength={11} />)}
+                      })(<Input maxLength={11} disabled={disabled} />)}
                     </FormItem>
                   </Col>
                   <Col span={24}>
@@ -462,7 +465,7 @@ class BusinessInfo extends Component {
                       {getFieldDecorator('signDateType', {
                         rules: [{ required: true, message: '请选择签约日期' }],
                         initialValue: businessInfo.signDateType,
-                      })(<Checkbox.Group options={signDateTypeList} />)}
+                      })(<Checkbox.Group options={signDateTypeList} disabled={disabled} />)}
                     </FormItem>
                   </Col>
                 </>
@@ -479,6 +482,7 @@ class BusinessInfo extends Component {
                   <Upload
                     {...uploadPropsFn.call(this, { keyName: 'primaryImage', type: 1 })}
                     fileList={businessInfo.primaryImage}
+                    disabled={disabled}
                   >
                     <UploadOutlined /> 上传文件
                   </Upload>,
@@ -492,7 +496,11 @@ class BusinessInfo extends Component {
                     {getFieldDecorator('selfList', {
                       initialValue: businessInfo.selfList,
                     })(
-                      <Select mode="multiple" filterOption={fileterBrandOptions}>
+                      <Select
+                        mode="multiple"
+                        filterOption={fileterBrandOptions}
+                        disabled={disabled}
+                      >
                         {this.state.serviceFacilitys.map(item => (
                           <Option value={item.code} key={item.code}>
                             {item.desc}
@@ -523,7 +531,7 @@ class BusinessInfo extends Component {
                     })(
                       <Radio.Group
                         onChange={this.onChangeCompanyType}
-                        disabled={businessInfo.companyType}
+                        disabled={businessInfo.companyType || disabled}
                       >
                         <Radio value={1}>一般纳税人</Radio>
                         <Radio value={2}>小规模</Radio>
@@ -547,6 +555,7 @@ class BusinessInfo extends Component {
                         this.dealImgInfo,
                       )}
                       fileList={businessInfo.businessLicenseImage}
+                      disabled={disabled}
                     >
                       <UploadOutlined /> 上传文件
                     </Upload>,
@@ -558,16 +567,17 @@ class BusinessInfo extends Component {
                   <Col span={12}>
                     <Row>
                       <Col span={4} style={{ marginTop: '4px' }}>
-                        {businessInfo.companyName && (
+                        {/* 二期放开 */}
+                        {/* {businessInfo.companyName && (
                           <Button onClick={this.setCompanyName}>修改</Button>
-                        )}
+                        )} */}
                       </Col>
                       <Col span={12}>
                         <FormItem label="公司名称" labelCol={{ span: 8 }}>
                           {getFieldDecorator('companyName', {
                             rules: [{ required: true, message: '请输入公司名称!' }],
                             initialValue: businessInfo.companyName,
-                          })(<Input maxLength={50} disabled={companyNamedis} />)}
+                          })(<Input maxLength={50} disabled={companyNamedis || disabled} />)}
                         </FormItem>
                       </Col>
                     </Row>
@@ -580,7 +590,7 @@ class BusinessInfo extends Component {
                           { pattern: /^[A-Za-z0-9]*$/, message: '仅支持输入数字和字母' },
                         ],
                         initialValue: businessInfo.socialCode,
-                      })(<Input maxLength={18} />)}
+                      })(<Input maxLength={18} disabled={disabled} />)}
                     </FormItem>
                   </Col>
                   {(!companyNamedis &&
@@ -603,6 +613,7 @@ class BusinessInfo extends Component {
                               limit: 1,
                             })}
                             fileList={businessInfo.icbProofImage}
+                            disabled={disabled}
                           >
                             <UploadOutlined /> 上传文件
                           </Upload>,
@@ -628,6 +639,7 @@ class BusinessInfo extends Component {
                               limit: 1,
                             })}
                             fileList={businessInfo.householdRegisterImage}
+                            disabled={disabled}
                           >
                             <UploadOutlined /> 上传文件
                           </Upload>,
@@ -642,7 +654,7 @@ class BusinessInfo extends Component {
                       {getFieldDecorator('businessLicensePeriod', {
                         rules: [{ required: true, message: '请选择营业执照有效期!' }],
                         initialValue: businessInfo.businessLicensePeriod,
-                      })(<DatePicker maxLength={50} />)}
+                      })(<DatePicker maxLength={50} disabled={disabled} />)}
                     </FormItem>
                   </Col>
                   <Col span={24}>
@@ -657,6 +669,7 @@ class BusinessInfo extends Component {
                             limit: 9,
                           })}
                           fileList={businessInfo.categoryQualificateImage}
+                          disabled={disabled}
                         >
                           <UploadOutlined /> 上传文件
                         </Upload>,
@@ -678,6 +691,7 @@ class BusinessInfo extends Component {
                             limit: 1,
                           })}
                           fileList={businessInfo.sealImage}
+                          disabled={disabled}
                         >
                           <UploadOutlined /> 上传文件
                         </Upload>,
@@ -692,7 +706,7 @@ class BusinessInfo extends Component {
                     <FormItem label="授权品牌" labelCol={{ span: 4 }}>
                       {getFieldDecorator('brand', {
                         initialValue: businessInfo.brand,
-                      })(<Input maxLength={32} />)}
+                      })(<Input maxLength={32} disabled={disabled} />)}
                     </FormItem>
                   </Col>
                   <Col span={24}>
@@ -710,6 +724,7 @@ class BusinessInfo extends Component {
                             limit: 1,
                           })}
                           fileList={businessInfo.brandCertificate}
+                          disabled={disabled}
                         >
                           <UploadOutlined /> 上传文件
                         </Upload>,
@@ -741,6 +756,7 @@ class BusinessInfo extends Component {
                             this.dealImgInfo,
                           )}
                           fileList={businessInfo.idCardPortraitImage}
+                          disabled={disabled}
                         >
                           <UploadOutlined />
                           <div>身份证人像面</div>
@@ -765,6 +781,7 @@ class BusinessInfo extends Component {
                             this.dealImgInfo,
                           )}
                           fileList={businessInfo.idCardEmblemImage}
+                          disabled={disabled}
                         >
                           <UploadOutlined />
                           <div>身份证国徽面</div>
@@ -777,7 +794,7 @@ class BusinessInfo extends Component {
                       {getFieldDecorator('legalPersonName', {
                         rules: [{ required: true, message: '请输入证件姓名!' }],
                         initialValue: businessInfo.legalPersonName,
-                      })(<Input maxLength={8} />)}
+                      })(<Input maxLength={8} disabled={disabled} />)}
                     </FormItem>
                   </Col>
                   <Col span={12}>
@@ -788,7 +805,7 @@ class BusinessInfo extends Component {
                           { pattern: /^[A-Za-z0-9]*$/, message: '请输入数字或字母' },
                         ],
                         initialValue: businessInfo.legalPersonIdCard,
-                      })(<Input maxLength={18} />)}
+                      })(<Input maxLength={18} disabled={disabled} />)}
                     </FormItem>
                   </Col>
                   <Col span={12}>
@@ -796,7 +813,7 @@ class BusinessInfo extends Component {
                       {getFieldDecorator('legalPersonStart', {
                         rules: [{ required: true, message: '身份证起始有效期!' }],
                         initialValue: businessInfo.legalPersonStart,
-                      })(<DatePicker style={{ width: '200px' }} />)}
+                      })(<DatePicker style={{ width: '200px' }} disabled={disabled} />)}
                     </FormItem>
                   </Col>
                   <Col span={12}>
@@ -810,7 +827,12 @@ class BusinessInfo extends Component {
                           {getFieldDecorator('legalPersonEnd', {
                             rules: [{ required: !checkboxDisabled, message: '身份证结束有效期!' }],
                             initialValue: businessInfo.legalPersonEnd,
-                          })(<DatePicker style={{ width: '200px' }} disabled={checkboxDisabled} />)}
+                          })(
+                            <DatePicker
+                              style={{ width: '200px' }}
+                              disabled={checkboxDisabled || disabled}
+                            />,
+                          )}
                         </FormItem>
                       </Col>
                       <Col span={5}>
@@ -822,6 +844,7 @@ class BusinessInfo extends Component {
                               options={legalPersonList}
                               className={styles.radio}
                               onChange={e => this.oncheckedChange(e)}
+                              disabled={disabled}
                             />,
                           )}
                         </FormItem>
@@ -838,7 +861,7 @@ class BusinessInfo extends Component {
                       { validator: validatePhone, message: '请输入正确的手机号!' },
                     ],
                     initialValue: businessInfo.legalPersonPhone,
-                  })(<Input maxLength={11} />)}
+                  })(<Input maxLength={11} disabled={disabled} />)}
                 </FormItem>
               </Col>
               {+mainCategoryId !== carID && (
@@ -850,6 +873,7 @@ class BusinessInfo extends Component {
                       <Upload
                         {...uploadPropsFn.call(this, { keyName: 'otherImage', limit: 9, type: 7 })}
                         fileList={businessInfo.otherImage}
+                        disabled={disabled}
                       >
                         <UploadOutlined /> 上传文件
                       </Upload>,
@@ -869,7 +893,10 @@ class BusinessInfo extends Component {
                         rules: [{ required: true, message: '请选择账户类型!' }],
                         initialValue: businessInfo.settlementType,
                       })(
-                        <Radio.Group onChange={e => this.onChangeSettlType(e?.target?.value)}>
+                        <Radio.Group
+                          onChange={e => this.onChangeSettlType(e?.target?.value)}
+                          disabled={disabled}
+                        >
                           <Radio value={1} disabled={[2].includes(companyType)}>
                             对公
                           </Radio>
@@ -895,6 +922,7 @@ class BusinessInfo extends Component {
                               type: 8,
                             })}
                             fileList={businessInfo.accountOpenPermitImage}
+                            disabled={disabled}
                           >
                             <UploadOutlined /> 上传文件
                           </Upload>,
@@ -909,7 +937,7 @@ class BusinessInfo extends Component {
                             { pattern: /^[A-Za-z0-9]*$/, message: '请输入数字或字母' },
                           ],
                           initialValue: businessInfo.bankAccountLicenseNum,
-                        })(<Input />)}
+                        })(<Input disabled={disabled} />)}
                       </FormItem>
                     </Col>
                     <Col span={12}>
@@ -917,7 +945,7 @@ class BusinessInfo extends Component {
                         {getFieldDecorator('bankAccountName', {
                           rules: [{ required: true, message: '请输入开户名称!' }],
                           initialValue: businessInfo.bankAccountName,
-                        })(<Input maxLength={32} />)}
+                        })(<Input maxLength={32} disabled={disabled} />)}
                       </FormItem>
                     </Col>
                     <Col span={12}>
@@ -931,6 +959,7 @@ class BusinessInfo extends Component {
                             filterOption={(input, option) =>
                               (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
                             }
+                            disabled={disabled}
                           >
                             {this.state.bankList.map(item => (
                               <Option value={item.bankName} key={item.bankName}>
@@ -949,7 +978,7 @@ class BusinessInfo extends Component {
                             { pattern: /^[0-9]*$/, message: '请输入数字' },
                           ],
                           initialValue: businessInfo.bankAccount,
-                        })(<Input />)}
+                        })(<Input disabled={disabled} />)}
                       </FormItem>
                     </Col>
                     <Col span={12}>
@@ -957,7 +986,7 @@ class BusinessInfo extends Component {
                         {getFieldDecorator('interbankNum', {
                           rules: [{ pattern: /^[0-9]*$/, message: '请输入数字' }],
                           initialValue: businessInfo.interbankNum,
-                        })(<Input maxLength={50} />)}
+                        })(<Input maxLength={50} disabled={disabled} />)}
                       </FormItem>
                     </Col>
                     <Col span={24}>
@@ -975,6 +1004,7 @@ class BusinessInfo extends Component {
                               limit: 1,
                             })}
                             fileList={businessInfo.differentNameAuthorizationImage}
+                            disabled={disabled}
                           >
                             <UploadOutlined /> 上传文件
                           </Upload>,
@@ -991,7 +1021,7 @@ class BusinessInfo extends Component {
                           rules: [{ required: true, message: '请选择银行卡类型!' }],
                           initialValue: businessInfo.bankAccountType,
                         })(
-                          <Select>
+                          <Select disabled={disabled}>
                             <Option value={1} key={1}>
                               借记卡
                             </Option>
@@ -1004,7 +1034,7 @@ class BusinessInfo extends Component {
                         {getFieldDecorator('bankAccountName', {
                           rules: [{ required: true, message: '请输入开户名称!' }],
                           initialValue: businessInfo.bankAccountName,
-                        })(<Input maxLength={32} />)}
+                        })(<Input maxLength={32} disabled={disabled} />)}
                       </FormItem>
                     </Col>
                     <Col span={12}>
@@ -1018,6 +1048,7 @@ class BusinessInfo extends Component {
                             filterOption={(input, option) =>
                               (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
                             }
+                            disabled={disabled}
                           >
                             {this.state.bankList.map(item => (
                               <Option value={item.bankName} key={item.bankName}>
@@ -1036,7 +1067,7 @@ class BusinessInfo extends Component {
                             { pattern: /^[0-9]*$/, message: '请输入数字' },
                           ],
                           initialValue: businessInfo.bankAccount,
-                        })(<Input />)}
+                        })(<Input disabled={disabled} />)}
                       </FormItem>
                     </Col>
                   </Row>
@@ -1057,6 +1088,7 @@ class BusinessInfo extends Component {
                           type: 8,
                         })}
                         fileList={businessInfo.accountOpenPermitImage}
+                        disabled={disabled}
                       >
                         <UploadOutlined /> 上传文件
                       </Upload>,
@@ -1068,7 +1100,7 @@ class BusinessInfo extends Component {
                     {getFieldDecorator('bankAccountName', {
                       rules: [{ required: true, message: '请输入开户名称!' }],
                       initialValue: businessInfo.bankAccountName,
-                    })(<Input maxLength={32} />)}
+                    })(<Input maxLength={32} disabled={disabled} />)}
                   </FormItem>
                 </Col>
                 <Col span={12}>
@@ -1082,6 +1114,7 @@ class BusinessInfo extends Component {
                         filterOption={(input, option) =>
                           (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
                         }
+                        disabled={disabled}
                       >
                         {this.state.bankList.map(item => (
                           <Option value={item.bankName} key={item.bankName}>
@@ -1100,7 +1133,7 @@ class BusinessInfo extends Component {
                         { pattern: /^[0-9]*$/, message: '请输入数字' },
                       ],
                       initialValue: businessInfo.bankAccount,
-                    })(<Input />)}
+                    })(<Input disabled={disabled} />)}
                   </FormItem>
                 </Col>
               </Row>
@@ -1114,21 +1147,21 @@ class BusinessInfo extends Component {
                     {getFieldDecorator('giftPackageContent', {
                       rules: [{ required: true, message: '请输入礼包内容!' }],
                       initialValue: businessInfo.giftPackageContent,
-                    })(<Input style={{ width: '50%' }} />)}
+                    })(<Input style={{ width: '50%' }} disabled={disabled} />)}
                   </FormItem>
                 </Col>
               </Row>
             </Card>
           )}
-
-          <div className={styles.formBtns}>
+          {/* 临时注释二期放开 */}
+          {/* <div className={styles.formBtns}>
             <Button type="primary" size="large" htmlType="submit" loading={this.state.loading}>
               修改并提交
             </Button>
             <Button size="large" onClick={this.onCancel}>
               取消
             </Button>
-          </div>
+          </div> */}
         </Form>
         {this.state.visibleLoading && (
           <div className={styles.spinBox}>