修改细节

des
吕天方 6 months ago
parent 00ddf63346
commit ba37663d2c

@ -5,7 +5,7 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
ENV = 'development'
# 金鸡湖现代服务业品牌管理系统/开发环境
VUE_APP_BASE_API = 'http://192.168.0.115:9040'
VUE_APP_BASE_API = 'http://192.168.0.114:9040'
# VUE_APP_BASE_API = 'http://39.101.188.84:9040'
# VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'

@ -1,6 +1,6 @@
{
"name": "ruoyi",
"version": "1.0.202407100857",
"version": "1.0.202407120913",
"description": "金鸡湖现代服务业品牌管理系统",
"author": "若依",
"license": "MIT",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 KiB

After

Width:  |  Height:  |  Size: 839 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 216 KiB

@ -1,4 +1,12 @@
@font-face {
font-family: "PingFang-SC";
src: url("./font/PingFang_Heavy.ttf");
}
@font-face {
font-family: "AlibabaPuHuiTiB";
src: url("./font/Alibaba-PuHuiTi-Bold.ttf");
}
@font-face {
font-family: "AlibabaPuHuiTiR";
src: url("./font/Alibaba-PuHuiTi-Regular.ttf");
}

@ -239,6 +239,9 @@
}
}
}
.enter-left-info {
height: calc(25% - 5px);
}
.left-tabs{
height: calc(70% - 5px);
margin-top: 10px;
@ -931,6 +934,30 @@
}
}
}
.intelligentReminder-form {
.reminder-project {
display: flex;
width: 100%;
// align-items: center;
margin-bottom: 18px;
.new-label {
width: 180px;
padding-right: 12px;
text-align: right;
font-size: 14px;
font-weight: 700;
color: #606266;
}
.new-value {
// margin-left: 180px;
flex: 1;
font-size: 14px;
color: #606266;
display: flex;
align-items: center;
}
}
}
//
.info-dialog {
@ -1081,15 +1108,16 @@
}
}
.left-main {
display: grid;
grid-template-columns: 1fr;
grid-gap: 10px;
// display: grid;
// grid-template-columns: 1fr;
// grid-column-gap: 10px;
height: calc(100% - 55px);
overflow-y: auto;
.el-card {
background-color: #F5F8FA;
border: none;
height: 120px;
margin-bottom: 10px;
}
.el-card-border {
border: 1px solid rgba(245, 95, 95, 0.4); // #FD5F5F
@ -1273,4 +1301,252 @@
margin: 0;
}
}
}
//
.dataCloudMap {
height: 100%;
background-color: #f1f5f8;
.dataCloudMap-main {
height: 100%;
display: flex;
.dataCloudMap-main-left {
margin-right: 10px;
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
.dataCloudMap-left-top {
height: 50%;
background-color: #fff;
border-radius: 5px;
padding: 10px 20px;
.echart-title {
display: flex;
align-items: center;
justify-content: space-between;
.echart-left-title {
display: grid;
grid-template-columns: auto auto; /* 自动列宽 */
align-items: end; /* 垂直对齐方式:底部对齐 */
.L-title-left {
display: flex;
align-items: center;
.dataCloudMap-birght {
width: 10px;
height: 20px;
background: #0086FF;
box-shadow: 3px 0 3px 0px #0086FF;
border-radius: 5px 5px 5px 5px;
}
.dataCloudMap-title {
font-family: AlibabaPuHuiTiB;
font-size: 18px;
color: #333333;
margin: 0 10px;
}
}
.dataCloudMap-data {
font-family: AlibabaPuHuiTiR;
font-size: 14px;
color: #999999;
// line-height: 31px;
// margin-top: 5px;
}
}
.rightBigNav {
padding: 2px;
box-sizing: border-box;
height: 33px;
// background: #fff;
.right-nav {
display: flex;
height: 100%;
font-size: 14px;
.tabStyle {
height: 100%;
background: #F6F9FD;
padding: 0 20px;
border-radius: 2px;
display: flex;
align-items: center;
cursor: pointer;
user-select: none;
color: #7a8599;
margin-right: 10px;
border-radius: 5px;
.change-grey-birght {
width: 12px;
height: 12px;
background: #C7DAEE;
border-radius: 50%;
margin-right: 5px;
}
.change-blue-birght {
background: #0086FF;
}
.change-grey-text {
color: #94A9C0;
font-size: 14px;
font-weight: 500;
}
.change-blue-text {
color: #0086FF;
font-weight: bold;
}
}
.change-blue {
background: #E8F3FC;
color: #fff;
}
}
}
}
#echarts {
width: 100%;
height: 100%;
}
}
.dataCloudMap-left-bottom {
height: 49%;
background-color: #fff;
border-radius: 5px;
padding: 10px 20px;
.bottom-left-title {
display: grid;
grid-template-columns: auto auto; /* 自动列宽 */
// align-items: end; /* 垂直对齐方式:底部对齐 */
.L-title-left {
display: flex;
align-items: center;
.dataCloudMap-birght {
width: 10px;
height: 20px;
background: #0086FF;
box-shadow: 3px 0 3px 0px #0086FF;
border-radius: 5px 5px 5px 5px;
}
.dataCloudMap-title {
font-family: AlibabaPuHuiTiB;
font-size: 18px;
color: #333333;
margin: 0 10px;
}
}
.dataCloudMap-data {
font-family: AlibabaPuHuiTiR;
font-size: 14px;
color: #999999;
}
}
}
}
.dataCloudMap-main-right {
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
.dataCloudMap-right-top {
height: 40%;
background-color: #fff;
border-radius: 5px;
padding: 10px 20px;
.right-top-title {
display: grid;
// grid-template-columns: auto auto; /* 自动列宽 */
align-items: end; /* 垂直对齐方式:底部对齐 */
.L-title-left {
display: flex;
align-items: center;
.dataCloudMap-birght {
width: 10px;
height: 20px;
background: #0086FF;
box-shadow: 3px 0 3px 0px #0086FF;
border-radius: 5px 5px 5px 5px;
}
.dataCloudMap-title {
font-family: AlibabaPuHuiTiB;
font-size: 18px;
color: #333333;
margin: 0 10px;
}
}
.dataCloudMap-data {
font-family: AlibabaPuHuiTiR;
font-size: 14px;
color: #999999;
}
}
}
.dataCloudMap-right-middle {
height: 29%;
background-color: #fff;
border-radius: 5px;
padding: 10px 20px;
.right-middle-title {
display: grid;
grid-template-columns: auto auto; /* 自动列宽 */
// align-items: end; /* 垂直对齐方式:底部对齐 */
.L-title-left {
display: flex;
align-items: center;
.dataCloudMap-birght {
width: 10px;
height: 20px;
background: #0086FF;
box-shadow: 3px 0 3px 0px #0086FF;
border-radius: 5px 5px 5px 5px;
}
.dataCloudMap-title {
font-family: AlibabaPuHuiTiB;
font-size: 18px;
color: #333333;
margin: 0 10px;
}
}
.dataCloudMap-data {
font-family: AlibabaPuHuiTiR;
font-size: 14px;
color: #999999;
}
}
}
.dataCloudMap-right-bottom {
height: 29%;
background-color: #fff;
border-radius: 5px;
padding: 10px 20px;
.right-bottom-title {
display: grid;
grid-template-columns: auto auto; /* 自动列宽 */
// align-items: end; /* 垂直对齐方式:底部对齐 */
.L-title-left {
display: flex;
align-items: center;
.dataCloudMap-birght {
width: 10px;
height: 20px;
background: #0086FF;
box-shadow: 3px 0 3px 0px #0086FF;
border-radius: 5px 5px 5px 5px;
}
.dataCloudMap-title {
font-family: AlibabaPuHuiTiB;
font-size: 18px;
color: #333333;
margin: 0 10px;
}
}
.dataCloudMap-data {
font-family: AlibabaPuHuiTiR;
font-size: 14px;
color: #999999;
}
}
}
}
}
}

