Skip to content

P
patzn-cloud-web-back-soil
Commit fdc7a143 by wangweidong
Options

整体优化

parent 276fdefa
Showing with 1060 additions and 595 deletions
api/index.js
...@@ -34,4 +34,5 @@ export { default as meterItem } from './meter/meter-item' ...@@ -34,4 +34,5 @@ export { default as meterItem } from './meter/meter-item'
export { default as meterDevice } from './meter/meter-device' export { default as meterDevice } from './meter/meter-device'
export { default as meterContract } from './meter/meter-contract' export { default as meterContract } from './meter/meter-contract'
export { default as meterSampleQuote } from './meter/meter-sample-quote' export { default as meterSampleQuote } from './meter/meter-sample-quote'
export { default as meterRecord } from './meter/meter-record'
export { default as lmsBaseDict } from './lims/lms-base-dict' export { default as lmsBaseDict } from './lims/lms-base-dict'
api/meter/meter-contract.js
...@@ -30,6 +30,10 @@ export default { ...@@ -30,6 +30,10 @@ export default {
.then(res => res), .then(res => res),
pageContractReview: data => pageContractReview: data =>
http.post('meter/v1/contract/page_contract_review', data).then(res => res), http.post('meter/v1/contract/page_contract_review', data).then(res => res),
pageContractFile: data =>
http.post('meter/v1/contract/page_contract_file', data).then(res => res),
submitQuoteFirstReview: data => submitQuoteFirstReview: data =>
http http
.post('meter/v1/contract/submit_to_review_first?ids=' + data) .post('meter/v1/contract/submit_to_review_first?ids=' + data)
...@@ -120,5 +124,21 @@ export default { ...@@ -120,5 +124,21 @@ export default {
addQuote: data => addQuote: data =>
https https
.post('meter/v1/contract/add_quote', JSON.stringify(data)) .post('meter/v1/contract/add_quote', JSON.stringify(data))
.then(res => res) .then(res => res),
addContractRegister: data =>
https
.post('meter/v1/contract/add_contract_register', JSON.stringify(data))
.then(res => res),
passContractReview: data =>
http.post('meter/v1/contract/pass_contract_review', data).then(res => res),
contractReviewBack: data =>
http.post('meter/v1/contract/contract_review_back', data).then(res => res),
getReviewById: data =>
http.get('meter/v1/contract/review/' + data).then(res => res),
getReviewRecordById: data =>
http.get('meter/v1/contract/review_record/' + data).then(res => res)
} }
api/meter/meter-record.js 0 → 100644
/**
* 工作台
*/
import http from '../http'
export default {
// page
pageContractRecord: data =>
http.post('meter/v1/contract_record/page', data).then(res => res)
}
api/meter/meter-sample.js
...@@ -50,6 +50,8 @@ export default { ...@@ -50,6 +50,8 @@ export default {
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 =>
http.post('meter/v1/sample/page_certificate_check', data).then(res => res), http.post('meter/v1/sample/page_certificate_check', data).then(res => res),
pageCertificateIssue: data =>
http.post('meter/v1/sample/page_certificate_issue', data).then(res => res),
getById: data => http.get('meter/v1/sample/' + data).then(res => res), getById: data => http.get('meter/v1/sample/' + data).then(res => res),
reportPreview: data => reportPreview: data =>
http http
...@@ -62,6 +64,10 @@ export default { ...@@ -62,6 +64,10 @@ export default {
https https
.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),
saveSampleEnv: data =>
http
.put('meter/v1/sample/save_sample_env/' + data.ids, data.obj)
.then(res => res),
// 取消分包 // 取消分包
subpackageCancel: data => subpackageCancel: data =>
http http
......
pages/meter-business/quote-register/MeterQuoteRegisterOperation.vue → pages/meter-business/MeterContractRecord.vue
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
/** /**
* 操作日志-委托 * 操作日志-委托
*/ */
import { meterEntrust } from '../../../api' import { meterRecord } from '../../api'
export default { export default {
data() { data() {
return { return {
...@@ -58,13 +58,12 @@ export default { ...@@ -58,13 +58,12 @@ export default {
{ title: '操作类型', key: 'type', width: 80 }, { title: '操作类型', key: 'type', width: 80 },
{ title: '操作阶段', key: 'origin', width: 120 }, { title: '操作阶段', key: 'origin', width: 120 },
{ title: '目标阶段', key: 'target', width: 120 }, { title: '目标阶段', key: 'target', width: 120 },
{ title: '操作人', key: 'operator', width: 80 }, { title: '操作人', key: 'operator', width: 120 },
{ title: '操作时间', key: 'ctime', width: 150 }, { title: '操作时间', key: 'ctime', width: 180 },
{ title: '操作原因', key: 'remark' }, { title: '操作原因', key: 'remark' },
{ title: '责任人', key: 'liable', width: 80 } { title: '责任人', key: 'liable', width: 80 }
], ],
formObj: { formObj: {
origin: '',
contractId: '' contractId: ''
} }
} }
...@@ -78,13 +77,12 @@ export default { ...@@ -78,13 +77,12 @@ export default {
_open(contractId) { _open(contractId) {
this.showModal = true this.showModal = true
this.formObj.contractId = contractId this.formObj.contractId = contractId
this.formObj.origin = ''
this._page() this._page()
}, },
_page: async function() { _page: async function() {
console.log('要传的参数') console.log('要传的参数')
console.log(this.formObj) console.log(this.formObj)
const result = await meterEntrust.pageOutTaskOperation(this.formObj) const result = await meterRecord.pageContractRecord(this.formObj)
console.log(result) console.log(result)
if (result) { if (result) {
this.getPage = result this.getPage = result
......
pages/meter-business/MeterSampleQuoteManage.vue
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</Col> </Col>
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage" <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
:icon-msg="iconMsg" select-data @on-result-change="_tableResultChange"> 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"
...@@ -43,11 +43,15 @@ ...@@ -43,11 +43,15 @@
{{scope.row[item.key]===1?'是':'否'}} {{scope.row[item.key]===1?'是':'否'}}
</div> </div>
<div v-else-if="item.key==='type'"> <div v-else-if="item.key==='type'">
<Select v-model="scope.row.type"> <span v-if="scope.row[item.key]==='0'">
<Option v-for="(item,index) in options" :key="item.name" :value="index"> 检定
{{ item.name }} </span>
</Option> <span v-if="scope.row[item.key]==='1'">
</Select> 校准
</span>
<span v-if="scope.row[item.key]==='2'">
外观检查
</span>
</div> </div>
<div v-else>{{scope.row[item.key]}}</div> <div v-else>{{scope.row[item.key]}}</div>
</template> </template>
...@@ -71,33 +75,25 @@ export default { ...@@ -71,33 +75,25 @@ export default {
return { return {
currentComponent: '', currentComponent: '',
searchOpen: true, searchOpen: true,
// btn: [ // // ],
// {type: 'success', id: '', name: '添加', componentName: 'FoodSampleGovernEdit'}, // iconMsg: [
// {id: 'food-gov-sample-batch-add', name: '批量添加', componentName: 'FoodSampleGovernBatchAdd'}, // { type: 'compose', id: '', name: '编辑' },
// {id: '', name: '导入样品', componentName: 'FoodImportSample'}, // { type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
// {id: '', name: '导入检测项目', componentName: 'RelItem'}, // { type: 'trash-a', id: '', name: '删除' }
// {id: '', name: '导入检测项目包', componentName: 'RelItemPackage'},
// {id: '', name: '复制历史样品检测项目', componentName: 'CopyHisItem'},
// {id: '', name: '删除'},
// ], // ],
iconMsg: [
{ type: 'compose', id: '', name: '编辑' },
{ type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
{ type: 'trash-a', id: '', name: '删除' }
],
btn: [ btn: [
{ // {
// meter-review-entrust-pass-btn // // meter-review-entrust-pass-btn
type: 'success', // type: 'success',
id: '', // id: '',
name: '分包' // name: '分包'
}, // },
// meter-review-entrust-back-btn // // meter-review-entrust-back-btn
{ // {
type: 'success', // type: 'success',
id: '', // id: '',
name: '取消分包' // name: '取消分包'
} // }
], ],
options: [ options: [
{ {
...@@ -117,13 +113,17 @@ export default { ...@@ -117,13 +113,17 @@ export default {
selectData: [], selectData: [],
getPage: {}, getPage: {},
pageColumns: [ pageColumns: [
{ title: '样品编号', key: 'code', detail: true, width: 120 }, { title: '名称', key: 'name', width: 160 },
{ title: '样品名称', key: 'name', width: 140 }, { title: '型号', key: 'spec' },
{ title: '型号规格', key: 'spec', width: 140 }, { title: '数量', key: 'quantity' },
{ title: '出厂编号', key: 'factoryNumber', width: 140 }, { title: '技术参数', key: 'technicalParameter' },
{ title: '是否分包', key: 'jobOut', width: 110 }, { title: '生产厂家', key: 'manufacturer' },
{ title: '检测类型', key: 'type', width: 140 }, { title: '出厂编号', key: 'factoryNumber' },
{ title: '数量', key: 'quantity', width: 140 } { title: '上次检定校准日期', key: 'lastTime', date: true },
{ title: '收费单位', key: 'unit' },
{ title: '单价/元', key: 'price' },
{ title: '总价/元', key: 'totalPrice' },
{ title: '备注', key: 'remark' }
], ],
dateList: [], dateList: [],
formObj: { formObj: {
......
pages/meter-business/accepted/MeterContractAccepted.vue
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row[item.key]}}</span> <div v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</div>
<span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
...@@ -46,14 +47,14 @@ ...@@ -46,14 +47,14 @@
</div> </div>
</div> </div>
<Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason> <Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason>
<MeterSampleManage ref="meterSampleManageModal" @on-result-change="_componentResult"></MeterSampleManage> <MeterSampleManage ref="meterSampleManageModal" @on-result-change="_page"></MeterSampleManage>
<MeterEntrustDetail ref="meterSampleEdit" @on-result-change="_componentResult"></MeterEntrustDetail> <MeterEntrustDetail ref="meterSampleEdit" @on-result-change="_componentResult"></MeterEntrustDetail>
<Operation ref="operation"></Operation> <Operation ref="operation"></Operation>
</div> </div>
</template> </template>
<script> <script>
import { meterContract, meterEntrust, meterSubcontractor } from '../../../api' import { meterContract, meterSubcontractor } from '../../../api'
import Operation from '../../../components/operation/Operation' import Operation from '../MeterContractRecord'
import Reason from '../../../components/base/Reason' import Reason from '../../../components/base/Reason'
import MeterSampleManage from '../MeterSampleQuoteManage' import MeterSampleManage from '../MeterSampleQuoteManage'
import MeterEntrustDetail from './MeterContractAcceptedDetail' import MeterEntrustDetail from './MeterContractAcceptedDetail'
...@@ -66,12 +67,10 @@ export default { ...@@ -66,12 +67,10 @@ export default {
searchOpen: false, searchOpen: false,
btn: [ btn: [
{ {
// meter-review-entrust-pass-btn
type: 'success', type: 'success',
id: '', id: '',
name: '通过' name: '通过'
}, },
// meter-review-entrust-back-btn
{ {
type: 'success', type: 'success',
id: '', id: '',
...@@ -107,11 +106,10 @@ export default { ...@@ -107,11 +106,10 @@ export default {
{ title: '联系人', key: 'person', width: 120 }, { title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 }, { title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 }, { title: '传真', key: 'fax', width: 120 },
{ title: '邮编', key: 'postcode' }, { title: '要求完成时间', key: 'odate', width: 120, date: true },
{ title: 'E-mail', key: 'email', width: 120 }, { title: '折扣', key: 'discount', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 }, { title: '总价', key: 'totalPrice', width: 120 },
{ title: '费用合计', key: 'fee', width: 120 }, { title: '折扣价', key: 'discountPrice', width: 120 },
{ title: '合同号', key: 'contractCode', width: 120 },
{ title: '备注', key: 'remark' } { title: '备注', key: 'remark' }
] ]
} }
...@@ -132,19 +130,6 @@ export default { ...@@ -132,19 +130,6 @@ export default {
_detailModal(data) { _detailModal(data) {
console.log(data) console.log(data)
this.$refs.meterSampleEdit._open(data) this.$refs.meterSampleEdit._open(data)
// 查看
// this.$store.dispatch('FoodContract/getById', data.id).then(() => {
// if (data.type === 0) {
// // 企业委托 ’0‘
// this.currentComponent = 'FoodContractCompanyDetail'
// } else {
// // 政府委托 ’1‘
// this.currentComponent = 'FoodContractGovernDetail'
// }
// this.$nextTick(() => {
// this.$refs.refModal._open(this.$store.state.FoodContract.model)
// })
// })
}, },
_modalResult() { _modalResult() {
if (this.currentComponent === 'FoodSubcontracterEdit') { if (this.currentComponent === 'FoodSubcontracterEdit') {
...@@ -310,7 +295,7 @@ export default { ...@@ -310,7 +295,7 @@ export default {
}, },
_passEntrustReview: async function(ids) { _passEntrustReview: async function(ids) {
const result = await meterEntrust.passReview(ids) const result = await meterContract.submitToContractRegister(ids)
if (result) { if (result) {
this.$Message.success('提交成功！') this.$Message.success('提交成功！')
await this._page() await this._page()
......
pages/meter-business/quote-approval/MeterContractApproval.vue
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row[item.key]}}</span> <div v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</div>
<span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
...@@ -53,9 +54,9 @@ ...@@ -53,9 +54,9 @@
</template> </template>
<script> <script>
import { meterContract, meterSubcontractor } from '../../../api' import { meterContract, meterSubcontractor } from '../../../api'
import Operation from '../../../components/operation/Operation' import Operation from '../MeterContractRecord'
import Reason from '../../../components/base/Reason' import Reason from '../../../components/base/Reason'
import MeterSampleManage from './MeterSampleManage' import MeterSampleManage from '../MeterSampleQuoteManage'
import MeterEntrustDetail from './MeterContractApprovalDetail' import MeterEntrustDetail from './MeterContractApprovalDetail'
export default { export default {
components: { MeterSampleManage, MeterEntrustDetail, Operation, Reason }, components: { MeterSampleManage, MeterEntrustDetail, Operation, Reason },
...@@ -107,11 +108,10 @@ export default { ...@@ -107,11 +108,10 @@ export default {
{ title: '联系人', key: 'person', width: 120 }, { title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 }, { title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 }, { title: '传真', key: 'fax', width: 120 },
{ title: '邮编', key: 'postcode' }, { title: '要求完成时间', key: 'odate', width: 120, date: true },
{ title: 'E-mail', key: 'email', width: 120 }, { title: '折扣', key: 'discount', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 }, { title: '总价', key: 'totalPrice', width: 120 },
{ title: '费用合计', key: 'fee', width: 120 }, { title: '折扣价', key: 'discountPrice', width: 120 },
{ title: '合同号', key: 'contractCode', width: 120 },
{ title: '备注', key: 'remark' } { title: '备注', key: 'remark' }
] ]
} }
......
pages/meter-business/quote-check-second/MeterContractCheckSecond.vue
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row[item.key]}}</span> <div v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</div>
<span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
...@@ -53,9 +54,9 @@ ...@@ -53,9 +54,9 @@
</template> </template>
<script> <script>
import { meterContract, meterSubcontractor } from '../../../api' import { meterContract, meterSubcontractor } from '../../../api'
import Operation from '../../../components/operation/Operation' import Operation from '../MeterContractRecord'
import Reason from '../../../components/base/Reason' import Reason from '../../../components/base/Reason'
import MeterSampleManage from './MeterSampleManage' import MeterSampleManage from '../MeterSampleQuoteManage'
import MeterEntrustDetail from './MeterContractCheckDetail' import MeterEntrustDetail from './MeterContractCheckDetail'
export default { export default {
components: { MeterSampleManage, MeterEntrustDetail, Operation, Reason }, components: { MeterSampleManage, MeterEntrustDetail, Operation, Reason },
...@@ -107,11 +108,10 @@ export default { ...@@ -107,11 +108,10 @@ export default {
{ title: '联系人', key: 'person', width: 120 }, { title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 }, { title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 }, { title: '传真', key: 'fax', width: 120 },
{ title: '邮编', key: 'postcode' }, { title: '要求完成时间', key: 'odate', width: 120, date: true },
{ title: 'E-mail', key: 'email', width: 120 }, { title: '折扣', key: 'discount', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 }, { title: '总价', key: 'totalPrice', width: 120 },
{ title: '费用合计', key: 'fee', width: 120 }, { title: '折扣价', key: 'discountPrice', width: 120 },
{ title: '合同号', key: 'contractCode', width: 120 },
{ title: '备注', key: 'remark' } { title: '备注', key: 'remark' }
] ]
} }
......
pages/meter-business/quote-check-second/MeterContractCheckSecondHis.vue
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row[item.key]}}</span> <div v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</div>
<span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
......
pages/meter-business/quote-check/MeterContractCheck.vue
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row[item.key]}}</span> <div v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</div>
<span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
...@@ -53,9 +54,9 @@ ...@@ -53,9 +54,9 @@
</template> </template>
<script> <script>
import { meterContract, meterSubcontractor } from '../../../api' import { meterContract, meterSubcontractor } from '../../../api'
import Operation from '../../../components/operation/Operation' import Operation from '../MeterContractRecord'
import Reason from '../../../components/base/Reason' import Reason from '../../../components/base/Reason'
import MeterSampleManage from './MeterSampleManage' import MeterSampleManage from '../MeterSampleQuoteManage'
import MeterEntrustDetail from './MeterContractCheckDetail' import MeterEntrustDetail from './MeterContractCheckDetail'
export default { export default {
components: { MeterSampleManage, MeterEntrustDetail, Operation, Reason }, components: { MeterSampleManage, MeterEntrustDetail, Operation, Reason },
...@@ -87,7 +88,7 @@ export default { ...@@ -87,7 +88,7 @@ export default {
{ {
type: 'ios-beaker', type: 'ios-beaker',
id: '', id: '',
name: '样品管理' name: '报价样品'
}, },
{ type: 'md-cloud', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' },
{ {
...@@ -107,11 +108,10 @@ export default { ...@@ -107,11 +108,10 @@ export default {
{ title: '联系人', key: 'person', width: 120 }, { title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 }, { title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 }, { title: '传真', key: 'fax', width: 120 },
{ title: '邮编', key: 'postcode' }, { title: '要求完成时间', key: 'odate', width: 120, date: true },
{ title: 'E-mail', key: 'email', width: 120 }, { title: '折扣', key: 'discount', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 }, { title: '总价', key: 'totalPrice', width: 120 },
{ title: '费用合计', key: 'fee', width: 120 }, { title: '折扣价', key: 'discountPrice', width: 120 },
{ title: '合同号', key: 'contractCode', width: 120 },
{ title: '备注', key: 'remark' } { title: '备注', key: 'remark' }
] ]
} }
...@@ -221,6 +221,9 @@ export default { ...@@ -221,6 +221,9 @@ export default {
case '操作日志': case '操作日志':
this._record(data.id) this._record(data.id)
break break
case '报价样品':
this._manageSample(data.id)
break
} }
}) })
}, },
......
pages/meter-business/quote-register/MeterQuoteRegister.vue
...@@ -52,14 +52,16 @@ ...@@ -52,14 +52,16 @@
<FileManage ref="FileManage"></FileManage> <FileManage ref="FileManage"></FileManage>
<MeterSendOperation ref="operationModal"></MeterSendOperation> <MeterSendOperation ref="operationModal"></MeterSendOperation>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit> <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
<MeterSampleManage ref="meterSampleManageModal" @on-result-change="_page"></MeterSampleManage>
</div> </div>
</template> </template>
<script> <script>
import { meterContract, meterSubcontractor } from '../../../api' import { meterContract, meterSubcontractor } from '../../../api'
import MeterSendOperation from '../MeterContractRecord'
import MeterSampleManage from '../MeterSampleQuoteManage'
import MeterSubcontractorEdit from './MeterQuoteRegisterEdit' import MeterSubcontractorEdit from './MeterQuoteRegisterEdit'
import MeterSendOperation from './MeterQuoteRegisterOperation'
export default { export default {
components: { MeterSubcontractorEdit, MeterSendOperation }, components: { MeterSubcontractorEdit, MeterSendOperation, MeterSampleManage },
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
...@@ -87,7 +89,7 @@ export default { ...@@ -87,7 +89,7 @@ export default {
{ {
type: 'ios-beaker', type: 'ios-beaker',
id: '', id: '',
name: '资质项目' name: '报价样品'
}, },
{ type: 'md-cloud', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' }, { type: 'md-remove-circle', id: '', name: '删除' },
...@@ -134,6 +136,10 @@ export default { ...@@ -134,6 +136,10 @@ export default {
this._page() this._page()
} }
}, },
_manageSample(data) {
// 管理样品
this.$refs.meterSampleManageModal._open(data.id)
},
_btnClick(msg, componentName) { _btnClick(msg, componentName) {
this.currentComponent = componentName this.currentComponent = componentName
this.$nextTick(function() { this.$nextTick(function() {
...@@ -157,6 +163,9 @@ export default { ...@@ -157,6 +163,9 @@ export default {
case '编辑': case '编辑':
this._editModal(true, data.id) this._editModal(true, data.id)
break break
case '报价样品':
this._manageSample(data.id)
break
case '资质项目': case '资质项目':
this._itemModal(data.id) this._itemModal(data.id)
break break
...@@ -173,27 +182,25 @@ export default { ...@@ -173,27 +182,25 @@ export default {
}) })
}, },
_submitToReview() { _submitToReview() {
this._submitByContractIds('报价单初审')
},
_submitByContractIds(cont) {
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 = meterContract.submitQuoteFirstReview(ids) this._submit(ids)
if (result) {
this._resultChange('提交成功')
console.log(result)
}
// })
} }
}) })
} }
}, },
_submit: async function(ids) {
const result = await meterContract.submitQuoteFirstReview(ids)
if (result) {
this._resultChange('提交成功')
}
},
_resultChange(msg) { _resultChange(msg) {
this.$Message.success(msg) this.$Message.success(msg)
this._page() this._page()
...@@ -216,7 +223,6 @@ export default { ...@@ -216,7 +223,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.page(this.formObj) const result = await meterContract.page(this.formObj)
if (result) { if (result) {
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
......
pages/meter-business/quote-register/MeterQuoteRegisterEdit.vue
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<Input v-model="formObj.street" name="street" placeholder="请输入街道"/> <Input v-model="formObj.street" name="street" placeholder="请输入街道"/>
</Form-item> </Form-item>
<Form-item label="要求完成时间：" prop="odate" class="width-48"> <Form-item label="要求完成时间：" prop="odate" class="width-48">
<Date-picker type="date" split-panels style="width:100%;" placeholder="请选择要求完成时间" <Date-picker v-model="formObj.odate" type="date" split-panels style="width:100%;" placeholder="请选择要求完成时间"
@on-change="_ctimeChange"></Date-picker> @on-change="_ctimeChange"></Date-picker>
</Form-item> </Form-item>
<Form-item label="折扣：" prop="discount" class="width-48"> <Form-item label="折扣：" prop="discount" class="width-48">
...@@ -318,7 +318,7 @@ export default { ...@@ -318,7 +318,7 @@ export default {
console.log(data) console.log(data)
}, },
_cusNameQuery(query) { _cusNameQuery(query) {
console.log(query) this.formObj.client = query
}, },
_ctimeChange(data) { _ctimeChange(data) {
console.log('时间', data) console.log('时间', data)
...@@ -495,7 +495,7 @@ export default { ...@@ -495,7 +495,7 @@ export default {
// this._editModal(true, data.id) // this._editModal(true, data.id)
break break
case '删除': case '删除':
this._deleted(data.id) this._deleted(data)
console.log('点击了删除按钮') console.log('点击了删除按钮')
console.log(index) console.log(index)
this.getPage.records.splice(index, 1) this.getPage.records.splice(index, 1)
...@@ -601,6 +601,8 @@ export default { ...@@ -601,6 +601,8 @@ export default {
this.showModal = false this.showModal = false
}, },
_open(formObj) { _open(formObj) {
this.formObj.client = ''
this.formObj.clientId = undefined
this.showModal = true this.showModal = true
this._getList() this._getList()
this.$refs.formObj.resetFields() this.$refs.formObj.resetFields()
......
pages/meter-business/quote-register/MeterQuoteRegisterHis.vue
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row[item.key]}}</span> <div v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</div>
<span v-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
......
pages/meter-certificate/check/MeterCertificateCheck.vue
...@@ -80,22 +80,11 @@ export default { ...@@ -80,22 +80,11 @@ export default {
name: '预览' name: '预览'
}, },
{ {
type: 'md-car',
id: '',
name: '车辆管理'
},
{
type: 'ios-list-box', type: 'ios-list-box',
id: '', id: '',
name: '仪器领用' name: '仪器领用'
}, },
{ type: 'md-cloud', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' }
{ type: 'md-remove-circle', id: '', name: '删除' },
{
type: 'ios-clock',
id: '',
name: '操作日志'
}
], ],
formObj: { formObj: {
name: undefined, name: undefined,
...@@ -220,7 +209,6 @@ export default { ...@@ -220,7 +209,6 @@ export default {
this.$nextTick(function() { this.$nextTick(function() {
switch (res) { switch (res) {
case '预览': case '预览':
// this._editModal(true, data.id)
this._personModal(data) this._personModal(data)
break break
case '资质项目': case '资质项目':
...@@ -240,7 +228,6 @@ export default { ...@@ -240,7 +228,6 @@ export default {
}, },
_personModal(data) { _personModal(data) {
console.log(data) console.log(data)
// this.$refs.personModal._open(data.id)
this._previewEdit(data.id) this._previewEdit(data.id)
}, },
// 预览编辑 // 预览编辑
......
pages/meter-certificate/issue/MeterCertificateIssue.vue
...@@ -37,7 +37,18 @@ ...@@ -37,7 +37,18 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <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> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
...@@ -69,27 +80,16 @@ export default { ...@@ -69,27 +80,16 @@ export default {
], ],
iconMsg: [ iconMsg: [
{ {
type: 'md-create', type: 'ios-book',
id: '', id: '',
name: '编辑' name: '预览'
},
{
type: 'md-car',
id: '',
name: '车辆管理'
}, },
{ {
type: 'ios-list-box', type: 'ios-list-box',
id: '', id: '',
name: '仪器领用' name: '仪器领用'
}, },
{ type: 'md-cloud', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' }
{ type: 'md-remove-circle', id: '', name: '删除' },
{
type: 'ios-clock',
id: '',
name: '操作日志'
}
], ],
formObj: { formObj: {
name: undefined, name: undefined,
...@@ -102,7 +102,6 @@ export default { ...@@ -102,7 +102,6 @@ export default {
{ title: '样品名称', key: 'name', width: 120 }, { title: '样品名称', key: 'name', width: 120 },
{ title: '样品编号', key: 'code', width: 120 }, { title: '样品编号', key: 'code', width: 120 },
{ title: '型号规格', key: 'spec', width: 100 }, { title: '型号规格', key: 'spec', width: 100 },
{ title: '证书是否生成', key: 'reported', width: 120 },
{ title: '出厂编号', key: 'factoryNumber' }, { title: '出厂编号', key: 'factoryNumber' },
{ title: '检测类型', key: 'type' }, { title: '检测类型', key: 'type' },
{ title: '委托单位', key: 'client', width: 200 }, { title: '委托单位', key: 'client', width: 200 },
...@@ -184,13 +183,10 @@ export default { ...@@ -184,13 +183,10 @@ export default {
this.currentComponent = componentName this.currentComponent = componentName
this.$nextTick(function() { this.$nextTick(function() {
switch (res) { switch (res) {
case '编辑': case '预览':
// this._editModal(true, data.id) // this._editModal(true, data.id)
this._personModal(data) this._personModal(data)
break break
case '资质项目':
this._itemModal(data.id)
break
case '附件': case '附件':
this._upload(data.id) this._upload(data.id)
break break
...@@ -204,8 +200,18 @@ export default { ...@@ -204,8 +200,18 @@ export default {
}) })
}, },
_personModal(data) { _personModal(data) {
console.log(data) this._previewEdit(data.id)
this.$refs.personModal._open(data.id) },
// 预览编辑
async _previewEdit(id) {
const result = await meterSample.reportPreview(id)
if (result) {
this.$openWindowModeless({
objectKey: result.objectKey,
id: id,
isReport: 0
})
}
}, },
_record(id) { _record(id) {
this.$refs.operationModal._open(id) this.$refs.operationModal._open(id)
...@@ -234,8 +240,7 @@ export default { ...@@ -234,8 +240,7 @@ 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.pageCertificateIssue(this.formObj)
const result = await meterSample.pageCertificateMake(this.formObj)
if (result) { if (result) {
this.$refs.pageTable._hideLoading() this.$refs.pageTable._hideLoading()
this.getPage = result this.getPage = result
......
pages/meter-certificate/make/MeterCertificateMake.vue
...@@ -99,18 +99,13 @@ export default { ...@@ -99,18 +99,13 @@ export default {
id: '', id: '',
name: '车辆管理' name: '车辆管理'
}, },
{ { type: 'md-cloud', id: '', name: '附件' }
type: 'ios-list-box', // { type: 'md-remove-circle', id: '', name: '删除' },
id: '', // {
name: '仪器领用' // type: 'ios-clock',
}, // id: '',
{ type: 'md-cloud', id: '', name: '附件' }, // name: '操作日志'
{ type: 'md-remove-circle', id: '', name: '删除' }, // }
{
type: 'ios-clock',
id: '',
name: '操作日志'
}
], ],
formObj: { formObj: {
name: undefined, name: undefined,
......
pages/meter-contract/contract-register/MeterContractRegisterOperation.vue → pages/meter-contract/MeterContractReviewOperation.vue
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
/** /**
* 操作日志-委托 * 操作日志-委托
*/ */
import { meterEntrust } from '../../../api' import { meterRecord } from '../../api'
export default { export default {
data() { data() {
return { return {
...@@ -58,13 +58,12 @@ export default { ...@@ -58,13 +58,12 @@ export default {
{ title: '操作类型', key: 'type', width: 80 }, { title: '操作类型', key: 'type', width: 80 },
{ title: '操作阶段', key: 'origin', width: 120 }, { title: '操作阶段', key: 'origin', width: 120 },
{ title: '目标阶段', key: 'target', width: 120 }, { title: '目标阶段', key: 'target', width: 120 },
{ title: '操作人', key: 'operator', width: 80 }, { title: '操作人', key: 'operator', width: 120 },
{ title: '操作时间', key: 'ctime', width: 150 }, { title: '操作时间', key: 'ctime', width: 180 },
{ title: '操作原因', key: 'remark' }, { title: '操作原因', key: 'remark' },
{ title: '责任人', key: 'liable', width: 80 } { title: '责任人', key: 'liable', width: 80 }
], ],
formObj: { formObj: {
origin: '',
contractId: '' contractId: ''
} }
} }
...@@ -78,13 +77,12 @@ export default { ...@@ -78,13 +77,12 @@ export default {
_open(contractId) { _open(contractId) {
this.showModal = true this.showModal = true
this.formObj.contractId = contractId this.formObj.contractId = contractId
this.formObj.origin = ''
this._page() this._page()
}, },
_page: async function() { _page: async function() {
console.log('要传的参数') console.log('要传的参数')
console.log(this.formObj) console.log(this.formObj)
const result = await meterEntrust.pageOutTaskOperation(this.formObj) const result = await meterRecord.pageContractRecord(this.formObj)
console.log(result) console.log(result)
if (result) { if (result) {
this.getPage = result this.getPage = result
......
pages/meter-contract/MeterSampleQuoteManage.vue
...@@ -40,11 +40,15 @@ ...@@ -40,11 +40,15 @@
{{scope.row[item.key]===1?'是':'否'}} {{scope.row[item.key]===1?'是':'否'}}
</div> </div>
<div v-else-if="item.key==='type'"> <div v-else-if="item.key==='type'">
<Select v-model="scope.row.type"> <span v-if="scope.row[item.key]===0">
<Option v-for="(item,index) in options" :key="item.name" :value="index"> 检定
{{ item.name }} </span>
</Option> <span v-if="scope.row[item.key]===1">
</Select> 校准
</span>
<span v-if="scope.row[item.key]===2">
外观检查
</span>
</div> </div>
<div v-else>{{scope.row[item.key]}}</div> <div v-else>{{scope.row[item.key]}}</div>
</template> </template>
......
pages/meter-contract/contract-file/MeterContractFile.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.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-item" label="资质:">
<Input v-model="formObj.aptitude" name="aptitude" 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.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
<span v-else>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</div>
</div>
<FileManage ref="FileManage"></FileManage>
<Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason>
<MeterSendOperation ref="operationModal"></MeterSendOperation>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
<MeterSubcontractorAddEdit ref="addEditModal" @on-result-change="_page"></MeterSubcontractorAddEdit>
<MeterSampleManage ref="meterSampleManageModal" @on-result-change="_page"></MeterSampleManage>
</div>
</template>
<script>
import { meterContract, meterSubcontractor } from '../../../api'
import Reason from '../../../components/base/Reason'
import MeterSendOperation from '../MeterContractReviewOperation'
import MeterSampleManage from '../MeterSampleQuoteManage'
import MeterSubcontractorEdit from './MeterContractFileEdit'
import MeterSubcontractorAddEdit from './MeterContractReviewAddEdit'
export default {
components: {
MeterSubcontractorEdit,
MeterSendOperation,
MeterSubcontractorAddEdit,
MeterSampleManage,
Reason
},
data() {
return {
currentComponent: '',
formId: 'meterContractReviewFormId',
searchOpen: false,
btn: [
// {
// type: 'success',
// id: '',
// name: '评审'
// },
// {
// type: 'success',
// id: '',
// name: '驳回'
// }
],
iconMsg: [
{
type: 'md-create',
id: '',
name: '评审记录'
},
{
type: 'ios-beaker',
id: '',
name: '样品管理'
},
{ type: 'md-cloud', 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: 'odate', width: 120, date: true },
{ title: '折扣', key: 'discount', width: 120 },
{ title: '总价', key: 'totalPrice', width: 120 },
{ title: '折扣价', key: 'discountPrice', width: 120 },
{ title: '备注', key: 'remark' }
]
}
},
computed: {
tableHeight: function() {
if (this.searchOpen) {
return this.$tableHeight('search')
} else {
return this.$tableHeight('noSearch')
}
}
},
mounted() {
this._page()
},
methods: {
_modalResult() {
if (this.currentComponent === 'FoodSubcontracterEdit') {
this._page()
}
},
_btnClick(msg, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (msg) {
case '评审记录':
this._reviewContract(false)
break
case '驳回':
this._goBack()
break
case '提交':
this._submitToReview()
break
case 'search':
this.searchOpen = !this.searchOpen
break
}
})
},
_goBack() {
// 退回
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条委托！')
} else {
this.$refs.reasonModal._open('退回原因')
}
},
// _reportCheckBack: async function(data) {
// const result = await meterContract.checkSecond({
// ids: this.selectIds,
// remark: data
// })
//
// if (result) {
// this.$Message.success('退回成功！')
// await this._page()
// }
// },
_reasonResult(data) {
if (undefined !== data && data !== '') {
// this._reportCheckBack(data)
console.log('退回')
}
console.log(data)
},
_manageSample(data) {
// 管理样品
this.$refs.meterSampleManageModal._open(data.id)
},
_iconClick(res, data, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '评审记录':
this._reviewContract(data.id)
break
case '样品管理':
this._manageSample(data.id)
break
case '附件':
this._upload(data.id)
break
case '删除':
this._deleteByIds([data.id])
break
case '操作日志':
this._record(data.id)
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 = meterContract.submitToContractReview(ids)
if (result) {
this._resultChange('提交成功')
console.log(result)
}
// })
}
})
}
},
_resultChange(msg) {
this.$Message.success(msg)
this._page()
},
_record(id) {
this.$refs.operationModal._open(id)
},
_tableResultChange(msg, data) {
switch (msg) {
case 'selectIds':
this.selectIds = data
break
case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName)
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 meterContract.pageContractFile(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)
}
})
},
// 编辑&添加
_reviewContract(id) {
this._getContractReview(id)
},
_getContractReview: async function(id) {
const result = await meterContract.getReviewRecordById(id)
if (result) {
this.$refs.addEditModal._openEdit(result)
}
},
// 追加项目
_itemModal(data) {
this.$refs.refModal._open(data)
},
_upload(id) {
// 上传文件
this.$refs.FileManage._open(id, 'subcontractorId')
},
_getById: async function(id) {
const result = await meterContract.getVOById(id)
if (result) {
this.$refs.editSubcontractorModal._openEdit(result)
}
},
_delete: async function(ids) {
const result = await meterSubcontractor.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
}
}
}
</script>
pages/meter-contract/contract-file/MeterContractFileIndex.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">
<MeterSendEntrust ref="waitTabs"></MeterSendEntrust>
</el-tab-pane>
</el-tabs>
</div>
</div>
</div>
</template>
<script>
import MeterSendEntrust from './MeterContractFile'
export default {
name: 'MeterSendEntrustIndex',
components: {
MeterSendEntrust
},
data() {
return {
activeName: 'wait'
}
}
}
</script>
<style scoped>
</style>
pages/meter-contract/contract-register/MeterContractRegister.vue
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <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-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
...@@ -48,14 +49,16 @@ ...@@ -48,14 +49,16 @@
<FileManage ref="FileManage"></FileManage> <FileManage ref="FileManage"></FileManage>
<MeterSendOperation ref="operationModal"></MeterSendOperation> <MeterSendOperation ref="operationModal"></MeterSendOperation>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit> <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
<MeterSampleManage ref="meterSampleManageModal" @on-result-change="_page"></MeterSampleManage>
</div> </div>
</template> </template>
<script> <script>
import { meterContract, meterSubcontractor } from '../../../api' import { meterContract, meterSubcontractor } from '../../../api'
import MeterSendOperation from '../MeterContractReviewOperation'
import MeterSampleManage from '../MeterSampleQuoteManage'
import MeterSubcontractorEdit from './MeterContractRegisterEdit' import MeterSubcontractorEdit from './MeterContractRegisterEdit'
import MeterSendOperation from './MeterContractRegisterOperation'
export default { export default {
components: { MeterSubcontractorEdit, MeterSendOperation }, components: { MeterSubcontractorEdit, MeterSendOperation, MeterSampleManage },
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
...@@ -82,7 +85,7 @@ export default { ...@@ -82,7 +85,7 @@ export default {
{ {
type: 'ios-beaker', type: 'ios-beaker',
id: '', id: '',
name: '资质项目' name: '样品管理'
}, },
{ type: 'md-cloud', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' }, { type: 'md-remove-circle', id: '', name: '删除' },
...@@ -103,8 +106,7 @@ export default { ...@@ -103,8 +106,7 @@ export default {
{ title: '联系人', key: 'person', width: 120 }, { title: '联系人', key: 'person', 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: 'odate', width: 120, date: true },
{ title: '要求完成时间', key: 'odate', width: 120 },
{ title: '折扣', key: 'discount', width: 120 }, { title: '折扣', key: 'discount', width: 120 },
{ title: '总价', key: 'totalPrice', width: 120 }, { title: '总价', key: 'totalPrice', width: 120 },
{ title: '折扣价', key: 'discountPrice', width: 120 }, { title: '折扣价', key: 'discountPrice', width: 120 },
...@@ -153,6 +155,9 @@ export default { ...@@ -153,6 +155,9 @@ export default {
case '编辑': case '编辑':
this._editModal(true, data.id) this._editModal(true, data.id)
break break
case '样品管理':
this._manageSample(data.id)
break
case '资质项目': case '资质项目':
this._itemModal(data.id) this._itemModal(data.id)
break break
...@@ -168,6 +173,10 @@ export default { ...@@ -168,6 +173,10 @@ export default {
} }
}) })
}, },
_manageSample(data) {
// 管理样品
this.$refs.meterSampleManageModal._open(data.id)
},
_submitToReview() { _submitToReview() {
this._submitByContractIds('合同评审') this._submitByContractIds('合同评审')
}, },
......
pages/meter-contract/contract-register/MeterContractRegisterEdit.vue
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<Input v-model="formObj.street" name="street" placeholder="请输入街道"/> <Input v-model="formObj.street" name="street" placeholder="请输入街道"/>
</Form-item> </Form-item>
<Form-item label="要求完成时间：" prop="odate" class="width-48"> <Form-item label="要求完成时间：" prop="odate" class="width-48">
<Date-picker type="date" split-panels style="width:100%;" placeholder="请选择要求完成时间" <Date-picker type="date" v-model="formObj.odate" split-panels style="width:100%;" placeholder="请选择要求完成时间"
@on-change="_ctimeChange"></Date-picker> @on-change="_ctimeChange"></Date-picker>
</Form-item> </Form-item>
<Form-item label="折扣：" prop="discount" class="width-48"> <Form-item label="折扣：" prop="discount" class="width-48">
...@@ -566,6 +566,7 @@ export default { ...@@ -566,6 +566,7 @@ export default {
this.id = formObj.id this.id = formObj.id
this.formObj = formObj this.formObj = formObj
this._showAddress(formObj) this._showAddress(formObj)
this._showTime(formObj)
this.getPage.records = formObj.sampleList this.getPage.records = formObj.sampleList
}, },
_showAddress(formObj) { _showAddress(formObj) {
...@@ -615,17 +616,21 @@ export default { ...@@ -615,17 +616,21 @@ export default {
} }
}, },
_showTime(formObj) { _showTime(formObj) {
// 回显资质类型 if (this.formObj.odate === undefined) {
this.formObj.odate = ''
} else {
this.formObj.odate = new Date(formObj.odate)
}
}, },
_save: async function(data) { _save: async function(data) {
const result = await meterContract.addQuote(data) const result = await meterContract.addContractRegister(data)
console.log(result) console.log(result)
if (result) { if (result) {
this._resultChange('添加成功!') this._resultChange('添加成功!')
} }
}, },
_edit: async function(data) { _edit: async function(data) {
const result = await meterEntrust.editDTO(data) const result = await meterContract.editDTO(data)
console.log('修改后') console.log('修改后')
console.log(result) console.log(result)
if (result) { if (result) {
......
pages/meter-contract/contract-review/EditModal.vue deleted 100644 → 0
<template>
<div>
<Modal v-model="showUserGroupModal">
<p slot="header">
{{ modalTitle }}
</p>
<Row>
<!--查询条件-->
<Col span="24">
<Form id="test-item-form" :label-width="90" inline onsubmit="return false">
<label class="label-sign" />
<Form-item :label-width="70" label="授权资质仪器名称" >
<Input
v-model="code"
placeholder="授权资质仪器名称"
style="width: 100%"
@on-enter="_pageChange(1)"
/>
</Form-item>
<Form-item label="检测依据名称">
<Input
v-model="name"
placeholder="请输入检测依据名称"
style="width: 100%"
@on-enter="_pageChange(1)"
/>
</Form-item>
</Form>
</Col>
<Col span="24" style="margin-bottom: 10px">
<el-table
:height="300"
:data="getPage"
border
size="small"
highlight-current-row
style="width: 100%"
@row-click="_rowChange"
@row-dblclick="_dbClick"
>
<el-table-column
v-for="item in pageColumns"
:key="item.key"
:prop="item.key"
:label="item.title"
:min-width="item.width"
show-overflow-tooltip
>
<template slot-scope="scope">
<span v-if="item.key==='status'">
{{ scope.row[item.key]?scope.row[item.key].display:'' }}
</span>
<span v-else>{{ scope.row[item.key] }}</span>
</template>
</el-table-column>
</el-table>
</Col>
<Col span="24">
<Page
:total="getPage.total"
:page-size="getPage.size"
placement="top"
show-total
show-elevator
show-sizer
@on-change="_pageChange"
@on-page-size-change="_pageRows"
/>
<div style="clear: both" />
</Col>
</Row>
<div slot="footer" class="btn-width">
<Button style="margin-left: 8px" @click="_cancel">
取消
</Button>
<Button type="primary" @click="_ok">
确定
</Button>
</div>
</Modal>
</div>
</template>
<script>
// import { meterAptitude } from '../../../api'
import { meterManage } from '../../../api'
export default {
name: 'EditModal',
data() {
return {
loading: true,
pageParams: { rows: 20 },
pageColumns: [
{ title: '样品名称', key: 'name' },
{ title: '检定依据', key: 'code' },
{ title: '检定依据名称', key: 'basis' }
],
getPage: [],
showUserGroupModal: false,
modalTitle: '',
currentRowData: {},
name: '',
code: ''
}
},
methods: {
_open() {
this.modalTitle = '选择检测依据'
this.name = ''
this.code = ''
this._judge()
},
_judge() {
this.showUserGroupModal = true
this.currentRowData = {}
this._page()
},
_page: async function() {
const result = await meterManage.page(this._searchParams())
if (result) {
console.log('查询结果')
console.log(result)
this.getPage = result.records
this.loading = false
console.log(this.getPage)
}
},
_pageChange(page) {
this.pageParams.page = page
this._page()
},
_pageRows(rows) {
this.pageParams.rows = rows
this._page()
},
_searchParams() {
const data = this.$serialize('test-item-form')
if (this.name) {
data.name = this.name
}
if (this.code) {
data.code = this.code
}
return this.$extend(data, this.pageParams)
},
_search() {
this._page()
},
_rowChange(data) {
this.currentRowData = data // 选中的行数据;
},
_cancel() {
this.showUserGroupModal = false
},
_ok() {
if (JSON.stringify(this.currentRowData) === '{}') {
switch (this.modalTitle) {
case '选择检测依据':
this.$Message.warning('请选择一条检测依据！')
break
}
} else {
this.$emit('on-result-change', this.currentRowData)
this.showUserGroupModal = false
}
},
// 双击
_dbClick(data, event) {
this.currentRowData = data
// 选中的行数据;
this._ok()
}
}
}
</script>
<style scoped>
</style>
pages/meter-contract/contract-review/MeterContractReview.vue
...@@ -6,24 +6,24 @@ ...@@ -6,24 +6,24 @@
<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">
...@@ -37,7 +37,8 @@ ...@@ -37,7 +37,8 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <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-else>{{scope.row[item.key]}}</span>
</template> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
...@@ -49,15 +50,15 @@ ...@@ -49,15 +50,15 @@
<Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason> <Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason>
<MeterSendOperation ref="operationModal"></MeterSendOperation> <MeterSendOperation ref="operationModal"></MeterSendOperation>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit> <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
<MeterSubcontractorAddEdit ref="addEditModal"></MeterSubcontractorAddEdit> <MeterSubcontractorAddEdit ref="addEditModal" @on-result-change="_page"></MeterSubcontractorAddEdit>
</div> </div>
</template> </template>
<script> <script>
import { meterContract, meterSubcontractor } from '../../../api' import { meterContract, meterSubcontractor } from '../../../api'
import Reason from '../../../components/base/Reason' import Reason from '../../../components/base/Reason'
import MeterSendOperation from '../MeterContractReviewOperation'
import MeterSubcontractorEdit from './MeterContractReviewEdit' import MeterSubcontractorEdit from './MeterContractReviewEdit'
import MeterSubcontractorAddEdit from './MeterContractReviewAddEdit' import MeterSubcontractorAddEdit from './MeterContractReviewAddEdit'
import MeterSendOperation from './MeterContractReviewOperation'
export default { export default {
components: { components: {
MeterSubcontractorEdit, MeterSubcontractorEdit,
...@@ -68,14 +69,14 @@ export default { ...@@ -68,14 +69,14 @@ export default {
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
formId: 'meterSubcontractorFormId', formId: 'meterContractReviewFormId',
searchOpen: false, searchOpen: false,
btn: [ btn: [
{ // {
type: 'success', // type: 'success',
id: '', // id: '',
name: '评审' // name: '评审'
}, // },
{ {
type: 'success', type: 'success',
id: '', id: '',
...@@ -86,7 +87,7 @@ export default { ...@@ -86,7 +87,7 @@ export default {
{ {
type: 'md-create', type: 'md-create',
id: '', id: '',
name: '编辑' name: '评审'
}, },
{ {
type: 'ios-beaker', type: 'ios-beaker',
...@@ -113,7 +114,7 @@ export default { ...@@ -113,7 +114,7 @@ export default {
{ 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 },
{ title: '要求完成时间', key: 'odate', width: 120 }, { title: '要求完成时间', key: 'odate', width: 120, date: true },
{ title: '折扣', key: 'discount', width: 120 }, { title: '折扣', key: 'discount', width: 120 },
{ title: '总价', key: 'totalPrice', width: 120 }, { title: '总价', key: 'totalPrice', width: 120 },
{ title: '折扣价', key: 'discountPrice', width: 120 }, { title: '折扣价', key: 'discountPrice', width: 120 },
...@@ -144,7 +145,7 @@ export default { ...@@ -144,7 +145,7 @@ export default {
this.$nextTick(function() { this.$nextTick(function() {
switch (msg) { switch (msg) {
case '评审': case '评审':
this._editModal(false) this._reviewContract(false)
break break
case '驳回': case '驳回':
this._goBack() this._goBack()
...@@ -180,16 +181,19 @@ export default { ...@@ -180,16 +181,19 @@ export default {
_reasonResult(data) { _reasonResult(data) {
if (undefined !== data && data !== '') { if (undefined !== data && data !== '') {
// this._reportCheckBack(data) // this._reportCheckBack(data)
console.log('退回')
} }
console.log(data)
}, },
// _reportCheckBack: async function(data) {
// const result =await meterContract.ba
// },
_iconClick(res, data, componentName) { _iconClick(res, data, componentName) {
this.currentComponent = componentName this.currentComponent = componentName
this.$nextTick(function() { this.$nextTick(function() {
switch (res) { switch (res) {
case '编辑': case '评审':
this._editModal(true, data.id) this._reviewContract(data.id)
break break
case '资质项目': case '资质项目':
this._itemModal(data.id) this._itemModal(data.id)
...@@ -271,16 +275,17 @@ export default { ...@@ -271,16 +275,17 @@ export default {
}) })
}, },
// 编辑&添加 // 编辑&添加
_editModal(edit, id) { _reviewContract(id) {
if (edit) { this._getContractReview(id)
// 编辑 },
// this.$refs.editSubcontractorModal._open(id)
this._getById(id) _getContractReview: async function(id) {
} else { const result = await meterContract.getReviewById(id)
// 添加 if (result) {
this.$refs.addEditModal._open() this.$refs.addEditModal._openEdit(result)
} }
}, },
// 追加项目 // 追加项目
_itemModal(data) { _itemModal(data) {
this.$refs.refModal._open(data) this.$refs.refModal._open(data)
......
pages/meter-contract/contract-review/MeterContractReviewEdit.vue
...@@ -112,7 +112,6 @@ ...@@ -112,7 +112,6 @@
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer> <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div> </div>
</Modal> </Modal>
<EditModal ref="EditModal" is-change @on-result-change="_backData" />
<importModal ref="importModal" aptitude-item @on-result-change="_inputBack"></importModal> <importModal ref="importModal" aptitude-item @on-result-change="_inputBack"></importModal>
</div> </div>
</template> </template>
...@@ -124,10 +123,8 @@ import { lmsBaseDict, meterEntrust, meterContract } from '../../../api' ...@@ -124,10 +123,8 @@ import { lmsBaseDict, meterEntrust, meterContract } from '../../../api'
import CityNameCascader from '../../../components/base/CityNameCascader' import CityNameCascader from '../../../components/base/CityNameCascader'
import AutoComplete from '../../../components/base/AutoCompletes' import AutoComplete from '../../../components/base/AutoCompletes'
import importModal from '../../../components/import/DownloadTemplateImport' import importModal from '../../../components/import/DownloadTemplateImport'
import EditModal from './EditModal'
export default { export default {
components: { CityNameCascader, EditModal, AutoComplete, importModal }, components: { CityNameCascader, AutoComplete, importModal },
data() { data() {
const validateRemark = (rule, value, callback) => { const validateRemark = (rule, value, callback) => {
if (this.testedCityData.length === 0) { if (this.testedCityData.length === 0) {
......
pages/meter-contract/contract-review/MeterContractReviewHis.vue
...@@ -164,9 +164,6 @@ export default { ...@@ -164,9 +164,6 @@ export default {
}, },
_tableResultChange(msg, data) { _tableResultChange(msg, data) {
switch (msg) { switch (msg) {
case 'page':
this.getPage = this.$store.state.FoodSubcontracter.page
break
case 'iconClick': case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName) this._iconClick(data.name, data.rowData, data.componentName)
break break
......
pages/meter-contract/contract-review/MeterContractReviewIndex.vue
...@@ -6,9 +6,6 @@ ...@@ -6,9 +6,6 @@
<el-tab-pane label="待完成" name="wait"> <el-tab-pane label="待完成" name="wait">
<MeterSendEntrust ref="waitTabs"></MeterSendEntrust> <MeterSendEntrust ref="waitTabs"></MeterSendEntrust>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="已完成" name="finish">
<MeterSendEntrustFinish ref="finishTabs"></MeterSendEntrustFinish>
</el-tab-pane>
<el-tab-pane label="历史记录" name="his"> <el-tab-pane label="历史记录" name="his">
<MeterSendEntrustHis ref="hisTabs"></MeterSendEntrustHis> <MeterSendEntrustHis ref="hisTabs"></MeterSendEntrustHis>
</el-tab-pane> </el-tab-pane>
...@@ -20,13 +17,11 @@ ...@@ -20,13 +17,11 @@
<script> <script>
import MeterSendEntrust from './MeterContractReview' import MeterSendEntrust from './MeterContractReview'
import MeterSendEntrustFinish from './MeterContractReviewFinish'
import MeterSendEntrustHis from './MeterContractReviewHis' import MeterSendEntrustHis from './MeterContractReviewHis'
export default { export default {
name: 'MeterSendEntrustIndex', name: 'MeterSendEntrustIndex',
components: { components: {
MeterSendEntrust, MeterSendEntrust,
MeterSendEntrustFinish,
MeterSendEntrustHis MeterSendEntrustHis
}, },
data() { data() {
......
pages/meter-contract/contract-review/MeterContractReviewOperation.vue deleted 100644 → 0
<template>
<div>
<Modal v-model="showModal" width="900" class="modal-footer-none zIndex-1100">
<p slot="header">操作日志</p>
<div>
<Row>
<!--查询-->
<Col span="24">
<Form id="search-contract-record" :label-width="70" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item label="操作阶段:">
<Input v-model="formObj.origin" @on-enter="_search" placeholder="请输入操作阶段"
style="width: 200px" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_search" type="primary">搜索</Button>
</Form-item>
</Form>
</Col>
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" hide-checkbox>
<vxe-table-column
:field="item.key"
:title="item.title"
:min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined"
v-for="item in pageColumns" :key="item.key">
<template slot-scope="scope">
<span v-if="item.key==='type'">
{{scope.row[item.key] === 0 ? '流转' : scope.row[item.key] === 1 ? '退回': scope.row[item.key] === 2 ?'更新' :
scope.row[item.key] === 3 ? '转发':'文件'}}
</span>
<span v-else-if="item.key==='ctime'">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):''}}</span>
<span v-else>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</div>
</Modal>
</div>
</template>
<script>
/**
* 操作日志-委托
*/
import { meterEntrust } from '../../../api'
export default {
data() {
return {
showModal: false,
getPage: {},
pageColumns: [
{ title: '操作类型', key: 'type', width: 80 },
{ title: '操作阶段', key: 'origin', width: 120 },
{ title: '目标阶段', key: 'target', width: 120 },
{ title: '操作人', key: 'operator', width: 80 },
{ title: '操作时间', key: 'ctime', width: 150 },
{ title: '操作原因', key: 'remark' },
{ title: '责任人', key: 'liable', width: 80 }
],
formObj: {
origin: '',
contractId: ''
}
}
},
computed: {
tableHeight: function() {
return this.$tableHeight('tableModal')
}
},
methods: {
_open(contractId) {
this.showModal = true
this.formObj.contractId = contractId
this.formObj.origin = ''
this._page()
},
_page: async function() {
console.log('要传的参数')
console.log(this.formObj)
const result = await meterEntrust.pageOutTaskOperation(this.formObj)
console.log(result)
if (result) {
this.getPage = result
}
// this.$refs.pageTable._page(
// 'search-contract-record',
// 'FoodContractRecord/page',
// this.$serializeFormSearch(this.formObj)
// )
},
_tableResultChange(msg, data) {
switch (msg) {
case 'page':
this.getPage = this.$store.state.FoodContractRecord.page
break
case 'changeSize':
this._page()
break
}
},
_search() {
this.$refs.pageTable._pageChange(1)
}
}
}
</script>
pages/meter-contract/contract-technology/MeterTechnologyReview.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.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-item" label="资质:">
<Input v-model="formObj.aptitude" name="aptitude" 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.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
<span v-else>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</Row>
</div>
</div>
<FileManage ref="FileManage"></FileManage>
<Reason ref="reasonModal" @on-result-change="_reasonResult"></Reason>
<MeterSendOperation ref="operationModal"></MeterSendOperation>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
<MeterSubcontractorAddEdit ref="addEditModal" @on-result-change="_page"></MeterSubcontractorAddEdit>
</div>
</template>
<script>
import { meterContract, meterSubcontractor } from '../../../api'
import Reason from '../../../components/base/Reason'
import MeterSendOperation from '../MeterContractReviewOperation'
import MeterSubcontractorEdit from './MeterTechnologyReviewEdit'
import MeterSubcontractorAddEdit from './MeterTechnologyReviewAddEdit'
export default {
components: {
MeterSubcontractorEdit,
MeterSendOperation,
MeterSubcontractorAddEdit,
Reason
},
data() {
return {
currentComponent: '',
formId: 'meterContractReviewFormId',
searchOpen: false,
btn: [
// {
// type: 'success',
// id: '',
// name: '评审'
// },
{
type: 'success',
id: '',
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: 'odate', width: 120, date: true },
{ title: '折扣', key: 'discount', width: 120 },
{ title: '总价', key: 'totalPrice', width: 120 },
{ title: '折扣价', key: 'discountPrice', width: 120 },
{ title: '备注', key: 'remark' }
]
}
},
computed: {
tableHeight: function() {
if (this.searchOpen) {
return this.$tableHeight('search')
} else {
return this.$tableHeight('noSearch')
}
}
},
mounted() {
this._page()
},
methods: {
_modalResult() {
if (this.currentComponent === 'FoodSubcontracterEdit') {
this._page()
}
},
_btnClick(msg, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (msg) {
case '评审':
this._reviewContract(false)
break
case '驳回':
this._goBack()
break
case '提交':
this._submitToReview()
break
case 'search':
this.searchOpen = !this.searchOpen
break
}
})
},
_goBack() {
// 退回
if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条委托！')
} else {
this.$refs.reasonModal._open('退回原因')
}
},
// _reportCheckBack: async function(data) {
// const result = await meterContract.checkSecond({
// ids: this.selectIds,
// remark: data
// })
//
// if (result) {
// this.$Message.success('退回成功！')
// await this._page()
// }
// },
_reasonResult(data) {
if (undefined !== data && data !== '') {
// this._reportCheckBack(data)
}
},
// _reportCheckBack: async function(data) {
// const result =await meterContract.ba
// },
_iconClick(res, data, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
switch (res) {
case '评审':
this._reviewContract(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
}
})
},
_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 = meterContract.submitToContractReview(ids)
if (result) {
this._resultChange('提交成功')
console.log(result)
}
// })
}
})
}
},
_resultChange(msg) {
this.$Message.success(msg)
this._page()
},
_record(id) {
this.$refs.operationModal._open(id)
},
_tableResultChange(msg, data) {
switch (msg) {
case 'selectIds':
this.selectIds = data
break
case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName)
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 meterContract.pageContractReview(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)
}
})
},
// 编辑&添加
_reviewContract(id) {
this._getContractReview(id)
},
_getContractReview: async function(id) {
const result = await meterContract.getReviewById(id)
if (result) {
this.$refs.addEditModal._openEdit(result)
}
},
// 追加项目
_itemModal(data) {
this.$refs.refModal._open(data)
},
_upload(id) {
// 上传文件
this.$refs.FileManage._open(id, 'subcontractorId')
},
_getById: async function(id) {
const result = await meterContract.getVOById(id)
if (result) {
this.$refs.editSubcontractorModal._openEdit(result)
}
},
_delete: async function(ids) {
const result = await meterSubcontractor.deleteById(ids)
if (result) {
this._formSearch()
this.$Message.success('删除成功！')
}
}
}
}
</script>
pages/meter-contract/contract-review/MeterContractReviewFinish.vue → pages/meter-contract/contract-technology/MeterTechnologyReviewHis.vue
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</template> </template>
<script> <script>
import { meterEntrust, meterSubcontractor } from '../../../api' import { meterEntrust, meterSubcontractor } from '../../../api'
import MeterSubcontractorEdit from './MeterContractReviewEdit' import MeterSubcontractorEdit from './MeterTechnologyReviewEdit'
export default { export default {
components: { MeterSubcontractorEdit }, components: { MeterSubcontractorEdit },
data() { data() {
...@@ -164,9 +164,6 @@ export default { ...@@ -164,9 +164,6 @@ export default {
}, },
_tableResultChange(msg, data) { _tableResultChange(msg, data) {
switch (msg) { switch (msg) {
case 'page':
this.getPage = this.$store.state.FoodSubcontracter.page
break
case 'iconClick': case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName) this._iconClick(data.name, data.rowData, data.componentName)
break break
......
pages/meter-contract/contract-technology/MeterTechnologyReviewIndex.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">
<MeterSendEntrust ref="waitTabs"></MeterSendEntrust>
</el-tab-pane>
<el-tab-pane label="历史记录" name="his">
<MeterSendEntrustHis ref="hisTabs"></MeterSendEntrustHis>
</el-tab-pane>
</el-tabs>
</div>
</div>
</div>
</template>
<script>
import MeterSendEntrust from './MeterTechnologyReview'
import MeterSendEntrustHis from './MeterTechnologyReviewHis'
export default {
name: 'MeterSendEntrustIndex',
components: {
MeterSendEntrust,
MeterSendEntrustHis
},
data() {
return {
activeName: 'wait'
}
}
}
</script>
<style scoped>
</style>
pages/meter-entrust/send-test/MeterSendEntrustIndex.vue
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import MeterSendEntrust from './MeterSendEntrust' import MeterSendEntrust from './MeterSendEntrust'
import MeterSendEntrustFinish from './MeterSendEntrustFinish' import MeterSendEntrustFinish from './MeterSendEntrustFinish'
......
pages/meter-out/personal-task/MeterOutPersonalTask.vue
...@@ -59,11 +59,11 @@ ...@@ -59,11 +59,11 @@
</Row> </Row>
</div> </div>
</div> </div>
<docimasy ref="docimasy"></docimasy> <docimasy ref="docimasy" @on-result-change="_page"></docimasy>
<FileManage ref="FileManage"></FileManage> <FileManage ref="FileManage" @on-result-change="_page"></FileManage>
<operationModal ref="operationModal"></operationModal> <operationModal ref="operationModal" @on-result-change="_page"></operationModal>
<SelEquip ref="SelEquip" @on-result-change="_equipSelectBack"></SelEquip> <SelEquip ref="SelEquip" @on-result-change="_equipSelectBack"></SelEquip>
<CarManage ref="carEdit"></CarManage> <CarManage ref="carEdit" @on-result-change="_page"></CarManage>
<InstruMentEdit ref="InstruEdit" @on-result-change="_page"></InstruMentEdit> <InstruMentEdit ref="InstruEdit" @on-result-change="_page"></InstruMentEdit>
<MeterPersonItemTaskManage ref="personModal" @on-result-change="_page"></MeterPersonItemTaskManage> <MeterPersonItemTaskManage ref="personModal" @on-result-change="_page"></MeterPersonItemTaskManage>
<MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit> <MeterSubcontractorEdit ref="editSubcontractorModal" @on-result-change="_formSearch"></MeterSubcontractorEdit>
...@@ -151,6 +151,10 @@ export default { ...@@ -151,6 +151,10 @@ export default {
{ title: '型号规格', key: 'spec', width: 120 }, { title: '型号规格', key: 'spec', width: 120 },
{ title: '出厂编号', key: 'factoryNumber', width: 120 }, { title: '出厂编号', key: 'factoryNumber', width: 120 },
{ title: '检测类型', key: 'type', width: 100 }, { title: '检测类型', key: 'type', width: 100 },
{ title: '温度', key: 'temperature', width: 100 },
{ title: '湿度', key: 'humidity', width: 100 },
{ title: '地点', key: 'place', width: 100 },
{ title: '其他', key: 'cElse', width: 100 },
{ title: '委托单位', key: 'client', width: 200 }, { title: '委托单位', key: 'client', width: 200 },
{ title: '联系人', key: 'person', width: 120 }, { title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 }, { title: '联系电话', key: 'tel', width: 120 },
...@@ -204,7 +208,11 @@ export default { ...@@ -204,7 +208,11 @@ export default {
}) })
}, },
_docimasy() { _docimasy() {
this.$refs.docimasy._open(this.selectIds) if (this.selectIds.length === 0) {
this.$Message.warning('请至少选择一条数据！')
} else {
this.$refs.docimasy._open(this.selectIds)
}
}, },
_carManage() { _carManage() {
this.$refs.carEdit._open() this.$refs.carEdit._open()
......
pages/meter-out/personal-task/MeterPersonItemTaskManage.vue
...@@ -10,24 +10,24 @@ ...@@ -10,24 +10,24 @@
<Form id="formId" :label-width="80" inline onsubmit="return false"> <Form id="formId" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item label="样品名称:" class="search-item"> <Form-item label="样品名称:" class="search-item">
<Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/> <Input v-model="formObj.name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item label="样品编号:" class="search-item"> <Form-item label="样品编号:" class="search-item">
<Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/> <Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item class="search-btn" style="margin-left: -10px"> <Form-item class="search-btn" style="margin-left: -10px">
<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" :get-page="getPage" <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage"
:icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data> :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"
...@@ -48,9 +48,9 @@ ...@@ -48,9 +48,9 @@
<div v-else-if="item.key==='testValue'"> <div v-else-if="item.key==='testValue'">
<el-input <el-input
v-model="scope.row.testValue" v-model="scope.row.testValue"
@blur="_handleTestValueEdit(scope.row.id,scope.row.testValue)"
size="medium" size="medium"
placeholder="请输入检测结果" placeholder="请输入检测结果"
@blur="_handleTestValueEdit(scope.row.id,scope.row.testValue)"
/> />
</div> </div>
<div v-else-if="item.key==='progress'"> <div v-else-if="item.key==='progress'">
...@@ -155,6 +155,7 @@ export default { ...@@ -155,6 +155,7 @@ export default {
{ title: '进度', key: 'progress', width: 110 } { title: '进度', key: 'progress', width: 110 }
], ],
dateList: [], dateList: [],
sampleId: '',
formObj: { formObj: {
sampleId: undefined, sampleId: undefined,
name: undefined, name: undefined,
...@@ -233,7 +234,7 @@ export default { ...@@ -233,7 +234,7 @@ export default {
}) })
}, },
_docimasy() { _docimasy() {
this.$refs.docimasy._open(this.selectIds) this.$refs.docimasy._open(this.sampleId)
}, },
_detectionValue() { _detectionValue() {
if (this.selectIds.length === 0) { if (this.selectIds.length === 0) {
...@@ -293,6 +294,7 @@ export default { ...@@ -293,6 +294,7 @@ export default {
}, },
_open(id) { _open(id) {
this.formObj.sampleId = id this.formObj.sampleId = id
this.sampleId = id
this.showModal = true this.showModal = true
this._page() this._page()
}, },
......
pages/meter-out/personal-task/docimasy.vue
...@@ -10,17 +10,17 @@ ...@@ -10,17 +10,17 @@
<Form-item label="湿度:" prop="humidity"> <Form-item label="湿度:" prop="humidity">
<Input v-model="formObj.humidity" placeholder="请输入湿度"></Input> <Input v-model="formObj.humidity" placeholder="请输入湿度"></Input>
</Form-item> </Form-item>
<Form-item label="其他:" prop="others"> <Form-item label="其他:" prop="remark">
<Input v-model="formObj.others" placeholder="其他"></Input> <Input v-model="formObj.remark" placeholder="其他"></Input>
</Form-item> </Form-item>
<Form-item label="地点:" prop="location"> <Form-item label="地点:" prop="place">
<Input v-model="formObj.location" placeholder="地点"></Input> <Input v-model="formObj.place" placeholder="地点"></Input>
</Form-item> </Form-item>
</Form> </Form>
</div> </div>
<div slot="footer"> <div slot="footer">
<ModalFooter ref="footerModal" @on-result-change="_footerResult" :footer="footerList"></ModalFooter> <ModalFooter ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></ModalFooter>
</div> </div>
</Modal> </Modal>
</div> </div>
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
* 判定 * 判定
*/ */
import ModalFooter from '../../../components/base/modalFooter' import ModalFooter from '../../../components/base/modalFooter'
import { meterSample } from '../../../api'
export default { export default {
components: { components: {
...@@ -37,14 +38,14 @@ export default { ...@@ -37,14 +38,14 @@ export default {
}, },
data() { data() {
return { return {
ids: [], // 合同ids ids: '',
modalTitle: '检定条件', modalTitle: '检定条件',
showBackModal: false, showBackModal: false,
formObj: { formObj: {
temperature: '', temperature: '',
humidity: '', humidity: '',
others: '', remark: '',
location: '' place: ''
}, },
path: '', path: '',
ruleValidate: {}, ruleValidate: {},
...@@ -56,9 +57,8 @@ export default { ...@@ -56,9 +57,8 @@ export default {
}, },
methods: { methods: {
_open(ids) { _open(ids) {
this.ids = ids // 合同id this.ids = ids
this.showBackModal = true this.showBackModal = true
this.formObj.type = 1
this.formObj = {} this.formObj = {}
this.$refs.footerModal._hideLoading() this.$refs.footerModal._hideLoading()
}, },
...@@ -79,22 +79,19 @@ export default { ...@@ -79,22 +79,19 @@ export default {
_ok() { _ok() {
this.$refs.formObj.validate(valid => { this.$refs.formObj.validate(valid => {
if (valid) { if (valid) {
const data = {} this._saveSampleEnv({ ids: this.ids, obj: this.formObj })
data.ids = this.ids.join(',')
this.$extend(data, this.formObj)
console.log('要传的数据', data)
this.showBackModal = false
// this.$store.dispatch('FoodItem/judge', data).then(() => {
// if (this.$store.state.FoodItem.success) {
// this.$Message.success('判定成功')
// this.showBackModal = false
// this.$emit('on-result-change')
// }
// })
} else { } else {
this.$Message.error('表单验证失败!') this.$Message.error('表单验证失败!')
} }
}) })
},
_saveSampleEnv: async function(data) {
const result = await meterSample.saveSampleEnv(data)
if (result) {
this.$Message.success('检定条件信息填写成功!')
this.showBackModal = false
this.$emit('on-result-change')
}
} }
} }
} }
......
pages/meter-send/receive-sample/MeterReceiveEntrust.vue
...@@ -62,18 +62,18 @@ export default { ...@@ -62,18 +62,18 @@ export default {
formId: 'meterReviewEntrustFormId', formId: 'meterReviewEntrustFormId',
searchOpen: false, searchOpen: false,
btn: [ btn: [
{ // {
// meter-review-entrust-pass-btn // // meter-review-entrust-pass-btn
type: 'success', // type: 'success',
id: '', // id: '',
name: '通过' // name: '通过'
}, // },
// meter-review-entrust-back-btn // // meter-review-entrust-back-btn
{ // {
type: 'success', // type: 'success',
id: '', // id: '',
name: '驳回' // name: '驳回'
} // }
], ],
iconMsg: [ iconMsg: [
{ {
......
pages/meter-send/sample-flow/MeterSampleFlow.vue
...@@ -37,7 +37,18 @@ ...@@ -37,7 +37,18 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <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> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
...@@ -80,12 +91,12 @@ export default { ...@@ -80,12 +91,12 @@ export default {
} }
], ],
iconMsg: [ iconMsg: [
{ type: 'md-cloud', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' }
{ // {
type: 'ios-clock', // type: 'ios-clock',
id: '', // id: '',
name: '操作日志' // name: '操作日志'
} // }
], ],
formObj: { formObj: {
name: undefined, name: undefined,
......
pages/meter-send/sample-input/MeterPersonItemTaskManage.vue
...@@ -84,9 +84,8 @@ export default { ...@@ -84,9 +84,8 @@ export default {
return { return {
currentComponent: '', currentComponent: '',
iconMsg: [ iconMsg: [
{ type: 'compose', id: '', name: '编辑' }, // { type: 'compose', id: '', name: '编辑' },
{ type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' }, // { type: 'trash-a', id: '', name: '删除' }
{ type: 'trash-a', id: '', name: '删除' }
], ],
btn: [ btn: [
{ {
......
pages/meter-send/sample-input/MeterSampleInput.vue
...@@ -37,7 +37,18 @@ ...@@ -37,7 +37,18 @@
:min-width="item.width?item.width:200" :min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable> :fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope"> <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> </template>
</vxe-table-column> </vxe-table-column>
</PTVXETable> </PTVXETable>
...@@ -106,13 +117,13 @@ export default { ...@@ -106,13 +117,13 @@ export default {
id: '', id: '',
name: '仪器领用' name: '仪器领用'
}, },
{ type: 'md-cloud', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' }
{ type: 'md-remove-circle', id: '', name: '删除' }, // { type: 'md-remove-circle', id: '', name: '删除' },
{ // {
type: 'ios-clock', // type: 'ios-clock',
id: '', // id: '',
name: '操作日志' // name: '操作日志'
} // }
], ],
formObj: { formObj: {
name: undefined, name: undefined,
......
pages/meter-send/task-distribute/MeterTaskDistribute.vue
...@@ -80,18 +80,18 @@ export default { ...@@ -80,18 +80,18 @@ export default {
} }
], ],
iconMsg: [ iconMsg: [
{ // {
type: 'md-create', // type: 'md-create',
id: '', // id: '',
name: '编辑' // name: '编辑'
}, // },
{ {
type: 'ios-contact', type: 'ios-contact',
id: '', id: '',
name: '任务分配' name: '任务分配'
}, },
{ type: 'md-cloud', id: '', name: '附件' }, { type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' }, // { type: 'md-remove-circle', id: '', name: '删除' },
{ {
type: 'ios-clock', type: 'ios-clock',
id: '', id: '',
......
router/meter-routes.js
...@@ -31,6 +31,7 @@ import MeterContractApprovalIndex from '../pages/meter-business/quote-approval/M ...@@ -31,6 +31,7 @@ import MeterContractApprovalIndex from '../pages/meter-business/quote-approval/M
import MeterContractAcceptedIndex from '../pages/meter-business/accepted/MeterContractAcceptedIndex' import MeterContractAcceptedIndex from '../pages/meter-business/accepted/MeterContractAcceptedIndex'
import MeterContractRegisterIndex from '../pages/meter-contract/contract-register/MeterContractRegisterIndex' import MeterContractRegisterIndex from '../pages/meter-contract/contract-register/MeterContractRegisterIndex'
import MeterContractReviewIndex from '../pages/meter-contract/contract-review/MeterContractReviewIndex' import MeterContractReviewIndex from '../pages/meter-contract/contract-review/MeterContractReviewIndex'
import MeterContractFileIndex from '../pages/meter-contract/contract-file/MeterContractFileIndex'
import Blank from '~/pages/blank' import Blank from '~/pages/blank'
export default [ export default [
{ {
...@@ -197,6 +198,11 @@ export default [ ...@@ -197,6 +198,11 @@ export default [
path: 'contract_review', path: 'contract_review',
component: MeterContractReviewIndex, component: MeterContractReviewIndex,
meta: { title: '' } meta: { title: '' }
},
{
path: 'contract_file',
component: MeterContractFileIndex,
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