diff --git a/WebSite/src/views/financial-adjust/components/detail.vue b/WebSite/src/views/financial-adjust/components/detail.vue
index c950612d84414f91a2caf1a562d00d6234a5691d..12454d4b6a3f32db192ae132a9331e630c6a04f6 100644
--- a/WebSite/src/views/financial-adjust/components/detail.vue
+++ b/WebSite/src/views/financial-adjust/components/detail.vue
@@ -206,7 +206,7 @@
v-model="detailform.incomeCanUsedAmount"
></el-input>
</el-form-item>
- <el-form-item label="璋冨棰濆害">
+ <el-form-item label="璋冨噺棰濆害">
<el-input v-model="detailform.adjustMoney" disabled></el-input>
</el-form-item>
</el-form>
diff --git a/WebSite/src/views/funds-review/components/detail.vue b/WebSite/src/views/funds-review/components/detail.vue
index 3d100a074c3d479b0eb17aa6a5655b78f918e63f..6beb87626422376156fe67b8cc7873e0d58819c5 100644
--- a/WebSite/src/views/funds-review/components/detail.vue
+++ b/WebSite/src/views/funds-review/components/detail.vue
@@ -261,8 +261,8 @@ export default {
console.log('鎷垮埌鍥為€€缁勪欢杩斿洖鐨勬暟鎹�', flowOutput);
rollBackAdjustPlan({
id: data.tableData[0].id,
- nodeIds: [handleSubmit.nodeIds],
- remake: handleSubmit.remake
+ nodeIds: [flowOutput.nodeIds],
+ remake: flowOutput.remake
}).then(() => {
ElMessage.success('鍥為€€鎴愬姛');
getAdjustDate(data.tableData[0].id);
diff --git a/WebSite/src/views/funds-review/components/list.vue b/WebSite/src/views/funds-review/components/list.vue
index 5e6bf456af72bda2f53f81b44073f6caa2163690..cc262c9a52ca8873ef0cc848fb31a075667c7ff2 100644
--- a/WebSite/src/views/funds-review/components/list.vue
+++ b/WebSite/src/views/funds-review/components/list.vue
@@ -40,7 +40,7 @@
</el-select>
</el-form-item>
<el-form-item class="form-cont-item">
- <el-input v-model="formData.creator" placeholder="璇疯緭鍏ュ埗鍗曚汉宸ュ彿">
+ <el-input v-model="formData.creatorCode" placeholder="璇疯緭鍏ュ埗鍗曚汉宸ュ彿">
</el-input>
</el-form-item>
<el-form-item>
@@ -75,7 +75,7 @@
width="150"
></el-table-column>
<el-table-column
- prop="creator"
+ prop="creatorCode"
label="鍒跺崟浜哄伐鍙�"
width="120"
></el-table-column>
@@ -180,44 +180,39 @@ import { reactive, toRefs } from '@vue/reactivity';
import { onMounted } from '@vue/runtime-core';
import { queryAuditPrimaryFundPageList, getFlowStateEnum } from '@/api/index';
export default {
- setup(prop, context) {
- const data = reactive({
- formData: {
- date: new Date().getFullYear().toString(),
- businessNumber: '',
- projectCode: '',
- progress: '',
- type: '',
- creator: ''
- },
- tableData: [],
- dialog: false,
- pageList: {
- total: 50
- },
- options: [
- {
- value: '寰呭姙',
- label: '寰呭姙'
- },
- {
- value: '宸插姙',
- label: '宸插姙'
- },
- {
- value: '宸插畬鎴�',
- label: '宸插畬鎴�'
- },
- {
- value: '鍏ㄩ儴',
- label: '鍏ㄩ儴'
- }
- ],
- stateList: [],
- pageIndex: 1,
- pageSize: 10,
- datacount: 0
- });
+ setup(prop, context) {
+ const data = reactive({
+ formData: {
+ date: new Date().getFullYear().toString(),
+ businessNumber: '',
+ projectCode: '',
+ progress: '',
+ type: '',
+ creatorCode: ''
+ },
+ tableData: [],
+ dialog: false,
+ pageList: {
+ total: 50
+ },
+ options: [{
+ value: '寰呭姙',
+ label: '寰呭姙'
+ }, {
+ value: '宸插姙',
+ label: '宸插姙'
+ }, {
+ value: '宸插畬鎴�',
+ label: '宸插畬鎴�',
+ }, {
+ value: '鍏ㄩ儴',
+ label: '鍏ㄩ儴',
+ }],
+ stateList: [],
+ pageIndex: 1,
+ pageSize: 10,
+ datacount: 0,
+ });
onMounted(() => {
// 鑾峰彇瀹℃牳淇℃伅
getAuditData();
@@ -237,7 +232,7 @@ export default {
type: data.formData.type,
projectName: '',
progress: data.formData.progress,
- creator: data.formData.creator ? data.formData.creator : '',
+ creatorCode: data.formData.creatorCode ? data.formData.creatorCode : '',
pageIndex: data.pageIndex,
pageSize: data.pageSize
};
diff --git a/WebSite/src/views/project-adjust/components/detail.vue b/WebSite/src/views/project-adjust/components/detail.vue
index 92bd331987ea62725da1ede313d856094817898d..c5ecda9810ac971617f1a94ef7ecf01f682fe6de 100644
--- a/WebSite/src/views/project-adjust/components/detail.vue
+++ b/WebSite/src/views/project-adjust/components/detail.vue
@@ -51,132 +51,32 @@
<el-button type="primary" @click="addNewProject()">鏂板椤圭洰</el-button>
<el-button type="primary" @click="handleExport()">涓嬭浇</el-button>
<el-button type="primary" @click="uploadDialog = true">瀵煎叆</el-button>
- <el-table :data="specialFundInputListCopy">
+ <el-table :data="detailData.adjustFundList">
<el-table-column label="璋冨嚭椤圭洰缂栧彿">
<template #default="">{{ detailData.projectCode }}</template>
</el-table-column>
<el-table-column label="璋冨嚭椤圭洰鍚嶇О">
<template #default="">{{ detailData.projectName }}</template>
</el-table-column>
- <el-table-column label="璋冨嚭棰濆害" prop="sourceSubjectName">
- <template #default="scope">
- <div
- :class="{
- cueLine: index != scope.row.details.length - 1
- }"
- v-for="(item, index) in scope.row.details"
- :key="index"
- >
- <el-popover trigger="hover" placement="top">
- <p>{{ item.sourceSubjectName }}</p>
-
- <template #reference>
- {{ item.sourceSubjectName }}
- </template>
- </el-popover>
- </div>
- </template>
- </el-table-column>
- <el-table-column label="璋冨嚭閲戦" prop="adjustMoney">
- <template #default="scope">
- <div
- :class="{
- cueLine: index != scope.row.details.length - 1
- }"
- v-for="(item, index) in scope.row.details"
- :key="index"
- >
- <el-popover trigger="hover" placement="top">
- <p>{{ item.adjustMoney }}</p>
-
- <template #reference>
- {{ item.adjustMoney }}
- </template>
- </el-popover>
- </div>
- </template>
- </el-table-column>
- <el-table-column label="璋冨叆椤圭洰缂栧彿" prop="targetProjectCode">
- <template #default="scope">
- <div
- :class="{
- cueLine: index != scope.row.details.length - 1
- }"
- v-for="(item, index) in scope.row.details"
- :key="index"
- >
- <el-popover trigger="hover" placement="top">
- <p>{{ item.targetProjectCode }}</p>
-
- <template #reference>
- {{ item.targetProjectCode }}
- </template>
- </el-popover>
- </div>
- </template>
- </el-table-column>
- <el-table-column label="璋冨叆椤圭洰鍚嶇О" prop="targetProjectName">
- <template #default="scope">
- <div
- :class="{
- cueLine: index != scope.row.details.length - 1
- }"
- v-for="(item, index) in scope.row.details"
- :key="index"
- >
- <el-popover trigger="hover" placement="top">
- <p>{{ item.targetProjectName }}</p>
-
- <template #reference>
- {{ item.targetProjectName }}
- </template>
- </el-popover>
- </div>
- </template>
- </el-table-column>
- <el-table-column label="璋冨叆棰濆害" prop="targetSubjectName">
- <template #default="scope">
- <div
- :class="{
- cueLine: index != scope.row.details.length - 1
- }"
- v-for="(item, index) in scope.row.details"
- :key="index"
- >
- <el-popover trigger="hover" placement="top">
- <p>{{ item.targetSubjectName }}</p>
-
- <template #reference>
- {{ item.targetSubjectName }}
- </template>
- </el-popover>
- </div>
- </template>
- </el-table-column>
- <el-table-column label="璋冨叆閲戦" prop="adjustMoney">
- <template #default="scope">
- <div
- :class="{
- cueLine: index != scope.row.details.length - 1
- }"
- v-for="(item, index) in scope.row.details"
- :key="index"
- >
- <el-popover trigger="hover" placement="top">
- <p>{{ item.adjustMoney }}</p>
-
- <template #reference>
- {{ item.adjustMoney }}
- </template>
- </el-popover>
- </div>
- </template>
- </el-table-column>
- <el-table-column label="姹囨€�" prop="summary">
- <template #default="scope">
- <div>{{ totalMount(scope.row.details) }}</div>
- </template>
- </el-table-column>
+ <el-table-column
+ label="璋冨嚭棰濆害"
+ prop="sourceSubjectName"
+ ></el-table-column>
+ <el-table-column label="璋冨嚭閲戦" prop="adjustMoney"></el-table-column>
+ <el-table-column
+ label="璋冨叆椤圭洰缂栧彿"
+ prop="targetProjectCode"
+ ></el-table-column>
+ <el-table-column
+ label="璋冨叆椤圭洰鍚嶇О"
+ prop="targetProjectName"
+ ></el-table-column>
+ <el-table-column
+ label="璋冨叆棰濆害"
+ prop="targetSubjectName"
+ ></el-table-column>
+ <el-table-column label="璋冨叆閲戦" prop="adjustMoney"></el-table-column>
+ <el-table-column label="姹囨€�" prop="summary"></el-table-column>
<el-table-column label="鎿嶄綔">
<template #default="scoped">
<el-button @click="deleteData(scoped)" type="danger"
@@ -302,7 +202,7 @@
v-model="detailform.incomeCanUsedAmount"
></el-input>
</el-form-item>
- <el-form-item label="璋冨棰濆害">
+ <el-form-item label="璋冨噺棰濆害">
<el-input v-model="detailform.adjustMoney" disabled></el-input>
</el-form-item>
</el-form>
@@ -337,7 +237,6 @@ import { onMounted } from '@vue/runtime-core';
import quotaAdjust from '@/api/quotaAdjust';
import { ElMessage } from 'element-plus';
import * as XLSX from 'xlsx';
-import { moneyFormat } from '@/utils';
export default {
props: {
data: {
@@ -379,8 +278,7 @@ export default {
isShowState: false,
isShowCancel: false
}
- },
- specialFundInputListCopy: []
+ }
});
onMounted(() => {
if (props.data.id) {
@@ -392,7 +290,6 @@ export default {
const getData = id => {
quotaAdjust.getAdjustPlan(id).then(res => {
data.detailData = res.data[0];
- handleTrigger();
data.flowInfo = res.data[0].flowCanShowOut;
});
};
@@ -602,35 +499,8 @@ export default {
};
const addAdjustFund = () => {
data.detailData.adjustFundList.push(data.detailform);
- handleTrigger();
data.detailDialog = false;
};
- const totalMount = details => {
- let n = 0;
- for (let i in details) {
- n += Number(details[i].adjustMoney);
- }
- return moneyFormat(n, 2, ',');
- };
- const handleTrigger = () => {
- data.specialFundInputListCopy = [];
- data.detailData.adjustFundList.forEach(v => {
- for (let i in data.specialFundInputListCopy) {
- if (
- data.specialFundInputListCopy[i].targetProjectCode ===
- v.targetProjectCode
- ) {
- data.specialFundInputListCopy[i].details.push(v);
- return;
- }
- }
- data.specialFundInputListCopy.push({
- ...v,
- details: [{ ...v }]
- });
- console.log('specialFundInputListCopy', data.specialFundInputListCopy);
- });
- };
const resetData = () => {
data.detailform = {};
};
@@ -757,9 +627,7 @@ export default {
return {
...toRefs(data),
handleBack,
- handleTrigger,
handleSave,
- totalMount,
handleSubmit,
handleReturn,
deleteData,
@@ -785,8 +653,4 @@ export default {
.el-card {
margin-bottom: 10px;
}
-
-.cueLine {
- margin-bottom: 20px;
-}
</style>
diff --git a/WebSite/src/views/project-review/components/list.vue b/WebSite/src/views/project-review/components/list.vue
index ef6b83890899c5cec8e379cdf0315c7a72452f9f..a089cdebe59f3ef2ac28e90a821ada29b64a7444 100644
--- a/WebSite/src/views/project-review/components/list.vue
+++ b/WebSite/src/views/project-review/components/list.vue
@@ -43,7 +43,7 @@
</el-form-item>
<el-form-item class="form-cont-search">
<el-button type="primary" @click="onSubmit">鏌ヨ</el-button>
- <!-- <el-button type="danger" @click="onDelete">鍒犻櫎</el-button> -->
+ <el-button type="danger" @click="onDelete">鍒犻櫎</el-button>
</el-form-item>
</el-form>
</el-card>
@@ -154,10 +154,10 @@ import { reactive, toRefs } from '@vue/reactivity';
import { onMounted } from '@vue/runtime-core';
import {
queryProjectByAuditPage,
- getFlowStateEnum
- // removeSplitItemPlan
+ getFlowStateEnum,
+ removeSplitItemPlan
} from '@/api/index';
-// import { ElMessage } from 'element-plus';
+import { ElMessage } from 'element-plus';
export default {
setup(prop, context) {
const data = reactive({
@@ -248,18 +248,18 @@ export default {
};
// 鍒犻櫎
- // const onDelete = () => {
- // console.log('杩欐槸鍒犻櫎');
- // let ids = [];
- // data.selectData.forEach(item => {
- // ids.push(item.id);
- // });
- // removeSplitItemPlan().then(res => {
- // console.log('鍒犻櫎res', res);
- // ElMessage.success('鍒犻櫎鎴愬姛');
- // getqueryDate();
- // });
- // };
+ const onDelete = () => {
+ console.log('杩欐槸鍒犻櫎');
+ let ids = [];
+ data.selectData.forEach(item => {
+ ids.push(item.id);
+ });
+ removeSplitItemPlan().then(res => {
+ console.log('鍒犻櫎res', res);
+ ElMessage.success('鍒犻櫎鎴愬姛');
+ getqueryDate();
+ });
+ };
const handleSizeChange = val => {
data.pageSize = val;
@@ -275,7 +275,7 @@ export default {
...toRefs(data),
handleClick,
onSubmit,
- // onDelete,
+ onDelete,
getqueryDate,
selectChange,
handleSizeChange,
diff --git a/WebSite/src/views/quota-adjust/components/detail.vue b/WebSite/src/views/quota-adjust/components/detail.vue
index a6c3895109c2638b6b63fe74f6ca98b6dc9fe943..7281867992473ff02eefb8cd28774d061539cc98 100644
--- a/WebSite/src/views/quota-adjust/components/detail.vue
+++ b/WebSite/src/views/quota-adjust/components/detail.vue
@@ -51,7 +51,7 @@
<el-button type="primary" @click="addNewProject()">鏂板椤圭洰</el-button>
<el-button type="primary" @click="handleExport()">涓嬭浇</el-button>
<el-button type="primary" @click="uploadDialog = true">瀵煎叆</el-button>
- <el-table :data="specialFundInputListCopy">
+ <el-table :data="detailData.adjustFundList">
<el-table-column label="璋冨嚭椤圭洰缂栧彿" prop="targetProjectCode">
</el-table-column>
<el-table-column label="璋冨嚭椤圭洰鍚嶇О" prop="targetProjectName">
@@ -60,48 +60,9 @@
</el-table-column>
<el-table-column label="璋冨嚭閲戦" prop="adjustMoney"> </el-table-column>
<el-table-column label="璋冨叆棰濆害" prop="targetSubjectName">
- <template #default="scope">
- <div
- :class="{
- cueLine: index != scope.row.details.length - 1
- }"
- v-for="(item, index) in scope.row.details"
- :key="index"
- >
- <el-popover trigger="hover" placement="top">
- <p>{{ item.targetSubjectName }}</p>
-
- <template #reference>
- {{ item.targetSubjectName }}
- </template>
- </el-popover>
- </div>
- </template>
- </el-table-column>
- <el-table-column label="璋冨叆閲戦" prop="adjustMoney">
- <template #default="scope">
- <div
- :class="{
- cueLine: index != scope.row.details.length - 1
- }"
- v-for="(item, index) in scope.row.details"
- :key="index"
- >
- <el-popover trigger="hover" placement="top">
- <p>{{ item.adjustMoney }}</p>
-
- <template #reference>
- {{ item.adjustMoney }}
- </template>
- </el-popover>
- </div>
- </template>
- </el-table-column>
- <el-table-column label="姹囨€�" prop="summary">
- <template #default="scope">
- <div>{{ totalMount(scope.row.details) }}</div>
- </template>
</el-table-column>
+ <el-table-column label="璋冨叆閲戦" prop="adjustMoney"> </el-table-column>
+ <el-table-column label="姹囨€�" prop="summary"></el-table-column>
<el-table-column label="鎿嶄綔">
<template #default="scoped">
<el-button @click="deleteData(scoped)" type="danger"
@@ -173,11 +134,7 @@
></el-input>
</el-form-item>
<el-form-item label="璋冨噺棰濆害">
- <!-- <el-input v-model.number="detailform.adjustMoney"></el-input> -->
- <AmountInputBox
- v-model="detailform.adjustMoney"
- placeholder="璇疯緭鍏ヨ皟鍑忛搴�"
- ></AmountInputBox>
+ <el-input v-model.number="detailform.adjustMoney"></el-input>
</el-form-item>
</el-form>
</el-col>
@@ -247,7 +204,6 @@ import { onMounted } from '@vue/runtime-core';
import quotaAdjust from '@/api/quotaAdjust';
import { ElMessage } from 'element-plus';
import * as XLSX from 'xlsx';
-import { moneyFormat } from '@/utils';
export default {
props: {
data: {
@@ -293,8 +249,7 @@ export default {
isShowState: false,
isShowCancel: false
}
- },
- specialFundInputListCopy: []
+ }
});
onMounted(() => {
if (props.data.id) {
@@ -308,7 +263,6 @@ export default {
const getData = id => {
quotaAdjust.getAdjustPlan(id).then(res => {
data.detailData = res.data[0];
- handleTrigger();
data.flowInfo = res.data[0].flowCanShowOut;
});
};
@@ -442,35 +396,8 @@ export default {
// data.detailform.targetProjectCode = data.detailform.projectCode;
data.detailform.targetProjectName = data.detailform.projectName;
data.detailData.adjustFundList.push(data.detailform);
- handleTrigger();
data.detailDialog = false;
};
- const handleTrigger = () => {
- data.specialFundInputListCopy = [];
- data.detailData.adjustFundList.forEach(v => {
- for (let i in data.specialFundInputListCopy) {
- if (
- data.specialFundInputListCopy[i].targetSubjectName ===
- v.targetSubjectName
- ) {
- data.specialFundInputListCopy[i].details.push(v);
- return;
- }
- }
- data.specialFundInputListCopy.push({
- ...v,
- details: [{ ...v }]
- });
- console.log('specialFundInputListCopy', data.specialFundInputListCopy);
- });
- };
- const totalMount = details => {
- let n = 0;
- for (let i in details) {
- n += Number(details[i].adjustMoney);
- }
- return moneyFormat(n, 2, ',');
- };
const downloadFile = id => {
quotaAdjust.downloadAttachment(id).then(res => {
let blob = new Blob([res.data]); // { type: "application/vnd.ms-excel"
@@ -657,8 +584,6 @@ export default {
};
return {
...toRefs(data),
- handleTrigger,
- totalMount,
handleBack,
handleSave,
handleSubmit,
@@ -685,8 +610,4 @@ export default {
.el-card {
margin-bottom: 10px;
}
-
-.cueLine {
- margin-bottom: 20px;
-}
</style>
diff --git a/WebSite/src/views/special-funds-monitor/components/list.vue b/WebSite/src/views/special-funds-monitor/components/list.vue
index 0ce9cbb1a38518fcdbd7c6efc2ffb6b4f91f7d5b..cffc6cd563b46e19ba698427f40e4f25423bfa17 100644
--- a/WebSite/src/views/special-funds-monitor/components/list.vue
+++ b/WebSite/src/views/special-funds-monitor/components/list.vue
@@ -1,42 +1,27 @@
<template>
<div class="special-funds">
<el-card>
- <el-form :inline="true" label-width="150px" class="form-cont">
+ <el-form :inline="true" label-width="150px" class="form-cont">
<el-form-item class="form-cont-item">
- <el-date-picker
- v-model="formData.date"
- type="year"
- placeholder=""
- ></el-date-picker>
+ <el-date-picker v-model="formData.date" type="year" placeholder=""></el-date-picker>
</el-form-item>
<el-form-item class="form-cont-item">
- <el-select
- v-model="formData.state"
- placeholder="璇烽€夋嫨瀹℃牳鐘舵€�"
- clearable
- >
- <el-option
- v-for="item in stateList"
- :key="item"
- :label="item"
- :value="item"
- />
- </el-select>
+ <el-select v-model="formData.state" placeholder="璇烽€夋嫨瀹℃牳鐘舵€�" clearable>
+ <el-option
+ v-for="item in stateList"
+ :key="item"
+ :label="item"
+ :value="item"
+ />
+ </el-select>
</el-form-item>
<el-form-item class="form-cont-item">
- <el-input
- v-model="formData.projectCode"
- @change="onProjectCode"
- placeholder="璇疯緭鍏ヨ皟鍑洪」鐩紪鍙�"
- >
- </el-input>
+ <el-input v-model="formData.projectCode" @change="onProjectCode" placeholder="璇疯緭鍏ヨ皟鍑洪」鐩紪鍙�">
+ </el-input>
</el-form-item>
<el-form-item class="form-cont-item">
- <el-input
- v-model="formData.businessNumber"
- placeholder="璇疯緭鍏ヤ笟鍔℃祦姘村彿"
- >
- </el-input>
+ <el-input v-model="formData.businessNumber" placeholder="璇疯緭鍏ヤ笟鍔℃祦姘村彿">
+ </el-input>
</el-form-item>
<!-- <el-form-item class="form-cont-item">
<el-select v-model="formData.progress" placeholder="鍏ㄩ儴">
@@ -49,233 +34,213 @@
</el-select>
</el-form-item> -->
<el-form-item>
- <el-radio-group v-model="formData.type" @change="onRadio">
- <el-radio label="FUND">棰濆害璋冩暣</el-radio>
- <el-radio label="PROJECT">椤圭洰璋冩暣</el-radio>
- <el-radio label="FINANCE">璐㈠姟澶勮皟鏁�</el-radio>
- </el-radio-group>
+ <el-radio-group v-model="formData.type" @change="onRadio">
+ <el-radio label="FUND" >棰濆害璋冩暣</el-radio>
+ <el-radio label="PROJECT" >椤圭洰璋冩暣</el-radio>
+ <el-radio label="FINANCE" >璐㈠姟澶勮皟鏁�</el-radio>
+ </el-radio-group>
</el-form-item>
<el-form-item class="form-cont-search">
- <el-button type="primary" @click="onSubmit">鏌ヨ</el-button>
+ <el-button type="primary" @click="onSubmit">鏌ヨ</el-button>
</el-form-item>
- </el-form>
+ </el-form>
</el-card>
<el-card>
- <el-table :data="tableList" row-key="id" style="width: 100%">
- <el-table-column type="selection" width="55" />
- <el-table-column prop="year" label="鏃ユ湡" width="150">
- </el-table-column>
- <el-table-column prop="businessNumber" label="娴佹按鍙�" width="150">
- </el-table-column>
- <el-table-column prop="projectCert" label="椤圭洰鍑瘉鍙�" width="150">
- </el-table-column>
- <el-table-column prop="fundCert" label="棰濆害鍑瘉鍙�" width="150">
- </el-table-column>
- <el-table-column prop="creator" label="鍒跺崟浜哄鍚�" width="120">
- </el-table-column>
- <el-table-column prop="state" label="瀹℃牳鐘舵€�" width="120">
- </el-table-column>
- <el-table-column prop="projectCode" label="璋冨嚭椤圭洰缂栧彿" width="120">
- </el-table-column>
- <el-table-column prop="projectName" label="璋冨嚭椤圭洰鍚嶇О" width="120">
- </el-table-column>
- <el-table-column prop="adjustMoney" label="璋冨嚭棰濆害" width="120">
- <template #default="scope">
- <div v-for="item in scope.row.adjustFundList" :key="item">
- {{ item.sourceSubjectName }}
- </div>
- </template>
- </el-table-column>
- <el-table-column prop="adjustMoney" label="璋冨嚭閲戦" width="120">
- <template #default="scope">
- <div v-for="item in scope.row.adjustFundList" :key="item">
- {{ item.adjustMoney }}
- </div>
- </template>
- </el-table-column>
- <el-table-column
- prop="targetProjectCode"
- label="璋冨叆椤圭洰缂栧彿"
- width="120"
- >
- <template #default="scope">
- <div v-for="item in scope.row.adjustFundList" :key="item">
- {{ item.targetProjectCode }}
- </div>
- </template>
- </el-table-column>
- <el-table-column
- prop="targetProjectName"
- label="璋冨叆椤圭洰鍚嶇О"
- width="120"
- >
- <template #default="scope">
- <div v-for="item in scope.row.adjustFundList" :key="item">
- {{ item.targetProjectName }}
- </div>
- </template>
- </el-table-column>
- <el-table-column prop="targetSubjectName" label="璋冨叆棰濆害" width="120">
- <template #default="scope">
- <div v-for="item in scope.row.adjustFundList" :key="item">
- {{ item.targetSubjectName }}
- </div>
- </template>
- </el-table-column>
- <el-table-column prop="adjustMoney" label="璋冨叆閲戦" width="120">
- <template #default="scope">
- <div v-for="item in scope.row.adjustFundList" :key="item">
- {{ item.adjustMoney }}
- </div>
- </template>
- </el-table-column>
- <el-table-column prop="summary" label="姹囨€�" width="120">
- </el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔" width="200">
- <template #default="scoped">
- <el-button
- type="primary"
- size="small"
- @click="handleClick(scoped.row)"
- >鏌ョ湅鏄庣粏</el-button
- >
- <el-button type="primary" size="small">鎵撳嵃</el-button>
- </template>
- </el-table-column>
- </el-table>
- <!-- <Pagination :pageList="pageList"></Pagination> -->
- <el-pagination
- v-model:currentPage="pageIndex"
- v-model:page-size="pageSize"
- :page-sizes="[10, 20, 50, 100]"
- :background="true"
- layout="total, sizes, prev, pager, next, jumper"
- :total="datacount"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- ></el-pagination>
+ <el-table :data="tableList" row-key="id" style="width: 100%">
+ <el-table-column type="selection" width="55" />
+ <el-table-column prop="year" label="鏃ユ湡" width="150" >
+
+ </el-table-column>
+ <el-table-column prop="businessNumber" label="娴佹按鍙�" width="150" >
+
+ </el-table-column>
+ <el-table-column prop="projectCert" label="椤圭洰鍑瘉鍙�" width="150" >
+
+ </el-table-column>
+ <el-table-column prop="fundCert" label="棰濆害鍑瘉鍙�" width="150" >
+
+ </el-table-column>
+ <el-table-column prop="creator" label="鍒跺崟浜哄鍚�" width="120" >
+
+ </el-table-column>
+ <el-table-column prop="state" label="瀹℃牳鐘舵€�" width="120" >
+
+ </el-table-column>
+ <el-table-column prop="projectCode" label="璋冨嚭椤圭洰缂栧彿" width="120" >
+
+ </el-table-column>
+ <el-table-column prop="projectName" label="璋冨嚭椤圭洰鍚嶇О" width="120" >
+
+ </el-table-column>
+ <el-table-column prop="adjustMoney" label="璋冨嚭閲戦" width="120" >
+ <template #default="scope">
+ <div v-for="item in scope.row.adjustFundList" :key="item">{{item.adjustMoney}}</div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="targetProjectCode" label="璋冨叆椤圭洰缂栧彿" width="120" >
+ <template #default="scope">
+ <div v-for="item in scope.row.adjustFundList" :key="item">{{item.targetProjectCode}}</div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="targetProjectName" label="璋冨叆椤圭洰鍚嶇О" width="120" >
+ <template #default="scope">
+ <div v-for="item in scope.row.adjustFundList" :key="item">{{item.targetProjectName}}</div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="targetSubjectName" label="璋冨叆棰濆害" width="120" >
+ <template #default="scope">
+ <div v-for="item in scope.row.adjustFundList" :key="item">{{item.targetSubjectName}}</div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="adjustMoney" label="璋冨叆閲戦" width="120" >
+ <template #default="scope">
+ <div v-for="item in scope.row.adjustFundList" :key="item">{{item.adjustMoney}}</div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="summary" label="姹囨€�" width="120" >
+
+ </el-table-column>
+ <el-table-column fixed="right" label="鎿嶄綔" width="200">
+ <template #default="scoped">
+ <el-button type="primary" size="small" @click="handleClick(scoped.row)"
+ >鏌ョ湅鏄庣粏</el-button>
+ <el-button type="primary" size="small">鎵撳嵃</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- <Pagination :pageList="pageList"></Pagination> -->
+ <el-pagination
+ v-model:currentPage="pageIndex"
+ v-model:page-size="pageSize"
+ :page-sizes="[10, 20, 50, 100]"
+ :background="true"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="datacount"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ ></el-pagination>
</el-card>
+
</div>
</template>
<script>
import { reactive, toRefs } from '@vue/reactivity';
import { onMounted } from '@vue/runtime-core';
-import { queryMonitorPrimaryFundPageList, getFlowStateEnum } from '@/api/index';
+import {
+ queryMonitorPrimaryFundPageList,
+ getFlowStateEnum
+} from '@/api/index';
export default {
- setup(prop, context) {
- const data = reactive({
- formData: {
- date: new Date().getFullYear().toString(),
- businessNumber: '',
- projectCode: '',
- // progress: '',
- type: ''
- },
- tableData: [{}],
- dialog: false,
- pageList: {
- total: 50
- },
- options: [
- {
- value: '寰呭姙',
- label: '寰呭姙'
- },
- {
- value: '宸插姙',
- label: '宸插姙'
- },
- {
- value: '鍏ㄩ儴',
- label: '鍏ㄩ儴'
- }
- ],
- tableList: [],
- stateList: [],
- pageIndex: 1,
- pageSize: 10,
- datacount: 0
- });
-
- onMounted(() => {
- getDatalist();
+ setup(prop, context) {
+ const data = reactive({
+ formData: {
+ date: new Date().getFullYear().toString(),
+ businessNumber: '',
+ projectCode: '',
+ // progress: '',
+ type: '',
+ },
+ tableData: [{}],
+ dialog: false,
+ pageList: {
+ total: 50
+ },
+ options: [{
+ value: '寰呭姙',
+ label: '寰呭姙',
+ }, {
+ value: '宸插姙',
+ label: '宸插姙',
+ }, {
+ value: '鍏ㄩ儴',
+ label: '鍏ㄩ儴',
+ }],
+ tableList: [],
+ stateList: [],
+ pageIndex: 1,
+ pageSize: 10,
+ datacount: 0,
+ });
- // 鑾峰彇瀹℃牳鐘舵€�
- getFlowStateEnum().then(res => {
- console.log('getFlowStateEnum', res);
- data.stateList = res.data;
- });
- });
+ onMounted(() => {
+ getDatalist();
- // 鍒嗛〉鏄剧ず鐩戞帶淇℃伅
- const getDatalist = () => {
- const datalist = {
- year: data.formData.date,
- state: data.formData.state,
- projectCode: data.formData.projectCode,
- businessNumber: data.formData.businessNumber,
- type: data.formData.type,
- // "projectName": "",
- // "progress":data.formData.progress,
- pageIndex: data.pageIndex,
- pageSize: data.pageSize
- };
- queryMonitorPrimaryFundPageList(datalist).then(res => {
- data.tableList = res.data;
- data.datacount = res.total;
- console.log('queryMonitorPrimaryFundPageList', data.tableList);
- });
- };
+ // 鑾峰彇瀹℃牳鐘舵€�
+ getFlowStateEnum().then((res) => {
+ console.log('getFlowStateEnum', res);
+ data.stateList = res.data;
+ })
+ });
- const handleClick = row => {
- context.emit('switchPage', 'Detail', row);
- console.log('row', row);
- };
+ // 鍒嗛〉鏄剧ず鐩戞帶淇℃伅
+ const getDatalist = () => {
+ const datalist = {
+ "year": data.formData.date,
+ "state": data.formData.state,
+ "projectCode": data.formData.projectCode,
+ "businessNumber": data.formData.businessNumber,
+ "type": data.formData.type,
+ // "projectName": "",
+ // "progress":data.formData.progress,
+ "pageIndex":data.pageIndex,
+ "pageSize":data.pageSize
+ }
+ queryMonitorPrimaryFundPageList(datalist).then((res) => {
+ data.tableList = res.data;
+ data.datacount = res.total;
+ console.log('queryMonitorPrimaryFundPageList', data.tableList);
+ })
+ }
+
+ const handleClick = row => {
+ context.emit('switchPage', 'Detail', row);
+ console.log('row', row);
+ };
- const onProjectCode = val => {
- console.log('vvv', val);
- };
+ const onProjectCode = (val) => {
+ console.log('vvv', val);
+ }
- // 鏌ヨ
- const onSubmit = () => {
- console.log('杩欐槸form鐨勬煡璇�', data.formData);
- getDatalist();
- };
+ // 鏌ヨ
+ const onSubmit = () => {
+ console.log('杩欐槸form鐨勬煡璇�', data.formData);
+ getDatalist();
+ }
- const onRadio = value => {
- console.log('value', value);
- };
+ const onRadio = (value) => {
+ console.log('value', value);
+ }
- const handleSizeChange = val => {
- data.pageSize = val;
- data.pageIndex = 1;
- getDatalist();
- };
- const handleCurrentChange = val => {
- data.pageIndex = val;
- getDatalist();
- };
+ const handleSizeChange = val => {
+ data.pageSize = val;
+ data.pageIndex = 1;
+ getDatalist();
+ };
+ const handleCurrentChange = val => {
+ data.pageIndex = val;
+ getDatalist();
+ };
- return {
- ...toRefs(data),
- handleClick,
- onRadio,
- onProjectCode,
- onSubmit,
- getDatalist,
- handleSizeChange,
- handleCurrentChange
- };
- }
-};
+ return {
+ ...toRefs(data),
+ handleClick,
+ onRadio,
+ onProjectCode,
+ onSubmit,
+ getDatalist,
+ handleSizeChange,
+ handleCurrentChange
+ };
+ }
+}
</script>
<style scoped>
-.special-funds {
- padding: 20px;
-}
-.el-card {
- margin-bottom: 10px;
-}
-</style>
+ .special-funds {
+ padding: 20px;
+ }
+ .el-card {
+ margin-bottom: 10px;
+ }
+</style>
\ No newline at end of file
diff --git a/WebSite/src/views/subject-split/components/list.vue b/WebSite/src/views/subject-split/components/list.vue
index 54d13e70a7c1553cecf1c4713690b7f7aecfbbdf..4ce85f997f93bc5a2945af5c9487bd4101d9b78d 100644
--- a/WebSite/src/views/subject-split/components/list.vue
+++ b/WebSite/src/views/subject-split/components/list.vue
@@ -28,7 +28,7 @@
</el-form-item>
<el-form-item>
<el-select
- v-model="formData.state"
+ v-model="formData.progress"
placeholder="璇烽€夋嫨瀹℃牳鐘舵€�"
clearable
>