企业 经营信息字段修改

src/assets/js/httpApi.js

@@ -876,7 +876,7 @@ var reqApis = function(){
 														<input type="checkbox" id="updateJYYN" value="yes"> 是否更新已存在企业经营信息数据(同年份同企业)
 												</div>
 											</div>
-											<div style="color:red;">仅允许导入xls、xlsx格式文件</div>hjoz 
+											<div style="color:red;">仅允许导入xls、xlsx格式文件</div>
 										</div>
 										<div class="el-dialog__footer"><div class="dialog-footer"><button type="button" class="el-button el-button--text el-button--small cancel">取消</button><button type="button" class="el-button el-button--primary el-button--small confirm">确认</button></div></div>
 										</div>
@@ -1062,6 +1062,10 @@ var reqApis = function(){
 						"revenueLastYear": {name:"上年营收收入(万元)", must:true},
 						"netProfit": {name:"净利润(万元)", must:true},
 						"taxesPaid": {name:"上缴税费(万元)"},
+						"grossIncome": {name:"总收入(万元)", table:0,},
+						"researchInput": {name:"研发投入(万元)"},
+						"investmentProportion": {name:"研发投入占比", disabled:true},
+						
 					},
 					selectList: {
 						incubatorId: function () {

src/layout/components/AppMain.vue

@@ -48,6 +48,7 @@ export default {
 		background-color:#00154e;
 		height:100%;
 		.common-page{margin-top:75px;}
+		box-sizing: border-box;
 	}
 
 	//.page-inline{height:100%;width:100%;display:flex;}

src/views/business/iframe/index.vue

@@ -16,10 +16,24 @@
           <div class="content-fix">
             <div class="toolbar">
               <div>
-								<el-button v-for="(item, key) in form.config.otherBtn" size="mini" :type="item.type" :icon="item.icon" @click="item.callback.call(_self, $event)">{{item.name}}</el-button>
+                <el-button
+                  v-for="(item, key) in form.config.otherBtn"
+                  size="mini"
+                  :type="item.type"
+                  :icon="item.icon"
+                  @click="item.callback.call(_self, $event)"
+                  >{{ item.name }}</el-button
+                >
               </div>
               <div>
-								<el-button v-for="(item, key) in form.config.rightBtn" size="mini" :type="item.type" :icon="item.icon" @click="item.callback.call(_self, $event)">{{item.name}}</el-button>
+                <el-button
+                  v-for="(item, key) in form.config.rightBtn"
+                  size="mini"
+                  :type="item.type"
+                  :icon="item.icon"
+                  @click="item.callback.call(_self, $event)"
+                  >{{ item.name }}</el-button
+                >
               </div>
             </div>
             <!-- 表格渲染 -->
@@ -49,83 +63,131 @@
 </template>
 
 <script>
-import { reqApi, Config } from '@/assets/js/httpApi.js';
-import { Tools } from '@/assets/js/common.js';
-import DateRangePicker from '@/components/DateRangePicker';
-import TableFilter from '@/components/TableFilter';
-import cuForm from '@/components/cuForm';
-import cuTable from '@/components/cuTable';
+import { reqApi, Config } from "@/assets/js/httpApi.js";
+import { Tools } from "@/assets/js/common.js";
+import DateRangePicker from "@/components/DateRangePicker";
+import TableFilter from "@/components/TableFilter";
+import cuForm from "@/components/cuForm/index2";
+import cuTable from "@/components/cuTable";
 
 export default {
-	name: 'Dashboard',
+  name: "Dashboard",
   components: {
-		DateRangePicker, TableFilter, cuForm, cuTable
+    DateRangePicker,
+    TableFilter,
+    cuForm,
+    cuTable,
   },
   data() {
     return {
-			Dict:{selectList:[]},
-			table:{
+      Dict: { selectList: [] },
+      table: {
         page: 1,
         size: 10,
         total: 0,
         loading: false,
-				dataList:[],
+        dataList: [],
       },
       rules: {},
       form: {
-				title:'', visible:false, reqType:'add', historyDialog:false,
-				status:{cu:0},
-				query:{},
-				search:{},
-				item:{},
-				file:0,
-				config:{},
+        title: "",
+        visible: false,
+        reqType: "add",
+        historyDialog: false,
+        status: { cu: 0 },
+        query: {},
+        search: {},
+        item: {},
+        file: 0,
+        config: {},
       },
-		}
+    };
   },
-	created(){
+  created() {
     // 获取基本信息
     this.pageApi = Config.getModuleInfo(this);
     this.Dict = this.pageApi.Dict;
     this.form.config = this.pageApi.config;
-		this.rules = reqApi.getRules(this.Dict.baseInfo) || (this.Dict.rules || {});
+    this.rules = reqApi.getRules(this.Dict.baseInfo) || this.Dict.rules || {};
     this.pageApi.created && this.pageApi.created();
   },
+  watch: {
+    "form.item.grossIncome": {
+      handler(newValue) {
+        this.form.item.investmentProportion = this.calculatePercentage(this.form.item.researchInput, newValue)
+      },
+      immediate: true, // 立即调用处理函数
+    },
+	"form.item.researchInput": {
+      handler(newValue) {
+        this.form.item.investmentProportion = this.calculatePercentage(newValue, this.form.item.grossIncome)
+      },
+      immediate: true, // 立即调用处理函数
+    },
+  },
   mounted() {
     this.$nextTick(() => {
       var search = new URLSearchParams(window.location.search);
-			var companyId = this.companyId = search.get('companyId');
-			this.baseParams = companyId ? {exact:{companyId:companyId}} : void 0;
+      var companyId = (this.companyId = search.get("companyId"));
+      this.baseParams = companyId
+        ? { exact: { companyId: companyId } }
+        : void 0;
       this.loadData(this.baseParams);
       //window.onMessage = function(filename){};
     });
 
     // 获取选择列表字典
     var selectList = this.Dict.selectList;
-		Tools.asyncLoop.call(this, selectList, function(key, value, next){
-			if(typeof value === 'function'){
-				value.call(this.Dict).then(function(res){
-					selectList[key] = res; next();
-				})
-			}else{next()};
+    Tools.asyncLoop.call(this, selectList, function (key, value, next) {
+      if (typeof value === "function") {
+        value.call(this.Dict).then(function (res) {
+          selectList[key] = res;
+          next();
+        });
+      } else {
+        next();
+      }
     });
   },
   methods: {
-		loadData:reqApi.common.getRequst,
-		cancelForm(){
+    calculatePercentage(expense, totalIncome) {
+		console.log('')
+      if(!expense || !totalIncome){
+		return ''
+	  }
+		if (expense*0!==0) {
+        return 0; // 避免除以零
+      }
+	  if (totalIncome*0!==0) {
+        return 0; // 避免除以零
+      }
+
+
+      return ((expense / totalIncome) * 100).toFixed(2);
+    },
+    loadData: reqApi.common.getRequst,
+    cancelForm() {
       this.form.visible = false;
     },
-		submitForm(form, item){
-			item.companyId && (item.companyId = this.companyId)
+    submitForm(form, item) {
+      item.companyId && (item.companyId = this.companyId);
       reqApi.common.submitForm.call(this, form, item);
     },
-	}
-}
+  },
+};
 </script>
 <style rel="stylesheet/scss" lang="scss" scope>
-	#app{position:relative;display:flex;}
-	.iframe-ctn{
-		height:100%;overflow-y:auto;
-	}
-	.scrolling4::-webkit-scrollbar{width:6px;height:8px;cursor:pointer;}
+#app {
+  position: relative;
+  display: flex;
+}
+.iframe-ctn {
+  height: 100%;
+  overflow-y: auto;
+}
+.scrolling4::-webkit-scrollbar {
+  width: 6px;
+  height: 8px;
+  cursor: pointer;
+}
 </style>