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
d7ed14b7
Commit
d7ed14b7
authored
Jan 07, 2021
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了开土制备的原始记录填写
parent
05cb31e2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
10 deletions
+46
-10
soil-test.js
api/soil/soil-test.js
+10
-0
RecordLeftList.vue
...-preparation/sample-preparation-record/RecordLeftList.vue
+10
-4
RecordRightList.vue
...preparation/sample-preparation-record/RecordRightList.vue
+26
-6
No files found.
api/soil/soil-test.js
View file @
d7ed14b7
...
@@ -69,6 +69,16 @@ export default {
...
@@ -69,6 +69,16 @@ export default {
JSON
.
stringify
(
data
.
obj
)
JSON
.
stringify
(
data
.
obj
)
)
)
.
then
(
res
=>
res
),
.
then
(
res
=>
res
),
pageExpPrepareBath
:
data
=>
https
.
post
(
'soil/v1/experiment/page_exp_prepare_bath?page='
+
data
.
page
+
'&rows='
+
data
.
rows
,
JSON
.
stringify
(
data
.
obj
)
)
.
then
(
res
=>
res
),
pageExpPrepare
:
data
=>
pageExpPrepare
:
data
=>
http
.
post
(
'soil/v1/experiment/page_exp_prepare'
,
data
).
then
(
res
=>
res
),
http
.
post
(
'soil/v1/experiment/page_exp_prepare'
,
data
).
then
(
res
=>
res
),
zTree
:
data
=>
zTree
:
data
=>
...
...
pages/soil-sample-manage/sample-preparation/sample-preparation-record/RecordLeftList.vue
View file @
d7ed14b7
...
@@ -18,9 +18,9 @@
...
@@ -18,9 +18,9 @@
</Col>
</Col>
<!-- 表格 -->
<!-- 表格 -->
<Col
span=
"24"
>
<Col
span=
"24"
>
<PTVXETable
ref=
"pageTable"
:
isRadio=
"true"
:
pageColumns=
"pageColumns"
:table-name=
"tableName"
<PTVXETable
ref=
"pageTable"
:pageColumns=
"pageColumns"
:table-name=
"tableName"
:tableHeight=
"tableHeight"
:tableHeight=
"tableHeight"
@
on-result-change=
"_tableResultChange"
:getPage=
"getPage"
:hide-checkbox=
"true"
select-data
>
@
on-result-change=
"_tableResultChange"
:getPage=
"getPage"
select-data
>
<vxe-table-column
<vxe-table-column
v-for=
"item in userColumns.length > 0 ?userColumns:pageColumns"
v-for=
"item in userColumns.length > 0 ?userColumns:pageColumns"
:key=
"item.key"
:key=
"item.key"
...
@@ -52,6 +52,7 @@ export default {
...
@@ -52,6 +52,7 @@ export default {
formObj
:
{
formObj
:
{
name
:
undefined
name
:
undefined
},
},
selectDataName
:
[],
tableName
:
'food-task-assign-item-left'
,
tableName
:
'food-task-assign-item-left'
,
// 用户自己选中的列
// 用户自己选中的列
userColumns
:
[],
userColumns
:
[],
...
@@ -116,10 +117,15 @@ export default {
...
@@ -116,10 +117,15 @@ export default {
console
.
log
(
msg
,
data
)
console
.
log
(
msg
,
data
)
switch
(
msg
)
{
switch
(
msg
)
{
case
'page'
:
case
'page'
:
this
.
getPage
=
this
.
$store
.
state
.
FoodItem
.
page
this
.
_page
()
break
break
case
'selectData'
:
case
'selectData'
:
this
.
$emit
(
'on-result-change'
,
data
)
this
.
selectDataName
=
[]
for
(
let
i
=
0
;
i
<
data
.
length
;
i
++
)
{
this
.
selectDataName
.
push
(
data
[
i
].
name
)
}
console
.
log
(
'selectDataName'
,
this
.
selectDataName
)
this
.
$emit
(
'on-result-change'
,
this
.
selectDataName
)
break
break
case
'singleSelect'
:
case
'singleSelect'
:
this
.
$emit
(
'on-result-change'
,
data
)
this
.
$emit
(
'on-result-change'
,
data
)
...
...
pages/soil-sample-manage/sample-preparation/sample-preparation-record/RecordRightList.vue
View file @
d7ed14b7
...
@@ -90,7 +90,11 @@ export default {
...
@@ -90,7 +90,11 @@ export default {
entrustId
:
''
,
entrustId
:
''
,
name
:
''
,
name
:
''
,
testMethod
:
''
,
testMethod
:
''
,
testBasis
:
''
testBasis
:
''
,
obj
:
{
entrustId
:
''
,
nameList
:
[]
}
},
},
entrustId
:
''
,
entrustId
:
''
,
envPro
:
false
,
envPro
:
false
,
...
@@ -152,7 +156,7 @@ export default {
...
@@ -152,7 +156,7 @@ export default {
{
title
:
'检测依据'
,
key
:
'testBasis'
,
width
:
140
},
{
title
:
'检测依据'
,
key
:
'testBasis'
,
width
:
140
},
{
title
:
'检测科室'
,
key
:
'groupName'
,
width
:
150
}
{
title
:
'检测科室'
,
key
:
'groupName'
,
width
:
150
}
],
],
leftSelectData
:
{}
,
leftSelectData
:
[]
,
selectIds
:
[],
// 检测项目id
selectIds
:
[],
// 检测项目id
selectData
:
[],
// 检测项目data
selectData
:
[],
// 检测项目data
selectSampleIds
:
[],
// 样品ids
selectSampleIds
:
[],
// 样品ids
...
@@ -610,11 +614,13 @@ export default {
...
@@ -610,11 +614,13 @@ export default {
return
obj
return
obj
},
},
_page
:
async
function
()
{
_page
:
async
function
()
{
this
.
formObj
.
obj
.
nameList
=
[]
Object
.
assign
(
this
.
formObj
,
this
.
$refs
.
pageTable
.
_searchParams
())
Object
.
assign
(
this
.
formObj
,
this
.
$refs
.
pageTable
.
_searchParams
())
this
.
formObj
.
entrustId
=
this
.
entrustId
this
.
formObj
.
obj
.
entrustId
=
this
.
entrustId
this
.
formObj
.
name
=
this
.
leftSelectData
.
name
this
.
formObj
.
obj
.
nameList
=
this
.
leftSelectData
this
.
formObj
.
testMethod
=
this
.
leftSelectData
.
testMethod
// this.formObj.entrustId = this.entrustId
const
result
=
await
soilTest
.
pageExpPrepare
(
// this.formObj.nameList = this.leftSelectData.join(',')
const
result
=
await
soilTest
.
pageExpPrepareBath
(
this
.
$serializeForm
(
this
.
formObj
)
this
.
$serializeForm
(
this
.
formObj
)
)
)
if
(
result
)
{
if
(
result
)
{
...
@@ -623,6 +629,20 @@ export default {
...
@@ -623,6 +629,20 @@ export default {
this
.
getPage
=
result
this
.
getPage
=
result
}
}
},
},
// _page: async function() {
// Object.assign(this.formObj, this.$refs.pageTable._searchParams())
// this.formObj.entrustId = this.entrustId
// this.formObj.name = this.leftSelectData.name
// this.formObj.testMethod = this.leftSelectData.testMethod
// const result = await soilTest.pageExpPrepare(
// this.$serializeForm(this.formObj)
// )
// if (result) {
// this.$refs.pageTable._hideLoading()
// this.$refs.pageTable._checkAll()
// this.getPage = result
// }
// },
_tableResultChange
(
msg
,
data
)
{
_tableResultChange
(
msg
,
data
)
{
const
selectIds
=
[]
const
selectIds
=
[]
switch
(
msg
)
{
switch
(
msg
)
{
...
...
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