Commit 1bb3d513 by wangweidong

优化修改

parent ed89881b
......@@ -84,12 +84,13 @@ export default {
return {
formId: 'meterAptitudeManageFormId',
pageColumns: [
{ title: '授权仪器名称', key: 'name' },
{ title: '检定依据', key: 'code', width: 160 },
{ title: '检定依据名称', key: 'basis' },
{ title: '检定周期', key: 'cycle' },
// {title: '限制范围或说明', key: 'limitDescription'},
{ title: '价格', key: 'price' },
{ title: '计量器具名称', key: 'name', width: 140 },
{ title: '准确度', key: 'grade', width: 150 },
{ title: '等级', key: 'testRank', width: 130 },
{ title: '测量范围', key: 'extent', width: 160 },
{ title: '收费单位', key: 'unit', width: 90 },
{ title: '收费标准(元)', key: 'price', width: 130 },
{ title: '备注', key: 'remark' },
{ title: '图片是否上传', key: 'picUri', image: true }
],
btn: [
......@@ -263,10 +264,10 @@ export default {
_import() {
const data = {
importUrl: '/meter/v1/aptitude/import_beyond_aptitude',
downloadUrl: '/meter/v1/excel/template/MeterAptitudeImport',
title: '授权资质导入'
downloadUrl: '/meter/v1/excel/template/MeterOutAptitudeImport',
title: '资质外计量器具导入'
}
this.$refs.importModal._open(data, '授权资质导入')
this.$refs.importModal._open(data, '资质外计量器具导入')
},
// 导出
_export() {
......
<template>
<div>
<Modal v-model="showModal" :mask-closable="false" width="1200">
<Modal v-model="showModal" :mask-closable="false" width="800">
<p slot="header">{{modalTitle}}</p>
<div>
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="100" inline>
<Form-item label="检定依据" prop="code" class="width-48">
<!-- <autoComplete :value="formObj.judgeBasis" :downData="judgeBasisData" @on-result-change="_judgeBasisChange" name="judgeBasis"-->
<!-- show-key="stdNum" placeholder="请输入或选择判定依据" focus-->
<!-- ></autoComplete>-->
<Input v-model="formObj.code" @on-result-change="_judgeBasisChange" @click.native="_selectjudgeBasis" name="code" placeholder="请选择检测依据" readonly/>
<!-- <Input-->
<!-- v-model="formObj.code"-->
<!-- name="code"-->
<!-- readonly-->
<!-- placeholder="请选择检测依据"-->
<!-- icon="ios-add-circle-outline"-->
<!-- @click.native="_selectjudgeBasis"-->
<!-- />-->
<Form-item label="计量器具名称 " prop="name" class="width-48">
<Input v-model="formObj.name" name="name" placeholder="请输入计量器具名称" />
</Form-item>
<Form-item label="检定依据名称" prop="basis" class="width-48">
<Input v-model="formObj.basis" name="basis" placeholder="请输入判定依据名称" />
<Form-item label="准确度" prop="grade" class="width-48">
<Input v-model="formObj.grade" name="grade" placeholder="请输入准确度" />
</Form-item>
<Form-item label="检定周期 " prop="cycle" class="width-48">
<!-- <Input :rows="3" v-model="formObj.remark" placeholder="请输入备注" type="textarea" name="remark"/>-->
<InputNumber :rows="3" v-model="formObj.cycle" name="cycle" style="width: 460px;"/>
</Form-item>
<Form-item label="授权仪器名称 " prop="name" class="width-48">
<Input v-model="formObj.name" name="name" placeholder="请输入授权仪器名称" />
</Form-item>
<Form-item label="价格" prop="price" class="width-48">
<InputNumber v-model="formObj.price" name="price" placeholder="请输入价格" style="width: 460px;"/>
<Form-item label="等级" prop="testRank" class="width-48">
<Input v-model="formObj.testRank" name="testRank" placeholder="请输入等级" />
</Form-item>
<Form-item label="测量范围 " prop="extent" class="width-48">
<Input v-model="formObj.extent" name="extent" placeholder="请输入测量范围" style="border: none;"/>
</Form-item>
<Form-item label="准确度等级" prop="grade" class="width-48">
<Input v-model="formObj.grade" name="grade" placeholder="请输入准确度等级" />
<Form-item label="收费单位 " prop="unit" class="width-48">
<Input v-model="formObj.unit" name="unit" placeholder="请输入收费单位" style="border: none;"/>
</Form-item>
<Form-item label="收费标准(元)" prop="price" class="width-48">
<InputNumber v-model="formObj.price" name="price" placeholder="请输入收费标准(元)" />
</Form-item>
<Form-item label="备注 " prop="remark" class="width-48">
<Input v-model="formObj.remark" name="remark" placeholder="请输入备注" style="border: none;"/>
</Form-item>
<input v-model="formObj.stdId" type="hidden" name="stdId">
</Form>
<Alert type="success" style="text-align: center;font-size: 15px;margin: 5px">
检测指标表
</Alert>
<Col span="24">
<!-- <btn-list :msg="btn" :open="searchOpen" :showSearchBtn="false" @on-result-change="_btnClick"-->
<!-- class="contHide"></btn-list>-->
<Button @click="_add()" type="success">添加</Button>
</Col>
<Col span="24">
<PTVXETable
ref="pageTable"
:form-id="formId"
:tableHeight="500"
:getPage="getPage"
:iconMsg="iconMsg"
@on-result-change="_tableResultChange">
<vxe-table-column
v-for="item in pageColumns"
:key="item.key"
:field="item.key"
:title="item.title"
:width="item.width"
:min-width="200"
:fixed="item.fixed?item.fixed:undefined"
sortable
>
<template slot-scope="scope">
<div v-if="item.key==='name'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.name" blur placeholder="请输入或选择检测项目"
></el-input>
</div>
<div v-if="item.key==='compare'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.compare" blur placeholder="请输入或选择比较符"
></el-input>
</div>
<div v-if="item.key==='limitValue'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.limitValue" blur placeholder="请输入或选择限量值"
></el-input>
</div>
<div v-if="item.key==='remark'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.remark" blur placeholder="请输入备注"
></el-input>
</div>
<div v-if="item.key==='unit'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.unit" blur placeholder="请输入或选择检测单位"
></el-input>
</div>
</template>
</vxe-table-column>
</PTVXETable>
</Col>
</div>
<EditModal ref="EditModal" @on-result-change="_backData" is-change />
<div slot="footer">
......@@ -147,10 +85,11 @@ export default {
formObj: {
basis: '',
name: '',
testRank: '',
code: '',
cycle: 0,
price: 0,
stdId: '',
remark: '',
extent: '',
grade: ''
},
......@@ -163,19 +102,8 @@ export default {
showModal: false,
aptitudeData: [],
ruleValidate: {
extent: [
{ required: true, message: '测量范围不能为空', trigger: 'blur' }
],
name: [
{ required: true, message: '授权仪器名称不能为空', trigger: 'blur' }
],
cycle: [
{
required: true,
type: 'number',
message: '检定周期不能为空',
trigger: 'blur'
}
{ required: true, message: '计量器具名称不能为空', trigger: 'blur' }
]
},
footerList: [
......@@ -255,16 +183,14 @@ export default {
}
},
_open(formObj) {
this._getJudgeBasisList()
this.$refs.formObj.resetFields()
if (this.$string(formObj).isEmpty()) {
this.id = ''
this.modalTitle = '添加检定依据'
this.modalTitle = '添加资质外检测器具'
} else {
this.formObj = formObj
this.id = formObj.id
console.log(this.formObj)
this.modalTitle = '编辑检定依据'
this.modalTitle = '编辑资质外检测器具'
}
this.showModal = true
},
......
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