@ -1,11 +1,288 @@
<template>
<div>
<div class="dataCloudMap" v-if="false">
<el-row class="dataCloudMap-main">
<el-col :span="11" class="dataCloudMap-main-left">
<div class="dataCloudMap-left-top">
<div class="echart-title">
<div class="echart-left-title">
<div class="L-title-left">
<span class="dataCloudMap-birght"></span>
<span class="dataCloudMap-title">服务业发展总览</span>
</div>
<span class="dataCloudMap-data">统计数据截至2024-01</span>
</div>
<div class="rightBigNav">
<div class="right-nav">
<div
class="tabStyle"
v-for="(item, index) in options1"
:key="index"
@click="active(index)"
:class="activeIndex == index ? 'change-blue' : ''"
>
<div class="change-grey-birght" :class="activeIndex == index ? 'change-blue-birght' : ''"></div>
<span class="change-grey-text" :class="activeIndex == index ? 'change-blue-text' : ''">{{ item.name }}</span>
</div>
</div>
</div>
</div>
<div id="echarts"></div>
</div>
<div class="dataCloudMap-left-bottom">
<div class="bottom-left-title">
<div class="L-title-left">
<span class="dataCloudMap-birght"></span>
<span class="dataCloudMap-title">行业纵深情况</span>
</div>
<span class="dataCloudMap-data">统计数据截至2024-01</span>
</div>
</div>
</el-col>
<el-col :span="13" class="dataCloudMap-main-right">
<div class="dataCloudMap-right-top">
<div class="right-top-title">
<div class="L-title-left">
<span class="dataCloudMap-birght"></span>
<span class="dataCloudMap-title">企业情况</span>
</div>
<span class="dataCloudMap-data">统计数据截至2024-01</span>
</div>
</div>
<div class="dataCloudMap-right-middle">
<div class="right-middle-title">
<div class="L-title-left">
<span class="dataCloudMap-birght"></span>
<span class="dataCloudMap-title">荣誉情况</span>
</div>
<span class="dataCloudMap-data">统计数据截至2024-01</span>
</div>
</div>
<div class="dataCloudMap-right-bottom">
<div class="right-bottom-title">
<div class="L-title-left">
<span class="dataCloudMap-birght"></span>
<span class="dataCloudMap-title">项目追踪情况</span>
</div>
<span class="dataCloudMap-data">统计数据截至2024-01</span>
</div>
</div>
</el-col>
</el-row>
</div>
</template>
<script>
export default {};
import * as echarts from "echarts";
export default {
data() {
return {
activeIndex:0,
options1: [
{
name: "按年",
// url: require("../../assets/images/bg1.png"),
// url1: require("../../assets/images/bg2.png"),
},
{
name: "按季度",
// url: require("../../assets/images/tb1.png"),
// url1: require("../../assets/images/tb2.png"),
},
],
}
},
mounted(){
// this.$nextTick(()=>{
// this.initEchart();
// })
},
methods:{
initEchart(){
var chartDom = document.getElementById("echarts");
var myChart = echarts.init(chartDom);
let option = {
// title: {
// text: "2019",
// textStyle: {
// align: "center",
// color: "#fff",
// fontSize: 20,
// },
// top: "3%",
// left: "10%",
// },
// backgroundColor: "#0f375f",
grid: {
top: "10%",
bottom: "25%", //leftright
},
// tooltip: {
// trigger: "axis",
// axisPointer: {
// type: "shadow",
// label: {
// show: true,
// },
// },
// },
// legend: {
// data: ["", ""],
// top: "1%",
// textStyle: {
// // color: "#ffffff",
// },
// },
xAxis: {
data: [
"当年完成水量",
"去年同期水量",
"滚动目标值水量",
"全年目标值水量",
"当年完成金额",
"去年同期金额",
"滚动目标金额",
"全年目标值",
],
axisLine: {
show: true, //X线
// lineStyle: {
// color: "#01FCE3",
// },
},
axisTick: {
show: true, //X
},
axisLabel: {
show: true,
// textStyle: {
// color: "#ebf8ac", //X
// },
},
},
yAxis: [
{
type: "value",
name: "亿元",
// nameTextStyle: {
// // color: "#ebf8ac",
// },
splitLine: {
show: false,
},
axisTick: {
show: true,
},
axisLine: {
show: true,
// lineStyle: {
// color: "#FFFFFF",
// },
},
axisLabel: {
show: true,
// textStyle: {
// color: "#ebf8ac",
// },
},
},
// {
// type: "value",
// // name: "",
// // nameTextStyle: {
// // color: "#ebf8ac",
// // },
// position: "right",
// splitLine: {
// show: false,
// },
// axisTick: {
// show: false,
// },
// axisLine: {
// show: false,
// },
// axisLabel: {
// show: false,
// formatter: "{value} %", //Y
// // textStyle: {
// // color: "#ebf8ac",
// // },
// },
// },
// {
// type: "value",
// gridIndex: 0,
// min: 50,
// max: 100,
// splitNumber: 8,
// splitLine: {
// show: false,
// },
// axisLine: {
// show: false,
// },
// axisTick: {
// show: false,
// },
// axisLabel: {
// show: false,
// },
// splitArea: {
// show: true,
// areaStyle: {
// color: ["rgba(250,250,250,0.0)", "rgba(250,250,250,0.05)"],
// },
// },
// },
],
series: [
{
name: "销售水量",
type: "line",
// yAxisIndex: 1, //使 y index y
smooth: true, //线
showAllSymbol: true, //
symbol: "circle", //
symbolSize: 10, //
itemStyle: {
//线
color: "#058cff",
},
lineStyle: {
color: "#058cff",
},
// 线
// areaStyle: {
// color: "rgba(5,140,255, 0.2)",
// },
data: [4.2, 3.8, 4.8, 3.5, 2.9, 2.8, 3, 5],
},
{
name: "主营业务",
type: "bar",
// barWidth: 15,
// itemStyle: {
// normal: {
// color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
// {
// offset: 0,
// color: "#00FFE3",
// },
// {
// offset: 1,
// color: "#4693EC",
// },
// ]),
// },
// },
data: [4.2, 3.8, 4.8, 3.5, 2.9, 2.8, 3, 5],
},
],
};
myChart.setOption(option)
},
active(e) {
this.activeIndex = e;
},
},
}
</script>
<style></style>

