Skip to content

P
patzn-cloud-web-back-soil
Commit b9fcf037 by wangweidong
Options

优化修改

parent 9f964dd1
Showing with 68 additions and 38 deletions
api/meter/meter-contract.js
......@@ -49,6 +49,11 @@ export default {
pageContractReview: data =>
http.post('meter/v1/contract/page_contract_review', data).then(res => res),
pageContractReviewHis: data =>
http
.post('meter/v1/contract/page_contract_review_his', data)
.then(res => res),
pageContractFile: data =>
http.post('meter/v1/contract/page_contract_file', data).then(res => res),
......
pages/meter-business/quote-register/MeterQuoteRegisterEdit.vue
......@@ -319,9 +319,7 @@ export default {
}
},
_customerMatch(data) {
// this.formObj.client = data
this._getQueryList(data)
console.log(data)
},
_cusNameQuery(query) {
this.formObj.client = query
......@@ -679,18 +677,10 @@ export default {
result[0].city,
result[0].area
]
if (result[0].province) {
this.formObj.province = result[0].province
}
if (result[0].city) {
this.formObj.city = result[0].city
}
if (result[0].area) {
this.formObj.county = result[0].area
}
}
},
_getAptitudeList: async function() {
const result = await lmsBaseDict.getItem('subcontractorAptitude')
......
pages/meter-contract/contract-register/MeterContractRegisterEdit.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" @on-result-change="_cusNameChange"
name="client" placeholder="请输入或选择委托单位"
<AutoComplete :value="formObj.client" :down-data="customerData" name="client"
placeholder="请输入或选择委托单位" @on-result-change="_cusNameChange"
></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(',')" @on-result-change="_cascaderResult" name="tested">
<CityNameCascader :value="testedCityData.join(',')" name="tested" @on-result-change="_cascaderResult">
</CityNameCascader>
</Form-item>
......@@ -32,13 +32,13 @@
</Form-item>
<Form-item label="合同登记时间：" prop="edate" class="width-48">
<Date-picker v-model="formObj.edate" @on-change="_etimeChange" type="date" split-panels style="width:100%;"
placeholder="请选择合同登记时间"></Date-picker>
<Date-picker v-model="formObj.edate" type="date" split-panels style="width:100%;" placeholder="请选择合同登记时间"
@on-change="_etimeChange"></Date-picker>
</Form-item>
<Form-item label="要求完成时间：" prop="odate" class="width-48">
<Date-picker v-model="formObj.odate" @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
placeholder="请选择要求完成时间"></Date-picker>
<Date-picker v-model="formObj.odate" type="date" split-panels style="width:100%;" placeholder="请选择要求完成时间"
@on-change="_ctimeChange"></Date-picker>
</Form-item>
<Form-item label="折扣：" prop="discount" class="width-48">
<Input v-model="formObj.discount" name="discount" placeholder="折扣"/>
......@@ -57,8 +57,8 @@
<!--操作-->
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
class="contHide"></btn-list>
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
@on-result-change="_btnClick"></btn-list>
</Col>
<Col span="24">
<PTVXETable
......@@ -80,9 +80,9 @@
>
<template slot-scope="scope">
<div v-if="item.key==='name'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.name" @on-result-change="_judgeBasisChange" blur placeholder="请输入或选择样品名称" style="width: 150px;"
<el-input v-model="scope.row.name" blur placeholder="请输入或选择样品名称" style="width: 150px;" @on-result-change="_judgeBasisChange"
></el-input>
<a @on-result-change="_judgeBasisChange" @click="_selectjudgeBasis(scope.$rowIndex)" style="font-size: 18px;" class="">+</a>
<a style="font-size: 18px;" class="" @on-result-change="_judgeBasisChange" @click="_selectjudgeBasis(scope.$rowIndex)">+</a>
</div>
<div v-else-if="item.key==='spec'" @click.stop="_handleRow(scope)">
<el-input v-model="scope.row.spec" blur placeholder="请输入或选择型号规格"
......@@ -110,9 +110,9 @@
<div v-else-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">
......@@ -130,8 +130,8 @@
<modal-footer ref="footerModal" :footer="footerList" @on-result-change="_footerResult"></modal-footer>
</div>
</Modal>
<EditModal ref="EditModal" @on-result-change="_backData" is-change />
<importModal ref="importModal" @on-result-change="_inputBack" aptitude-item></importModal>
<EditModal ref="EditModal" is-change @on-result-change="_backData" />
<importModal ref="importModal" aptitude-item @on-result-change="_inputBack"></importModal>
</div>
</template>
<script>
......@@ -648,6 +648,11 @@ export default {
} else {
this.formObj.odate = new Date(formObj.odate)
}
if (this.formObj.edate === undefined) {
this.formObj.edate = ''
} else {
this.formObj.edate = new Date(formObj.edate)
}
},
_save: async function(data) {
const result = await meterContract.addContractRegister(data)
......
pages/meter-contract/contract-review/MeterContractReviewHis.vue
......@@ -6,24 +6,24 @@
<Row>
<!--查询-->
<Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label>
<Form-item class="search-item" label="委托单位:">
<Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
<Input v-model="formObj.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-item" label="合同编号:">
<Input v-model="formObj.salesCode" @on-enter="_formSearch" name="salesCode" placeholder="请输入合同编号" clearable/>
<Input v-model="formObj.salesCode" name="salesCode" placeholder="请输入合同编号" clearable @on-enter="_formSearch"/>
</Form-item>
<Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button>
<Button type="primary" @click="_formSearch">搜索</Button>
</Form-item>
</Form>
</Col>
<!--操作-->
<Col span="24">
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" @on-result-change="_btnClick"
class="contHide"></btn-list>
<btn-list :msg="btn" :open="searchOpen" :show-search-btn="true" class="contHide"
@on-result-change="_btnClick"></btn-list>
</Col>
<!--表格-->
<Col span="24">
......@@ -37,7 +37,8 @@
:min-width="item.width?item.width:200"
:fixed="item.fixed?item.fixed:undefined" sortable>
<template slot-scope="scope">
<span>{{scope.row[item.key]}}</span>
<span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
<span v-else>{{scope.row[item.key]}}</span>
</template>
</vxe-table-column>
</PTVXETable>
......@@ -51,7 +52,8 @@
</div>
</template>
<script>
import { meterEntrust, meterSubcontractor } from '../../../api'
import http from '../../../api/http'
import { meterContract, meterSubcontractor } from '../../../api'
import MeterReviewHisHisOperation from '../../../components/operation/Operation'
import MeterSubcontractorEdit from './MeterContractReviewEdit'
export default {
......@@ -111,12 +113,13 @@ export default {
{ title: '联系人', key: 'person', width: 120 },
{ title: '联系电话', key: 'tel', width: 120 },
{ title: '传真', key: 'fax', width: 120 },
{ title: '合同编号', key: 'salesCode', width: 120 },
{ title: '详细地址', key: 'address', width: 250 },
{ title: '邮编', key: 'postcode' },
{ title: 'E-mail', key: 'email', width: 120 },
{ title: '委托日期', key: 'edate', width: 120 },
{ title: '费用合计', key: 'fee', width: 120 },
{ title: '合同号', key: 'contractCode', width: 120 },
{ title: '登记日期', key: 'edate', width: 120, date: true },
{ title: '要求完成时间', key: 'odate', width: 120, date: true },
{ title: '折扣', key: 'discount', width: 120 },
{ title: '总价', key: 'totalPrice', width: 120 },
{ title: '折扣价', key: 'discountPrice', width: 120 },
{ title: '备注', key: 'remark' }
]
}
......@@ -141,12 +144,36 @@ export default {
case '添加':
this._editModal(false)
break
case '导出项目统计表':
this._exportContractTable()
break
case 'search':
this.searchOpen = !this.searchOpen
break
}
})
},
_exportContractTable() {
// if (this.selectIds.length === 0) {
// this.$Message.warning('请选择要导出的数据!')
// return false
// }
const sampleIds = this.selectIds.join(',')
const data = this.formObj
data.idsStr = sampleIds
this.$Modal.confirm({
title: '提示',
content: '确定导出数据？',
onOk: () => {
http.open(
'/meter/v1/contract/export_contract_statistics_table/',
data
)
}
})
},
_iconClick(res, data, componentName) {
this.currentComponent = componentName
this.$nextTick(function() {
......@@ -177,6 +204,9 @@ export default {
case 'iconClick':
this._iconClick(data.name, data.rowData, data.componentName)
break
case 'selectIds':
this.selectIds = data
break
case 'changeSize':
this._page()
break
......@@ -185,7 +215,7 @@ export default {
_page: async function() {
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
console.log('this.formObj', this.formObj)
const result = await meterEntrust.pageSendEntrust(this.formObj)
const result = await meterContract.pageContractReviewHis(this.formObj)
if (result) {
this.$refs.pageTable._hideLoading()
this.getPage = result
......
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