Skip to content

P
patzn-cloud-web-back-soil
Commit 9d189ea1 by wangweidong
Options

优化修改

parent 7f0c9b9e
Showing with 523 additions and 134 deletions
api/meter/meter-sample.js
...@@ -88,6 +88,10 @@ export default { ...@@ -88,6 +88,10 @@ export default {
.then(res => res), .then(res => res),
pageCertificateIssue: data => pageCertificateIssue: data =>
http.post('meter/v1/sample/page_certificate_issue', data).then(res => res), 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 => pageCertificatePrint: data =>
http.post('meter/v1/sample/page_certificate_print', data).then(res => res), http.post('meter/v1/sample/page_certificate_print', data).then(res => res),
pageCertificateEnd: data => pageCertificateEnd: data =>
......
pages/meter-certificate/check/MeterCertificateCheck.vue
...@@ -113,8 +113,9 @@ export default { ...@@ -113,8 +113,9 @@ export default {
{ title: '样品编号', key: 'code', width: 120 }, { title: '样品编号', key: 'code', width: 120 },
{ title: '型号规格', key: 'spec', width: 100 }, { title: '型号规格', key: 'spec', width: 100 },
{ title: '出厂编号', key: 'factoryNumber' }, { title: '出厂编号', key: 'factoryNumber' },
{ title: '检测类型', key: 'type' }, { title: '检测类型', key: 'type', width: 100 },
{ 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: 'tel', width: 120 }, { title: '联系电话', key: 'tel', width: 120 },
{ title: '详细地址', key: 'address', width: 250 }, { title: '详细地址', key: 'address', width: 250 },
......
pages/meter-certificate/check/MeterCertificateCheckHis.vue
...@@ -113,8 +113,9 @@ export default { ...@@ -113,8 +113,9 @@ export default {
{ title: '样品编号', key: 'code', width: 120 }, { title: '样品编号', key: 'code', width: 120 },
{ title: '型号规格', key: 'spec', width: 100 }, { title: '型号规格', key: 'spec', width: 100 },
{ title: '出厂编号', key: 'factoryNumber' }, { title: '出厂编号', key: 'factoryNumber' },
{ title: '检测类型', key: 'type' }, { title: '检测类型', key: 'type', width: 100 },
{ 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: 'tel', width: 120 }, { title: '联系电话', key: 'tel', width: 120 },
{ title: '详细地址', key: 'address', width: 250 }, { title: '详细地址', key: 'address', width: 250 },
...@@ -255,7 +256,7 @@ export default { ...@@ -255,7 +256,7 @@ export default {
this._personModal(data) this._personModal(data)
break break
case '查看证书': case '查看证书':
this._itemOriginalRecordLook(data, 'write') this._itemOriginalRecordLook(data, 'only')
break break
case '资质项目': case '资质项目':
this._itemModal(data.id) this._itemModal(data.id)
......
pages/meter-certificate/issue/MeterCertificateIssue.vue
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
<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 v-show="searchOpen" id="formId" :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.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
</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.entrustCode" name="entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button> <Button type="primary" @click="_formSearch">搜索</Button>
...@@ -99,8 +99,8 @@ export default { ...@@ -99,8 +99,8 @@ export default {
{ type: 'md-cloud', id: '', name: '附件' } { type: 'md-cloud', id: '', name: '附件' }
], ],
formObj: { formObj: {
name: undefined, client: undefined,
aptitude: undefined entrustCode: undefined
}, },
selectIds: [], selectIds: [],
selectData: [], selectData: [],
...@@ -111,8 +111,9 @@ export default { ...@@ -111,8 +111,9 @@ export default {
{ title: '证书编号', key: 'reportCode', width: 120 }, { title: '证书编号', key: 'reportCode', width: 120 },
{ title: '型号规格', key: 'spec', width: 100 }, { title: '型号规格', key: 'spec', width: 100 },
{ title: '出厂编号', key: 'factoryNumber' }, { title: '出厂编号', key: 'factoryNumber' },
{ title: '检测类型', key: 'type' }, { title: '检测类型', key: 'type', width: 100 },
{ 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: 'tel', width: 120 }, { title: '联系电话', key: 'tel', width: 120 },
{ title: '详细地址', key: 'address', width: 250 }, { title: '详细地址', key: 'address', width: 250 },
......
pages/meter-certificate/issue/MeterCertificateIssueHis.vue
...@@ -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 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> <label class="label-sign"></label>
<Form-item class="search-item" label="实验室名称:"> <Form-item class="search-item" label="委托单位:">
<Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/> <Input v-model="formObj.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item class="search-item" label="资质:"> <Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/> <Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button> <Button type="primary" @click="_formSearch">搜索</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" @on-result-change="_btnClick" <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
class="contHide"></btn-list> @on-result-change="_btnClick"></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" @on-result-change="_tableResultChange" > :get-page="getPage" :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -37,7 +37,18 @@ ...@@ -37,7 +37,18 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row[item.key]}}</span> <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> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
...@@ -45,66 +56,68 @@ ...@@ -45,66 +56,68 @@
</Row> </Row>
</div> </div>
</div> </div>
<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> </div>
</template> </template>
<script> <script>
import { meterEntrust } from '../../../api' import { meterSample } from '../../../api'
import Reason from '../../../components/base/Reason'
import operationModal from '../../../components/operation/Operation'
import CertificateMakeLook from '../../meter-certificate/CertificateMakeLook'
export default { export default {
components: {}, components: { operationModal, Reason, CertificateMakeLook },
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
formId: 'meterSubcontractorFormId', formId: 'meterCertificateCheckFormId',
searchOpen: false, searchOpen: false,
btn: [ btn: [
{ // {
type: 'success', // type: 'success',
id: 'meter-go-out-entrust-add-btn', // id: '',
name: '添加' // name: '提交'
}, // },
{ // {
type: 'success', // type: 'error',
id: 'meter-go-out-entrust-submit-btn', // id: '',
name: '提交' // name: '退回'
} // }
], ],
iconMsg: [ iconMsg: [
{ {
type: 'md-create', type: 'ios-book',
id: '', id: '',
name: '编辑' name: '查看证书'
}, },
{ { type: 'md-cloud', id: '', name: '附件' }
type: 'ios-beaker',
id: '',
name: '管理样品'
},
{ type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' },
{
type: 'ios-clock',
id: '',
name: '操作日志'
}
], ],
formObj: { formObj: {
name: undefined, client: undefined,
aptitude: undefined entrustCode: undefined
}, },
selectIds: [], selectIds: [],
selectData: [],
getPage: {}, getPage: {},
pageColumns: [ 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: 'client', width: 200 },
{ title: '委托编号', key: 'entrustCode', width: 130 },
{ title: '联系人', key: 'person', width: 120 }, { title: '联系人', key: 'person', width: 120 },
{ 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: 'postcode' }, { title: '数量', key: 'quantity' },
{ title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 },
{ title: '费用合计', key: 'fee', width: 120 },
{ title: '合同号', key: 'contractCode', width: 120 },
{ title: '备注', key: 'remark' } { title: '备注', key: 'remark' }
] ]
} }
...@@ -122,55 +135,106 @@ export default { ...@@ -122,55 +135,106 @@ export default {
this._page() this._page()
}, },
methods: { methods: {
_resultRecord() {
this._page()
this.$emit('on-result-change')
},
_btnClick(msg, componentName) { _btnClick(msg, componentName) {
this.currentComponent = componentName this.currentComponent = componentName
this.$nextTick(function() { this.$nextTick(function() {
switch (msg) { switch (msg) {
case '生成':
this._create()
break
case '添加': case '添加':
this._editModal(false) this._editModal(false)
break break
case '提交': case '提交':
this._submitToReview() this._submitToReview()
break break
case '退回':
this._goBack()
break
case 'search': case 'search':
this.searchOpen = !this.searchOpen this.searchOpen = !this.searchOpen
break 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() { _submitToReview() {
this._submitByContractIds('委托评审') this._submitByContractIds()
}, },
_submitByContractIds(cont) { _submitByContractIds() {
const ids = this.selectIds const ids = this.selectIds
if (ids.length === 0) { if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据！') this.$Message.warning('请至少选择一条数据！')
} else { } else {
this.$Modal.confirm({ this.$Modal.confirm({
title: '提示', title: '提示',
content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？', content: '确定要把这 ' + ids.length + ' 条记录批准通过吗？',
onOk: () => { onOk: () => {
const result = meterEntrust.submit(ids) this._submitIssue(ids)
if (result) {
console.log(result)
}
} }
}) })
} }
}, },
_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) { _iconClick(res, data, componentName) {
this.currentComponent = componentName this.currentComponent = componentName
this.$nextTick(function() { this.$nextTick(function() {
switch (res) { switch (res) {
case '编辑': case '预览':
this._editModal(true, data.id) // this._editModal(true, data.id)
break this._personModal(data)
case '资质项目':
this._itemModal(data.id)
break break
case '附件': case '附件':
this._upload(data.id) this._upload(data.id)
break break
case '查看证书':
this._itemOriginalRecordLook(data, 'only')
break
case '删除': case '删除':
this._deleteByIds([data.id]) this._deleteByIds([data.id])
break break
...@@ -180,19 +244,54 @@ export default { ...@@ -180,19 +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) { _record(id) {
this.$refs.refModal._open(id) this.$refs.operationModal._open(id)
}, },
_tableResultChange(msg, data) { _tableResultChange(msg, data) {
switch (msg) { switch (msg) {
case 'page':
this.getPage = this.$store.state.FoodSubcontracter.page
break
case 'iconClick': case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName) this._iconClick(data.name, data.rowData, data.componentName)
console.log('操作按钮点击后的值', data)
break break
case 'selectIds': // case 'selectIds':
this.selectIds = data // 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 break
case 'changeSize': case 'changeSize':
this._page() this._page()
...@@ -201,8 +300,7 @@ export default { ...@@ -201,8 +300,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())
console.log('this.formObj', this.formObj) const result = await meterSample.pageCertificateIssueHis(this.formObj)
const result = await meterEntrust.pageGoOutEntrust(this.formObj)
if (result) { if (result) {
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
this.getPage = result this.getPage = result
...@@ -238,16 +336,16 @@ export default { ...@@ -238,16 +336,16 @@ export default {
_upload(id) { _upload(id) {
// 上传文件 // 上传文件
this.$refs.refModal._open(id, 'subcontractorId') this.$refs.FileManage._open(id, 'subcontractorId')
}, },
_getById: async function(id) { _getById: async function(id) {
const result = await meterEntrust.getVOById(id) const result = await meterSample.getById(id)
if (result) { if (result) {
this.$refs.editSubcontractorModal._openEdit(result) this.$refs.editSubcontractorModal._openEdit(result)
} }
}, },
_delete: async function(ids) { _delete: async function(ids) {
const result = await meterEntrust.deleteById(ids) const result = await meterSample.deleteById(ids)
if (result) { if (result) {
this._formSearch() this._formSearch()
this.$Message.success('删除成功！') this.$Message.success('删除成功！')
......
pages/meter-certificate/make/MeterCertificateMake.vue
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
<Col span="24" style="margin-top: 10px"> <Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :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" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/> <Input v-model="formObj.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item class="search-item" label="资质:"> <Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/> <Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
...@@ -127,8 +127,8 @@ export default { ...@@ -127,8 +127,8 @@ export default {
// } // }
], ],
formObj: { formObj: {
name: undefined, client: undefined,
aptitude: undefined entrustCode: undefined
}, },
selectIds: [], selectIds: [],
selectData: [], selectData: [],
......
pages/meter-certificate/make/MeterCertificateMakeHis.vue
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
<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 v-show="searchOpen" id="formId" :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.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
</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.entrustCode" name="entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button> <Button type="primary" @click="_formSearch">搜索</Button>
...@@ -111,8 +111,8 @@ export default { ...@@ -111,8 +111,8 @@ export default {
{ type: 'md-cloud', id: '', name: '附件' } { type: 'md-cloud', id: '', name: '附件' }
], ],
formObj: { formObj: {
name: undefined, client: undefined,
aptitude: undefined entrustCode: undefined
}, },
selectIds: [], selectIds: [],
selectData: [], selectData: [],
......
pages/meter-certificate/print/MeterCertificatePrintHis.vue
...@@ -58,14 +58,18 @@ ...@@ -58,14 +58,18 @@
</div> </div>
<operationModal ref="operationModal"></operationModal> <operationModal ref="operationModal"></operationModal>
<FileManage ref="FileManage"></FileManage> <FileManage ref="FileManage"></FileManage>
<!--编辑证书-->
<CertificateMakeLook ref="itemOriginalRecordLookModal" @on-result-change="_resultRecord"></CertificateMakeLook>
</div> </div>
</template> </template>
<script> <script>
import { meterSample } from '../../../api' import { meterSample } from '../../../api'
import operationModal from '../../../components/operation/Operation' import operationModal from '../../../components/operation/Operation'
import CertificateMakeLook from '../../meter-certificate/CertificateMakeLook'
export default { export default {
components: { operationModal }, components: { operationModal, CertificateMakeLook },
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
...@@ -79,16 +83,11 @@ export default { ...@@ -79,16 +83,11 @@ export default {
// } // }
], ],
iconMsg: [ iconMsg: [
// { {
// type: 'ios-book', type: 'ios-book',
// id: '', id: '',
// name: '预览' name: '查看证书'
// }, },
// {
// type: 'ios-list-box',
// id: '',
// name: '仪器领用'
// },
{ type: 'md-cloud', id: '', name: '附件' } { type: 'md-cloud', id: '', name: '附件' }
], ],
formObj: { formObj: {
...@@ -103,8 +102,9 @@ export default { ...@@ -103,8 +102,9 @@ export default {
{ title: '样品编号', key: 'code', width: 120 }, { title: '样品编号', key: 'code', width: 120 },
{ title: '型号规格', key: 'spec', width: 100 }, { title: '型号规格', key: 'spec', width: 100 },
{ title: '出厂编号', key: 'factoryNumber' }, { title: '出厂编号', key: 'factoryNumber' },
{ title: '检测类型', key: 'type' }, { title: '检测类型', key: 'type', width: 100 },
{ 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: 'tel', width: 120 }, { title: '联系电话', key: 'tel', width: 120 },
{ title: '详细地址', key: 'address', width: 250 }, { title: '详细地址', key: 'address', width: 250 },
...@@ -158,16 +158,16 @@ export default { ...@@ -158,16 +158,16 @@ export default {
} else { } else {
this.$Modal.confirm({ this.$Modal.confirm({
title: '提示', title: '提示',
content: '确定要把这 ' + ids.length + ' 条记录批准通过吗？', content: '确定提交吗？',
onOk: () => { onOk: () => {
this._submitIssue(ids) this._submitEnd(ids)
} }
}) })
} }
}, },
_submitIssue: async function(data) { _submitEnd: async function(data) {
const result = await meterSample.submitReportToEnd(data) const result = await meterSample.endReport(data)
if (result) { if (result) {
this.$Message.success('提交成功！') this.$Message.success('提交成功！')
await this._page() await this._page()
...@@ -194,6 +194,9 @@ export default { ...@@ -194,6 +194,9 @@ export default {
case '附件': case '附件':
this._upload(data.id) this._upload(data.id)
break break
case '查看证书':
this._itemOriginalRecordLook(data, 'only')
break
case '删除': case '删除':
this._deleteByIds([data.id]) this._deleteByIds([data.id])
break break
...@@ -244,7 +247,7 @@ export default { ...@@ -244,7 +247,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.pageCertificateEnd(this.formObj) const result = await meterSample.pageCertificatePrint(this.formObj)
if (result) { if (result) {
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
this.getPage = result this.getPage = result
...@@ -282,6 +285,21 @@ export default { ...@@ -282,6 +285,21 @@ export default {
// 上传文件 // 上传文件
this.$refs.FileManage._open(id, 'subcontractorId') 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) { _getById: async function(id) {
const result = await meterSample.getById(id) const result = await meterSample.getById(id)
if (result) { if (result) {
......
pages/meter-certificate/print/MeterCertificatePrintIndex.vue
<template> <template>
<div> <div>
<!--内容-->
<div class="layout-content-padding"> <div class="layout-content-padding">
<div class="layout-content-main"> <div class="layout-content-main">
<el-tabs v-model="activeName"> <Row>
<el-tab-pane label="待完成" name="wait"> <!--查询-->
<MeterGoOutEntrust ref="waitTabs"></MeterGoOutEntrust> <Col span="24" style="margin-top: 10px">
</el-tab-pane> <Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
<el-tab-pane label="历史记录" name="his"> <label class="label-sign"></label>
<MeterGoOutEntrustHis ref="hisTabs"></MeterGoOutEntrustHis> <Form-item class="search-item" label="委托单位:">
</el-tab-pane> <Input v-model="formObj.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
</el-tabs> </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>
</div> </div>
<operationModal ref="operationModal"></operationModal>
<FileManage ref="FileManage"></FileManage>
<!--编辑证书-->
<CertificateMakeLook ref="itemOriginalRecordLookModal" @on-result-change="_resultRecord"></CertificateMakeLook>
</div> </div>
</template>
</template>
<script> <script>
import MeterGoOutEntrust from './MeterCertificatePrint' import { meterSample } from '../../../api'
import MeterGoOutEntrustHis from './MeterCertificatePrintHis' import operationModal from '../../../components/operation/Operation'
import CertificateMakeLook from '../../meter-certificate/CertificateMakeLook'
export default { export default {
name: 'MeterGoOutEntrustIndex', components: { operationModal, CertificateMakeLook },
components: {
MeterGoOutEntrust,
MeterGoOutEntrustHis
},
data() { data() {
return { 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() { mounted() {
this.activeName = 'wait'
this._page() this._page()
}, },
methods: { methods: {
_changeTabs(tab, event) { _btnClick(msg, componentName) {
if (tab.name === 'wait') { this.currentComponent = componentName
this._page() 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 { } 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> </script>
<style scoped>
</style>
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