Skip to content

P
patzn-cloud-web-back-soil
Commit 340cc118 by wangweidong
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 3645e746 b12b2509
Showing with 109 additions and 80 deletions
layouts/default.vue
<template> <template>
<div > <div >
<header-menu :crumbs="crumbsList" @on-result-change="_headerMenuResult"/> <header-menu :crumbs="crumbsList" @on-result-change="_headerMenuResult"/>
<div v-if="show" :class="{'shrink-iview-layout-nuxt':isShrink}" class="iview-layout-nuxt"> <div :class="{'shrink-iview-layout-nuxt':isShrink}" class="iview-layout-nuxt">
<nuxt /> <nuxt v-if="isRouterAlive" />
</div> </div>
</div> </div>
</template> </template>
...@@ -19,7 +19,8 @@ export default { ...@@ -19,7 +19,8 @@ export default {
return { return {
isShrink: false, isShrink: false,
crumbsList: [], crumbsList: [],
show: false show: false,
isRouterAlive: false
} }
}, },
watch: { watch: {
...@@ -28,16 +29,27 @@ export default { ...@@ -28,16 +29,27 @@ export default {
} }
}, },
mounted() { mounted() {
this.show = true // this.show = true
this._setBreadCrumb(this.$route) this._setBreadCrumb(this.$route)
this._initLoad() this.$nextTick(() => {
this._initLoad()
})
}, },
methods: { methods: {
// 刷新
_reload() {
this.isRouterAlive = false
this.$nextTick(() => {
this.isRouterAlive = true
})
},
// 初始化加载 // 初始化加载
_initLoad() { _initLoad() {
if (!Global.getLn()) { if (!Global.getLn()) {
// 暂时没有登录-跳到首页 // 暂时没有登录-跳到首页
window.location.href = Global.ssoURL window.location.href = Global.ssoURL
} else {
this._reload()
} }
}, },
// 设置面包屑 // 设置面包屑
......
pages/meter-entrust/go-out-test/ContractModal.vue
<template> <template>
<div> <div>
<Modal v-model="showUserGroupModal"> <Modal v-model="showUserGroupModal" width="800">
<p slot="header"> <p slot="header">
{{ modalTitle }} {{ modalTitle }}
</p> </p>
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
</Col> </Col>
<Col span="24" style="margin-bottom: 10px"> <Col span="24" style="margin-bottom: 10px">
<el-table <el-table
:height="300"
:data="getPage" :data="getPage"
border border
size="small" size="small"
...@@ -96,9 +95,10 @@ export default { ...@@ -96,9 +95,10 @@ export default {
pageParams: { rows: 20 }, pageParams: { rows: 20 },
pageColumns: [ pageColumns: [
{ title: '合同编号', key: 'salesCode', width: 120 }, { title: '合同编号', key: 'salesCode', width: 120 },
{ title: '委托单位', key: 'client', width: 200 }, { title: '委托单位', key: 'client' },
{ title: '联系人', key: 'person', width: 120 }, { title: '联系人', key: 'person' },
{ title: '联系电话', key: 'tel', width: 120 } { title: '联系电话', key: 'tel' },
{ title: '样品名称', key: 'samples', width: 140 }
// { title: '传真', key: 'fax', width: 120 }, // { title: '传真', key: 'fax', width: 120 },
// { title: '详细地址', key: 'address', width: 250 }, // { title: '详细地址', key: 'address', width: 250 },
// { title: '登记日期', key: 'edate', width: 120, date: true }, // { title: '登记日期', key: 'edate', width: 120, date: true },
......
pages/meter-entrust/go-out-test/MeterGoOutTestEdit.vue
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</Form-item> </Form-item>
<Form-item label="合同号：" prop="contractCode" class="width-48"> <Form-item label="合同号：" prop="contractCode" class="width-48">
<Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号" style="width: 465px;"/> <Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号" style="width: 465px;"/>
<span @click="_selectcontractCode" style="font-size: 20px;color: #00b5ec;cursor: pointer" class="">+</span> <span v-if="showBtn" @click="_selectcontractCode" style="font-size: 20px;color: #00b5ec;cursor: pointer" class="">+</span>
</Form-item> </Form-item>
<Form-item label="备注：" prop="remark" style="width: 99.8%"> <Form-item label="备注：" prop="remark" style="width: 99.8%">
<Input v-model="formObj.remark" :rows="3" name="remark" type="textarea" <Input v-model="formObj.remark" :rows="3" name="remark" type="textarea"
...@@ -223,6 +223,7 @@ export default { ...@@ -223,6 +223,7 @@ export default {
getPage: { getPage: {
records: [] records: []
}, },
showBtn: true,
testedCityData: [], testedCityData: [],
customerData: [], customerData: [],
searchOpen: true, searchOpen: true,
...@@ -451,6 +452,7 @@ export default { ...@@ -451,6 +452,7 @@ export default {
}, },
_backData(data) { _backData(data) {
console.log(typeof this.index) console.log(typeof this.index)
console.log(data)
this.getPage.records[this.index].name = data.name this.getPage.records[this.index].name = data.name
this.getPage.records[this.index].aptitudeId = data.id this.getPage.records[this.index].aptitudeId = data.id
this.getPage.records[this.index].verification = data.code + data.basis this.getPage.records[this.index].verification = data.code + data.basis
...@@ -472,6 +474,11 @@ export default { ...@@ -472,6 +474,11 @@ export default {
this.formObj.odate = new Date(data.odate) this.formObj.odate = new Date(data.odate)
this.formObj.contractCode = data.salesCode this.formObj.contractCode = data.salesCode
this.formObj.operation.fee = data.discountPrice this.formObj.operation.fee = data.discountPrice
if (data.sampleQuoteList) {
this.getPage.records = data.sampleQuoteList
} else {
this.getPage.records = []
}
}, },
_selectjudgeBasis(index) { _selectjudgeBasis(index) {
this.index = index this.index = index
...@@ -650,6 +657,7 @@ export default { ...@@ -650,6 +657,7 @@ export default {
const saveData = this.formObj const saveData = this.formObj
saveData.sampleList = this.getPage.records saveData.sampleList = this.getPage.records
// 编辑 // 编辑
console.log(saveData)
this._edit(saveData) this._edit(saveData)
} }
} else { } else {
...@@ -682,6 +690,7 @@ export default { ...@@ -682,6 +690,7 @@ export default {
this.showModal = false this.showModal = false
}, },
_open() { _open() {
this.showBtn = true
this.showModal = true this.showModal = true
this._getList() this._getList()
this.$refs.formObj.resetFields() this.$refs.formObj.resetFields()
...@@ -696,6 +705,7 @@ export default { ...@@ -696,6 +705,7 @@ export default {
}, },
_openEdit(formObj) { _openEdit(formObj) {
this.showBtn = false
this._getList() this._getList()
this.getPage.records = [] this.getPage.records = []
this.showModal = true this.showModal = true
......
pages/meter-entrust/send-test/ContractModal.vue
<template> <template>
<div> <div>
<Modal v-model="showUserGroupModal" width="600"> <Modal v-model="showUserGroupModal" width="800">
<p slot="header"> <p slot="header">
{{ modalTitle }} {{ modalTitle }}
</p> </p>
...@@ -12,31 +12,30 @@ ...@@ -12,31 +12,30 @@
<Form-item :label-width="70" label="授权资质仪器名称" > <Form-item :label-width="70" label="授权资质仪器名称" >
<Input <Input
v-model="code" v-model="code"
@on-enter="_pageChange(1)"
placeholder="授权资质仪器名称" placeholder="授权资质仪器名称"
style="width: 100%" style="width: 100%"
@on-enter="_pageChange(1)"
/> />
</Form-item> </Form-item>
<Form-item label="检测依据名称"> <Form-item label="检测依据名称">
<Input <Input
v-model="name" v-model="name"
@on-enter="_pageChange(1)"
placeholder="请输入检测依据名称" placeholder="请输入检测依据名称"
style="width: 100%" style="width: 100%"
@on-enter="_pageChange(1)"
/> />
</Form-item> </Form-item>
</Form> </Form>
</Col> </Col>
<Col span="24" style="margin-bottom: 10px"> <Col span="24" style="margin-bottom: 10px">
<el-table <el-table
:height="300"
:data="getPage" :data="getPage"
@row-click="_rowChange"
@row-dblclick="_dbClick"
border border
size="small" size="small"
highlight-current-row highlight-current-row
style="width: 100%" style="width: 100%"
@row-click="_rowChange"
@row-dblclick="_dbClick"
> >
<el-table-column <el-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
...@@ -59,21 +58,21 @@ ...@@ -59,21 +58,21 @@
<Page <Page
:total="getPage.total" :total="getPage.total"
:page-size="getPage.size" :page-size="getPage.size"
@on-change="_pageChange"
@on-page-size-change="_pageRows"
placement="top" placement="top"
show-total show-total
show-elevator show-elevator
show-sizer show-sizer
@on-change="_pageChange"
@on-page-size-change="_pageRows"
/> />
<div style="clear: both" /> <div style="clear: both" />
</Col> </Col>
</Row> </Row>
<div slot="footer" class="btn-width"> <div slot="footer" class="btn-width">
<Button style="margin-left: 8px" @click="_cancel"> <Button @click="_cancel" style="margin-left: 8px">
取消 取消
</Button> </Button>
<Button type="primary" @click="_ok"> <Button @click="_ok" type="primary">
确定 确定
</Button> </Button>
</div> </div>
...@@ -96,9 +95,10 @@ export default { ...@@ -96,9 +95,10 @@ export default {
pageParams: { rows: 20 }, pageParams: { rows: 20 },
pageColumns: [ pageColumns: [
{ title: '合同编号', key: 'salesCode', width: 120 }, { title: '合同编号', key: 'salesCode', width: 120 },
{ title: '委托单位', key: 'client', width: 200 }, { title: '委托单位', key: 'client' },
{ title: '联系人', key: 'person', width: 120 }, { title: '联系人', key: 'person' },
{ title: '联系电话', key: 'tel', width: 120 } { title: '联系电话', key: 'tel' },
{ title: '样品名称', key: 'samples', width: 140 }
// { title: '传真', key: 'fax', width: 120 }, // { title: '传真', key: 'fax', width: 120 },
// { title: '详细地址', key: 'address', width: 250 }, // { title: '详细地址', key: 'address', width: 250 },
// { title: '登记日期', key: 'edate', width: 120, date: true }, // { title: '登记日期', key: 'edate', width: 120, date: true },
...@@ -132,7 +132,6 @@ export default { ...@@ -132,7 +132,6 @@ export default {
const result = await meterContract.pageContractForEntrust(this.formObj) const result = await meterContract.pageContractForEntrust(this.formObj)
if (result) { if (result) {
this.getPage = result.records this.getPage = result.records
console.log(this.getPage)
this.loading = false this.loading = false
} }
}, },
......
pages/meter-entrust/send-test/MeterSendTestEdit.vue
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</Form-item> </Form-item>
<Form-item label="合同号：" prop="contractCode" class="width-96"> <Form-item label="合同号：" prop="contractCode" class="width-96">
<Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号" style="width: 495px;"/> <Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号" style="width: 495px;"/>
<span @click="_selectcontractCode" style="font-size: 20px;color: #00b5ec;cursor: pointer" class="">+</span> <span v-if="showBtn" @click="_selectcontractCode" style="font-size: 20px;color: #00b5ec;cursor: pointer" class="">+</span>
</Form-item> </Form-item>
<Form-item label="备注：" prop="remark" style="width: 99.8%"> <Form-item label="备注：" prop="remark" style="width: 99.8%">
<Input v-model="formObj.remark" :rows="3" name="remark" type="textarea" <Input v-model="formObj.remark" :rows="3" name="remark" type="textarea"
...@@ -205,6 +205,7 @@ export default { ...@@ -205,6 +205,7 @@ export default {
getPage: { getPage: {
records: [] records: []
}, },
showBtn: true,
customerData: [], customerData: [],
cityData: [], cityData: [],
searchOpen: true, searchOpen: true,
...@@ -473,6 +474,11 @@ export default { ...@@ -473,6 +474,11 @@ export default {
this.formObj.odate = new Date(data.odate) this.formObj.odate = new Date(data.odate)
this.formObj.contractCode = data.salesCode this.formObj.contractCode = data.salesCode
this.formObj.operation.fee = data.discountPrice this.formObj.operation.fee = data.discountPrice
if (data.sampleQuoteList) {
this.getPage.records = data.sampleQuoteList
} else {
this.getPage.records = []
}
}, },
_add() { _add() {
const data = { const data = {
...@@ -663,6 +669,7 @@ export default { ...@@ -663,6 +669,7 @@ export default {
this.showModal = false this.showModal = false
}, },
_open(formObj) { _open(formObj) {
this.showBtn = true
this.showModal = true this.showModal = true
this._getList() this._getList()
this.$refs.formObj.resetFields() this.$refs.formObj.resetFields()
...@@ -685,6 +692,7 @@ export default { ...@@ -685,6 +692,7 @@ export default {
} }
}, },
_openEdit(formObj) { _openEdit(formObj) {
this.showBtn = false
this._getList() this._getList()
this.getPage.records = [] this.getPage.records = []
this.showModal = true this.showModal = true
......
pages/meter-send/receive-sample/MeterReceiveEntrust.vue
...@@ -82,22 +82,22 @@ export default { ...@@ -82,22 +82,22 @@ export default {
iconMsg: [ iconMsg: [
{ {
type: 'md-paper', type: 'md-paper',
id: 'receive-sample-meter-receive-entrust-detail', id: 'meter-receive-entrust-detail',
name: '详情' name: '详情'
}, },
{ {
type: 'ios-beaker', type: 'ios-beaker',
id: 'receive-sample-meter-receive-entrust-sample-manage', id: 'meter-receive-entrust-sample-manage',
name: '样品管理' name: '样品管理'
}, },
{ {
type: 'md-cloud', type: 'md-cloud',
id: 'receive-sample-meter-receive-entrust-accessory', id: 'meter-receive-entrust-accessory',
name: '附件' name: '附件'
}, },
{ {
type: 'ios-clock', type: 'ios-clock',
id: 'receive-sample-meter-receive-entrust-record', id: 'meter-receive-entrust-record',
name: '操作日志' name: '操作日志'
} }
], ],
......
pages/meter-send/receive-sample/MeterReceiveEntrustHis.vue
...@@ -69,29 +69,29 @@ export default { ...@@ -69,29 +69,29 @@ export default {
btn: [ btn: [
{ {
type: 'success', type: 'success',
id: '', id: 'meter-receive-entrust-his-register-btn',
name: '样品交接发放登记表' name: '样品交接发放登记表'
} }
], ],
iconMsg: [ iconMsg: [
{ {
type: 'md-paper', type: 'md-paper',
id: 'receive-sample-meter-receive-entrust-his-detail', id: 'meter-receive-entrust-his-detail',
name: '详情' name: '详情'
}, },
{ {
type: 'ios-beaker', type: 'ios-beaker',
id: 'receive-sample-meter-receive-entrust-his-sample-manage', id: 'meter-receive-entrust-his-sample-manage',
name: '样品管理' name: '样品管理'
}, },
{ {
type: 'md-cloud', type: 'md-cloud',
id: 'receive-sample-meter-receive-entrust-his-accessory', id: 'meter-receive-entrust-his-accessory',
name: '附件' name: '附件'
}, },
{ {
type: 'ios-clock', type: 'ios-clock',
id: 'receive-sample-meter-receive-entrust-his-record', id: 'meter-receive-entrust-his-record',
name: '操作日志' name: '操作日志'
} }
], ],
......
pages/meter-send/receive-sample/MeterSampleManage.vue
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
{ {
// meter-review-entrust-pass-btn // meter-review-entrust-pass-btn
type: 'success', type: 'success',
id: 'receive-sample-meter-sample-manage-collect-btn', id: 'meter-sample-manage-collect-btn',
name: '收样' name: '收样'
} }
], ],
......
pages/meter-send/sample-flow/MeterSampleFlow.vue
...@@ -81,14 +81,14 @@ export default { ...@@ -81,14 +81,14 @@ export default {
btn: [ btn: [
{ {
type: 'success', type: 'success',
id: 'sample-flow-meter-sample-flow-flow-btn', id: 'meter-sample-flow-flow-btn',
name: '流转' name: '流转'
} }
], ],
iconMsg: [ iconMsg: [
{ {
type: 'md-cloud', type: 'md-cloud',
id: 'sample-flow-meter-sample-flow-accessory', id: 'meter-sample-flow-accessory',
name: '附件' name: '附件'
} }
// { // {
......
pages/meter-send/sample-flow/MeterSampleFlowHis.vue
...@@ -60,16 +60,16 @@ export default { ...@@ -60,16 +60,16 @@ export default {
formId: 'meterSubcontractorFormId', formId: 'meterSubcontractorFormId',
searchOpen: false, searchOpen: false,
btn: [ btn: [
{ // {
type: 'success', // type: 'success',
id: 'sample-flow-meter-sample-flow-his-add-btn', // id: 'meter-sample-flow-his-add-btn',
name: '添加' // name: '添加'
}, // },
{ // {
type: 'success', // type: 'success',
id: 'sample-flow-meter-sample-flow-his-submit-btn', // id: 'meter-sample-flow-his-submit-btn',
name: '提交' // name: '提交'
} // }
], ],
iconMsg: [ iconMsg: [
// { // {
...@@ -84,17 +84,17 @@ export default { ...@@ -84,17 +84,17 @@ export default {
// }, // },
{ {
type: 'md-cloud', type: 'md-cloud',
id: 'sample-flow-meter-sample-flow-his-accessory', id: 'meter-sample-flow-his-accessory',
name: '附件' name: '附件'
}, },
{ {
type: 'md-remove-circle', type: 'md-remove-circle',
id: 'sample-flow-meter-sample-flow-his-remove', id: 'meter-sample-flow-his-remove',
name: '删除' name: '删除'
}, },
{ {
type: 'ios-clock', type: 'ios-clock',
id: 'sample-flow-meter-sample-flow-his-record', id: 'meter-sample-flow-his-record',
name: '操作日志' name: '操作日志'
} }
], ],
......
pages/meter-send/sample-input/MeterPersonItemTaskManage.vue
...@@ -90,12 +90,12 @@ export default { ...@@ -90,12 +90,12 @@ export default {
btn: [ btn: [
{ {
type: 'success', type: 'success',
id: 'sample-input-meter-person-item-task-manage-input-btn', id: 'meter-person-item-task-manage-input-btn',
name: '填写检测值' name: '填写检测值'
}, },
{ {
type: 'success', type: 'success',
id: 'sample-input-meter-person-item-task-manage-judge-btn', id: 'meter-person-item-task-manage-judge-btn',
name: '判定' name: '判定'
} }
], ],
......
pages/meter-send/sample-input/MeterSampleInput.vue
...@@ -99,49 +99,49 @@ export default { ...@@ -99,49 +99,49 @@ export default {
btn: [ btn: [
{ {
type: 'success', type: 'success',
id: 'sample-input-meter-sample-input-take-btn', id: 'meter-sample-input-take-btn',
name: '仪器领用' name: '仪器领用'
}, },
{ {
type: 'success', type: 'success',
id: 'sample-input-meter-sample-input-car-btn', id: 'meter-sample-input-car-btn',
name: '车辆管理' name: '车辆管理'
}, },
{ {
type: 'success', type: 'success',
id: 'sample-input-meter-sample-input-submit-btn', id: 'meter-sample-input-submit-btn',
name: '提交' name: '提交'
}, },
{ {
type: 'success', type: 'success',
id: 'sample-input-meter-sample-input-submit-create-btn', id: 'meter-sample-input-submit-create-btn',
name: '提交至证书编制' name: '提交至证书编制'
} }
], ],
iconMsg: [ iconMsg: [
{ {
type: 'ios-bookmarks', type: 'ios-bookmarks',
id: 'sample-input-meter-sample-input-create', id: 'meter-sample-input-create',
name: '编制证书' name: '编制证书'
}, },
{ {
type: 'md-create', type: 'md-create',
id: 'sample-input-meter-sample-input-edit', id: 'meter-sample-input-edit',
name: '编辑' name: '编辑'
}, },
{ {
type: 'md-car', type: 'md-car',
id: 'sample-input-meter-sample-input-car', id: 'meter-sample-input-car',
name: '车辆管理' name: '车辆管理'
}, },
{ {
type: 'ios-list-box', type: 'ios-list-box',
id: 'sample-input-meter-sample-input-take', id: 'meter-sample-input-take',
name: '仪器领用' name: '仪器领用'
}, },
{ {
type: 'md-cloud', type: 'md-cloud',
id: 'sample-input-meter-sample-input-accessory', id: 'meter-sample-input-accessory',
name: '附件' name: '附件'
} }
// { type: 'md-remove-circle', id: '', name: '删除' }, // { type: 'md-remove-circle', id: '', name: '删除' },
......
pages/meter-send/sample-input/MeterSampleInputHis.vue
...@@ -121,7 +121,7 @@ export default { ...@@ -121,7 +121,7 @@ export default {
iconMsg: [ iconMsg: [
{ {
type: 'ios-bookmarks', type: 'ios-bookmarks',
id: 'sample-input-meter-sample-input-his-view', id: 'meter-sample-input-his-view',
name: '查看证书' name: '查看证书'
}, },
// { // {
...@@ -141,7 +141,7 @@ export default { ...@@ -141,7 +141,7 @@ export default {
// }, // },
{ {
type: 'md-cloud', type: 'md-cloud',
id: 'sample-input-meter-sample-input-his-accessory', id: 'meter-sample-input-his-accessory',
name: '附件' name: '附件'
} }
// { type: 'md-remove-circle', id: '', name: '删除' }, // { type: 'md-remove-circle', id: '', name: '删除' },
......
pages/meter-send/task-distribute/MeterTaskAlloca.vue
...@@ -98,12 +98,12 @@ export default { ...@@ -98,12 +98,12 @@ export default {
iconMsg: [ iconMsg: [
{ {
type: 'ios-beaker', type: 'ios-beaker',
id: 'task-distribute-meter-task-alloca-item-manage', id: 'meter-task-alloca-item-manage',
name: '检测项目管理' name: '检测项目管理'
}, },
{ {
type: 'ios-clock', type: 'ios-clock',
id: 'task-distribute-meter-task-alloca-record', id: 'meter-task-alloca-record',
name: '操作日志' name: '操作日志'
} }
], ],
...@@ -114,12 +114,12 @@ export default { ...@@ -114,12 +114,12 @@ export default {
btn: [ btn: [
{ {
type: 'success', type: 'success',
id: 'task-distribute-meter-task-alloca-allocation-btn', id: 'meter-task-alloca-allocation-btn',
name: '分配任务' name: '分配任务'
}, },
{ {
type: 'success', type: 'success',
id: 'task-distribute-meter-task-alloca-import-item-btn', id: 'meter-task-alloca-import-item-btn',
name: '导入检测项目' name: '导入检测项目'
} }
], ],
......
pages/meter-send/task-distribute/MeterTaskAllocaHis.vue
...@@ -99,12 +99,12 @@ export default { ...@@ -99,12 +99,12 @@ export default {
iconMsg: [ iconMsg: [
{ {
type: 'ios-beaker', type: 'ios-beaker',
id: 'task-distribute-meter-task-alloca-his-item-manage', id: 'meter-task-alloca-his-item-manage',
name: '检测项目管理' name: '检测项目管理'
}, },
{ {
type: 'ios-clock', type: 'ios-clock',
id: 'task-distribute-meter-task-alloca-his-record', id: 'meter-task-alloca-his-record',
name: '操作日志' name: '操作日志'
} }
], ],
...@@ -115,12 +115,12 @@ export default { ...@@ -115,12 +115,12 @@ export default {
btn: [ btn: [
{ {
type: 'success', type: 'success',
id: 'task-distribute-meter-task-alloca-his-allocation-btn', id: 'meter-task-alloca-his-allocation-btn',
name: '任务重新分配' name: '任务重新分配'
}, },
{ {
type: 'success', type: 'success',
id: 'task-distribute-meter-task-alloca-his-import-item-btn', id: 'meter-task-alloca-his-import-item-btn',
name: '导入检测项目' name: '导入检测项目'
} }
], ],
......
pages/meter-send/task-distribute/MeterTaskDistribute.vue
...@@ -89,18 +89,18 @@ export default { ...@@ -89,18 +89,18 @@ export default {
// }, // },
{ {
type: 'ios-contact', type: 'ios-contact',
id: 'task-distribute-meter-task-distribute-allocation', id: 'meter-task-distribute-allocation',
name: '任务分配' name: '任务分配'
}, },
{ {
type: 'md-cloud', type: 'md-cloud',
id: 'task-distribute-meter-task-distribute-accessory', id: 'meter-task-distribute-accessory',
name: '附件' name: '附件'
}, },
// { type: 'md-remove-circle', id: '', name: '删除' }, // { type: 'md-remove-circle', id: '', name: '删除' },
{ {
type: 'ios-clock', type: 'ios-clock',
id: 'task-distribute-meter-task-distribute-record', id: 'meter-task-distribute-record',
name: '操作日志' name: '操作日志'
} }
], ],
......
pages/meter-send/task-distribute/MeterTaskDistributeHis.vue
...@@ -89,18 +89,18 @@ export default { ...@@ -89,18 +89,18 @@ export default {
// }, // },
{ {
type: 'ios-contact', type: 'ios-contact',
id: 'task-distribute-meter-task-distribute-his-allocation-his', id: 'meter-task-distribute-his-allocation-his',
name: '任务分配历史' name: '任务分配历史'
}, },
{ {
type: 'md-cloud', type: 'md-cloud',
id: 'task-distribute-meter-task-distribute-his-accessory', id: 'meter-task-distribute-his-accessory',
name: '附件' name: '附件'
}, },
// { type: 'md-remove-circle', id: '', name: '删除' }, // { type: 'md-remove-circle', id: '', name: '删除' },
{ {
type: 'ios-clock', type: 'ios-clock',
id: 'task-distribute-meter-task-distribute-his-record', id: 'meter-task-distribute-his-record',
name: '操作日志' name: '操作日志'
} }
], ],
......
pages/meter-send/task-distribute/MeterTestEdit.vue
...@@ -145,12 +145,12 @@ export default { ...@@ -145,12 +145,12 @@ export default {
iconMsg: [ iconMsg: [
{ {
type: 'ios-clock', type: 'ios-clock',
id: 'task-distribute-meter-test-edit-edit', id: 'meter-test-edit-edit',
name: '编辑' name: '编辑'
}, },
{ {
type: 'ios-clock', type: 'ios-clock',
id: 'task-distribute-meter-test-edit-remove', id: 'meter-test-edit-remove',
name: '删除' name: '删除'
} }
], ],
......
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