企业基本信息 分页传参问题处理

src/assets/js/httpApi.js

@@ -490,7 +490,7 @@ var reqApis = function(){
 					baseInfo: {
 						// "incubatorId": {name:"孵化器名称", must:true, 'type':'select', val:'id', key:'name',},
 						"year": {
-							name:"年度", must:true, 'type':'date', 'datetype':'year','format':'yyyy', table:0
+							name:"年度", must:true, 'type':'date', 'datetype':'year','format':'yyyy'
 						},
 						"totalRevenue": {name:"孵化器总收入（万元）", must:true },
 						"serviceRevenue": {name:"综合服务收入(万元)", },
@@ -1048,6 +1048,17 @@ var reqApis = function(){
 					],
 				},
 				request: function (type, param) {
+					var searchParam = new URLSearchParams(window.location.search);
+					var companyId = searchParam.get('companyId');
+					if(companyId){
+						if(param.exact){ // 有exact则直接追加companyId 没有则新增值
+							param.exact.companyId = companyId
+						}else{ 
+							param.exact = {
+								companyId
+							}
+						}
+					}
 					return reqPublic('api/companyProduct', type, param)
 				},
 				upload: function (data) {
@@ -1122,6 +1133,18 @@ var reqApis = function(){
 					],
 				},
 				request: function (type, param) {
+					var searchParam = new URLSearchParams(window.location.search);
+					var companyId = searchParam.get('companyId');
+					if(companyId){
+						if(param.exact){ // 有exact则直接追加companyId 没有则新增值
+							param.exact.companyId = companyId
+						}else{ 
+							param.exact = {
+								companyId
+							}
+						}
+					}
+					
 					return reqPublic('api/companyAnnualInfo', type, param)
 				},
 			},

src/views/system/home/enterprise.vue

@@ -68,7 +68,7 @@
           </el-row>
           <el-row>
             <el-form-item label="剩余企业孵化的面积(m²)">
-              {{ remainingArea }}
+              {{ formInline.remainingArea }}
             </el-form-item>
           </el-row>
           <el-row>
@@ -220,9 +220,9 @@ export default {
     };
   },
   computed: {
-    remainingArea() {
-      return this.formInline.totalArea - this.formInline.incubationArea;
-    },
+    // remainingArea() {
+    //   return this.formInline.totalArea - this.formInline.incubationArea;
+    // },
   },
   mounted() {
     // this.getData();