Skip to content

P
patzn-cloud-web-back-soil
Commit 3645e746 by wangweidong
Options

优化修改

parent 172fc0c8
Showing with 551 additions and 147 deletions
api/meter/meter-entrust.js
...@@ -53,6 +53,10 @@ export default { ...@@ -53,6 +53,10 @@ export default {
.then(res => res), .then(res => res),
pageEntrustReview: data => pageEntrustReview: data =>
http.post('meter/v1/entrust/page_review_entrust', data).then(res => res), http.post('meter/v1/entrust/page_review_entrust', data).then(res => res),
pageEntrustProgress: data =>
http.post('meter/v1/entrust/page_entrust_progress', data).then(res => res),
pageEntrustReceive: data => pageEntrustReceive: data =>
http http
.post('meter/v1/entrust/page_sample_receive_entrust', data) .post('meter/v1/entrust/page_sample_receive_entrust', data)
......
pages/meter-contract/contract-file/MeterContractFile.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" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</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" @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托编号" clearable/>
</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>
...@@ -109,8 +109,8 @@ export default { ...@@ -109,8 +109,8 @@ export default {
} }
], ],
formObj: { formObj: {
name: undefined, client: undefined,
aptitude: undefined entrustCode: undefined
}, },
selectIds: [], selectIds: [],
getPage: {}, getPage: {},
...@@ -244,7 +244,6 @@ export default { ...@@ -244,7 +244,6 @@ 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 meterContract.pageContractFile(this.formObj) const result = await meterContract.pageContractFile(this.formObj)
if (result) { if (result) {
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
......
pages/meter-entrust/send-test/MeterSendEntrust.vue
...@@ -9,8 +9,16 @@ ...@@ -9,8 +9,16 @@
<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.client" @on-enter="_formSearch" name="name" placeholder="请输入委托单位" clearable/> <Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item> </Form-item>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托编号" clearable/>
</Form-item>
<Form-item class="search-item" label="合同编号:">
<Input v-model="formObj.contractCode" @on-enter="_formSearch" name="contractCode" placeholder="请输入合同编号" clearable/>
</Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
</Form-item> </Form-item>
...@@ -115,6 +123,7 @@ export default { ...@@ -115,6 +123,7 @@ export default {
], ],
formObj: { formObj: {
client: undefined, client: undefined,
contractCode: undefined,
entrustCode: undefined entrustCode: undefined
}, },
selectIds: [], selectIds: [],
...@@ -123,6 +132,7 @@ export default { ...@@ -123,6 +132,7 @@ export default {
{ title: '委托单位', key: 'client', width: 200 }, { title: '委托单位', key: 'client', width: 200 },
{ title: '联系人', key: 'person', width: 120 }, { title: '联系人', key: 'person', width: 120 },
{ title: '委托编号', key: 'entrustCode', width: 120 }, { title: '委托编号', key: 'entrustCode', width: 120 },
{ title: '合同号', key: 'contractCode', width: 120 },
{ title: '状态', key: 'progress', width: 120, status: true }, { title: '状态', key: 'progress', width: 120, status: true },
{ title: '联系电话', key: 'tel', width: 120 }, { title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 }, { title: '传真', key: 'fax', width: 120 },
...@@ -131,7 +141,6 @@ export default { ...@@ -131,7 +141,6 @@ export default {
{ title: 'E-mail', key: 'email', width: 120 }, { title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120, date: true }, { title: '委托日期', key: 'edate', width: 120, date: true },
{ title: '费用合计', key: 'fee', width: 120 }, { title: '费用合计', key: 'fee', width: 120 },
{ title: '合同号', key: 'contractCode', width: 120 },
{ title: '备注', key: 'remark' } { title: '备注', key: 'remark' }
] ]
} }
......
pages/meter-progress/progress-entrust/MeterEntrustProgress.vue 0 → 100644
<template>
<div>
<!--内容-->
<div class="layout-content-padding">
<div class="layout-content-main">
<Row>
<!--查询-->
<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.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-item" label="合同编号:">
<Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同编号" clearable @on-enter="_formSearch"/>
</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" @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==='edate'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
</span>
<span v-else-if="item.status">{{scope.row[item.key].display}}
</span>
<span v-else-if="item.entrustType">
{{scope.row[item.key]===1?'出检':'送检'}}
</span>
<span v-else>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</div>
</div>
<MeterEntrustSampleProgress ref="meterSampleManageModal" @on-result-change="_page"></MeterEntrustSampleProgress>
</div>
</template>
<script>
import { meterEntrust, meterSubcontractor } from '../../../api'
import MeterEntrustSampleProgress from './MeterEntrustSampleProgress'
export default {
components: { MeterEntrustSampleProgress },
data() {
return {
currentComponent: 'FoodSampleGovern',
formId: 'meterEntrustProgressFormId',
searchOpen: true,
btn: [],
iconMsg: [
{
type: 'ios-beaker',
id: '',
name: '样品进度'
}
],
formObj: {
client: undefined,
contractCode: undefined,
entrustCode: undefined
},
selectIds: [],
getPage: {},
pageColumns: [
{ title: '委托单位', key: 'client', width: 200 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '委托编号', key: 'entrustCode', width: 120 },
{ title: '委托类型', key: 'type', width: 120, entrustType: true },
{ title: '合同编号', key: 'contractCode', width: 120 },
{ title: '进度', key: 'progress', width: 120, status: true },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '邮编', key: 'postcode', width: 130 },
{ title: 'E-mail', key: 'email', width: 150 },
{ title: '委托日期', key: 'edate', width: 120 },
{ title: '费用合计', key: 'fee', width: 120 },
{ title: '备注', key: 'remark' }
]
}
},
computed: {
tableHeight: function() {
if (this.searchOpen) {
return this.$tableHeight('search')
} else {
return this.$tableHeight('noSearch')
}
}
},
mounted() {
this._page()
},
methods: {
_detailModal(data) {
console.log(data)
this.$refs.meterSampleEdit._open(data)
},
_btnClick(msg, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (msg) {
case '驳回':
this._goBack()
break
case '添加':
this._editModal(false)
break
case '通过':
this._passReview()
break
case 'search':
this.searchOpen = !this.searchOpen
break
}
})
},
_goBack() {
// 退回
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条委托！')
} else {
this.$refs.reasonModal._open('退回原因')
}
},
_reasonResult(data) {
if (undefined !== data && data !== '') {
console.log(data)
this._reportCheckBack(data)
console.log('退回')
}
console.log(data)
},
_reportCheckBack: async function(data) {
const result = await meterEntrust.back({
ids: this.selectIds,
remark: data
})
if (result) {
this.$Message.success('退回成功！')
await this._page()
}
},
_iconClick(res, data) {
this.$nextTick(function() {
switch (res) {
case '样品进度':
this._manageSample(data.id)
break
case '详情':
this._detailModal(data)
break
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
}
})
},
_manageSample(data) {
// 管理样品
this.$refs.meterSampleManageModal._open(data)
},
_record(id) {
this.$refs.operation._open(id)
},
_tableResultChange(msg, data) {
switch (msg) {
case 'iconClick':
this._iconClick(data.name, data.rowData)
break
case 'changeSize':
this._page()
break
case 'selectIds':
this.selectIds = data
break
}
},
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await meterEntrust.pageEntrustProgress(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.$refs.editSubcontractorModal._open(id)
this._getById(id)
} else {
// 添加
this.$refs.editSubcontractorModal._open()
}
},
_passReview() {
if (this.selectIds.length === 0) {
this.$Message.warning('请选择要通过评审的委托单！')
return false
}
this.$Modal.confirm({
title: '提示',
content: '确定通过该委托单？',
onOk: () => {
this._passEntrustReview(this.selectIds)
}
})
},
_passEntrustReview: async function(ids) {
const result = await meterEntrust.passReview(ids)
if (result) {
this.$Message.success('提交成功！')
await this._page()
}
},
// 追加项目
_itemModal(data) {
this.$refs.refModal._open(data)
},
_upload(id) {
// 上传文件
this.$refs.FileManage._open(id, 'contractId')
},
_getById: async function(id) {
const result = await meterSubcontractor.getById(id)
if (result) {
this.$refs.editSubcontractorModal._open(result)
}
},
_delete: async function(ids) {
const result = await meterSubcontractor.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
}
}
}
</script>
pages/meter-progress/progress-entrust/MeterEntrustSampleProgress.vue 0 → 100644
<template>
<div>
<Modal v-model="showModal" width="1200" class="modal-footer-none">
<p slot="header">{{modalTitle}}</p>
<div>
<!--内容-->
<Row>
<!--查询-->
<Col span="24">
<Form id="formId" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="委托单位:" style="margin-left: -20px">
<Input v-model="formObj.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
</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-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.code" name="code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-item" label="出厂编号:">
<Input v-model="formObj.factoryNumber" name="factoryNumber" placeholder="请输入出厂编号" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-btn" style="margin-left: -10px">
<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" :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">
<div v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
</div>
<div v-else-if="item.key==='jobOut'">
{{scope.row[item.key]===1?'是':'否'}}
</div>
<div v-else-if="item.status">{{scope.row[item.key].display}}</div>
<div v-else-if="item.entrustType">
{{scope.row[item.key]===1?'出检':'送检'}}
</div>
<div v-else-if="item.key==='type'">
<Select v-model="scope.row.type">
<Option v-for="(item,index) in options" :key="item.name" :value="index">
{{ item.name }}
</Option>
</Select>
</div>
<div v-else>{{scope.row[item.key]}}</div>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</div>
</Modal>
</div>
</template>
<script>
import { meterSample } from '../../../api'
export default {
components: {
// FoodSampleGovernDetail,
// CopyModal,
// FoodSampleGovernLYEdits
},
data() {
return {
currentComponent: '',
searchOpen: true,
iconMsg: [],
btn: [],
options: [
{
name: '检定'
},
{
name: '校准'
},
{
name: '外观检查'
}
],
formId: 'meterEntrustSampleProgressFormId',
showModal: false,
modalTitle: '管理样品',
selectIds: [],
selectData: [],
getPage: {},
pageColumns: [
{ title: '委托单位', key: 'client', width: 140 },
{ title: '委托单号', key: 'entrustCode', width: 130 },
{
title: '委托类型',
key: 'entrustType',
width: 110,
entrustType: true
},
{ title: '样品名称', key: 'name', width: 140 },
{ title: '样品编号', key: 'code', width: 130 },
{ title: '出厂编号', key: 'factoryNumber', width: 130 },
{ title: '处理进度', key: 'status', status: true, width: 120 },
{ title: '收样人', key: 'receiver', width: 120 },
{ title: '收样人时间', key: 'receiveTime', width: 120 },
{ title: '任务分配人', key: 'assignor', width: 120 },
{ title: '任务分配时间', key: 'allocateTime', width: 120 },
{ title: '领用人', key: 'flower', width: 120 },
{ title: '领用时间', key: 'flowTime', width: 120 },
{ title: '入库人', key: 'sampleInner', width: 120 },
{ title: '入库时间', key: 'sampleInnerTime', width: 120 },
{ title: '出库人', key: 'sampleOuter', width: 120 },
{ title: '出库时间', key: 'outTime', width: 120 }
],
dateList: [],
formObj: {
entrustId: undefined,
entrustCode: undefined,
client: undefined,
name: undefined,
factoryNumber: undefined,
code: undefined
}
}
},
computed: {
tableHeight: function() {
return this.$tableHeight('tableModal')
}
},
methods: {
_dateChange(data) {
this.formObj.ctimeBegin = data[0]
this.formObj.ctimeEnd = data[1]
},
_btnClick(msg, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (msg) {
case '取消分包':
break
}
})
},
_iconClick(res, data, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '管理检测项目':
this._sampleEditModal(data)
break
}
})
},
_tableResultChange(msg, data) {
switch (msg) {
case 'selectData':
const selectIds = []
for (let i = 0; i < data.length; i++) {
selectIds.push(data[i].id)
}
this.selectIds = selectIds
this.selectData = data
break
case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName)
break
case 'changeSize':
this._page()
break
}
},
_open(id) {
this.formObj.entrustId = id
this.showModal = true
this._page()
},
_formSearch() {
this.$refs.pageTable._pageChange(1)
},
_page: async function() {
this.selectIds = []
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
const result = await meterSample.pageSampleProgress(this.formObj)
if (result) {
this.getPage = result
this.$refs.pageTable._hideLoading()
}
},
_search() {
this._page()
},
_resultChange(msg) {
this._page()
this.$Message.success(msg)
}
}
}
</script>
pages/meter-progress/progress-sample/MeterSampleProgress.vue
...@@ -74,13 +74,13 @@ ...@@ -74,13 +74,13 @@
</div> </div>
</template> </template>
<script> <script>
import { meterAptitude, meterSample } from '../../../api' import { meterSample } from '../../../api'
export default { export default {
name: 'MeterSampleProgress', name: 'MeterSampleProgress',
components: {}, components: {},
data() { data() {
return { return {
formId: 'meterAptitudeFormId', formId: 'meterSampleProgressFormId',
pageColumns: [ pageColumns: [
{ title: '委托单位', key: 'client', width: 140 }, { title: '委托单位', key: 'client', width: 140 },
{ title: '委托单号', key: 'entrustCode', width: 130 }, { title: '委托单号', key: 'entrustCode', width: 130 },
...@@ -106,10 +106,7 @@ export default { ...@@ -106,10 +106,7 @@ export default {
{ title: '出库时间', key: 'outTime', width: 120 } { title: '出库时间', key: 'outTime', width: 120 }
], ],
btn: [], btn: [],
iconMsg: [ iconMsg: [],
// { type: 'ios-clock', id: '', name: '编辑' },
// { type: 'ios-clock', id: '', name: '删除' }
],
formObj: { formObj: {
entrustCode: undefined, entrustCode: undefined,
client: undefined, client: undefined,
...@@ -138,18 +135,6 @@ export default { ...@@ -138,18 +135,6 @@ export default {
methods: { methods: {
_btnClick(msg) { _btnClick(msg) {
switch (msg) { switch (msg) {
case '添加':
this._editModal(false)
break
case '删除':
this._deleteSelected()
break
case '导入':
this._import()
break
case '导出':
this._export()
break
case 'search': case 'search':
this.searchOpen = !this.searchOpen this.searchOpen = !this.searchOpen
break break
...@@ -157,12 +142,6 @@ export default { ...@@ -157,12 +142,6 @@ export default {
}, },
_iconClick(res, data) { _iconClick(res, data) {
switch (res) { switch (res) {
case '编辑':
this._editModal(true, data.id)
break
case '删除':
this._deleteById(data.id)
break
case '操作日志': case '操作日志':
this._record(data.id) this._record(data.id)
break break
...@@ -170,14 +149,9 @@ export default { ...@@ -170,14 +149,9 @@ 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.pageSampleProgress(this.formObj) const result = await meterSample.pageSampleProgress(this.formObj)
if (result) { if (result) {
console.log(55555)
console.log(result)
this.getPage = result this.getPage = result
console.log(123456789)
console.log(this.getPage)
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
} }
}, },
...@@ -186,9 +160,6 @@ export default { ...@@ -186,9 +160,6 @@ export default {
}, },
_tableResultChange(msg, data) { _tableResultChange(msg, data) {
switch (msg) { switch (msg) {
case 'page':
this.getPage = this.$store.state.FoodJudgeBasis.page
break
case 'selectIds': case 'selectIds':
this.selectIds = data this.selectIds = data
break break
...@@ -199,86 +170,6 @@ export default { ...@@ -199,86 +170,6 @@ export default {
this._page() this._page()
break break
} }
},
// 删除
_deleteByIds(ids, content) {
this.$Modal.confirm({
title: '提示',
content: content || '确定删除该记录？',
onOk: () => {
this._delete(ids)
}
})
},
_delete: async function(ids) {
const result = await meterAptitude.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
},
_deleteById(id) {
// 删除一条记录
this._deleteByIds([id])
},
_deleteSelected() {
// 批量删除
const ids = this.selectIds
if (ids.length === 0) {
this.$Message.warning('请选择一条或多条数据！')
} else {
this._deleteByIds(ids, '确定删除这 ' + ids.length + ' 条记录？')
}
},
// 编辑&添加
_editModal(edit, id) {
if (edit) {
this._getById(id)
// 编辑
// this.$store.dispatch('FoodJudgeBasis/getById', id).then(() => {
// this.$refs.editModal._open(this.$store.state.FoodJudgeBasis.model)
// })
} else {
// 添加
this.$refs.editModal._open()
}
},
_getById: async function(id) {
const result = await meterAptitude.getById(id)
if (result) {
this.$refs.editModal._open(result)
}
},
// 导入
_import() {
const data = {
importUrl:
'/food/v1/food_aptitude_judge_basis/food_aptitude_judge_import',
downloadUrl: '/food/v1/excel/template/FoodAptitudeJudgeBasis',
title: '导入检验方法管理'
}
this.$refs.sampleModal._open(data)
},
// 导出
_export() {
console.log('.this.selectIds', this.selectIds)
if (this.selectIds.length === 0) {
this.$Message.warning('请选择需要导出的数据')
} else {
const content = '确定导出 ' + this.selectIds.length + ' 条记录？'
this.$Modal.confirm({
title: '提示',
content: content,
onOk: () => {
// eslint-disable-next-line no-undef
http.open(
'/food/v1/food_aptitude_judge_basis/food_aptitude_judge_export?ids=' +
this.selectIds
)
}
})
}
} }
} }
} }
......
pages/meter-review/MeterReviewEntrust.vue
...@@ -8,11 +8,14 @@ ...@@ -8,11 +8,14 @@
<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" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</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.contractCode" @on-enter="_formSearch" name="contractCode" placeholder="请输入合同编号" clearable/>
</Form-item>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托编号" clearable/>
</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>
...@@ -104,8 +107,9 @@ export default { ...@@ -104,8 +107,9 @@ export default {
} }
], ],
formObj: { formObj: {
name: undefined, client: undefined,
aptitude: undefined contractCode: undefined,
entrustCode: undefined
}, },
selectIds: [], selectIds: [],
getPage: {}, getPage: {},
...@@ -113,6 +117,7 @@ export default { ...@@ -113,6 +117,7 @@ export default {
{ title: '委托单位', key: 'client', width: 200 }, { title: '委托单位', key: 'client', width: 200 },
{ title: '联系人', key: 'person', width: 120 }, { title: '联系人', key: 'person', width: 120 },
{ title: '委托编号', key: 'entrustCode', width: 120 }, { title: '委托编号', key: 'entrustCode', width: 120 },
{ title: '合同编号', key: 'contractCode', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 }, { title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 }, { title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 }, { title: '详细地址', key: 'address', width: 250 },
...@@ -120,7 +125,6 @@ export default { ...@@ -120,7 +125,6 @@ export default {
{ title: 'E-mail', key: 'email', width: 120 }, { title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 }, { title: '委托日期', key: 'edate', width: 120 },
{ title: '费用合计', key: 'fee', width: 120 }, { title: '费用合计', key: 'fee', width: 120 },
{ title: '合同号', key: 'contractCode', width: 120 },
{ title: '备注', key: 'remark' } { title: '备注', key: 'remark' }
] ]
} }
...@@ -232,22 +236,6 @@ export default { ...@@ -232,22 +236,6 @@ export default {
// 管理样品 // 管理样品
this.$refs.meterSampleManageModal._open(data) this.$refs.meterSampleManageModal._open(data)
}, },
_componentResult(data, msg) {
switch (this.currentComponent) {
case 'FoodContractCompanyEdit':
this._page()
break
case 'FoodContractGovernEdit':
this._page()
break
case 'FoodContractCompanyEditByDLTB':
this._page()
break
case 'FoodContractCompanyEditByHES':
this._page()
break
}
},
_record(id) { _record(id) {
this.$refs.operation._open(id) this.$refs.operation._open(id)
}, },
......
router/meter-routes.js
...@@ -35,6 +35,7 @@ import MeterContractReviewIndex from '../pages/meter-contract/contract-review/Me ...@@ -35,6 +35,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 MeterOutSampleProgress from '../pages/meter-progress/out-progress-sample/MeterOutSampleProgress' import MeterOutSampleProgress from '../pages/meter-progress/out-progress-sample/MeterOutSampleProgress'
import MeterEntrustProgress from '../pages/meter-progress/progress-entrust/MeterEntrustProgress'
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 MeterMeterWarehouseInIndex from '../pages/meter-warehouse/warehouse-in/MeterMeterWarehouseInIndex'
import MeterMeterWarehouseOutIndex from '../pages/meter-warehouse/warehouse-out/MeterMeterWarehouseOutIndex' import MeterMeterWarehouseOutIndex from '../pages/meter-warehouse/warehouse-out/MeterMeterWarehouseOutIndex'
...@@ -225,17 +226,17 @@ export default [ ...@@ -225,17 +226,17 @@ export default [
{ {
path: 'contract_register', path: 'contract_register',
component: MeterContractRegisterIndex, component: MeterContractRegisterIndex,
meta: { title: '' } meta: { title: '合同登记' }
}, },
{ {
path: 'contract_review', path: 'contract_review',
component: MeterContractReviewIndex, component: MeterContractReviewIndex,
meta: { title: '' } meta: { title: '合同评审' }
}, },
{ {
path: 'contract_file', path: 'contract_file',
component: MeterContractFileIndex, component: MeterContractFileIndex,
meta: { title: '' } meta: { title: '合同档案' }
} }
] ]
}, },
...@@ -252,6 +253,11 @@ export default [ ...@@ -252,6 +253,11 @@ export default [
path: 'out_sample_progress', path: 'out_sample_progress',
component: MeterOutSampleProgress, component: MeterOutSampleProgress,
meta: { title: '出检样品进度' } meta: { title: '出检样品进度' }
},
{
path: 'entrust_progress',
component: MeterEntrustProgress,
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