Skip to content

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

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

parents 4b399e58 c75108d2
Showing with 51 additions and 55 deletions
pages/meter-contract/contract-file/MeterContractFile.vue
......@@ -89,22 +89,22 @@ export default {
iconMsg: [
{
type: 'md-create',
id: 'contract-file-meter-contract-file-review-record-operation',
id: 'meter-contract-file-review-record-operation',
name: '评审记录'
},
{
type: 'ios-beaker',
id: 'contract-file-meter-contract-file-sample-manage-operation',
id: 'meter-contract-file-sample-manage-operation',
name: '样品管理'
},
{
type: 'md-cloud',
id: 'contract-file-meter-contract-file-accessory-operation',
id: 'meter-contract-file-accessory-operation',
name: '附件'
},
{
type: 'ios-clock',
id: 'contract-file-meter-contract-file-record-operation',
id: 'meter-contract-file-record-operation',
name: '操作日志'
}
],
......
pages/meter-contract/contract-file/MeterContractReviewAddEdit.vue
......@@ -113,12 +113,12 @@ export default {
iconMsg: [
{
type: 'ios-clock',
id: 'contract-file-meter-contract-review-add-edit-edit-operation',
id: 'meter-contract-review-add-edit-edit-operation',
name: '编辑'
},
{
type: 'ios-clock',
id: 'contract-file-meter-contract-review-add-edit-remove-operation',
id: 'meter-contract-review-add-edit-remove-operation',
name: '删除'
}
],
......@@ -156,7 +156,7 @@ export default {
},
{
type: 'success',
id: 'contract-file-meter-contract-review-add-edit-import',
id: 'file-meter-contract-review-add-edit-import',
name: '导入'
}
],
......
pages/meter-contract/contract-register/MeterContractRegisterEdit.vue
......@@ -168,7 +168,7 @@ export default {
iconMsg: [
{
type: 'md-trash',
id: '',
id: 'meter-contract-register-edit-remove-o',
name: '删除'
}
],
......
pages/meter-contract/contract-register/MeterContractRegisterHis.vue
......@@ -64,7 +64,7 @@ export default {
btn: [
{
type: 'success',
id: 'contract-register-meter-contract-register-his-add',
id: 'meter-contract-register-his-add',
name: '添加'
}
],
......@@ -81,18 +81,17 @@ export default {
// },
{
type: 'md-cloud',
id:
'contract-register-meter-contract-register-his-accessory-operation',
id: 'meter-contract-register-his-accessory-o',
name: '附件'
},
{
type: 'md-remove-circle',
id: 'contract-register-meter-contract-register-his-remove-operation',
id: 'meter-contract-register-his-remove-o',
name: '删除'
},
{
type: 'ios-clock',
id: 'contract-register-meter-contract-register-his-record-operation',
id: 'meter-contract-register-his-record-o',
name: '操作日志'
}
],
......
pages/meter-contract/contract-review/MeterContractReviewAddEdit.vue
......@@ -119,12 +119,12 @@ export default {
iconMsg: [
{
type: 'ios-clock',
id: 'contract-review-meter-contract-review-add-edit-edit-operation',
id: 'review-meter-contract-review-add-edit-edit-o',
name: '编辑'
},
{
type: 'ios-clock',
id: 'contract-review-meter-contract-review-add-edit-remove-operation',
id: 'review-meter-contract-review-add-edit-remove-o',
name: '删除'
}
],
......@@ -157,12 +157,12 @@ export default {
btn: [
{
type: 'success',
id: 'contract-review-meter-contract-review-add-edit-add',
id: 'review-meter-contract-review-add-edit-add',
name: '添加'
},
{
type: 'success',
id: 'contract-review-meter-contract-review-add-edit-import',
id: 'review-meter-contract-review-add-edit-import',
name: '导入'
}
],
......
pages/meter-contract/contract-review/MeterContractReviewHis.vue
......@@ -81,17 +81,17 @@ export default {
// },
{
type: 'md-cloud',
id: 'contract-review-meter-contract-review-his-accessory-operation',
id: 'meter-contract-review-his-accessory-operation',
name: '附件'
},
{
type: 'md-remove-circle',
id: 'contract-review-meter-contract-review-his-remove-operation',
id: 'meter-contract-review-his-remove-operation',
name: '删除'
},
{
type: 'ios-clock',
id: 'contract-review-meter-contract-review-his-record-operation',
id: 'meter-contract-review-his-record-operation',
name: '操作日志'
}
],
......
pages/meter-entrust/client-online/MeterClientOnlineEntrustHis.vue
......@@ -65,16 +65,16 @@ export default {
formId: 'meterSubcontractorFormId',
searchOpen: false,
btn: [
{
type: 'success',
id: 'meter-client-online-entrust-his-add',
name: '添加'
},
{
type: 'success',
id: 'meter-client-online-entrust-his-submit',
name: '提交'
}
// {
// type: 'success',
// id: 'meter-client-online-entrust-his-add',
// name: '添加'
// },
// {
// type: 'success',
// id: 'meter-client-online-entrust-his-submit',
// name: '提交'
// }
],
iconMsg: [
{
......
pages/meter-review/MeterReviewEntrust.vue
......@@ -89,17 +89,17 @@ export default {
},
{
type: 'ios-beaker',
id: 'meter-review-meter-review-entrust-sample-manage-operation',
id: 'meter-review-meter-review-entrust-sample-manage-o',
name: '样品管理'
},
{
type: 'md-cloud',
id: 'meter-review-meter-review-entrust-accessory-operation',
id: 'meter-review-meter-review-entrust-accessory-o',
name: '附件'
},
{
type: 'ios-clock',
id: 'meter-review-meter-review-entrust-record-operation',
id: 'meter-review-meter-review-entrust-record-o',
name: '操作日志'
}
],
......
pages/meter-review/MeterReviewItemManage.vue
......@@ -77,18 +77,18 @@ export default {
iconMsg: [
{
type: 'compose',
id: 'meter-review-meter-review-item-manage-edit-operation',
id: 'meter-review-item-manage-edit-o',
name: '编辑'
},
{
type: 'ios-copy',
id: 'meter-review-meter-review-item-manage-copy-operation',
id: 'meter-review-item-manage-copy-o',
name: '复制',
componentName: 'CopyModal'
},
{
type: 'trash-a',
id: 'meter-review-meter-review-item-manage-remove-operation',
id: 'meter-review-item-manage-remove-o',
name: '删除'
}
],
......
pages/meter-review/MeterSampleManage.vue
......@@ -89,17 +89,17 @@ export default {
iconMsg: [
{
type: 'compose',
id: 'meter-review-meter-sample-manage-edit-operation',
id: 'meter-review-meter-sample-manage-edit-o',
name: '编辑'
},
{
type: 'ios-flask-outline',
id: 'meter-review-meter-sample-manage-test-itm-manage-operation',
id: 'meter-review-meter-sample-manage-test-itm-manage-o',
name: '管理检测项目'
},
{
type: 'trash-a',
id: 'meter-review-meter-sample-manage-remove-operation',
id: 'meter-review-meter-sample-manage-remove-o',
name: '删除'
}
],
......@@ -111,12 +111,12 @@ export default {
},
{
type: 'success',
id: 'meter-review-meter-sample-manage-subpackage-cancel',
id: 'review-meter-sample-manage-subpackage-cancel',
name: '取消分包'
},
{
type: 'success',
id: 'meter-review-meter-sample-manage-import-test-item',
id: 'review-meter-sample-manage-import-test-item',
name: '导入检测项目'
}
],
......
pages/meter-subcontract/subpackage-task/MeterSubSampleManage.vue
......@@ -89,18 +89,18 @@ export default {
iconMsg: [
{
type: 'compose',
id: 'subpackage-task-meter-sub-sample-manage-edit-operation',
id: 'subpackage-task-meter-sub-sample-manage-edit-o',
name: '编辑'
},
{
type: 'ios-copy',
id: 'subpackage-task-meter-sub-sample-manage-copy-operation',
id: 'subpackage-task-meter-sub-sample-manage-copy-o',
name: '复制',
componentName: 'CopyModal'
},
{
type: 'trash-a',
id: 'subpackage-task-meter-sub-sample-manage-remove-operation',
id: 'subpackage-task-meter-sub-sample-manage-remove-o',
name: '删除'
}
],
......@@ -108,19 +108,18 @@ export default {
{
// meter-review-entrust-pass-btn
type: 'success',
id:
'subpackage-task-meter-sub-sample-manage-subpackage-info-register',
id: 'meter-sub-sample-manage-subpackage-info-register',
name: '分包信息登记'
},
// meter-review-entrust-back-btn
{
type: 'success',
id: 'subpackage-task-meter-sub-sample-manage-subpackage-cancel',
id: 'meter-sub-sample-manage-subpackage-cancel',
name: '取消分包'
},
{
type: 'success',
id: 'subpackage-task-meter-sub-sample-manage-subpackage-out',
id: 'meter-sub-sample-manage-subpackage-out',
name: '分包出库'
}
],
......
pages/meter-subcontract/subpackage-task/MeterSubpackageTask.vue
......@@ -85,18 +85,17 @@ export default {
// },
{
type: 'ios-beaker',
id:
'subpackage-task-meter-subpackage-task-subpackage-sample-manage-operation',
id: 'meter-subpackage-task-subpackage-sample-manage-o',
name: '分包样品管理'
},
{
type: 'md-cloud',
id: 'subpackage-task-meter-subpackage-task-accessory-operation',
id: 'meter-subpackage-task-accessory-o',
name: '附件'
},
{
type: 'md-book',
id: 'subpackage-task-meter-subpackage-task-record-operation',
id: 'meter-subpackage-task-record-o',
name: '操作日志'
}
],
......
pages/meter-subcontract/subpackage-task/MeterSubpackageTaskHis.vue
......@@ -66,13 +66,12 @@ export default {
iconMsg: [
{
type: 'ios-beaker',
id:
'subpackage-task-meter-subpackage-task-his-subpackage-sample-query-operation',
id: 'meter-subpackage-task-his-sample-query-o',
name: '分包样品查询'
},
{
type: 'md-cloud',
id: 'subpackage-task-meter-subpackage-task-his-accessory-operation',
id: 'meter-subpackage-task-his-accessory-o',
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