|
@@ -92,21 +92,37 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :xs="12" :sm="6">
|
|
|
- <el-form-item label="费用状态" prop="fDc">
|
|
|
+ <el-form-item label="费用状态" prop="fBillstatus">
|
|
|
<el-select
|
|
|
- v-model="queryParams.fDc"
|
|
|
+ v-model="queryParams.fBillstatus"
|
|
|
clearable
|
|
|
filterable
|
|
|
placeholder="请选择"
|
|
|
style="width: 100%"
|
|
|
>
|
|
|
<el-option
|
|
|
- label="收"
|
|
|
- value="D"
|
|
|
+ label="录入"
|
|
|
+ value="1"
|
|
|
></el-option>
|
|
|
<el-option
|
|
|
- label="付"
|
|
|
- value="C"
|
|
|
+ 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-select>
|
|
|
</el-form-item>
|
|
@@ -252,6 +268,9 @@
|
|
|
<span v-else-if="item.label == 'fFeeUnitid'">
|
|
|
{{ scope.row.fFeeUnitid | fFeeUnitFormat(fFeetUnitOptions) }}
|
|
|
</span>
|
|
|
+ <span v-else-if="item.label == 'fBilltype'">
|
|
|
+ {{ scope.row.fBilltype | billTypeFormat(billTypeList) }}
|
|
|
+ </span>
|
|
|
<span v-else>{{ scope.row[item.label] }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -271,7 +290,7 @@ import Cookies from "js-cookie";
|
|
|
import draggable from "vuedraggable";
|
|
|
import { addSet, resetModule, select } from '@/api/system/set';
|
|
|
import {listCorps} from "@/api/basicdata/corps";
|
|
|
-import {getList} from "@/api/finance/query";
|
|
|
+import {getList, exportList} from "@/api/finance/query";
|
|
|
|
|
|
export default {
|
|
|
name: "index",
|
|
@@ -327,10 +346,17 @@ export default {
|
|
|
width: 100,
|
|
|
},{
|
|
|
surface: "5",
|
|
|
- label: "feesName",
|
|
|
+ label: "feeName",
|
|
|
name: "费用名称",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ surface: "6",
|
|
|
+ label: "fBillstatusName",
|
|
|
+ name: "费用状态",
|
|
|
+ checked: 0,
|
|
|
+ width: 100,
|
|
|
},{
|
|
|
surface: "6",
|
|
|
label: "fDc",
|
|
@@ -417,7 +443,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
surface: "18",
|
|
|
- label: "fBusinessType",
|
|
|
+ label: "fBilltype",
|
|
|
name: "业务类型",
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
@@ -442,6 +468,7 @@ export default {
|
|
|
fMblnoOptions: [],
|
|
|
loading: false,
|
|
|
dataList: [],
|
|
|
+ billTypeList: [],
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
@@ -455,6 +482,9 @@ export default {
|
|
|
this.getDicts("data_unitfees").then((response) => {
|
|
|
this.fFeetUnitOptions = response.data;
|
|
|
});
|
|
|
+ this.getDicts("data_billtype_type").then((response) => {
|
|
|
+ this.billTypeList = response.data;
|
|
|
+ });
|
|
|
},
|
|
|
mounted() {
|
|
|
this.$nextTick(() => {
|
|
@@ -481,6 +511,15 @@ export default {
|
|
|
});
|
|
|
return name;
|
|
|
},
|
|
|
+ billTypeFormat(row, billTypeList) {
|
|
|
+ let type;
|
|
|
+ billTypeList.map((e) => {
|
|
|
+ if (row == e.dictValue) {
|
|
|
+ type = e.dictLabel;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return type;
|
|
|
+ },
|
|
|
},
|
|
|
methods: {
|
|
|
getList() {
|
|
@@ -508,7 +547,15 @@ export default {
|
|
|
},
|
|
|
// 导出
|
|
|
handleExport() {
|
|
|
- this.$message.warning('此功能暂未开发')
|
|
|
+ this.$confirm("是否确认导出所有库存总账数据项?", "警告", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning",
|
|
|
+ }).then(() => {
|
|
|
+ return exportList(this.queryParams)
|
|
|
+ }).then(res => {
|
|
|
+ this.download(res.msg)
|
|
|
+ })
|
|
|
},
|
|
|
// 表格合计
|
|
|
getSum(param) {
|