Browse Source

fix(): 12-16处理发票配置税率回显等问题

tags/PMS_Frontend_v1.0.6-develop
陈宇航 1 year ago
parent
commit
e29bbabe67
  1. 4
      src/pages/MerchantMgm/InvoiceConf/index.scss
  2. 53
      src/pages/MerchantMgm/InvoiceConf/loadable.jsx
  3. 5
      src/pages/MerchantMgm/MerchantInfo/loadable.jsx

4
src/pages/MerchantMgm/InvoiceConf/index.scss

@ -374,7 +374,7 @@ $color-primary : var(--color-primary);
flex-direction: column;
.left-wrap {
width: 300px;
width: calc(100% - 10px);
margin-bottom: 40px;
.item {
@ -397,7 +397,7 @@ $color-primary : var(--color-primary);
width: 50%;
.right-wrap {
width: 500px;
width: calc(100% - 10px);
.item {
margin: 15px;

53
src/pages/MerchantMgm/InvoiceConf/loadable.jsx

@ -411,7 +411,8 @@ function InvoiceConf(props) {
drawer_name: res?.data?.drawer_name || "",
mini_amount: res?.data?.mini_amount || "",
max_amount: res?.data?.max_amount || "",
})
});
setRateStatus(res?.data?.tax_rate || "0");
} else {
message.error(res.message)
}
@ -730,7 +731,7 @@ function InvoiceConf(props) {
</Form.Item>
<Form.Item
label="最修改时间:"
label="最修改时间:"
name="last_time"
labelAlign="left"
className="form-item yisa-search"
@ -740,7 +741,7 @@ function InvoiceConf(props) {
className="search-group-item"
limit={90}
showTime={false}
// allowClear={false}
allowClear={false}
/>
</Form.Item>
@ -1175,114 +1176,114 @@ function InvoiceConf(props) {
form={editForm}
>
<Form.Item
label="销方名称:"
label="销方名称:"
labelAlign="left"
name="sell_name"
required={true}
className="form-item"
validateTrigger="onBlur"
rules={[
{ required: true, message: "请输入销方名称!" },
{ required: true, message: "请输入销方名称!" },
{min:0,max:50,message:"最大长度为50"}
]}
>
<Input
placeholder="请输入销方名称"
placeholder="请输入销方名称"
className="form-item"
maxLength={50}
showCount
/>
</Form.Item>
<Form.Item
label="销方识别号:"
label="销方识别号:"
labelAlign="left"
name="sell_num"
required={true}
className="form-item"
validateTrigger="onBlur"
rules={[
{ required: true, message: "请输入销方识别号!" },
{ required: true, message: "请输入销方识别号!" },
{min:0,max:30,message:"最大长度为30"}
]}
>
<Input
placeholder="请输入销方识别号"
placeholder="请输入销方识别号"
className="form-item"
maxLength={30}
showCount
/>
</Form.Item>
<Form.Item
label="销方地址:"
label="销方地址:"
labelAlign="left"
name="sell_address"
required={true}
className="form-item"
validateTrigger="onBlur"
rules={[
{ required: true, message: "请输入销方地址!" },
{ required: true, message: "请输入销方地址!" },
{min:0,max:50,message:"最大长度为50"}
]}
>
<Input
placeholder="请输入销方地址"
placeholder="请输入销方地址"
className="form-item"
maxLength={50}
showCount
/>
</Form.Item>
<Form.Item
label="销方电话:"
label="销方电话:"
labelAlign="left"
name="sell_phone"
required={true}
className="form-item"
validateTrigger="onBlur"
rules={[
{ required: true, message: "请输入正确的销方电话!",pattern:new RegExp(/^\d+$/) },
{ required: true, message: "请输入正确的销方电话!",pattern:new RegExp(/^\d+$/) },
{min:0,max:20,message:"最大长度为20"}
]}
>
<Input
placeholder="请输入销方电话"
placeholder="请输入销方电话"
className="form-item"
maxLength={20}
showCount
/>
</Form.Item>
<Form.Item
label="销方银行名称:"
label="销方银行名称:"
labelAlign="left"
name="sell_bank_name"
required={true}
className="form-item"
validateTrigger="onBlur"
rules={[
{ required: true, message: "请输入销方银行名称!" },
{ required: true, message: "请输入销方银行名称!" },
{min:0,max:50,message:"最大长度为50"}
]}
>
<Input
placeholder="请输入销方银行名称"
placeholder="请输入销方银行名称"
className="form-item"
maxLength={50}
showCount
/>
</Form.Item>
<Form.Item
label="销方银行账号:"
label="销方银行账号:"
labelAlign="left"
name="sell_bank_num"
required={true}
className="form-item"
validateTrigger="onBlur"
rules={[
{ required: true, message: "请输入正确的销方银行账号!", pattern:new RegExp(/^([1-9]{1})(\d{14}|\d{18})$/) },
{ required: true, message: "请输入正确的销方银行账号!", pattern:new RegExp(/^([1-9]{1})(\d{14}|\d{18})$/) },
{min:0,max:20,message:"最大长度为20"}
]}
>
<Input
placeholder="请输入销方银行账号"
placeholder="请输入销方银行账号"
className="form-item"
maxLength={20}
showCount
@ -1432,11 +1433,11 @@ function InvoiceConf(props) {
<div className="right">
<div className="right-wrap">
<div className="item"><div className="item-title">销货方名称</div>{records.sell_name}</div>
<div className="item"><div className="item-title">销货识别号</div>{records.sell_num}</div>
<div className="item"><div className="item-title">方地址</div>{records.sell_address}</div>
<div className="item"><div className="item-title">方电话</div>{records.sell_phone}</div>
<div className="item"><div className="item-title">方银行名称</div>{records.sell_bank_name}</div>
<div className="item"><div className="item-title">方银行账号</div>{records.sell_bank_num}</div>
<div className="item"><div className="item-title">销货识别号</div>{records.sell_num}</div>
<div className="item"><div className="item-title">方地址</div>{records.sell_address}</div>
<div className="item"><div className="item-title">方电话</div>{records.sell_phone}</div>
<div className="item"><div className="item-title">方银行名称</div>{records.sell_bank_name}</div>
<div className="item"><div className="item-title">方银行账号</div>{records.sell_bank_num}</div>
<div className="item"><div className="item-title">收款人</div>{records.pay_name}</div>
<div className="item"><div className="item-title">复核</div>{records.check_name}</div>
<div className="item"><div className="item-title">开票人</div>{records.drawer_name}</div>

5
src/pages/MerchantMgm/MerchantInfo/loadable.jsx

@ -13,7 +13,6 @@ import { SearchOutlined, DeleteOutlined } from '@ant-design/icons';
const { RangePicker } = DatePicker;
const MerchantInfo = (props) => {
const uid = props?.user?.userInfo?.user_uid;
console.log(uid, props);
const defaultData = {
tenantId: '',
tenantType: '',
@ -686,7 +685,7 @@ const MerchantInfo = (props) => {
}
///
function stopBtn(record) {
ajax.updateStatus({ id: record.id,click_status:record.status==1?2:1 }).then(
ajax.updateStatus({ id: record.id,click_status:record.status==1?2:1, uid }).then(
res => {
if (res.status == 20000) {
// setPageInfo({
@ -1169,7 +1168,7 @@ const MerchantInfo = (props) => {
{ required: true, message: "请输入正确的联系人电话!", pattern:new RegExp(/^\d+$/)}
]}
>
<Input placeholder="请输入联系人电话!" maxLength={20} showCount></Input>
<Input placeholder="请输入联系人电话!" maxLength={11} showCount></Input>
</Form.Item>
<Form.Item
name="email"

Loading…
Cancel
Save