Merge branch 'feature/settlement' into 'master'

feat: 添加结算模式

See merge request !105

src/pages/SettlementSheet/data.js

@@ -4,7 +4,8 @@ import { Button } from 'antd';
 export const dateStateEnum = {
   1: { text: '一周', maxlength: 8 },
   2: { text: '半个月', maxlength: 4 },
-  3: { text: ' 一个月', maxlength: 2 },
+  3: { text: '一个月', maxlength: 2 },
+  4: { text: '日结', maxlength: 10 },
 };
 
 export const orderStateNum = {

src/pages/businessManage/info/data.js

@@ -48,54 +48,56 @@ export async function getInfo() {
   const data = await apiBusinessDetail();
   let settlementType = 1;
   const res = data.data;
-  if (res) {
-    if (res.facilities) {
-      res.customList = res.facilities.customList || [];
-      res.selfList = res.facilities.selfList || [];
-    }
-    res.signDateType = res.signDateType ? [res.signDateType] : [];
-    res.accountOpenPermitImage = res.accountOpenPermitImage
-      ? [{ uid: 0, url: res.accountOpenPermitImage }]
-      : [];
-    res.businessLicenseImage = res.businessLicenseImage
-      ? [{ uid: 0, url: res.businessLicenseImage }]
-      : [];
-    res.idCardEmblemImage = res.idCardEmblemImage ? [{ uid: 0, url: res.idCardEmblemImage }] : [];
-    res.idCardPortraitImage = res.idCardPortraitImage
-      ? [{ uid: 0, url: res.idCardPortraitImage }]
-      : [];
-    res.primaryImage = res.primaryImage ? [{ uid: 0, url: res.primaryImage }] : [];
-    res.sealImage = res.sealImage ? [{ uid: 0, url: res.sealImage }] : [];
-    res.brandCertificate = res.brandCertificate ? [{ uid: 0, url: res.brandCertificate }] : [];
-    // 非同名结算授权文件
-    res.differentNameAuthorizationImage = res.differentNameAuthorizationImage
-      ? [{ uid: 0, url: res.brandCertificate }]
-      : [];
-    // 户口本本人页
-    res.householdRegisterImage = res.householdRegisterImage
-      ? [{ uid: 0, url: res.householdRegisterImage }]
-      : [];
-    // 工商局
-    res.icbProofImage = res.icbProofImage ? [{ uid: 0, url: res.icbProofImage }] : [];
-    if (res.categoryQualificateImage && res.categoryQualificateImage.length) {
-      res.categoryQualificateImage = res.categoryQualificateImage.map((item, index) => ({
-        uid: index,
-        url: item,
-      }));
-    }
-    if (res.otherImage && res.otherImage.length) {
-      res.otherImage = res.otherImage.map((item, index) => ({
-        uid: index,
-        url: item,
-      }));
-    }
-    res.addr = [res.provinceId, res.cityId, res.countyId];
-    if (res.townId) {
-      res.addr.push(res.townId);
-    }
-    if (settlementType !== null) {
-      settlementType = +res.settlementType;
-    }
+  console.log('res :>> ', res);
+  if (!res) {
+    return;
+  }
+  if (res.facilities) {
+    res.customList = res.facilities.customList || [];
+    res.selfList = res.facilities.selfList || [];
+  }
+  res.signDateType = res.signDateType ? [res.signDateType] : [];
+  res.accountOpenPermitImage = res.accountOpenPermitImage
+    ? [{ uid: 0, url: res.accountOpenPermitImage }]
+    : [];
+  res.businessLicenseImage = res.businessLicenseImage
+    ? [{ uid: 0, url: res.businessLicenseImage }]
+    : [];
+  res.idCardEmblemImage = res.idCardEmblemImage ? [{ uid: 0, url: res.idCardEmblemImage }] : [];
+  res.idCardPortraitImage = res.idCardPortraitImage
+    ? [{ uid: 0, url: res.idCardPortraitImage }]
+    : [];
+  res.primaryImage = res.primaryImage ? [{ uid: 0, url: res.primaryImage }] : [];
+  res.sealImage = res.sealImage ? [{ uid: 0, url: res.sealImage }] : [];
+  res.brandCertificate = res.brandCertificate ? [{ uid: 0, url: res.brandCertificate }] : [];
+  // 非同名结算授权文件
+  res.differentNameAuthorizationImage = res.differentNameAuthorizationImage
+    ? [{ uid: 0, url: res.brandCertificate }]
+    : [];
+  // 户口本本人页
+  res.householdRegisterImage = res.householdRegisterImage
+    ? [{ uid: 0, url: res.householdRegisterImage }]
+    : [];
+  // 工商局
+  res.icbProofImage = res.icbProofImage ? [{ uid: 0, url: res.icbProofImage }] : [];
+  if (res.categoryQualificateImage && res.categoryQualificateImage.length) {
+    res.categoryQualificateImage = res.categoryQualificateImage.map((item, index) => ({
+      uid: index,
+      url: item,
+    }));
+  }
+  if (res.otherImage && res.otherImage.length) {
+    res.otherImage = res.otherImage.map((item, index) => ({
+      uid: index,
+      url: item,
+    }));
+  }
+  res.addr = [res.provinceId, res.cityId, res.countyId];
+  if (res.townId) {
+    res.addr.push(res.townId);
+  }
+  if (settlementType !== null) {
+    settlementType = +res.settlementType;
   }
   // 身份证有效期处理
   let checkboxDisabled = false;

src/pages/businessManage/info/index.jsx

 import React, { Component } from 'react';
-import { history } from 'umi';
 import moment from 'moment';
 import { ArrowRightOutlined, UploadOutlined } from '@ant-design/icons';
 import { Form } from '@ant-design/compatible';
@@ -31,7 +30,7 @@ import {
   getServiceFacility,
   businessModel,
   getInfo,
-  getBankList,
+  // getBankList,
   businessTypeDesc,
   signDateTypeList,
   legalPersonList,
@@ -62,7 +61,7 @@ class BusinessInfo extends Component {
     areaAddr: [], // 四级地址列表
     categoryList: [], // 主要类目
     serviceFacilitys: [], // 服务设施
-    bankList: [], // 开户行
+    // bankList: [], // 开户行
     settlementType: 1,
     // loading: false,
     visibleLoading: false,
@@ -77,7 +76,7 @@ class BusinessInfo extends Component {
     await getInfo.call(this);
     getAreaAddr.call(this);
     getServiceFacility.call(this);
-    getBankList.call(this);
+    // getBankList.call(this);
   }
 
   // 主营类目
@@ -997,23 +996,9 @@ class BusinessInfo extends Component {
                     <Col span={12}>
                       <FormItem label="开户行" labelCol={{ span: 8 }}>
                         {getFieldDecorator('accountBankName', {
-                          rules: [{ required: true, message: '请选择开户行!' }],
+                          rules: [{ required: true, message: '请输入开户行!' }],
                           initialValue: businessInfo.accountBankName,
-                        })(
-                          <Select
-                            showSearch
-                            filterOption={(input, option) =>
-                              (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
-                            }
-                            disabled={disabled}
-                          >
-                            {this.state.bankList.map(item => (
-                              <Option value={item.bankName} key={item.bankName}>
-                                {item.bankName}
-                              </Option>
-                            ))}
-                          </Select>,
-                        )}
+                        })(<Input maxLength={100} disabled={disabled} />)}
                       </FormItem>
                     </Col>
                     <Col span={12}>
@@ -1086,23 +1071,9 @@ class BusinessInfo extends Component {
                     <Col span={12}>
                       <FormItem label="开户行" labelCol={{ span: 8 }}>
                         {getFieldDecorator('accountBankName', {
-                          rules: [{ required: true, message: '请选择开户行!' }],
+                          rules: [{ required: true, message: '请输入开户行!' }],
                           initialValue: businessInfo.accountBankName,
-                        })(
-                          <Select
-                            showSearch
-                            filterOption={(input, option) =>
-                              (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
-                            }
-                            disabled={disabled}
-                          >
-                            {this.state.bankList.map(item => (
-                              <Option value={item.bankName} key={item.bankName}>
-                                {item.bankName}
-                              </Option>
-                            ))}
-                          </Select>,
-                        )}
+                        })(<Input maxLength={100} disabled={disabled} />)}
                       </FormItem>
                     </Col>
                     <Col span={12}>
@@ -1152,23 +1123,9 @@ class BusinessInfo extends Component {
                 <Col span={12}>
                   <FormItem label="开户行" labelCol={{ span: 8 }}>
                     {getFieldDecorator('accountBankName', {
-                      rules: [{ required: true, message: '请选择开户行!' }],
+                      rules: [{ required: true, message: '请输入开户行!' }],
                       initialValue: businessInfo.accountBankName,
-                    })(
-                      <Select
-                        showSearch
-                        filterOption={(input, option) =>
-                          (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
-                        }
-                        disabled={disabled}
-                      >
-                        {this.state.bankList.map(item => (
-                          <Option value={item.bankName} key={item.bankName}>
-                            {item.bankName}
-                          </Option>
-                        ))}
-                      </Select>,
-                    )}
+                    })(<Input maxLength={100} disabled={disabled} />)}
                   </FormItem>
                 </Col>
                 <Col span={12}>