Skip to content

P
patzn-cloud-web-back-soil
Commit 8629c021 by wangweidong
Options

整体优化

parent fb3022b9
Showing with 657 additions and 27 deletions
api/meter/meter-sample.js
...@@ -49,6 +49,9 @@ export default { ...@@ -49,6 +49,9 @@ export default {
pageSampleInput: data => pageSampleInput: data =>
http.post('meter/v1/sample/page_sample_input', data).then(res => res), http.post('meter/v1/sample/page_sample_input', data).then(res => res),
pageSampleInStock: data =>
http.post('meter/v1/sample/page_sample_in_stock', data).then(res => res),
pageCertificateMake: data => pageCertificateMake: data =>
http.post('meter/v1/sample/page_certificate_make', data).then(res => res), http.post('meter/v1/sample/page_certificate_make', data).then(res => res),
pageCertificateCheck: data => pageCertificateCheck: data =>
...@@ -68,6 +71,8 @@ export default { ...@@ -68,6 +71,8 @@ export default {
.post('meter/v1/sample/add_send_entrust', JSON.stringify(data)) .post('meter/v1/sample/add_send_entrust', JSON.stringify(data))
.then(res => res), .then(res => res),
addSample: data => http.post('meter/v1/sample/', data).then(res => res), addSample: data => http.post('meter/v1/sample/', data).then(res => res),
chaseAddSample: data =>
http.post('meter/v1/sample/chase_add_sample', data).then(res => res),
saveSampleEnv: data => saveSampleEnv: data =>
http http
.put('meter/v1/sample/save_sample_env/' + data.ids, data.obj) .put('meter/v1/sample/save_sample_env/' + data.ids, data.obj)
...@@ -88,7 +93,10 @@ export default { ...@@ -88,7 +93,10 @@ export default {
http http
.post('meter/v1/sample/submit_report_to_issue?ids=' + data) .post('meter/v1/sample/submit_report_to_issue?ids=' + data)
.then(res => res), .then(res => res),
submitReportToEnd: data =>
http
.post('meter/v1/sample/submit_report_to_end?ids=' + data)
.then(res => res),
submitFlow: data => submitFlow: data =>
https https
.post('meter/v1/sample/sample_flow', JSON.stringify(data)) .post('meter/v1/sample/sample_flow', JSON.stringify(data))
......
pages/meter-business/quote-register/MeterQuoteRegisterEdit.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/> <Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/>
</Form-item> </Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48"> <Form-item label="省、市、区" prop="testedCityData" class="width-48">
<CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult"> <CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader> </CityNameCascader>
</Form-item> </Form-item>
......
pages/meter-certificate/issue/MeterCertificateIssue.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.name" name="name" 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.aptitude" name="aptitude" 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" select-data> :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"
...@@ -75,7 +75,12 @@ export default { ...@@ -75,7 +75,12 @@ export default {
{ {
type: 'success', type: 'success',
id: '', id: '',
name: '生成' name: '提交'
},
{
type: 'error',
id: '',
name: '退回'
} }
], ],
iconMsg: [ iconMsg: [
...@@ -139,6 +144,9 @@ export default { ...@@ -139,6 +144,9 @@ export default {
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
...@@ -146,25 +154,31 @@ export default { ...@@ -146,25 +154,31 @@ export default {
}) })
}, },
_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 = meterSample.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() { _create() {
const selectData = JSON.parse(JSON.stringify(this.selectData)) const selectData = JSON.parse(JSON.stringify(this.selectData))
console.log(selectData) console.log(selectData)
......
pages/meter-contract/contract-file/MeterContractFileEdit.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/> <Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/>
</Form-item> </Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48"> <Form-item label="省、市、区" prop="testedCityData" class="width-48">
<CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult"> <CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader> </CityNameCascader>
</Form-item> </Form-item>
......
pages/meter-contract/contract-register/MeterContractRegisterEdit.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/> <Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/>
</Form-item> </Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48"> <Form-item label="省、市、区" prop="testedCityData" class="width-48">
<CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult"> <CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader> </CityNameCascader>
</Form-item> </Form-item>
......
pages/meter-contract/contract-review/MeterContractReviewEdit.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/> <Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/>
</Form-item> </Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48"> <Form-item label="省、市、区" prop="testedCityData" class="width-48">
<CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult"> <CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader> </CityNameCascader>
</Form-item> </Form-item>
......
pages/meter-entrust/MeterSampleHisEdit.vue
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
* 添加编辑环境检测项目包 * 添加编辑环境检测项目包
*/ */
import ModalFooter from '../../components/base/modalFooter' import ModalFooter from '../../components/base/modalFooter'
import { meterAptitude } from '../../api' import { meterAptitude, meterSample } from '../../api'
import EditModal from './go-out-test/EditModal' import EditModal from './go-out-test/EditModal'
export default { export default {
...@@ -72,6 +72,7 @@ export default { ...@@ -72,6 +72,7 @@ export default {
modalTitle: '', modalTitle: '',
formObj: { formObj: {
verification: '', verification: '',
aptitudeId: '',
name: '', name: '',
spec: '', spec: '',
factoryNumber: '', factoryNumber: '',
...@@ -110,12 +111,13 @@ export default { ...@@ -110,12 +111,13 @@ export default {
}, },
_backData(data) { _backData(data) {
this.formObj.name = data.name this.formObj.name = data.name
this.formObj.aptitudeId = data.id
this.formObj.verification = data.code + data.basis this.formObj.verification = data.code + data.basis
console.log('返回的数据') console.log('返回的数据')
console.log(data) console.log(data)
}, },
_save: async function(data) { _save: async function(data) {
const result = await meterAptitude.save(data) const result = await meterSample.chaseAddSample(data)
console.log(result) console.log(result)
if (result) { if (result) {
this._resultChange('添加成功!') this._resultChange('添加成功!')
...@@ -150,7 +152,7 @@ export default { ...@@ -150,7 +152,7 @@ export default {
// 添加 // 添加
const saveData = this.formObj const saveData = this.formObj
console.log('要追加的数据', saveData) console.log('要追加的数据', saveData)
// this._save(saveData) this._save(saveData)
} else { } else {
// 编辑 // 编辑
this._edit({ id: this.formObj.id, obj: data }) this._edit({ id: this.formObj.id, obj: data })
......
pages/meter-entrust/MeterSampleManageRead.vue
...@@ -138,6 +138,7 @@ export default { ...@@ -138,6 +138,7 @@ export default {
{ title: '样品编号', key: 'code', width: 120 }, { title: '样品编号', key: 'code', width: 120 },
{ title: '样品名称', key: 'name', width: 140 }, { title: '样品名称', key: 'name', width: 140 },
{ title: '型号规格', key: 'spec', width: 140 }, { title: '型号规格', key: 'spec', width: 140 },
{ title: '检测项目', key: 'itemNames', width: 140 },
{ title: '出厂编号', key: 'factoryNumber', width: 140 }, { title: '出厂编号', key: 'factoryNumber', width: 140 },
{ title: '是否分包', key: 'jobOut', width: 110 }, { title: '是否分包', key: 'jobOut', width: 110 },
{ title: '检测类型', key: 'type', width: 140 }, { title: '检测类型', key: 'type', width: 140 },
......
pages/meter-out/personal-task/MeterGoOutTestEdit.vue
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</Form-item> </Form-item>
<Form-item label="省、市、区" prop="name" class="width-48"> <Form-item label="省、市、区" prop="name" class="width-48">
<!-- <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>--> <!-- <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>-->
<CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult"> <CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader> </CityNameCascader>
</Form-item> </Form-item>
<Form-item label="街道" prop="street" class="width-48"> <Form-item label="街道" prop="street" class="width-48">
......
pages/meter-send/sample-input/MeterGoOutTestEdit.vue
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</Form-item> </Form-item>
<Form-item label="省、市、区" prop="name" class="width-48"> <Form-item label="省、市、区" prop="name" class="width-48">
<!-- <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>--> <!-- <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>-->
<CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult"> <CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader> </CityNameCascader>
</Form-item> </Form-item>
<Form-item label="街道" prop="street" class="width-48"> <Form-item label="街道" prop="street" class="width-48">
......
pages/meter-send/task-distribute/MeterTestEdit.vue
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</Form-item> </Form-item>
<Form-item label="省、市、区" prop="name" class="width-48"> <Form-item label="省、市、区" prop="name" class="width-48">
<!-- <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>--> <!-- <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>-->
<CityNameCascader :value="testedCityData" name="tested" @on-result-change="_cascaderResult"> <CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader> </CityNameCascader>
</Form-item> </Form-item>
<Form-item label="街道" prop="street" class="width-48"> <Form-item label="街道" prop="street" class="width-48">
......
pages/meter-warehouse/warehouse-in/MeterMeterWarehouseInHis.vue 0 → 100644
<template>
<div>
<!--内容-->
<div class="layout-content-padding">
<div class="layout-content-main">
<Row>
<!--查询-->
<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>
<Form-item class="search-item" label="资质:">
<Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</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>
</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" >
<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>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</div>
</div>
</div>
</template>
<script>
import { meterEntrust } from '../../../api'
export default {
components: {},
data() {
return {
currentComponent: '',
formId: 'meterSubcontractorFormId',
searchOpen: false,
btn: [
{
type: 'success',
id: 'meter-go-out-entrust-add-btn',
name: '添加'
},
{
type: 'success',
id: 'meter-go-out-entrust-submit-btn',
name: '提交'
}
],
iconMsg: [
{
type: 'md-create',
id: '',
name: '编辑'
},
{
type: 'ios-beaker',
id: '',
name: '管理样品'
},
{ type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' },
{
type: 'ios-clock',
id: '',
name: '操作日志'
}
],
formObj: {
name: undefined,
aptitude: undefined
},
selectIds: [],
getPage: {},
pageColumns: [
{ 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: 'remark' }
]
}
},
computed: {
tableHeight: function() {
if (this.searchOpen) {
return this.$tableHeight('search')
} else {
return this.$tableHeight('noSearch')
}
}
},
mounted() {
this._page()
},
methods: {
_btnClick(msg, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (msg) {
case '添加':
this._editModal(false)
break
case '提交':
this._submitToReview()
break
case 'search':
this.searchOpen = !this.searchOpen
break
}
})
},
_submitToReview() {
this._submitByContractIds('委托评审')
},
_submitByContractIds(cont) {
const ids = this.selectIds
if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$Modal.confirm({
title: '提示',
content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
onOk: () => {
const result = meterEntrust.submit(ids)
if (result) {
console.log(result)
}
}
})
}
},
_iconClick(res, data, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '编辑':
this._editModal(true, data.id)
break
case '资质项目':
this._itemModal(data.id)
break
case '附件':
this._upload(data.id)
break
case '删除':
this._deleteByIds([data.id])
break
case '操作日志':
this._record(data.id)
break
}
})
},
_record(id) {
this.$refs.refModal._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)
break
case 'selectIds':
this.selectIds = data
break
case 'changeSize':
this._page()
break
}
},
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj)
const result = await meterEntrust.pageGoOutEntrust(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 {
// 添加
this.$refs.editSubcontractorModal._open()
}
},
// 追加项目
_itemModal(data) {
this.$refs.refModal._open(data)
},
_upload(id) {
// 上传文件
this.$refs.refModal._open(id, 'subcontractorId')
},
_getById: async function(id) {
const result = await meterEntrust.getVOById(id)
if (result) {
this.$refs.editSubcontractorModal._openEdit(result)
}
},
_delete: async function(ids) {
const result = await meterEntrust.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
}
}
}
</script>
pages/meter-warehouse/warehouse-in/MeterMeterWarehouseInIndex.vue 0 → 100644
<template>
<div>
<div class="layout-content-padding">
<div class="layout-content-main">
<el-tabs v-model="activeName">
<el-tab-pane label="待完成" name="wait">
<MeterGoOutEntrust ref="waitTabs"></MeterGoOutEntrust>
</el-tab-pane>
<el-tab-pane label="历史记录" name="his">
<MeterGoOutEntrustHis ref="hisTabs"></MeterGoOutEntrustHis>
</el-tab-pane>
</el-tabs>
</div>
</div>
</div>
</template>
<script>
import MeterGoOutEntrust from './MeterWarehouseIn'
import MeterGoOutEntrustHis from './MeterMeterWarehouseInHis'
export default {
name: 'MeterGoOutEntrustIndex',
components: {
MeterGoOutEntrust,
MeterGoOutEntrustHis
},
data() {
return {
activeName: 'wait'
}
}
}
</script>
<style scoped>
</style>
pages/meter-warehouse/warehouse-in/MeterWarehouseIn.vue 0 → 100644
<template>
<div>
<!--内容-->
<div class="layout-content-padding">
<div class="layout-content-main">
<Row>
<!--查询-->
<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>
<Form-item class="search-item" label="资质:">
<Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</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>
</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" >
<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>
<FileManage ref="FileManage"></FileManage>
</div>
</template>
<script>
import { meterDevice, meterSample } from '../../../api'
export default {
components: {},
data() {
return {
currentComponent: '',
formId: 'meterWarehouseInFormId',
searchOpen: false,
btn: [
{
type: 'success',
id: '',
name: '提交'
}
],
iconMsg: [
{
type: 'md-create',
id: '',
name: '编辑'
},
{ type: 'md-cloud', id: '', name: '附件' }
],
formObj: {
name: undefined,
aptitude: undefined
},
selectIds: [],
getPage: {},
pageColumns: [
{ title: '样品名称', key: 'name', width: 120 },
{ title: '样品编号', key: 'code', width: 120 },
{ title: '型号规格', key: 'spec' },
{ title: '出厂编号', key: 'factoryNumber' },
{ title: '检测类型', key: 'type' },
{ title: '委托单位', key: 'client', width: 200 },
{ 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() {
this._page()
},
methods: {
_btnClick(msg, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (msg) {
case '仪器领用':
this._receiveApparatus()
break
case '车辆管理':
this._carManage()
break
case '添加':
this._editModal(false)
break
case '提交':
this._submitToReview()
break
case 'search':
this.searchOpen = !this.searchOpen
break
}
})
},
_carManage() {
this.$refs.carEdit._open()
},
_receiveApparatus() {
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$refs.SelEquip._open('sample-input')
}
},
_submitToReview() {
this._submitByContractIds('委托评审')
},
_submitByContractIds(cont) {
const ids = this.selectIds
if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$Modal.confirm({
title: '提示',
content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
onOk: () => {
const result = meterSample.submit(ids)
if (result) {
console.log(result)
}
}
})
}
},
_iconClick(res, data, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '仪器领用':
this.$refs.InstruEdit._open()
break
case '车辆管理':
this.$refs.carEdit._open()
break
case '编辑':
// this._editModal(true, data.id)
this._personModal(data)
break
case '资质项目':
this._itemModal(data.id)
break
case '附件':
this._upload(data.id)
break
case '删除':
this._deleteByIds([data.id])
break
case '操作日志':
this._record(data.id)
break
}
})
},
_personModal(data) {
console.log(data)
this.$refs.personModal._open(data.id)
},
_equipSelectBack(data) {
console.log('_equipSelectBack', data)
const equipData = []
for (let i = 0; i < data.length; i++) {
const object = data[i]
const obj = {}
obj.name = object.name
obj.certificateNo = object.ceNum
obj.measuringRange = object.range
obj.uncertaintyAccuray = object.uncertainty
obj.validUntil = object.effectDate
equipData.push(obj)
}
this._addEquipUse({ sampleIds: this.selectIds, devicesList: equipData })
},
_addEquipUse: async function(data) {
const result = await meterDevice.addEquipUse(data)
if (result) {
await this._page()
}
},
_record(id) {
this.$refs.refModal._open(id)
},
_tableResultChange(msg, data) {
switch (msg) {
case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName)
break
case 'selectIds':
this.selectIds = data
break
case 'changeSize':
this._page()
break
}
},
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await meterSample.pageSampleInStock(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 {
// 添加
this.$refs.editSubcontractorModal._open()
}
},
// 追加项目
_itemModal(data) {
this.$refs.refModal._open(data)
},
_upload(id) {
// 上传文件
this.$refs.FileManage._open(id, 'subcontractorId')
},
_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>
router/meter-routes.js
...@@ -34,6 +34,7 @@ import MeterContractReviewIndex from '../pages/meter-contract/contract-review/Me ...@@ -34,6 +34,7 @@ import MeterContractReviewIndex from '../pages/meter-contract/contract-review/Me
import MeterContractFileIndex from '../pages/meter-contract/contract-file/MeterContractFileIndex' import MeterContractFileIndex from '../pages/meter-contract/contract-file/MeterContractFileIndex'
import MeterSampleProgress from '../pages/meter-progress/progress-sample/MeterSampleProgress' import MeterSampleProgress from '../pages/meter-progress/progress-sample/MeterSampleProgress'
import MeterClientOnlineEntrustIndex from '../pages/meter-entrust/client-online/MeterClientOnlineEntrustIndex' import MeterClientOnlineEntrustIndex from '../pages/meter-entrust/client-online/MeterClientOnlineEntrustIndex'
import MeterMeterWarehouseInIndex from '../pages/meter-warehouse/warehouse-in/MeterMeterWarehouseInIndex'
import Blank from '~/pages/blank' import Blank from '~/pages/blank'
export default [ export default [
{ {
...@@ -220,7 +221,18 @@ export default [ ...@@ -220,7 +221,18 @@ export default [
{ {
path: 'sample_progress', path: 'sample_progress',
component: MeterSampleProgress, component: MeterSampleProgress,
meta: { title: '' } meta: { title: '样品进度查询' }
}
]
},
{
path: 'warehouse',
component: Blank,
children: [
{
path: 'sample_in_store',
component: MeterMeterWarehouseInIndex,
meta: { title: '样品入库管理' }
} }
] ]
} }
......
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