Skip to content

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

优化修改

parent 7f0c9b9e
Showing with 64 additions and 39 deletions
api/meter/meter-sample.js
......@@ -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
......@@ -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
......@@ -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
......@@ -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,
aptitude: undefined
client: undefined,
entrustCode: 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/make/MeterCertificateMake.vue
......@@ -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,
aptitude: undefined
client: undefined,
entrustCode: undefined
},
selectIds: [],
selectData: [],
......
pages/meter-certificate/make/MeterCertificateMakeHis.vue
......@@ -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,
aptitude: undefined
client: undefined,
entrustCode: undefined
},
selectIds: [],
selectData: [],
......
pages/meter-certificate/print/MeterCertificatePrintHis.vue
......@@ -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._submitIssue(ids)
this._submitEnd(ids)
}
})
}
},
_submitIssue: async function(data) {
const result = await meterSample.submitReportToEnd(data)
_submitEnd: 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.pageCertificateEnd(this.formObj)
const result = await meterSample.pageCertificatePrint(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) {
......
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