Commit d8676669 by lichengming

修改了合同评审的按钮id

parent e5afccad
...@@ -82,26 +82,34 @@ export default { ...@@ -82,26 +82,34 @@ export default {
// }, // },
{ {
type: 'success', type: 'success',
id: '', id: 'contract-review-meter-contract-review-reject',
name: '驳回' name: '驳回'
} }
], ],
iconMsg: [ iconMsg: [
{ {
type: 'md-create', type: 'md-create',
id: '', id: 'contract-review-meter-contract-review-review-operation',
name: '评审' name: '评审'
}, },
{ {
type: 'ios-beaker', type: 'ios-beaker',
id: '', id: 'contract-review-meter-contract-review-view-sample-operation',
name: '查看样品' 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', type: 'ios-clock',
id: '', id: 'contract-review-meter-contract-review-record-operation',
name: '操作日志' name: '操作日志'
} }
], ],
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<!-- <Input v-model="formObj.person" name="person" placeholder="请输入评审人员"/>--> <!-- <Input v-model="formObj.person" name="person" placeholder="请输入评审人员"/>-->
<!-- </Form-item>--> <!-- </Form-item>-->
<Form-item label="检定/校准执行规程/规范:" prop="requirements" style="width: 100%;margin-bottom: 5px;"> <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>
<Form-item label="要求完成时间" prop="odate" style="width: 100%;margin-bottom: 5px;"> <Form-item label="要求完成时间" prop="odate" style="width: 100%;margin-bottom: 5px;">
<span> <span>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer> <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div> </div>
</Modal> </Modal>
<importModal ref="importModal" aptitude-item @on-result-change="_inputBack"></importModal> <importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal>
</div> </div>
</template> </template>
<script> <script>
...@@ -117,8 +117,16 @@ export default { ...@@ -117,8 +117,16 @@ export default {
testedCityData: [], testedCityData: [],
judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }], judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
iconMsg: [ 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: [ pageColumns: [
{ title: '名称', key: 'name', width: 160 }, { title: '名称', key: 'name', width: 160 },
...@@ -149,12 +157,12 @@ export default { ...@@ -149,12 +157,12 @@ export default {
btn: [ btn: [
{ {
type: 'success', type: 'success',
id: '', id: 'contract-review-meter-contract-review-add-edit-add',
name: '添加' name: '添加'
}, },
{ {
type: 'success', type: 'success',
id: '', id: 'contract-review-meter-contract-review-add-edit-import',
name: '导入' name: '导入'
} }
], ],
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline> <Form id="edit-form" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>
<Form-item label="委托单位" prop="client" class="width-48"> <Form-item label="委托单位" prop="client" class="width-48">
<AutoComplete :value="formObj.client" :down-data="customerData" name="client" ref="autoComplete" <AutoComplete ref="autoComplete" :value="formObj.client" :down-data="customerData" @on-result-change="_cusNameChange"
placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange" name="client" placeholder="请输入或选择委托单位"
></AutoComplete> ></AutoComplete>
</Form-item> </Form-item>
<Form-item label="联系人" prop="person" class="width-48"> <Form-item label="联系人" prop="person" class="width-48">
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/> <Input v-model="formObj.fax" name="fax" placeholder="请输入传真"/>
</Form-item> </Form-item>
<Form-item label="省、市、区" prop="testedCityData" class="width-48"> <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> </CityNameCascader>
</Form-item> </Form-item>
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
<Input v-model="formObj.street" name="street" placeholder="请输入街道"/> <Input v-model="formObj.street" name="street" placeholder="请输入街道"/>
</Form-item> </Form-item>
<Form-item label="要求完成时间:" prop="odate" class="width-48"> <Form-item label="要求完成时间:" prop="odate" class="width-48">
<Date-picker type="date" split-panels style="width:100%;" placeholder="请选择要求完成时间" <Date-picker @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
@on-change="_ctimeChange"></Date-picker> placeholder="请选择要求完成时间"></Date-picker>
</Form-item> </Form-item>
<Form-item label="折扣:" prop="discount" class="width-48"> <Form-item label="折扣:" prop="discount" class="width-48">
<Input v-model="formObj.discount" name="discount" placeholder="折扣"/> <Input v-model="formObj.discount" name="discount" placeholder="折扣"/>
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
<!--操作--> <!--操作-->
<Col span="24"> <Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide" <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
@on-result-change="_btnClick"></btn-list> class="contHide"></btn-list>
</Col> </Col>
<Col span="24"> <Col span="24">
<PTVXETable <PTVXETable
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="item.key==='name'" @click.stop="_handleRow(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> ></el-input>
</div> </div>
<div v-if="item.key==='spec'" @click.stop="_handleRow(scope)"> <div v-if="item.key==='spec'" @click.stop="_handleRow(scope)">
...@@ -92,9 +92,9 @@ ...@@ -92,9 +92,9 @@
<div v-if="item.key==='quantity'" @click.stop="_handleRow(scope)"> <div v-if="item.key==='quantity'" @click.stop="_handleRow(scope)">
<el-input <el-input
v-model="scope.row.quantity" v-model="scope.row.quantity"
@keydown.native="channelInputLimit"
type="number" type="number"
placeholder="请输入或选择数量" placeholder="请输入或选择数量"
@keydown.native="channelInputLimit"
/> />
</div> </div>
<div v-else-if="item.date"> <div v-else-if="item.date">
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer> <modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div> </div>
</Modal> </Modal>
<importModal ref="importModal" aptitude-item @on-result-change="_inputBack"></importModal> <importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal>
</div> </div>
</template> </template>
<script> <script>
...@@ -151,8 +151,16 @@ export default { ...@@ -151,8 +151,16 @@ export default {
testedCityData: [], testedCityData: [],
judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }], judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
iconMsg: [ 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: [ pageColumns: [
{ title: '名称', key: 'name', width: 160 }, { title: '名称', key: 'name', width: 160 },
...@@ -183,12 +191,12 @@ export default { ...@@ -183,12 +191,12 @@ export default {
btn: [ btn: [
{ {
type: 'success', type: 'success',
id: '', id: 'contract-review-meter-contract-review-edit-add',
name: '添加' name: '添加'
}, },
{ {
type: 'success', type: 'success',
id: '', id: 'contract-review-meter-contract-review-edit-import',
name: '导入' name: '导入'
} }
], ],
......
...@@ -64,7 +64,7 @@ export default { ...@@ -64,7 +64,7 @@ export default {
btn: [ btn: [
{ {
type: 'success', type: 'success',
id: 'meter-subcontractor-add-btn', id: 'contract-review-meter-contract-review-his-add',
name: '添加' name: '添加'
} }
], ],
...@@ -79,11 +79,19 @@ export default { ...@@ -79,11 +79,19 @@ export default {
// id: '', // id: '',
// name: '资质项目' // 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', type: 'ios-clock',
id: '', id: 'contract-review-meter-contract-review-his-record-operation',
name: '操作日志' name: '操作日志'
} }
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment