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
97d919c8
Commit
97d919c8
authored
Jun 16, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了操作日志按钮
parent
d05d500a
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
289 additions
and
40 deletions
+289
-40
Operation.vue
components/operation/Operation.vue
+114
-0
MeterAptitudeStandard.vue
pages/meter-aptitude/standard/MeterAptitudeStandard.vue
+1
-0
MeterCertificateCheck.vue
pages/meter-certificate/check/MeterCertificateCheck.vue
+11
-9
MeterCertificateIssue.vue
pages/meter-certificate/issue/MeterCertificateIssue.vue
+5
-2
MeterCertificateMake.vue
pages/meter-certificate/make/MeterCertificateMake.vue
+4
-2
MeterGoOutEntrust.vue
pages/meter-entrust/go-out-test/MeterGoOutEntrust.vue
+7
-4
MeterGoOutOperation.vue
pages/meter-entrust/go-out-test/MeterGoOutOperation.vue
+114
-0
MeterOutPersonalTask.vue
pages/meter-out/personal-task/MeterOutPersonalTask.vue
+11
-8
MeterReviewEntrust.vue
pages/meter-review/MeterReviewEntrust.vue
+10
-8
MeterSubcontractor.vue
pages/meter-subcontract/subcontractor/MeterSubcontractor.vue
+4
-3
MeterSubpackageInput.vue
...ter-subcontract/subpackage-input/MeterSubpackageInput.vue
+4
-2
MeterSubpackageTask.vue
...meter-subcontract/subpackage-task/MeterSubpackageTask.vue
+4
-2
No files found.
components/operation/Operation.vue
0 → 100644
View file @
97d919c8
<
template
>
<div>
<Modal
v-model=
"showModal"
width=
"900"
class=
"modal-footer-none zIndex-1100"
>
<p
slot=
"header"
>
操作日志
</p>
<div>
<Row>
<!--查询-->
<Col
span=
"24"
>
<Form
id=
"search-contract-record"
:label-width=
"70"
inline
onsubmit=
"return false"
>
<label
class=
"label-sign"
></label>
<Form-item
label=
"操作阶段:"
>
<Input
v-model=
"formObj.origin"
@
on-enter=
"_search"
placeholder=
"请输入操作阶段"
style=
"width: 200px"
clearable
/>
</Form-item>
<Form-item
class=
"search-btn"
>
<Button
@
click=
"_search"
type=
"primary"
>
搜索
</Button>
</Form-item>
</Form>
</Col>
<!-- 表格 -->
<Col
span=
"24"
>
<PTVXETable
ref=
"pageTable"
:tableHeight=
"tableHeight"
@
on-result-change=
"_tableResultChange"
:getPage=
"getPage"
hide-checkbox
>
<vxe-table-column
:field=
"item.key"
:title=
"item.title"
:min-width=
"item.width?item.width:200"
:fixed=
"item.fixed?item.fixed:undefined"
v-for=
"item in pageColumns"
:key=
"item.key"
>
<template
slot-scope=
"scope"
>
<span
v-if=
"item.key==='type'"
>
{{
scope
.
row
[
item
.
key
]
===
0
?
'流转'
:
scope
.
row
[
item
.
key
]
===
1
?
'退回'
:
scope
.
row
[
item
.
key
]
===
2
?
'更新'
:
scope
.
row
[
item
.
key
]
===
3
?
'转发'
:
'文件'
}}
</span>
<span
v-else-if=
"item.key==='ctime'"
>
{{
scope
.
row
[
item
.
key
]?
$dateformat
(
scope
.
row
[
item
.
key
],
'yyyy-mm-dd HH:MM:ss'
):
''
}}
</span>
<span
v-else
>
{{
scope
.
row
[
item
.
key
]
}}
</span>
</
template
>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</div>
</Modal>
</div>
</template>
<
script
>
/**
* 操作日志-委托
*/
import
{
meterEntrust
}
from
'../../api'
export
default
{
data
()
{
return
{
showModal
:
false
,
getPage
:
{},
pageColumns
:
[
{
title
:
'操作类型'
,
key
:
'type'
,
width
:
80
},
{
title
:
'操作阶段'
,
key
:
'origin'
,
width
:
120
},
{
title
:
'目标阶段'
,
key
:
'target'
,
width
:
120
},
{
title
:
'操作人'
,
key
:
'operator'
,
width
:
80
},
{
title
:
'操作时间'
,
key
:
'ctime'
,
width
:
150
},
{
title
:
'操作原因'
,
key
:
'remark'
},
{
title
:
'责任人'
,
key
:
'liable'
,
width
:
80
}
],
formObj
:
{
origin
:
''
,
contractId
:
''
}
}
},
computed
:
{
tableHeight
:
function
()
{
return
this
.
$tableHeight
(
'tableModal'
)
}
},
methods
:
{
_open
(
contractId
)
{
this
.
showModal
=
true
this
.
formObj
.
contractId
=
contractId
this
.
formObj
.
origin
=
''
this
.
_page
()
},
_page
:
async
function
()
{
console
.
log
(
'要传的参数'
)
console
.
log
(
this
.
formObj
)
const
result
=
await
meterEntrust
.
pageOutTaskOperation
(
this
.
formObj
)
console
.
log
(
result
)
if
(
result
)
{
this
.
getPage
=
result
}
// this.$refs.pageTable._page(
// 'search-contract-record',
// 'FoodContractRecord/page',
// this.$serializeFormSearch(this.formObj)
// )
},
_tableResultChange
(
msg
,
data
)
{
switch
(
msg
)
{
case
'page'
:
this
.
getPage
=
this
.
$store
.
state
.
FoodContractRecord
.
page
break
case
'changeSize'
:
this
.
_page
()
break
}
},
_search
()
{
this
.
$refs
.
pageTable
.
_pageChange
(
1
)
}
}
}
</
script
>
pages/meter-aptitude/standard/MeterAptitudeStandard.vue
View file @
97d919c8
...
@@ -152,6 +152,7 @@ export default {
...
@@ -152,6 +152,7 @@ export default {
this
.
getPage
=
result
this
.
getPage
=
result
console
.
log
(
123456789
)
console
.
log
(
123456789
)
console
.
log
(
this
.
getPage
)
console
.
log
(
this
.
getPage
)
this
.
$refs
.
pageTable
.
_hideLoading
()
}
}
},
},
_formSearch
()
{
_formSearch
()
{
...
...
pages/meter-certificate/check/MeterCertificateCheck.vue
View file @
97d919c8
...
@@ -6,29 +6,29 @@
...
@@ -6,29 +6,29 @@
<Row>
<Row>
<!--查询-->
<!--查询-->
<Col
span=
"24"
style=
"margin-top: 10px"
>
<Col
span=
"24"
style=
"margin-top: 10px"
>
<Form
v-show=
"searchOpen"
id=
"formId
"
:label-width=
"90"
inline
onsubmit=
"return false"
>
<Form
id=
"formId"
v-show=
"searchOpen
"
:label-width=
"90"
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.name"
name=
"name"
placeholder=
"请输入实验室名称"
clearable
@
on-enter=
"_formSearch"
/>
<Input
v-model=
"formObj.name"
@
on-enter=
"_formSearch"
name=
"name"
placeholder=
"请输入实验室名称"
clearable
/>
</Form-item>
</Form-item>
<Form-item
class=
"search-item"
label=
"资质:"
>
<Form-item
class=
"search-item"
label=
"资质:"
>
<Input
v-model=
"formObj.aptitude"
name=
"aptitude"
placeholder=
"请输入资质"
clearable
@
on-enter=
"_formSearch"
/>
<Input
v-model=
"formObj.aptitude"
@
on-enter=
"_formSearch"
name=
"aptitude"
placeholder=
"请输入资质"
clearable
/>
</Form-item>
</Form-item>
<Form-item
class=
"search-btn"
>
<Form-item
class=
"search-btn"
>
<Button
type=
"primary"
@
click=
"_formSearch
"
>
搜索
</Button>
<Button
@
click=
"_formSearch"
type=
"primary
"
>
搜索
</Button>
</Form-item>
</Form-item>
</Form>
</Form>
</Col>
</Col>
<!--操作-->
<!--操作-->
<Col
span=
"24"
>
<Col
span=
"24"
>
<btn-list
:msg=
"btn"
:open=
"searchOpen"
:show-search-btn=
"true"
class=
"contHide
"
<btn-list
:msg=
"btn"
:open=
"searchOpen"
:show-search-btn=
"true"
@
on-result-change=
"_btnClick
"
@
on-result-change=
"_btnClick
"
></btn-list>
class=
"contHide
"
></btn-list>
</Col>
</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"
:icon-msg=
"iconMsg"
select-data
@
on-result-change=
"_tableResultChange"
>
:get-page=
"getPage"
:icon-msg=
"iconMsg"
@
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"
...
@@ -46,13 +46,15 @@
...
@@ -46,13 +46,15 @@
</div>
</div>
</div>
</div>
<Reason
ref=
"reasonModal"
@
on-result-change=
"_reasonResult"
></Reason>
<Reason
ref=
"reasonModal"
@
on-result-change=
"_reasonResult"
></Reason>
<operationModal
ref=
"operationModal"
></operationModal>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
meterSample
}
from
'../../../api'
import
{
meterSample
}
from
'../../../api'
import
Reason
from
'../../../components/base/Reason'
import
Reason
from
'../../../components/base/Reason'
import
operationModal
from
'../../../components/operation/Operation'
export
default
{
export
default
{
components
:
{
Reason
},
components
:
{
Reason
,
operationModal
},
data
()
{
data
()
{
return
{
return
{
currentComponent
:
''
,
currentComponent
:
''
,
...
@@ -251,7 +253,7 @@ export default {
...
@@ -251,7 +253,7 @@ export default {
}
}
},
},
_record
(
id
)
{
_record
(
id
)
{
this
.
$refs
.
ref
Modal
.
_open
(
id
)
this
.
$refs
.
operation
Modal
.
_open
(
id
)
},
},
_tableResultChange
(
msg
,
data
)
{
_tableResultChange
(
msg
,
data
)
{
switch
(
msg
)
{
switch
(
msg
)
{
...
...
pages/meter-certificate/issue/MeterCertificateIssue.vue
View file @
97d919c8
...
@@ -45,12 +45,15 @@
...
@@ -45,12 +45,15 @@
</Row>
</Row>
</div>
</div>
</div>
</div>
<operationModal
ref=
"operationModal"
></operationModal>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
meterSample
}
from
'../../../api'
import
{
meterSample
}
from
'../../../api'
import
operationModal
from
'../../../components/operation/Operation'
export
default
{
export
default
{
components
:
{},
components
:
{
operationModal
},
data
()
{
data
()
{
return
{
return
{
currentComponent
:
''
,
currentComponent
:
''
,
...
@@ -204,7 +207,7 @@ export default {
...
@@ -204,7 +207,7 @@ export default {
this
.
$refs
.
personModal
.
_open
(
data
.
id
)
this
.
$refs
.
personModal
.
_open
(
data
.
id
)
},
},
_record
(
id
)
{
_record
(
id
)
{
this
.
$refs
.
ref
Modal
.
_open
(
id
)
this
.
$refs
.
operation
Modal
.
_open
(
id
)
},
},
_tableResultChange
(
msg
,
data
)
{
_tableResultChange
(
msg
,
data
)
{
switch
(
msg
)
{
switch
(
msg
)
{
...
...
pages/meter-certificate/make/MeterCertificateMake.vue
View file @
97d919c8
...
@@ -48,15 +48,17 @@
...
@@ -48,15 +48,17 @@
<CreateReport
ref=
"CreateReport"
></CreateReport>
<CreateReport
ref=
"CreateReport"
></CreateReport>
<CarManage
ref=
"carEdit"
></CarManage>
<CarManage
ref=
"carEdit"
></CarManage>
<InstruMentEdit
ref=
"InstruEdit"
></InstruMentEdit>
<InstruMentEdit
ref=
"InstruEdit"
></InstruMentEdit>
<operationModal
ref=
"operationModal"
></operationModal>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
meterSample
}
from
'../../../api'
import
{
meterSample
}
from
'../../../api'
import
operationModal
from
'../../../components/operation/Operation'
import
CreateReport
from
'./CreateReport'
import
CreateReport
from
'./CreateReport'
import
CarManage
from
'./CarManage'
import
CarManage
from
'./CarManage'
import
InstruMentEdit
from
'./InstrumentEdit'
import
InstruMentEdit
from
'./InstrumentEdit'
export
default
{
export
default
{
components
:
{
CreateReport
,
CarManage
,
InstruMentEdit
},
components
:
{
CreateReport
,
CarManage
,
InstruMentEdit
,
operationModal
},
data
()
{
data
()
{
return
{
return
{
currentComponent
:
''
,
currentComponent
:
''
,
...
@@ -263,7 +265,7 @@ export default {
...
@@ -263,7 +265,7 @@ export default {
}
}
},
},
_record
(
id
)
{
_record
(
id
)
{
this
.
$refs
.
ref
Modal
.
_open
(
id
)
this
.
$refs
.
operation
Modal
.
_open
(
id
)
},
},
_tableResultChange
(
msg
,
data
)
{
_tableResultChange
(
msg
,
data
)
{
switch
(
msg
)
{
switch
(
msg
)
{
...
...
pages/meter-entrust/go-out-test/MeterGoOutEntrust.vue
View file @
97d919c8
...
@@ -47,13 +47,15 @@
...
@@ -47,13 +47,15 @@
</div>
</div>
<MeterSubcontractorEdit
ref=
"editSubcontractorModal"
@
on-result-change=
"_formSearch"
></MeterSubcontractorEdit>
<MeterSubcontractorEdit
ref=
"editSubcontractorModal"
@
on-result-change=
"_formSearch"
></MeterSubcontractorEdit>
<operationModal
ref=
"operationModal"
></operationModal>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
meterEntrust
}
from
'../../../api'
import
{
meterEntrust
}
from
'../../../api'
import
MeterSubcontractorEdit
from
'./MeterGoOutTestEdit'
import
MeterSubcontractorEdit
from
'./MeterGoOutTestEdit'
import
operationModal
from
'./MeterGoOutOperation'
export
default
{
export
default
{
components
:
{
MeterSubcontractorEdit
},
components
:
{
MeterSubcontractorEdit
,
operationModal
},
data
()
{
data
()
{
return
{
return
{
currentComponent
:
''
,
currentComponent
:
''
,
...
@@ -182,13 +184,14 @@ export default {
...
@@ -182,13 +184,14 @@ export default {
this
.
_deleteByIds
([
data
.
id
])
this
.
_deleteByIds
([
data
.
id
])
break
break
case
'操作日志'
:
case
'操作日志'
:
this
.
_record
(
data
.
id
)
this
.
_record
(
data
)
break
break
}
}
})
})
},
},
_record
(
id
)
{
_record
(
data
)
{
this
.
$refs
.
refModal
.
_open
(
id
)
console
.
log
(
data
)
this
.
$refs
.
operationModal
.
_open
(
data
.
id
)
},
},
_tableResultChange
(
msg
,
data
)
{
_tableResultChange
(
msg
,
data
)
{
switch
(
msg
)
{
switch
(
msg
)
{
...
...
pages/meter-entrust/go-out-test/MeterGoOutOperation.vue
0 → 100644
View file @
97d919c8
<
template
>
<div>
<Modal
v-model=
"showModal"
width=
"900"
class=
"modal-footer-none zIndex-1100"
>
<p
slot=
"header"
>
操作日志
</p>
<div>
<Row>
<!--查询-->
<Col
span=
"24"
>
<Form
id=
"search-contract-record"
:label-width=
"70"
inline
onsubmit=
"return false"
>
<label
class=
"label-sign"
></label>
<Form-item
label=
"操作阶段:"
>
<Input
v-model=
"formObj.origin"
@
on-enter=
"_search"
placeholder=
"请输入操作阶段"
style=
"width: 200px"
clearable
/>
</Form-item>
<Form-item
class=
"search-btn"
>
<Button
@
click=
"_search"
type=
"primary"
>
搜索
</Button>
</Form-item>
</Form>
</Col>
<!-- 表格 -->
<Col
span=
"24"
>
<PTVXETable
ref=
"pageTable"
:tableHeight=
"tableHeight"
@
on-result-change=
"_tableResultChange"
:getPage=
"getPage"
hide-checkbox
>
<vxe-table-column
:field=
"item.key"
:title=
"item.title"
:min-width=
"item.width?item.width:200"
:fixed=
"item.fixed?item.fixed:undefined"
v-for=
"item in pageColumns"
:key=
"item.key"
>
<template
slot-scope=
"scope"
>
<span
v-if=
"item.key==='type'"
>
{{
scope
.
row
[
item
.
key
]
===
0
?
'流转'
:
scope
.
row
[
item
.
key
]
===
1
?
'退回'
:
scope
.
row
[
item
.
key
]
===
2
?
'更新'
:
scope
.
row
[
item
.
key
]
===
3
?
'转发'
:
'文件'
}}
</span>
<span
v-else-if=
"item.key==='ctime'"
>
{{
scope
.
row
[
item
.
key
]?
$dateformat
(
scope
.
row
[
item
.
key
],
'yyyy-mm-dd HH:MM:ss'
):
''
}}
</span>
<span
v-else
>
{{
scope
.
row
[
item
.
key
]
}}
</span>
</
template
>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</div>
</Modal>
</div>
</template>
<
script
>
/**
* 操作日志-委托
*/
import
{
meterEntrust
}
from
'../../../api'
export
default
{
data
()
{
return
{
showModal
:
false
,
getPage
:
{},
pageColumns
:
[
{
title
:
'操作类型'
,
key
:
'type'
,
width
:
80
},
{
title
:
'操作阶段'
,
key
:
'origin'
,
width
:
120
},
{
title
:
'目标阶段'
,
key
:
'target'
,
width
:
120
},
{
title
:
'操作人'
,
key
:
'operator'
,
width
:
80
},
{
title
:
'操作时间'
,
key
:
'ctime'
,
width
:
150
},
{
title
:
'操作原因'
,
key
:
'remark'
},
{
title
:
'责任人'
,
key
:
'liable'
,
width
:
80
}
],
formObj
:
{
origin
:
''
,
contractId
:
''
}
}
},
computed
:
{
tableHeight
:
function
()
{
return
this
.
$tableHeight
(
'tableModal'
)
}
},
methods
:
{
_open
(
contractId
)
{
this
.
showModal
=
true
this
.
formObj
.
contractId
=
contractId
this
.
formObj
.
origin
=
''
this
.
_page
()
},
_page
:
async
function
()
{
console
.
log
(
'要传的参数'
)
console
.
log
(
this
.
formObj
)
const
result
=
await
meterEntrust
.
pageOutTaskOperation
(
this
.
formObj
)
console
.
log
(
result
)
if
(
result
)
{
this
.
getPage
=
result
}
// this.$refs.pageTable._page(
// 'search-contract-record',
// 'FoodContractRecord/page',
// this.$serializeFormSearch(this.formObj)
// )
},
_tableResultChange
(
msg
,
data
)
{
switch
(
msg
)
{
case
'page'
:
this
.
getPage
=
this
.
$store
.
state
.
FoodContractRecord
.
page
break
case
'changeSize'
:
this
.
_page
()
break
}
},
_search
()
{
this
.
$refs
.
pageTable
.
_pageChange
(
1
)
}
}
}
</
script
>
pages/meter-out/personal-task/MeterOutPersonalTask.vue
View file @
97d919c8
...
@@ -6,24 +6,24 @@
...
@@ -6,24 +6,24 @@
<Row>
<Row>
<!--查询-->
<!--查询-->
<Col
span=
"24"
style=
"margin-top: 10px"
>
<Col
span=
"24"
style=
"margin-top: 10px"
>
<Form
v-show=
"searchOpen"
id=
"formId
"
:label-width=
"90"
inline
onsubmit=
"return false"
>
<Form
id=
"formId"
v-show=
"searchOpen
"
:label-width=
"90"
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.name"
name=
"name"
placeholder=
"请输入实验室名称"
clearable
@
on-enter=
"_formSearch"
/>
<Input
v-model=
"formObj.name"
@
on-enter=
"_formSearch"
name=
"name"
placeholder=
"请输入实验室名称"
clearable
/>
</Form-item>
</Form-item>
<Form-item
class=
"search-item"
label=
"资质:"
>
<Form-item
class=
"search-item"
label=
"资质:"
>
<Input
v-model=
"formObj.aptitude"
name=
"aptitude"
placeholder=
"请输入资质"
clearable
@
on-enter=
"_formSearch"
/>
<Input
v-model=
"formObj.aptitude"
@
on-enter=
"_formSearch"
name=
"aptitude"
placeholder=
"请输入资质"
clearable
/>
</Form-item>
</Form-item>
<Form-item
class=
"search-btn"
>
<Form-item
class=
"search-btn"
>
<Button
type=
"primary"
@
click=
"_formSearch
"
>
搜索
</Button>
<Button
@
click=
"_formSearch"
type=
"primary
"
>
搜索
</Button>
</Form-item>
</Form-item>
</Form>
</Form>
</Col>
</Col>
<!--操作-->
<!--操作-->
<Col
span=
"24"
>
<Col
span=
"24"
>
<btn-list
:msg=
"btn"
:open=
"searchOpen"
:show-search-btn=
"true"
class=
"contHide
"
<btn-list
:msg=
"btn"
:open=
"searchOpen"
:show-search-btn=
"true"
@
on-result-change=
"_btnClick
"
@
on-result-change=
"_btnClick
"
></btn-list>
class=
"contHide
"
></btn-list>
</Col>
</Col>
<!--表格-->
<!--表格-->
<Col
span=
"24"
>
<Col
span=
"24"
>
...
@@ -45,6 +45,7 @@
...
@@ -45,6 +45,7 @@
</Row>
</Row>
</div>
</div>
</div>
</div>
<operationModal
ref=
"operationModal"
></operationModal>
<SelEquip
ref=
"SelEquip"
@
on-result-change=
"_equipSelectBack"
></SelEquip>
<SelEquip
ref=
"SelEquip"
@
on-result-change=
"_equipSelectBack"
></SelEquip>
<CarManage
ref=
"carEdit"
></CarManage>
<CarManage
ref=
"carEdit"
></CarManage>
<InstruMentEdit
ref=
"InstruEdit"
></InstruMentEdit>
<InstruMentEdit
ref=
"InstruEdit"
></InstruMentEdit>
...
@@ -55,6 +56,7 @@
...
@@ -55,6 +56,7 @@
<
script
>
<
script
>
import
{
meterDevice
,
meterSample
}
from
'../../../api'
import
{
meterDevice
,
meterSample
}
from
'../../../api'
import
SelEquip
from
'../../../components/select-equip/SelEquip'
import
SelEquip
from
'../../../components/select-equip/SelEquip'
import
operationModal
from
'../../../components/operation/Operation'
import
MeterSubcontractorEdit
from
'./MeterGoOutTestEdit'
import
MeterSubcontractorEdit
from
'./MeterGoOutTestEdit'
import
CarManage
from
'./CarManage'
import
CarManage
from
'./CarManage'
import
MeterPersonItemTaskManage
from
'./MeterPersonItemTaskManage'
import
MeterPersonItemTaskManage
from
'./MeterPersonItemTaskManage'
...
@@ -65,7 +67,8 @@ export default {
...
@@ -65,7 +67,8 @@ export default {
CarManage
,
CarManage
,
MeterPersonItemTaskManage
,
MeterPersonItemTaskManage
,
SelEquip
,
SelEquip
,
InstruMentEdit
InstruMentEdit
,
operationModal
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -261,7 +264,7 @@ export default {
...
@@ -261,7 +264,7 @@ export default {
},
},
_record
(
id
)
{
_record
(
id
)
{
this
.
$refs
.
ref
Modal
.
_open
(
id
)
this
.
$refs
.
operation
Modal
.
_open
(
id
)
},
},
_tableResultChange
(
msg
,
data
)
{
_tableResultChange
(
msg
,
data
)
{
switch
(
msg
)
{
switch
(
msg
)
{
...
...
pages/meter-review/MeterReviewEntrust.vue
View file @
97d919c8
...
@@ -6,24 +6,24 @@
...
@@ -6,24 +6,24 @@
<Row>
<Row>
<!--查询-->
<!--查询-->
<Col
span=
"24"
style=
"margin-top: 10px"
>
<Col
span=
"24"
style=
"margin-top: 10px"
>
<Form
v-show=
"searchOpen"
id=
"formId
"
:label-width=
"90"
inline
onsubmit=
"return false"
>
<Form
id=
"formId"
v-show=
"searchOpen
"
:label-width=
"90"
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.name"
name=
"name"
placeholder=
"请输入实验室名称"
clearable
@
on-enter=
"_formSearch"
/>
<Input
v-model=
"formObj.name"
@
on-enter=
"_formSearch"
name=
"name"
placeholder=
"请输入实验室名称"
clearable
/>
</Form-item>
</Form-item>
<Form-item
class=
"search-item"
label=
"资质:"
>
<Form-item
class=
"search-item"
label=
"资质:"
>
<Input
v-model=
"formObj.aptitude"
name=
"aptitude"
placeholder=
"请输入资质"
clearable
@
on-enter=
"_formSearch"
/>
<Input
v-model=
"formObj.aptitude"
@
on-enter=
"_formSearch"
name=
"aptitude"
placeholder=
"请输入资质"
clearable
/>
</Form-item>
</Form-item>
<Form-item
class=
"search-btn"
>
<Form-item
class=
"search-btn"
>
<Button
type=
"primary"
@
click=
"_formSearch
"
>
搜索
</Button>
<Button
@
click=
"_formSearch"
type=
"primary
"
>
搜索
</Button>
</Form-item>
</Form-item>
</Form>
</Form>
</Col>
</Col>
<!--操作-->
<!--操作-->
<Col
span=
"24"
>
<Col
span=
"24"
>
<btn-list
:msg=
"btn"
:open=
"searchOpen"
:show-search-btn=
"true"
class=
"contHide
"
<btn-list
:msg=
"btn"
:open=
"searchOpen"
:show-search-btn=
"true"
@
on-result-change=
"_btnClick
"
@
on-result-change=
"_btnClick
"
></btn-list>
class=
"contHide
"
></btn-list>
</Col>
</Col>
<!--表格-->
<!--表格-->
<Col
span=
"24"
>
<Col
span=
"24"
>
...
@@ -47,14 +47,16 @@
...
@@ -47,14 +47,16 @@
</div>
</div>
<MeterSampleManage
ref=
"meterSampleManageModal"
@
on-result-change=
"_componentResult"
></MeterSampleManage>
<MeterSampleManage
ref=
"meterSampleManageModal"
@
on-result-change=
"_componentResult"
></MeterSampleManage>
<MeterEntrustDetail
ref=
"meterSampleEdit"
@
on-result-change=
"_componentResult"
></MeterEntrustDetail>
<MeterEntrustDetail
ref=
"meterSampleEdit"
@
on-result-change=
"_componentResult"
></MeterEntrustDetail>
<Operation
ref=
"operation"
></Operation>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
meterEntrust
,
meterSubcontractor
}
from
'../../api'
import
{
meterEntrust
,
meterSubcontractor
}
from
'../../api'
import
Operation
from
'../../components/operation/Operation'
import
MeterSampleManage
from
'./MeterSampleManage'
import
MeterSampleManage
from
'./MeterSampleManage'
import
MeterEntrustDetail
from
'./MeterEntrustDetail'
import
MeterEntrustDetail
from
'./MeterEntrustDetail'
export
default
{
export
default
{
components
:
{
MeterSampleManage
,
MeterEntrustDetail
},
components
:
{
MeterSampleManage
,
MeterEntrustDetail
,
Operation
},
data
()
{
data
()
{
return
{
return
{
currentComponent
:
'FoodSampleGovern'
,
currentComponent
:
'FoodSampleGovern'
,
...
@@ -212,7 +214,7 @@ export default {
...
@@ -212,7 +214,7 @@ export default {
}
}
},
},
_record
(
id
)
{
_record
(
id
)
{
this
.
$refs
.
refModal
.
_open
(
id
)
this
.
$refs
.
operation
.
_open
(
id
)
},
},
_tableResultChange
(
msg
,
data
)
{
_tableResultChange
(
msg
,
data
)
{
switch
(
msg
)
{
switch
(
msg
)
{
...
...
pages/meter-subcontract/subcontractor/MeterSubcontractor.vue
View file @
97d919c8
...
@@ -45,15 +45,16 @@
...
@@ -45,15 +45,16 @@
</Row>
</Row>
</div>
</div>
</div>
</div>
<operationModal
ref=
"operationModal"
></operationModal>
<MeterSubcontractorEdit
ref=
"editSubcontractorModal"
@
on-result-change=
"_formSearch"
></MeterSubcontractorEdit>
<MeterSubcontractorEdit
ref=
"editSubcontractorModal"
@
on-result-change=
"_formSearch"
></MeterSubcontractorEdit>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
meterSubcontractor
}
from
'../../../api'
import
{
meterSubcontractor
}
from
'../../../api'
import
operationModal
from
'../../../components/operation/Operation'
import
MeterSubcontractorEdit
from
'./MeterSubcontractorEdit'
import
MeterSubcontractorEdit
from
'./MeterSubcontractorEdit'
export
default
{
export
default
{
components
:
{
MeterSubcontractorEdit
},
components
:
{
MeterSubcontractorEdit
,
operationModal
},
data
()
{
data
()
{
return
{
return
{
currentComponent
:
''
,
currentComponent
:
''
,
...
@@ -157,7 +158,7 @@ export default {
...
@@ -157,7 +158,7 @@ export default {
})
})
},
},
_record
(
id
)
{
_record
(
id
)
{
this
.
$refs
.
ref
Modal
.
_open
(
id
)
this
.
$refs
.
operation
Modal
.
_open
(
id
)
},
},
_tableResultChange
(
msg
,
data
)
{
_tableResultChange
(
msg
,
data
)
{
switch
(
msg
)
{
switch
(
msg
)
{
...
...
pages/meter-subcontract/subpackage-input/MeterSubpackageInput.vue
View file @
97d919c8
...
@@ -46,13 +46,15 @@
...
@@ -46,13 +46,15 @@
</div>
</div>
</div>
</div>
<subSampleManage
ref=
"subSampleManage"
></subSampleManage>
<subSampleManage
ref=
"subSampleManage"
></subSampleManage>
<operationModal
ref=
"operationModal"
></operationModal>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
meterEntrust
,
meterSubcontractor
}
from
'../../../api'
import
{
meterEntrust
,
meterSubcontractor
}
from
'../../../api'
import
operationModal
from
'../../../components/operation/Operation'
import
subSampleManage
from
'./MeterSubSampleManage'
import
subSampleManage
from
'./MeterSubSampleManage'
export
default
{
export
default
{
components
:
{
subSampleManage
},
components
:
{
subSampleManage
,
operationModal
},
data
()
{
data
()
{
return
{
return
{
currentComponent
:
''
,
currentComponent
:
''
,
...
@@ -173,7 +175,7 @@ export default {
...
@@ -173,7 +175,7 @@ export default {
this
.
$refs
.
subSampleManage
.
_open
(
data
.
id
)
this
.
$refs
.
subSampleManage
.
_open
(
data
.
id
)
},
},
_record
(
id
)
{
_record
(
id
)
{
this
.
$refs
.
ref
Modal
.
_open
(
id
)
this
.
$refs
.
operation
Modal
.
_open
(
id
)
},
},
_tableResultChange
(
msg
,
data
)
{
_tableResultChange
(
msg
,
data
)
{
switch
(
msg
)
{
switch
(
msg
)
{
...
...
pages/meter-subcontract/subpackage-task/MeterSubpackageTask.vue
View file @
97d919c8
...
@@ -46,13 +46,15 @@
...
@@ -46,13 +46,15 @@
</div>
</div>
</div>
</div>
<subSampleManage
ref=
"subSampleManage"
></subSampleManage>
<subSampleManage
ref=
"subSampleManage"
></subSampleManage>
<operationModal
ref=
"operationModal"
></operationModal>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
{
meterEntrust
,
meterSubcontractor
}
from
'../../../api'
import
{
meterEntrust
,
meterSubcontractor
}
from
'../../../api'
import
operationModal
from
'../../../components/operation/Operation'
import
subSampleManage
from
'./MeterSubSampleManage'
import
subSampleManage
from
'./MeterSubSampleManage'
export
default
{
export
default
{
components
:
{
subSampleManage
},
components
:
{
subSampleManage
,
operationModal
},
data
()
{
data
()
{
return
{
return
{
currentComponent
:
''
,
currentComponent
:
''
,
...
@@ -173,7 +175,7 @@ export default {
...
@@ -173,7 +175,7 @@ export default {
this
.
$refs
.
subSampleManage
.
_open
(
data
.
id
)
this
.
$refs
.
subSampleManage
.
_open
(
data
.
id
)
},
},
_record
(
id
)
{
_record
(
id
)
{
this
.
$refs
.
ref
Modal
.
_open
(
id
)
this
.
$refs
.
operation
Modal
.
_open
(
id
)
},
},
_tableResultChange
(
msg
,
data
)
{
_tableResultChange
(
msg
,
data
)
{
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