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
bd65a63e
Commit
bd65a63e
authored
Oct 14, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了开土制备历史的制备详情按钮
parent
becc6221
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
8 deletions
+23
-8
SoilSampleManageHis.vue
pages/soil-sample-manage/SoilSampleManageHis.vue
+23
-8
PreparationHis.vue
.../soil-sample-manage/sample-preparation/PreparationHis.vue
+0
-0
No files found.
pages/soil-sample-manage/SoilSampleManageHis.vue
View file @
bd65a63e
...
@@ -9,13 +9,13 @@
...
@@ -9,13 +9,13 @@
<Row>
<Row>
<!--查询-->
<!--查询-->
<Col
span=
"24"
>
<Col
span=
"24"
>
<Form
v-show=
"searchOpen"
id=
"search-sample-company
"
:label-width=
"80"
inline
onsubmit=
"return false"
>
<Form
id=
"search-sample-company"
v-show=
"searchOpen
"
:label-width=
"80"
inline
onsubmit=
"return false"
>
<label
class=
"label-sign"
></label>
<label
class=
"label-sign"
></label>
<Form-item
label=
"样品编号:"
class=
"search-item"
>
<Form-item
label=
"样品编号:"
class=
"search-item"
>
<Input
v-model=
"formObj.sampleCode"
placeholder=
"请输入样品编号"
clearable
@
on-enter=
"_formSearch"
/>
<Input
v-model=
"formObj.sampleCode"
@
on-enter=
"_formSearch"
placeholder=
"请输入样品编号"
clearable
/>
</Form-item>
</Form-item>
<Form-item
class=
"search-btn"
>
<Form-item
class=
"search-btn"
>
<Button
type=
"primary"
@
click=
"_page
"
>
<Button
@
click=
"_page"
type=
"primary
"
>
搜索
搜索
</Button>
</Button>
</Form-item>
</Form-item>
...
@@ -23,12 +23,12 @@
...
@@ -23,12 +23,12 @@
</Col>
</Col>
<!--操作-->
<!--操作-->
<Col
span=
"24"
>
<Col
span=
"24"
>
<btn-list
:msg=
"btn"
:open=
"searchOpen"
class=
"contHide"
show-search-btn=
"true"
@
on-result-change=
"_btnClick
"
></btn-list>
<btn-list
:msg=
"btn"
:open=
"searchOpen"
@
on-result-change=
"_btnClick"
class=
"contHide"
show-search-btn=
"true
"
></btn-list>
</Col>
</Col>
<!-- 表格 -->
<!-- 表格 -->
<Col
span=
"24"
>
<Col
span=
"24"
>
<PTVXETable
ref=
"pageTable"
:table-height=
"tableHeight"
:form-id=
"formId"
:loading=
"true"
<PTVXETable
ref=
"pageTable"
:table-height=
"tableHeight"
:form-id=
"formId"
:loading=
"true"
:get-page=
"getPage"
:icon-msg=
"iconMsg"
select-data
@
on-result-change=
"_tableResultChange"
>
:get-page=
"getPage"
:icon-msg=
"iconMsg"
@
on-result-change=
"_tableResultChange"
select-data
>
<vxe-table-column
<vxe-table-column
v-for=
"item in pageColumns"
v-for=
"item in pageColumns"
:key=
"item.key"
:key=
"item.key"
...
@@ -61,7 +61,7 @@
...
@@ -61,7 +61,7 @@
</Modal>
</Modal>
<SoilSampleItemManage
ref=
"sampleItemManage"
@
on-result-change=
"_page"
></SoilSampleItemManage>
<SoilSampleItemManage
ref=
"sampleItemManage"
@
on-result-change=
"_page"
></SoilSampleItemManage>
<DescribeDetailModal
ref=
"writeDetailModal"
@
on-result-change=
"_page"
></DescribeDetailModal>
<DescribeDetailModal
ref=
"writeDetailModal"
@
on-result-change=
"_page"
></DescribeDetailModal>
<Preparation
Modal
ref=
"preModal"
@
on-result-change=
"_page"
></PreparationModal
>
<Preparation
His
ref=
"preHisModal"
@
on-result-change=
"_page"
></PreparationHis
>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
...
@@ -70,10 +70,14 @@ import { soilEntrust } from '../../api'
...
@@ -70,10 +70,14 @@ import { soilEntrust } from '../../api'
import
{
getLodop
}
from
'../../plugins/clodop/LodopFuncs'
import
{
getLodop
}
from
'../../plugins/clodop/LodopFuncs'
import
SoilSampleItemManage
from
'./SoilSampleItemManageHis'
import
SoilSampleItemManage
from
'./SoilSampleItemManageHis'
import
DescribeDetailModal
from
'./sample-preparation/DescribeDetailModal'
import
DescribeDetailModal
from
'./sample-preparation/DescribeDetailModal'
import
Preparation
Modal
from
'./sample-preparation/Preparation
'
import
Preparation
His
from
'./sample-preparation/PreparationHis
'
let
LODOP
let
LODOP
export
default
{
export
default
{
components
:
{
SoilSampleItemManage
,
DescribeDetailModal
,
PreparationModal
},
components
:
{
SoilSampleItemManage
,
DescribeDetailModal
,
PreparationHis
},
data
()
{
data
()
{
return
{
return
{
formId
:
'soilSampleManage'
,
formId
:
'soilSampleManage'
,
...
@@ -93,6 +97,11 @@ export default {
...
@@ -93,6 +97,11 @@ export default {
],
],
iconMsg
:
[
iconMsg
:
[
{
{
type
:
'ios-paper'
,
id
:
''
,
name
:
'制备详情'
},
{
type
:
'ios-beaker'
,
type
:
'ios-beaker'
,
id
:
''
,
id
:
''
,
name
:
'管理检测项目'
name
:
'管理检测项目'
...
@@ -284,6 +293,9 @@ export default {
...
@@ -284,6 +293,9 @@ export default {
case
'管理检测项目'
:
case
'管理检测项目'
:
this
.
_itemManage
(
data
.
id
)
this
.
_itemManage
(
data
.
id
)
break
break
case
'制备详情'
:
this
.
_preEdit
(
data
.
id
)
break
case
'编辑'
:
case
'编辑'
:
this
.
_editModal
(
true
,
data
)
this
.
_editModal
(
true
,
data
)
break
break
...
@@ -300,6 +312,9 @@ export default {
...
@@ -300,6 +312,9 @@ export default {
}
}
})
})
},
},
_preEdit
(
id
)
{
this
.
$refs
.
preHisModal
.
_open
(
id
)
},
_itemManage
(
data
)
{
_itemManage
(
data
)
{
// 管理检测项目
// 管理检测项目
if
(
this
.
recordHis
)
{
if
(
this
.
recordHis
)
{
...
...
pages/soil-sample-manage/sample-preparation/PreparationHis.vue
0 → 100644
View file @
bd65a63e
This diff is collapsed.
Click to expand it.
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