明树Git Lab

Commit 4dac1ac3 authored by yangyajing's avatar yangyajing

投资目标责任书数据对接,资源库管理调整

parent 0b12acf2
Pipeline #106049 passed with stage
in 16 seconds
......@@ -20,6 +20,7 @@
"element-plus": "^2.11.8",
"less-loader": "^12.3.0",
"lodash": "^4.17.21",
"moment": "^2.30.1",
"pinia": "^3.0.4",
"vue": "^3.5.24",
"vue-router": "^4.6.3",
......@@ -1525,6 +1526,15 @@
"version": "3.0.1",
"license": "MIT"
},
"node_modules/moment": {
"version": "2.30.1",
"resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
"integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
"license": "MIT",
"engines": {
"node": "*"
}
},
"node_modules/nanoid": {
"version": "3.3.11",
"funding": [
......
......@@ -15,6 +15,7 @@
v-model="dialogVisible"
width="50%"
:before-close="handleClose"
:close-on-click-modal="false" :close-on-press-escape="false"
>
<commonTable
:data="tableData"
......
......@@ -11,12 +11,14 @@ import "./assets/fonts/font.less"; // 字体样式
import "../public/iconFont/iconfont.css"; // 图标字体样式
import { $get, $post } from "@/data/https.js";
import windowConfig from "@/window";
import moment from "moment";
const pinia = createPinia()
const app = createApp(App)
app.config.globalProperties.$get = $get;
app.config.globalProperties.$post = $post;
app.config.globalProperties.windowConfig = windowConfig;
app.config.globalProperties.moment = moment;
for (const [key, component] of Object.entries(ElIcons)) {
app.component(key, component)
}
......
......@@ -18,7 +18,7 @@
.header-left{
flex: 1;
width: 0;
.el-input{
.el-input, .el-select{
width: 220px;
}
}
......@@ -216,8 +216,8 @@
overflow: auto;
position: relative;
.el-tree {
max-height: 700px;
overflow-y: auto;
// max-height: 700px;
// overflow-y: auto;
// 只有当内容超过700px时才显示滚动条
&:not(:hover) {
scrollbar-width: none;
......@@ -256,5 +256,9 @@
overflow: hidden;
text-overflow: ellipsis;
}
.node-key{
font-size: 12px;
color: #969696;
}
}
}
\ No newline at end of file
......@@ -194,6 +194,7 @@
v-model="dialogVisible"
width="80%"
:before-close="handleClose"
:close-on-click-modal="false" :close-on-press-escape="false"
>
<div class="dialog-content">
<div class="table-wrap">
......
<template>
<div class="add-project-container">
<div class="add-project-content" v-loading="loading">
<div class="add-project-header">
<div class="header-left"></div>
<div class="header-right">
<el-button type="default" @click="backClick">返回</el-button>
<template v-if="!loading && !isPreview">
<el-button type="primary" @click="saveClick">保存</el-button>
</template>
</div>
</div>
<div class="tabs-content"></div>
</div>
</div>
</template>
<script setup>
import { reactive, ref, onMounted, getCurrentInstance, h } from "vue";
import { useRouter, useRoute } from "vue-router";
import { ElMessage, ElMessageBox } from "element-plus";
import { useUserStore } from "@/stores/user.js";
const userStore = useUserStore();
const router = useRouter();
const route = useRoute();
const { proxy } = getCurrentInstance();
</script>
<style lang="less">
@import "@/styles/manage.less";
.add-project-header{
margin-bottom: 10px;
}
</style>
\ No newline at end of file
......@@ -19,14 +19,21 @@
<el-collapse v-model="activeCollapse">
<el-collapse-item title="责任书基本信息" name="责任书基本信息">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="层级"></el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="责任书类型"></el-form-item>
<el-col :span="12">
<el-form-item label="责任书类型">
<el-tree-select
v-model="formData.zrslx"
:data="zrslxList"
node-key="key"
:props="zrslxProps"
placeholder="请选择"
render-after-expand
@node-click="changeZrslx"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="项目信息">
<el-col :span="12">
<el-form-item label="项目信息" required>
<el-select v-model="formData.projectId" placeholder="请选择" no-data-text="暂无数据"
@change="changeProject"
>
......@@ -55,7 +62,11 @@
>
<el-table-column type="selection" width="55" />
<el-table-column prop="originalname" label="文件名" />
<el-table-column prop="updatedAt" label="上传时间" />
<el-table-column prop="updatedAt" label="上传时间">
<template #default="{ row, index }">
<span>{{ moment(row.updatedAt).format("YYYY-MM-DD HH:mm:SS") }}</span>
</template>
</el-table-column>
<el-table-column prop="size" label="大小" />
<el-table-column fixed="right" label="操作" width="100">
<template #default="{ row, index }">
......@@ -72,15 +83,6 @@
<el-input v-model="formData.projectName" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="年份">
<el-date-picker
v-model="formData.nf"
type="year"
placeholder="请选择"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="投资主体">
<el-input v-model="formData.tzzt" />
......@@ -124,33 +126,27 @@
</el-row>
</el-collapse-item>
<el-collapse-item title="责任书具体指标" name="责任书具体指标">
<div class="tab-handle">
<el-button type="primary" size="small" @click="addZrsjtzb">新增</el-button>
</div>
<el-table :data="zrsjtzbData" style="width: 100%" empty-text="暂无数据" border
default-expand-all row-key="xh"
show-summary :summary-method="getSummaries"
>
<el-table-column type="index" width="60" />
<el-table-column prop="zbmc" label="指标名称">
<template #default="scope">
<el-input v-model="scope.row.zbmc" type="textarea" />
</template>
</el-table-column>
<el-table-column prop="zbmbz" label="指标目标值">
<el-table-column type="index" label="序号" width="60" />
<el-table-column prop="zbmc" label="指标名称" />
<el-table-column prop="zbmbz" label="指标目标值" width="180">
<template #default="scope">
<el-input-number v-model="scope.row.zbmbz" :min="0" :max="99999999999.99999999"
controls-position="right"
/>
</template>
</el-table-column>
<el-table-column prop="khjzf" label="考核基准分">
<el-table-column prop="khjzf" label="考核基准分" width="180">
<template #default="scope">
<el-input-number v-model="scope.row.khjzf" :min="0" :max="99999999999.99999999"
controls-position="right"
/>
</template>
</el-table-column>
<el-table-column prop="sfsy" label="是否适用">
<el-table-column prop="sfsy" label="是否适用" width="90">
<template #default="scope">
<el-switch
v-model="scope.row.sfsy" inline-prompt
......@@ -164,9 +160,61 @@
<el-input v-model="scope.row.khsm" type="textarea" />
</template>
</el-table-column>
</el-table>
</el-collapse-item>
<el-collapse-item title="批复意见落实情况" name="批复意见落实情况">
<div class="tab-handle">
<el-button type="primary" size="small" @click="addPfyjlsqk">新增</el-button>
</div>
<el-table :data="pfyjlsqkData" style="width: 100%" empty-text="暂无数据" border>
<el-table-column type="index" width="60" />
<el-table-column prop="lx" label="类型">
<template #default="scope">
<el-select v-model="scope.row.lx" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in pfyjlxList" :key="item.key"
:label="item.name" :value="item.key"
></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="pfyj" label="批复意见">
<template #default="scope">
<el-input v-model="scope.row.pfyj" type="textarea" />
</template>
</el-table-column>
<el-table-column prop="jzf" label="基准分">
<template #default="scope">
<el-input-number v-model="scope.row.jzf" :min="0" :max="99999999999.99999999"
controls-position="right"
/>
</template>
</el-table-column>
<el-table-column prop="lsqk" label="落实情况">
<template #default="scope">
<el-select v-model="scope.row.lsqk" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in lsqkList" :key="item.key"
:label="item.name" :value="item.key"
></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="lssj" label="落实时间">
<template #default="scope">
<el-date-picker
v-model="scope.row.lssj"
type="datetime"
placeholder="请选择"
/>
</template>
</el-table-column>
<el-table-column prop="lsqkjtsm" label="落实情况具体说明">
<template #default="scope">
<el-input v-model="scope.row.lsqkjtsm" type="textarea" />
</template>
</el-table-column>
<el-table-column label="操作" width="60">
<template #default="scope">
<el-button link type="danger" size="small" @click="deleteZrsjtzb(scope.$index)">删除</el-button>
<el-button link type="danger" size="small" @click="deletePfyjlsqk(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
......@@ -199,7 +247,11 @@
>
<el-table-column type="selection" width="55" />
<el-table-column prop="originalname" label="文件名" />
<el-table-column prop="updatedAt" label="上传时间" />
<el-table-column prop="updatedAt" label="上传时间">
<template #default="{ row, index }">
<span>{{ moment(row.updatedAt).format("YYYY-MM-DD HH:mm:SS") }}</span>
</template>
</el-table-column>
<el-table-column prop="size" label="大小" />
<el-table-column fixed="right" label="操作" width="100">
<template #default="{ row, index }">
......@@ -231,6 +283,7 @@
v-model="scope.row.nd"
type="year"
placeholder="请选择"
value-format="YYYY"
/>
</template>
</el-table-column>
......@@ -280,6 +333,7 @@
import { useRouter, useRoute } from "vue-router";
import { ElMessage, ElMessageBox } from "element-plus";
import { useUserStore } from "@/stores/user.js";
import moment from "moment";
const userStore = useUserStore();
const router = useRouter();
const route = useRoute();
......@@ -289,11 +343,15 @@
token.value = userStore.authToken || sessionStorage.getItem("authToken") || "";
const activeCollapse = reactive([
"责任书基本信息", "责任书具体指标"
"责任书基本信息", "责任书具体指标", "批复意见落实情况"
]);
let formData = reactive({});
let loading = ref(false);
let isPreview = !!route.query.isPreview;
// 责任书类型
let zrslxList = reactive([]);
let zrslxProps = {
label: "name"
}
// 项目列表
let projectList = ref([]);
const getProjectData = () => {
......@@ -310,15 +368,64 @@
}
})
};
// 批复意见落实情况
let pfyjlxList = reactive([]);
let lsqkList = reactive([]);
let pfyjlsqkData = ref([]);
const addPfyjlsqk = () => {
pfyjlsqkData.value.push({});
};
const deletePfyjlsqk = (index) => {
ElMessageBox.confirm("确认删除该项?", "提示",{
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
pfyjlsqkData.value.splice(index, 1);
})
}
let isPreview = !!route.query.isPreview;
let statementId = route.query.statementId;
// 查看编辑详情
const getStatementInfo = () => {
loading.value = true;
proxy.$post({
url: "/api/project/getTzmbzrsInfo",
data: {
id: statementId
},
callback: (res) => {
loading.value = false;
Object.assign(formData, res);
Object.assign(zrsData.value, res.zrswj);
Object.assign(zrsjtzbData.value, res.tzmbzrsZbs.map(item => {
return {
...item,
sfsy: item.sfsy && item.sfsy.toString()
}
}));
Object.assign(chwjData.value, res.chwj);
Object.assign(jyglzrsData.value, res.tzmbzrsNds);
Object.assign(pfyjlsqkData.value, res.tzmbzrsPfyjs);
}
});
};
onMounted(() => {
getProjectData();
let resourceData = JSON.parse(sessionStorage.getItem("resourceData"));
zrslxList = resourceData.level;
pfyjlxList = resourceData.ssjd;
lsqkList = resourceData.lszxqk;
statementId && getStatementInfo();
});
// 选择关联项目,同步相关字段信息
const changeProject = (val) => {
let selectData = projectList.value.filter(item => item.id === val)[0];
if (selectData) {
formData.value.projectName = selectData.projectName;
formData.value.tzzt = selectData.tzzt;
formData.projectName = selectData.projectName;
formData.tzzt = selectData.tzzt;
}
}
......@@ -351,17 +458,228 @@
};
// 责任书具体指标
let zrsjtzbData = ref([]);
const addZrsjtzb = () => {
zrsjtzbData.value.push({});
};
const deleteZrsjtzb = (index) =>{
ElMessageBox.confirm("确认删除该项?", "提示",{
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
zrsjtzbData.value.splice(index, 1);
}).catch(() => {})
let qsmzqZrs = [
{
xh: "1",
zbmc: "项目总投资(亿元)"
},
{
xh: "1.1",
zbmc: "建安费用(亿元)"
},
{
xh: "2",
zbmc: "项目带动工程收益(亿元)"
},
{
xh: "2.1",
zbmc: "工程收益率(%)"
},
{
xh: "3",
zbmc: "政府补助资金到位(亿元)"
},
{
xh: "4",
zbmc: "我方资本金投入(亿元)"
},
{
xh: "5",
zbmc: "我方负责引入的股权融资(亿元)"
},
{
xh: "6",
zbmc: "项目融资额(亿元)"
},
{
xh: "6.1",
zbmc: "融资利率(%)"
},
{
xh: "7",
zbmc: "项目实现营业收入累计(亿元)"
},
{
xh: "8",
zbmc: "项目经营净现金流累计(亿元)"
},
{
xh: "9",
zbmc: "项目全投资财务内部收益率(税前)(%)"
},
{
xh: "10",
zbmc: "项目资本金财务内部收益率(%)"
},
{
xh: "11",
zbmc: "项目竣工投产时间(年月)"
}
];
let jsqZrs = [
{
xh: "1",
zbmc: "项目总投资 (亿元)"
},
{
xh: "1.1",
zbmc: "建安费用(亿元)"
},
{
xh: "2",
zbmc: "项目带动工程收益 (亿元)"
},
{
xh: "2.1",
zbmc: "工程收益率(%)"
},
{
xh: "3",
zbmc: "建设期政府补助资金(亿元)"
},
{
xh: "4",
zbmc: "我方资本金投入(亿元)"
},
{
xh: "5",
zbmc: "我方负责引入的股权融资(亿元)"
},
{
xh: "5.1",
zbmc: "股权融资成本(%)"
},
{
xh: "6",
zbmc: "项目建设期融资额(亿元)"
},
{
xh: "6.1",
zbmc: "融资利率(%)"
},
{
xh: "7",
zbmc: "项目全投资财务内部收益率(税前)(%)"
},
{
xh: "8",
zbmc: "项目资本金财务内部收益率(%)"
},
{
xh: "9",
zbmc: "项目竣工投产时间(年月)"
}
];
let yyqZrs = [
{
xh: "1",
zbmc: "运营期政府补助资金到位(亿元)"
},
{
xh: "2",
zbmc: "项目运营期融资额(亿元)"
},
{
xh: "2.1",
zbmc: "融资利率(%)"
},
{
xh: "3",
zbmc: "项目实现营业收入累计(亿元)"
},
{
xh: "3.1",
zbmc: "利润总额累计(亿元)"
},
{
xh: "4",
zbmc: "项目经营净现金流累计(亿元)"
},
{
xh: "5",
zbmc: "项目全投资财务内部收益率(税前)(%)"
},
{
xh: "6",
zbmc: "项目资本金财务内部收益率(%)"
}
];
let ndZrs = [
{
xh: "1",
zbmc: "本年度完成投资(亿元)"
},
{
xh: "1.1",
zbmc: "建安费用(亿元)"
},
{
xh: "1.2",
zbmc: "项目征地拆迁费(亿元)"
},
{
xh: "2",
zbmc: "本年度工程收益(亿元)"
},
{
xh: "2.1",
zbmc: "工程收益率(%)"
},
{
xh: "3",
zbmc: "本年度政府补助资金(亿元)"
},
{
xh: "4",
zbmc: "本年度我方资本金投入(亿元)"
},
{
xh: "5",
zbmc: "本年度我方负责引入的股权融资(亿元)"
},
{
xh: "5.1",
zbmc: "股权融资成本(%)"
},
{
xh: "6",
zbmc: "本年度项目融资额(亿元)"
},
{
xh: "6.1",
zbmc: "融资利率(%)"
},
{
xh: "7",
zbmc: "本年度投资项目实现营业收入(亿元)"
},
{
xh: "8",
zbmc: "本年度项目经营净现金流(亿元)"
},
{
xh: "9",
zbmc: "项目全投资财务内部收益率(税前)(%)"
},
{
xh: "10",
zbmc: "项目资本金财务内部收益率(%)"
}
]
// 选择责任书类型,同步切换责任书具体指标数据
const changeZrslx = (data) => {
if (!data.children || !data.children.length) {
// 点击到最内层子节点
if (data.name.indexOf("年度") != -1) {
zrsjtzbData.value = ndZrs;
} else if(data.name.indexOf("建设") != -1) {
zrsjtzbData.value = jsqZrs;
} else if (data.name.indexOf("运营") != -1) {
zrsjtzbData.value = yyqZrs;
} else {
zrsjtzbData.value = qsmzqZrs;
}
}
}
const getSummaries = (param) => {
const { columns, data } = param;
......@@ -372,7 +690,7 @@
return
}
const values = data.map((item) => Number(item[column.property]))
if (!values.every((value) => Number.isNaN(value) || column.property === "sfsy")) {
if (["khjzf"].includes(column.property)) {
sums[index] = `${values.reduce((prev, curr) => {
const value = Number(curr);
if (!Number.isNaN(value)) {
......@@ -443,23 +761,28 @@
const backClick = () => {
router.replace("/targetLiabilityStatement");
router.back(-1)
}
const saveClick = () => {
let url = formData.id ? "updateTzmbzrs" : "createTzmbzrs";
proxy.$post({
url: "/api/project/" + url,
data: {
...formData,
zrswj: zrsData.value,
tzmbzrsZbs: zrsjtzbData.value,
chwj: chwjData.value,
jyglzrs: jyglzrsData.value
},
callback: (data) => {
router.replace("/targetLiabilityStatement");
}
})
if (formData.projectId) {
let url = formData.id ? "updateTzmbzrs" : "createTzmbzrs";
proxy.$post({
url: "/api/project/" + url,
data: {
...formData,
zrswj: zrsData.value,
tzmbzrsZbs: zrsjtzbData.value,
chwj: chwjData.value,
tzmbzrsNds: jyglzrsData.value,
tzmbzrsPfyjs: pfyjlsqkData.value
},
callback: (data) => {
router.back(-1)
}
})
} else {
ElMessage.warning("请选择项目信息");
}
}
</script>
......
<template>
<div class="manage-container">
<div class="manage-wrap">
<div class="manage-header">
<div class="header-left"></div>
<div class="header-right">
<el-button type="primary" @click="addControl">新增</el-button>
</div>
</div>
<div class="manage-content" v-loading="loading">
<common-table
:autoHeight="true"
:maxRows="10"
:data="tableData"
:columns="tableColumns"
:total="total"
:current-page="currentPage"
:page-size="pageSize"
:index="true"
:indexLabel="'序号'"
title=""
:border="true"
@size-change="handleSizeChange"
@current-page-change="handleCurrentPageChange"
>
<template #operations="{ row, index }">
<el-button link type="primary" size="small" @click="previewControl(row)">查看</el-button>
<el-button link type="primary" size="small" @click="editControl(row)">编辑</el-button>
</template>
</common-table>
</div>
</div>
</div>
</template>
<script setup>
import { ref, onMounted, getCurrentInstance } from "vue";
import { useRouter } from "vue-router";
import CommonTable from "@/components/common/commonTable.vue";
const router = useRouter();
const { proxy } = getCurrentInstance();
let tableData = ref([]);
let tableColumns = ref([
{
prop: "projectName",
label: "项目名称",
showOverflowTooltip: true
},
{
prop: "projectCode",
label: "项目编号",
showOverflowTooltip: true
},
{
prop: "operations",
label: "操作",
width: 170,
slot: "operations",
fixed: "right",
align: "center"
}
]);
let loading = ref(false);
let total = ref(0);
let currentPage = ref(1);
let pageSize = ref(10);
// 获取列表数据
const getControlData = () => {
loading.value = true;
proxy.$post({
url: "/api/project/getTzmbzrsList",
data: {
page: currentPage.value,
pagesize: pageSize.value
},
callback: (data) => {
tableData.value = data.rows;
total.value = data.count;
loading.value = false;
}
})
};
// 分页
const handleSizeChange = (size) => {
pageSize.value = size;
currentPage.value = 1;
getControlData();
}
const handleCurrentPageChange = (page) => {
currentPage.value = page;
getControlData();
}
const addControl = () => {
router.push("/addControl");
};
const editControl = (item) => {
router.push({
name: "addControl",
query: {
projectId: item.id
}
});
};
const previewControl = (item) => {
router.push({
name: "addControl",
query: {
isPreview: true,
projectId: item.id
}
})
}
onMounted(() => {
getControlData();
})
</script>
<style scoped lang="less">
@import "@/styles/manage.less";
</style>
\ No newline at end of file
......@@ -26,6 +26,7 @@
<template #operations="{ row, index }">
<el-button link type="primary" size="small" @click="previewStatement(row)">查看</el-button>
<el-button link type="primary" size="small" @click="editStatement(row)">编辑</el-button>
<el-button link type="danger" size="small" @click="deleteStatement(row)">删除</el-button>
</template>
</common-table>
</div>
......@@ -36,6 +37,7 @@
<script setup>
import { ref, onMounted, getCurrentInstance } from "vue";
import { useRouter } from "vue-router";
import { ElMessage, ElMessageBox } from "element-plus";
import CommonTable from "@/components/common/commonTable.vue";
const router = useRouter();
......@@ -49,10 +51,27 @@
showOverflowTooltip: true
},
{
prop: "projectCode",
label: "项目编号",
prop: "tzzt",
label: "投资主体",
showOverflowTooltip: true
},
{
prop: "xmdd",
label: "项目地点",
showOverflowTooltip: true
},
{
prop: "xmkgrq",
label: "项目开工日期",
showOverflowTooltip: true,
width: 170
},
{
prop: "xmssqx",
label: "项目实施期限",
showOverflowTooltip: true,
width: 120
},
{
prop: "operations",
label: "操作",
......@@ -99,7 +118,7 @@
router.push({
name: "addStatement",
query: {
projectId: item.id
statementId: item.id
}
});
};
......@@ -108,10 +127,28 @@
name: "addStatement",
query: {
isPreview: true,
projectId: item.id
statementId: item.id
}
})
}
const deleteStatement = (item) => {
ElMessageBox.confirm("确认删除该项?", "提示",{
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
proxy.$post({
url: "/api/project/deleteTzmbzrs",
data: {
id: item.id
},
callback: (data) => {
ElMessage.success("删除成功");
getStatementData();
}
})
}).catch(() => {})
}
onMounted(() => {
getStatementData();
})
......
......@@ -61,8 +61,8 @@
<el-col :span="12">
<el-form-item label="主业/非主业">
<el-select v-model="formData.zyfzy" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in zyList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in zyList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -91,8 +91,8 @@
<el-col :span="9">
<el-form-item label="财务报表类型">
<el-select v-model="formData.cwbblx" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in cwbblxList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in cwbblxList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -100,8 +100,8 @@
<el-col :span="9">
<el-form-item label="政府审批(核准、备案)级别" :label-width="200">
<el-select v-model="formData.zfsphzbajb" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in zfspjbList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in zfspjbList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -123,8 +123,8 @@
<el-select v-model="formData.jnw" placeholder="请选择" no-data-text="暂无数据"
@change="changeJnw"
>
<el-option v-for="item in jnwList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in jnwList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -134,8 +134,8 @@
<el-select v-model="formData.sjnzjjw" placeholder="请选择" no-data-text="暂无数据"
@change="changeSzj"
>
<el-option v-for="item in szjList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in szjList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -145,8 +145,8 @@
<el-select v-model="formData.dsjngjjw" placeholder="请选择" no-data-text="暂无数据"
@change="changeDsgj"
>
<el-option v-for="item in dsgjList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in dsgjList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -154,8 +154,8 @@
<el-col :span="8">
<el-form-item label="区县(境内)/国家(境外)">
<el-select v-model="formData.qxjngjjw" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in qxgjList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in qxgjList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -163,8 +163,8 @@
<el-col :span="8">
<el-form-item label="项目区域" :label-width="180">
<el-select v-model="formData.xmqy" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in xmqyList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in xmqyList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -184,8 +184,8 @@
<el-col :span="6">
<el-form-item label="币种">
<el-select v-model="formData.bizhong" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in bzList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in bzList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -263,15 +263,15 @@
<el-select v-model="formData.tzsxyjfl" placeholder="请选择" no-data-text="暂无数据"
@change="changeTzsxyjfl"
>
<el-option v-for="item in tzsxyjflList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in tzsxyjflList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="二级分类">
<el-select v-model="formData.tzsxejfl" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in tzsxejflList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in tzsxejflList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -279,15 +279,15 @@
<el-select v-model="formData.tzbk" placeholder="请选择" no-data-text="暂无数据"
@change="changeTzsxtzbk"
>
<el-option v-for="item in tzsxtzbkList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in tzsxtzbkList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="细分板块">
<el-select v-model="formData.subsector" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in tzsxxfbkList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in tzsxxfbkList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -298,22 +298,22 @@
<el-select v-model="formData.tzmdyjfl" placeholder="请选择" no-data-text="暂无数据"
@change="changeTzmdyjfl"
>
<el-option v-for="item in tzmdyjflList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in tzmdyjflList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="二级分类">
<el-select v-model="formData.tzmdejfl" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in tzmdejflList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in tzmdejflList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="四新分类">
<el-select v-model="formData.sxfl" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in tzmdsxflList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in tzmdsxflList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -326,15 +326,15 @@
<el-select v-model="formData.tzznyjfl" placeholder="请选择" no-data-text="暂无数据"
@change="changeTzznyjfl"
>
<el-option v-for="item in tzznyjflList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in tzznyjflList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="二级分类">
<el-select v-model="formData.tzznejfl" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in tzznejflList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in tzznejflList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -353,6 +353,7 @@
node-key="id"
:props="gmjjhyProps"
placeholder="请选择"
render-after-expand
/>
</el-form-item>
</el-col>
......@@ -435,8 +436,8 @@
placeholder="请选择" no-data-text="暂无数据"
@change="changeGdxxSums"
>
<el-option v-for="item in gdlxList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in gdlxList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
<div v-else class="sums-column">
......@@ -630,8 +631,8 @@
<el-table-column prop="type" label="业务类型" width="130">
<template #default="scope">
<el-select v-model="scope.row.type" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in hxbjtjlxlxList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in hxbjtjlxlxList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</template>
......@@ -647,8 +648,8 @@
<el-table-column prop="dwgczjDw" label="单位" width="130">
<template #default="scope">
<el-select v-model="scope.row.dwgczjDw" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in hxbjtjzjdwList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in hxbjtjzjdwList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</template>
......@@ -702,8 +703,8 @@
<el-table-column prop="ykphdlx" label="类型" width="130">
<template #default="scope">
<el-select v-model="scope.row.ykphdlx" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in hxbjtjykphdlxList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in hxbjtjykphdlxList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</template>
......@@ -739,8 +740,8 @@
<el-col :span="8">
<el-form-item label="立项最终审批意见" :label-width="160">
<el-select v-model="formData.lxzzpfyj" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in lxzzspyjList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in lxzzspyjList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -803,8 +804,8 @@
<el-table-column prop="lx" label="类型">
<template #default="scope">
<el-select v-model="scope.row.lx" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in spyjlxList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in spyjlxList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</template>
......@@ -913,8 +914,8 @@
<el-col :span="8">
<el-form-item label="申报单位企业规格">
<el-select v-model="jcFormData.sbdwqygg" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in qyggList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in qyggList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -943,8 +944,8 @@
<el-col :span="8">
<el-form-item label="项目区域" :label-width="180">
<el-select v-model="jcFormData.xmqy" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in xmqyList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in xmqyList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -954,8 +955,8 @@
<el-select v-model="jcFormData.jnw" placeholder="请选择" no-data-text="暂无数据"
@change="changeJcJnw"
>
<el-option v-for="item in jnwList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in jnwList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -965,8 +966,8 @@
<el-select v-model="jcFormData.sjnzjjw" placeholder="请选择" no-data-text="暂无数据"
@change="changeJcSzj"
>
<el-option v-for="item in jcSzjList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in jcSzjList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -976,8 +977,8 @@
<el-select v-model="jcFormData.dsjngjjw" placeholder="请选择" no-data-text="暂无数据"
@change="changeJcDsgj"
>
<el-option v-for="item in jcDsgjList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in jcDsgjList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -985,8 +986,8 @@
<el-col :span="8">
<el-form-item label="区县(境内)/国家(境外)">
<el-select v-model="jcFormData.qxjngjjw" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in jcQxgjList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in jcQxgjList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -994,8 +995,8 @@
<el-col :span="6">
<el-form-item label="币种">
<el-select v-model="jcFormData.bizhong" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in bzList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in bzList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -1055,8 +1056,8 @@
<el-col :span="8">
<el-form-item label="项目资金来源">
<el-select v-model="jcFormData.xmzjly" multiple placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in xmzjlyList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in xmzjlyList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -1064,8 +1065,8 @@
<el-col :span="8">
<el-form-item label="商务部项目类型">
<el-select v-model="jcFormData.swbxmlx" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in swbxmlxList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in swbxmlxList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -1078,6 +1079,7 @@
node-key="id"
:props="gmjjhyProps"
placeholder="请选择"
render-after-expand
/>
</el-form-item>
</el-col>
......@@ -1092,8 +1094,8 @@
<el-col :span="8">
<el-form-item label="财务报表类型">
<el-select v-model="jcFormData.cwbblx" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in cwbblxList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in cwbblxList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -1101,8 +1103,8 @@
<el-col :span="8">
<el-form-item label="项目类型">
<el-select v-model="jcFormData.xmlx" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in xmlxList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in xmlxList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -1110,8 +1112,8 @@
<el-col :span="12">
<el-form-item label="主业/非主业">
<el-select v-model="jcFormData.zyfzy" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in zyList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in zyList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -1223,8 +1225,8 @@
<el-col :span="8">
<el-form-item label="投资回收方式">
<el-select v-model="jcFormData.tzhsfs" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in tzhsfsList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in tzhsfsList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -1257,15 +1259,15 @@
<el-select v-model="jcFormData.tzsxyjfl" placeholder="请选择" no-data-text="暂无数据"
@change="changeJcTzsxyjfl"
>
<el-option v-for="item in tzsxyjflList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in tzsxyjflList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="二级分类">
<el-select v-model="jcFormData.tzsxejfl" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in jcTzsxejflList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in jcTzsxejflList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -1273,15 +1275,15 @@
<el-select v-model="jcFormData.tzbk" placeholder="请选择" no-data-text="暂无数据"
@change="changeJcTzsxtzbk"
>
<el-option v-for="item in tzsxtzbkList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in tzsxtzbkList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="细分板块">
<el-select v-model="jcFormData.subsector" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in jcTzsxxfbkList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in jcTzsxxfbkList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -1292,22 +1294,22 @@
<el-select v-model="jcFormData.tzmdyjfl" placeholder="请选择" no-data-text="暂无数据"
@change="changeJcTzmdyjfl"
>
<el-option v-for="item in tzmdyjflList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in tzmdyjflList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="二级分类">
<el-select v-model="jcFormData.tzmdejfl" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in jcTzmdejflList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in jcTzmdejflList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="四新分类">
<el-select v-model="jcFormData.sxfl" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in tzmdsxflList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in tzmdsxflList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -1324,15 +1326,15 @@
<el-select v-model="jcFormData.tzznyjfl" placeholder="请选择" no-data-text="暂无数据"
@change="changeJcTzznyjfl"
>
<el-option v-for="item in tzznyjflList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in tzznyjflList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="二级分类">
<el-select v-model="jcFormData.tzznejfl" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in jcTzznejflList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in jcTzznejflList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -1479,8 +1481,8 @@
<el-col :span="6">
<el-form-item label="审批级别">
<el-select v-model="jcFormData.spjb" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in zfspjbList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in zfspjbList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -1508,8 +1510,8 @@
placeholder="请选择" no-data-text="暂无数据"
@change="changeJcGdxxSums"
>
<el-option v-for="item in gdlxList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in gdlxList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
<div v-else class="sums-column">
......@@ -2119,8 +2121,8 @@
<el-table-column prop="type" label="业务类型" width="130">
<template #default="scope">
<el-select v-model="scope.row.type" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in hxbjtjlxlxList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in hxbjtjlxlxList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</template>
......@@ -2136,8 +2138,8 @@
<el-table-column prop="dwgczjDw" label="单位" width="130">
<template #default="scope">
<el-select v-model="scope.row.dwgczjDw" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in hxbjtjzjdwList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in hxbjtjzjdwList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</template>
......@@ -2191,8 +2193,8 @@
<el-table-column prop="ykphdlx" label="类型" width="130">
<template #default="scope">
<el-select v-model="scope.row.ykphdlx" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in hxbjtjykphdlxList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in hxbjtjykphdlxList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</template>
......@@ -2227,8 +2229,8 @@
<el-table-column prop="hylx" label="会议类型">
<template #default="scope">
<el-select v-model="scope.row.hylx" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in hylxList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in hylxList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</template>
......@@ -2292,8 +2294,8 @@
<el-table-column prop="hylx" label="会议类型">
<template #default="scope">
<el-select v-model="scope.row.hylx" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in hylxList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in hylxList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</template>
......@@ -2362,8 +2364,8 @@
<el-col :span="8">
<el-form-item label="最终审批意见" label-width="160">
<el-select v-model="jcFormData.jczzpfyj" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in lxzzspyjList" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in lxzzspyjList" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</el-form-item>
......@@ -2400,8 +2402,8 @@
<el-table-column prop="lx" label="类型">
<template #default="scope">
<el-select v-model="scope.row.lx" placeholder="请选择" no-data-text="暂无数据">
<el-option v-for="item in jcspyjlx" :key="item.id"
:label="item.value" :value="item.id"
<el-option v-for="item in jcspyjlx" :key="item.key"
:label="item.value" :value="item.key"
></el-option>
</el-select>
</template>
......@@ -2573,8 +2575,9 @@
if (index < gdxxData.length - 1) {
if (item.gdlx) {
if (!obj[item.gdlx]) {
console.log(gdlxList, item.gdlx);
obj[item.gdlx] = {
name: gdlxList.filter(gdlx => gdlx.id == item.gdlx)[0].value
name: gdlxList.filter(gdlx => gdlx.key == item.gdlx)[0].value
};
}
obj[item.gdlx].cgbl = new Decimal(Number(obj[item.gdlx].cgbl || 0)).plus(new Decimal(Number(item.cgbl || 0)));
......@@ -2803,7 +2806,7 @@
if (index < jcGdxxData.length - 1) {
if (!obj[item.gdlx]) {
obj[item.gdlx] = {
name: gdlxList.filter(gdlx => gdlx.id == item.gdlx)[0].value
name: gdlxList.filter(gdlx => gdlx.key == item.gdlx)[0].value
};
}
obj[item.gdlx].mycgbl = new Decimal(Number(obj[item.gdlx].mycgbl || 0)).plus(new Decimal(Number(item.mycgbl || 0)));
......@@ -3234,7 +3237,7 @@
let qxgjList = ref([]); // 区县(境内)/国家(境外) // 级联
const changeJnw = (val) => {
if (val || val === 0) {
let selectData = jnwList.filter(item => item.id == val);
let selectData = jnwList.filter(item => item.key == val);
szjList.value = selectData[0] && selectData[0].children || [];
dsgjList.value = [];
qxgjList.value = [];
......@@ -3245,7 +3248,7 @@
};
const changeSzj = (val) => {
if (val || val === 0) {
let selectData = szjList.value.filter(item => item.id == val);
let selectData = szjList.value.filter(item => item.key == val);
dsgjList.value = selectData[0] && selectData[0].children || [];
qxgjList.value = [];
delete formData.dsjngjjw;
......@@ -3254,7 +3257,7 @@
}
const changeDsgj = (val) => {
if (val || val === 0) {
let selectData = dsgjList.value.filter(item => item.id == val);
let selectData = dsgjList.value.filter(item => item.key == val);
qxgjList.value = selectData[0] && selectData[0].children || [];
delete formData.qxjngjjw;
}
......@@ -3265,7 +3268,7 @@
let tzsxejflList = ref([]); // 投资属性二级分类
const changeTzsxyjfl = (val) => {
if (val || val === 0) {
let selectData = tzsxyjflList.filter(item => item.id == val);
let selectData = tzsxyjflList.filter(item => item.key == val);
tzsxejflList.value = selectData[0] && selectData[0].children || [];
delete formData.tzsxejfl;
}
......@@ -3274,7 +3277,7 @@
let tzsxxfbkList = ref([]); // 投资属性细分板块
const changeTzsxtzbk = (val) => {
if (val || val === 0) {
let selectData = tzsxtzbkList.filter(item => item.id == val);
let selectData = tzsxtzbkList.filter(item => item.key == val);
tzsxxfbkList.value = selectData[0] && selectData[0].children || [];
delete formData.subsector;
}
......@@ -3283,7 +3286,7 @@
let tzmdejflList = ref([]); // 投资目的二级分类
const changeTzmdyjfl = (val) => {
if (val || val === 0) {
let selectData = tzmdyjflList.filter(item => item.id == val);
let selectData = tzmdyjflList.filter(item => item.key == val);
tzmdejflList.value = selectData[0] && selectData[0].children || [];
delete formData.tzmdejfl;
}
......@@ -3293,7 +3296,7 @@
let tzznejflList = ref([]); // 投资指南二级分类
const changeTzznyjfl = (val) => {
if (val || val === 0) {
let selectData = tzznyjflList.filter(item => item.id == val);
let selectData = tzznyjflList.filter(item => item.key == val);
tzznejflList.value = selectData[0] && selectData[0].children || [];
delete formData.tzznejfl;
}
......@@ -3324,7 +3327,7 @@
let tzhsfsList = reactive([]); // 投资回收方式
const changeJcJnw = (val) => {
if (val || val === 0) {
let selectData = jnwList.filter(item => item.id == val);
let selectData = jnwList.filter(item => item.key == val);
jcSzjList.value = selectData[0] && selectData[0].children || [];
jcDsgjList.value = [];
jcQxgjList.value = [];
......@@ -3335,7 +3338,7 @@
};
const changeJcSzj = (val) => {
if (val || val === 0) {
let selectData = jcSzjList.value.filter(item => item.id == val);
let selectData = jcSzjList.value.filter(item => item.key == val);
jcDsgjList.value = selectData[0] && selectData[0].children || [];
jcQxgjList.value = [];
delete jcFormData.dsjngjjw;
......@@ -3344,7 +3347,7 @@
}
const changeJcDsgj = (val) => {
if (val || val === 0) {
let selectData = jcDsgjList.value.filter(item => item.id == val);
let selectData = jcDsgjList.value.filter(item => item.key == val);
jcQxgjList.value = selectData[0] && selectData[0].children || [];
delete jcFormData.qxjngjjw;
}
......@@ -3352,7 +3355,7 @@
let jcTzsxejflList = ref([]); // 投资属性二级分类
const changeJcTzsxyjfl = (val) => {
if (val || val === 0) {
let selectData = tzsxyjflList.filter(item => item.id == val);
let selectData = tzsxyjflList.filter(item => item.key == val);
jcTzsxejflList.value = selectData[0] && selectData[0].children || [];
delete jcFormData.tzsxejfl;
}
......@@ -3360,7 +3363,7 @@
let jcTzsxxfbkList = ref([]); // 投资属性细分板块
const changeJcTzsxtzbk = (val) => {
if (val || val === 0) {
let selectData = tzsxtzbkList.filter(item => item.id == val);
let selectData = tzsxtzbkList.filter(item => item.key == val);
jcTzsxxfbkList.value = selectData[0] && selectData[0].children || [];
delete jcFormData.subsector;
}
......@@ -3368,7 +3371,7 @@
let jcTzmdejflList = ref([]); // 投资目的二级分类
const changeJcTzmdyjfl = (val) => {
if (val || val === 0) {
let selectData = tzmdyjflList.filter(item => item.id == val);
let selectData = tzmdyjflList.filter(item => item.key == val);
jcTzmdejflList.value = selectData[0] && selectData[0].children || [];
delete jcFormData.tzmdejfl;
}
......@@ -3376,7 +3379,7 @@
let jcTzznejflList = ref([]); // 投资指南二级分类
const changeJcTzznyjfl = (val) => {
if (val || val === 0) {
let selectData = tzznyjflList.filter(item => item.id == val);
let selectData = tzznyjflList.filter(item => item.key == val);
jcTzznejflList.value = selectData[0] && selectData[0].children || [];
delete jcFormData.tzznejfl;
}
......@@ -3409,13 +3412,13 @@
Object.assign(spyjTableData, data.projectSpyjs);
Object.assign(shclData.value, data.xgshcl);
// 关联筛选
szjList.value = jnwList.filter(item => item.id == data.jnw)[0]?.children || [];
dsgjList.value = szjList.value.filter(item => item.id == data.sjnzjjw)[0]?.children || [];
qxgjList.value = dsgjList.value.filter(item => item.id == data.dsjngjjw)[0]?.children || [];
tzsxejflList.value = tzsxyjflList.filter(item => item.id == data.tzsxyjfl)[0]?.children || [];
tzsxxfbkList.value = tzsxtzbkList.filter(item => item.id == data.tzbk)[0]?.children || [];
tzmdejflList.value = tzmdyjflList.filter(item => item.id == data.tzmdyjfl)[0]?.children || [];
tzznejflList.value = tzznyjflList.filter(item => item.id == data.tzznyjfl)[0]?.children || [];
szjList.value = jnwList.filter(item => item.key == data.jnw)[0]?.children || [];
dsgjList.value = szjList.value.filter(item => item.key == data.sjnzjjw)[0]?.children || [];
qxgjList.value = dsgjList.value.filter(item => item.key == data.dsjngjjw)[0]?.children || [];
tzsxejflList.value = tzsxyjflList.filter(item => item.key == data.tzsxyjfl)[0]?.children || [];
tzsxxfbkList.value = tzsxtzbkList.filter(item => item.key == data.tzbk)[0]?.children || [];
tzmdejflList.value = tzmdyjflList.filter(item => item.key == data.tzmdyjfl)[0]?.children || [];
tzznejflList.value = tzznyjflList.filter(item => item.key == data.tzznyjfl)[0]?.children || [];
// 决策
let jcData = res.juece || res.lixiang || {};
......@@ -3441,13 +3444,13 @@
Object.assign(jcspyjData, jcData.projectSpyjs);
}
// 关联筛选
jcSzjList.value = jnwList.filter(item => item.id == jcData.jnw)[0]?.children || [];
jcDsgjList.value = jcSzjList.value.filter(item => item.id == jcData.sjnzjjw)[0]?.children || [];
jcQxgjList.value = jcDsgjList.value.filter(item => item.id == jcData.dsjngjjw)[0]?.children || [];
jcTzsxejflList.value = tzsxyjflList.filter(item => item.id == jcData.tzsxyjfl)[0]?.children || [];
jcTzsxxfbkList.value = tzsxtzbkList.filter(item => item.id == jcData.tzbk)[0]?.children || [];
jcTzmdejflList.value = tzmdyjflList.filter(item => item.id == jcData.tzmdyjfl)[0]?.children || [];
jcTzznejflList.value = tzznyjflList.filter(item => item.id == jcData.tzznyjfl)[0]?.children || [];
jcSzjList.value = jnwList.filter(item => item.key == jcData.jnw)[0]?.children || [];
jcDsgjList.value = jcSzjList.value.filter(item => item.key == jcData.sjnzjjw)[0]?.children || [];
jcQxgjList.value = jcDsgjList.value.filter(item => item.key == jcData.dsjngjjw)[0]?.children || [];
jcTzsxejflList.value = tzsxyjflList.filter(item => item.key == jcData.tzsxyjfl)[0]?.children || [];
jcTzsxxfbkList.value = tzsxtzbkList.filter(item => item.key == jcData.tzbk)[0]?.children || [];
jcTzmdejflList.value = tzmdyjflList.filter(item => item.key == jcData.tzmdyjfl)[0]?.children || [];
jcTzznejflList.value = tzznyjflList.filter(item => item.key == jcData.tzznyjfl)[0]?.children || [];
}
});
};
......
......@@ -31,6 +31,7 @@
<el-dialog v-model="filedsModalShow"
modal-class="fields-modal"
title="筛选查询" width="50%" top="10vh"
:close-on-click-modal="false" :close-on-press-escape="false"
>
<el-table :data="tableFields" style="width: 100%; height: 500px;" empty-text="暂无数据" border
@selection-change="handleFieldsSelectChange"
......
......@@ -78,6 +78,7 @@
:title="dialogTitle"
width="400px"
@close="cancelDepartForm"
:close-on-click-modal="false" :close-on-press-escape="false"
>
<el-form :model="departFormData" ref="departForm" :rules="departRules" label-width="100">
<el-form-item label="项目名称" prop="name">
......
......@@ -32,6 +32,7 @@
:title="dialogTitle"
width="500px"
@close="cancelMenuForm"
:close-on-click-modal="false" :close-on-press-escape="false"
>
<el-form :model="menuFormData" ref="menuForm" :rules="menuRules" label-width="100">
<el-form-item label="项目名称" prop="name">
......
......@@ -6,6 +6,12 @@
<el-form-item label="关键字查询">
<el-input v-model="searchForm.name" clearable @keydown.enter="handleSearch" />
</el-form-item>
<el-form-item label="数据类型查询">
<el-select v-model="searchForm.type">
<el-option label="平级数据" value="1"></el-option>
<el-option label="树形数据" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSearch">查询</el-button>
</el-form-item>
......@@ -48,6 +54,7 @@
:title="dialogTitle"
width="600px"
@close="cancelResourceForm"
:close-on-click-modal="false" :close-on-press-escape="false"
>
<el-form :model="resourceFormData" ref="resourceForm" :rules="resourceRules" label-width="100">
<el-form-item label="名称" prop="name">
......@@ -57,7 +64,9 @@
<el-input v-model="resourceFormData.key" placeholder="请输入唯一标识" />
</el-form-item>
<el-form-item label="类型" prop="type">
<el-select v-model="resourceFormData.type" placeholder="请选择数据类型">
<el-select v-model="resourceFormData.type" placeholder="请选择数据类型"
:disabled="!!resourceFormData.id"
>
<el-option label="平级数据" value="1"></el-option>
<el-option label="树形数据" value="2"></el-option>
</el-select>
......@@ -69,12 +78,15 @@
ref="treeRef"
:data="treeData"
node-key="key"
default-expand-all
:props="{label: 'name'}"
render-after-expand
>
<template #default="{ node, data }">
<div class="custom-tree-node">
<span class="node-name">{{ node.label }}</span>
<span class="node-name">
{{ node.label }}
<span class="node-key">{{ data.key }}</span>
</span>
<el-dropdown>
<span class="el-dropdown-link">
<i class="iconfont icon-gengduo"></i>
......@@ -114,13 +126,14 @@
:title="listDialogTitle"
width="600px"
@close="cancelListForm"
:close-on-click-modal="false" :close-on-press-escape="false"
>
<el-form :model="listFormData" ref="listForm" :rules="listRules" label-width="100">
<el-form-item label="名称" prop="name">
<el-input v-model="listFormData.name" placeholder="请输入资源库名称" />
</el-form-item>
<el-form-item label="唯一标识" prop="key">
<el-input v-model="listFormData.key" placeholder="请输入唯一标识" />
<el-input v-model="listFormData.key" placeholder="请输入唯一标识"/>
</el-form-item>
</el-form>
<template #footer>
......@@ -153,6 +166,12 @@
minWidth: 100,
showOverflowTooltip: true,
},
{
prop: "key",
label: "唯一标识",
minWidth: 100,
showOverflowTooltip: true,
},
{
prop: "operations",
label: "操作",
......@@ -312,7 +331,10 @@
id: row.id
},
callback: (data) => {
resourceFormData.value = { ...data };
resourceFormData.value = {
...data,
type: data.type.toString()
};
treeData.value = data.resourceInfos || [];
dialogVisible.value = true;
}
......
......@@ -52,6 +52,7 @@
:title="dialogTitle"
width="400px"
@close="cancelRoleForm"
:close-on-click-modal="false" :close-on-press-escape="false"
>
<el-form :model="roleFormData" ref="roleForm" :rules="roleRules" label-width="100">
<el-form-item label="角色名称" prop="name">
......@@ -100,7 +101,7 @@
</template>
</commonForm> -->
</el-dialog>
<!-- <el-dialog v-model="menuVisible" title="菜单配置">
<!-- <el-dialog v-model="menuVisible" title="菜单配置" :close-on-click-modal="false" :close-on-press-escape="false"d>
<el-tree
:data="treeData"
show-checkbox
......
......@@ -67,6 +67,7 @@
:title="dialogTitle"
width="600px"
@close="cancelUserForm"
:close-on-click-modal="false" :close-on-press-escape="false"
>
<el-form :model="userFormData" ref="userForm" :rules="userRules" label-width="100">
<el-form-item label="用户姓名" prop="name">
......
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