Skip to content

P
patzn-cloud-web-back-soil
Commit 9665a953 by wangweidong
Options

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

parents 8a9e557c 1c4b01e9
Showing with 2 additions and 8 deletions
pages/meter-entrust/client-online/MeterGoOutTestEdit.vue
...@@ -165,10 +165,7 @@ export default { ...@@ -165,10 +165,7 @@ export default {
testedCityData: [], testedCityData: [],
customerData: [], customerData: [],
judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }], judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
iconMsg: [ iconMsg: [{ type: 'md-trash', id: '', name: '删除' }],
{ type: 'ios-clock', id: '', name: '编辑' },
{ type: 'ios-clock', id: '', name: '删除' }
],
pageColumns: [ pageColumns: [
{ title: '样品名称', key: 'name', width: 160 }, { title: '样品名称', key: 'name', width: 160 },
{ title: '型号规格', key: 'spec' }, { title: '型号规格', key: 'spec' },
......
pages/meter-entrust/go-out-test/MeterGoOutTestEdit.vue
...@@ -164,10 +164,7 @@ export default { ...@@ -164,10 +164,7 @@ export default {
testedCityData: [], testedCityData: [],
customerData: [], customerData: [],
judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }], judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
iconMsg: [ iconMsg: [{ type: 'md-trash', id: '', name: '删除' }],
{ type: 'ios-clock', id: '', name: '编辑' },
{ type: 'ios-clock', id: '', name: '删除' }
],
pageColumns: [ pageColumns: [
{ title: '样品名称', key: 'name', width: 160 }, { title: '样品名称', key: 'name', width: 160 },
{ title: '型号规格', key: 'spec' }, { title: '型号规格', key: 'spec' },
......
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