Skip to content

P
patzn-cloud-web-back-soil
Commit 6f0ac2d3 by wangweidong
Options

优化修改

parent e5235d8a
Showing with 157 additions and 90 deletions
api/meter/meter-entrust.js
......@@ -28,6 +28,11 @@ export default {
.post('meter/v1/entrust/page_distribute_entrust', data)
.then(res => res),
pageDistributeEntrustHis: data =>
http
.post('meter/v1/entrust/page_distribute_entrust_his', data)
.then(res => res),
pageGoOutEntrust: data =>
http.post('meter/v1/entrust/page_out_draft_entrust', data).then(res => res),
pageClientOnlineEntrust: data =>
......@@ -42,6 +47,10 @@ export default {
http
.post('meter/v1/entrust/page_out_task_distribute', data)
.then(res => res),
pageOutTaskDistributeHis: data =>
http
.post('meter/v1/entrust/page_out_task_distribute_his', data)
.then(res => res),
pageEntrustReview: data =>
http.post('meter/v1/entrust/page_review_entrust', data).then(res => res),
pageEntrustReceive: data =>
......
api/meter/meter-sample.js
......@@ -20,7 +20,10 @@ export default {
pageSampleDistribute: data =>
http.post('meter/v1/sample/page_sample_distribute', data).then(res => res),
pageSampleDistributeHis: data =>
http
.post('meter/v1/sample/page_sample_distribute_his', data)
.then(res => res),
pageSampleFlow: data =>
http.post('meter/v1/sample/page_sample_flow', data).then(res => res),
......@@ -47,6 +50,8 @@ export default {
.then(res => res),
pageOutDistribute: data =>
http.post('meter/v1/sample/page_distribute', data).then(res => res),
pageOutDistributeHis: data =>
http.post('meter/v1/sample/page_distribute_his', data).then(res => res),
pageOutPersonalTask: data =>
http.post('meter/v1/sample/page_out_personal_task', data).then(res => res),
......@@ -171,6 +176,18 @@ export default {
)
.then(res => res),
distributeAgain: data =>
http
.post(
'meter/v1/sample/distribute_again?ids=' +
data.ids +
'&user=' +
data.user +
'&userId=' +
data.userId
)
.then(res => res),
reportCheckBack: data =>
http
.post(
......
pages/meter-entrust/go-out-test/MeterGoOutEntrust.vue
......@@ -6,24 +6,24 @@
<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.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
<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" @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托单号" clearable/>
<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>
<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">
......@@ -77,6 +77,11 @@ export default {
{
type: 'success',
id: '',
name: '提交评审'
},
{
type: 'success',
id: '',
name: '提交'
}
],
......@@ -143,15 +148,39 @@ export default {
case '添加':
this._editModal(false)
break
case '提交':
case '提交评审':
this._submitToReview()
break
case '提交':
this._submitToSkipReview()
break
case 'search':
this.searchOpen = !this.searchOpen
break
}
})
},
_submitToSkipReview() {
const ids = this.selectIds
if (ids.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$Modal.confirm({
title: '提示',
content: '确定要提交 ' + ids.length + ' 条记录？',
onOk: () => {
this._subToSkipRe(ids)
}
})
}
},
_subToSkipRe: async function(ids) {
const result = await meterEntrust.submitSkipReview(ids)
if (result) {
this._resultChange('提交成功')
}
},
_submitToReview() {
this._submitByContractIds('委托评审')
},
......@@ -164,15 +193,20 @@ export default {
title: '提示',
content: '确定要把这 ' + ids.length + ' 条记录提交到' + cont + '？',
onOk: () => {
const result = meterEntrust.submit(ids)
if (result) {
this.$Message.warning('提交成功！')
this._page()
}
this._submitOutReview(ids)
}
})
}
},
_submitOutReview: async function(ids) {
const result = await meterEntrust.submit(ids)
if (result) {
this.$Message.warning('提交成功！')
await this._page()
}
},
_sampleManage(data) {
// 管理样品
this.$refs.meterSampleManageModal._open(data)
......
pages/meter-entrust/go-out-test/MeterGoOutOperation.vue
......@@ -64,8 +64,8 @@ export default {
{ title: '责任人', key: 'liable', width: 80 }
],
formObj: {
origin: '',
contractId: ''
origin: undefined,
entrustId: ''
}
}
},
......@@ -77,7 +77,7 @@ export default {
methods: {
_open(contractId) {
this.showModal = true
this.formObj.contractId = contractId
this.formObj.entrustId = contractId
this.formObj.origin = ''
this._page()
},
......
pages/meter-entrust/send-test/MeterSendEntrust.vue
......@@ -34,7 +34,9 @@
: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.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
<span v-if="item.status">{{scope.row[item.key].display}}</span>
<span v-else>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
</PTVXETable>
......@@ -109,6 +111,7 @@ export default {
{ title: '委托单位', key: 'client', width: 200 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '委托编号', key: 'entrustCode', width: 120 },
{ title: '状态', key: 'progress', width: 120, status: true },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
......
pages/meter-entrust/send-test/MeterSendOperation.vue
......@@ -65,7 +65,7 @@ export default {
],
formObj: {
origin: '',
contractId: ''
entrustId: ''
}
}
},
......@@ -77,7 +77,7 @@ export default {
methods: {
_open(contractId) {
this.showModal = true
this.formObj.contractId = contractId
this.formObj.entrustId = contractId
this.formObj.origin = ''
this._page()
},
......
pages/meter-out/task-distribute/MeterOutTaskDistribute.vue
......@@ -90,12 +90,13 @@ export default {
selectIds: [],
getPage: {},
pageColumns: [
{ title: '委托单位', key: 'client', width: 200 },
{ title: '委托单位', key: 'client', width: 140 },
{ title: '委托编号', key: 'entrustCode', width: 120 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '邮编', key: 'postcode' },
{ title: '邮编', key: 'postcode', width: 110 },
{ title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 },
{ title: '费用合计', key: 'fee', width: 120 },
......
pages/meter-out/task-distribute/MeterOutTaskDistributeHis.vue
......@@ -6,24 +6,24 @@
<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.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>
<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">
......@@ -45,42 +45,38 @@
</Row>
</div>
</div>
<FileManage ref="FileManage" @on-result-change="_page"></FileManage>
<MeterOutTaskAlloca ref="taskAllocaModal" @on-result-change="_page"></MeterOutTaskAlloca>
<MeterOutTaskOperation ref="operationModal" @on-result-change="_page"></MeterOutTaskOperation>
</div>
</template>
<script>
import { meterEntrust } from '../../../api'
import MeterOutTaskAlloca from './MeterOutTaskAllocaHis'
import MeterOutTaskOperation from './MeterOutTaskOperation'
export default {
components: {},
components: {
MeterOutTaskAlloca,
MeterOutTaskOperation
},
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: '提交'
}
],
searchOpen: true,
btn: [],
iconMsg: [
// {
// type: 'md-create',
// id: '',
// name: '编辑'
// },
{
type: 'md-create',
type: 'ios-contact',
id: '',
name: '编辑'
},
{
type: 'ios-beaker',
id: '',
name: '管理样品'
name: '任务分配'
},
{ type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' },
{
type: 'ios-clock',
id: '',
......@@ -88,13 +84,14 @@ export default {
}
],
formObj: {
name: undefined,
aptitude: undefined
client: undefined,
entrustCode: undefined
},
selectIds: [],
getPage: {},
pageColumns: [
{ title: '委托单位', key: 'client', width: 200 },
{ title: '委托单位', key: 'client', width: 140 },
{ title: '委托编号', key: 'entrustCode', width: 120 },
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
......@@ -161,6 +158,9 @@ export default {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '任务分配':
this._taskAllocaModal(data)
break
case '编辑':
this._editModal(true, data.id)
break
......@@ -179,8 +179,12 @@ export default {
}
})
},
_taskAllocaModal(data) {
// 管理样品
this.$refs.taskAllocaModal._open(data.id)
},
_record(id) {
this.$refs.refModal._open(id)
this.$refs.operationModal._open(id)
},
_tableResultChange(msg, data) {
switch (msg) {
......@@ -201,7 +205,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 meterEntrust.pageOutTaskDistributeHis(this.formObj)
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = result
......@@ -237,7 +241,7 @@ 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)
......
pages/meter-out/task-distribute/MeterOutTaskOperation.vue
......@@ -65,7 +65,7 @@ export default {
],
formObj: {
origin: '',
contractId: ''
entrustId: ''
}
}
},
......@@ -77,8 +77,8 @@ export default {
methods: {
_open(contractId) {
this.showModal = true
this.formObj.contractId = contractId
this.formObj.origin = ''
this.formObj.entrustId = contractId
this.formObj.origin = undefined
this._page()
},
_page: async function() {
......
pages/meter-send/task-distribute/MeterTaskDistribute.vue
......@@ -65,19 +65,19 @@ export default {
data() {
return {
currentComponent: '',
formId: 'meterSubcontractorFormId',
searchOpen: false,
formId: 'meterTaskDistributeFormId',
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: [
// {
......
pages/meter-send/task-distribute/MeterTaskDistributeHis.vue
......@@ -46,7 +46,7 @@
</div>
</div>
<FileManage ref="FileManage"></FileManage>
<MeterOutTaskAlloca ref="taskAllocaModal" @on-result-change="_page"></MeterOutTaskAlloca>
<MeterTaskAlloca ref="taskAllocaModal" @on-result-change="_page"></MeterTaskAlloca>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
<MeterOutTaskOperation ref="operationModal"></MeterOutTaskOperation>
</div>
......@@ -54,30 +54,30 @@
<script>
import { meterEntrust } from '../../../api'
import MeterSubcontractorEdit from './MeterTestEdit'
import MeterOutTaskAlloca from './MeterTaskAlloca'
import MeterTaskAlloca from './MeterTaskAllocaHis'
import MeterOutTaskOperation from './MeterTaskOperation'
export default {
components: {
MeterSubcontractorEdit,
MeterOutTaskAlloca,
MeterTaskAlloca,
MeterOutTaskOperation
},
data() {
return {
currentComponent: '',
formId: 'meterSubcontractorFormId',
searchOpen: false,
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: 'meter-go-out-entrust-add-btn',
// name: '添加'
// },
// {
// type: 'success',
// id: 'meter-go-out-entrust-submit-btn',
// name: '提交'
// }
],
iconMsg: [
// {
......@@ -88,7 +88,7 @@ export default {
{
type: 'ios-contact',
id: '',
name: '任务分配'
name: '任务分配历史'
},
{ type: 'md-cloud', id: '', name: '附件' },
// { type: 'md-remove-circle', id: '', name: '删除' },
......@@ -173,7 +173,7 @@ export default {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '任务分配':
case '任务分配历史':
this._taskAllocaModal(data)
break
case '编辑':
......@@ -219,8 +219,7 @@ export default {
},
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj)
const result = await meterEntrust.pageDistributeEntrust(this.formObj)
const result = await meterEntrust.pageDistributeEntrustHis(this.formObj)
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = 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