Skip to content

P
patzn-cloud-web-back-soil
Commit 5fdd237e by wangweidong
Options

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

# Conflicts:
#	pages/meter-contract/contract-register/MeterContractRegisterEdit.vue
#	pages/meter-entrust/client-online/MeterGoOutTestEdit.vue
parents 37d40670 60054609
Showing with 895 additions and 478 deletions
pages/meter-business/accepted/MeterContractAccepted.vue
......@@ -66,30 +66,34 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'accepted-meter-contract-accepted-pass',
name: '通过'
},
{
type: 'success',
id: '',
id: 'accepted-meter-contract-accepted-reject',
name: '驳回'
}
],
iconMsg: [
{
type: 'md-paper',
id: '',
id: 'accepted-meter-contract-accepted-detail-operation',
name: '详情'
},
{
type: 'ios-beaker',
id: '',
id: 'accepted-meter-contract-accepted-sample-manage-operation',
name: '样品管理'
},
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'md-cloud',
id: 'accepted-meter-contract-accepted-accessory-operation',
name: '附件'
},
{
type: 'ios-clock',
id: '',
id: 'accepted-meter-contract-accepted-record-operation',
name: '操作日志'
}
],
......
pages/meter-business/accepted/MeterContractAcceptedHis.vue
......@@ -6,26 +6,26 @@
<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.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" 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" hide-checkbox @on-result-change="_tableResultChange">
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" hide-checkbox>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -63,13 +63,18 @@ export default {
iconMsg: [
{
type: 'ios-beaker',
id: '',
id:
'accepted-meter-contract-accepted-his-check-sample-query-operation',
name: '报检样品查询'
},
{ type: 'ios-cloud', id: '', name: '附件' },
{
type: 'ios-cloud',
id: 'accepted-meter-contract-accepted-his-accessory-operation',
name: '附件'
},
{
type: 'ios-clock',
id: '',
id: 'accepted-meter-contract-accepted-his-record-operation',
name: '操作日志'
}
],
......
pages/meter-business/quote-check/MeterContractCheck.vue
......@@ -68,31 +68,35 @@ export default {
{
// meter-review-entrust-pass-btn
type: 'success',
id: '',
id: 'quote-check-meter-contract-check-pass',
name: '通过'
},
// meter-review-entrust-back-btn
{
type: 'success',
id: '',
id: 'quote-check-meter-contract-check-reject',
name: '驳回'
}
],
iconMsg: [
{
type: 'md-paper',
id: '',
id: 'quote-check-meter-contract-check-detail-operation',
name: '详情'
},
{
type: 'ios-beaker',
id: '',
id: 'quote-check-meter-contract-check-quote-sample-operation',
name: '报价样品'
},
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'md-cloud',
id: 'quote-check-meter-contract-check-accessory-operation',
name: '附件'
},
{
type: 'ios-clock',
id: '',
id: 'quote-check-meter-contract-check-record-operation',
name: '操作日志'
}
],
......
pages/meter-business/quote-check/MeterContractCheckHis.vue
......@@ -6,26 +6,26 @@
<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.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" 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" hide-checkbox @on-result-change="_tableResultChange">
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" hide-checkbox>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -63,13 +63,18 @@ export default {
iconMsg: [
{
type: 'ios-beaker',
id: '',
id:
'quote-check-meter-contract-check-his-quote-sample-query-operation',
name: '报检样品查询'
},
{ type: 'ios-cloud', id: '', name: '附件' },
{
type: 'ios-cloud',
id: 'quote-check-meter-contract-check-his-accessory-operation',
name: '附件'
},
{
type: 'ios-clock',
id: '',
id: 'quote-check-meter-contract-check-his-record-operation',
name: '操作日志'
}
],
......
pages/meter-business/quote-register/MeterQuoteRegister.vue
......@@ -6,21 +6,21 @@
<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.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" 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">
......@@ -65,32 +65,40 @@ export default {
btn: [
{
type: 'success',
id: 'meter-subcontractor-add-btn',
id: 'quote-register-meter-quote-register-add',
name: '添加'
},
// meter-subcontractor-submit-btn
{
type: 'success',
id: '',
id: 'quote-register-meter-quote-register-submit',
name: '提交'
}
],
iconMsg: [
{
type: 'md-create',
id: '',
id: 'quote-register-meter-quote-register-edit-operation',
name: '编辑'
},
{
type: 'ios-beaker',
id: '',
id: 'quote-register-meter-quote-register-quote-sample-operation',
name: '报价样品'
},
{ type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' },
{
type: 'md-cloud',
id: 'quote-register-meter-quote-register-accessory-operation',
name: '附件'
},
{
type: 'md-remove-circle',
id: 'quote-register-meter-quote-register-remove-operation',
name: '删除'
},
{
type: 'ios-clock',
id: '',
id: 'quote-register-meter-quote-register-record-operation',
name: '操作日志'
}
],
......
pages/meter-business/quote-register/MeterQuoteRegisterEdit.vue
......@@ -6,8 +6,8 @@
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
<Form-item label="委托单位" prop="client" class="width-48">
<AutoComplete :value="formObj.client" :down-data="customerData" name="client"
placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange"
<AutoComplete :value="formObj.client" :down-data="customerData" @on-result-change="_cusNameChange"
name="client" placeholder="请输入或选择委托单位"
></AutoComplete>
</Form-item>
<Form-item label="联系人" prop="person" class="width-48">
......@@ -20,7 +20,7 @@
<Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/>
</Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48">
<CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
<CityNameCascader :value="testedCityData.join(',')" @on-result-change="_cascaderResult" name="tested">
</CityNameCascader>
</Form-item>
......@@ -28,8 +28,8 @@
<Input v-model="formObj.street" name="street" placeholder="请输入街道"/>
</Form-item>
<Form-item label="要求完成时间：" prop="odate" class="width-48">
<Date-picker v-model="formObj.odate" type="date" split-panels style="width:100%;" placeholder="请选择要求完成时间"
@on-change="_ctimeChange"></Date-picker>
<Date-picker v-model="formObj.odate" @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
placeholder="请选择要求完成时间"></Date-picker>
</Form-item>
<Form-item label="折扣：" prop="discount" class="width-48">
<Input v-model="formObj.discount" name="discount" placeholder="折扣"/>
......@@ -48,8 +48,8 @@
<!--操作-->
<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
......@@ -71,7 +71,7 @@
>
<template slot-scope="scope">
<div v-if="item.key==='name'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.name" blur placeholder="请输入或选择样品名称" @click.native="_selectjudgeBasis(scope.$rowIndex)"
<el-input v-model="scope.row.name" @click.native="_selectjudgeBasis(scope.$rowIndex)" blur placeholder="请输入或选择样品名称"
></el-input>
</div>
<div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
......@@ -104,10 +104,10 @@
<div v-if="item.key==='quantity'" @click.stop="_handleRow(scope)" >
<el-input
v-model="scope.row.quantity"
type="number"
placeholder="请输入或选择数量"
@blur="_quantityChange(scope.$rowIndex)"
@keydown.native="channelInputLimit"
type="number"
placeholder="请输入或选择数量"
/>
</div>
......@@ -137,8 +137,8 @@
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div>
</Modal>
<EditModal ref="EditModal" is-change @on-result-change="_backData" />
<importModal ref="importModal" aptitude-item @on-result-change="_inputBack"></importModal>
<EditModal ref="EditModal" @on-result-change="_backData" is-change />
<importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal>
</div>
</template>
<script>
......@@ -185,7 +185,11 @@ export default {
judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
iconMsg: [
// { type: 'md-create', id: '', name: '编辑' },
{ type: 'md-trash', id: '', name: '删除' }
{
type: 'md-trash',
id: 'quote-register-meter-quote-register-edit-remove-operation',
name: '删除'
}
],
pageColumns: [
{ title: '名称', key: 'name', width: 160 },
......@@ -216,12 +220,12 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'quote-register-meter-quote-register-edit-add',
name: '添加'
},
{
type: 'success',
id: '',
id: 'quote-register-meter-quote-register-edit-import',
name: '导入'
}
],
......
pages/meter-business/quote-register/MeterQuoteRegisterHis.vue
......@@ -6,26 +6,26 @@
<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.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" 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" hide-checkbox @on-result-change="_tableResultChange">
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" hide-checkbox>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -69,13 +69,18 @@ export default {
iconMsg: [
{
type: 'ios-beaker',
id: '',
id:
'quote-register-meter-quote-register-his-quote-sample-query-operation',
name: '报检样品查询'
},
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'md-cloud',
id: 'quote-register-meter-quote-register-his-accessory-operation',
name: '附件'
},
{
type: 'ios-clock',
id: '',
id: 'quote-register-meter-quote-register-his-record-operation',
name: '操作日志'
}
],
......
pages/meter-contract/contract-file/MeterContractFile.vue
......@@ -6,24 +6,24 @@
<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.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.aptitude" @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">
......@@ -89,18 +89,22 @@ export default {
iconMsg: [
{
type: 'md-create',
id: '',
id: 'contract-file-meter-contract-file-review-record-operation',
name: '评审记录'
},
{
type: 'ios-beaker',
id: '',
id: 'contract-file-meter-contract-file-sample-manage-operation',
name: '样品管理'
},
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'md-cloud',
id: 'contract-file-meter-contract-file-accessory-operation',
name: '附件'
},
{
type: 'ios-clock',
id: '',
id: 'contract-file-meter-contract-file-record-operation',
name: '操作日志'
}
],
......
pages/meter-contract/contract-file/MeterContractFileEdit.vue
......@@ -6,8 +6,8 @@
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
<Form-item label="委托单位" prop="client" class="width-48">
<AutoComplete :value="formObj.client" :down-data="customerData" name="client" ref="autoComplete"
placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange"
<AutoComplete ref="autoComplete" :value="formObj.client" :down-data="customerData" @on-result-change="_cusNameChange"
name="client" placeholder="请输入或选择委托单位"
></AutoComplete>
</Form-item>
<Form-item label="联系人" prop="person" class="width-48">
......@@ -20,7 +20,7 @@
<Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/>
</Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48">
<CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
<CityNameCascader :value="testedCityData.join(',')" @on-result-change="_cascaderResult" name="tested">
</CityNameCascader>
</Form-item>
......@@ -28,8 +28,8 @@
<Input v-model="formObj.street" name="street" placeholder="请输入街道"/>
</Form-item>
<Form-item label="要求完成时间：" prop="odate" class="width-48">
<Date-picker type="date" split-panels style="width:100%;" placeholder="请选择要求完成时间"
@on-change="_ctimeChange"></Date-picker>
<Date-picker @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
placeholder="请选择要求完成时间"></Date-picker>
</Form-item>
<Form-item label="折扣：" prop="discount" class="width-48">
<Input v-model="formObj.discount" name="discount" placeholder="折扣"/>
......@@ -48,8 +48,8 @@
<!--操作-->
<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
......@@ -71,7 +71,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)">
......@@ -92,9 +92,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>
<div v-else-if="item.date">
......@@ -112,7 +112,7 @@
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div>
</Modal>
<importModal ref="importModal" aptitude-item @on-result-change="_inputBack"></importModal>
<importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal>
</div>
</template>
<script>
......@@ -151,8 +151,16 @@ export default {
testedCityData: [],
judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
iconMsg: [
{ type: 'ios-clock', id: '', name: '编辑' },
{ type: 'ios-clock', id: '', name: '删除' }
{
type: 'ios-clock',
id: 'contract-file-meter-contract-file-edit-edit-operation',
name: '编辑'
},
{
type: 'ios-clock',
id: 'contract-file-meter-contract-file-edit-remove-operation',
name: '删除'
}
],
pageColumns: [
{ title: '名称', key: 'name', width: 160 },
......@@ -183,12 +191,12 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'contract-file-meter-contract-file-edit-add',
name: '添加'
},
{
type: 'success',
id: '',
id: 'contract-file-meter-contract-file-edit-import',
name: '导入'
}
],
......
pages/meter-contract/contract-file/MeterContractReviewAddEdit.vue
......@@ -14,7 +14,7 @@
<!-- <Input v-model="formObj.person" name="person" placeholder="请输入评审人员"/>-->
<!-- </Form-item>-->
<Form-item label="检定/校准执行规程/规范：" prop="operation.requirements" style="width: 100%;margin-bottom: 5px;">
<Input v-model="formObj.operation.requirements" readonly :rows="2" name="requirements" type="textarea" placeholder="请输入要求"/>
<Input v-model="formObj.operation.requirements" :rows="2" readonly name="requirements" type="textarea" placeholder="请输入要求"/>
</Form-item>
<Form-item label="要求完成时间" prop="odate" style="width: 100%;margin-bottom: 5px;">
<span>
......@@ -57,7 +57,7 @@
placeholder="请输入解决的问题"/>
</Form-item>
<Form-item label="评审结论" prop="operation.reviewConclusion" style="width: 99.8%;margin-bottom: 5px;">
<Input v-model="formObj.operation.reviewConclusion" readonly :rows="2" name="verdict" type="textarea"
<Input v-model="formObj.operation.reviewConclusion" :rows="2" readonly name="verdict" type="textarea"
placeholder="请输入评审结论"/>
</Form-item>
......@@ -72,7 +72,7 @@
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div>
</Modal>
<importModal ref="importModal" aptitude-item @on-result-change="_inputBack"></importModal>
<importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal>
</div>
</template>
<script>
......@@ -111,8 +111,16 @@ export default {
testedCityData: [],
judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
iconMsg: [
{ type: 'ios-clock', id: '', name: '编辑' },
{ type: 'ios-clock', id: '', name: '删除' }
{
type: 'ios-clock',
id: 'contract-file-meter-contract-review-add-edit-edit-operation',
name: '编辑'
},
{
type: 'ios-clock',
id: 'contract-file-meter-contract-review-add-edit-remove-operation',
name: '删除'
}
],
pageColumns: [
{ title: '名称', key: 'name', width: 160 },
......@@ -143,12 +151,12 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'contract-file-meter-contract-review-add-edit-add',
name: '添加'
},
{
type: 'success',
id: '',
id: 'contract-file-meter-contract-review-add-edit-import',
name: '导入'
}
],
......
pages/meter-contract/contract-register/MeterContractRegister.vue
......@@ -6,24 +6,24 @@
<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.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.aptitude" @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">
......@@ -67,31 +67,40 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'contract-register-meter-contract-register-add',
name: '添加'
},
{
type: 'success',
id: '',
id: 'contract-register-meter-contract-register-submit',
name: '提交'
}
],
iconMsg: [
{
type: 'md-create',
id: '',
id: 'contract-register-meter-contract-register-edit-operation',
name: '编辑'
},
{
type: 'ios-beaker',
id: '',
id:
'contract-register-meter-contract-register-sample-manage-operation',
name: '样品管理'
},
{ type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' },
{
type: 'md-cloud',
id: 'contract-register-meter-contract-register-accessory-operation',
name: '附件'
},
{
type: 'md-remove-circle',
id: 'contract-register-meter-contract-register-remove-operation',
name: '删除'
},
{
type: 'ios-clock',
id: '',
id: 'contract-register-meter-contract-register-record-operation',
name: '操作日志'
}
],
......
pages/meter-contract/contract-register/MeterContractRegisterEdit.vue
......@@ -162,8 +162,11 @@ export default {
testedCityData: [],
judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
iconMsg: [
// { type: 'ios-clock', id: '', name: '编辑' },
{ type: 'md-trash', id: '', name: '删除' }
{
type: 'md-trash',
id: 'contract-register-meter-contract-register-edit-remove-operation',
name: '删除'
}
],
pageColumns: [
{ title: '名称', key: 'name', width: 160 },
......@@ -195,12 +198,12 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'contract-register-meter-contract-register-edit-add',
name: '添加'
},
{
type: 'success',
id: '',
id: 'contract-register-meter-contract-register-edit-import',
name: '导入'
}
],
......
pages/meter-contract/contract-register/MeterContractRegisterHis.vue
......@@ -64,7 +64,7 @@ export default {
btn: [
{
type: 'success',
id: 'meter-subcontractor-add-btn',
id: 'contract-register-meter-contract-register-his-add',
name: '添加'
}
],
......@@ -79,11 +79,20 @@ export default {
// id: '',
// name: '资质项目'
// },
{ type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' },
{
type: 'md-cloud',
id:
'contract-register-meter-contract-register-his-accessory-operation',
name: '附件'
},
{
type: 'md-remove-circle',
id: 'contract-register-meter-contract-register-his-remove-operation',
name: '删除'
},
{
type: 'ios-clock',
id: '',
id: 'contract-register-meter-contract-register-his-record-operation',
name: '操作日志'
}
],
......
pages/meter-contract/contract-review/MeterContractReview.vue
......@@ -82,26 +82,34 @@ export default {
// },
{
type: 'success',
id: '',
id: 'contract-review-meter-contract-review-reject',
name: '驳回'
}
],
iconMsg: [
{
type: 'md-create',
id: '',
id: 'contract-review-meter-contract-review-review-operation',
name: '评审'
},
{
type: 'ios-beaker',
id: '',
id: 'contract-review-meter-contract-review-view-sample-operation',
name: '查看样品'
},
{ type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' },
{
type: 'md-cloud',
id: 'contract-review-meter-contract-review-accessory-operation',
name: '附件'
},
{
type: 'md-remove-circle',
id: 'contract-review-meter-contract-review-remove-operation',
name: '删除'
},
{
type: 'ios-clock',
id: '',
id: 'contract-review-meter-contract-review-record-operation',
name: '操作日志'
}
],
......
pages/meter-contract/contract-review/MeterContractReviewAddEdit.vue
......@@ -14,7 +14,7 @@
<!-- <Input v-model="formObj.person" name="person" placeholder="请输入评审人员"/>-->
<!-- </Form-item>-->
<Form-item label="检定/校准执行规程/规范：" prop="requirements" style="width: 100%;margin-bottom: 5px;">
<Input v-model="formObj.requirements" readonly :rows="2" name="requirements" type="textarea" placeholder="请输入要求"/>
<Input v-model="formObj.requirements" :rows="2" readonly name="requirements" type="textarea" placeholder="请输入要求"/>
</Form-item>
<Form-item label="要求完成时间" prop="odate" style="width: 100%;margin-bottom: 5px;">
<span>
......@@ -78,7 +78,7 @@
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div>
</Modal>
<importModal ref="importModal" aptitude-item @on-result-change="_inputBack"></importModal>
<importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal>
</div>
</template>
<script>
......@@ -117,8 +117,16 @@ export default {
testedCityData: [],
judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
iconMsg: [
{ type: 'ios-clock', id: '', name: '编辑' },
{ type: 'ios-clock', id: '', name: '删除' }
{
type: 'ios-clock',
id: 'contract-review-meter-contract-review-add-edit-edit-operation',
name: '编辑'
},
{
type: 'ios-clock',
id: 'contract-review-meter-contract-review-add-edit-remove-operation',
name: '删除'
}
],
pageColumns: [
{ title: '名称', key: 'name', width: 160 },
......@@ -149,12 +157,12 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'contract-review-meter-contract-review-add-edit-add',
name: '添加'
},
{
type: 'success',
id: '',
id: 'contract-review-meter-contract-review-add-edit-import',
name: '导入'
}
],
......
pages/meter-contract/contract-review/MeterContractReviewEdit.vue
......@@ -6,8 +6,8 @@
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
<Form-item label="委托单位" prop="client" class="width-48">
<AutoComplete :value="formObj.client" :down-data="customerData" name="client" ref="autoComplete"
placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange"
<AutoComplete ref="autoComplete" :value="formObj.client" :down-data="customerData" @on-result-change="_cusNameChange"
name="client" placeholder="请输入或选择委托单位"
></AutoComplete>
</Form-item>
<Form-item label="联系人" prop="person" class="width-48">
......@@ -20,7 +20,7 @@
<Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/>
</Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48">
<CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
<CityNameCascader :value="testedCityData.join(',')" @on-result-change="_cascaderResult" name="tested">
</CityNameCascader>
</Form-item>
......@@ -28,8 +28,8 @@
<Input v-model="formObj.street" name="street" placeholder="请输入街道"/>
</Form-item>
<Form-item label="要求完成时间：" prop="odate" class="width-48">
<Date-picker type="date" split-panels style="width:100%;" placeholder="请选择要求完成时间"
@on-change="_ctimeChange"></Date-picker>
<Date-picker @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
placeholder="请选择要求完成时间"></Date-picker>
</Form-item>
<Form-item label="折扣：" prop="discount" class="width-48">
<Input v-model="formObj.discount" name="discount" placeholder="折扣"/>
......@@ -48,8 +48,8 @@
<!--操作-->
<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
......@@ -71,7 +71,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)">
......@@ -92,9 +92,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>
<div v-else-if="item.date">
......@@ -112,7 +112,7 @@
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div>
</Modal>
<importModal ref="importModal" aptitude-item @on-result-change="_inputBack"></importModal>
<importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal>
</div>
</template>
<script>
......@@ -151,8 +151,16 @@ export default {
testedCityData: [],
judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
iconMsg: [
{ type: 'ios-clock', id: '', name: '编辑' },
{ type: 'ios-clock', id: '', name: '删除' }
{
type: 'ios-clock',
id: 'contract-review-meter-contract-review-edit-edit-operation',
name: '编辑'
},
{
type: 'ios-clock',
id: 'contract-review-meter-contract-review-edit-remove-operation',
name: '删除'
}
],
pageColumns: [
{ title: '名称', key: 'name', width: 160 },
......@@ -183,12 +191,12 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'contract-review-meter-contract-review-edit-add',
name: '添加'
},
{
type: 'success',
id: '',
id: 'contract-review-meter-contract-review-edit-import',
name: '导入'
}
],
......
pages/meter-contract/contract-review/MeterContractReviewHis.vue
......@@ -64,7 +64,7 @@ export default {
btn: [
{
type: 'success',
id: 'meter-subcontractor-add-btn',
id: 'contract-review-meter-contract-review-his-add',
name: '添加'
}
],
......@@ -79,11 +79,19 @@ export default {
// id: '',
// name: '资质项目'
// },
{ type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' },
{
type: 'md-cloud',
id: 'contract-review-meter-contract-review-his-accessory-operation',
name: '附件'
},
{
type: 'md-remove-circle',
id: 'contract-review-meter-contract-review-his-remove-operation',
name: '删除'
},
{
type: 'ios-clock',
id: '',
id: 'contract-review-meter-contract-review-his-record-operation',
name: '操作日志'
}
],
......
pages/meter-entrust/MeterItemManage.vue
......@@ -10,21 +10,21 @@
<Form id="formId" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label>
<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 class="search-btn" style="margin-left: -10px">
<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" :get-page="getPage" :icon-msg="iconMsg"
select-data @on-result-change="_tableResultChange">
@on-result-change="_tableResultChange" select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -74,7 +74,13 @@ export default {
data() {
return {
currentComponent: '',
iconMsg: [{ type: 'md-trash', id: '', name: '删除' }],
iconMsg: [
{
type: 'md-trash',
id: 'meter-entrust-meter-item-manage-remove-operation',
name: '删除'
}
],
btn: [],
options: [
{
......
pages/meter-entrust/MeterSampleManage.vue
......@@ -10,24 +10,24 @@
<Form id="formId" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label>
<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 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 class="search-btn" style="margin-left: -10px">
<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" :get-page="getPage"
:icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
:icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -85,34 +85,46 @@ export default {
currentComponent: '',
searchOpen: false,
iconMsg: [
{ type: 'compose', id: '', name: '编辑' },
{ type: 'ios-flask-outline', id: '', name: '管理检测项目' },
{ type: 'trash-a', id: '', name: '删除' }
{
type: 'compose',
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: [
{
type: 'success',
id: '',
id: 'meter-entrust-meter-sample-manage-add',
name: '新增'
},
{
type: 'success',
id: '',
id: 'meter-entrust-meter-sample-manage-import-sample',
name: '导入样品'
},
{
type: 'success',
id: '',
id: 'meter-entrust-meter-sample-manage-subpackage',
name: '分包'
},
{
type: 'success',
id: '',
id: 'meter-entrust-meter-sample-manage-subpackage-cancel',
name: '取消分包'
},
{
type: 'success',
id: '',
id: 'meter-entrust-meter-sample-manage-import-test-item',
name: '导入检测项目'
}
],
......
pages/meter-entrust/MeterSampleManageRead.vue
......@@ -10,24 +10,24 @@
<Form id="formId" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label>
<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 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 class="search-btn" style="margin-left: -10px">
<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" :get-page="getPage"
:icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
:icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -84,11 +84,18 @@ export default {
return {
currentComponent: '',
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: [
{
type: 'success',
id: '',
id: 'meter-entrust-meter-sample-manage-read-add-sample',
name: '追加样品'
}
// {
......
pages/meter-entrust/client-online/MeterClientOnlineEntrust.vue
......@@ -6,24 +6,24 @@
<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.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item>
<Form-item class="search-item" label="委托单号:">
<Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托单号" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" 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">
......@@ -80,26 +80,35 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'client-online-meter-client-online-entrust-submit',
name: '提交'
}
],
iconMsg: [
{
type: 'md-create',
id: '',
id: 'client-online-meter-client-online-entrust-edit-operation',
name: '编辑'
},
{
type: 'ios-beaker',
id: '',
id:
'client-online-meter-client-online-entrust-sample-manage-operation',
name: '管理样品'
},
{ type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' },
{
type: 'md-cloud',
id: 'client-online-meter-client-online-entrust-accessory-operation',
name: '附件'
},
{
type: 'md-remove-circle',
id: 'client-online-meter-client-online-entrust-remove-operation',
name: '删除'
},
{
type: 'ios-clock',
id: '',
id: 'client-online-meter-client-online-entrust-record-operation',
name: '操作日志'
}
],
......
pages/meter-entrust/client-online/MeterClientOnlineEntrustHis.vue
......@@ -12,7 +12,7 @@
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item>
<Form-item class="search-item" label="委托单号:">
<Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托单号" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" placeholder="请输入委托单号" clearable/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
......@@ -67,24 +67,25 @@ export default {
btn: [
{
type: 'success',
id: 'meter-go-out-entrust-add-btn',
id: 'client-online-meter-client-online-entrust-his-add',
name: '添加'
},
{
type: 'success',
id: 'meter-go-out-entrust-submit-btn',
id: 'client-online-meter-client-online-entrust-his-submit',
name: '提交'
}
],
iconMsg: [
{
type: 'md-flask',
id: '',
id:
'client-online-meter-client-online-entrust-his-view-sample-operation',
name: '查看样品'
},
{
type: 'ios-clock',
id: '',
id: 'client-online-meter-client-online-entrust-his-record-operation',
name: '操作日志'
}
],
......
pages/meter-entrust/client-online/MeterGoOutTestEdit.vue
......@@ -172,7 +172,13 @@ export default {
testedCityData: [],
customerData: [],
judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
iconMsg: [{ type: 'md-trash', id: '', name: '删除' }],
iconMsg: [
{
type: 'md-trash',
id: 'client-online-meter-go-out-test-edit-remove-operation',
name: '删除'
}
],
pageColumns: [
{ title: '样品名称', key: 'name', width: 160 },
{ title: '型号规格', key: 'spec' },
......
pages/meter-entrust/client-online/MeterItemManage.vue
......@@ -10,21 +10,21 @@
<Form id="formId" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label>
<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 class="search-btn" style="margin-left: -10px">
<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" :get-page="getPage"
select-data @on-result-change="_tableResultChange">
@on-result-change="_tableResultChange" select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -75,9 +75,22 @@ export default {
return {
currentComponent: '',
iconMsg: [
{ type: 'compose', id: '', name: '编辑' },
{ type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
{ type: 'trash-a', id: '', name: '删除' }
{
type: 'compose',
id: 'client-online-meter-item-manage-edit-operation',
name: '编辑'
},
{
type: 'ios-copy',
id: 'client-online-meter-item-manage-copy-operation',
name: '复制',
componentName: 'CopyModal'
},
{
type: 'trash-a',
id: 'client-online-meter-item-manage-remove-operation',
name: '删除'
}
],
btn: [],
options: [
......
pages/meter-entrust/client-online/MeterSampleManage.vue
......@@ -10,24 +10,24 @@
<Form id="formId" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label>
<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 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 class="search-btn" style="margin-left: -10px">
<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" :get-page="getPage"
:icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
:icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -78,29 +78,41 @@ export default {
currentComponent: '',
searchOpen: false,
iconMsg: [
{ type: 'compose', id: '', name: '编辑' },
{ type: 'ios-flask-outline', id: '', name: '管理检测项目' },
{ type: 'trash-a', id: '', name: '删除' }
{
type: 'compose',
id: 'client-online-meter-sample-manage-edit-operation',
name: '编辑'
},
{
type: 'ios-flask-outline',
id: 'client-online-meter-sample-manage-test-item-manage-operation',
name: '管理检测项目'
},
{
type: 'trash-a',
id: 'client-online-meter-sample-manage-remove-operation',
name: '删除'
}
],
btn: [
{
type: 'success',
id: '',
id: 'client-online-meter-sample-manage-add',
name: '新增'
},
{
type: 'success',
id: '',
id: 'client-online-meter-sample-manage-subpackage',
name: '分包'
},
{
type: 'success',
id: '',
id: 'client-online-meter-sample-manage-subpackage-cancel',
name: '取消分包'
},
{
type: 'success',
id: '',
id: 'client-online-meter-sample-manage-import-test-item',
name: '导入检测项目'
}
],
......
pages/meter-entrust/go-out-test/MeterGoOutEntrust.vue
......@@ -6,24 +6,24 @@
<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.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item>
<Form-item class="search-item" label="委托单号:">
<Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托单号" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" 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">
......@@ -90,20 +90,32 @@ export default {
iconMsg: [
{
type: 'md-create',
id: '',
id: 'go-out-test-meter-go-out-entrust-edit-operation',
name: '编辑'
},
{
type: 'ios-beaker',
id: '',
id: 'go-out-test-meter-go-out-entrust-sample-manage-operation',
name: '管理样品'
},
{ type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-document', id: '', name: '导出委托单' },
{ type: 'md-remove-circle', id: '', name: '删除' },
{
type: 'md-cloud',
id: 'go-out-test-meter-go-out-entrust-accessory-operation',
name: '附件'
},
{
type: 'md-document',
id: 'go-out-test-meter-go-out-entrust-export-entrust-operation',
name: '导出委托单'
},
{
type: 'md-remove-circle',
id: 'go-out-test-meter-go-out-entrust-remove-operation',
name: '删除'
},
{
type: 'ios-clock',
id: '',
id: 'go-out-test-meter-go-out-entrust-record-operation',
name: '操作日志'
}
],
......
pages/meter-entrust/go-out-test/MeterGoOutEntrustHis.vue
......@@ -67,24 +67,24 @@ export default {
btn: [
{
type: 'success',
id: 'meter-go-out-entrust-add-btn',
id: 'go-out-test-meter-go-out-entrust-his-add',
name: '添加'
},
{
type: 'success',
id: 'meter-go-out-entrust-submit-btn',
id: 'go-out-test-meter-go-out-entrust-his-submit',
name: '提交'
}
],
iconMsg: [
{
type: 'md-flask',
id: '',
id: 'go-out-test-meter-go-out-entrust-his-view-sample-operation',
name: '查看样品'
},
{
type: 'ios-clock',
id: '',
id: 'go-out-test-meter-go-out-entrust-his-record-operation',
name: '操作日志'
}
],
......
pages/meter-entrust/go-out-test/MeterGoOutTestEdit.vue
......@@ -10,8 +10,8 @@
</Radio-group>
</Form-item>
<Form-item label="委托单位" prop="client" class="width-48">
<AutoComplete :value="formObj.client" :down-data="customerData" name="client"
placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange"
<AutoComplete :value="formObj.client" :down-data="customerData" @on-result-change="_cusNameChange"
name="client" placeholder="请输入或选择委托单位"
></AutoComplete>
</Form-item>
<Form-item label="联系人" prop="operation.person" class="width-48">
......@@ -24,7 +24,7 @@
<Input v-model="formObj.operation.fax" name="operation.fax" placeholder="请输入传真"/>
</Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48">
<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">
......@@ -38,15 +38,15 @@
<Input v-model="formObj.operation.email" name="operation.email" placeholder="请输入E-mail"/>
</Form-item>
<Form-item label="委托日期：" prop="edate" class="width-48">
<Date-picker v-model="formObj.edate" type="date" split-panels style="width:100%;" placeholder="请选择委托日期"
@on-change="_ctimeChange"></Date-picker>
<Date-picker v-model="formObj.edate" @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
placeholder="请选择委托日期"></Date-picker>
</Form-item>
<Form-item label="委托费用：" prop="operation.fee" class="width-48">
<Input v-model="formObj.operation.fee" type="number" name="operation.fee" placeholder="请输入委托费用" @keydown.native="channelInputLimit"/>
<Input v-model="formObj.operation.fee" @keydown.native="channelInputLimit" type="number" name="operation.fee" placeholder="请输入委托费用"/>
</Form-item>
<Form-item label="要求完成日期：" prop="odate" class="width-48">
<Date-picker v-model="formObj.odate" type="date" split-panels style="width:100%;" placeholder="请选择要求完成"
@on-change="_odateChange"></Date-picker>
<Date-picker v-model="formObj.odate" @on-change="_odateChange" type="date" split-panels style="width:100%;"
placeholder="请选择要求完成"></Date-picker>
</Form-item>
<Form-item label="合同号：" prop="contractCode" class="width-48">
<Input v-model="formObj.contractCode" name="contractCode" placeholder="请输入合同号"/>
......@@ -59,8 +59,8 @@
<Col span="24">
<!-- <btn-list :msg="btn" :open="searchOpen" :showSearchBtn="false" @on-result-change="_btnClick"-->
<!-- class="contHide"></btn-list>-->
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="false" class="contHide"
@on-result-change="_btnClick"></btn-list>
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="false" @on-result-change="_btnClick"
class="contHide"></btn-list>
<!-- <Button @click="_add()" type="success">添加</Button>-->
</Col>
<Col span="24">
......@@ -83,7 +83,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)">
......@@ -116,34 +116,34 @@
<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>
<div v-if="item.key==='testFee'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.testFee"
@keydown.native="channelInputLimit"
type="number"
placeholder="请输入检定/校准费"
@keydown.native="channelInputLimit"
/>
</div>
<div v-if="item.key==='repairFee'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.repairFee"
@keydown.native="channelInputLimit"
type="number"
placeholder="请输入调修费"
@keydown.native="channelInputLimit"
/>
</div>
<div v-if="item.key==='elseFee'" @click.stop="_handleRow(scope)">
<el-input
v-model="scope.row.elseFee"
@keydown.native="channelInputLimit"
type="number"
placeholder="请输入其他费用"
@keydown.native="channelInputLimit"
/>
</div>
<span v-else>{{scope.row[item.key]}}</span>
......@@ -155,8 +155,8 @@
<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" />
<importModal ref="importModal" aptitude-item @on-result-change="_inputBack"></importModal>
<EditModal ref="EditModal" @on-result-change="_backData" is-change />
<importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal>
</Modal>
</div>
</template>
......@@ -217,7 +217,13 @@ export default {
customerData: [],
searchOpen: true,
judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
iconMsg: [{ type: 'md-trash', id: '', name: '删除' }],
iconMsg: [
{
type: 'md-trash',
id: 'go-out-test-meter-go-out-test-edit-remove-operation',
name: '删除'
}
],
pageColumns: [
{ title: '样品名称', key: 'name', width: 160 },
{ title: '型号规格', key: 'spec' },
......@@ -234,12 +240,12 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'go-out-test-meter-go-out-test-edit-add',
name: '添加'
},
{
type: 'success',
id: '',
id: 'go-out-test-meter-go-out-test-edit-import',
name: '导入'
}
],
......
pages/meter-entrust/send-test/MeterSendEntrust.vue
......@@ -67,37 +67,49 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'send-test-meter-send-entrust-add',
name: '添加'
},
{
type: 'success',
id: '',
id: 'send-test-meter-send-entrust-submit-review',
name: '提交至评审'
},
{
type: 'success',
id: '',
id: 'send-test-meter-send-entrust-submit',
name: '提交'
}
],
iconMsg: [
{
type: 'md-create',
id: '',
id: 'send-test-meter-send-entrust-edit-operation',
name: '编辑'
},
{
type: 'ios-beaker',
id: '',
id: 'send-test-meter-send-entrust-sample-manage-operation',
name: '管理样品'
},
{ type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-document', id: '', name: '导出委托单' },
{ type: 'md-remove-circle', id: '', name: '删除' },
{
type: 'md-cloud',
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',
id: '',
id: 'send-test-meter-send-entrust-record-operation',
name: '操作日志'
}
],
......
pages/meter-entrust/send-test/MeterSendEntrustHis.vue
......@@ -77,12 +77,12 @@ export default {
iconMsg: [
{
type: 'md-flask',
id: '',
id: 'send-test-meter-send-entrust-his-view-sample-operation',
name: '查看样品'
},
{
type: 'ios-clock',
id: '',
id: 'send-test-meter-send-entrust-his-record-operation',
name: '操作日志'
}
],
......
pages/meter-entrust/send-test/MeterSendTestEdit.vue
......@@ -202,7 +202,13 @@ export default {
searchOpen: true,
testedCityData: [],
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: [
{ title: '样品名称', key: 'name', width: 160 },
{ title: '型号规格', key: 'spec' },
......@@ -219,12 +225,12 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'send-test-meter-send-test-edit-add',
name: '添加'
},
{
type: 'success',
id: '',
id: 'send-test-meter-send-test-edit-import',
name: '导入'
}
],
......
pages/meter-out/MeterItemManage.vue
......@@ -10,21 +10,21 @@
<Form id="formId" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label>
<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 class="search-btn" style="margin-left: -10px">
<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" :get-page="getPage"
select-data @on-result-change="_tableResultChange">
@on-result-change="_tableResultChange" select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -75,9 +75,22 @@ export default {
return {
currentComponent: '',
iconMsg: [
{ type: 'compose', id: '', name: '编辑' },
{ type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
{ type: 'trash-a', id: '', name: '删除' }
{
type: 'compose',
id: 'task-distribute-meter-item-manage-edit-operation',
name: '编辑'
},
{
type: 'ios-copy',
id: 'task-distribute-meter-item-manage-copy-operation',
name: '复制',
componentName: 'CopyModal'
},
{
type: 'trash-a',
id: 'task-distribute-meter-item-manage-remove-operation',
name: '删除'
}
],
btn: [],
options: [
......
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: '检定条件'
}
],
......
pages/meter-out/task-distribute/MeterOutTaskDistribute.vue
......@@ -6,24 +6,24 @@
<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.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" 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">
......@@ -75,13 +75,18 @@ export default {
// },
{
type: 'ios-contact',
id: '',
id:
'task-distribute-meter-out-task-distribute-task-allocation-operation',
name: '任务分配'
},
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'md-cloud',
id: 'task-distribute-meter-out-task-distribute-accessory-operation',
name: '附件'
},
{
type: 'ios-clock',
id: '',
id: 'task-distribute-meter-out-task-distribute-record-operation',
name: '操作日志'
}
],
......
pages/meter-out/task-distribute/MeterOutTaskDistributeHis.vue
......@@ -6,24 +6,24 @@
<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.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" 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">
......@@ -75,13 +75,19 @@ export default {
// },
{
type: 'ios-contact',
id: '',
id:
'task-distribute-meter-out-task-distribute-his-task-allocation-operation',
name: '任务分配'
},
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'md-cloud',
id:
'task-distribute-meter-out-task-distribute-his-accessory-operation',
name: '附件'
},
{
type: 'ios-clock',
id: '',
id: 'task-distribute-meter-out-task-distribute-his-record-operation',
name: '操作日志'
}
],
......
pages/meter-review/MeterReviewEntrust.vue
......@@ -71,31 +71,35 @@ export default {
{
// meter-review-entrust-pass-btn
type: 'success',
id: '',
id: 'meter-review-meter-review-entrust-pass',
name: '通过'
},
// meter-review-entrust-back-btn
{
type: 'success',
id: '',
id: 'meter-review-meter-review-entrust-reject',
name: '驳回'
}
],
iconMsg: [
{
type: 'md-paper',
id: '',
id: 'meter-review-meter-review-entrust-detail-operation',
name: '详情'
},
{
type: 'ios-beaker',
id: '',
id: 'meter-review-meter-review-entrust-sample-manage-operation',
name: '样品管理'
},
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'md-cloud',
id: 'meter-review-meter-review-entrust-accessory-operation',
name: '附件'
},
{
type: 'ios-clock',
id: '',
id: 'meter-review-meter-review-entrust-record-operation',
name: '操作日志'
}
],
......
pages/meter-review/MeterReviewEntrustHis.vue
......@@ -59,26 +59,34 @@ export default {
btn: [
{
type: 'success',
id: 'meter-subcontractor-add-btn',
id: 'meter-review-meter-review-entrust-his-add',
name: '添加'
}
],
iconMsg: [
{
type: 'ios-clock',
id: '',
id: 'meter-review-meter-review-entrust-his-edit-operation',
name: '编辑'
},
{
type: 'ios-clock',
id: '',
id: 'meter-review-meter-review-entrust-his-aptitude-operation',
name: '资质项目'
},
{ type: 'ios-clock', id: '', name: '附件' },
{ type: 'ios-clock', id: '', name: '删除' },
{
type: 'ios-clock',
id: '',
id: 'meter-review-meter-review-entrust-his-accessory-operation',
name: '附件'
},
{
type: 'ios-clock',
id: 'meter-review-meter-review-entrust-his-remove-operation',
name: '删除'
},
{
type: 'ios-clock',
id: 'meter-review-meter-review-entrust-his-record-operation',
name: '操作日志'
}
],
......
pages/meter-review/MeterReviewItemManage.vue
......@@ -10,21 +10,21 @@
<Form id="formId" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label>
<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 class="search-btn" style="margin-left: -10px">
<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" :get-page="getPage"
select-data @on-result-change="_tableResultChange">
@on-result-change="_tableResultChange" select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -75,9 +75,22 @@ export default {
return {
currentComponent: '',
iconMsg: [
{ type: 'compose', id: '', name: '编辑' },
{ type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
{ type: 'trash-a', id: '', name: '删除' }
{
type: 'compose',
id: 'meter-review-meter-review-item-manage-edit-operation',
name: '编辑'
},
{
type: 'ios-copy',
id: 'meter-review-meter-review-item-manage-copy-operation',
name: '复制',
componentName: 'CopyModal'
},
{
type: 'trash-a',
id: 'meter-review-meter-review-item-manage-remove-operation',
name: '删除'
}
],
btn: [],
options: [
......
pages/meter-review/MeterSampleManage.vue
......@@ -87,24 +87,36 @@ export default {
// {id: '', name: '删除'},
// ],
iconMsg: [
{ type: 'compose', id: '', name: '编辑' },
{ type: 'ios-flask-outline', id: '', name: '管理检测项目' },
{ type: 'trash-a', id: '', name: '删除' }
{
type: 'compose',
id: 'meter-review-meter-sample-manage-edit-operation',
name: '编辑'
},
{
type: 'ios-flask-outline',
id: 'meter-review-meter-sample-manage-test-itm-manage-operation',
name: '管理检测项目'
},
{
type: 'trash-a',
id: 'meter-review-meter-sample-manage-remove-operation',
name: '删除'
}
],
btn: [
{
type: 'success',
id: '',
id: 'meter-review-meter-sample-manage-subpackage',
name: '分包'
},
{
type: 'success',
id: '',
id: 'meter-review-meter-sample-manage-subpackage-cancel',
name: '取消分包'
},
{
type: 'success',
id: '',
id: 'meter-review-meter-sample-manage-import-test-item',
name: '导入检测项目'
}
],
......
pages/meter-send/MeterItemManage.vue
......@@ -10,21 +10,21 @@
<Form id="formId" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label>
<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 class="search-btn" style="margin-left: -10px">
<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" :get-page="getPage"
select-data @on-result-change="_tableResultChange">
@on-result-change="_tableResultChange" select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -75,9 +75,22 @@ export default {
return {
currentComponent: '',
iconMsg: [
{ type: 'compose', id: '', name: '编辑' },
{ type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
{ type: 'trash-a', id: '', name: '删除' }
{
type: 'compose',
id: 'meter-send-meter-item-manage-edit',
name: '编辑'
},
{
type: 'ios-copy',
id: 'meter-send-meter-item-manage-copy',
name: '复制',
componentName: 'CopyModal'
},
{
type: 'trash-a',
id: 'meter-send-meter-item-manage-remove',
name: '删除'
}
],
btn: [],
options: [
......
pages/meter-send/receive-sample/MeterReceiveEntrust.vue
......@@ -82,18 +82,22 @@ export default {
iconMsg: [
{
type: 'md-paper',
id: '',
id: 'receive-sample-meter-receive-entrust-detail',
name: '详情'
},
{
type: 'ios-beaker',
id: '',
id: 'receive-sample-meter-receive-entrust-sample-manage',
name: '样品管理'
},
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'md-cloud',
id: 'receive-sample-meter-receive-entrust-accessory',
name: '附件'
},
{
type: 'ios-clock',
id: '',
id: 'receive-sample-meter-receive-entrust-record',
name: '操作日志'
}
],
......
pages/meter-send/receive-sample/MeterReceiveEntrustHis.vue
......@@ -6,24 +6,24 @@
<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.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" 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">
......@@ -76,18 +76,22 @@ export default {
iconMsg: [
{
type: 'md-paper',
id: '',
id: 'receive-sample-meter-receive-entrust-his-detail',
name: '详情'
},
{
type: 'ios-beaker',
id: '',
id: 'receive-sample-meter-receive-entrust-his-sample-manage',
name: '样品管理'
},
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'md-cloud',
id: 'receive-sample-meter-receive-entrust-his-accessory',
name: '附件'
},
{
type: 'ios-clock',
id: '',
id: 'receive-sample-meter-receive-entrust-his-record',
name: '操作日志'
}
],
......
pages/meter-send/receive-sample/MeterSampleManage.vue
......@@ -101,7 +101,7 @@ export default {
{
// meter-review-entrust-pass-btn
type: 'success',
id: '',
id: 'receive-sample-meter-sample-manage-collect-btn',
name: '收样'
}
],
......
pages/meter-send/task-distribute/MeterTaskAlloca.vue
......@@ -96,10 +96,14 @@ export default {
// {id: '', name: '删除'},
// ],
iconMsg: [
{ type: 'ios-beaker', id: '', name: '检测项目管理' },
{
type: 'ios-beaker',
id: 'task-distribute-meter-task-alloca-item-manage',
name: '检测项目管理'
},
{
type: 'ios-clock',
id: '',
id: 'task-distribute-meter-task-alloca-record',
name: '操作日志'
}
],
......@@ -110,12 +114,12 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'task-distribute-meter-task-alloca-allocation-btn',
name: '分配任务'
},
{
type: 'success',
id: '',
id: 'task-distribute-meter-task-alloca-import-item-btn',
name: '导入检测项目'
}
],
......
pages/meter-send/task-distribute/MeterTaskAllocaHis.vue
......@@ -97,10 +97,14 @@ export default {
// {id: '', name: '删除'},
// ],
iconMsg: [
{ type: 'ios-beaker', id: '', name: '检测项目管理' },
{
type: 'ios-beaker',
id: 'task-distribute-meter-task-alloca-his-item-manage',
name: '检测项目管理'
},
{
type: 'ios-clock',
id: '',
id: 'task-distribute-meter-task-alloca-his-record',
name: '操作日志'
}
],
......@@ -111,12 +115,12 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'task-distribute-meter-task-alloca-his-allocation-btn',
name: '任务重新分配'
},
{
type: 'success',
id: '',
id: 'task-distribute-meter-task-alloca-his-import-item-btn',
name: '导入检测项目'
}
],
......
pages/meter-send/task-distribute/MeterTaskDistribute.vue
......@@ -89,14 +89,18 @@ export default {
// },
{
type: 'ios-contact',
id: '',
id: 'task-distribute-meter-task-distribute-allocation',
name: '任务分配'
},
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'md-cloud',
id: 'task-distribute-meter-task-distribute-accessory',
name: '附件'
},
// { type: 'md-remove-circle', id: '', name: '删除' },
{
type: 'ios-clock',
id: '',
id: 'task-distribute-meter-task-distribute-record',
name: '操作日志'
}
],
......
pages/meter-send/task-distribute/MeterTaskDistributeHis.vue
......@@ -6,24 +6,24 @@
<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.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item>
<Form-item class="search-item" label="委托编号:">
<Input v-model="formObj.entrustCode" name="entrustCode" placeholder="请输入委托编号" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.entrustCode" @on-enter="_formSearch" name="entrustCode" 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">
......@@ -89,14 +89,18 @@ export default {
// },
{
type: 'ios-contact',
id: '',
id: 'task-distribute-meter-task-distribute-his-allocation-his',
name: '任务分配历史'
},
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'md-cloud',
id: 'task-distribute-meter-task-distribute-his-accessory',
name: '附件'
},
// { type: 'md-remove-circle', id: '', name: '删除' },
{
type: 'ios-clock',
id: '',
id: 'task-distribute-meter-task-distribute-his-record',
name: '操作日志'
}
],
......
pages/meter-send/task-distribute/MeterTestEdit.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: 'task-distribute-meter-test-edit-edit',
name: '编辑'
},
{
type: 'ios-clock',
id: 'task-distribute-meter-test-edit-remove',
name: '删除'
}
],
pageColumns: [
{ title: '样品名称', key: 'name', width: 160 },
......
pages/meter-subcontract/cannot-sub/MeterCannotSub.vue
......@@ -6,21 +6,21 @@
<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.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" 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">
......@@ -60,23 +60,31 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'cannot-sub-meter-cannot-sub-add',
name: '添加'
},
{
type: 'success',
id: '',
id: 'cannot-sub-meter-cannot-sub-submit',
name: '提交'
}
],
iconMsg: [
{
type: 'md-create',
id: '',
id: 'cannot-sub-meter-cannot-sub-edit-operation',
name: '编辑'
},
{ type: 'md-cloud', id: '', name: '附件' },
{ type: 'md-remove-circle', id: '', name: '删除' }
{
type: 'md-cloud',
id: 'cannot-sub-meter-cannot-sub-accessory-operation',
name: '附件'
},
{
type: 'md-remove-circle',
id: 'cannot-sub-meter-cannot-sub-remove-operation',
name: '删除'
}
],
formObj: {
client: undefined
......
pages/meter-subcontract/cannot-sub/MeterCannotSubEdit.vue
......@@ -186,7 +186,11 @@ export default {
judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
iconMsg: [
// { type: 'md-create', id: '', name: '编辑' },
{ type: 'md-trash', id: '', name: '删除' }
{
type: 'md-trash',
id: 'cannot-sub-meter-cannot-sub-edit-remove-operation',
name: '删除'
}
],
pageColumns: [
{ title: '名称', key: 'name', width: 160 },
......@@ -210,12 +214,12 @@ export default {
btn: [
{
type: 'success',
id: '',
id: 'cannot-sub-meter-cannot-sub-edit-add',
name: '添加'
},
{
type: 'success',
id: '',
id: 'cannot-sub-meter-cannot-sub-edit-import',
name: '导入'
}
],
......
pages/meter-subcontract/cannot-sub/MeterCannotSubHis.vue
......@@ -74,10 +74,14 @@ export default {
iconMsg: [
{
type: 'md-flask',
id: '',
id: 'cannot-sub-meter-cannot-sub-his-view-sample-operation',
name: '查看样品'
},
{ type: 'md-cloud', id: '', name: '附件' }
{
type: 'md-cloud',
id: 'cannot-sub-meter-cannot-sub-his-accessory-operation',
name: '附件'
}
],
formObj: {
client: undefined
......
pages/meter-subcontract/subcontractor/MeterSubcontractor.vue
......@@ -64,17 +64,21 @@ export default {
btn: [
{
type: 'success',
id: 'meter-subcontractor-add-btn',
id: 'subcontractor-meter-subcontractor-add',
name: '添加'
}
],
iconMsg: [
{
type: 'md-create',
id: '',
id: 'subcontractor-meter-subcontractor-edit-operation',
name: '编辑'
},
{ type: 'ios-close', id: '', name: '删除' }
{
type: 'ios-close',
id: 'subcontractor-meter-subcontractor-remove-operation',
name: '删除'
}
],
formObj: {
name: undefined,
......
pages/meter-subcontract/subpackage-input/MeterSubSampleManage.vue
......@@ -98,15 +98,33 @@ export default {
// {id: '', name: '删除'},
// ],
iconMsg: [
{ type: 'md-create', id: '', name: '分包结果录入' },
{ type: 'ios-list', id: '', name: '历史版本' },
{ type: 'ios-cloud-upload', id: '', name: '分包证书上传' },
{ type: 'compose', id: '', name: '编辑' }
{
type: 'md-create',
id:
'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: [
{
type: 'success',
id: '',
id: 'subpackage-input-meter-sub-sample-manage-subpackage-return',
name: '分包返库'
}
],
......
pages/meter-subcontract/subpackage-input/MeterSubpackageInput.vue
......@@ -82,13 +82,18 @@ export default {
// },
{
type: 'ios-beaker',
id: '',
id:
'subpackage-input-meter-subpackage-input-subpackage-sample-manage-operation',
name: '分包样品管理'
},
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'md-cloud',
id: 'subpackage-input-meter-subpackage-input-accessory-operation',
name: '附件'
},
{
type: 'md-book',
id: '',
id: 'subpackage-input-meter-subpackage-input-record-operation',
name: '操作日志'
}
],
......
pages/meter-subcontract/subpackage-input/MeterSubpackageInputHis.vue
......@@ -6,26 +6,26 @@
<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.client" name="name" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.client" @on-enter="_formSearch" name="name" 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" hide-checkbox @on-result-change="_tableResultChange">
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" hide-checkbox>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -77,18 +77,23 @@ export default {
iconMsg: [
{
type: 'md-paper',
id: '',
id: 'subpackage-input-meter-subpackage-input-his-edit-operation',
name: '编辑'
},
{
type: 'ios-beaker',
id: '',
id:
'subpackage-input-meter-subpackage-input-his-subpackage-sample-manage-operation',
name: '分包样品管理'
},
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'md-cloud',
id: 'subpackage-input-meter-subpackage-input-his-accessory-operation',
name: '附件'
},
{
type: 'md-book',
id: '',
id: 'subpackage-input-meter-subpackage-input-his-record-operation',
name: '操作日志'
}
],
......
pages/meter-subcontract/subpackage-input/SubResultInputEdit.vue
......@@ -10,24 +10,24 @@
<Form id="formId" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label>
<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 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 class="search-btn" style="margin-left: -10px">
<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" :get-page="getPage"
:icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
:icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -48,9 +48,9 @@
<div v-else-if="item.key==='testValue'">
<el-input
v-model="scope.row.testValue"
@blur="_handleTestValueEdit(scope.row.id,scope.row.testValue)"
size="medium"
placeholder="请输入检测结果"
@blur="_handleTestValueEdit(scope.row.id,scope.row.testValue)"
/>
</div>
<div v-else-if="item.key==='progress'">
......@@ -87,26 +87,39 @@ export default {
// {id: '', name: '删除'},
// ],
iconMsg: [
{ type: 'compose', id: '', name: '编辑' },
{ type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
{ type: 'trash-a', id: '', name: '删除' }
{
type: 'compose',
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: [
{
// meter-review-entrust-pass-btn
type: 'success',
id: '',
id: 'subpackage-input-sub-result-input-edit-complete',
name: '完成'
},
// meter-review-entrust-back-btn
{
type: 'success',
id: '',
id: 'subpackage-input-sub-result-input-edit-input-check-value',
name: '填写检测值'
},
{
type: 'success',
id: '',
id: 'subpackage-input-sub-result-input-edit-judge',
name: '判定'
}
],
......
pages/meter-subcontract/subpackage-task/MeterSubSampleManage.vue
......@@ -10,24 +10,24 @@
<Form id="formId" :label-width="80" inline onsubmit="return false">
<label class="label-sign"></label>
<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 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 class="search-btn" style="margin-left: -10px">
<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" :get-page="getPage"
:icon-msg="iconMsg" select-data @on-result-change="_tableResultChange">
:icon-msg="iconMsg" @on-result-change="_tableResultChange" select-data>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -87,26 +87,40 @@ export default {
// {id: '', name: '删除'},
// ],
iconMsg: [
{ type: 'compose', id: '', name: '编辑' },
{ type: 'ios-copy', id: '', name: '复制', componentName: 'CopyModal' },
{ type: 'trash-a', id: '', name: '删除' }
{
type: 'compose',
id: 'subpackage-task-meter-sub-sample-manage-edit-operation',
name: '编辑'
},
{
type: 'ios-copy',
id: 'subpackage-task-meter-sub-sample-manage-copy-operation',
name: '复制',
componentName: 'CopyModal'
},
{
type: 'trash-a',
id: 'subpackage-task-meter-sub-sample-manage-remove-operation',
name: '删除'
}
],
btn: [
{
// meter-review-entrust-pass-btn
type: 'success',
id: '',
id:
'subpackage-task-meter-sub-sample-manage-subpackage-info-register',
name: '分包信息登记'
},
// meter-review-entrust-back-btn
{
type: 'success',
id: '',
id: 'subpackage-task-meter-sub-sample-manage-subpackage-cancel',
name: '取消分包'
},
{
type: 'success',
id: '',
id: 'subpackage-task-meter-sub-sample-manage-subpackage-out',
name: '分包出库'
}
],
......
pages/meter-subcontract/subpackage-task/MeterSubpackageTask.vue
......@@ -85,13 +85,18 @@ export default {
// },
{
type: 'ios-beaker',
id: '',
id:
'subpackage-task-meter-subpackage-task-subpackage-sample-manage-operation',
name: '分包样品管理'
},
{ type: 'md-cloud', id: '', name: '附件' },
{
type: 'md-cloud',
id: 'subpackage-task-meter-subpackage-task-accessory-operation',
name: '附件'
},
{
type: 'md-book',
id: '',
id: 'subpackage-task-meter-subpackage-task-record-operation',
name: '操作日志'
}
],
......
pages/meter-subcontract/subpackage-task/MeterSubpackageTaskHis.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.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/>
<Input v-model="formObj.aptitude" @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" hide-checkbox @on-result-change="_tableResultChange">
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" hide-checkbox>
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
......@@ -66,10 +66,15 @@ export default {
iconMsg: [
{
type: 'ios-beaker',
id: '',
id:
'subpackage-task-meter-subpackage-task-his-subpackage-sample-query-operation',
name: '分包样品查询'
},
{ type: 'md-cloud', id: '', name: '附件' }
{
type: 'md-cloud',
id: 'subpackage-task-meter-subpackage-task-his-accessory-operation',
name: '附件'
}
],
formObj: {
name: undefined,
......
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