Skip to content

P
patzn-cloud-web-back-soil
Commit 878b643e by lichengming
Options

Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev

parents 7f1c3d80 7f0c9b9e
Showing with 392 additions and 117 deletions
api/meter/meter-sample.js
......@@ -74,8 +74,18 @@ export default {
pageCertificateMake: data =>
http.post('meter/v1/sample/page_certificate_make', data).then(res => res),
pageCertificateMakeHis: data =>
http
.post('meter/v1/sample/page_certificate_make_his', data)
.then(res => res),
pageCertificateCheck: data =>
http.post('meter/v1/sample/page_certificate_check', data).then(res => res),
pageCertificateCheckHis: data =>
http
.post('meter/v1/sample/page_certificate_check_his', data)
.then(res => res),
pageCertificateIssue: data =>
http.post('meter/v1/sample/page_certificate_issue', data).then(res => res),
pageCertificatePrint: data =>
......
pages/meter-certificate/check/MeterCertificateCheckHis.vue
......@@ -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.name" name="name" 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.code" name="aptitude" 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,18 @@
:min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable>
<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>
</vxe-table-column>
</PTVXETable>
......@@ -45,66 +56,69 @@
</Row>
</div>
</div>
<Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason>
<operationModal ref="operationModal"></operationModal>
<FileManage ref="FileManage"></FileManage>
<!--编辑证书-->
<CertificateMakeLook ref="itemOriginalRecordLookModal" @on-result-change="_resultRecord"></CertificateMakeLook>
</div>
</template>
<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 {
components: {},
components: { Reason, operationModal, CertificateMakeLook },
data() {
return {
currentComponent: '',
formId: 'meterSubcontractorFormId',
searchOpen: false,
formId: 'meterCertificateCheckFormId',
searchOpen: true,
btn: [
{
type: 'success',
id: 'meter-go-out-entrust-add-btn',
name: '添加'
},
{
type: 'success',
id: 'meter-go-out-entrust-submit-btn',
name: '提交'
}
// {
// type: 'success',
// id: '',
// name: '提交'
// },
// {
// type: 'error',
// id: '',
// name: '退回'
// }
],
iconMsg: [
{
type: 'md-create',
type: 'ios-book',
id: '',
name: '编辑'
name: '查看证书'
},
{
type: 'ios-beaker',
type: 'ios-list-box',
id: '',
name: '管理样品'
name: '仪器领用'
},
{ type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' },
{
type: 'ios-clock',
id: '',
name: '操作日志'
}
{ type: 'md-cloud', id: '', name: '附件' }
],
formObj: {
name: undefined,
aptitude: undefined
code: 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' },
{ title: '委托单位', key: 'client', width: 200 },
{ 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' }
]
}
......@@ -122,24 +136,60 @@ export default {
this._page()
},
methods: {
_reasonResult(data) {
if (undefined !== data && data !== '') {
this._reportCheckBack(data)
}
console.log(data)
},
_reportCheckBack: async function(data) {
const result = await meterSample.reportCheckBack({
ids: this.selectIds,
reason: data
})
if (result) {
this.$Message.success('退回成功！')
await this._page()
}
},
// 追填原始记录 回调
_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('退回原因')
}
},
_submitToReview() {
this._submitByContractIds('委托评审')
this._submitByContractIds('证书签发')
},
_submitByContractIds(cont) {
const ids = this.selectIds
......@@ -149,21 +199,63 @@ export default {
this.$Modal.confirm({
title: '提示',
content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
// onOk: async () => {
// const result = meterSample.submitReportToIssue(ids)
// if (result) {
// this.$Message.success('提交成功！')
// await this._page()
// }
// }
onOk: () => {
const result = meterEntrust.submit(ids)
this._subTo(ids)
}
})
}
},
_subTo: async function(ids) {
const result = await meterSample.submitReportToIssue(ids)
if (result) {
console.log(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)
}
})
},
_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
)
}
},
_iconClick(res, data, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '编辑':
this._editModal(true, data.id)
case '预览':
this._personModal(data)
break
case '查看证书':
this._itemOriginalRecordLook(data, 'write')
break
case '资质项目':
this._itemModal(data.id)
......@@ -180,19 +272,40 @@ export default {
}
})
},
_personModal(data) {
console.log(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.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()
......@@ -202,7 +315,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.pageCertificateCheckHis(this.formObj)
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = result
......@@ -238,16 +351,16 @@ export default {
_upload(id) {
// 上传文件
this.$refs.refModal._open(id, 'subcontractorId')
this.$refs.FileManage._open(id, 'subcontractorId')
},
_getById: async function(id) {
const result = await meterEntrust.getVOById(id)
const result = await meterSample.getById(id)
if (result) {
this.$refs.editSubcontractorModal._openEdit(result)
}
},
_delete: async function(ids) {
const result = await meterEntrust.deleteById(ids)
const result = await meterSample.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
......
pages/meter-certificate/make/MeterCertificateMakeHis.vue
......@@ -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/>
<Input v-model="formObj.name" name="name" 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/>
<Input v-model="formObj.aptitude" name="aptitude" 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,18 @@
:min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable>
<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>
</vxe-table-column>
</PTVXETable>
......@@ -45,66 +56,80 @@
</Row>
</div>
</div>
<CertificateMake ref="itemOriginalRecordModal" @on-result-change="_resultRecord"></CertificateMake>
<CertificateMakeLook ref="itemOriginalRecordLookModal" @on-result-change="_resultRecord"></CertificateMakeLook>
<CreateReport ref="CreateReport"></CreateReport>
<SelectOriTempRecord ref="SelectOriTempRecord" @on-result-change="_certificateSelectBack"></SelectOriTempRecord>
<CarManage ref="carEdit"></CarManage>
<InstruMentEdit ref="InstruEdit"></InstruMentEdit>
<operationModal ref="operationModal"></operationModal>
<FileManage ref="FileManage"></FileManage>
</div>
</template>
<script>
import { meterEntrust } from '../../../api'
import CertificateMake from '../../meter-certificate/CertificateMake'
import CertificateMakeLook from '../../meter-certificate/CertificateMakeLook'
import { meterSample } from '../../../api'
import operationModal from '../../../components/operation/Operation'
import CreateReport from './CreateReport'
import CarManage from './CarManage'
import InstruMentEdit from './InstrumentEdit'
import SelectOriTempRecord from './SelectOriTempRecord'
export default {
components: {},
components: {
CreateReport,
CarManage,
InstruMentEdit,
operationModal,
SelectOriTempRecord,
CertificateMake,
CertificateMakeLook
},
data() {
return {
currentComponent: '',
formId: 'meterSubcontractorFormId',
searchOpen: false,
formId: 'meterCertificateMakeHisFormId',
searchOpen: true,
btn: [
{
type: 'success',
id: 'meter-go-out-entrust-add-btn',
name: '添加'
},
{
type: 'success',
id: 'meter-go-out-entrust-submit-btn',
name: '提交'
}
// {
// type: 'success',
// id: '',
// name: '生成'
// },
// {
// type: 'success',
// id: '',
// name: '提交'
// }
],
iconMsg: [
{
type: 'md-create',
id: '',
name: '编辑'
},
{
type: 'ios-beaker',
type: 'ios-bookmarks',
id: '',
name: '管理样品'
name: '查看证书'
},
{ type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' },
{
type: 'ios-clock',
id: '',
name: '操作日志'
}
{ type: 'md-cloud', id: '', name: '附件' }
],
formObj: {
name: undefined,
aptitude: undefined
},
selectIds: [],
selectData: [],
getPage: {},
pageColumns: [
{ title: '样品名称', key: 'name', width: 120 },
{ title: '样品编号', key: 'code', width: 120 },
{ title: '型号规格', key: 'spec', width: 100 },
{ title: '证书是否编制', key: 'onlineReported', width: 120 },
{ title: '证书编号', key: 'reportCode', width: 120 },
{ title: '出厂编号', key: 'factoryNumber' },
{ title: '检测类型', key: 'type' },
{ title: '委托单位', key: 'client', width: 200 },
{ 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,11 +151,14 @@ export default {
this.currentComponent = componentName
this.$nextTick(function() {
switch (msg) {
case '添加':
this._editModal(false)
case '生成':
this._create()
break
case '提交':
this._submitToReview()
this._submitToCheck()
break
case '添加':
this._editModal(false)
break
case 'search':
this.searchOpen = !this.searchOpen
......@@ -138,6 +166,38 @@ export default {
}
})
},
_certificateSelectBack(data) {
if (data) {
// this.$refs.itemOriginalRecordModal._open(
// data.sampleId,
// data.tempId,
// data.dataSource
// )
this._makeCode(data)
} else {
const ids = this.selectIds
if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据!')
} else {
// this._appendOriginalRecord()
}
}
},
_makeCode: async function(data) {
const result = await meterSample.makeCode(data)
if (result) {
if (result === '' || result === undefined) {
this.$Message.warning('证书编号暂未生成！')
return false
}
data.dataSource.cc = result
this.$refs.itemOriginalRecordModal._open(
data.sampleId,
data.tempId,
data.dataSource
)
}
},
_submitToReview() {
this._submitByContractIds('委托评审')
},
......@@ -150,7 +210,7 @@ export default {
title: '提示',
content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
onOk: () => {
const result = meterEntrust.submit(ids)
const result = meterSample.submit(ids)
if (result) {
console.log(result)
}
......@@ -158,12 +218,62 @@ export default {
})
}
},
_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)
}
},
_submitToCheck() {
if (this.selectData.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
for (let i = 0; i < this.selectData.length; i++) {
if (this.selectData[i].onlineReported === '否') {
this.$Message.warning(
'您选择的样品编号为' +
this.selectData[i].code +
'的样品暂未生成报告请确认！'
)
return false
}
}
this.$Modal.confirm({
title: '提示',
content: '确定提交' + this.selectIds.length + '条记录？',
onOk: () => {
this._submit(this.selectIds)
}
})
}
},
_submit: async function(data) {
const result = await meterSample.submitReportToCheck(data)
if (result) {
this.$Message.success('提交成功！')
await this._page()
}
},
_iconClick(res, data, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '查看证书':
this._makeCertificate(data)
break
case '仪器领用':
this.$refs.InstruEdit._open()
break
case '车辆管理':
this.$refs.carEdit._open()
break
case '编辑':
this._editModal(true, data.id)
// this._editModal(true, data.id)
this._personModal(data)
break
case '资质项目':
this._itemModal(data.id)
......@@ -180,19 +290,62 @@ export default {
}
})
},
_personModal(data) {
this._previewEdit(data.id)
},
_makeCertificate(data) {
if (data.onlineReported === '否' || undefined === data.recordId) {
console.log('click')
this.$refs.SelectOriTempRecord._open(data.id, data)
} else {
this._itemOriginalRecordLook(data, 'only')
}
},
_resultRecord() {
this._page()
this.$emit('on-result-change')
},
_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
)
}
},
// 预览/编制报告
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.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 '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()
......@@ -201,8 +354,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.pageCertificateMakeHis(this.formObj)
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = result
......@@ -238,16 +390,16 @@ export default {
_upload(id) {
// 上传文件
this.$refs.refModal._open(id, 'subcontractorId')
this.$refs.FileManage._open(id, 'subcontractorId')
},
_getById: async function(id) {
const result = await meterEntrust.getVOById(id)
const result = await meterSample.getById(id)
if (result) {
this.$refs.editSubcontractorModal._openEdit(result)
}
},
_delete: async function(ids) {
const result = await meterEntrust.deleteById(ids)
const result = await meterSample.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
......
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