Skip to content

P
patzn-cloud-web-back-soil
Commit 1e84fb1a by lichengming
Options

修改了个人检测任务的按钮id

parent 1dc49855
Showing with 54 additions and 38 deletions
pages/meter-out/personal-task/MeterGoOutTestEdit.vue
......@@ -27,7 +27,7 @@
</Form-item>
<Form-item label="省、市、区" prop="name" class="width-48">
<!-- <Input v-model="formObj.client" name="name" placeholder="请输入委托单位"/>-->
<CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
<CityNameCascader :value="testedCityData.join(',')" @on-result-change="_cascaderResult" name="tested">
</CityNameCascader>
</Form-item>
<Form-item label="街道" prop="street" class="width-48">
......@@ -54,7 +54,7 @@
<Col span="24">
<!-- <btn-list :msg="btn" :open="searchOpen" :showSearchBtn="false" @on-result-change="_btnClick"-->
<!-- class="contHide"></btn-list>-->
<Button type="success" @click="_add()">添加</Button>
<Button @click="_add()" type="success">添加</Button>
</Col>
<Col span="24">
<PTVXETable
......@@ -76,7 +76,7 @@
>
<template slot-scope="scope">
<div v-if="item.key==='name'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.name" blur placeholder="请输入或选择样品名称" @on-result-change="_judgeBasisChange" @click.native="_selectjudgeBasis(scope.$rowIndex)"
<el-input v-model="scope.row.name" @on-result-change="_judgeBasisChange" @click.native="_selectjudgeBasis(scope.$rowIndex)" blur placeholder="请输入或选择样品名称"
></el-input>
</div>
<div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
......@@ -97,9 +97,9 @@
<div v-if="item.key==='quantity'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.quantity"
@keydown.native="channelInputLimit"
type="number"
placeholder="请输入或选择数量"
@keydown.native="channelInputLimit"
/>
</div>
</template>
......@@ -110,7 +110,7 @@
<div slot="footer">
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div>
<EditModal ref="EditModal" is-change @on-result-change="_backData" />
<EditModal ref="EditModal" @on-result-change="_backData" is-change />
</Modal>
</div>
</template>
......@@ -143,8 +143,16 @@ export default {
},
judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
iconMsg: [
{ type: 'ios-clock', id: '', name: '编辑' },
{ type: 'ios-clock', id: '', name: '删除' }
{
type: 'ios-clock',
id: 'personal-task-meter-go-out-test-edit-edit-operation',
name: '编辑'
},
{
type: 'ios-clock',
id: 'personal-task-meter-go-out-test-edit-remove-operation',
name: '删除'
}
],
pageColumns: [
{ title: '样品名称', key: 'name', width: 160 },
......
pages/meter-out/personal-task/MeterOutPersonalTask.vue
......@@ -6,29 +6,29 @@
<Row>
<!--查询-->
<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>
<Form-item class="search-item" label="样品名称:">
<Input v-model="formObj.name" name="name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入样品名称" clearable/>
</Form-item>
<Form-item class="search-item" label="样品编号:">
<Input v-model="formObj.code" name="aptitude" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.code" @on-enter="_formSearch" name="aptitude" placeholder="请输入样品编号" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button>
<Button @click="_formSearch" type="primary">搜索</Button>
</Form-item>
</Form>
</Col>
<!--操作-->
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
@on-result-change="_btnClick"></btn-list>
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
class="contHide"></btn-list>
</Col>
<!--表格-->
<Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -106,55 +106,59 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'personal-task-meter-out-personal-task-take',
name: '仪器领用'
},
{
type: 'success',
id: '',
id: 'personal-task-meter-out-personal-task-car',
name: '车辆管理'
},
{
type: 'success',
id: '',
id: 'personal-task-meter-out-personal-task-submit',
name: '提交'
},
{
type: 'success',
id: '',
id: 'personal-task-meter-out-personal-task-submit-create',
name: '提交至证书编制'
},
{
type: 'success',
id: '',
id: 'personal-task-meter-out-personal-task-condition',
name: '检定条件'
}
],
iconMsg: [
{
type: 'ios-bookmarks',
id: '',
id: 'personal-task-meter-out-personal-task-create-operation',
name: '编制证书'
},
{
type: 'md-create',
id: '',
id: 'personal-task-meter-out-personal-task-result-operation',
name: '检测结果'
},
{
type: 'md-car',
id: '',
id: 'personal-task-meter-out-personal-task-car-operation',
name: '车辆管理'
},
{
type: 'ios-list-box',
id: '',
id: 'personal-task-meter-out-personal-task-take-operation',
name: '仪器领用'
},
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'md-cloud',
id: 'personal-task-meter-out-personal-task-accessory-operation',
name: '附件'
},
{
type: 'ios-clock',
id: '',
id: 'personal-task-meter-out-personal-task-record-operation',
name: '操作日志'
}
],
......
pages/meter-out/personal-task/MeterOutPersonalTaskHis.vue
......@@ -6,29 +6,29 @@
<Row>
<!--查询-->
<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>
<Form-item class="search-item" label="样品名称:">
<Input v-model="formObj.name" name="name" placeholder="请输入样品名称" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入样品名称" clearable/>
</Form-item>
<Form-item class="search-item" label="样品编号:">
<Input v-model="formObj.code" name="aptitude" placeholder="请输入样品编号" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.code" @on-enter="_formSearch" name="aptitude" placeholder="请输入样品编号" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button>
<Button @click="_formSearch" type="primary">搜索</Button>
</Form-item>
</Form>
</Col>
<!--操作-->
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
@on-result-change="_btnClick"></btn-list>
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
class="contHide"></btn-list>
</Col>
<!--表格-->
<Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -133,13 +133,17 @@ export default {
iconMsg: [
{
type: 'ios-bookmarks',
id: '',
id: 'personal-task-meter-out-personal-task-his-view-operation',
name: '查看证书'
},
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'md-cloud',
id: 'personal-task-meter-out-personal-task-his-accessory-operation',
name: '附件'
},
{
type: 'ios-clock',
id: '',
id: 'personal-task-meter-out-personal-task-his-record-operation',
name: '操作日志'
}
],
......
pages/meter-out/personal-task/MeterPersonItemTaskManage.vue
......@@ -108,17 +108,17 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'personal-task-meter-person-item-task-manage-input',
name: '填写检测值'
},
{
type: 'success',
id: '',
id: 'personal-task-meter-person-item-task-manage-judge',
name: '判定'
},
{
type: 'success',
id: '',
id: 'personal-task-meter-person-item-task-manage-condition',
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