chenglb
/
PMS_Frontend_v1.0.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

tags/PMS_Frontend_v1.0.6-develop
陈宇航 1 year ago
parent
76fec6a085
commit
e29bbabe67
3 changed files with 31 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
View File

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

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

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

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

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

Write Preview
Loading…
Cancel
Save