@ -6,10 +6,20 @@
<el-table v-loading="loading" border class="tabTwo-table" :data="tableData" :row-class-name="tableRowClassName" :max-height="tabHeader">
<el-table-column type="index" width="55" label="序号"/>
<el-table-column label="年份" prop="projectYear" />
<el-table-column label="项目名称" prop="projectName" />
<el-table-column label="项目类" prop="projectClassify">
<!-- <el-table-column label="项目名称" prop="projectName" /> -->
<el-table-column label="项目类" prop="projectClassify">
<template slot-scope="scope">
<dict-tag :options="dict.type.jjh_project_type" :value="scope.row.projectClassify"/>
<dict-tag :options="dict.type.project_categories" :value="scope.row.projectBigType"/>
</template>
</el-table-column>
<el-table-column label="项目中类" prop="projectMiddleType">
<template slot-scope="scope">
<dict-tag :options="dict.type.project_middle_type" :value="scope.row.projectMiddleType"/>
</template>
</el-table-column>
<el-table-column label="项目小类" prop="projectSmallType">
<template slot-scope="scope">
<dict-tag :options="dict.type.project_small_type" :value="scope.row.projectSmallType"/>
</template>
</el-table-column>
<el-table-column label="状态" prop="status" class-name="table-status">
@ -80,7 +90,7 @@ import { jProject } from "@/api/jin_ji_hu/project/index"
export default {
components:{myPagination},
name:"tabThree",
dicts: ['jjh_project_type', 'bms_approval_status'],
dicts: [ "project_middle_type", "project_small_type", "project_categories"],
props:{
creditCode:{
type:String,

@ -2,7 +2,7 @@
<div class="L-public-main projectInfo" id="L-size-main">
<el-row :gutter="10">
<el-col :span="24">
<div class="left-info" id="L-header">
<div class="left-info enter-left-info" id="L-header">
<div class="project-info-title">企业信息</div>
<el-descriptions class="margin-top" :column="2" size="medium" border v-loading="loading">
<el-descriptions-item label="企业名称">{{ info.qymc }}</el-descriptions-item>

@ -90,10 +90,10 @@
<my-pagination
id="L-pagination"
:total="total"
:page="pagination.pageNum"
:limit="pagination.pageSize"
:page="pagination.current"
:limit="pagination.size"
@pagination="getPagination"
:current-page.sync="pagination.pageNum"
:current-page.sync="pagination.current"
></my-pagination>
</section>
</div>
@ -159,8 +159,8 @@ export default {
deptId: this.$store.state.user.deptId,
total:0,
pagination: {
pageNum:1,
pageSize:10,
current:1,
size:10,
},
loading:false,
formInline: {
@ -238,15 +238,15 @@ export default {
},
//
getPagination(pages) {
this.pagination.pageNum = pages.page;
this.pagination.pageSize = pages.limit;
this.pagination.current = pages.page;
this.pagination.size = pages.limit;
this.getList();
},
//
handleQuery() {
this.pagination = {
pageNum: 1,
pageSize: 10
current: 1,
size: 10
}
this.pagination = { ...this.pagination,...this.formInline };
// console.log(this.pagination);
@ -257,8 +257,8 @@ export default {
resetQuery(formName){
this.$refs[formName].resetFields();
this.pagination = {
pageNum: 1,
pageSize: 10
current: 1,
size: 10
}
this.getList();
},

@ -88,7 +88,7 @@
</section>
</div>
<my-dialog :title="title" @close="importClose" @confirm="confirm" ref="importProject" closeText="关闭" width="40%" :myclass="true">
<el-form :model="addFrom" size="small" ref="importFrom" label-width="180px" :rules="rules" class="newArticle" :disabled="title == '查看智能提醒规则' ? true : false">
<el-form :model="addFrom" size="small" ref="importFrom" label-width="180px" :rules="rules" class="newArticle intelligentReminder-form" :disabled="title == '查看智能提醒规则' ? true : false">
<el-row>
<el-col :span="24">
<el-form-item label="提醒规则标题" class="importFormItem" prop="rulesName">
@ -145,14 +145,21 @@
</div>
</el-form-item>
</el-col>
<el-col :span="24" v-if="addFrom.projectName">
<el-form-item label="项目名称" class="importFormItem" prop="projectName">
<el-col :span="24" v-if="addFrom.projectId">
<!-- <el-form-item label="所属项目:" class="importFormItem" prop="projectId">
<el-input
disabled
placeholder="请输入提醒内容"
v-model="addFrom.projectName">
v-model="addFrom.projectId">
</el-input>
</el-form-item>
</el-form-item> -->
<div class="reminder-project">
<div class="new-label">所属项目</div>
<div class="new-value">
<div class="value-enterName">{{ addFrom.qymc }}-</div>
<dict-tag :options="dict.type.project_small_type" :value="addFrom.projectSmallType"/>
</div>
</div>
</el-col>
<el-col :span="24">
<el-form-item label="提醒内容:" class="importFormItem" prop="alertContent">
@ -181,7 +188,7 @@ import myDialog from "@/views/components/myDialog/index.vue"
import { getjSmartReminders, jSmartRemindersNew, updateNdqChange, updateDqChange, jSmartRemindersId, jSmartRemindersDel } from "@/api/jin_ji_hu/intelligentReminder"
export default {
components:{myPagination, myDialog},
dicts: ['alert_type'],
dicts: ['alert_type', "project_small_type"],
data() {
return {
total:0,

@ -25,8 +25,20 @@
</el-col>
<el-col :span="8" style="height: 50px">
<div class="templateInfo">
<div class="templateInfo_left">项目分类</div>
<dict-tag :options="dict.type.jjh_project_type" :value="templateInfo.projectClassify"/>
<div class="templateInfo_left">项目大类</div>
<dict-tag :options="dict.type.project_categories" :value="templateInfo.projectBigType"/>
</div>
</el-col>
<el-col :span="8" style="height: 50px">
<div class="templateInfo">
<div class="templateInfo_left">项目中类</div>
<dict-tag :options="dict.type.project_middle_type" :value="templateInfo.projectMiddleType"/>
</div>
</el-col>
<el-col :span="8" style="height: 50px">
<div class="templateInfo">
<div class="templateInfo_left">项目小类</div>
<dict-tag :options="dict.type.project_small_type" :value="templateInfo.projectSmallType"/>
</div>
</el-col>
<el-col :span="8" style="height: 50px">
@ -1323,7 +1335,7 @@ export default {
name: "declareAddContent",
// 'sys_show_hide', 'sys_normal_disable', 'bms_product_area', 'bms_declaration_type','bms_template_type', 'bms_declaration_channels',
dicts: ['bms_responsibility_unit', 'bms_level', 'bms_affiliation_type', 'sys_declaration_type', 'jjh_project_type', 'template_industry', 'new_template_type'],
dicts: ['bms_responsibility_unit', 'bms_level', 'bms_affiliation_type', 'sys_declaration_type', 'jjh_project_type', 'template_industry', 'new_template_type',"project_middle_type", "project_small_type", "project_categories"],
data() {
//
var checkMobile = (rule,value,cb) =>{
@ -1524,9 +1536,9 @@ export default {
this.baseInfo = response.data
console.log(this.baseInfo);
})
// getOpenInterface({templateRecordId: templateRecordId}).then((response) => {
// this.openInterfaceInfo = response.data
// })
getOpenInterface({templateRecordId: templateRecordId}).then((response) => {
this.openInterfaceInfo = response.data
})
// templateList({
// responsibilityUnit: this.templateInfo.responsibilityUnit,
// enterpriseId: this.$store.state.user.enterpriseId,
@ -1637,10 +1649,14 @@ export default {
}
})
let detailList = []
detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: this.openInterfaceInfo.year})
detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: this.openInterfaceInfo.year})
detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: Number(this.openInterfaceInfo.year)+1})
detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '预计税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: Number(this.openInterfaceInfo.year)+1})
// detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrate: '', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: this.openInterfaceInfo.year})
// detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrate: '', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: this.openInterfaceInfo.year})
// detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: Number(this.openInterfaceInfo.year)+1})
// detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: Number(this.openInterfaceInfo.year)+1})
detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: 2021})
detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: 2021})
detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: 2022})
detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '预计税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: 2022})
params.fundingDetailList = detailList
// console.log('11', params);
addProjectSettlementAward(params).then((response) => {
@ -1664,14 +1680,22 @@ export default {
}
})
let detailList = []
detailList.push({amount: this.form.revenueNowYear3,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear3',year: this.openInterfaceInfo.year})
detailList.push({amount: this.form.taxationNowYear3,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear3',year: this.openInterfaceInfo.year})
detailList.push({amount: this.form.revenueNowYear2,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear2',year: Number(this.openInterfaceInfo.year)+1})
detailList.push({amount: this.form.taxationNowYear2,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear2',year: Number(this.openInterfaceInfo.year)+1})
detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: Number(this.openInterfaceInfo.year)+2})
detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: Number(this.openInterfaceInfo.year)+2})
detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: Number(this.openInterfaceInfo.year)+3})
detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: Number(this.openInterfaceInfo.year)+3})
// detailList.push({amount: this.form.revenueNowYear3,detailId: '',illustrate: '', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear3',year: this.openInterfaceInfo.year})
// detailList.push({amount: this.form.taxationNowYear3,detailId: '',illustrate: '', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear3',year: this.openInterfaceInfo.year})
// detailList.push({amount: this.form.revenueNowYear2,detailId: '',illustrate: '', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear2',year: Number(this.openInterfaceInfo.year)+1})
// detailList.push({amount: this.form.taxationNowYear2,detailId: '',illustrate: '', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear2',year: Number(this.openInterfaceInfo.year)+1})
// detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrate: '', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: Number(this.openInterfaceInfo.year)+2})
// detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrate: '', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: Number(this.openInterfaceInfo.year)+2})
// detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: Number(this.openInterfaceInfo.year)+3})
// detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: Number(this.openInterfaceInfo.year)+3})
detailList.push({amount: this.form.revenueNowYear3,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear3',year: 2021})
detailList.push({amount: this.form.taxationNowYear3,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear3',year: 2021})
detailList.push({amount: this.form.revenueNowYear2,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear2',year: 2022})
detailList.push({amount: this.form.taxationNowYear2,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear2',year: 2022})
detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: 2023})
detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: 2023})
detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: 2024})
detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: 2024})
params.fundingDetailList = detailList
// console.log('11', params);
addBigStrongAward(params).then((response) => {

@ -32,10 +32,28 @@
</el-col>
<el-col :span="8" style="height: 50px">
<div class="templateInfo">
<div class="templateInfo_left">项目</div>
<div class="templateInfo_left">项目</div>
<dict-tag
:options="dict.type.jjh_project_type"
:value="templateInfo.projectClassify"
:options="dict.type.project_categories"
:value="templateInfo.projectBigType"
/>
</div>
</el-col>
<el-col :span="8" style="height: 50px">
<div class="templateInfo">
<div class="templateInfo_left">项目中类</div>
<dict-tag
:options="dict.type.project_middle_type"
:value="templateInfo.projectMiddleType"
/>
</div>
</el-col>
<el-col :span="8" style="height: 50px">
<div class="templateInfo">
<div class="templateInfo_left">项目小类</div>
<dict-tag
:options="dict.type.project_small_type"
:value="templateInfo.projectSmallType"
/>
</div>
</el-col>
@ -3431,7 +3449,9 @@ export default {
"bms_level",
"bms_affiliation_type",
"sys_declaration_type",
"jjh_project_type",
"project_middle_type",
"project_small_type",
"project_categories",
"template_industry",
"new_template_type",
],

@ -146,14 +146,23 @@
</el-col>
<el-col :span="24">
<el-form-item label="项目分类" prop="projectClassify">
<el-select v-model="form.projectClassify" placeholder="请选择项目分类" style="width: 100%;" @change="changeProjectClassify" :disabled="isReplace">
<!-- <el-select v-model="form.projectClassify" placeholder="请选择项目分类" style="width: 100%;" @change="changeProjectClassify" :disabled="!form.responsibilityUnit || isReplace">
<el-option
v-for="dict in dict.type.jjh_project_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-select> -->
<el-cascader
style="width: 100%;"
:disabled="isReplace"
v-model="form.projectClassify"
:options="optionsTwo"
:props="propsTwo"
@change="changeProjectClassify"
>
</el-cascader>
</el-form-item>
</el-col>
<!-- <el-col :span="24">
@ -170,7 +179,7 @@
</el-col> -->
<el-col :span="24">
<el-form-item label="申报表单模版" prop="templateId">
<el-select v-model="form.templateId" placeholder="请选择申报表单模版" style="width: 100%;" @change="changeTemplate" :disabled="isReplace">
<el-select v-model="form.templateId" placeholder="请选择申报表单模版" style="width: 100%;" @change="changeTemplate" :disabled="isForm">
<el-option
v-for="dict in templateList"
:key="dict.id"
@ -314,7 +323,7 @@
<script>
import { listTemplate, listBusiness, exportData, addTemplateRecord, putTemplateRecord, listTemplateInfo, getTemplateRecord, uploadFile, allList, supplementation } from "@/api/onlineDeclartion/enterpriseDirectory"
import * as XLSX from 'xlsx'
import { getAllList } from "@/api/system/dict/data";
export default {
name: "EnterpriseDirectory",
// 'sys_show_hide', 'sys_normal_disable', 'bms_template_type',
@ -341,6 +350,8 @@ export default {
open: false,
//
isReplace: false,
//
isForm: false,
//
refreshTable: true,
total: 10,
@ -402,13 +413,36 @@ export default {
excelData: [],
tabHeader: undefined,
unitId: undefined,
projectId: undefined,
projectBigType: undefined,
projectMiddleType: undefined,
projectSmallType: undefined,
diaLoading:false,
optionsTwo: [],
propsTwo:{
lazy:true,
lazyLoad (node, resolve) {
const { level, data, children } = node;
if(children?.length == 0 ) {
getAllList({dictType: data.dict}).then(res=>{
const nodes = Array.from(res.data).map((item)=>{
return {
value:item.dictValue,
label:item.dictLabel,
dict:item.remark,
leaf: level >= 2
}
})
resolve(nodes)
})
}
}
},
};
},
mounted() {
this.cancalDebounce();
window.addEventListener('resize', this.cancalDebounce);
this.getDataList();
},
destroyed() {
window.removeEventListener('resize', this.cancalDebounce);
@ -418,6 +452,17 @@ export default {
this.getTemplateList();
},
methods: {
getDataList(){
getAllList({dictType:"project_categories"}).then(res=>{
res.data.map(item => {
let obj = {};
obj.value = item.dictValue;
obj.label = item.dictLabel;
obj.dict = item.remark;
this.optionsTwo.push(obj);
})
})
},
//
cancalDebounce(){
const element = document.getElementById('app-container'); // ID
@ -455,6 +500,7 @@ export default {
cancel() {
this.open = false;
this.isReplace = false;
this.isForm = false;
this.reset();
},
//
@ -485,11 +531,52 @@ export default {
this.reset();
this.open = true;
this.isReplace = false;
this.isForm = true;
this.fileList = [];
this.form.isFrame = 0;
this.form.isTime = 0;
this.title = "发布申报任务";
},
/** 回显Cascader 级联选择器数据 */
echoCascader(arr){
getAllList({dictType:"project_categories"}).then(res=>{
let obj = {};
let objTwo = {};
let objThree = {};
res.data.map(item => {
if(arr[0] == item.dictValue) {
obj.value = item.dictValue;
obj.label = item.dictLabel;
obj.dict = item.remark;
obj.children = [];
getAllList({dictType: item.remark}).then(resTwo=>{
resTwo.data.map((itemTwo)=>{
if(arr[1] == itemTwo.dictValue) {
objTwo.value = itemTwo.dictValue;
objTwo.label = itemTwo.dictLabel;
objTwo.dict = itemTwo.remark;
objTwo.children = [];
obj.children.push(objTwo)
getAllList({dictType: itemTwo.remark}).then(resThree => {
resThree.data.map((itemThree)=>{
if(arr[2] == itemThree.dictValue) {
objThree.value = itemThree.dictValue;
objThree.label = itemThree.dictLabel;
objThree.dict = itemThree.remark;
objThree.leaf = 'leaf';
objTwo.children.push(objThree)
this.optionsTwo.push(obj);
}
})
})
}
})
})
}
})
})
},
/** 补录按钮操作 */
handleReplace(row){
this.reset();
@ -497,9 +584,18 @@ export default {
this.form = response.data;
this.open = true;
this.isReplace = true;
this.isForm = true;
this.title = "申报补录";
this.form.responsibilityUnit = this.form.responsibilityUnit + ''
this.form.projectClassify = this.form.projectClassify + ''
let arr = [];
if(response.data.projectBigType && response.data.projectMiddleType && response.data.projectSmallType) {
arr.push(response.data.projectBigType + '')
arr.push(response.data.projectMiddleType + '')
arr.push(response.data.projectSmallType + '')
}
this.echoCascader(arr)
// this.form.projectClassify = this.form.projectClassify + ''
this.form.projectClassify = arr
this.form.road = this.form.road + ''
if(this.form.fileName) {
@ -537,6 +633,7 @@ export default {
this.form = response.data;
this.open = true;
this.isReplace = false;
this.isForm = false;
this.title = "修改申报任务";
this.form.responsibilityUnit = this.form.responsibilityUnit + ''
this.form.projectClassify = this.form.projectClassify + ''
@ -584,6 +681,7 @@ export default {
this.$modal.msgSuccess("补录成功");
this.open = false;
this.isReplace = false;
this.isForm = false;
this.getList();
})
} else if (this.form.id != undefined) {
@ -592,6 +690,7 @@ export default {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.isReplace = false;
this.isForm = false;
this.getList();
});
} else {
@ -600,6 +699,7 @@ export default {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.isReplace = false;
this.isForm = false;
this.getList();
});
}
@ -654,14 +754,14 @@ export default {
//
changeResponsibilityUnit(valid) {
this.unitId = valid;
if(this.projectId) {
if(this.projectBigType && this.projectMiddleType && this.projectSmallType) {
this.isForm = false;
// this.templateList = this.templateListLock.filter((item) => {
// return item.responsibilityUnit == valid
// })
this.templateList = []
this.form.templateId = ""
allList({responsibilityUnit:Number(valid),projectClassify:Number(this.projectId)}).then(res=>{
allList({responsibilityUnit:Number(valid),projectBigType:this.projectBigType,projectMiddleType:this.projectMiddleType,projectSmallType:this.projectSmallType}).then(res=>{
// console.log(res);
this.templateList = res.data || []
})
@ -671,14 +771,17 @@ export default {
},
//
changeProjectClassify(valId){
this.projectId = valId
this.projectBigType = valId[0]
this.projectMiddleType = valId[1]
this.projectSmallType = valId[2]
if(this.unitId) {
this.isForm = false;
// this.templateList = this.templateListLock.filter((item) => {
// return item.responsibilityUnit == valId
// })
this.templateList = []
this.form.templateId = ""
allList({responsibilityUnit:Number(this.unitId),projectClassify:Number(valId)}).then(res=>{
allList({responsibilityUnit:Number(this.unitId),projectBigType:this.projectBigType,projectMiddleType:this.projectMiddleType,projectSmallType:this.projectSmallType}).then(res=>{
// console.log(res);
this.templateList = res.data || []
})

@ -82,12 +82,15 @@
<el-col :span="22">
<el-radio-group v-model="radio" @change="toggleOptions">
<el-radio-button label="">全部</el-radio-button>
<el-radio-button label="1,8">初审</el-radio-button>
<el-radio-button label="2,7">复审</el-radio-button>
<!-- <el-radio-button label="3,6">专家评审</el-radio-button> -->
<el-radio-button label="3,6">终审</el-radio-button>
<!-- <el-radio-button label="4">市级评审</el-radio-button> -->
<el-radio-button label="5">终审通过</el-radio-button>
<el-radio-button label="0">待填报</el-radio-button>
<el-radio-button label="1">初审中</el-radio-button>
<el-radio-button label="10">初审驳回</el-radio-button>
<el-radio-button label="8">初审不通过</el-radio-button>
<el-radio-button label="2">复审中</el-radio-button>
<el-radio-button label="7">复审不通过</el-radio-button>
<el-radio-button label="3">终审中</el-radio-button>
<el-radio-button label="9">终审不通过</el-radio-button>
<el-radio-button label="5">评审通过</el-radio-button>
</el-radio-group>
</el-col>
<el-col :span="2" class="zipImport">

@ -8,7 +8,13 @@
模板名称{{ info.templateName }}
</el-col>
<el-col :span="8" style="height: 50px;display: flex;">
项目分类<dict-tag :options="dict.type.jjh_project_type" :value="info.projectClassify"/>
项目大类<dict-tag :options="dict.type.project_categories" :value="info.projectBigType"/>
</el-col>
<el-col :span="8" style="height: 50px;display: flex;">
项目中类<dict-tag :options="dict.type.project_middle_type" :value="info.projectMiddleType"/>
</el-col>
<el-col :span="8" style="height: 50px;display: flex;">
项目小类<dict-tag :options="dict.type.project_small_type" :value="info.projectSmallType"/>
</el-col>
<el-col :span="8" style="height: 50px;display: flex;">
<!-- {{ info.responsibilityUnit == 0 ? '经发委' : info.responsibilityUnit == 1 ? '规建委' : info.responsibilityUnit == 2 ? '行审局' : info.responsibilityUnit == 3 ? '市监局' : '' }} -->
@ -409,7 +415,7 @@ import JsPDF from 'jspdf';
import { getInfo } from "@/api/onlineDeclartion/declarationManagement"
export default {
name: "declareAddContent",
dicts: ['jjh_project_type', 'bms_responsibility_unit'],
dicts: ['bms_responsibility_unit', "project_middle_type", "project_small_type", "project_categories"],
data() {
return {
size: '',

@ -16,10 +16,10 @@
v-for="(activity, index) in flow"
:key="index"
size="large"
:class="activity.approvalStatus == 1 || activity.approvalStatus == 0 ? 'timeline-item-green' : activity.approvalStatus == 2 ? 'timeline-item-red' : ''"
:class="activity.approvalStatus == 1 || activity.approvalStatus == 0 ? 'timeline-item-green' : activity.approvalStatus == 2? 'timeline-item-red' : ''"
>
<div slot="dot" class="timeline-dot" :class="activity.approvalStatus == 2 ? 'timeline-dot-red' : ''">
<i class="icon iconfont" :class="activity.approvalStatus == 1 || activity.approvalStatus == 0 ? 'icon-jc-dian-green' : activity.approvalStatus == 2 ? 'icon-jc-dian' : ''"></i>
<div slot="dot" class="timeline-dot" :class="activity.approvalStatus == 2 || activity.approvalStatus == 3 ? 'timeline-dot-red' : ''">
<i class="icon iconfont" :class="activity.approvalStatus == 1 || activity.approvalStatus == 0 ? 'icon-jc-dian-green' : activity.approvalStatus == 2 || activity.approvalStatus == 3 ? 'icon-jc-dian' : ''"></i>
</div>
<el-card> <!-- 去除阴影 shadow="never -->
<div class="schedule-content">
@ -68,7 +68,7 @@
</div>
<div class="card-content-two" v-if="!activity.approvalAttachment">
<span>附件</span>
<a></a>
<span></span>
</div>
<div class="card-content-three">{{ activity.approvalTime }}</div>
<!-- <div class="card-content-three-red" v-show="activity.approvalStatus == 2">2023-06-20</div> -->

@ -7,23 +7,18 @@
<el-descriptions class="margin-top" :column="2" size="medium" border v-loading="loading">
<el-descriptions-item label="企业名称" contentClassName="info-link">{{ info.declareUnit }}<a v-if="$route.query.type == 1" @click="goEnterprice(info.creditCode)"></a></el-descriptions-item>
<el-descriptions-item label="统一社会信用代码">{{ info.creditCode }}</el-descriptions-item>
<el-descriptions-item label="项目分类" contentClassName="info-link">
<!-- <el-descriptions-item label="项目分类" contentClassName="info-link">
<div class="project_info_box" style="display: flex;">
<dict-tag class="dict_type" :options="dict.type.project_categories" :value="info.projectBigType" />/<dict-tag class="dict_type" :options="dict.type.project_middle_type" :value="info.projectMiddleType"/>/<dict-tag class="dict_type" :options="dict.type.project_small_type" :value="info.projectSmallType"/>
<!-- <el-tooltip effect="light" :content="getLabel(info.projectBigType,'big')" placement="top">
<dict-tag class="dict_type" :options="dict.type.project_categories" :value="info.projectBigType"/>/
</el-tooltip>
<el-tooltip effect="light" :content="getLabel(info.projectMiddleType,'middle')" placement="top">
<dict-tag class="dict_type" :options="dict.type.project_middle_type" :value="info.projectMiddleType"/>/
</el-tooltip>
<el-tooltip effect="light" :content="getLabel(info.projectSmallType,'small')" placement="top">
<dict-tag class="dict_type" :options="dict.type.project_small_type" :value="info.projectSmallType"/>
</el-tooltip> -->
</div>
</el-descriptions-item>
<!-- <el-descriptions-item label="项目中类" contentClassName="info-link"><a class="a-primary" @click="goback(info.projectMiddleType)"><dict-tag :options="dict.type.project_middle_type" :value="info.projectMiddleType"/></a></el-descriptions-item>
</el-descriptions-item> -->
<el-descriptions-item label="项目大类" contentClassName="info-link"><dict-tag :options="dict.type.project_categories" :value="info.projectBigType"/></el-descriptions-item>
<el-descriptions-item label="项目中类" contentClassName="info-link"><dict-tag :options="dict.type.project_middle_type" :value="info.projectMiddleType"/></el-descriptions-item>
<el-descriptions-item label="项目小类" contentClassName="info-link"><dict-tag :options="dict.type.project_small_type" :value="info.projectSmallType"/></el-descriptions-item>
<!-- <el-descriptions-item label="项目大类" contentClassName="info-link"><a class="a-primary" @click="goback(info.projectBigType)"><dict-tag :options="dict.type.project_categories" :value="info.projectBigType"/></a></el-descriptions-item>
<el-descriptions-item label="项目中类" contentClassName="info-link"><a class="a-primary" @click="goback(info.projectMiddleType)"><dict-tag :options="dict.type.project_middle_type" :value="info.projectMiddleType"/></a></el-descriptions-item>
<el-descriptions-item label="项目小类" contentClassName="info-link"><a class="a-primary" @click="goback(info.projectSmallType)"><dict-tag :options="dict.type.project_small_type" :value="info.projectSmallType"/></a></el-descriptions-item> -->
<el-descriptions-item label="年份">{{ info.projectYear }}</el-descriptions-item>
<el-descriptions-item label="申报年份">{{ info.projectYear }}</el-descriptions-item>
</el-descriptions>
</div>
<div class="left-tabs">
@ -177,7 +172,9 @@ export default {
this.loading = false;
this.detailedInfo = JSON.parse(res.data.otherJson);
this.fileJson = JSON.parse(res.data.fileJson);
return getUserId({getCreditCode : this.info.creditCode})
if(this.info.creditCode) {
return getUserId({getCreditCode : this.info.creditCode})
}
// console.log(this.fileJson,"this.fileJson");
// for (var key in obj) {
// if (obj.hasOwnProperty(key)) {

@ -47,7 +47,15 @@
<div class="content-time">{{ item.alertTime }}</div>
</div>
</div>
<div class="warn-main-left" v-if="item.alertManner == 1 && item.projectId">
<div class="warn-main-left" v-else-if="item.alertManner == 1 && item.qymc && item.alertRecipients == 2">
<div class="warn-main-img"><img src="@/assets/images/warn-orange.png" alt=""></div>
<div class="warn-main-content">
<div class="content-title" style="display: flex;">{{ item.qymc }}<dict-tag :options="dict.type.project_small_type" :value="item.declarationName"/></div>
<div class="content-middle">{{ item.alertContent }}</div>
<div class="content-time">{{ item.alertTime }}</div>
</div>
</div>
<div class="warn-main-left" v-else-if="item.alertManner == 1 && item.projectId">
<div class="warn-main-img"><img src="@/assets/images/warn-orange.png" alt=""></div>
<div class="warn-main-content">
<div class="content-title">{{ item.declarationName }}</div>
@ -55,7 +63,7 @@
<div class="content-time">{{ item.alertTime }}</div>
</div>
</div>
<div class="warn-main-left different-left" v-if="item.alertManner == 1 && !item.projectId">
<div class="warn-main-left different-left" v-else-if="item.alertManner == 1 && !item.projectId">
<div class="warn-main-img"><img src="@/assets/images/warn-blue.png" alt=""></div>
<div class="warn-main-content">
<div class="content-title">{{ item.alertContent }}</div>
@ -123,6 +131,7 @@ import { listRecords } from "@/api/onlineDeclartion/records"
import { selectAll, workSearch } from "@/api/jin_ji_hu/home"
import { chiefAll, enterpriseAll, changeIsRead } from "@/api/jin_ji_hu/intelligentReminder"
export default {
dicts: ["project_small_type"],
data() {
return {
// 01 02

Loading…
Cancel
Save