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
d125f80c
Commit
d125f80c
authored
Dec 30, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了样品进度查询
parent
b1104649
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
SampleProgressDetail.vue
.../soil-statistics/sample-progress/SampleProgressDetail.vue
+7
-1
SampleProgressDetail.vue
pages/workbench/SampleProgressDetail.vue
+7
-1
No files found.
pages/soil-statistics/sample-progress/SampleProgressDetail.vue
View file @
d125f80c
...
@@ -18,6 +18,9 @@
...
@@ -18,6 +18,9 @@
<Form-item
label=
"项目名称:"
class=
"search-item"
>
<Form-item
label=
"项目名称:"
class=
"search-item"
>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.projectName"
placeholder=
"请输入项目名称"
clearable
/>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.projectName"
placeholder=
"请输入项目名称"
clearable
/>
</Form-item>
</Form-item>
<Form-item
label=
"现场编号:"
class=
"search-item"
>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.siteNo"
placeholder=
"请输入现场编号"
clearable
/>
</Form-item>
<Form-item
class=
"search-btn"
>
<Form-item
class=
"search-btn"
>
<Button
@
click=
"_formSearch"
type=
"primary"
>
搜索
</Button>
<Button
@
click=
"_formSearch"
type=
"primary"
>
搜索
</Button>
</Form-item>
</Form-item>
...
@@ -78,7 +81,8 @@ export default {
...
@@ -78,7 +81,8 @@ export default {
boreholeName
:
undefined
,
boreholeName
:
undefined
,
sampleCode
:
undefined
,
sampleCode
:
undefined
,
entrustCode
:
undefined
,
entrustCode
:
undefined
,
projectName
:
undefined
projectName
:
undefined
,
siteNo
:
undefined
},
},
btn
:
[
btn
:
[
{
type
:
'primary'
,
id
:
''
,
name
:
'导出'
},
{
type
:
'primary'
,
id
:
''
,
name
:
'导出'
},
...
@@ -89,7 +93,9 @@ export default {
...
@@ -89,7 +93,9 @@ export default {
{
title
:
'委托编号'
,
key
:
'entrustCode'
,
width
:
140
},
{
title
:
'委托编号'
,
key
:
'entrustCode'
,
width
:
140
},
{
title
:
'钻孔名称'
,
key
:
'boreholeName'
,
width
:
140
},
{
title
:
'钻孔名称'
,
key
:
'boreholeName'
,
width
:
140
},
{
title
:
'样品编号'
,
key
:
'sampleCode'
,
width
:
140
},
{
title
:
'样品编号'
,
key
:
'sampleCode'
,
width
:
140
},
{
title
:
'现场编号'
,
key
:
'siteNo'
,
width
:
140
},
{
title
:
'项目名称'
,
key
:
'projectName'
,
width
:
140
},
{
title
:
'项目名称'
,
key
:
'projectName'
,
width
:
140
},
{
title
:
'深度'
,
key
:
'sampleDepth'
,
width
:
140
},
{
title
:
'状态'
,
key
:
'status'
,
width
:
80
,
status
:
true
},
{
title
:
'状态'
,
key
:
'status'
,
width
:
80
,
status
:
true
},
{
title
:
'检测进度'
,
key
:
'testProgress'
,
width
:
160
}
{
title
:
'检测进度'
,
key
:
'testProgress'
,
width
:
160
}
],
],
...
...
pages/workbench/SampleProgressDetail.vue
View file @
d125f80c
...
@@ -18,6 +18,9 @@
...
@@ -18,6 +18,9 @@
<Form-item
label=
"项目名称:"
class=
"search-item"
>
<Form-item
label=
"项目名称:"
class=
"search-item"
>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.projectName"
placeholder=
"请输入项目名称"
clearable
/>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.projectName"
placeholder=
"请输入项目名称"
clearable
/>
</Form-item>
</Form-item>
<Form-item
label=
"现场编号:"
class=
"search-item"
>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.siteNo"
placeholder=
"请输入现场编号"
clearable
/>
</Form-item>
<Form-item
class=
"search-btn"
>
<Form-item
class=
"search-btn"
>
<Button
@
click=
"_formSearch"
type=
"primary"
>
搜索
</Button>
<Button
@
click=
"_formSearch"
type=
"primary"
>
搜索
</Button>
</Form-item>
</Form-item>
...
@@ -73,7 +76,8 @@ export default {
...
@@ -73,7 +76,8 @@ export default {
boreholeName
:
undefined
,
boreholeName
:
undefined
,
sampleCode
:
undefined
,
sampleCode
:
undefined
,
entrustCode
:
undefined
,
entrustCode
:
undefined
,
projectName
:
undefined
projectName
:
undefined
,
siteNo
:
undefined
},
},
btn
:
[
btn
:
[
{
type
:
'primary'
,
id
:
''
,
name
:
'导出'
},
{
type
:
'primary'
,
id
:
''
,
name
:
'导出'
},
...
@@ -84,7 +88,9 @@ export default {
...
@@ -84,7 +88,9 @@ export default {
{
title
:
'委托编号'
,
key
:
'entrustCode'
,
width
:
140
},
{
title
:
'委托编号'
,
key
:
'entrustCode'
,
width
:
140
},
{
title
:
'钻孔名称'
,
key
:
'boreholeName'
,
width
:
140
},
{
title
:
'钻孔名称'
,
key
:
'boreholeName'
,
width
:
140
},
{
title
:
'样品编号'
,
key
:
'sampleCode'
,
width
:
140
},
{
title
:
'样品编号'
,
key
:
'sampleCode'
,
width
:
140
},
{
title
:
'现场编号'
,
key
:
'siteNo'
,
width
:
140
},
{
title
:
'项目名称'
,
key
:
'projectName'
,
width
:
140
},
{
title
:
'项目名称'
,
key
:
'projectName'
,
width
:
140
},
{
title
:
'深度'
,
key
:
'sampleDepth'
,
width
:
140
},
{
title
:
'状态'
,
key
:
'status'
,
width
:
80
,
status
:
true
},
{
title
:
'状态'
,
key
:
'status'
,
width
:
80
,
status
:
true
},
{
title
:
'检测进度'
,
key
:
'testProgress'
,
width
:
160
}
{
title
:
'检测进度'
,
key
:
'testProgress'
,
width
:
160
}
],
],
...
...
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