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
8ca5aab0
Commit
8ca5aab0
authored
Oct 21, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了操作日志
parent
fbe72935
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
7 deletions
+15
-7
Operation.vue
components/operation/Operation.vue
+14
-5
ReportMakeByEntrust.vue
...il-report-manage/report-make/tabs/ReportMakeByEntrust.vue
+1
-1
AllotByEntrust.vue
pages/soil-test-manage/test-task-manage/AllotByEntrust.vue
+0
-1
No files found.
components/operation/Operation.vue
View file @
8ca5aab0
...
...
@@ -9,7 +9,7 @@
<Form
id=
"search-contract-record"
:label-width=
"70"
inline
onsubmit=
"return false"
>
<label
class=
"label-sign"
></label>
<Form-item
label=
"操作阶段:"
>
<Input
v-model=
"formObj.origin"
@
on-enter=
"_search"
placeholder=
"请输入操作阶段"
<Input
v-model=
"formObj.origin"
@
on-enter=
"_search"
name=
"origin"
placeholder=
"请输入操作阶段"
style=
"width: 200px"
clearable
/>
</Form-item>
<Form-item
class=
"search-btn"
>
...
...
@@ -26,7 +26,8 @@
:key=
"item.key"
:field=
"item.key"
:title=
"item.title"
:min-width=
"item.width?item.width:200"
:fixed=
"item.fixed?item.fixed:undefined"
>
:min-width=
"item.width?item.width:200"
:fixed=
"item.fixed?item.fixed:undefined"
>
<template
slot-scope=
"scope"
>
<span
v-if=
"item.key==='type'"
>
{{
scope
.
row
[
item
.
key
]
===
0
?
'流转'
:
scope
.
row
[
item
.
key
]
===
1
?
'退回'
:
scope
.
row
[
item
.
key
]
===
2
?
'更新'
:
...
...
@@ -64,9 +65,9 @@ export default {
{
title
:
'责任人'
,
key
:
'liable'
,
width
:
80
}
],
formObj
:
{
entrustId
:
''
,
entrustId
:
undefined
,
origin
:
undefined
,
sampleId
:
''
sampleId
:
undefined
}
}
},
...
...
@@ -148,7 +149,15 @@ export default {
}
},
_search
()
{
this
.
$refs
.
pageTable
.
_pageChange
(
1
)
if
(
this
.
formObj
.
entrustId
!==
undefined
)
{
this
.
_page
()
}
else
if
(
this
.
formObj
.
sampleBackupId
!==
undefined
)
{
this
.
_pageBackup
()
}
else
if
(
this
.
formObj
.
samplePrepareId
!==
undefined
)
{
this
.
_pageSurplus
()
}
else
{
this
.
_pageTask
()
}
}
}
}
...
...
pages/soil-report-manage/report-make/tabs/ReportMakeByEntrust.vue
View file @
8ca5aab0
...
...
@@ -120,7 +120,7 @@ export default {
name
:
'管理样品和报告'
},
{
type
:
'ios-b
ook
'
,
type
:
'ios-b
eaker
'
,
id
:
''
,
name
:
'查看原始记录'
},
...
...
pages/soil-test-manage/test-task-manage/AllotByEntrust.vue
View file @
8ca5aab0
...
...
@@ -402,7 +402,6 @@ export default {
},
_page
:
async
function
()
{
Object
.
assign
(
this
.
formObj
,
this
.
$refs
.
pageTable
.
_searchParams
())
console
.
log
(
'this.formObj'
,
this
.
formObj
)
const
result
=
await
soilTest
.
pageExpAllot
(
this
.
$serializeForm
(
this
.
formObj
)
)
...
...
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