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
06524e7b
Commit
06524e7b
authored
Dec 03, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了留存位置查询
parent
00299a2c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
2 deletions
+38
-2
soil-sample.js
api/soil/soil-sample.js
+3
-1
AddressManage.vue
pages/soil-sample-manage/keep-address/AddressManage.vue
+35
-1
No files found.
api/soil/soil-sample.js
View file @
06524e7b
...
@@ -192,5 +192,7 @@ export default {
...
@@ -192,5 +192,7 @@ export default {
'&remark='
+
'&remark='
+
data
.
remark
data
.
remark
)
)
.
then
(
res
=>
res
)
.
then
(
res
=>
res
),
sampleBringOut
:
data
=>
http
.
post
(
'soil/v1/sample/sample_bring_out?ids='
+
data
).
then
(
res
=>
res
)
}
}
pages/soil-sample-manage/keep-address/AddressManage.vue
View file @
06524e7b
...
@@ -14,6 +14,9 @@
...
@@ -14,6 +14,9 @@
<Form-item
class=
"search-item"
label=
"试样编号:"
>
<Form-item
class=
"search-item"
label=
"试样编号:"
>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.sampleCode"
name=
"sampleCode"
placeholder=
"请输入试样编号"
clearable
/>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.sampleCode"
name=
"sampleCode"
placeholder=
"请输入试样编号"
clearable
/>
</Form-item>
</Form-item>
<Form-item
class=
"search-item"
label=
"钻孔名称:"
>
<Input
@
on-enter=
"_formSearch"
v-model=
"formObj.boreholeName"
name=
"boreholeName"
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>
...
@@ -89,9 +92,15 @@ export default {
...
@@ -89,9 +92,15 @@ export default {
formObj
:
{
formObj
:
{
entrustCode
:
undefined
,
entrustCode
:
undefined
,
sampleCode
:
undefined
,
sampleCode
:
undefined
,
name
:
undefined
name
:
undefined
,
boreholeName
:
undefined
},
},
btn
:
[
btn
:
[
{
type
:
'success'
,
id
:
''
,
name
:
'调出'
}
// {
// {
// type: 'success',
// type: 'success',
// id: '',
// id: '',
...
@@ -107,6 +116,7 @@ export default {
...
@@ -107,6 +116,7 @@ export default {
{
title
:
'委托商'
,
key
:
'client'
,
width
:
200
},
{
title
:
'委托商'
,
key
:
'client'
,
width
:
200
},
{
title
:
'委托编号'
,
key
:
'entrustCode'
,
width
:
120
},
{
title
:
'委托编号'
,
key
:
'entrustCode'
,
width
:
120
},
{
title
:
'试样编号'
,
key
:
'sampleCode'
,
width
:
100
},
{
title
:
'试样编号'
,
key
:
'sampleCode'
,
width
:
100
},
{
title
:
'钻孔名称'
,
key
:
'boreholeName'
,
width
:
100
},
{
title
:
'试样深度'
,
key
:
'sampleDepth'
,
width
:
95
},
{
title
:
'试样深度'
,
key
:
'sampleDepth'
,
width
:
95
},
{
title
:
'现场编号'
,
key
:
'siteNo'
,
width
:
100
},
{
title
:
'现场编号'
,
key
:
'siteNo'
,
width
:
100
},
{
title
:
'接收人'
,
key
:
'receiver'
,
width
:
120
},
{
title
:
'接收人'
,
key
:
'receiver'
,
width
:
120
},
...
@@ -188,6 +198,9 @@ export default {
...
@@ -188,6 +198,9 @@ export default {
case
'导出'
:
case
'导出'
:
// this._export()
// this._export()
break
break
case
'调出'
:
this
.
_callout
()
break
// 收起搜索
// 收起搜索
case
'search'
:
case
'search'
:
this
.
searchOpen
=
!
this
.
searchOpen
this
.
searchOpen
=
!
this
.
searchOpen
...
@@ -223,6 +236,27 @@ export default {
...
@@ -223,6 +236,27 @@ export default {
}
}
})
})
},
},
_callout
()
{
if
(
this
.
selectIds
.
length
===
0
)
{
this
.
$Message
.
warning
(
'请至少选择一条数据'
)
}
else
{
this
.
$Modal
.
confirm
({
title
:
'提示'
,
content
:
'确定调出这'
+
this
.
selectIds
.
length
+
'条记录?'
,
onOk
:
()
=>
{
this
.
_calloutOk
()
}
})
}
},
_calloutOk
()
{
console
.
log
(
this
.
selectIds
)
const
result
=
soilSample
.
sampleBringOut
(
this
.
selectIds
)
if
(
result
)
{
this
.
$Message
.
success
(
'调出成功'
)
this
.
_page
()
}
},
_upload
(
id
)
{
_upload
(
id
)
{
const
obj
=
{
const
obj
=
{
importUrl
:
'/soil/v1/standard_annex/upload/'
+
id
importUrl
:
'/soil/v1/standard_annex/upload/'
+
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