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
37538382
Commit
37538382
authored
Sep 23, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了委托单登记历史记录
parent
c9931b17
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
SoilSampleItemManageHis.vue
pages/meter-entrust/SoilSampleItemManageHis.vue
+0
-0
SoilSampleManageHis.vue
pages/meter-entrust/SoilSampleManageHis.vue
+0
-0
EntrustRegisterHis.vue
pages/meter-entrust/entrust-register/EntrustRegisterHis.vue
+13
-2
No files found.
pages/meter-entrust/SoilSampleItemManageHis.vue
0 → 100644
View file @
37538382
This diff is collapsed.
Click to expand it.
pages/meter-entrust/SoilSampleManageHis.vue
0 → 100644
View file @
37538382
This diff is collapsed.
Click to expand it.
pages/meter-entrust/entrust-register/EntrustRegisterHis.vue
View file @
37538382
...
@@ -38,6 +38,7 @@
...
@@ -38,6 +38,7 @@
:fixed=
"item.fixed?item.fixed:undefined"
sortable
>
:fixed=
"item.fixed?item.fixed:undefined"
sortable
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<span
v-if=
"item.date"
>
{{
scope
.
row
[
item
.
key
]?
$dateformat
(
scope
.
row
[
item
.
key
],
'yyyy-mm-dd'
):
''
}}
</span>
<span
v-if=
"item.date"
>
{{
scope
.
row
[
item
.
key
]?
$dateformat
(
scope
.
row
[
item
.
key
],
'yyyy-mm-dd'
):
''
}}
</span>
<span
v-if=
"item.status"
>
{{
scope
.
row
[
item
.
key
].
display
}}
</span>
<span
v-else
>
{{
scope
.
row
[
item
.
key
]
}}
</span>
<span
v-else
>
{{
scope
.
row
[
item
.
key
]
}}
</span>
</
template
>
</
template
>
</vxe-table-column>
</vxe-table-column>
...
@@ -47,13 +48,15 @@
...
@@ -47,13 +48,15 @@
</div>
</div>
</div>
</div>
<MeterEntrustRecord
ref=
"entrustRecordModal"
@
on-result-change=
"_page"
></MeterEntrustRecord>
<MeterEntrustRecord
ref=
"entrustRecordModal"
@
on-result-change=
"_page"
></MeterEntrustRecord>
<SoilSampleManage
ref=
"sampleManageModal"
@
on-result-change=
"_page"
></SoilSampleManage>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
soilAptitude
,
soilEntrust
}
from
'../../../api'
import
{
soilAptitude
,
soilEntrust
}
from
'../../../api'
import
MeterEntrustRecord
from
'../../../components/operation/Operation'
import
MeterEntrustRecord
from
'../../../components/operation/Operation'
import
SoilSampleManage
from
'../SoilSampleManageHis'
export
default
{
export
default
{
components
:
{
MeterEntrustRecord
},
components
:
{
MeterEntrustRecord
,
SoilSampleManage
},
data
()
{
data
()
{
return
{
return
{
currentComponent
:
''
,
currentComponent
:
''
,
...
@@ -68,6 +71,11 @@ export default {
...
@@ -68,6 +71,11 @@ export default {
],
],
iconMsg
:
[
iconMsg
:
[
{
{
type
:
'ios-list'
,
id
:
''
,
name
:
'试样列表'
},
{
type
:
'ios-clock'
,
type
:
'ios-clock'
,
id
:
''
,
id
:
''
,
name
:
'操作日志'
name
:
'操作日志'
...
@@ -145,12 +153,15 @@ export default {
...
@@ -145,12 +153,15 @@ export default {
case
'查看样品'
:
case
'查看样品'
:
this
.
_sampleManage
(
data
.
id
)
this
.
_sampleManage
(
data
.
id
)
break
break
case
'试样列表'
:
this
.
_sampleManage
(
data
.
id
)
break
}
}
})
})
},
},
_sampleManage
(
data
)
{
_sampleManage
(
data
)
{
// 管理样品
// 管理样品
this
.
$refs
.
meterS
ampleManageModal
.
_open
(
data
)
this
.
$refs
.
s
ampleManageModal
.
_open
(
data
)
},
},
_record
(
id
)
{
_record
(
id
)
{
this
.
$refs
.
entrustRecordModal
.
_open
(
id
)
this
.
$refs
.
entrustRecordModal
.
_open
(
id
)
...
...
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