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
63d06d1e
Commit
63d06d1e
authored
Jul 09, 2020
by
lichengming
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://git.patzn.com/root/patzn-cloud-service-metr-web
into dev
parents
66386a3f
54be3cea
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
519 additions
and
136 deletions
+519
-136
meter-sample.js
api/meter/meter-sample.js
+4
-0
MeterCertificateCheck.vue
pages/meter-certificate/check/MeterCertificateCheck.vue
+2
-1
MeterCertificateCheckHis.vue
pages/meter-certificate/check/MeterCertificateCheckHis.vue
+3
-2
MeterCertificateIssue.vue
pages/meter-certificate/issue/MeterCertificateIssue.vue
+8
-7
MeterCertificateIssueHis.vue
pages/meter-certificate/issue/MeterCertificateIssueHis.vue
+162
-70
MeterCertificateMake.vue
pages/meter-certificate/make/MeterCertificateMake.vue
+6
-6
MeterCertificateMakeHis.vue
pages/meter-certificate/make/MeterCertificateMakeHis.vue
+6
-6
MeterCertificatePrintHis.vue
pages/meter-certificate/print/MeterCertificatePrintHis.vue
+35
-17
MeterCertificatePrintIndex.vue
pages/meter-certificate/print/MeterCertificatePrintIndex.vue
+293
-27
No files found.
api/meter/meter-sample.js
View file @
63d06d1e
...
...
@@ -88,6 +88,10 @@ export default {
.
then
(
res
=>
res
),
pageCertificateIssue
:
data
=>
http
.
post
(
'meter/v1/sample/page_certificate_issue'
,
data
).
then
(
res
=>
res
),
pageCertificateIssueHis
:
data
=>
http
.
post
(
'meter/v1/sample/page_certificate_issue_his'
,
data
)
.
then
(
res
=>
res
),
pageCertificatePrint
:
data
=>
http
.
post
(
'meter/v1/sample/page_certificate_print'
,
data
).
then
(
res
=>
res
),
pageCertificateEnd
:
data
=>
...
...
pages/meter-certificate/check/MeterCertificateCheck.vue
View file @
63d06d1e
...
...
@@ -113,8 +113,9 @@ export default {
{
title
:
'样品编号'
,
key
:
'code'
,
width
:
120
},
{
title
:
'型号规格'
,
key
:
'spec'
,
width
:
100
},
{
title
:
'出厂编号'
,
key
:
'factoryNumber'
},
{
title
:
'检测类型'
,
key
:
'type'
},
{
title
:
'检测类型'
,
key
:
'type'
,
width
:
100
},
{
title
:
'委托单位'
,
key
:
'client'
,
width
:
200
},
{
title
:
'委托编号'
,
key
:
'entrustCode'
,
width
:
130
},
{
title
:
'联系人'
,
key
:
'person'
,
width
:
120
},
{
title
:
'联系电话'
,
key
:
'tel'
,
width
:
120
},
{
title
:
'详细地址'
,
key
:
'address'
,
width
:
250
},
...
...
pages/meter-certificate/check/MeterCertificateCheckHis.vue
View file @
63d06d1e
...
...
@@ -113,8 +113,9 @@ export default {
{
title
:
'样品编号'
,
key
:
'code'
,
width
:
120
},
{
title
:
'型号规格'
,
key
:
'spec'
,
width
:
100
},
{
title
:
'出厂编号'
,
key
:
'factoryNumber'
},
{
title
:
'检测类型'
,
key
:
'type'
},
{
title
:
'检测类型'
,
key
:
'type'
,
width
:
100
},
{
title
:
'委托单位'
,
key
:
'client'
,
width
:
200
},
{
title
:
'委托编号'
,
key
:
'entrustCode'
,
width
:
130
},
{
title
:
'联系人'
,
key
:
'person'
,
width
:
120
},
{
title
:
'联系电话'
,
key
:
'tel'
,
width
:
120
},
{
title
:
'详细地址'
,
key
:
'address'
,
width
:
250
},
...
...
@@ -255,7 +256,7 @@ export default {
this
.
_personModal
(
data
)
break
case
'查看证书'
:
this
.
_itemOriginalRecordLook
(
data
,
'
write
'
)
this
.
_itemOriginalRecordLook
(
data
,
'
only
'
)
break
case
'资质项目'
:
this
.
_itemModal
(
data
.
id
)
...
...
pages/meter-certificate/issue/MeterCertificateIssue.vue
View file @
63d06d1e
...
...
@@ -8,11 +8,11 @@
<Col
span=
"24"
style=
"margin-top: 10px"
>
<Form
v-show=
"searchOpen"
id=
"formId"
:label-width=
"90"
inline
onsubmit=
"return false"
>
<label
class=
"label-sign"
></label>
<Form-item
class=
"search-item"
label=
"
实验室名称
:"
>
<Input
v-model=
"formObj.
name"
name=
"name"
placeholder=
"请输入实验室名称
"
clearable
@
on-enter=
"_formSearch"
/>
<Form-item
class=
"search-item"
label=
"
委托单位
:"
>
<Input
v-model=
"formObj.
client"
name=
"client"
placeholder=
"请输入委托单位
"
clearable
@
on-enter=
"_formSearch"
/>
</Form-item>
<Form-item
class=
"search-item"
label=
"
资质
:"
>
<Input
v-model=
"formObj.
aptitude"
name=
"aptitude"
placeholder=
"请输入资质
"
clearable
@
on-enter=
"_formSearch"
/>
<Form-item
class=
"search-item"
label=
"
委托编号
:"
>
<Input
v-model=
"formObj.
entrustCode"
name=
"entrustCode"
placeholder=
"请输入委托编号
"
clearable
@
on-enter=
"_formSearch"
/>
</Form-item>
<Form-item
class=
"search-btn"
>
<Button
type=
"primary"
@
click=
"_formSearch"
>
搜索
</Button>
...
...
@@ -99,8 +99,8 @@ export default {
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
}
],
formObj
:
{
name
:
undefined
,
aptitu
de
:
undefined
client
:
undefined
,
entrustCo
de
:
undefined
},
selectIds
:
[],
selectData
:
[],
...
...
@@ -111,8 +111,9 @@ export default {
{
title
:
'证书编号'
,
key
:
'reportCode'
,
width
:
120
},
{
title
:
'型号规格'
,
key
:
'spec'
,
width
:
100
},
{
title
:
'出厂编号'
,
key
:
'factoryNumber'
},
{
title
:
'检测类型'
,
key
:
'type'
},
{
title
:
'检测类型'
,
key
:
'type'
,
width
:
100
},
{
title
:
'委托单位'
,
key
:
'client'
,
width
:
200
},
{
title
:
'委托编号'
,
key
:
'entrustCode'
,
width
:
130
},
{
title
:
'联系人'
,
key
:
'person'
,
width
:
120
},
{
title
:
'联系电话'
,
key
:
'tel'
,
width
:
120
},
{
title
:
'详细地址'
,
key
:
'address'
,
width
:
250
},
...
...
pages/meter-certificate/issue/MeterCertificateIssueHis.vue
View file @
63d06d1e
...
...
@@ -6,29 +6,29 @@
<Row>
<!--查询-->
<Col
span=
"24"
style=
"margin-top: 10px"
>
<Form
id=
"formId"
v-show=
"searchOpen
"
:label-width=
"90"
inline
onsubmit=
"return false"
>
<Form
v-show=
"searchOpen"
id=
"formId
"
:label-width=
"90"
inline
onsubmit=
"return false"
>
<label
class=
"label-sign"
></label>
<Form-item
class=
"search-item"
label=
"
实验室名称
:"
>
<Input
v-model=
"formObj.
name"
@
on-enter=
"_formSearch"
name=
"name"
placeholder=
"请输入实验室名称"
clearable
/>
<Form-item
class=
"search-item"
label=
"
委托单位
:"
>
<Input
v-model=
"formObj.
client"
name=
"client"
placeholder=
"请输入委托单位"
clearable
@
on-enter=
"_formSearch"
/>
</Form-item>
<Form-item
class=
"search-item"
label=
"
资质
:"
>
<Input
v-model=
"formObj.
aptitude"
@
on-enter=
"_formSearch"
name=
"aptitude"
placeholder=
"请输入资质"
clearable
/>
<Form-item
class=
"search-item"
label=
"
委托编号
:"
>
<Input
v-model=
"formObj.
entrustCode"
name=
"entrustCode"
placeholder=
"请输入委托编号"
clearable
@
on-enter=
"_formSearch"
/>
</Form-item>
<Form-item
class=
"search-btn"
>
<Button
@
click=
"_formSearch"
type=
"primary
"
>
搜索
</Button>
<Button
type=
"primary"
@
click=
"_formSearch
"
>
搜索
</Button>
</Form-item>
</Form>
</Col>
<!--操作-->
<Col
span=
"24"
>
<btn-list
:msg=
"btn"
:open=
"searchOpen"
:show-search-btn=
"true"
@
on-result-change=
"_btnClick
"
class=
"contHide
"
></btn-list>
<btn-list
:msg=
"btn"
:open=
"searchOpen"
:show-search-btn=
"true"
class=
"contHide
"
@
on-result-change=
"_btnClick
"
></btn-list>
</Col>
<!--表格-->
<Col
span=
"24"
>
<PTVXETable
ref=
"pageTable"
:table-height=
"tableHeight"
:form-id=
"formId"
:loading=
"true"
:get-page=
"getPage"
:icon-msg=
"iconMsg"
@
on-result-change=
"_tableResultChange"
>
:get-page=
"getPage"
:icon-msg=
"iconMsg"
select-data
@
on-result-change=
"_tableResultChange"
>
<vxe-table-column
v-for=
"item in pageColumns"
:key=
"item.key"
...
...
@@ -37,7 +37,16 @@
:min-width=
"item.width?item.width:200"
:fixed=
"item.fixed?item.fixed:undefined"
sortable
>
<template
slot-scope=
"scope"
>
<span
v-if=
"item.key==='edate'"
>
{{
scope
.
row
[
item
.
key
]?
$dateformat
(
scope
.
row
[
item
.
key
],
'yyyy-mm-dd'
):
''
}}
<span
v-if=
"item.key==='type'"
>
<span
v-if=
"scope.row[item.key]===0"
>
检定
</span>
<span
v-else-if=
"scope.row[item.key]===1"
>
校准
</span>
<span
v-else-if=
"scope.row[item.key]===2"
>
外观检查
</span>
</span>
<span
v-else
>
{{
scope
.
row
[
item
.
key
]
}}
</span>
</
template
>
...
...
@@ -47,68 +56,68 @@
</Row>
</div>
</div>
<
Operation
ref=
"Operation"
></Operation
>
<
operationModal
ref=
"operationModal"
></operationModal
>
<FileManage
ref=
"FileManage"
></FileManage>
<Reason
ref=
"reasonModal"
@
on-result-change=
"_reasonResult"
></Reason>
<!--编辑证书-->
<CertificateMakeLook
ref=
"itemOriginalRecordLookModal"
@
on-result-change=
"_resultRecord"
></CertificateMakeLook>
</div>
</template>
<
script
>
import
{
meterEntrust
}
from
'../../../api'
import
Operation
from
'../../../components/operation/Operation'
import
{
meterSample
}
from
'../../../api'
import
Reason
from
'../../../components/base/Reason'
import
operationModal
from
'../../../components/operation/Operation'
import
CertificateMakeLook
from
'../../meter-certificate/CertificateMakeLook'
export
default
{
components
:
{
Operation
},
components
:
{
operationModal
,
Reason
,
CertificateMakeLook
},
data
()
{
return
{
currentComponent
:
''
,
formId
:
'meter
Subcontractor
FormId'
,
formId
:
'meter
CertificateCheck
FormId'
,
searchOpen
:
false
,
btn
:
[
{
type
:
'success'
,
id
:
'meter-go-out-entrust-add-btn'
,
name
:
'添加'
},
{
type
:
'success'
,
id
:
'meter-go-out-entrust-submit-btn'
,
name
:
'提交'
}
],
iconMsg
:
[
// {
// type: '
md-create
',
// type: '
success
',
// id: '',
// name: '
编辑
'
// name: '
提交
'
// },
// {
// type: '
ios-beake
r',
// type: '
erro
r',
// id: '',
// name: '
管理样品
'
// }
,
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
}
,
{
type
:
'md-remove-circle'
,
id
:
''
,
name
:
'删除'
},
// name: '
退回
'
// }
]
,
iconMsg
:
[
{
type
:
'ios-
cloc
k'
,
type
:
'ios-
boo
k'
,
id
:
''
,
name
:
'操作日志'
}
name
:
'查看证书'
},
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
}
],
formObj
:
{
name
:
undefined
,
aptitu
de
:
undefined
client
:
undefined
,
entrustCo
de
:
undefined
},
selectIds
:
[],
selectData
:
[],
getPage
:
{},
pageColumns
:
[
{
title
:
'样品名称'
,
key
:
'name'
,
width
:
120
},
{
title
:
'样品编号'
,
key
:
'code'
,
width
:
120
},
{
title
:
'证书编号'
,
key
:
'reportCode'
,
width
:
120
},
{
title
:
'型号规格'
,
key
:
'spec'
,
width
:
100
},
{
title
:
'出厂编号'
,
key
:
'factoryNumber'
},
{
title
:
'检测类型'
,
key
:
'type'
,
width
:
100
},
{
title
:
'委托单位'
,
key
:
'client'
,
width
:
200
},
{
title
:
'委托编号'
,
key
:
'entrustCode'
,
width
:
130
},
{
title
:
'联系人'
,
key
:
'person'
,
width
:
120
},
{
title
:
'联系电话'
,
key
:
'tel'
,
width
:
120
},
{
title
:
'传真'
,
key
:
'fax'
,
width
:
120
},
{
title
:
'详细地址'
,
key
:
'address'
,
width
:
250
},
{
title
:
'邮编'
,
key
:
'postcode'
},
{
title
:
'E-mail'
,
key
:
'email'
,
width
:
120
},
{
title
:
'委托日期'
,
key
:
'edate'
,
width
:
120
},
{
title
:
'费用合计'
,
key
:
'fee'
,
width
:
120
},
{
title
:
'合同号'
,
key
:
'contractCode'
,
width
:
120
},
{
title
:
'数量'
,
key
:
'quantity'
},
{
title
:
'备注'
,
key
:
'remark'
}
]
}
...
...
@@ -126,55 +135,106 @@ export default {
this
.
_page
()
},
methods
:
{
_resultRecord
()
{
this
.
_page
()
this
.
$emit
(
'on-result-change'
)
},
_btnClick
(
msg
,
componentName
)
{
this
.
currentComponent
=
componentName
this
.
$nextTick
(
function
()
{
switch
(
msg
)
{
case
'生成'
:
this
.
_create
()
break
case
'添加'
:
this
.
_editModal
(
false
)
break
case
'提交'
:
this
.
_submitToReview
()
break
case
'退回'
:
this
.
_goBack
()
break
case
'search'
:
this
.
searchOpen
=
!
this
.
searchOpen
break
}
})
},
_goBack
()
{
// 退回
if
(
this
.
selectIds
.
length
===
0
)
{
this
.
$Message
.
warning
(
'请至少选择一条委托!'
)
}
else
{
this
.
$refs
.
reasonModal
.
_open
(
'退回原因'
)
}
},
_reasonResult
(
data
)
{
if
(
undefined
!==
data
&&
data
!==
''
)
{
this
.
_reportIssueBack
(
data
)
}
console
.
log
(
data
)
},
_reportIssueBack
:
async
function
(
data
)
{
const
result
=
await
meterSample
.
reportIssueBack
({
ids
:
this
.
selectIds
,
reason
:
data
})
if
(
result
)
{
this
.
$Message
.
success
(
'退回成功!'
)
await
this
.
_page
()
}
},
_submitToReview
()
{
this
.
_submitByContractIds
(
'委托评审'
)
this
.
_submitByContractIds
()
},
_submitByContractIds
(
cont
)
{
_submitByContractIds
()
{
const
ids
=
this
.
selectIds
if
(
ids
.
length
===
0
)
{
this
.
$Message
.
warning
(
'请至少选择一条数据!'
)
}
else
{
this
.
$Modal
.
confirm
({
title
:
'提示'
,
content
:
'确定要把这 '
+
ids
.
length
+
' 条记录
提交到'
+
cont
+
'
?'
,
content
:
'确定要把这 '
+
ids
.
length
+
' 条记录
批准通过吗
?'
,
onOk
:
()
=>
{
const
result
=
meterEntrust
.
submit
(
ids
)
if
(
result
)
{
console
.
log
(
result
)
}
this
.
_submitIssue
(
ids
)
}
})
}
},
_submitIssue
:
async
function
(
data
)
{
const
result
=
await
meterSample
.
submitReportToEnd
(
data
)
if
(
result
)
{
this
.
$Message
.
success
(
'提交成功!'
)
await
this
.
_page
()
}
},
_create
()
{
const
selectData
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
selectData
))
console
.
log
(
selectData
)
if
(
this
.
selectIds
.
length
===
0
)
{
this
.
$Message
.
warning
(
'请至少选择一条数据!'
)
}
else
{
this
.
$refs
.
CreateReport
.
_open
(
this
.
selectData
)
}
},
_iconClick
(
res
,
data
,
componentName
)
{
this
.
currentComponent
=
componentName
this
.
$nextTick
(
function
()
{
switch
(
res
)
{
case
'编辑'
:
this
.
_editModal
(
true
,
data
.
id
)
break
case
'资质项目'
:
this
.
_itemModal
(
data
.
id
)
case
'预览'
:
// this._editModal(true, data.id)
this
.
_personModal
(
data
)
break
case
'附件'
:
this
.
_upload
(
data
.
id
)
break
case
'查看证书'
:
this
.
_itemOriginalRecordLook
(
data
,
'only'
)
break
case
'删除'
:
this
.
_deleteByIds
([
data
.
id
])
break
...
...
@@ -184,20 +244,54 @@ export default {
}
})
},
_itemOriginalRecordLook
(
data
,
name
)
{
if
(
data
.
recordId
===
null
||
undefined
===
data
.
recordId
||
data
.
recordId
===
''
)
{
this
.
$Message
.
warning
(
'证书暂未编制!'
)
}
else
{
this
.
$refs
.
itemOriginalRecordLookModal
.
_open
(
data
.
recordId
,
name
,
data
.
id
)
}
},
_personModal
(
data
)
{
this
.
_previewEdit
(
data
.
id
)
},
// 预览编辑
async
_previewEdit
(
id
)
{
const
result
=
await
meterSample
.
reportPreview
(
id
)
if
(
result
)
{
this
.
$openWindowModeless
({
objectKey
:
result
.
objectKey
,
id
:
id
,
isReport
:
0
})
}
},
_record
(
id
)
{
// this.$refs.refModal._open(id)
this
.
$refs
.
Operation
.
_open
(
id
)
this
.
$refs
.
operationModal
.
_open
(
id
)
},
_tableResultChange
(
msg
,
data
)
{
switch
(
msg
)
{
case
'page'
:
this
.
getPage
=
this
.
$store
.
state
.
FoodSubcontracter
.
page
break
case
'iconClick'
:
this
.
_iconClick
(
data
.
name
,
data
.
rowData
,
data
.
componentName
)
console
.
log
(
'操作按钮点击后的值'
,
data
)
break
case
'selectIds'
:
this
.
selectIds
=
data
// case 'selectIds':
// this.selectIds = data
// console.log('操作按钮点击后的值', data)
// break
case
'selectData'
:
this
.
selectData
=
data
this
.
selectIds
=
[]
for
(
let
i
=
0
;
i
<
data
.
length
;
i
++
)
{
this
.
selectIds
.
push
(
data
[
i
].
id
)
}
break
case
'changeSize'
:
this
.
_page
()
...
...
@@ -206,8 +300,7 @@ export default {
},
_page
:
async
function
()
{
Object
.
assign
(
this
.
formObj
,
this
.
$refs
.
pageTable
.
_searchParams
())
console
.
log
(
'this.formObj'
,
this
.
formObj
)
const
result
=
await
meterEntrust
.
pageGoOutEntrust
(
this
.
formObj
)
const
result
=
await
meterSample
.
pageCertificateIssueHis
(
this
.
formObj
)
if
(
result
)
{
this
.
$refs
.
pageTable
.
_hideLoading
()
this
.
getPage
=
result
...
...
@@ -243,17 +336,16 @@ export default {
_upload
(
id
)
{
// 上传文件
// this.$refs.refModal._open(id, 'subcontractorId')
this
.
$refs
.
FileManage
.
_open
(
id
,
'subcontractorId'
)
},
_getById
:
async
function
(
id
)
{
const
result
=
await
meter
Entrust
.
getVO
ById
(
id
)
const
result
=
await
meter
Sample
.
get
ById
(
id
)
if
(
result
)
{
//
this.$refs.editSubcontractorModal._openEdit(result)
this
.
$refs
.
editSubcontractorModal
.
_openEdit
(
result
)
}
},
_delete
:
async
function
(
ids
)
{
const
result
=
await
meter
Entrust
.
deleteById
(
ids
)
const
result
=
await
meter
Sample
.
deleteById
(
ids
)
if
(
result
)
{
this
.
_formSearch
()
this
.
$Message
.
success
(
'删除成功!'
)
...
...
pages/meter-certificate/make/MeterCertificateMake.vue
View file @
63d06d1e
...
...
@@ -8,11 +8,11 @@
<Col
span=
"24"
style=
"margin-top: 10px"
>
<Form
id=
"formId"
v-show=
"searchOpen"
:label-width=
"90"
inline
onsubmit=
"return false"
>
<label
class=
"label-sign"
></label>
<Form-item
class=
"search-item"
label=
"
实验室名称
:"
>
<Input
v-model=
"formObj.
name"
@
on-enter=
"_formSearch"
name=
"name"
placeholder=
"请输入实验室名称"
clearable
/>
<Form-item
class=
"search-item"
label=
"
委托单位
:"
>
<Input
v-model=
"formObj.
client"
name=
"client"
placeholder=
"请输入委托单位"
clearable
@
on-enter=
"_formSearch"
/>
</Form-item>
<Form-item
class=
"search-item"
label=
"
资质
:"
>
<Input
v-model=
"formObj.
aptitude"
@
on-enter=
"_formSearch"
name=
"aptitude"
placeholder=
"请输入资质"
clearable
/>
<Form-item
class=
"search-item"
label=
"
委托编号
:"
>
<Input
v-model=
"formObj.
entrustCode"
name=
"entrustCode"
placeholder=
"请输入委托编号"
clearable
@
on-enter=
"_formSearch"
/>
</Form-item>
<Form-item
class=
"search-btn"
>
<Button
@
click=
"_formSearch"
type=
"primary"
>
搜索
</Button>
...
...
@@ -127,8 +127,8 @@ export default {
// }
],
formObj
:
{
name
:
undefined
,
aptitu
de
:
undefined
client
:
undefined
,
entrustCo
de
:
undefined
},
selectIds
:
[],
selectData
:
[],
...
...
pages/meter-certificate/make/MeterCertificateMakeHis.vue
View file @
63d06d1e
...
...
@@ -8,11 +8,11 @@
<Col
span=
"24"
style=
"margin-top: 10px"
>
<Form
v-show=
"searchOpen"
id=
"formId"
:label-width=
"90"
inline
onsubmit=
"return false"
>
<label
class=
"label-sign"
></label>
<Form-item
class=
"search-item"
label=
"
实验室名称
:"
>
<Input
v-model=
"formObj.
name"
name=
"name"
placeholder=
"请输入实验室名称
"
clearable
@
on-enter=
"_formSearch"
/>
<Form-item
class=
"search-item"
label=
"
委托单位
:"
>
<Input
v-model=
"formObj.
client"
name=
"client"
placeholder=
"请输入委托单位
"
clearable
@
on-enter=
"_formSearch"
/>
</Form-item>
<Form-item
class=
"search-item"
label=
"
资质
:"
>
<Input
v-model=
"formObj.
aptitude"
name=
"aptitude"
placeholder=
"请输入资质
"
clearable
@
on-enter=
"_formSearch"
/>
<Form-item
class=
"search-item"
label=
"
委托编号
:"
>
<Input
v-model=
"formObj.
entrustCode"
name=
"entrustCode"
placeholder=
"请输入委托编号
"
clearable
@
on-enter=
"_formSearch"
/>
</Form-item>
<Form-item
class=
"search-btn"
>
<Button
type=
"primary"
@
click=
"_formSearch"
>
搜索
</Button>
...
...
@@ -111,8 +111,8 @@ export default {
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
}
],
formObj
:
{
name
:
undefined
,
aptitu
de
:
undefined
client
:
undefined
,
entrustCo
de
:
undefined
},
selectIds
:
[],
selectData
:
[],
...
...
pages/meter-certificate/print/MeterCertificatePrintHis.vue
View file @
63d06d1e
...
...
@@ -58,14 +58,18 @@
</div>
<operationModal
ref=
"operationModal"
></operationModal>
<FileManage
ref=
"FileManage"
></FileManage>
<!--编辑证书-->
<CertificateMakeLook
ref=
"itemOriginalRecordLookModal"
@
on-result-change=
"_resultRecord"
></CertificateMakeLook>
</div>
</template>
<
script
>
import
{
meterSample
}
from
'../../../api'
import
operationModal
from
'../../../components/operation/Operation'
import
CertificateMakeLook
from
'../../meter-certificate/CertificateMakeLook'
export
default
{
components
:
{
operationModal
},
components
:
{
operationModal
,
CertificateMakeLook
},
data
()
{
return
{
currentComponent
:
''
,
...
...
@@ -79,16 +83,11 @@ export default {
// }
],
iconMsg
:
[
// {
// type: 'ios-book',
// id: '',
// name: '预览'
// },
// {
// type: 'ios-list-box',
// id: '',
// name: '仪器领用'
// },
{
type
:
'ios-book'
,
id
:
''
,
name
:
'查看证书'
},
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
}
],
formObj
:
{
...
...
@@ -103,8 +102,9 @@ export default {
{
title
:
'样品编号'
,
key
:
'code'
,
width
:
120
},
{
title
:
'型号规格'
,
key
:
'spec'
,
width
:
100
},
{
title
:
'出厂编号'
,
key
:
'factoryNumber'
},
{
title
:
'检测类型'
,
key
:
'type'
},
{
title
:
'检测类型'
,
key
:
'type'
,
width
:
100
},
{
title
:
'委托单位'
,
key
:
'client'
,
width
:
200
},
{
title
:
'委托编号'
,
key
:
'entrustCode'
,
width
:
130
},
{
title
:
'联系人'
,
key
:
'person'
,
width
:
120
},
{
title
:
'联系电话'
,
key
:
'tel'
,
width
:
120
},
{
title
:
'详细地址'
,
key
:
'address'
,
width
:
250
},
...
...
@@ -158,16 +158,16 @@ export default {
}
else
{
this
.
$Modal
.
confirm
({
title
:
'提示'
,
content
:
'确定
要把这 '
+
ids
.
length
+
' 条记录批准通过
吗?'
,
content
:
'确定
提交
吗?'
,
onOk
:
()
=>
{
this
.
_submit
Issue
(
ids
)
this
.
_submit
End
(
ids
)
}
})
}
},
_submit
Issue
:
async
function
(
data
)
{
const
result
=
await
meterSample
.
submitReportToEnd
(
data
)
_submit
End
:
async
function
(
data
)
{
const
result
=
await
meterSample
.
endReport
(
data
)
if
(
result
)
{
this
.
$Message
.
success
(
'提交成功!'
)
await
this
.
_page
()
...
...
@@ -194,6 +194,9 @@ export default {
case
'附件'
:
this
.
_upload
(
data
.
id
)
break
case
'查看证书'
:
this
.
_itemOriginalRecordLook
(
data
,
'only'
)
break
case
'删除'
:
this
.
_deleteByIds
([
data
.
id
])
break
...
...
@@ -244,7 +247,7 @@ export default {
},
_page
:
async
function
()
{
Object
.
assign
(
this
.
formObj
,
this
.
$refs
.
pageTable
.
_searchParams
())
const
result
=
await
meterSample
.
pageCertificate
End
(
this
.
formObj
)
const
result
=
await
meterSample
.
pageCertificate
Print
(
this
.
formObj
)
if
(
result
)
{
this
.
$refs
.
pageTable
.
_hideLoading
()
this
.
getPage
=
result
...
...
@@ -282,6 +285,21 @@ export default {
// 上传文件
this
.
$refs
.
FileManage
.
_open
(
id
,
'subcontractorId'
)
},
_itemOriginalRecordLook
(
data
,
name
)
{
if
(
data
.
recordId
===
null
||
undefined
===
data
.
recordId
||
data
.
recordId
===
''
)
{
this
.
$Message
.
warning
(
'证书暂未编制!'
)
}
else
{
this
.
$refs
.
itemOriginalRecordLookModal
.
_open
(
data
.
recordId
,
name
,
data
.
id
)
}
},
_getById
:
async
function
(
id
)
{
const
result
=
await
meterSample
.
getById
(
id
)
if
(
result
)
{
...
...
pages/meter-certificate/print/MeterCertificatePrintIndex.vue
View file @
63d06d1e
<
template
>
<div>
<!--内容-->
<div
class=
"layout-content-padding"
>
<div
class=
"layout-content-main"
>
<el-tabs
v-model=
"activeName"
>
<el-tab-pane
label=
"待完成"
name=
"wait"
>
<MeterGoOutEntrust
ref=
"waitTabs"
></MeterGoOutEntrust>
</el-tab-pane>
<el-tab-pane
label=
"历史记录"
name=
"his"
>
<MeterGoOutEntrustHis
ref=
"hisTabs"
></MeterGoOutEntrustHis>
</el-tab-pane>
</el-tabs>
<Row>
<!--查询-->
<Col
span=
"24"
style=
"margin-top: 10px"
>
<Form
v-show=
"searchOpen"
id=
"formId"
:label-width=
"90"
inline
onsubmit=
"return false"
>
<label
class=
"label-sign"
></label>
<Form-item
class=
"search-item"
label=
"委托单位:"
>
<Input
v-model=
"formObj.client"
name=
"client"
placeholder=
"请输入委托单位"
clearable
@
on-enter=
"_formSearch"
/>
</Form-item>
<Form-item
class=
"search-item"
label=
"委托编号:"
>
<Input
v-model=
"formObj.entrustCode"
name=
"entrustCode"
placeholder=
"请输入委托编号"
clearable
@
on-enter=
"_formSearch"
/>
</Form-item>
<Form-item
class=
"search-btn"
>
<Button
type=
"primary"
@
click=
"_formSearch"
>
搜索
</Button>
</Form-item>
</Form>
</Col>
<!--操作-->
<Col
span=
"24"
>
<btn-list
:msg=
"btn"
:open=
"searchOpen"
:show-search-btn=
"true"
class=
"contHide"
@
on-result-change=
"_btnClick"
></btn-list>
</Col>
<!--表格-->
<Col
span=
"24"
>
<PTVXETable
ref=
"pageTable"
:table-height=
"tableHeight"
:form-id=
"formId"
:loading=
"true"
:get-page=
"getPage"
:icon-msg=
"iconMsg"
select-data
@
on-result-change=
"_tableResultChange"
>
<vxe-table-column
v-for=
"item in pageColumns"
:key=
"item.key"
:field=
"item.key"
:title=
"item.title"
:min-width=
"item.width?item.width:200"
:fixed=
"item.fixed?item.fixed:undefined"
sortable
>
<template
slot-scope=
"scope"
>
<span
v-if=
"item.key==='type'"
>
<span
v-if=
"scope.row[item.key]===0"
>
检定
</span>
<span
v-else-if=
"scope.row[item.key]===1"
>
校准
</span>
<span
v-else-if=
"scope.row[item.key]===2"
>
外观检查
</span>
</span>
<span
v-else
>
{{
scope
.
row
[
item
.
key
]
}}
</span>
</
template
>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</div>
</div>
<operationModal
ref=
"operationModal"
></operationModal>
<FileManage
ref=
"FileManage"
></FileManage>
<!--编辑证书-->
<CertificateMakeLook
ref=
"itemOriginalRecordLookModal"
@
on-result-change=
"_resultRecord"
></CertificateMakeLook>
</div>
</
template
>
</template>
<
script
>
import
MeterGoOutEntrust
from
'./MeterCertificatePrint'
import
MeterGoOutEntrustHis
from
'./MeterCertificatePrintHis'
import
{
meterSample
}
from
'../../../api'
import
operationModal
from
'../../../components/operation/Operation'
import
CertificateMakeLook
from
'../../meter-certificate/CertificateMakeLook'
export
default
{
name
:
'MeterGoOutEntrustIndex'
,
components
:
{
MeterGoOutEntrust
,
MeterGoOutEntrustHis
},
components
:
{
operationModal
,
CertificateMakeLook
},
data
()
{
return
{
activeName
:
'wait'
currentComponent
:
''
,
formId
:
'meterCertificatePrintIndexFormId'
,
searchOpen
:
true
,
btn
:
[
// {
// type: 'success',
// id: '',
// name: '提交'
// }
],
iconMsg
:
[
{
type
:
'ios-book'
,
id
:
''
,
name
:
'查看证书'
},
{
type
:
'md-cloud'
,
id
:
''
,
name
:
'附件'
}
],
formObj
:
{
client
:
undefined
,
entrustCode
:
undefined
},
selectIds
:
[],
selectData
:
[],
getPage
:
{},
pageColumns
:
[
{
title
:
'样品名称'
,
key
:
'name'
,
width
:
120
},
{
title
:
'样品编号'
,
key
:
'code'
,
width
:
120
},
{
title
:
'型号规格'
,
key
:
'spec'
,
width
:
100
},
{
title
:
'出厂编号'
,
key
:
'factoryNumber'
},
{
title
:
'检测类型'
,
key
:
'type'
,
width
:
100
},
{
title
:
'委托单位'
,
key
:
'client'
,
width
:
200
},
{
title
:
'委托编号'
,
key
:
'entrustCode'
,
width
:
130
},
{
title
:
'联系人'
,
key
:
'person'
,
width
:
120
},
{
title
:
'联系电话'
,
key
:
'tel'
,
width
:
120
},
{
title
:
'详细地址'
,
key
:
'address'
,
width
:
250
},
{
title
:
'数量'
,
key
:
'quantity'
},
{
title
:
'备注'
,
key
:
'remark'
}
]
}
},
computed
:
{
tableHeight
:
function
()
{
if
(
this
.
searchOpen
)
{
return
this
.
$tableHeight
(
'search'
)
}
else
{
return
this
.
$tableHeight
(
'noSearch'
)
}
}
},
mounted
()
{
this
.
activeName
=
'wait'
this
.
_page
()
},
methods
:
{
_changeTabs
(
tab
,
event
)
{
if
(
tab
.
name
===
'wait'
)
{
this
.
_page
()
_btnClick
(
msg
,
componentName
)
{
this
.
currentComponent
=
componentName
this
.
$nextTick
(
function
()
{
switch
(
msg
)
{
case
'生成'
:
this
.
_create
()
break
case
'添加'
:
this
.
_editModal
(
false
)
break
case
'提交'
:
this
.
_submitToReview
()
break
case
'退回'
:
this
.
_goBack
()
break
case
'search'
:
this
.
searchOpen
=
!
this
.
searchOpen
break
}
})
},
_submitToReview
()
{
this
.
_submitByContractIds
()
},
_submitByContractIds
()
{
const
ids
=
this
.
selectIds
if
(
ids
.
length
===
0
)
{
this
.
$Message
.
warning
(
'请至少选择一条数据!'
)
}
else
{
this
.
$Modal
.
confirm
({
title
:
'提示'
,
content
:
'确定提交吗?'
,
onOk
:
()
=>
{
this
.
_submitEnd
(
ids
)
}
})
}
},
_submitEnd
:
async
function
(
data
)
{
const
result
=
await
meterSample
.
endReport
(
data
)
if
(
result
)
{
this
.
$Message
.
success
(
'提交成功!'
)
await
this
.
_page
()
}
},
_create
()
{
const
selectData
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
selectData
))
console
.
log
(
selectData
)
if
(
this
.
selectIds
.
length
===
0
)
{
this
.
$Message
.
warning
(
'请至少选择一条数据!'
)
}
else
{
this
.
$refs
.
CreateReport
.
_open
(
this
.
selectData
)
}
},
_iconClick
(
res
,
data
,
componentName
)
{
this
.
currentComponent
=
componentName
this
.
$nextTick
(
function
()
{
switch
(
res
)
{
case
'预览'
:
// this._editModal(true, data.id)
this
.
_personModal
(
data
)
break
case
'附件'
:
this
.
_upload
(
data
.
id
)
break
case
'查看证书'
:
this
.
_itemOriginalRecordLook
(
data
,
'only'
)
break
case
'删除'
:
this
.
_deleteByIds
([
data
.
id
])
break
case
'操作日志'
:
this
.
_record
(
data
.
id
)
break
}
})
},
_personModal
(
data
)
{
this
.
_previewEdit
(
data
.
id
)
},
// 预览编辑
async
_previewEdit
(
id
)
{
const
result
=
await
meterSample
.
reportPreview
(
id
)
if
(
result
)
{
this
.
$openWindowModeless
({
objectKey
:
result
.
objectKey
,
id
:
id
,
isReport
:
0
})
}
},
_record
(
id
)
{
this
.
$refs
.
operationModal
.
_open
(
id
)
},
_tableResultChange
(
msg
,
data
)
{
switch
(
msg
)
{
case
'iconClick'
:
this
.
_iconClick
(
data
.
name
,
data
.
rowData
,
data
.
componentName
)
console
.
log
(
'操作按钮点击后的值'
,
data
)
break
// case 'selectIds':
// this.selectIds = data
// console.log('操作按钮点击后的值', data)
// break
case
'selectData'
:
this
.
selectData
=
data
this
.
selectIds
=
[]
for
(
let
i
=
0
;
i
<
data
.
length
;
i
++
)
{
this
.
selectIds
.
push
(
data
[
i
].
id
)
}
break
case
'changeSize'
:
this
.
_page
()
break
}
},
_page
:
async
function
()
{
Object
.
assign
(
this
.
formObj
,
this
.
$refs
.
pageTable
.
_searchParams
())
const
result
=
await
meterSample
.
pageCertificatePrint
(
this
.
formObj
)
if
(
result
)
{
this
.
$refs
.
pageTable
.
_hideLoading
()
this
.
getPage
=
result
}
},
_formSearch
()
{
this
.
$refs
.
pageTable
.
_pageChange
(
1
)
},
// 删除
_deleteByIds
(
ids
,
content
)
{
this
.
$Modal
.
confirm
({
title
:
'提示'
,
content
:
content
||
'确定删除该记录?'
,
onOk
:
()
=>
{
this
.
_delete
(
ids
)
}
})
},
// 编辑&添加
_editModal
(
edit
,
id
)
{
if
(
edit
)
{
// 编辑
this
.
_getById
(
id
)
}
else
{
this
.
$refs
.
hisTabs
.
_page
()
// 添加
this
.
$refs
.
editSubcontractorModal
.
_open
()
}
},
_page
()
{
this
.
$refs
.
waitTabs
.
_page
()
// 追加项目
_itemModal
(
data
)
{
this
.
$refs
.
refModal
.
_open
(
data
)
},
_upload
(
id
)
{
// 上传文件
this
.
$refs
.
FileManage
.
_open
(
id
,
'subcontractorId'
)
},
_itemOriginalRecordLook
(
data
,
name
)
{
if
(
data
.
recordId
===
null
||
undefined
===
data
.
recordId
||
data
.
recordId
===
''
)
{
this
.
$Message
.
warning
(
'证书暂未编制!'
)
}
else
{
this
.
$refs
.
itemOriginalRecordLookModal
.
_open
(
data
.
recordId
,
name
,
data
.
id
)
}
},
_getById
:
async
function
(
id
)
{
const
result
=
await
meterSample
.
getById
(
id
)
if
(
result
)
{
this
.
$refs
.
editSubcontractorModal
.
_openEdit
(
result
)
}
},
_delete
:
async
function
(
ids
)
{
const
result
=
await
meterSample
.
deleteById
(
ids
)
if
(
result
)
{
this
.
_formSearch
()
this
.
$Message
.
success
(
'删除成功!'
)
}
}
}
}
</
script
>
<
style
scoped
>
</
style
>
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