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
d2394138
Commit
d2394138
authored
Jun 19, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了个人检测任务检定条件
parent
7ffb0e04
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
130 additions
and
1 deletions
+130
-1
MeterOutPersonalTask.vue
pages/meter-out/personal-task/MeterOutPersonalTask.vue
+14
-0
MeterPersonItemTaskManage.vue
pages/meter-out/personal-task/MeterPersonItemTaskManage.vue
+15
-1
docimasy.vue
pages/meter-out/personal-task/docimasy.vue
+101
-0
No files found.
pages/meter-out/personal-task/MeterOutPersonalTask.vue
View file @
d2394138
...
...
@@ -59,6 +59,7 @@
</Row>
</div>
</div>
<docimasy
ref=
"docimasy"
></docimasy>
<FileManage
ref=
"FileManage"
></FileManage>
<operationModal
ref=
"operationModal"
></operationModal>
<SelEquip
ref=
"SelEquip"
@
on-result-change=
"_equipSelectBack"
></SelEquip>
...
...
@@ -76,8 +77,10 @@ import MeterSubcontractorEdit from './MeterGoOutTestEdit'
import
CarManage
from
'./CarManage'
import
MeterPersonItemTaskManage
from
'./MeterPersonItemTaskManage'
import
InstruMentEdit
from
'./InstrumentEdit'
import
docimasy
from
'./docimasy'
export
default
{
components
:
{
docimasy
,
MeterSubcontractorEdit
,
CarManage
,
MeterPersonItemTaskManage
,
...
...
@@ -105,6 +108,11 @@ export default {
type
:
'success'
,
id
:
''
,
name
:
'提交'
},
{
type
:
'success'
,
id
:
''
,
name
:
'检定条件'
}
],
iconMsg
:
[
...
...
@@ -174,6 +182,9 @@ export default {
this
.
currentComponent
=
componentName
this
.
$nextTick
(
function
()
{
switch
(
msg
)
{
case
'检定条件'
:
this
.
_docimasy
()
break
case
'仪器领用'
:
this
.
_receiveApparatus
()
break
...
...
@@ -192,6 +203,9 @@ export default {
}
})
},
_docimasy
()
{
this
.
$refs
.
docimasy
.
_open
(
this
.
selectIds
)
},
_carManage
()
{
this
.
$refs
.
carEdit
.
_open
()
},
...
...
pages/meter-out/personal-task/MeterPersonItemTaskManage.vue
View file @
d2394138
...
...
@@ -69,16 +69,19 @@
</Modal>
<fillout
ref=
"fillout"
></fillout>
<decide
ref=
"decide"
></decide>
<docimasy
ref=
"docimasy"
></docimasy>
</div>
</template>
<
script
>
import
{
meterItem
}
from
'../../../api'
import
fillout
from
'./DetectionValue'
import
decide
from
'./Judge'
import
docimasy
from
'./docimasy'
export
default
{
components
:
{
fillout
,
decide
decide
,
docimasy
// FoodSampleGovernDetail,
// CopyModal,
// FoodSampleGovernLYEdits
...
...
@@ -117,6 +120,11 @@ export default {
type
:
'success'
,
id
:
''
,
name
:
'判定'
},
{
type
:
'success'
,
id
:
''
,
name
:
'检定条件'
}
],
options
:
[
...
...
@@ -196,6 +204,9 @@ export default {
this
.
currentComponent
=
componentName
this
.
$nextTick
(
function
()
{
switch
(
msg
)
{
case
'检定条件'
:
this
.
_docimasy
()
break
case
'判定'
:
this
.
_judge
()
break
...
...
@@ -221,6 +232,9 @@ export default {
}
})
},
_docimasy
()
{
this
.
$refs
.
docimasy
.
_open
(
this
.
selectIds
)
},
_detectionValue
()
{
if
(
this
.
selectIds
.
length
===
0
)
{
this
.
$Message
.
warning
(
'请至少选择一条数据!'
)
...
...
pages/meter-out/personal-task/docimasy.vue
0 → 100644
View file @
d2394138
<
template
>
<div>
<Modal
v-model=
"showBackModal"
:mask-closable=
"false"
class=
"zIndex-1100"
>
<p
slot=
"header"
>
{{
modalTitle
}}
</p>
<div>
<Form
ref=
"formObj"
:model=
"formObj"
:rules=
"ruleValidate"
:label-width=
"90"
>
<Form-item
label=
"温度:"
prop=
"temperature"
>
<Input
v-model=
"formObj.temperature"
placeholder=
"请输入温度"
></Input>
</Form-item>
<Form-item
label=
"湿度:"
prop=
"humidity"
>
<Input
v-model=
"formObj.humidity"
placeholder=
"请输入湿度"
></Input>
</Form-item>
<Form-item
label=
"其他:"
prop=
"others"
>
<Input
v-model=
"formObj.others"
placeholder=
"其他"
></Input>
</Form-item>
<Form-item
label=
"地点:"
prop=
"location"
>
<Input
v-model=
"formObj.location"
placeholder=
"地点"
></Input>
</Form-item>
</Form>
</div>
<div
slot=
"footer"
>
<ModalFooter
ref=
"footerModal"
@
on-result-change=
"_footerResult"
:footer=
"footerList"
></ModalFooter>
</div>
</Modal>
</div>
</
template
>
<
script
>
/**
* 判定
*/
import
ModalFooter
from
'../../../components/base/modalFooter'
export
default
{
components
:
{
ModalFooter
},
data
()
{
return
{
ids
:
[],
// 合同ids
modalTitle
:
'检定条件'
,
showBackModal
:
false
,
formObj
:
{
temperature
:
''
,
humidity
:
''
,
others
:
''
,
location
:
''
},
path
:
''
,
ruleValidate
:
{},
footerList
:
[
{
id
:
''
,
name
:
'取消'
,
type
:
''
},
{
id
:
''
,
name
:
'保存'
,
type
:
'primary'
}
]
}
},
methods
:
{
_open
(
ids
)
{
this
.
ids
=
ids
// 合同id
this
.
showBackModal
=
true
this
.
formObj
.
type
=
1
this
.
formObj
=
{}
this
.
$refs
.
footerModal
.
_hideLoading
()
},
_cancel
()
{
this
.
showBackModal
=
false
},
_footerResult
(
name
)
{
switch
(
name
)
{
case
'取消'
:
this
.
_cancel
()
break
case
'保存'
:
this
.
_ok
()
break
}
this
.
$refs
.
footerModal
.
_hideLoading
()
},
_ok
()
{
this
.
$refs
.
formObj
.
validate
(
valid
=>
{
if
(
valid
)
{
const
data
=
{}
data
.
ids
=
this
.
ids
.
join
(
','
)
this
.
$extend
(
data
,
this
.
formObj
)
console
.
log
(
'要传的数据'
,
data
)
this
.
showBackModal
=
false
// this.$store.dispatch('FoodItem/judge', data).then(() => {
// if (this.$store.state.FoodItem.success) {
// this.$Message.success('判定成功')
// this.showBackModal = false
// this.$emit('on-result-change')
// }
// })
}
else
{
this
.
$Message
.
error
(
'表单验证失败!'
)
}
})
}
}
}
</
script
>
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