diff --git a/.env.development b/.env.development
index 80ff118..a60aba1 100644
--- a/.env.development
+++ b/.env.development
@@ -5,8 +5,8 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
ENV = 'development'
# 金鸡湖现代服务业品牌管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.0.105:9041'
-VUE_APP_BASE_API = 'http://39.101.188.84:9040'
+VUE_APP_BASE_API = 'http://192.168.0.105:9040'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9040'
# VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'
# 路由懒加载
diff --git a/package.json b/package.json
index 3606f7a..945187b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi",
- "version": "1.0.202407031608",
+ "version": "1.0.202407041438",
"description": "金鸡湖现代服务业品牌管理系统",
"author": "若依",
"license": "MIT",
diff --git a/src/layout/components/FixedHeader/components/MenuMain/index.vue b/src/layout/components/FixedHeader/components/MenuMain/index.vue
index a06cd4c..5dfcb2a 100644
--- a/src/layout/components/FixedHeader/components/MenuMain/index.vue
+++ b/src/layout/components/FixedHeader/components/MenuMain/index.vue
@@ -80,7 +80,7 @@ export default {
//是否当前路由
isCurrentRoute(key) {
- if(this.$route.path == '/user/projectInfo' && this.userType == '01' && key.indexOf("/enterpriseService") > -1) {
+ if((this.$route.path == '/user/projectInfo' || this.$route.path == '/user/enterpriselibraryInfo') && this.userType == '01' && key.indexOf("/enterpriseService") > -1) {
return true;
}
return this.$route.path.indexOf(key) > -1;
diff --git a/src/views/infoMaintain/index.vue b/src/views/infoMaintain/index.vue
index 26130f2..7d32b87 100644
--- a/src/views/infoMaintain/index.vue
+++ b/src/views/infoMaintain/index.vue
@@ -2,13 +2,13 @@
-->
+
+
+
+
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index e02487b..0ab7d43 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -47,7 +47,7 @@
- 导入新项目
+ 导入新项目
@@ -108,7 +108,7 @@
查看详情
- 删除
+ 删除
@@ -228,6 +228,7 @@ export default {
return {
// 判断登陆用户是何身份⌈ 01 ： 企业 02 ： 政务 ⌋
userType: this.$store.state.user.userType,
+ roles: this.$store.state.user.roles,
total:0,
pagination: {
current:1,
diff --git a/src/views/project/projectInfo/components/tabTwo/index.vue b/src/views/project/projectInfo/components/tabTwo/index.vue
index cbb59bc..24f85e5 100644
--- a/src/views/project/projectInfo/components/tabTwo/index.vue
+++ b/src/views/project/projectInfo/components/tabTwo/index.vue
@@ -1,9 +1,9 @@
【申报单位信息】
-
+
+
+
+ {{ info.qymc }}
+
+
+ {{ info.bszh }}
+
+
+ {{ info.tyshxydm }}
+
+
+ {{ info.qyzch }}
+
+
+ {{ info.zzjgdm }}
+
+
+ {{ info.jjlxdm }}
+
+
+ {{ info.jjlxmc }}
+
+
+ {{ info.qylxdm }}
+
+
+ {{ info.qylxmc }}
+
+
+ {{ info.zczj }}
+
+
+ {{ info.zczbbz }}
+
+
+ {{ info.zclx }}
+
+
+ {{ info.jyhyyqsrq }}
+
+
+ {{ info.jyhyyjzrq }}
+
+
+ {{ info.hydm }}
+
+
+ {{ info.hymc }}
+
+
+ {{ info.hymc }}
+
+
+ {{ info.cylx }}
+
+
+ {{ info.qyzs }}
+
+
+ {{ info.jycs }}
+
+
+ {{ info.jycsxzqh }}
+
+
+ {{ info.yzbm }}
+
+
+ {{ info.clrq }}
+
+
+ {{ info.xydj }}
+
+
+ {{ info.qygm }}
+
+
+ {{ info.fddbrxm }}
+
+
+ {{ info.fddbrzjhm }}
+
+
+ {{ info.djjg }}
+
+
+ {{ info.hzrq }}
+
+
+ {{ info.jyzt }}
+
+
+ {{ info.ztrq }}
+
+
+ {{ info.zxrq }}
+
+
+ {{ info.dxrq }}
+
+
+ {{ info.lxdh }}
+
+
+ {{ info.sfyqn }}
+
+
+ {{ info.dwTimestamp }}
+
+
+ {{ info.dwLyjg }}
+
+
+ {{ info.jyfw }}
+
@@ -24,6 +140,8 @@ export default {
name:"tabTwo",
data() {
return {
+ // 判断登陆用户是何身份⌈ 01 ： 企业 02 ： 政务 ⌋
+ userType: this.$store.state.user.userType,
}
},
props:{
@@ -35,6 +153,13 @@ export default {
}
},
methods:{
+ goEnterprice(creditCode){
+ // console.log(creditCode);
+ this.$router.push({
+ name: 'enterpriselibraryInfo',
+ query: { userId: this.info.id, creditCode: creditCode }
+ })
+ },
},
}
diff --git a/src/views/project/projectInfo/index.vue b/src/views/project/projectInfo/index.vue
index e2b1257..a747a36 100644
--- a/src/views/project/projectInfo/index.vue
+++ b/src/views/project/projectInfo/index.vue
@@ -17,7 +17,7 @@
-
+
@@ -57,9 +57,7 @@ export default {
name: "申报单位信息",
},{
name: "资金拨付进度",
- },{
- name: "备忘录",
- },
+ }
],
govTabs:[
{
@@ -84,7 +82,8 @@ export default {
tabStyle:{
height:undefined,
overflow: 'auto'
- }
+ },
+ enterInfo:{},
}
},
mounted(){
@@ -120,6 +119,7 @@ export default {
// }
// }
}).then(res=>{
+ this.enterInfo = res.data
this.info.userId = res.data.id
})
},
@@ -137,7 +137,7 @@ export default {
goEnterprice(creditCode){
// console.log(creditCode);
this.$router.push({
- name: 'enterInfo',
+ name: 'enterpriselibraryInfo',
query: { userId: this.info.userId, creditCode: creditCode }
})
},
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index 768a464..47228db 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -99,7 +99,7 @@
- 暂未待审核
+ 暂无
@@ -215,9 +215,15 @@ export default {
// 智能提醒去查看并修改状态
putMemo(item){
if(item.isRead == 1) {
- changeIsRead({id:item.id}).then(res=>{})
+ changeIsRead({id:item.id}).then(res=>{
+ if(this.userType == "02") {
+ this.govRemind();
+ } else if(this.userType == "01") {
+ this.entRemind();
+ }
+ })
}
- if(item.alertRecipients == 2) {
+ if(item.projectId) {
this.$router.push({
name: 'projectInfo',
query: { userId: Number(item.projectId) }
@@ -281,7 +287,7 @@ export default {
workSearch({enterpriseInfo: queryString}).then(res => {
res.data.forEach(item => {
results.push({
- value: item.enterpriseName,
+ value: item.qymc,
id: item.id
})
})
@@ -312,8 +318,8 @@ export default {
// console.log(item);
if(this.checked == 0) {
this.$router.push({
- name: 'enterInfo',
- query: { userId: item.id, creditCode: item.creditCode }
+ name: 'enterpriselibraryInfo',
+ query: { userId: item.id, creditCode: item.tyshxydm }
})
} else if(this.checked == 1) {
this.$router.push({