Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
patzn-cloud-web-back-soil
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangweidong
patzn-cloud-web-back-soil
Commits
12816a03
Commit
12816a03
authored
Jan 23, 2021
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了报告审核报告签发退回按钮
parent
80dccefa
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
55 additions
and
4 deletions
+55
-4
soil-sample.js
api/soil/soil-sample.js
+18
-0
SummaryInfo.vue
pages/soil-report-manage/report-audit/SummaryInfo.vue
+36
-3
SummaryInfo.vue
pages/soil-report-manage/report-issue/SummaryInfo.vue
+1
-1
No files found.
api/soil/soil-sample.js
View file @
12816a03
...
@@ -120,6 +120,24 @@ export default {
...
@@ -120,6 +120,24 @@ export default {
data
.
remark
data
.
remark
)
)
.
then
(
res
=>
res
),
.
then
(
res
=>
res
),
expReportIssueBack
:
data
=>
http
.
post
(
'soil/v1/exp_report/exp_report_issue_back?ids='
+
data
.
ids
+
'&remark='
+
data
.
remark
)
.
then
(
res
=>
res
),
expReportCheckBack
:
data
=>
http
.
post
(
'soil/v1/exp_report/exp_report_check_back?ids='
+
data
.
ids
+
'&remark='
+
data
.
remark
)
.
then
(
res
=>
res
),
// 样品检测退回
// 样品检测退回
testInputBack
:
data
=>
testInputBack
:
data
=>
...
...
pages/soil-report-manage/report-audit/SummaryInfo.vue
View file @
12816a03
...
@@ -60,17 +60,18 @@
...
@@ -60,17 +60,18 @@
style=
"width:400px"
>
style=
"width:400px"
>
</DatePicker>
</DatePicker>
</Modal>
</Modal>
<Reason
ref=
"reasonModal"
@
on-result-change=
"_reasonResult"
></Reason>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
soilReport
,
soilStatistics
,
soilTest
}
from
'../../../api'
import
{
soilReport
,
soilS
ample
,
soilS
tatistics
,
soilTest
}
from
'../../../api'
import
Global
from
'../../../api/config'
import
Global
from
'../../../api/config'
import
Reason
from
'../../../components/base/Reason'
/**
/**
* 报告编制的-待办-报告台账
* 报告编制的-待办-报告台账
*/
*/
export
default
{
export
default
{
components
:
{},
components
:
{
Reason
},
data
()
{
data
()
{
return
{
return
{
notOkCountList
:
[
notOkCountList
:
[
...
@@ -91,6 +92,11 @@ export default {
...
@@ -91,6 +92,11 @@ export default {
type
:
'primary'
,
type
:
'primary'
,
id
:
''
,
id
:
''
,
name
:
'提交'
name
:
'提交'
},
{
type
:
'primary'
,
id
:
''
,
name
:
'退回'
}
}
],
],
selectIds
:
[],
selectIds
:
[],
...
@@ -301,12 +307,39 @@ export default {
...
@@ -301,12 +307,39 @@ export default {
case
'提交'
:
case
'提交'
:
this
.
_submit
()
this
.
_submit
()
break
break
case
'退回'
:
this
.
_goBack
()
break
case
'search'
:
case
'search'
:
this
.
searchOpen
=
!
this
.
searchOpen
this
.
searchOpen
=
!
this
.
searchOpen
break
break
}
}
})
})
},
},
_goBack
()
{
// 退回
if
(
this
.
selectIds
.
length
===
0
)
{
this
.
$Message
.
warning
(
'请至少选择一条委托!'
)
}
else
{
this
.
$refs
.
reasonModal
.
_open
(
'退回原因'
)
}
},
_reasonResult
(
data
)
{
if
(
undefined
!==
data
&&
data
!==
''
)
{
this
.
_reportCheckBack
(
data
)
}
},
_reportCheckBack
:
async
function
(
data
)
{
const
result
=
await
soilSample
.
expReportCheckBack
({
ids
:
this
.
selectIds
,
remark
:
data
})
if
(
result
)
{
this
.
$Message
.
success
(
'退回成功!'
)
await
this
.
_page
()
}
},
// 选择审核人
// 选择审核人
_selectAuditor
()
{
_selectAuditor
()
{
if
(
this
.
selectIds
.
length
===
0
)
{
if
(
this
.
selectIds
.
length
===
0
)
{
...
...
pages/soil-report-manage/report-issue/SummaryInfo.vue
View file @
12816a03
...
@@ -330,7 +330,7 @@ export default {
...
@@ -330,7 +330,7 @@ export default {
}
}
},
},
_reportCheckBack
:
async
function
(
data
)
{
_reportCheckBack
:
async
function
(
data
)
{
const
result
=
await
soilSample
.
r
eportIssueBack
({
const
result
=
await
soilSample
.
expR
eportIssueBack
({
ids
:
this
.
selectIds
,
ids
:
this
.
selectIds
,
remark
:
data
remark
:
data
})
})
...
...
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