Skip to content

P
patzn-cloud-web-back-soil
Commit 2ea90c4b by wangweidong
Options

证书编制修改

parent 5f4b4e43
Showing with 104 additions and 44 deletions
api/meter/meter-sample.js
......@@ -153,7 +153,10 @@ export default {
submitReceive: data =>
http.post('meter/v1/sample/submit_receive?ids=' + data).then(res => res),
toReportCheck: data =>
http.post('meter/v1/sample/to_report_check?ids=' + data).then(res => res),
toReportMake: data =>
http.post('meter/v1/sample/to_report_make?ids=' + data).then(res => res),
taskTransfer: data =>
http
.post(
......
pages/meter-certificate/check/MeterCertificateCheck.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" select-data>
:get-page="getPage" :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -59,14 +59,18 @@
<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 { meterSample } from '../../../api'
import Reason from '../../../components/base/Reason'
import operationModal from '../../../components/operation/Operation'
import CertificateMakeLook from '../../meter-certificate/CertificateMakeLook'
export default {
components: { Reason, operationModal },
components: { Reason, operationModal, CertificateMakeLook },
data() {
return {
currentComponent: '',
......@@ -88,7 +92,7 @@ export default {
{
type: 'ios-book',
id: '',
name: '预览'
name: '查看证书'
},
{
type: 'ios-list-box',
......@@ -99,7 +103,7 @@ export default {
],
formObj: {
name: undefined,
aptitude: undefined
code: undefined
},
selectIds: [],
selectData: [],
......@@ -108,7 +112,6 @@ export default {
{ title: '样品名称', key: 'name', width: 120 },
{ title: '样品编号', key: 'code', width: 120 },
{ title: '型号规格', key: 'spec', width: 100 },
{ title: '证书是否生成', key: 'reported', width: 120 },
{ title: '出厂编号', key: 'factoryNumber' },
{ title: '检测类型', key: 'type' },
{ title: '委托单位', key: 'client', width: 200 },
......@@ -150,6 +153,11 @@ export default {
await this._page()
}
},
// 追填原始记录 回调
_resultRecord() {
this._page()
this.$emit('on-result-change')
},
_btnClick(msg, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
......@@ -210,6 +218,23 @@ export default {
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() {
......@@ -217,6 +242,9 @@ export default {
case '预览':
this._personModal(data)
break
case '查看证书':
this._itemOriginalRecordLook(data, 'only')
break
case '资质项目':
this._itemModal(data.id)
break
......
pages/meter-certificate/make/MeterCertificateMake.vue
......@@ -275,10 +275,6 @@ export default {
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 = []
......
pages/meter-out/personal-task/MeterPersonItemTaskManage.vue
......@@ -102,16 +102,11 @@ export default {
{ name: '取消', type: '' },
{ name: '确定', type: 'primary' }
],
iconMsg: [{ type: 'md-checkmark', id: '', name: '完成' }],
iconMsg: [
// { type: 'md-checkmark', id: '', name: '完成' }
],
btn: [
{
// meter-review-entrust-pass-btn
type: 'success',
id: '',
name: '完成'
},
// meter-review-entrust-back-btn
{
type: 'success',
id: '',
name: '填写检测值'
......
pages/meter-send/sample-input/MeterPersonItemTaskManage.vue
......@@ -89,13 +89,6 @@ export default {
],
btn: [
{
// meter-review-entrust-pass-btn
type: 'success',
id: '',
name: '完成'
},
// meter-review-entrust-back-btn
{
type: 'success',
id: '',
name: '填写检测值'
......
pages/meter-send/sample-input/MeterSampleInput.vue
......@@ -28,7 +28,7 @@
<!--表格-->
<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" @on-result-change="_tableResultChange" select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -113,6 +113,11 @@ export default {
type: 'success',
id: '',
name: '提交'
},
{
type: 'success',
id: '',
name: '提交至证书编制'
}
],
iconMsg: [
......@@ -149,6 +154,7 @@ export default {
aptitude: undefined
},
selectIds: [],
selectData: [],
getPage: {},
pageColumns: [
{ title: '样品名称', key: 'name', width: 120 },
......@@ -195,7 +201,10 @@ export default {
this._editModal(false)
break
case '提交':
this._submitToReview()
this._submitToReportReview()
break
case '提交至证书编制':
this._submitToReportMake()
break
case 'search':
this.searchOpen = !this.searchOpen
......@@ -218,26 +227,58 @@ export default {
this.$refs.SelEquip._open('sample-input')
}
},
_submitToReview() {
this._submitByContractIds('委托评审')
},
_submitByContractIds(cont) {
_submitToReportReview() {
const ids = this.selectIds
const data = this.selectData
if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
for (let i = 0; i < data.length; i++) {
if (data[i].recordId === undefined) {
this.$Message.warning(
'您选择的样品编号为' + data[i].code + '暂未编制证书，无法提交！'
)
return false
}
}
this.$Modal.confirm({
title: '提示',
content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
content: '确定要把这 ' + ids.length + ' 条记录提交到证书核准？',
onOk: () => {
const result = meterSample.submit(ids)
this._submitReportCheck(ids)
}
})
}
},
_submitReportCheck: async function(ids) {
const result = await meterSample.toReportCheck(ids)
if (result) {
console.log(result)
await this._page()
this.$Message.success('提交成功！')
}
},
_submitToReportMake() {
const ids = this.selectIds
if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$Modal.confirm({
title: '提示',
content: '确定要把这 ' + ids.length + ' 条记录提交到证书编制？',
onOk: () => {
this._submitReportMake(ids)
}
})
}
},
_submitReportMake: async function(ids) {
const result = await meterSample.toReportMake(ids)
if (result) {
await this._page()
this.$Message.success('提交成功！')
}
},
_iconClick(res, data, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
......@@ -329,8 +370,12 @@ export default {
case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName)
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()
......
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