Skip to content

P
patzn-cloud-web-back-soil
Commit 67c9a9f7 by wangweidong
Options

计量证书修改

parent dbf31a4c
Showing with 92 additions and 124 deletions
api/meter/meter-entrust.js
...@@ -8,6 +8,10 @@ import { https } from '../https' ...@@ -8,6 +8,10 @@ import { https } from '../https'
export default { export default {
// page // page
page: data => http.post('meter/v1/entrust/page', data).then(res => res), page: data => http.post('meter/v1/entrust/page', data).then(res => res),
pagePrintEntrust: data =>
http.post('meter/v1/entrust/page_print_entrust', data).then(res => res),
pagePrintedEntrust: data =>
http.post('meter/v1/entrust/page_printed_entrust', data).then(res => res),
// list // list
pageList: data => http.get('res/v1/customer/list').then(res => res), pageList: data => http.get('res/v1/customer/list').then(res => res),
......
api/meter/meter-sub-contract.js
...@@ -7,7 +7,8 @@ import { https } from '../https' ...@@ -7,7 +7,8 @@ import { https } from '../https'
export default { export default {
// page // page
page: data => http.post('meter/v1/sub_contract/page', data).then(res => res), page: data =>
http.post('meter/v1/sub_contract/page_vo', data).then(res => res),
pageSubmit: data => pageSubmit: data =>
http.post('meter/v1/sub_contract/page_have_submit', data).then(res => res), http.post('meter/v1/sub_contract/page_have_submit', data).then(res => res),
getById: data => http.get('meter/v1/sub_contract/' + data).then(res => res), getById: data => http.get('meter/v1/sub_contract/' + data).then(res => res),
......
pages/meter-certificate/print/MeterCertificatePrintIndex.vue
...@@ -62,31 +62,34 @@ ...@@ -62,31 +62,34 @@
<!--编辑证书--> <!--编辑证书-->
<CertificateMakeLook ref="itemOriginalRecordLookModal" @on-result-change="_resultRecord"></CertificateMakeLook> <CertificateMakeLook ref="itemOriginalRecordLookModal" @on-result-change="_resultRecord"></CertificateMakeLook>
<MeterSampleManage ref="meterSampleManageModal" @on-result-change="_page"></MeterSampleManage>
</div> </div>
</template> </template>
<script> <script>
import { meterSample } from '../../../api' import { meterEntrust, meterSample } from '../../../api'
import operationModal from '../../../components/operation/Operation' import operationModal from '../../../components/operation/Operation'
import CertificateMakeLook from '../../meter-certificate/CertificateMakeLook' import CertificateMakeLook from '../../meter-certificate/CertificateMakeLook'
import MeterSampleManage from './MeterCertificateSamplePrint'
export default { export default {
components: { operationModal, CertificateMakeLook }, components: { operationModal, CertificateMakeLook, MeterSampleManage },
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
formId: 'meterCertificatePrintIndexFormId', formId: 'meterCertificatePrintIndexFormId',
searchOpen: true, searchOpen: true,
btn: [ btn: [
{ // {
type: 'success', // type: 'success',
id: '', // id: '',
name: '打印' // name: '打印'
}, // },
{ // {
type: 'success', // type: 'success',
id: '', // id: '',
name: '打印完成' // name: '打印完成'
} // }
], ],
iconMsg: [ iconMsg: [
// { // {
...@@ -97,7 +100,7 @@ export default { ...@@ -97,7 +100,7 @@ export default {
{ {
type: 'ios-book', type: 'ios-book',
id: '', id: '',
name: '在线查看证书' name: '证书查看'
}, },
{ type: 'md-cloud', id: '', name: '附件' } { type: 'md-cloud', id: '', name: '附件' }
], ],
...@@ -110,38 +113,16 @@ export default { ...@@ -110,38 +113,16 @@ export default {
getPage: {}, getPage: {},
pageColumns: [ pageColumns: [
{ title: '委托单位', key: 'client', width: 200 }, { title: '委托单位', key: 'client', width: 200 },
{ title: '委托编号', key: 'entrustCode', width: 130 },
{ title: '联系人', key: 'person', width: 120 }, { title: '联系人', key: 'person', width: 120 },
{ title: '样品名称', key: 'name', width: 120 }, { title: '委托编号', key: 'entrustCode', width: 120 },
{ title: '样品编号', key: 'code', width: 145 }, { title: '合同编号', key: 'contractCode', width: 120 },
{ title: '证书编号', key: 'reportCode', width: 145 },
{ title: '证书编制人', key: 'reportMaker', width: 145 },
{
title: '证书编制时间',
key: 'reportMakeTime',
width: 145,
date: true
},
{ title: '证书审核人', key: 'reportChecker', width: 145 },
{
title: '证书审核时间',
key: 'reportCheckTime',
width: 145,
date: true
},
{ title: '证书签发人', key: 'reportIssuer', width: 145 },
{
title: '证书签发时间',
key: 'reportIssueTime',
width: 145,
date: true
},
{ title: '型号规格', key: 'spec', width: 100 },
{ title: '出厂编号', key: 'factoryNumber' },
{ title: '检测类型', key: 'type', width: 100 },
{ title: '联系电话', key: 'tel', width: 120 }, { title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 }, { title: '详细地址', key: 'address', width: 250 },
{ title: '数量', key: 'quantity' }, { title: '邮编', key: 'postcode' },
{ title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 },
{ title: '费用合计', key: 'fee', width: 120 },
{ title: '备注', key: 'remark' } { title: '备注', key: 'remark' }
] ]
} }
...@@ -249,8 +230,8 @@ export default { ...@@ -249,8 +230,8 @@ export default {
case '查看证书': case '查看证书':
this._itemOriginalRecordLook(data, 'only') this._itemOriginalRecordLook(data, 'only')
break break
case '在线查看证书': case '证书查看':
this._reportMakeLook(data) this._sampleManage(data)
break break
case '删除': case '删除':
this._deleteByIds([data.id]) this._deleteByIds([data.id])
...@@ -261,13 +242,9 @@ export default { ...@@ -261,13 +242,9 @@ export default {
} }
}) })
}, },
_reportMakeLook: async function(data) { _sampleManage(data) {
const result = await meterSample.getCertificateReport(data.id) // 管理样品
if (result) { this.$refs.meterSampleManageModal._open(data.id)
this._viewReport(result)
} else {
this._itemOriginalRecordLook(data, 'only')
}
}, },
_viewReport(data) { _viewReport(data) {
if (data) { if (data) {
...@@ -320,7 +297,7 @@ export default { ...@@ -320,7 +297,7 @@ export default {
}, },
_page: async function() { _page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams()) Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await meterSample.pageCertificatePrint(this.formObj) const result = await meterEntrust.pagePrintEntrust(this.formObj)
if (result) { if (result) {
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
this.getPage = result this.getPage = result
......
pages/meter-certificate/print/MeterCertificatePrintIndexHis.vue
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<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" class="contHide"
style="height: 30px;" @on-result-change="_btnClick"></btn-list> @on-result-change="_btnClick"></btn-list>
</Col> </Col>
<!--表格--> <!--表格-->
<Col span="24"> <Col span="24">
...@@ -62,27 +62,34 @@ ...@@ -62,27 +62,34 @@
<!--编辑证书--> <!--编辑证书-->
<CertificateMakeLook ref="itemOriginalRecordLookModal" @on-result-change="_resultRecord"></CertificateMakeLook> <CertificateMakeLook ref="itemOriginalRecordLookModal" @on-result-change="_resultRecord"></CertificateMakeLook>
<MeterSampleManage ref="meterSampleManageModal" @on-result-change="_page"></MeterSampleManage>
</div> </div>
</template> </template>
<script> <script>
import { meterSample } from '../../../api' import { meterEntrust, meterSample } from '../../../api'
import operationModal from '../../../components/operation/Operation' import operationModal from '../../../components/operation/Operation'
import CertificateMakeLook from '../../meter-certificate/CertificateMakeLook' import CertificateMakeLook from '../../meter-certificate/CertificateMakeLook'
import http from '../../../api/http' import MeterSampleManage from './MeterCertificateSamplePrintHis'
export default { export default {
components: { operationModal, CertificateMakeLook }, components: { operationModal, CertificateMakeLook, MeterSampleManage },
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
formId: 'meterCertificatePrintIndexFormId', formId: 'meterCertificatePrintIndexFormId',
searchOpen: true, searchOpen: true,
btn: [ btn: [
{ // {
type: 'success', // type: 'success',
id: '', // id: '',
name: '导出证书记录' // name: '打印'
} // },
// {
// type: 'success',
// id: '',
// name: '打印完成'
// }
], ],
iconMsg: [ iconMsg: [
// { // {
...@@ -93,7 +100,7 @@ export default { ...@@ -93,7 +100,7 @@ export default {
{ {
type: 'ios-book', type: 'ios-book',
id: '', id: '',
name: '在线查看证书' name: '证书查看'
}, },
{ type: 'md-cloud', id: '', name: '附件' } { type: 'md-cloud', id: '', name: '附件' }
], ],
...@@ -106,38 +113,16 @@ export default { ...@@ -106,38 +113,16 @@ export default {
getPage: {}, getPage: {},
pageColumns: [ pageColumns: [
{ title: '委托单位', key: 'client', width: 200 }, { title: '委托单位', key: 'client', width: 200 },
{ title: '委托编号', key: 'entrustCode', width: 130 },
{ title: '联系人', key: 'person', width: 120 }, { title: '联系人', key: 'person', width: 120 },
{ title: '样品名称', key: 'name', width: 120 }, { title: '委托编号', key: 'entrustCode', width: 120 },
{ title: '样品编号', key: 'code', width: 145 }, { title: '合同编号', key: 'contractCode', width: 120 },
{ title: '证书编号', key: 'reportCode', width: 145 },
{ title: '证书编制人', key: 'reportMaker', width: 145 },
{
title: '证书编制时间',
key: 'reportMakeTime',
width: 145,
date: true
},
{ title: '证书审核人', key: 'reportChecker', width: 145 },
{
title: '证书审核时间',
key: 'reportCheckTime',
width: 145,
date: true
},
{ title: '证书签发人', key: 'reportIssuer', width: 145 },
{
title: '证书签发时间',
key: 'reportIssueTime',
width: 145,
date: true
},
{ title: '型号规格', key: 'spec', width: 100 },
{ title: '出厂编号', key: 'factoryNumber' },
{ title: '检测类型', key: 'type', width: 100 },
{ title: '联系电话', key: 'tel', width: 120 }, { title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 }, { title: '详细地址', key: 'address', width: 250 },
{ title: '数量', key: 'quantity' }, { title: '邮编', key: 'postcode' },
{ title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 },
{ title: '费用合计', key: 'fee', width: 120 },
{ title: '备注', key: 'remark' } { title: '备注', key: 'remark' }
] ]
} }
...@@ -165,8 +150,11 @@ export default { ...@@ -165,8 +150,11 @@ export default {
case '添加': case '添加':
this._editModal(false) this._editModal(false)
break break
case '导出证书记录': case '打印':
this._exportCertificateInfo() this._printExcel()
break
case '打印完成':
this._printOverExcel()
break break
case '退回': case '退回':
this._goBack() this._goBack()
...@@ -177,26 +165,6 @@ export default { ...@@ -177,26 +165,6 @@ export default {
} }
}) })
}, },
_exportCertificateInfo() {
if (this.selectIds.length === 0) {
this.$Message.warning('请选择要导出的数据!')
return false
}
const sampleIds = this.selectIds.join(',')
const data = this.formObj
data.idsStr = sampleIds
this.$Modal.confirm({
title: '提示',
content: '确定导出数据？',
onOk: () => {
http.open(
'/meter/v1/sample/export_certificate_info/?ids=' + sampleIds
)
}
})
},
_submitToReview() { _submitToReview() {
this._submitByContractIds() this._submitByContractIds()
}, },
...@@ -208,6 +176,28 @@ export default { ...@@ -208,6 +176,28 @@ export default {
this.$pageofficePrint({ ids: ids, type: 'xlsx' }) this.$pageofficePrint({ ids: ids, type: 'xlsx' })
} }
}, },
_printOverExcel() {
const ids = this.selectIds
if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$Modal.confirm({
title: '提示',
content: '确定这 ' + ids.length + ' 条记录已经打印完成？',
onOk: () => {
this._submitPrintEnd(ids)
}
})
}
},
_submitPrintEnd: async function(data) {
const result = await meterSample.printEnd(data)
if (result) {
this.$Message.success('提交成功！')
await this._page()
}
},
_submitEnd: async function(data) { _submitEnd: async function(data) {
const result = await meterSample.endReport(data) const result = await meterSample.endReport(data)
...@@ -240,8 +230,8 @@ export default { ...@@ -240,8 +230,8 @@ export default {
case '查看证书': case '查看证书':
this._itemOriginalRecordLook(data, 'only') this._itemOriginalRecordLook(data, 'only')
break break
case '在线查看证书': case '证书查看':
this._reportMakeLook(data) this._sampleManage(data)
break break
case '删除': case '删除':
this._deleteByIds([data.id]) this._deleteByIds([data.id])
...@@ -252,13 +242,9 @@ export default { ...@@ -252,13 +242,9 @@ export default {
} }
}) })
}, },
_reportMakeLook: async function(data) { _sampleManage(data) {
const result = await meterSample.getCertificateReport(data.id) // 管理样品
if (result) { this.$refs.meterSampleManageModal._open(data.id)
this._viewReport(result)
} else {
this._itemOriginalRecordLook(data, 'only')
}
}, },
_viewReport(data) { _viewReport(data) {
if (data) { if (data) {
...@@ -311,7 +297,7 @@ export default { ...@@ -311,7 +297,7 @@ export default {
}, },
_page: async function() { _page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams()) Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await meterSample.pageCertificatePrinted(this.formObj) const result = await meterEntrust.pagePrintedEntrust(this.formObj)
if (result) { if (result) {
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
this.getPage = result this.getPage = result
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment