projects/mesxc-zjl
into projects/mesxc-test
6 months ago
@@ -4,38 +4,23 @@ | |||||
<el-col :span='12'> | <el-col :span='12'> | ||||
<el-form-item label="能源类型" prop="energyTypeId"> | <el-form-item label="能源类型" prop="energyTypeId"> | ||||
<el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable> | <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable> | ||||
<el-option | |||||
v-for="item in this.energyTypeList" | |||||
:key="item.id" | |||||
:label="item.name" | |||||
:value="item.id"> | |||||
<el-option v-for="item in this.energyTypeList" :key="item.id" :label="item.name" :value="item.id"> | |||||
</el-option> | </el-option> | ||||
</el-select> | </el-select> | ||||
</el-form-item> | </el-form-item> | ||||
</el-col> | </el-col> | ||||
<el-col :span='12'> | <el-col :span='12'> | ||||
<el-form-item label="抄表日期" prop="recordTime"> | <el-form-item label="抄表日期" prop="recordTime"> | ||||
<el-date-picker | |||||
v-model="form.recordTime" | |||||
type="date" | |||||
format="yyyy-MM-dd" | |||||
value-format="timestamp" | |||||
placeholder="选择日期" | |||||
style="width: 100%;"> | |||||
<el-date-picker v-model="form.recordTime" type="date" format="yyyy-MM-dd" value-format="timestamp" | |||||
placeholder="选择日期" style="width: 100%;"> | |||||
</el-date-picker> | </el-date-picker> | ||||
</el-form-item> | </el-form-item> | ||||
</el-col> | </el-col> | ||||
</el-row> | </el-row> | ||||
<el-row :gutter="20"> | <el-row :gutter="20"> | ||||
<el-col :span='24'> | <el-col :span='24'> | ||||
<base-table | |||||
border | |||||
:table-props="tableProps" | |||||
:table-data="tableData" | |||||
:add-button-show="addButtonShow" | |||||
@emitFun="inputChange" | |||||
@emitButtonClick="emitButtonClick" | |||||
/> | |||||
<base-table border :table-props="tableProps" :table-data="tableData" :add-button-show="addButtonShow" | |||||
@emitFun="inputChange" @emitButtonClick="emitButtonClick" /> | |||||
</el-col> | </el-col> | ||||
</el-row> | </el-row> | ||||
</el-form> | </el-form> | ||||
@@ -48,12 +33,12 @@ import SelectArea from './SelectArea' | |||||
const tableProps = [ | const tableProps = [ | ||||
{ | { | ||||
prop: 'tableName', | prop: 'tableName', | ||||
label: '表名', | |||||
label: '表名*', | |||||
subcomponent: SelectArea | subcomponent: SelectArea | ||||
}, | }, | ||||
{ | { | ||||
prop: 'readingQuantity', | prop: 'readingQuantity', | ||||
label: '抄表数', | |||||
label: '抄表数*', | |||||
subcomponent: InputArea | subcomponent: InputArea | ||||
} | } | ||||
] | ] | ||||
@@ -185,7 +185,7 @@ export default { | |||||
break | break | ||||
default: | default: | ||||
this.$modal.confirm('是否确认导出').then(() => { | this.$modal.confirm('是否确认导出').then(() => { | ||||
return energyQuantityManualExport({ ...this.queryParams }); | |||||
return energyQuantityManualExport({ energyTypeId: this.queryParams.energyTypeId, recordTime: this.queryParams.recordTime }); | |||||
}).then(response => { | }).then(response => { | ||||
this.$download.excel(response, '能源报表.xls'); | this.$download.excel(response, '能源报表.xls'); | ||||
}).catch(() => { }) | }).catch(() => { }) | ||||
@@ -2,27 +2,12 @@ | |||||
<div class="app-container"> | <div class="app-container"> | ||||
<!-- 搜索工作栏 --> | <!-- 搜索工作栏 --> | ||||
<search-bar | |||||
:formConfigs="formConfig" | |||||
ref="searchBarForm" | |||||
@headBtnClick="buttonClick" | |||||
/> | |||||
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> | |||||
<!-- 列表 --> | <!-- 列表 --> | ||||
<base-table | |||||
:page="queryParams.pageNo" | |||||
:limit="queryParams.pageSize" | |||||
:table-props="tableProps" | |||||
:table-data="list" | |||||
:selectWidth="55" | |||||
:max-height="tableH" | |||||
@selection-change="selectChange" | |||||
/> | |||||
<pagination | |||||
:page.sync="queryParams.pageNo" | |||||
:limit.sync="queryParams.pageSize" | |||||
:total="total" | |||||
@pagination="getList" | |||||
/> | |||||
<base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list" | |||||
:selectWidth="55" :max-height="tableH" @selection-change="selectChange" /> | |||||
<pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total" | |||||
@pagination="getList" /> | |||||
</div> | </div> | ||||
</template> | </template> | ||||
@@ -71,7 +56,8 @@ export default { | |||||
type: 'select', | type: 'select', | ||||
label: '能源类型', | label: '能源类型', | ||||
selectOptions: [], | selectOptions: [], | ||||
param: 'energyTypeId' | |||||
param: 'energyTypeId', | |||||
filterable: true | |||||
}, | }, | ||||
{ | { | ||||
type: 'datePicker', | type: 'datePicker', | ||||
@@ -127,9 +127,11 @@ export default { | |||||
name: '', | name: '', | ||||
code: '', | code: '', | ||||
unit: '', | unit: '', | ||||
singlePrice: 0, | |||||
pricingMethod: 2, | pricingMethod: 2, | ||||
leaderName: '', | |||||
push: false | |||||
dim: '', | |||||
push: false, | |||||
description: '' | |||||
}, | }, | ||||
isEdit: false, //是否是编辑 | isEdit: false, //是否是编辑 | ||||
rules: { | rules: { | ||||
@@ -162,14 +164,15 @@ export default { | |||||
this.form.code = res.data.code | this.form.code = res.data.code | ||||
this.form.unit = res.data.unit | this.form.unit = res.data.unit | ||||
this.form.pricingMethod = res.data.pricingMethod | this.form.pricingMethod = res.data.pricingMethod | ||||
this.form.leaderName = res.data.leaderName | |||||
this.form.push = res.data.push ? true : false | this.form.push = res.data.push ? true : false | ||||
this.form.description = res.data.description | |||||
switch (this.form.pricingMethod) { | switch (this.form.pricingMethod) { | ||||
case 0: | case 0: | ||||
this.tableData1 = res.data.segPriceList || [] | this.tableData1 = res.data.segPriceList || [] | ||||
break; | break; | ||||
case 1: | case 1: | ||||
this.tableData2 = res.data.usedPriceList || [] | this.tableData2 = res.data.usedPriceList || [] | ||||
this.form.dim = res.data.dim | |||||
break; | break; | ||||
default: | default: | ||||
this.form.singlePrice = res.data.singlePrice || 0 | this.form.singlePrice = res.data.singlePrice || 0 | ||||