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
61edf4d3
Commit
61edf4d3
authored
Mar 26, 2021
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了样品拆分
parent
9fa0bdc3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
32 deletions
+30
-32
SoilSampleSplit.vue
pages/soil-sample-manage/SoilSampleSplit.vue
+20
-20
SoilSampleSplitChild.vue
pages/soil-sample-manage/SoilSampleSplitChild.vue
+10
-12
No files found.
pages/soil-sample-manage/SoilSampleSplit.vue
View file @
61edf4d3
...
@@ -9,13 +9,10 @@
...
@@ -9,13 +9,10 @@
<Row>
<Row>
<!--查询-->
<!--查询-->
<!--操作-->
<!--操作-->
<Col
span=
"24"
>
<btn-list
:msg=
"btn"
:open=
"searchOpen"
@
on-result-change=
"_btnClick"
class=
"contHide"
show-search-btn=
"true"
></btn-list>
</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"
@
on-result-change=
"_tableResultChange"
:icon-msg=
"iconMsg"
select-data
>
:get-page=
"getPage"
:hide-page=
"true"
@
on-result-change=
"_tableResultChange"
:icon-msg=
"iconMsg"
select-data
>
<vxe-table-column
<vxe-table-column
v-for=
"item in pageColumns"
v-for=
"item in pageColumns"
:key=
"item.key"
:key=
"item.key"
...
@@ -65,11 +62,11 @@ export default {
...
@@ -65,11 +62,11 @@ export default {
formId
:
'soilSampleManage'
,
formId
:
'soilSampleManage'
,
currentComponent
:
''
,
currentComponent
:
''
,
btn
:
[
btn
:
[
{
//
{
type
:
'success'
,
//
type: 'success',
id
:
''
,
//
id: '',
name
:
'保存'
//
name: '保存'
}
//
}
// {
// {
// type: 'success',
// type: 'success',
// id: '',
// id: '',
...
@@ -88,7 +85,7 @@ export default {
...
@@ -88,7 +85,7 @@ export default {
currentRow
:
''
,
currentRow
:
''
,
footerList
:
[
footerList
:
[
{
id
:
''
,
name
:
'取消'
,
type
:
''
},
{
id
:
''
,
name
:
'取消'
,
type
:
''
},
{
id
:
''
,
name
:
'
关闭
'
,
type
:
'primary'
}
{
id
:
''
,
name
:
'
保存
'
,
type
:
'primary'
}
],
],
iconMsg
:
[
iconMsg
:
[
{
{
...
@@ -168,8 +165,8 @@ export default {
...
@@ -168,8 +165,8 @@ export default {
case
'取消'
:
case
'取消'
:
this
.
_cancel
()
this
.
_cancel
()
break
break
case
'
关闭
'
:
case
'
保存
'
:
this
.
_
cancel
()
this
.
_
save
()
break
break
}
}
},
},
...
@@ -205,14 +202,16 @@ export default {
...
@@ -205,14 +202,16 @@ export default {
},
},
_save
()
{
_save
()
{
console
.
log
(
this
.
getPage
.
records
)
console
.
log
(
this
.
getPage
.
records
)
for
(
let
i
=
0
;
i
<
this
.
getPage
.
records
.
length
;
i
++
)
{
const
data
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
getPage
.
records
))
this
.
getPage
.
records
[
i
].
id
=
this
.
sampleId
// for (let i = 0; i
<
data
.
length
;
i
++
)
{
this
.
getPage
.
records
[
i
].
sampleCode
=
// data[i].id = this.sampleId
this
.
getPage
.
records
[
i
].
sampleCode
+
// data[i].sampleCode = data[i].sampleCode + '-' + (data[i].index + 1)
'-'
+
// this._addSample(data[i])
(
this
.
getPage
.
records
[
i
].
index
+
1
)
// }
console
.
log
(
this
.
getPage
.
records
[
i
])
for
(
let
i
=
0
;
i
<
data
.
length
;
i
++
)
{
this
.
_addSample
(
this
.
getPage
.
records
[
i
])
data
[
i
].
id
=
this
.
sampleId
data
[
i
].
sampleCode
=
data
[
i
].
sampleCode
+
'-'
+
(
data
[
i
].
index
+
1
)
this
.
_addSample
(
data
[
i
])
}
}
},
},
_addSample
:
async
function
(
data
)
{
_addSample
:
async
function
(
data
)
{
...
@@ -221,6 +220,7 @@ export default {
...
@@ -221,6 +220,7 @@ export default {
this
.
showModal
=
false
this
.
showModal
=
false
this
.
_deleteOk
(
this
.
sampleId
)
this
.
_deleteOk
(
this
.
sampleId
)
this
.
$emit
(
'on-result-change'
)
this
.
$emit
(
'on-result-change'
)
this
.
$refs
.
footerList
.
_hideLoading
()
}
}
},
},
_copyHisSample
()
{
_copyHisSample
()
{
...
...
pages/soil-sample-manage/SoilSampleSplitChild.vue
View file @
61edf4d3
...
@@ -9,13 +9,10 @@
...
@@ -9,13 +9,10 @@
<Row>
<Row>
<!--查询-->
<!--查询-->
<!--操作-->
<!--操作-->
<Col
span=
"24"
>
<btn-list
:msg=
"btn"
:open=
"searchOpen"
@
on-result-change=
"_btnClick"
class=
"contHide"
show-search-btn=
"true"
></btn-list>
</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"
@
on-result-change=
"_tableResultChange"
select-data
>
:get-page=
"getPage"
:hide-page=
"true"
@
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"
...
@@ -62,11 +59,11 @@ export default {
...
@@ -62,11 +59,11 @@ export default {
formId
:
'soilSampleManage'
,
formId
:
'soilSampleManage'
,
currentComponent
:
''
,
currentComponent
:
''
,
btn
:
[
btn
:
[
{
//
{
type
:
'success'
,
//
type: 'success',
id
:
''
,
//
id: '',
name
:
'保存'
//
name: '保存'
}
//
}
// {
// {
// type: 'success',
// type: 'success',
// id: '',
// id: '',
...
@@ -85,7 +82,7 @@ export default {
...
@@ -85,7 +82,7 @@ export default {
currentRow
:
''
,
currentRow
:
''
,
footerList
:
[
footerList
:
[
{
id
:
''
,
name
:
'取消'
,
type
:
''
},
{
id
:
''
,
name
:
'取消'
,
type
:
''
},
{
id
:
''
,
name
:
'
关闭
'
,
type
:
'primary'
}
{
id
:
''
,
name
:
'
保存
'
,
type
:
'primary'
}
],
],
iconMsg
:
[
iconMsg
:
[
{
{
...
@@ -165,8 +162,8 @@ export default {
...
@@ -165,8 +162,8 @@ export default {
case
'取消'
:
case
'取消'
:
this
.
_cancel
()
this
.
_cancel
()
break
break
case
'
关闭
'
:
case
'
保存
'
:
this
.
_
cancel
()
this
.
_
save
()
break
break
}
}
},
},
...
@@ -213,6 +210,7 @@ export default {
...
@@ -213,6 +210,7 @@ export default {
// this._deleteOk(this.sampleId)
// this._deleteOk(this.sampleId)
this
.
showModal
=
false
this
.
showModal
=
false
this
.
$emit
(
'on-result-change'
)
this
.
$emit
(
'on-result-change'
)
this
.
$refs
.
footerList
.
_hideLoading
()
}
}
},
},
_copyHisSample
()
{
_copyHisSample
()
{
...
...
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