Commit 183f47f6 by lichengming

修改了送检委托单的按钮id

parent 3d1e9bc4
...@@ -10,21 +10,21 @@ ...@@ -10,21 +10,21 @@
<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" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/> <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/>
</Form-item> </Form-item>
<Form-item class="search-btn" style="margin-left: -10px"> <Form-item class="search-btn" style="margin-left: -10px">
<Button type="primary" @click="_formSearch">搜索</Button> <Button @click="_formSearch" type="primary">搜索</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" class="contHide" <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
@on-result-change="_btnClick"></btn-list> class="contHide"></btn-list>
</Col> </Col>
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage" :icon-msg="iconMsg" <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :get-page="getPage" :icon-msg="iconMsg"
select-data @on-result-change="_tableResultChange"> @on-result-change="_tableResultChange" select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -74,7 +74,13 @@ export default { ...@@ -74,7 +74,13 @@ export default {
data() { data() {
return { return {
currentComponent: '', currentComponent: '',
iconMsg: [{ type: 'md-trash', id: '', name: '删除' }], iconMsg: [
{
type: 'md-trash',
id: 'meter-entrust-meter-item-manage-remove-operation',
name: '删除'
}
],
btn: [], btn: [],
options: [ options: [
{ {
......
...@@ -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" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/> <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/>
</Form-item> </Form-item>
<Form-item label="样品编号:" class="search-item"> <Form-item label="样品编号:" class="search-item">
<Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/> <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/>
</Form-item> </Form-item>
<Form-item class="search-btn" style="margin-left: -10px"> <Form-item class="search-btn" style="margin-left: -10px">
<Button type="primary" @click="_formSearch">搜索</Button> <Button @click="_formSearch" type="primary">搜索</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" class="contHide" <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
@on-result-change="_btnClick"></btn-list> class="contHide"></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" select-data @on-result-change="_tableResultChange"> :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -85,34 +85,46 @@ export default { ...@@ -85,34 +85,46 @@ export default {
currentComponent: '', currentComponent: '',
searchOpen: false, searchOpen: false,
iconMsg: [ iconMsg: [
{ type: 'compose', id: '', name: '编辑' }, {
{ type: 'ios-flask-outline', id: '', name: '管理检测项目' }, type: 'compose',
{ type: 'trash-a', id: '', name: '删除' } id: 'meter-entrust-meter-sample-manage-edit-operation',
name: '编辑'
},
{
type: 'ios-flask-outline',
id: 'meter-entrust-meter-sample-manage-test-item-manage-operation',
name: '管理检测项目'
},
{
type: 'trash-a',
id: 'meter-entrust-meter-sample-manage-remove-operation',
name: '删除'
}
], ],
btn: [ btn: [
{ {
type: 'success', type: 'success',
id: '', id: 'meter-entrust-meter-sample-manage-add',
name: '新增' name: '新增'
}, },
{ {
type: 'success', type: 'success',
id: '', id: 'meter-entrust-meter-sample-manage-import-sample',
name: '导入样品' name: '导入样品'
}, },
{ {
type: 'success', type: 'success',
id: '', id: 'meter-entrust-meter-sample-manage-subpackage',
name: '分包' name: '分包'
}, },
{ {
type: 'success', type: 'success',
id: '', id: 'meter-entrust-meter-sample-manage-subpackage-cancel',
name: '取消分包' name: '取消分包'
}, },
{ {
type: 'success', type: 'success',
id: '', id: 'meter-entrust-meter-sample-manage-import-test-item',
name: '导入检测项目' name: '导入检测项目'
} }
], ],
......
...@@ -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" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/> <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入样品名称" clearable/>
</Form-item> </Form-item>
<Form-item label="样品编号:" class="search-item"> <Form-item label="样品编号:" class="search-item">
<Input v-model="formObj.code" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/> <Input v-model="formObj.code" @on-enter="_formSearch" placeholder="请输入样品编号" clearable/>
</Form-item> </Form-item>
<Form-item class="search-btn" style="margin-left: -10px"> <Form-item class="search-btn" style="margin-left: -10px">
<Button type="primary" @click="_formSearch">搜索</Button> <Button @click="_formSearch" type="primary">搜索</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" class="contHide" <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
@on-result-change="_btnClick"></btn-list> class="contHide"></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" select-data @on-result-change="_tableResultChange"> :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -84,11 +84,18 @@ export default { ...@@ -84,11 +84,18 @@ export default {
return { return {
currentComponent: '', currentComponent: '',
searchOpen: false, searchOpen: false,
iconMsg: [{ type: 'ios-flask-outline', id: '', name: '管理检测项目' }], iconMsg: [
{
type: 'ios-flask-outline',
id:
'meter-entrust-meter-sample-manage-read-test-item-manage-operation',
name: '管理检测项目'
}
],
btn: [ btn: [
{ {
type: 'success', type: 'success',
id: '', id: 'meter-entrust-meter-sample-manage-read-add-sample',
name: '追加样品' name: '追加样品'
} }
// { // {
......
...@@ -67,37 +67,49 @@ export default { ...@@ -67,37 +67,49 @@ export default {
btn: [ btn: [
{ {
type: 'success', type: 'success',
id: '', id: 'send-test-meter-send-entrust-add',
name: '添加' name: '添加'
}, },
{ {
type: 'success', type: 'success',
id: '', id: 'send-test-meter-send-entrust-submit-review',
name: '提交至评审' name: '提交至评审'
}, },
{ {
type: 'success', type: 'success',
id: '', id: 'send-test-meter-send-entrust-submit',
name: '提交' name: '提交'
} }
], ],
iconMsg: [ iconMsg: [
{ {
type: 'md-create', type: 'md-create',
id: '', id: 'send-test-meter-send-entrust-edit-operation',
name: '编辑' name: '编辑'
}, },
{ {
type: 'ios-beaker', type: 'ios-beaker',
id: '', id: 'send-test-meter-send-entrust-sample-manage-operation',
name: '管理样品' name: '管理样品'
}, },
{ type: 'md-cloud', id: '', name: '附件' }, {
{ type: 'md-document', id: '', name: '导出委托单' }, type: 'md-cloud',
{ type: 'md-remove-circle', id: '', name: '删除' }, id: 'send-test-meter-send-entrust-accessory-operation',
name: '附件'
},
{
type: 'md-document',
id: 'send-test-meter-send-entrust-export-entrust-operation',
name: '导出委托单'
},
{
type: 'md-remove-circle',
id: 'send-test-meter-send-entrust-remove-operation',
name: '删除'
},
{ {
type: 'ios-clock', type: 'ios-clock',
id: '', id: 'send-test-meter-send-entrust-record-operation',
name: '操作日志' name: '操作日志'
} }
], ],
......
...@@ -77,12 +77,12 @@ export default { ...@@ -77,12 +77,12 @@ export default {
iconMsg: [ iconMsg: [
{ {
type: 'md-flask', type: 'md-flask',
id: '', id: 'send-test-meter-send-entrust-his-view-sample-operation',
name: '查看样品' name: '查看样品'
}, },
{ {
type: 'ios-clock', type: 'ios-clock',
id: '', id: 'send-test-meter-send-entrust-his-record-operation',
name: '操作日志' name: '操作日志'
} }
], ],
......
...@@ -202,7 +202,13 @@ export default { ...@@ -202,7 +202,13 @@ export default {
searchOpen: true, searchOpen: true,
testedCityData: [], testedCityData: [],
judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }], judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
iconMsg: [{ type: 'md-trash', id: '', name: '删除' }], iconMsg: [
{
type: 'md-trash',
id: 'send-test-meter-send-test-edit-remove-operation',
name: '删除'
}
],
pageColumns: [ pageColumns: [
{ title: '样品名称', key: 'name', width: 160 }, { title: '样品名称', key: 'name', width: 160 },
{ title: '型号规格', key: 'spec' }, { title: '型号规格', key: 'spec' },
...@@ -219,12 +225,12 @@ export default { ...@@ -219,12 +225,12 @@ export default {
btn: [ btn: [
{ {
type: 'success', type: 'success',
id: '', id: 'send-test-meter-send-test-edit-add',
name: '添加' name: '添加'
}, },
{ {
type: 'success', type: 'success',
id: '', id: 'send-test-meter-send-test-edit-import',
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