Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
3bfa2736
Commit
3bfa2736
authored
Feb 19, 2021
by
王昆
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
'审核页面调整'
parent
b209ddfc
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
46 additions
and
17 deletions
+46
-17
xgg-web/app/base/db/impl/bmuserbizDao.js
+1
-1
xgg-web/app/base/wxapplet/impl/xggApplet.js
+4
-2
xgg-web/app/front/entry/audit_page.ejs
+21
-5
xgg-web/app/front/entry/public/js/audit_page.js
+20
-9
No files found.
xgg-web/app/base/db/impl/bmuserbizDao.js
View file @
3bfa2736
...
@@ -54,7 +54,7 @@ class BmuserbizDao extends Dao{
...
@@ -54,7 +54,7 @@ class BmuserbizDao extends Dao{
let
sql
=
[];
let
sql
=
[];
sql
.
push
(
"SELECT"
);
sql
.
push
(
"SELECT"
);
sql
.
push
(
"t1.*, "
);
sql
.
push
(
"t1.*, "
);
sql
.
push
(
"t1.merchantId, t2.companyId, t2.orderNo, t2.audit_status"
);
sql
.
push
(
"t1.merchantId, t2.companyId, t2.orderNo, t2.audit_status
, t2.reject_reason
"
);
sql
.
push
(
"FROM bm_user_biz t1"
);
sql
.
push
(
"FROM bm_user_biz t1"
);
sql
.
push
(
"INNER JOIN bm_order t2 ON t1.orderId = t2.id"
);
sql
.
push
(
"INNER JOIN bm_order t2 ON t1.orderId = t2.id"
);
sql
.
push
(
"WHERE 1 = 1 "
);
sql
.
push
(
"WHERE 1 = 1 "
);
...
...
xgg-web/app/base/wxapplet/impl/xggApplet.js
View file @
3bfa2736
...
@@ -345,16 +345,18 @@ class xggApplet extends AppletBase {
...
@@ -345,16 +345,18 @@ class xggApplet extends AppletBase {
}
}
}
}
async
toAuditOrders
(
gobj
,
pobj
,
req
)
{
async
auditPage
(
gobj
,
pobj
,
req
)
{
pobj
=
pobj
.
search
||
{};
pobj
=
pobj
.
search
||
{};
try
{
try
{
let
params
=
{
let
params
=
{
pageSize
:
pobj
.
pageSize
||
10
,
pageSize
:
pobj
.
pageSize
||
10
,
currentPage
:
pobj
.
currentPage
||
1
,
currentPage
:
pobj
.
currentPage
||
1
,
audit_status
:
0
,
merchantId
:
this
.
merchantId
,
merchantId
:
this
.
merchantId
,
legalName
:
this
.
trim
(
pobj
.
legalName
)
legalName
:
this
.
trim
(
pobj
.
legalName
)
};
};
if
(
pobj
.
auditStatus
!==
""
)
{
params
.
audit_status
=
Number
(
pobj
.
auditStatus
);
}
//0待审核 1审核通过
//0待审核 1审核通过
let
page
=
await
this
.
bmuserbizSve
.
pageByCondition
(
params
);
let
page
=
await
this
.
bmuserbizSve
.
pageByCondition
(
params
);
let
result
=
{
code
:
1
,
data
:
page
};
let
result
=
{
code
:
1
,
data
:
page
};
...
...
xgg-web/app/front/entry/audit_page.ejs
View file @
3bfa2736
...
@@ -202,9 +202,21 @@
...
@@ -202,9 +202,21 @@
<el-card
style=
"background-color: #FFFFFF;padding:10px 10px 30px 10px;margin-top: 20px;"
>
<el-card
style=
"background-color: #FFFFFF;padding:10px 10px 30px 10px;margin-top: 20px;"
>
<div
style=
"width:100%;line-height: 40px;"
>
<div
style=
"width:100%;line-height: 40px;"
>
<div
style=
"float:left;width: 300px;"
>
<div
style=
"float:left;width: 300px;"
>
<span
style=
"font-size: 14px;color: 2F2F2F;"
>
姓名:
</span>
<span
style=
"font-size: 14px;color: 2F2F2F;"
>
法人
姓名:
</span>
<el-input
v-model=
"search.legalName"
placeholder=
"姓名"
maxlength=
"100"
clearable
style=
"max-width:200px;height: 36px;"
></el-input>
<el-input
v-model=
"search.legalName"
placeholder=
"姓名"
maxlength=
"100"
clearable
style=
"max-width:200px;height: 36px;"
></el-input>
</div>
</div>
<div
style=
"float:left;width: 300px;"
>
<span
style=
"font-size: 14px;color: 2F2F2F;"
>
审核状态:
</span>
<el-select
v-model=
"search.auditStatus"
style=
"max-width:200px;height: 36px;"
clearable
>
<el-option
v-for=
"item in auditStatusList"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
>
</el-option>
</el-select>
</div>
<div
style=
"float:left;margin-top:5px;"
>
<div
style=
"float:left;margin-top:5px;"
>
<el-button
@
click=
"resetSearch()"
style=
"float:right;width:68px;height:36px;background-color: #54C4A7;color: #FFFFFF;font-size: 14px;padding-top:10px;"
>
重置
</el-button>
<el-button
@
click=
"resetSearch()"
style=
"float:right;width:68px;height:36px;background-color: #54C4A7;color: #FFFFFF;font-size: 14px;padding-top:10px;"
>
重置
</el-button>
...
@@ -231,9 +243,12 @@
...
@@ -231,9 +243,12 @@
<el-table-column
prop=
"legal_name"
label=
"姓名"
:formatter=
"onColFormater"
align=
"center"
></el-table-column>
<el-table-column
prop=
"legal_name"
label=
"姓名"
:formatter=
"onColFormater"
align=
"center"
></el-table-column>
<el-table-column
prop=
"legal_mobile"
label=
"手机号"
:formatter=
"onColFormater"
align=
"center"
></el-table-column>
<el-table-column
prop=
"legal_mobile"
label=
"手机号"
:formatter=
"onColFormater"
align=
"center"
></el-table-column>
<el-table-column
prop=
"idcard"
label=
"身份证"
:formatter=
"onColFormater"
align=
"center"
></el-table-column>
<el-table-column
prop=
"idcard"
label=
"身份证"
:formatter=
"onColFormater"
align=
"center"
></el-table-column>
<el-table-column
prop=
"audit_status_name"
label=
"审核状态"
:formatter=
"onColFormater"
align=
"center"
></el-table-column>
<el-table-column
prop=
"reject_reason"
label=
"审核备注"
:formatter=
"onColFormater"
align=
"center"
></el-table-column>
<el-table-column
label=
"操作"
align=
"center"
>
<el-table-column
label=
"操作"
align=
"center"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<a
href=
"javascript:;"
@
click=
"openAudit(scope.row)"
style=
"text-decoration: none;color:#59C1A6;font-size: 14px;"
>
审核
</a>
<a
v-if=
"scope.row.audit_status == 0"
href=
"javascript:;"
@
click=
"openAudit(scope.row, 'edit')"
style=
"text-decoration: none;color:#59C1A6;font-size: 14px;"
>
审核
</a>
<a
v-if=
"scope.row.audit_status != 0"
href=
"javascript:;"
@
click=
"openAudit(scope.row, 'view')"
style=
"text-decoration: none;font-size: 14px;"
>
详情
</a>
</template>
</template>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
...
@@ -262,12 +277,13 @@
...
@@ -262,12 +277,13 @@
<div
style=
"font-size:13px;margin-left: 40px;margin-top: 10px;"
>
订单编号: {{auditItem.orderNo}}
</div>
<div
style=
"font-size:13px;margin-left: 40px;margin-top: 10px;"
>
订单编号: {{auditItem.orderNo}}
</div>
<div
style=
"font-size:13px;margin-left: 40px;margin-top: 5px;"
>
订单状态: {{auditItem.audit_status_name}}
</div>
<div
style=
"font-size:13px;margin-left: 40px;margin-top: 5px;"
>
订单状态: {{auditItem.audit_status_name}}
</div>
<div
style=
"font-size:13px;margin-left: 40px;margin-top: 5px;"
>
创建时间: {{auditItem.created_at}}
</div>
<div
style=
"font-size:13px;margin-left: 40px;margin-top: 5px;"
>
创建时间: {{auditItem.created_at}}
</div>
<div
v-if=
"auditItem.audit_status == 2"
style=
"font-size:13px;margin-left: 40px;margin-top: 5px;color: red;"
>
驳回原因: {{auditItem.reject_reason}}
</div>
</el-card>
</el-card>
<el-card
style=
"line-height: 15px;margin-top: 15px;"
>
<el-card
style=
"line-height: 15px;margin-top: 15px;"
>
<span
style=
"font-size:15px;color: #333333;font-weight:bold;margin-left: 7px;"
>
公司信息
</span>
<span
style=
"font-size:15px;color: #333333;font-weight:bold;margin-left: 7px;"
>
公司信息
</span>
<!-- <div style="font-size:13px;margin-left: 40px;margin-top: 10px;">公司名称: {{auditItem.companyName}}(恒昌)</div>--
>
<div
style=
"font-size:13px;margin-left: 40px;margin-top: 10px;"
>
所属公司: {{auditItem.companyName}}(恒昌)
</div
>
<div
style=
"font-size:13px;margin-left: 40px;margin-top: 10px;"
>
个体户
申请名称: {{auditItem.companyNames}}
</div>
<div
style=
"font-size:13px;margin-left: 40px;margin-top: 10px;"
>
申请名称: {{auditItem.companyNames}}
</div>
</el-card>
</el-card>
<el-card
style=
"line-height: 15px;margin-top: 15px;"
>
<el-card
style=
"line-height: 15px;margin-top: 15px;"
>
<span
style=
"font-size:15px;color: #333333;font-weight:bold;margin-left: 7px;"
>
法人信息
</span>
<span
style=
"font-size:15px;color: #333333;font-weight:bold;margin-left: 7px;"
>
法人信息
</span>
...
@@ -308,7 +324,7 @@
...
@@ -308,7 +324,7 @@
</div>
</div>
</el-card>
</el-card>
<el-card
style=
"line-height: 15px;margin-top: 15px;"
>
<el-card
v-if=
"showTag == 'edit'"
style=
"line-height: 15px;margin-top: 15px;"
>
<span
style=
"font-size:15px;color: #333333;font-weight:bold;margin-left: 7px;"
>
审核结果
</span>
<span
style=
"font-size:15px;color: #333333;font-weight:bold;margin-left: 7px;"
>
审核结果
</span>
<el-input
<el-input
type=
"textarea"
type=
"textarea"
...
...
xgg-web/app/front/entry/public/js/audit_page.js
View file @
3bfa2736
...
@@ -5,6 +5,7 @@ var app = new Vue({
...
@@ -5,6 +5,7 @@ var app = new Vue({
btnloading
:
false
,
btnloading
:
false
,
uploadLoading
:
null
,
uploadLoading
:
null
,
showAudit
:
false
,
showAudit
:
false
,
showTag
:
"view"
,
auditLoading
:
false
,
auditLoading
:
false
,
search
:
{
search
:
{
list
:
[],
list
:
[],
...
@@ -12,9 +13,15 @@ var app = new Vue({
...
@@ -12,9 +13,15 @@ var app = new Vue({
pageSize
:
20
,
pageSize
:
20
,
total
:
0
,
total
:
0
,
legalName
:
''
,
legalName
:
''
,
auditStatus
:
''
,
},
},
auditItem
:
{},
auditItem
:
{},
auditReason
:
""
,
auditReason
:
""
,
auditStatusList
:
[
{
value
:
"0"
,
label
:
"待审核"
},
{
value
:
"1"
,
label
:
"审核通过"
},
{
value
:
"2"
,
label
:
"审核驳回"
},
]
}
}
},
},
created
:
function
()
{
created
:
function
()
{
...
@@ -41,6 +48,7 @@ var app = new Vue({
...
@@ -41,6 +48,7 @@ var app = new Vue({
pageSize
:
20
,
pageSize
:
20
,
total
:
0
,
total
:
0
,
legalName
:
''
,
legalName
:
''
,
auditStatus
:
''
}
}
},
},
getParams
()
{
getParams
()
{
...
@@ -61,28 +69,31 @@ var app = new Vue({
...
@@ -61,28 +69,31 @@ var app = new Vue({
getList
()
{
getList
()
{
var
self
=
this
;
var
self
=
this
;
var
params
=
this
.
getParams
();
var
params
=
this
.
getParams
();
this
.
$root
.
postReq
(
"/applet/xggApplet/
toAuditOrders
"
,
{
this
.
$root
.
postReq
(
"/applet/xggApplet/
auditPage
"
,
{
search
:
params
search
:
params
}).
then
(
function
(
d
)
{
}).
then
(
function
(
d
)
{
if
(
d
.
code
==
1
)
{
if
(
d
.
code
==
1
)
{
self
.
search
.
list
=
d
.
data
.
rows
||
[];
self
.
search
.
list
=
d
.
data
.
rows
||
[];
self
.
search
.
total
=
d
.
data
.
count
||
0
;
self
.
search
.
total
=
d
.
data
.
count
||
0
;
for
(
let
item
of
self
.
search
.
list
)
{
if
(
item
.
audit_status
==
0
)
{
item
.
audit_status_name
=
"待审核"
;
}
else
if
(
item
.
audit_status
==
1
)
{
item
.
audit_status_name
=
"审核通过"
;
}
else
{
item
.
audit_status_name
=
"审核驳回"
;
}
}
}
else
{
}
else
{
}
}
});
});
},
},
btnclick
(
pfm
,
code
)
{
btnclick
(
pfm
,
code
)
{
},
},
openAudit
(
item
)
{
openAudit
(
item
,
tag
)
{
console
.
log
(
item
);
console
.
log
(
item
);
this
.
showTag
=
tag
;
this
.
auditItem
=
item
;
this
.
auditItem
=
item
;
if
(
item
.
audit_status
==
0
)
{
item
.
audit_status_name
=
"待审核"
;
}
else
if
(
item
.
audit_status
==
1
)
{
item
.
audit_status_name
=
"审核通过"
;
}
else
{
item
.
audit_status_name
=
"审核驳回"
;
}
if
(
item
.
companyId
==
1
)
{
if
(
item
.
companyId
==
1
)
{
item
.
companyName
=
"汇财"
item
.
companyName
=
"汇财"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment