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
d440aa81
Commit
d440aa81
authored
Jan 08, 2021
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了试验任务分配
parent
ff041bdf
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
9 deletions
+24
-9
soil-test.js
api/soil/soil-test.js
+11
-1
ItemLeftList.vue
...k-manage/entrust-sample-manage/item-tabs/ItemLeftList.vue
+1
-1
ItemRightList.vue
...-manage/entrust-sample-manage/item-tabs/ItemRightList.vue
+12
-7
No files found.
api/soil/soil-test.js
View file @
d440aa81
...
@@ -48,7 +48,17 @@ export default {
...
@@ -48,7 +48,17 @@ export default {
.
post
(
'soil/v1/experiment/page_allot_by_exp_his'
,
data
)
.
post
(
'soil/v1/experiment/page_allot_by_exp_his'
,
data
)
.
then
(
res
=>
res
),
.
then
(
res
=>
res
),
pageExperimentAllot
:
data
=>
pageExperimentAllot
:
data
=>
http
.
post
(
'soil/v1/experiment/page_exp_allot'
,
data
).
then
(
res
=>
res
),
http
.
post
(
'soil/v1/experiment/page_exp_allot_bath'
,
data
).
then
(
res
=>
res
),
pageExperimentAllotBath
:
data
=>
https
.
post
(
'soil/v1/experiment/page_exp_allot_bath?page='
+
data
.
page
+
'&rows='
+
data
.
rows
,
JSON
.
stringify
(
data
.
obj
)
)
.
then
(
res
=>
res
),
pageExperimentAllotHis
:
data
=>
pageExperimentAllotHis
:
data
=>
http
.
post
(
'soil/v1/experiment/page_exp_allot_his'
,
data
).
then
(
res
=>
res
),
http
.
post
(
'soil/v1/experiment/page_exp_allot_his'
,
data
).
then
(
res
=>
res
),
pageTestByExp
:
data
=>
pageTestByExp
:
data
=>
...
...
pages/soil-test-manage/test-task-manage/entrust-sample-manage/item-tabs/ItemLeftList.vue
View file @
d440aa81
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
<Col
span=
"24"
>
<Col
span=
"24"
>
<PTVXETable
ref=
"pageTable"
:page-columns=
"pageColumns"
:table-name=
"tableName"
<PTVXETable
ref=
"pageTable"
:page-columns=
"pageColumns"
:table-name=
"tableName"
:table-height=
"tableHeight"
:table-height=
"tableHeight"
:get-page=
"getPage"
:is-radio=
"true"
select-data
hide-checkbox
@
on-result-change=
"_tableResultChange"
>
:get-page=
"getPage"
select-data
@
on-result-change=
"_tableResultChange"
>
<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"
...
...
pages/soil-test-manage/test-task-manage/entrust-sample-manage/item-tabs/ItemRightList.vue
View file @
d440aa81
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<Form
id=
"task-assign-item-right"
:label-width=
"70"
inline
onsubmit=
"return false"
>
<Form
id=
"task-assign-item-right"
:label-width=
"70"
inline
onsubmit=
"return false"
>
<label
class=
"label-sign"
></label>
<label
class=
"label-sign"
></label>
<Form-item
class=
"search-item"
label=
"试样编号:"
>
<Form-item
class=
"search-item"
label=
"试样编号:"
>
<Input
v-model=
"formObj.sampleCode"
@
on-enter=
"_formSearch"
placeholder=
"请输入试样编号"
clearable
></Input>
<Input
v-model=
"formObj.
obj.
sampleCode"
@
on-enter=
"_formSearch"
placeholder=
"请输入试样编号"
clearable
></Input>
</Form-item>
</Form-item>
<Form-item
class=
"search-btn"
>
<Form-item
class=
"search-btn"
>
<Button
@
click=
"_formSearch"
type=
"primary"
>
搜索
</Button>
<Button
@
click=
"_formSearch"
type=
"primary"
>
搜索
</Button>
...
@@ -67,7 +67,11 @@ export default {
...
@@ -67,7 +67,11 @@ export default {
name
:
''
,
name
:
''
,
testMethod
:
''
,
testMethod
:
''
,
testBasis
:
''
,
testBasis
:
''
,
obj
:
{
nameList
:
[],
entrustId
:
undefined
,
sampleCode
:
undefined
sampleCode
:
undefined
}
},
},
entrustId
:
''
,
entrustId
:
''
,
// 用户自己选中的列
// 用户自己选中的列
...
@@ -355,17 +359,18 @@ export default {
...
@@ -355,17 +359,18 @@ export default {
return
obj
return
obj
},
},
_page
:
async
function
()
{
_page
:
async
function
()
{
const
saveName
=
this
.
leftSelectData
.
name
const
saveName
=
[]
const
saveMethod
=
this
.
leftSelectData
.
testMethod
for
(
let
i
=
0
;
i
<
this
.
leftSelectData
.
length
;
i
++
)
{
saveName
.
push
(
this
.
leftSelectData
[
i
].
name
)
}
// for (let i = 0; i
<
this
.
leftSelectData
.
length
;
i
++
)
{
// for (let i = 0; i
<
this
.
leftSelectData
.
length
;
i
++
)
{
// saveName.push(this.leftSelectData[i].name)
// saveName.push(this.leftSelectData[i].name)
// saveMethod.push(this.leftSelectData[i].testMethod)
// saveMethod.push(this.leftSelectData[i].testMethod)
// }
// }
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
=
saveName
this
.
formObj
.
obj
.
nameList
=
saveName
this
.
formObj
.
testMethod
=
saveMethod
const
result
=
await
soilTest
.
pageExperimentAllotBath
(
const
result
=
await
soilTest
.
pageExperimentAllot
(
this
.
$serializeForm
(
this
.
formObj
)
this
.
$serializeForm
(
this
.
formObj
)
)
)
if
(
result
)
{
if
(
result
)
{
...
...
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