Commit e9e8369b by lichengming

修改了报价登记按钮id

parent 95992711
...@@ -6,21 +6,21 @@ ...@@ -6,21 +6,21 @@
<Row> <Row>
<!--查询--> <!--查询-->
<Col span="24" style="margin-top: 10px"> <Col span="24" style="margin-top: 10px">
<Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false"> <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item class="search-item" label="委托单位:"> <Form-item class="search-item" label="委托单位:">
<Input v-model="formObj.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/> <Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
</Form-item> </Form-item>
</Form> </Form>
</Col> </Col>
<!--操作--> <!--操作-->
<Col span="24"> <Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide" <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
@on-result-change="_btnClick"></btn-list> class="contHide"></btn-list>
</Col> </Col>
<!--表格--> <!--表格-->
<Col span="24"> <Col span="24">
...@@ -65,32 +65,40 @@ export default { ...@@ -65,32 +65,40 @@ export default {
btn: [ btn: [
{ {
type: 'success', type: 'success',
id: 'meter-subcontractor-add-btn', id: 'quote-register-meter-quote-register-add',
name: '添加' name: '添加'
}, },
// meter-subcontractor-submit-btn // meter-subcontractor-submit-btn
{ {
type: 'success', type: 'success',
id: '', id: 'quote-register-meter-quote-register-submit',
name: '提交' name: '提交'
} }
], ],
iconMsg: [ iconMsg: [
{ {
type: 'md-create', type: 'md-create',
id: '', id: 'quote-register-meter-quote-register-edit-operation',
name: '编辑' name: '编辑'
}, },
{ {
type: 'ios-beaker', type: 'ios-beaker',
id: '', id: 'quote-register-meter-quote-register-quote-sample-operation',
name: '报价样品' 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', type: 'ios-clock',
id: '', id: 'quote-register-meter-quote-register-record-operation',
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" <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 v-model="formObj.odate" type="date" split-panels style="width:100%;" placeholder="请选择要求完成时间" <Date-picker v-model="formObj.odate" @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="请输入或选择样品名称" @click.native="_selectjudgeBasis(scope.$rowIndex)" <el-input v-model="scope.row.name" @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)">
...@@ -104,10 +104,10 @@ ...@@ -104,10 +104,10 @@
<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"
type="number"
placeholder="请输入或选择数量"
@blur="_quantityChange(scope.$rowIndex)" @blur="_quantityChange(scope.$rowIndex)"
@keydown.native="channelInputLimit" @keydown.native="channelInputLimit"
type="number"
placeholder="请输入或选择数量"
/> />
</div> </div>
...@@ -137,8 +137,8 @@ ...@@ -137,8 +137,8 @@
<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>
<EditModal ref="EditModal" is-change @on-result-change="_backData" /> <EditModal ref="EditModal" @on-result-change="_backData" is-change />
<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>
...@@ -185,7 +185,11 @@ export default { ...@@ -185,7 +185,11 @@ export default {
judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }], judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
iconMsg: [ iconMsg: [
// { type: 'md-create', id: '', name: '编辑' }, // { type: 'md-create', id: '', name: '编辑' },
{ type: 'md-trash', id: '', name: '删除' } {
type: 'md-trash',
id: 'quote-register-meter-quote-register-edit-remove-operation',
name: '删除'
}
], ],
pageColumns: [ pageColumns: [
{ title: '名称', key: 'name', width: 160 }, { title: '名称', key: 'name', width: 160 },
...@@ -216,12 +220,12 @@ export default { ...@@ -216,12 +220,12 @@ export default {
btn: [ btn: [
{ {
type: 'success', type: 'success',
id: '', id: 'quote-register-meter-quote-register-edit-add',
name: '添加' name: '添加'
}, },
{ {
type: 'success', type: 'success',
id: '', id: 'quote-register-meter-quote-register-edit-import',
name: '导入' name: '导入'
} }
], ],
......
...@@ -6,26 +6,26 @@ ...@@ -6,26 +6,26 @@
<Row> <Row>
<!--查询--> <!--查询-->
<Col span="24" style="margin-top: 10px"> <Col span="24" style="margin-top: 10px">
<Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false"> <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item class="search-item" label="委托单位:"> <Form-item class="search-item" label="委托单位:">
<Input v-model="formObj.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/> <Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
</Form-item> </Form-item>
</Form> </Form>
</Col> </Col>
<!--操作--> <!--操作-->
<Col span="24"> <Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide" <btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
@on-result-change="_btnClick"></btn-list> class="contHide"></btn-list>
</Col> </Col>
<!--表格--> <!--表格-->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true" <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" hide-checkbox @on-result-change="_tableResultChange"> :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" hide-checkbox>
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -69,13 +69,18 @@ export default { ...@@ -69,13 +69,18 @@ export default {
iconMsg: [ iconMsg: [
{ {
type: 'ios-beaker', type: 'ios-beaker',
id: '', id:
'quote-register-meter-quote-register-his-quote-sample-query-operation',
name: '报检样品查询' name: '报检样品查询'
}, },
{ type: 'md-cloud', id: '', name: '附件' }, {
type: 'md-cloud',
id: 'quote-register-meter-quote-register-his-accessory-operation',
name: '附件'
},
{ {
type: 'ios-clock', type: 'ios-clock',
id: '', id: 'quote-register-meter-quote-register-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