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
bc1ebfda
Commit
bc1ebfda
authored
Oct 28, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了数据录入设备选择
parent
0a314aee
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
2 deletions
+34
-2
SelEquip.vue
components/select-equip/SelEquip.vue
+1
-1
ItemRightList.vue
...s/soil-test-manage/test-input/item-tabs/ItemRightList.vue
+33
-1
No files found.
components/select-equip/SelEquip.vue
View file @
bc1ebfda
...
...
@@ -142,7 +142,7 @@ export default {
// 'LmsEquipInfo/page',
// this.$serializeFormSearch(this.formObj)
// )
const
result
=
await
equip
.
page
()
const
result
=
await
equip
.
page
(
this
.
$serializeFormSearch
(
this
.
formObj
)
)
console
.
log
(
'仪器结果'
,
result
)
if
(
result
)
{
this
.
getPage
=
result
...
...
pages/soil-test-manage/test-input/item-tabs/ItemRightList.vue
View file @
bc1ebfda
...
...
@@ -51,6 +51,7 @@
<SelectOriTempRecord
ref=
"recordModal"
@
on-result-change=
"_page"
></SelectOriTempRecord>
<OriginalRecordEdit
ref=
"editModal"
></OriginalRecordEdit>
<IndexManage
ref=
"indexModal"
@
on-result-change=
"_page"
></IndexManage>
<SelEquip
ref=
"selEquip"
@
on-result-change=
"_equipResult"
></SelEquip>
</div>
</template>
<
script
>
...
...
@@ -60,12 +61,14 @@ import AssignPerson from '../../../../components/user-info-single/AssignPerson'
import
SelectOriTempRecord
from
'../SelectOriTempRecord'
import
OriginalRecordEdit
from
'../OriginalRecordEdit'
import
IndexManage
from
'../IndexManage'
import
SelEquip
from
'../../../../components/select-equip/SelEquip'
export
default
{
components
:
{
AssignPerson
,
SelectOriTempRecord
,
OriginalRecordEdit
,
IndexManage
IndexManage
,
SelEquip
},
data
()
{
return
{
...
...
@@ -105,6 +108,7 @@ export default {
btn
:
[
{
type
:
'success'
,
id
:
''
,
name
:
'填写原始记录'
},
{
type
:
'success'
,
id
:
''
,
name
:
'完成提交'
},
{
type
:
'success'
,
id
:
''
,
name
:
'设备'
},
{
type
:
''
,
id
:
'food-task-assign-adjust-group'
,
name
:
'调整分组'
},
{
type
:
''
,
...
...
@@ -206,6 +210,24 @@ export default {
this
.
userColumns
=
colList
this
.
$refs
.
pageTable
.
_loadColumn
(
colList
)
},
_equipResult
(
res
)
{
console
.
log
(
res
)
// let equipIds = []
// for (let i = 0; i
<
res
.
length
;
i
++
)
{
// equipIds.push(res[i].id)
// }
// this.$layxLoading()
// this.$store.dispatch('FoodItem/selectEquip', {
// ids: this.selectIds.join(','),
// equipIds: equipIds.join(',')
// }).then(() => {
// if (this.$store.state.FoodItem.success) {
// this.$Message.success('操作成功!');
// this._updateRows('selected');
// }
// this.$layxLoading(false);
// });
},
// 从字典查预警期
_dicSearch
()
{
const
data
=
[
'食品检测预警天数'
,
'食品默认计划完成时间'
]
...
...
@@ -333,6 +355,9 @@ export default {
case
'完成提交'
:
this
.
_submitItem
(
this
.
selectData
)
break
case
'设备'
:
this
.
_selectEquipment
()
break
case
'按组分配'
:
await
this
.
_reportDueDate
()
await
this
.
_groupAssign
()
...
...
@@ -358,6 +383,13 @@ export default {
break
}
},
_selectEquipment
()
{
if
(
this
.
selectIds
.
length
===
0
)
{
this
.
$Message
.
warning
(
'请至少选择一条数据!'
)
}
else
{
this
.
$refs
.
selEquip
.
_open
(
'sample-input'
)
}
},
_submitItem
(
data
)
{
console
.
log
(
data
)
if
(
data
[
0
].
recorded
!==
'是'
)
{
...
...
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