|
@@ -125,18 +125,15 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="费用状态" prop="fBillstatus">
|
|
|
+ <el-form-item label="费用状态" prop="fFeeStatus">
|
|
|
<el-select
|
|
|
style="width: 200px"
|
|
|
- v-model="queryParams.fBillstatus"
|
|
|
+ v-model="queryParams.fFeeStatus"
|
|
|
placeholder="请选择费用状态"
|
|
|
>
|
|
|
- <el-option label="录入" value="1"></el-option>
|
|
|
- <el-option label="暂存" value="2"></el-option>
|
|
|
- <el-option label="驳回" value="3"></el-option>
|
|
|
- <el-option label="请核" value="4"></el-option>
|
|
|
- <el-option label="审核中" value="5"></el-option>
|
|
|
- <el-option label="全部入账" value="6"></el-option>
|
|
|
+ <el-option label="暂存" :value="1"></el-option>
|
|
|
+ <el-option label="部分" :value="2"></el-option>
|
|
|
+ <el-option label="全部入账" :value="3"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
@@ -457,7 +454,7 @@
|
|
|
:height="tableHeight"
|
|
|
@expand-change="expandChange"
|
|
|
>
|
|
|
- <el-table-column type="selection" fixed align="center" />
|
|
|
+ <el-table-column type="selection" fixed align="center" width="58" />
|
|
|
<el-table-column type="expand" fixed="left">
|
|
|
<template slot-scope="props">
|
|
|
<el-table
|
|
@@ -526,6 +523,11 @@
|
|
|
</div></el-link
|
|
|
>
|
|
|
</span>
|
|
|
+ <span v-else-if="item.label == 'fFeeStatus'">
|
|
|
+ <div v-if="scope.row.fFeeStatus == 1">暂存</div>
|
|
|
+ <div v-else-if="scope.row.fFeeStatus == 2">部分</div>
|
|
|
+ <div v-else>全部入账</div>
|
|
|
+ </span>
|
|
|
<span v-else>{{ scope.row[item.label] }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -645,6 +647,7 @@ export default {
|
|
|
fBillstatus: null,
|
|
|
fItemsStatus: null,
|
|
|
timeInterval: null,
|
|
|
+ fFeeStatus: null,
|
|
|
},
|
|
|
// 显示搜索条件
|
|
|
showSearch: true,
|
|
@@ -789,7 +792,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
surface: "19",
|
|
|
- label: "fBillstatus",
|
|
|
+ label: "fFeeStatus",
|
|
|
name: "费用状态",
|
|
|
checked: 0,
|
|
|
width: 100,
|