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

商户管理系统bug修改

tags/PMS_Frontend_v1.0.6-develop
heyx 2 years ago
parent
6f01a3e5c5
commit
88155a1828
6 changed files with 89 additions and 37 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. 2
      src/config/character.config.js
  2. 2
      src/pages/InRoadMgm/BusinessMgm/AbnormalParking/ExceptionParkReport/loadable.jsx
  3. 80
      src/pages/MerchantMgm/InvoiceConf/loadable.jsx
  4. 3
      src/pages/MerchantMgm/MerchantAdmin/index.scss
  5. 31
      src/pages/MerchantMgm/MerchantAdmin/loadable.jsx
  6. 8
      src/pages/MerchantMgm/MerchantInfo/loadable.jsx

2
src/config/character.config.js
View File

@ -441,7 +441,7 @@ export default {
{ {
value: '', value: '',
label: '微信原生-微信信用分支付' label: '微信原生-微信信用分支付'
},
},
{ {
value: '', value: '',
label: '招商银行-微信小程序支付' label: '招商银行-微信小程序支付'

2
src/pages/InRoadMgm/BusinessMgm/AbnormalParking/ExceptionParkReport/loadable.jsx
View File

@ -456,4 +456,4 @@ function ExceptionParkReport(props) {
</> </>
} }
export default ExceptionParkReport;
export default ExceptionParkReport;

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

@ -19,7 +19,7 @@ function InvoiceConf() {
const parameter = { const parameter = {
info_id: '',//发票ID info_id: '',//发票ID
tenantName: '', tenantName: '',
receipt_type: 0,//发票平台
receipt_type: '',//发票平台
receipt_type_name: '', receipt_type_name: '',
invoice_item: '',//开票项目 invoice_item: '',//开票项目
sell_name: '', sell_name: '',
@ -27,8 +27,8 @@ function InvoiceConf() {
drawer_name: '', drawer_name: '',
updatePerson: '', updatePerson: '',
updateAt: '', updateAt: '',
type: 1,
status: 0,
type: "",
status: "",
status_name: '', status_name: '',
start: moment().subtract(90, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss'), start: moment().subtract(90, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss'),
end: moment().format('YYYY-MM-DD HH:mm:ss'), end: moment().format('YYYY-MM-DD HH:mm:ss'),
@ -87,7 +87,8 @@ function InvoiceConf() {
const [createVisible, setCreateVisible] = useState(false) const [createVisible, setCreateVisible] = useState(false)
//查看开关 //查看开关
const [checkVisible, setCheckVisible] = useState(false) const [checkVisible, setCheckVisible] = useState(false)
//是第一次获取列表数据
const [isFirst,setIsFirst]=useState(true)
//商户类型选择 //商户类型选择
const tenantOption = [ const tenantOption = [
{ {
@ -277,22 +278,44 @@ function InvoiceConf() {
var end=formData.end var end=formData.end
} }
setLoading(true) setLoading(true)
ajax.getInvoiceTable({ ...value, start, end }).then(
res => {
if (res.status == 20000) {
setTableData(res.data.list)
setTotal(res.data.total_records)
if(isFirst){//是第一次获取列表数据吗
ajax.getInvoiceTable({ start, end }).then(
res => {
if (res.status == 20000) {
setTableData(res.data.list)
setTotal(res.data.total_records)
setLoading(false)
setIsFirst(false)
} else {
message.error(res.message)
}
setLoading(false) setLoading(false)
} else {
message.error(res.message)
} }
setLoading(false)
}
).catch(
(err) => {
console.log(err)
}
)
).catch(
(err) => {
console.log(err)
}
)
}else{
ajax.getInvoiceTable({...value, start, end }).then(
res => {
if (res.status == 20000) {
setTableData(res.data.list)
setTotal(res.data.total_records)
setLoading(false)
} else {
message.error(res.message)
}
setLoading(false)
}
).catch(
(err) => {
console.log(err)
}
)
}
} }
//获取商户名称的下拉 //获取商户名称的下拉
const getTenantNamePull = () => { const getTenantNamePull = () => {
@ -419,7 +442,7 @@ function InvoiceConf() {
//启用/停用 //启用/停用
function stopBtn(record) { function stopBtn(record) {
ajax.updateInvoiceStatus(record.id).then(
ajax.updateInvoiceStatus({id:record.id}).then(
res => { res => {
if (res.status == 20000) { if (res.status == 20000) {
getTable() getTable()
@ -739,6 +762,7 @@ function InvoiceConf() {
className="form-item" className="form-item"
value={formData.code} value={formData.code}
maxLength={30} maxLength={30}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ code: e.target.value }) setFormData({ code: e.target.value })
}} }}
@ -751,6 +775,7 @@ function InvoiceConf() {
className="form-item" className="form-item"
value={formData.auth_code} value={formData.auth_code}
maxLength={36} maxLength={36}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ auth_code: e.target.value }) setFormData({ auth_code: e.target.value })
}} }}
@ -763,6 +788,7 @@ function InvoiceConf() {
className="form-item" className="form-item"
value={formData.request_url} value={formData.request_url}
maxLength={200} maxLength={200}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ request_url: e.target.value }) setFormData({ request_url: e.target.value })
}} }}
@ -776,6 +802,7 @@ function InvoiceConf() {
value={formData.request_code} value={formData.request_code}
showClose={true} showClose={true}
maxLength={36} maxLength={36}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ request_code: e.target.value }) setFormData({ request_code: e.target.value })
}} }}
@ -789,6 +816,7 @@ function InvoiceConf() {
value={formData.request_func} value={formData.request_func}
showClose={true} showClose={true}
maxLength={40} maxLength={40}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ request_func: e.target.value }) setFormData({ request_func: e.target.value })
}} }}
@ -802,6 +830,7 @@ function InvoiceConf() {
value={formData.namespace} value={formData.namespace}
showClose={true} showClose={true}
maxLength={200} maxLength={200}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ namespace: e.target.value }) setFormData({ namespace: e.target.value })
}} }}
@ -818,6 +847,7 @@ function InvoiceConf() {
isRequired={true} isRequired={true}
value={formData.tax_name} value={formData.tax_name}
showClose={true} showClose={true}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ tax_name: e.target.value }) setFormData({ tax_name: e.target.value })
}} }}
@ -829,6 +859,7 @@ function InvoiceConf() {
isRequired={true} isRequired={true}
value={formData.tax_num} value={formData.tax_num}
showClose={true} showClose={true}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ tax_num: e.target.value }) setFormData({ tax_num: e.target.value })
}} }}
@ -840,6 +871,7 @@ function InvoiceConf() {
isRequired={true} isRequired={true}
value={formData.sell_name} value={formData.sell_name}
showClose={true} showClose={true}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ sell_name: e.target.value }) setFormData({ sell_name: e.target.value })
}} }}
@ -851,6 +883,7 @@ function InvoiceConf() {
isRequired={true} isRequired={true}
value={formData.sell_num} value={formData.sell_num}
showClose={true} showClose={true}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ sell_num: e.target.value }) setFormData({ sell_num: e.target.value })
}} }}
@ -862,6 +895,7 @@ function InvoiceConf() {
isRequired={true} isRequired={true}
value={formData.sell_address} value={formData.sell_address}
showClose={true} showClose={true}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ sell_address: e.target.value }) setFormData({ sell_address: e.target.value })
}} }}
@ -873,6 +907,7 @@ function InvoiceConf() {
isRequired={true} isRequired={true}
value={formData.sell_phone} value={formData.sell_phone}
showClose={true} showClose={true}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ sell_phone: e.target.value }) setFormData({ sell_phone: e.target.value })
}} }}
@ -884,6 +919,7 @@ function InvoiceConf() {
isRequired={true} isRequired={true}
value={formData.sell_bank_name} value={formData.sell_bank_name}
showClose={true} showClose={true}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ sell_bank_name: e.target.value }) setFormData({ sell_bank_name: e.target.value })
}} }}
@ -895,6 +931,7 @@ function InvoiceConf() {
isRequired={true} isRequired={true}
value={formData.sell_bank_num} value={formData.sell_bank_num}
showClose={true} showClose={true}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ sell_bank_num: e.target.value }) setFormData({ sell_bank_num: e.target.value })
}} }}
@ -906,6 +943,7 @@ function InvoiceConf() {
isRequired={true} isRequired={true}
value={formData.pay_name} value={formData.pay_name}
showClose={true} showClose={true}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ pay_name: e.target.value }) setFormData({ pay_name: e.target.value })
}} }}
@ -917,6 +955,7 @@ function InvoiceConf() {
isRequired={true} isRequired={true}
value={formData.check_name} value={formData.check_name}
showClose={true} showClose={true}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ check_name: e.target.value }) setFormData({ check_name: e.target.value })
}} }}
@ -928,6 +967,7 @@ function InvoiceConf() {
isRequired={true} isRequired={true}
value={formData.drawer_name} value={formData.drawer_name}
showClose={true} showClose={true}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ drawer_name: e.target.value }) setFormData({ drawer_name: e.target.value })
}} }}
@ -938,6 +978,7 @@ function InvoiceConf() {
placeholder="请输入最小开票金额（0.01~1000）" placeholder="请输入最小开票金额（0.01~1000）"
value={formData.mini_amount} value={formData.mini_amount}
showClose={true} showClose={true}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ mini_amount: e.target.value }) setFormData({ mini_amount: e.target.value })
}} }}
@ -947,6 +988,7 @@ function InvoiceConf() {
labelPosition="left" labelPosition="left"
placeholder="请输入最大开票金额（0.01~1000）" placeholder="请输入最大开票金额（0.01~1000）"
value={formData.max_amount} value={formData.max_amount}
showCount={true}
onChange={e => { onChange={e => {
setFormData({ max_amount: e.target.value }) setFormData({ max_amount: e.target.value })
}} }}

3
src/pages/MerchantMgm/MerchantAdmin/index.scss
View File

@ -164,6 +164,9 @@ $color-primary : var(--color-primary);
height: 20px; height: 20px;
border-radius: 50%; border-radius: 50%;
border: 1px solid #67C23A; border: 1px solid #67C23A;
} }
.table-status-err { .table-status-err {

31
src/pages/MerchantMgm/MerchantAdmin/loadable.jsx
View File

@ -19,7 +19,7 @@ function MerchantAdmin() {
manage_type: '',//经营业务类型 manage_type: '',//经营业务类型
manage_type_name: "",//经营业务类型 manage_type_name: "",//经营业务类型
account: "",//管理员账号 account: "",//管理员账号
username: "",//姓名
name: "",//姓名
phone: "",//电话 phone: "",//电话
email: "",//邮箱 email: "",//邮箱
sex: "",//性别 sex: "",//性别
@ -147,7 +147,7 @@ function MerchantAdmin() {
<Popover content={ <Popover content={
<div className="operateBtn" style={{ cursor: "pointer" }} trigger="hover"> <div className="operateBtn" style={{ cursor: "pointer" }} trigger="hover">
<div onClick={() => { checkBtn(record.id) }}>详情</div> <div onClick={() => { checkBtn(record.id) }}>详情</div>
<div onClick={() => { resetPassWordBtn(record.id) }}>重置密码</div>
<div onClick={() => { resetPassWordBtn(record) }}>重置密码</div>
{ {
record.user_status == 2 ? record.user_status == 2 ?
<> <>
@ -195,11 +195,10 @@ function MerchantAdmin() {
} }
//获取表格数据 //获取表格数据
const getTable = () => {
const value =searchForm.getFieldsValue(["operatorid","phone","name","account","status"])
console.log(value);
const getTable = (data) => {
setLoading(true) setLoading(true)
ajax.getMerchantAdminTable(value).then(
ajax.getMerchantAdminTable(data).then(
res => { res => {
if (res.status == 20000) { if (res.status == 20000) {
if (banBtn) { if (banBtn) {
@ -253,9 +252,14 @@ function MerchantAdmin() {
//切换分页 //切换分页
const changePn = (pn, length) => { const changePn = (pn, length) => {
console.log(pn,length);
if (lastFormData.page_size === length) { if (lastFormData.page_size === length) {
setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
setLastFormData(Object.assign({...lastFormData, pn: pn }))
lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn }) lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
const value =searchForm.getFieldsValue(["operatorid","phone","name","account","status"])
// console.log(value);
setLastFormData({...value})
getTable(Object.assign({}, lastFormData, { pn: pn })) getTable(Object.assign({}, lastFormData, { pn: pn }))
} }
} }
@ -374,7 +378,7 @@ function MerchantAdmin() {
} }
const handleAdminStatus = () => { const handleAdminStatus = () => {
ajax.updateAdminStatus(ID).then(
ajax.updateAdminStatus({id:ID}).then(
res => { res => {
if (res.status == 20000) { if (res.status == 20000) {
getTable() getTable()
@ -389,13 +393,13 @@ function MerchantAdmin() {
) )
} }
//重置密码 //重置密码
const resetPassWordBtn = (index) => {
const resetPassWordBtn = (record) => {
setConfirm(true) setConfirm(true)
setID(index)
setID(record.id)
} }
const handleReset = () => { const handleReset = () => {
ajax.resetPassWord(ID).then(
ajax.resetPassWord({id:ID}).then(
res => { res => {
if (res.status == 20000) { if (res.status == 20000) {
getTable() getTable()
@ -540,6 +544,7 @@ function MerchantAdmin() {
pagination={false} pagination={false}
dataSource={tableData} dataSource={tableData}
loading={loading} loading={loading}
scroll={{y:800}}
></Table> ></Table>
<Pagination <Pagination
className="pagination-common" className="pagination-common"
@ -553,7 +558,7 @@ function MerchantAdmin() {
} }
} }
total={total} total={total}
current={formData.pn}
current={lastFormData.pn}
pageSize={formData.page_size} pageSize={formData.page_size}
pageSizeOptions={pageSizeOptions} pageSizeOptions={pageSizeOptions}
onChange={changePn} onChange={changePn}
@ -839,7 +844,7 @@ function MerchantAdmin() {
<div className="item"><div className="item-title">登录名：</div><span>{records.account}</span></div> <div className="item"><div className="item-title">登录名：</div><span>{records.account}</span></div>
<div className="item"><div className="item-title">姓名：</div><span>{records.username}</span></div> <div className="item"><div className="item-title">姓名：</div><span>{records.username}</span></div>
<div className="item"><div className="item-title">邮箱：</div><span>{records.email}</span></div> <div className="item"><div className="item-title">邮箱：</div><span>{records.email}</span></div>
<div className="item"><div className="item-title">性别：</div><span>{records.sex_status}</span></div>
<div className="item"><div className="item-title">性别：</div><span>{records.sex_status_name}</span></div>
</div> </div>
</div> </div>
</div> </div>

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

@ -411,6 +411,8 @@ function MerchantInfo() {
//切换分页 //切换分页
const changePn = (pn, length) => { const changePn = (pn, length) => {
console.log("pn",pn);//2
console.log("length",length);
if (lastFormData.page_size === length) { if (lastFormData.page_size === length) {
setLastFormData(Object.assign({}, lastFormData, { pn: pn })) setLastFormData(Object.assign({}, lastFormData, { pn: pn }))
lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn }) lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn })
@ -510,7 +512,7 @@ function MerchantInfo() {
} }
//启用/停用 //启用/停用
function stopBtn(record) { function stopBtn(record) {
ajax.updateStatus(record.id).then(
ajax.updateStatus({id:record.id}).then(
res => { res => {
if (res.status == 20000) { if (res.status == 20000) {
getTable() getTable()
@ -764,8 +766,8 @@ function MerchantInfo() {
} }
} }
total={total} total={total}
current={formData.pn}
pageSize={formData.page_size}
current={lastFormData.pn}
pageSize={lastFormData.page_size}
pageSizeOptions={pageSizeOptions} pageSizeOptions={pageSizeOptions}
onChange={changePn} onChange={changePn}
onShowSizeChange={changeLength} onShowSizeChange={changeLength}

Write Preview
Loading…
Cancel
Save