Commit 307a9aa3 by lichengming

修改了分包数据录入的按钮id

parent e6b6e8b2
...@@ -98,15 +98,33 @@ export default { ...@@ -98,15 +98,33 @@ export default {
// {id: '', name: '删除'}, // {id: '', name: '删除'},
// ], // ],
iconMsg: [ iconMsg: [
{ type: 'md-create', id: '', name: '分包结果录入' }, {
{ type: 'ios-list', id: '', name: '历史版本' }, type: 'md-create',
{ type: 'ios-cloud-upload', id: '', name: '分包证书上传' }, id:
{ type: 'compose', id: '', name: '编辑' } 'subpackage-input-meter-sub-sample-manage-subpackage-result-enter-operation',
name: '分包结果录入'
},
{
type: 'ios-list',
id: 'subpackage-input-meter-sub-sample-manage-history-operation',
name: '历史版本'
},
{
type: 'ios-cloud-upload',
id:
'subpackage-input-meter-sub-sample-manage-subpackage-certificate-upload-operation',
name: '分包证书上传'
},
{
type: 'compose',
id: 'subpackage-input-meter-sub-sample-manage-edit-operation',
name: '编辑'
}
], ],
btn: [ btn: [
{ {
type: 'success', type: 'success',
id: '', id: 'subpackage-input-meter-sub-sample-manage-subpackage-return',
name: '分包返库' name: '分包返库'
} }
], ],
......
...@@ -82,13 +82,18 @@ export default { ...@@ -82,13 +82,18 @@ export default {
// }, // },
{ {
type: 'ios-beaker', type: 'ios-beaker',
id: '', id:
'subpackage-input-meter-subpackage-input-subpackage-sample-manage-operation',
name: '分包样品管理' name: '分包样品管理'
}, },
{ type: 'md-cloud', id: '', name: '附件' }, {
type: 'md-cloud',
id: 'subpackage-input-meter-subpackage-input-accessory-operation',
name: '附件'
},
{ {
type: 'md-book', type: 'md-book',
id: '', id: 'subpackage-input-meter-subpackage-input-record-operation',
name: '操作日志' name: '操作日志'
} }
], ],
......
...@@ -6,26 +6,26 @@ ...@@ -6,26 +6,26 @@
<Row> <Row>
<!--查询--> <!--查询-->
<Col span="24" style="margin-top: 10px"> <Col span="24" style="margin-top: 10px">
<Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false"> <Form id="formId" v-show="searchOpen" :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.client" name="name" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/> <Input v-model="formObj.client" @on-enter="_formSearch" name="name" placeholder="请输入委托单位" clearable/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<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" :loading="true" <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" hide-checkbox @on-result-change="_tableResultChange"> :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" hide-checkbox>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -77,18 +77,23 @@ export default { ...@@ -77,18 +77,23 @@ export default {
iconMsg: [ iconMsg: [
{ {
type: 'md-paper', type: 'md-paper',
id: '', id: 'subpackage-input-meter-subpackage-input-his-edit-operation',
name: '编辑' name: '编辑'
}, },
{ {
type: 'ios-beaker', type: 'ios-beaker',
id: '', id:
'subpackage-input-meter-subpackage-input-his-subpackage-sample-manage-operation',
name: '分包样品管理' name: '分包样品管理'
}, },
{ type: 'md-cloud', id: '', name: '附件' }, {
type: 'md-cloud',
id: 'subpackage-input-meter-subpackage-input-his-accessory-operation',
name: '附件'
},
{ {
type: 'md-book', type: 'md-book',
id: '', id: 'subpackage-input-meter-subpackage-input-his-record-operation',
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"
...@@ -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'">
...@@ -87,26 +87,39 @@ export default { ...@@ -87,26 +87,39 @@ export default {
// {id: '', name: '删除'}, // {id: '', name: '删除'},
// ], // ],
iconMsg: [ iconMsg: [
{ type: 'compose', id: '', name: '编辑' }, {
{ type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' }, type: 'compose',
{ type: 'trash-a', id: '', name: '删除' } id: 'subpackage-input-sub-result-input-edit-edit-operation',
name: '编辑'
},
{
type: 'ios-copy',
id: 'subpackage-input-sub-result-input-edit-copy-operation',
name: '复制',
componentName: 'CopyModal'
},
{
type: 'trash-a',
id: 'subpackage-input-sub-result-input-edit-remove-operation',
name: '删除'
}
], ],
btn: [ btn: [
{ {
// meter-review-entrust-pass-btn // meter-review-entrust-pass-btn
type: 'success', type: 'success',
id: '', id: 'subpackage-input-sub-result-input-edit-complete',
name: '完成' name: '完成'
}, },
// meter-review-entrust-back-btn // meter-review-entrust-back-btn
{ {
type: 'success', type: 'success',
id: '', id: 'subpackage-input-sub-result-input-edit-input-check-value',
name: '填写检测值' name: '填写检测值'
}, },
{ {
type: 'success', type: 'success',
id: '', id: 'subpackage-input-sub-result-input-edit-judge',
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